www-commits
[Top][All Lists]
Advanced

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

www fun/jokes/po/anagrams.pot fun/jokes/po/bug....


From: GNUN
Subject: www fun/jokes/po/anagrams.pot fun/jokes/po/bug....
Date: Thu, 15 Jul 2021 12:02:04 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/15 12:02:04

Modified files:
        fun/jokes/po   : anagrams.pot bug.war.pot courtroom.quips.pot 
                         echo-msg.pot echo-msg.ru.po echo-msg.zh-cn.po 
                         ed-msg.pot ed-msg.ru.po freesoftware.pot 
                         fsf-in-german.pot fsf-in-german.uk.po 
                         gnuemacs.acro.exp.pot gospel.pot gospel.ru.po 
                         hello_world_patent.pot hello_world_patent.ru.po 
                         know.your.sysadmin.pot purchase.agreement.de.po 
                         purchase.agreement.pot users-lightbulb.de.po 
                         users-lightbulb.fr.po users-lightbulb.pot 
                         users-lightbulb.ru.po 
        fun/po         : humor.de-diff.html humor.de.po humor.fr.po 
                         humor.ja.po humor.pot humor.ru.po humor.sq.po 
                         humor.zh-cn.po 
        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/anagrams.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/bug.war.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/courtroom.quips.pot?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/echo-msg.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/echo-msg.ru.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/echo-msg.zh-cn.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/ed-msg.pot?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/ed-msg.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/freesoftware.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/fsf-in-german.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/fsf-in-german.uk.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gnuemacs.acro.exp.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gospel.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gospel.ru.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/hello_world_patent.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/hello_world_patent.ru.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/know.your.sysadmin.pot?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/purchase.agreement.de.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/purchase.agreement.pot?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/users-lightbulb.de.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/users-lightbulb.fr.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/users-lightbulb.pot?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/users-lightbulb.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.de-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.de.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.fr.po?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.ja.po?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.pot?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.ru.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.sq.po?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.zh-cn.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.af.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ar.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.bg.po?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ca.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.cs.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.da.po?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.de.po?cvsroot=www&r1=1.178&r2=1.179
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.el.po?cvsroot=www&r1=1.134&r2=1.135
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.eo.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.es.po?cvsroot=www&r1=1.137&r2=1.138
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fa.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fi.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fr.po?cvsroot=www&r1=1.135&r2=1.136
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.he.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.hr.po?cvsroot=www&r1=1.108&r2=1.109
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.id.po?cvsroot=www&r1=1.125&r2=1.126
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.it.po?cvsroot=www&r1=1.154&r2=1.155
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ja.po?cvsroot=www&r1=1.145&r2=1.146
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ko.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.lt.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ml.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ms.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nb.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nl.po?cvsroot=www&r1=1.121&r2=1.122
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pl.po?cvsroot=www&r1=1.143&r2=1.144
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pot?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pt-br.po?cvsroot=www&r1=1.133&r2=1.134
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ro.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ru.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sk.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sq.po?cvsroot=www&r1=1.143&r2=1.144
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sr.po?cvsroot=www&r1=1.125&r2=1.126
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sv.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ta.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.te.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.tr.po?cvsroot=www&r1=1.131&r2=1.132
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.uk.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-cn.po?cvsroot=www&r1=1.131&r2=1.132
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-tw.po?cvsroot=www&r1=1.125&r2=1.126

Patches:
Index: fun/jokes/po/anagrams.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/anagrams.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/anagrams.pot   17 Dec 2020 09:31:25 -0000      1.10
+++ fun/jokes/po/anagrams.pot   15 Jul 2021 16:02:01 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anagrams.html\n"
-"POT-Creation-Date: 2020-12-17 09:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+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,11 +20,25 @@
 msgid "Anagrams - 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&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Dictionary\">Dictionary&nbsp;&amp;&nbsp;word&nbsp;play</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Anagrams"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "An Anagram, as you all know, is a word or phrase made by transposing or "
 "rearranging the letters of another word or phrase.  The following are "
@@ -32,230 +46,218 @@
 "waste or is deadly at Scrabble."
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Dormitory"
+#. type: Content of: <dl><dt>
+msgid "Dormitory:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Dirty Room"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Evangelist"
+#. type: Content of: <dl><dt>
+msgid "Evangelist:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Evil's Agent"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Desperation"
+#. type: Content of: <dl><dt>
+msgid "Desperation:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "A Rope Ends It"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "The Morse Code"
+#. type: Content of: <dl><dt>
+msgid "The Morse Code:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Here Come Dots"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Slot Machines"
+#. type: Content of: <dl><dt>
+msgid "Slot Machines:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Cash Lost in 'em"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Animosity"
+#. type: Content of: <dl><dt>
+msgid "Animosity:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Is No Amity"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Mother-in-law"
+#. type: Content of: <dl><dt>
+msgid "Mother-in-law:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Woman Hitler :)"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Snooze Alarms"
+#. type: Content of: <dl><dt>
+msgid "Snooze Alarms:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Alas! No More Z's"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Alec Guinness"
+#. type: Content of: <dl><dt>
+msgid "Alec Guinness:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Genuine Class"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Semolina"
+#. type: Content of: <dl><dt>
+msgid "Semolina:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Is No Meal"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "The Public Art Galleries"
+#. type: Content of: <dl><dt>
+msgid "The Public Art Galleries:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Large Picture Halls, I Bet"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "A Decimal Point"
+#. type: Content of: <dl><dt>
+msgid "A Decimal Point:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "I'm a Dot in Place"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "The Earthquakes"
+#. type: Content of: <dl><dt>
+msgid "The Earthquakes:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "That Queer Shake"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Eleven plus two"
+#. type: Content of: <dl><dt>
+msgid "Eleven plus two:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Twelve plus one"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Contradiction"
+#. type: Content of: <dl><dt>
+msgid "Contradiction:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Accord not in it"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Astronomer"
+#. type: Content of: <dl><dt>
+msgid "Astronomer:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "Moon Starer"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Princess Diana"
+#. type: Content of: <dl><dt>
+msgid "Princess Diana:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "End is a car spin"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
-msgid "Year Two Thousand"
+#. type: Content of: <dl><dt>
+msgid "Year Two Thousand:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <dl><dd>
 msgid "A year to shut down"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid "This one's truly amazing:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><div><blockquote><p>
 msgid ""
-"<q>To be or not to be: that is the question, whether its nobler in the mind "
-"to suffer the slings and arrows of outrageous fortune.</q>"
+"<i>To be or not to be, that is the question: whether 'tis nobler in the mind "
+"to suffer the slings and arrows of outrageous fortune&hellip;</i>"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><div><p>
 msgid "And the Anagram:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><div><blockquote><p>
 msgid ""
-"<q>In one of the Bard's best-thought-of tragedies, our insistent hero, "
-"Hamlet, queries on two fronts about how life turns rotten.</q>"
+"In one of the Bard's best-thought-of tragedies, our insistent hero, Hamlet, "
+"queries on two fronts about how life turns rotten."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid "And for the grand finale:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "<q>That's one small step for a man, one giant leap for mankind.</q>"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "--Neil Armstrong"
+#. type: Content of: <div><div><div><blockquote><p>
+msgid ""
+"<i>That's one small step for a man, one giant leap for mankind. --Neil "
+"Armstrong</i>"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><div><p>
 msgid "The Anagram:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><div><blockquote><p>
 msgid ""
-"<q>A thin man ran; makes a large stride, left planet, pins flag on moon! On "
-"to Mars!</q>"
+"A thin man ran; makes a large stride, left planet, pins flag on moon! On to "
+"Mars!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid "Nope, one more!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid "The following phrase is a perfect anagram to start the impeachment 
trial:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "<q>PRESIDENT CLINTON OF THE USA</q>"
+#. type: Content of: <div><div><div><blockquote><p>
+msgid "<i>PRESIDENT CLINTON OF THE USA</i>"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "<q>TO COPULATE HE FINDS INTERNS</q>"
+#. type: Content of: <div><div><div><blockquote><p>
+msgid "TO COPULATE HE FINDS INTERNS"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/anagrams\">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/anagrams.txt\">Plain text version</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=\"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.
@@ -282,7 +284,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>. 
@@ -290,7 +292,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/bug.war.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/bug.war.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/bug.war.pot    3 Aug 2019 14:58:48 -0000       1.10
+++ fun/jokes/po/bug.war.pot    15 Jul 2021 16:02:01 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bug.war.html\n"
-"POT-Creation-Date: 2019-08-03 14:55+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+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,17 +20,33 @@
 msgid "War against bugs! - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "War against bugs!"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 msgid ""
-"From <cite>Doctor Dobb's Journal</cite>, 2/90, p. 158, &ldquo;The War on "
-"Bugs&rdquo; (humor):"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "War against bugs!"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "by Michael Swaine"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
+msgid "<small>editor-at-large, Doctor Dobb's Journal</small>"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "I wish I could tell you that we're going to be able to eliminate all bug use "
 "in America, but that would be insincere.  We will spare no expense to wipe "
@@ -46,32 +62,14 @@
 "flights."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "&nbsp;&nbsp;--Michael Swaine, editor-at-large"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/bug.war\">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: <h3>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/bug.war.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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"Source:&nbsp; <cite>Doctor Dobb's Journal</cite>, 2/90, p.&nbsp;158, "
+"&ldquo;The War on Bugs&rdquo; (humor)"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -98,7 +96,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>. 
@@ -106,7 +104,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/courtroom.quips.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/courtroom.quips.pot,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- fun/jokes/po/courtroom.quips.pot    17 Aug 2019 07:59:07 -0000      1.12
+++ fun/jokes/po/courtroom.quips.pot    15 Jul 2021 16:02:01 -0000      1.13
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: courtroom.quips.html\n"
-"POT-Creation-Date: 2019-08-17 07:55+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+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,314 +20,315 @@
 msgid "Great Court Quotes - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Great Court Quotes"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 msgid ""
-"The following article is taken from the <cite>New Hampshire Business "
-"Review</cite> under the category of lawyers.  This was one of Richard "
-"Lederer's columns on <cite>Looking at Language</cite>.  Original date "
-"unknown."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Great Court Quotes"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "by Richard Lederer"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "<small>New Hampshire Business Review</small>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From Mary Louise Gilman's two volumes, here are some great court quotes, all "
 "from official transcripts, all recorded by America's keepers of the word:"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><th>
 msgid "Q."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "What is your brother-in-law's name?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><th>
 msgid "A."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Borofkin."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "What's his first name?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "I can't remember."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "He's been your brother-in-law for years, and you can't remember his first "
 "name?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "No.  I tell you I'm too excited. <i>(Rising from the witness chair and "
 "pointing to Mr. Borofkin.)</i> Nathan, for God's sake, tell them your first "
 "name!"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Did you ever stay all night with this man in New York?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "I refuse to answer that question."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Did you ever stay all night with this man in Chicago?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Did you ever stay all night with this man in Miami?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "No."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Now, Mrs. Johnson, how was your first marriage terminated?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "By death."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "And by whose death was it terminated?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Doctor, did you say he was shot in the woods?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "No, I said he was shot in the lumbar region."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "What is your name?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Ernestine McDowell."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "And what is your marital status?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Fair."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Are you married?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "No, I'm divorced."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "And what did your husband do before you divorced him?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "A lot of things I didn't know about."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "And who is this person you are speaking of?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "My ex-widow said it."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "How did you happen to go to Dr. Cherney?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "Well, a gal down the road had had several of her children by Dr. Cherney, "
 "and said he was really good."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Do you know how far pregnant you are right now?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "I will be three months November 8th."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Apparently then, the date of conception was August 8th?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Yes."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "What were you and your husband doing at that time?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Mrs. Smith, do you believe that you are emotionally unstable?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "I should be."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "How many times have you committed suicide?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Four times."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Doctor, how many autopsies have you performed on dead people?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "All my autopsies have been performed on dead people."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Were you aquainted with the decedent?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Yes, sir."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Before or after he died?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Officer, what led you to believe the defendant was under the influence?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Because he was argumentary and he couldn't pronunciate his words."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "What happened then?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "He told me, he says, &ldquo;I have to kill you because you can identify "
 "me.&rdquo;"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Did he kill you?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "Mrs. Jones, is your appearance this morning pursuant to a deposition notice "
 "which I sent to your attorney?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "No.  This is how I dress when I go to work."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Did he pick the dog up by the ears?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "What was he doing with the dog's ears?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Picking them up in the air."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Where was the dog at this time?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Attached to the ears."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "When he went, had you gone and had she, if she wanted to and were able, for "
 "the time being excluding all the restraints on her not to go, gone also, "
 "would he have brought you, meaning you and she, with him to the station?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "MR. BROOKS:"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Objection.  That question should be taken out and shot."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "[Before we recess, let's listen to one last exchange involving a 
child:]"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "And lastly, Gary, all your responses must be oral.  O.K.? What school do you "
 "go to?"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Oral."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "How old are you?"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a "
-"href=\"/fun/jokes/courtroom.quips.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: <h3>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/courtroom.quips.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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"Source:&nbsp; <cite>New Hampshire Business Review</cite> (date unknown) "
+"under the category of lawyers.  This was one of Richard Lederer's columns on "
+"&ldquo;Looking at Language.&rdquo;"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -354,7 +355,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>. 
@@ -362,7 +363,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/echo-msg.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/echo-msg.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/echo-msg.pot   12 Nov 2020 16:30:39 -0000      1.8
+++ fun/jokes/po/echo-msg.pot   15 Jul 2021 16:02:01 -0000      1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: echo-msg.html\n"
-"POT-Creation-Date: 2020-11-12 16:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+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"
@@ -23,300 +23,323 @@
 #. type: Content of: <style>
 #, no-wrap
 msgid ""
+"p.infobox { margin-bottom: 2em; }\n"
 "table { width: 100%; }\n"
-"th { text-align: left; vertical-align: top; }\n"
 "td, th { padding: 1em; }\n"
+"th { text-align: left; vertical-align: top; }\n"
+".col1 { border-right: 0; }\n"
+".col2 { text-align: center; border-left: 0; border-right: 0; }\n"
+".col3 { text-align: right; border-left: 0; }\n"
+".col1, .col3 { width: 20%; }\n"
 "td p { margin-bottom: 0; }\n"
 "td p:first-child { margin-top: 0; }\n"
 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&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Documentation\">Documentation</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "GNU Echo?"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><address>
+msgid "by Robert Herndon"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "From: herndon@umn-cs.UUCP"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: GNU Echo, Release 1"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: 28 Oct 85 18:23:00 GMT"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date-Received: 10 Nov 85 05:29:10 GMT <em>[sic]</em>"
+msgstr ""
+
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Written 12:22 pm  Oct 28, 1985 by umn-cs!herndon in umn-cs:net.jokes */\n"
 "/* ---------- \"GNU Echo, Release 1\" ---------- */\n"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "GNUecho(1)"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Unix Programmer's Manual"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "NAME"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "echo - echo arguments"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "SYNOPSIS"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "echo [ options ] &hellip;"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "DESCRIPTION"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
-"Echo writes its arguments separated by blanks and terminated by\ta newline "
-"on the standard output.  Options to filter and redirect the output are "
-"as\tfollows:"
+"Echo writes its arguments separated by blanks and terminated by a newline on "
+"the standard output.  Options to filter and redirect the output are as "
+"follows:"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-2</b> generate rhyming couplets from keywords"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-3</b> generate Haiku verse from keywords"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-5</b> generate limerick from keywords"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-a</b> convert ASCII\tto ASCII"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-a</b> convert ASCII to ASCII"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-A</b> disambiguate sentence\tstructure"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-A</b> disambiguate sentence structure"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-b</b> generate bureaucratese equivalent (see <b>-x</b>)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-B</b> issue\tequivalent C code with bugs fixed"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-B</b> issue equivalent C code with bugs fixed"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-c</b> simplify/calculate arithmetic\texpression(s)"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-c</b> simplify/calculate arithmetic expression(s)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-C</b> remove copyright notice(s)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-d</b> define new echo switch map"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-D</b> delete all ownership information from\tsystem files"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-D</b> delete all ownership information from system files"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-e</b> evaluate lisp\texpression(s)"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-e</b> evaluate lisp expression(s)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-E</b> convert ASCII\tto Navajo"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-E</b> convert ASCII to Navajo"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-f</b> read input from file"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-F</b> transliterate\tto french"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-F</b> transliterate to french"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-g</b> generate pseudo-revolutionary\tmarxist\tcatch-phrases"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-g</b> generate pseudo-revolutionary marxist catch-phrases"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-G</b> prepend GNU manifesto"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-G</b> prepend GNU Manifesto"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-h</b> halt system (reboot suppressed on Suns, Apollos, and VAXen, not "
 "supported on NOS-2)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-i</b> emulate IBM OS/VU (recursive universes not supported)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-I</b> emulate IBM VTOS 3.7.6 (chronosynclastic infundibula supported "
 "with restrictions documented in IBM VTOS)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-J</b> generate junk\tmail"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-J</b> generate junk mail"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-j</b> justify text (see <b>-b</b> option)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-k</b> output &ldquo;echo&rdquo; software tools"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-K</b> delete privileged accounts"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-l</b> generate legalese equivalent"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-L</b> load echo modules"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-M</b> generate mail"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-N</b> send output to all reachable networks (usable with <b>-J</b>, "
 "<b>-K</b>, <b>-h</b> options)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-n</b> do not add newline to\tthe output"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-n</b> do not add newline to the output"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-o</b> generate obscene text"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-O</b> clean\tup dirty language"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-O</b> clean up dirty language"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-p</b> decrypt and print <code>/etc/passwd</code>"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-P</b> port echo to all reachable networks"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-P1</b> oolcay itay"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-q</b> query\tstandard input for arguments"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-q</b> query standard input for arguments"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-r</b> read alternate &ldquo;<code>.echo</code>&rdquo; file on start 
up"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-R</b> change root password to &ldquo;RMS&rdquo;"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-s</b> suspend operating system during output (Sun and VAX BSD 4.2 
only)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-S</b> translate to Swahili"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-T</b> emulate TCP/IP handler"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-t</b> issue\ttroff output"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-t</b> issue Troff output"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-u</b> issue\tunix philosophy\tessay"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-u</b> issue Unix philosophy essay"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-v</b> generate reverberating echo"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-V</b> print\tdebugging information"
+#. type: Content of: <div><table><tr><td><p>
+msgid "<b>-V</b> print debugging information"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-x</b> decrypt DES format messages (NSA secret algorithm CX 3.8, not "
 "distributed outside continental US)"
 msgstr ""
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>Echo</b> is useful for producing diagnostics in shell programs and for "
 "writing constant data on pipes.  To send diagnostics to the standard error "
 "file, do &lsquo;echo &hellip; 1&gt;2&rsquo;."
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "AUTHOR"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Robert Herndon"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "LICENSE"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "GNU GPL, version 2 or later."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
-msgid "Printed 10/28/85"
-msgstr ""
-
-#. type: Content of: <table><tr><td>
-msgid "18 January 1983"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/echo-msg.txt\"> plain "
-"text</a>."
+#. type: Content of: <div><table><tr><td>
+msgid "<small>Printed 10/28/85</small>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><table><tr><td>
+msgid "<small>18 January 1983</small>"
 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=\"https://lists.gnu.org/\";>email archives</a> of the GNU Project."
+#. type: Content of: <div><table><tr><td>
+msgid "<small>3</small>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/echo-msg.txt\">Original email</a>"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -355,6 +378,10 @@
 "article."
 msgstr ""
 
+#. type: Content of: <div><p>
+msgid "<a href=\"#Licensing\">Licensing information</a>"
+msgstr ""
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"

Index: fun/jokes/po/echo-msg.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/echo-msg.ru.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/echo-msg.ru.po 13 Nov 2020 10:31:11 -0000      1.7
+++ fun/jokes/po/echo-msg.ru.po 15 Jul 2021 16:02:01 -0000      1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: echo-msg.html\n"
-"POT-Creation-Date: 2020-11-12 16:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2020-07-07 15:47+0000\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-15 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU Echo - GNU Project - Free Software Foundation"
@@ -23,23 +24,66 @@
 #. type: Content of: <style>
 #, no-wrap
 msgid ""
+"p.infobox { margin-bottom: 2em; }\n"
 "table { width: 100%; }\n"
-"th { text-align: left; vertical-align: top; }\n"
 "td, th { padding: 1em; }\n"
-"td p { margin-bottom: 0; }\n"
-"td p:first-child { margin-top: 0; }\n"
-msgstr ""
-"table { width: 100%; }\n"
 "th { text-align: left; vertical-align: top; }\n"
-"td, th { padding: 1em; }\n"
+".col1 { border-right: 0; }\n"
+".col2 { text-align: center; border-left: 0; border-right: 0; }\n"
+".col3 { text-align: right; border-left: 0; }\n"
+".col1, .col3 { width: 20%; }\n"
 "td p { margin-bottom: 0; }\n"
 "td p:first-child { margin-top: 0; }\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&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Documentation\">Documentation</a>&nbsp;/"
+msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Echo?"
 msgstr "GNU Echo?"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><address>
+# | {+by+} Robert Herndon
+#, fuzzy
+#| msgid "Robert Herndon"
+msgid "by Robert Herndon"
+msgstr "Роберт Герндон"
+
+#. type: Content of: <div><p>
+msgid "From: herndon@umn-cs.UUCP"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: GNU Echo, Release 1"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: 28 Oct 85 18:23:00 GMT"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date-Received: 10 Nov 85 05:29:10 GMT <em>[sic]</em>"
+msgstr ""
+
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Written 12:22 pm  Oct 28, 1985 by umn-cs!herndon in umn-cs:net.jokes */\n"
@@ -48,114 +92,155 @@
 "/* Написано в 12:22 28 окт 1985 пользователем 
umn-cs!herndon в umn-cs:net.jokes */\n"
 "/* ---------- \"GNU Echo, Выпуск 1\" ---------- */\n"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "GNUecho(1)"
 msgstr "GNUecho(1)"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Unix Programmer's Manual"
 msgstr "Руководство программиста Unix"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "NAME"
 msgstr "ИМЯ"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "echo - echo arguments"
 msgstr "echo - вывести аргументы"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "SYNOPSIS"
 msgstr "ВЫЗОВ"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "echo [ options ] &hellip;"
 msgstr "echo [ параметры ] &hellip;"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
-#. type: Content of: <table><tr><td><p>
-msgid ""
-"Echo writes its arguments separated by blanks and terminated by\ta newline "
-"on the standard output.  Options to filter and redirect the output are as"
-"\tfollows:"
+#. type: Content of: <div><table><tr><td><p>
+# | Echo writes its arguments separated by blanks and terminated [-by\ta-]
+# | {+by a+} newline on the standard output.  Options to filter and redirect
+# | the output are [-as\tfollows:-] {+as follows:+}
+#, fuzzy
+#| msgid ""
+#| "Echo writes its arguments separated by blanks and terminated by\ta "
+#| "newline on the standard output.  Options to filter and redirect the "
+#| "output are as\tfollows:"
+msgid ""
+"Echo writes its arguments separated by blanks and terminated by a newline on "
+"the standard output.  Options to filter and redirect the output are as "
+"follows:"
 msgstr ""
 "Echo выводит свои аргументы, разделенные 
пробелами и завершенные переводом "
 "строки, в стандартный поток вывода. 
Параметры для перенаправления и "
 "фильтрации вывода:"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-2</b> generate rhyming couplets from keywords"
 msgstr "<b>-2</b> генерировать рифмованные 
куплеты из ключевых слов"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-3</b> generate Haiku verse from keywords"
 msgstr "<b>-3</b> генерировать хайку из ключевых 
слов"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-5</b> generate limerick from keywords"
 msgstr "<b>-5</b> генерировать лимерик из ключевых
 слов"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-a</b> convert ASCII\tto ASCII"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-a</b> convert [-ASCII\tto-] {+ASCII to+} ASCII
+#, fuzzy
+#| msgid "<b>-a</b> convert ASCII\tto ASCII"
+msgid "<b>-a</b> convert ASCII to ASCII"
 msgstr "<b>-a</b> конвертировать ASCII в ASCII"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-A</b> disambiguate sentence\tstructure"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-A</b> disambiguate [-sentence\tstructure-] {+sentence structure+}
+#, fuzzy
+#| msgid "<b>-A</b> disambiguate sentence\tstructure"
+msgid "<b>-A</b> disambiguate sentence structure"
 msgstr "<b>-A</b> показывать структуру 
предложения"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-b</b> generate bureaucratese equivalent (see <b>-x</b>)"
 msgstr "<b>-b</b> генерировать канцелярский 
эквивалент (см. <b>-x</b>)"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-B</b> issue\tequivalent C code with bugs fixed"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-B</b> [-issue\tequivalent-] {+issue equivalent+} C code with bugs fixed
+#, fuzzy
+#| msgid "<b>-B</b> issue\tequivalent C code with bugs fixed"
+msgid "<b>-B</b> issue equivalent C code with bugs fixed"
 msgstr ""
 "<b>-B</b> выдавать эквивалентную программу на 
Си с исправленными ошибками"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-c</b> simplify/calculate arithmetic\texpression(s)"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-c</b> simplify/calculate [-arithmetic\texpression(s)-] {+arithmetic
+# | expression(s)+}
+#, fuzzy
+#| msgid "<b>-c</b> simplify/calculate arithmetic\texpression(s)"
+msgid "<b>-c</b> simplify/calculate arithmetic expression(s)"
 msgstr "<b>-c</b> упрощать/вычислять 
арифметические выражения"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-C</b> remove copyright notice(s)"
 msgstr "<b>-C</b> удалять уведомления об 
авторском праве"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-d</b> define new echo switch map"
 msgstr "<b>-d</b> определить новую карту 
переключений echo"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-D</b> delete all ownership information from\tsystem files"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-D</b> delete all ownership information [-from\tsystem-] {+from
+# | system+} files
+#, fuzzy
+#| msgid "<b>-D</b> delete all ownership information from\tsystem files"
+msgid "<b>-D</b> delete all ownership information from system files"
 msgstr "<b>-D</b> снять всю информацию о 
владельцах с системных файлов"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-e</b> evaluate lisp\texpression(s)"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-e</b> evaluate [-lisp\texpression(s)-] {+lisp expression(s)+}
+#, fuzzy
+#| msgid "<b>-e</b> evaluate lisp\texpression(s)"
+msgid "<b>-e</b> evaluate lisp expression(s)"
 msgstr "<b>-e</b> оценить выражения Lisp"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-E</b> convert ASCII\tto Navajo"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-E</b> convert [-ASCII\tto-] {+ASCII to+} Navajo
+#, fuzzy
+#| msgid "<b>-E</b> convert ASCII\tto Navajo"
+msgid "<b>-E</b> convert ASCII to Navajo"
 msgstr "<b>-E</b> конвертировать ASCII в навахо"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-f</b> read input from file"
 msgstr "<b>-f</b> читать ввод из файла"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-F</b> transliterate\tto french"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-F</b> [-transliterate\tto-] {+transliterate to+} french
+#, fuzzy
+#| msgid "<b>-F</b> transliterate\tto french"
+msgid "<b>-F</b> transliterate to french"
 msgstr "<b>-F</b> транслитерировать на 
французский"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-g</b> generate pseudo-revolutionary\tmarxist\tcatch-phrases"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-g</b> generate [-pseudo-revolutionary\tmarxist\tcatch-phrases-]
+# | {+pseudo-revolutionary marxist catch-phrases+}
+#, fuzzy
+#| msgid "<b>-g</b> generate pseudo-revolutionary\tmarxist\tcatch-phrases"
+msgid "<b>-g</b> generate pseudo-revolutionary marxist catch-phrases"
 msgstr "<b>-g</b> генерировать 
псевдо-революционные марксистские лозунги"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-G</b> prepend GNU manifesto"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-G</b> prepend GNU [-m-]{+M+}anifesto
+#, fuzzy
+#| msgid "<b>-G</b> prepend GNU manifesto"
+msgid "<b>-G</b> prepend GNU Manifesto"
 msgstr "<b>-G</b> предварять Манифестом GNU"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-h</b> halt system (reboot suppressed on Suns, Apollos, and VAXen, not "
 "supported on NOS-2)"
@@ -163,12 +248,12 @@
 "<b>-h</b> остановить систему (перезагрузка 
подавляется на компьютерах Sun, "
 "Apollo, VAX, не поддерживается на NOS-2)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-i</b> emulate IBM OS/VU (recursive universes not supported)"
 msgstr ""
 "<b>-i</b> эмулировать IBM OS/VU (рекурсивные 
вселенные не поддерживаются)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-I</b> emulate IBM VTOS 3.7.6 (chronosynclastic infundibula supported "
 "with restrictions documented in IBM VTOS)"
@@ -176,35 +261,38 @@
 "<b>-I</b> эмулировать IBM VTOS 3.7.6 (х
роносинкластические инфундибулы "
 "поддерживаются с ограничениями, 
документированными для IBM VTOS)"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-J</b> generate junk\tmail"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-J</b> generate [-junk\tmail-] {+junk mail+}
+#, fuzzy
+#| msgid "<b>-J</b> generate junk\tmail"
+msgid "<b>-J</b> generate junk mail"
 msgstr "<b>-J</b> генерировать удаляемую почту"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-j</b> justify text (see <b>-b</b> option)"
 msgstr "<b>-j</b> обосновывать текст (см. параметр 
<b>-b</b>)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-k</b> output &ldquo;echo&rdquo; software tools"
 msgstr "<b>-k</b> вывести программные средства 
&ldquo;echo&rdquo;"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-K</b> delete privileged accounts"
 msgstr "<b>-K</b> удалить привилегированные 
учетные записи"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-l</b> generate legalese equivalent"
 msgstr "<b>-l</b> генерировать эквивалент на 
юридическом языке"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-L</b> load echo modules"
 msgstr "<b>-L</b> загружать молули echo"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-M</b> generate mail"
 msgstr "<b>-M</b> генерировать почту"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-N</b> send output to all reachable networks (usable with <b>-J</b>, <b>-"
 "K</b>, <b>-h</b> options)"
@@ -212,75 +300,93 @@
 "<b>-N</b> высылать вывод во все досягаемые 
сети (можно использовать с "
 "параметрами <b>-J</b>, <b>-K</b>, <b>-h</b>)"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-n</b> do not add newline to\tthe output"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-n</b> do not add newline [-to\tthe-] {+to the+} output
+#, fuzzy
+#| msgid "<b>-n</b> do not add newline to\tthe output"
+msgid "<b>-n</b> do not add newline to the output"
 msgstr "<b>-n</b> не добавлять новую строку в 
вывод"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-o</b> generate obscene text"
 msgstr "<b>-o</b> генерировать нецензурную брань"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-O</b> clean\tup dirty language"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-O</b> [-clean\tup-] {+clean up+} dirty language
+#, fuzzy
+#| msgid "<b>-O</b> clean\tup dirty language"
+msgid "<b>-O</b> clean up dirty language"
 msgstr "<b>-O</b> смягчать крепкие выражения"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-p</b> decrypt and print <code>/etc/passwd</code>"
 msgstr "<b>-p</b> расшифровать и распечатать 
<code>/etc/passwd</code>"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-P</b> port echo to all reachable networks"
 msgstr "<b>-P</b> портировать echo на все досягаемые 
сети"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-P1</b> oolcay itay"
 msgstr "<b>-P1</b> oolcay itay"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-q</b> query\tstandard input for arguments"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-q</b> [-query\tstandard-] {+query standard+} input for arguments
+#, fuzzy
+#| msgid "<b>-q</b> query\tstandard input for arguments"
+msgid "<b>-q</b> query standard input for arguments"
 msgstr "<b>-q</b> запрашивать аргументы в 
стандартном потоке ввода"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-r</b> read alternate &ldquo;<code>.echo</code>&rdquo; file on start up"
 msgstr "<b>-r</b> при запуске читать 
альтернативный файл <code>.echo</code>"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-R</b> change root password to &ldquo;RMS&rdquo;"
 msgstr "<b>-R</b> изменить пароль администратора 
на &ldquo;RMS&rdquo;"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-s</b> suspend operating system during output (Sun and VAX BSD 4.2 only)"
 msgstr ""
 "<b>-s</b> приостановить операционную систему 
во время вывода (только для Sun "
 "и VAX BSD 4.2)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-S</b> translate to Swahili"
 msgstr "<b>-S</b> переводить на суахили"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-T</b> emulate TCP/IP handler"
 msgstr "<b>-T</b> эмулировать обработчик TCP/IP"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-t</b> issue\ttroff output"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-t</b> [-issue\ttroff-] {+issue Troff+} output
+#, fuzzy
+#| msgid "<b>-t</b> issue\ttroff output"
+msgid "<b>-t</b> issue Troff output"
 msgstr "<b>-t</b> выдавать вывод troff"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-u</b> issue\tunix philosophy\tessay"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-u</b> [-issue\tunix philosophy\tessay-] {+issue Unix philosophy essay+}
+#, fuzzy
+#| msgid "<b>-u</b> issue\tunix philosophy\tessay"
+msgid "<b>-u</b> issue Unix philosophy essay"
 msgstr "<b>-u</b> выдавать очерк философии Unix"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-v</b> generate reverberating echo"
 msgstr "<b>-v</b> генерировать многократное эхо"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-V</b> print\tdebugging information"
+#. type: Content of: <div><table><tr><td><p>
+# | <b>-V</b> [-print\tdebugging-] {+print debugging+} information
+#, fuzzy
+#| msgid "<b>-V</b> print\tdebugging information"
+msgid "<b>-V</b> print debugging information"
 msgstr "<b>-V</b> печатать отладочную информацию"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-x</b> decrypt DES format messages (NSA secret algorithm CX 3.8, not "
 "distributed outside continental US)"
@@ -288,7 +394,7 @@
 "<b>-x</b> расшифровывать сообщения в формате 
DES (секретный алгоритм CX 3.8 "
 "НАБ, не распространяется вне 
континентальной части США)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>Echo</b> is useful for producing diagnostics in shell programs and for "
 "writing constant data on pipes.  To send diagnostics to the standard error "
@@ -299,60 +405,51 @@
 "диагностику в файл стандартного потока 
вывода, введите &lsquo;echo &hellip; "
 "1&gt;2&rsquo;."
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "AUTHOR"
 msgstr "АВТОР"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Robert Herndon"
 msgstr "Роберт Герндон"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "LICENSE"
 msgstr "ЛИЦЕНЗИЯ"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "GNU GPL, version 2 or later."
 msgstr "GNU GPL, версия 2 или более поздняя."
 
-#. type: Content of: <table><tr><td>
-msgid "Printed 10/28/85"
+#. type: Content of: <div><table><tr><td>
+# | [-Printed 10/28/85-]{+<small>Printed 10/28/85</small>+}
+#, fuzzy
+#| msgid "Printed 10/28/85"
+msgid "<small>Printed 10/28/85</small>"
 msgstr "Распечатано 28/10/85"
 
-#. type: Content of: <table><tr><td>
-msgid "18 January 1983"
+#. type: Content of: <div><table><tr><td>
+# | [-18-]{+<small>18+} January [-1983-] {+1983</small>+}
+#, fuzzy
+#| msgid "18 January 1983"
+msgid "<small>18 January 1983</small>"
 msgstr "18 января 1983"
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/echo-msg.txt\"> plain "
-"text</a>."
+#. type: Content of: <div><table><tr><td>
+msgid "<small>3</small>"
 msgstr ""
-"Оригинал этой шутки есть также в <a 
href=\"/fun/jokes/echo-msg.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>
-msgid "Disclaimer"
-msgstr "Предупреждение"
 
-#. type: Content of: <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 ""
-"Эта шутка извлечена из <a 
href=\"https://lists.gnu.org/\";>архивов почты</a> "
-"проекта GNU ФСПО."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+#. type: Content of: <div><p>
+# | [-This joke is also available in-]<a [-href=\"/fun/jokes/echo-msg.txt\">
+# | plain text</a>.-] {+href=\"/fun/jokes/echo-msg.txt\">Original email</a>+}
+#, fuzzy
+#| msgid ""
+#| "This joke is also available in <a href=\"/fun/jokes/echo-msg.txt\"> plain "
+#| "text</a>."
+msgid "<a href=\"/fun/jokes/echo-msg.txt\">Original email</a>"
 msgstr ""
-"Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
-"шутку."
+"Оригинал этой шутки есть также в <a 
href=\"/fun/jokes/echo-msg.txt\"> "
+"простом тексте</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -398,6 +495,10 @@
 "предложениям переводов наших статей см. в 
<a href=\"/server/standards/README."
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
+#. type: Content of: <div><p>
+msgid "<a href=\"#Licensing\">Licensing information</a>"
+msgstr ""
+
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -412,3 +513,35 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "table { width: 100%; }\n"
+#~ "th { text-align: left; vertical-align: top; }\n"
+#~ "td, th { padding: 1em; }\n"
+#~ "td p { margin-bottom: 0; }\n"
+#~ "td p:first-child { margin-top: 0; }\n"
+#~ msgstr ""
+#~ "table { width: 100%; }\n"
+#~ "th { text-align: left; vertical-align: top; }\n"
+#~ "td, th { padding: 1em; }\n"
+#~ "td p { margin-bottom: 0; }\n"
+#~ "td p:first-child { margin-top: 0; }\n"
+
+#~ 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=\"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/echo-msg.zh-cn.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/echo-msg.zh-cn.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- fun/jokes/po/echo-msg.zh-cn.po      16 Nov 2020 05:59:28 -0000      1.12
+++ fun/jokes/po/echo-msg.zh-cn.po      15 Jul 2021 16:02:01 -0000      1.13
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: echo-msg.html\n"
-"POT-Creation-Date: 2020-11-12 16:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2020-11-16 13:37+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@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-15 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU Echo - GNU Project - Free Software Foundation"
@@ -23,23 +24,69 @@
 #. type: Content of: <style>
 #, no-wrap
 msgid ""
+"p.infobox { margin-bottom: 2em; }\n"
 "table { width: 100%; }\n"
-"th { text-align: left; vertical-align: top; }\n"
 "td, th { padding: 1em; }\n"
-"td p { margin-bottom: 0; }\n"
-"td p:first-child { margin-top: 0; }\n"
-msgstr ""
-"table { width: 100%; }\n"
 "th { text-align: left; vertical-align: top; }\n"
-"td, th { padding: 1em; }\n"
+".col1 { border-right: 0; }\n"
+".col2 { text-align: center; border-left: 0; border-right: 0; }\n"
+".col3 { text-align: right; border-left: 0; }\n"
+".col1, .col3 { width: 20%; }\n"
 "td p { margin-bottom: 0; }\n"
 "td p:first-child { margin-top: 0; }\n"
+msgstr ""
 
-#. 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>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Documentation\">Documentation</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育资源</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "GNU Echo?"
 msgstr "GNU Echo?"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><address>
+#, fuzzy
+#| msgid "Robert Herndon"
+msgid "by Robert Herndon"
+msgstr "Robert Herndon"
+
+#. type: Content of: <div><p>
+msgid "From: herndon@umn-cs.UUCP"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: GNU Echo, Release 1"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: 28 Oct 85 18:23:00 GMT"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date-Received: 10 Nov 85 05:29:10 GMT <em>[sic]</em>"
+msgstr ""
+
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Written 12:22 pm  Oct 28, 1985 by umn-cs!herndon in umn-cs:net.jokes */\n"
@@ -48,123 +95,148 @@
 "/* Written 12:22 pm  Oct 28, 1985 by umn-cs!herndon in umn-cs:net.jokes */\n"
 "/* ---------- \"GNU Echo, 发布 1\" ---------- */\n"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "GNUecho(1)"
 msgstr "GNUecho(1)"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Unix Programmer's Manual"
 msgstr "Unix程序员手册"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "NAME"
 msgstr "名称"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "echo - echo arguments"
 msgstr "echo - echo参数"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "SYNOPSIS"
 msgstr "概要"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "echo [ options ] &hellip;"
 msgstr "echo [ 选项 ] &hellip;"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "DESCRIPTION"
 msgstr "说明"
 
-#. type: Content of: <table><tr><td><p>
-msgid ""
-"Echo writes its arguments separated by blanks and terminated by\ta newline "
-"on the standard output.  Options to filter and redirect the output are as"
-"\tfollows:"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid ""
+#| "Echo writes its arguments separated by blanks and terminated by\ta "
+#| "newline on the standard output.  Options to filter and redirect the "
+#| "output are as\tfollows:"
+msgid ""
+"Echo writes its arguments separated by blanks and terminated by a newline on "
+"the standard output.  Options to filter and redirect the output are as "
+"follows:"
 msgstr ""
 "Echo将其参数以空格分隔、以回车结尾写到æ 
‡å‡†è¾“出设备上。其输出的过滤和重定向选"
 "项如下:"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-2</b> generate rhyming couplets from keywords"
 msgstr "<b>-2</b> 由关键字产生一幅对联"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-3</b> generate Haiku verse from keywords"
 msgstr "<b>-3</b> 由关键字产生三行徘句诗"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-5</b> generate limerick from keywords"
 msgstr "<b>-5</b> 由关键字产生五行打油诗"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-a</b> convert ASCII\tto ASCII"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-a</b> convert ASCII\tto ASCII"
+msgid "<b>-a</b> convert ASCII to ASCII"
 msgstr "<b>-a</b> ASCII码转成ASCII码"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-A</b> disambiguate sentence\tstructure"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-A</b> disambiguate sentence\tstructure"
+msgid "<b>-A</b> disambiguate sentence structure"
 msgstr "<b>-A</b> 消除句子结构不清楚处"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-b</b> generate bureaucratese equivalent (see <b>-x</b>)"
 msgstr "<b>-b</b> 产生同义的官僚语言(参见 -x )"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-B</b> issue\tequivalent C code with bugs fixed"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-B</b> issue\tequivalent C code with bugs fixed"
+msgid "<b>-B</b> issue equivalent C code with bugs fixed"
 msgstr "<b>-B</b> 发布修正错误的同义C代码"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-c</b> simplify/calculate arithmetic\texpression(s)"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-c</b> simplify/calculate arithmetic\texpression(s)"
+msgid "<b>-c</b> simplify/calculate arithmetic expression(s)"
 msgstr "<b>-c</b> 简化/计算数学表示式"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-C</b> remove copyright notice(s)"
 msgstr "<b>-C</b> 删除版权声明"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-d</b> define new echo switch map"
 msgstr "<b>-d</b> 定义新的echo切换图"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-D</b> delete all ownership information from\tsystem files"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-D</b> delete all ownership information from\tsystem files"
+msgid "<b>-D</b> delete all ownership information from system files"
 msgstr "<b>-D</b> 从系统文件中删除全部的拥有者信息"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-e</b> evaluate lisp\texpression(s)"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-e</b> evaluate lisp\texpression(s)"
+msgid "<b>-e</b> evaluate lisp expression(s)"
 msgstr "<b>-e</b> 计算lisp表示式"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-E</b> convert ASCII\tto Navajo"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-E</b> convert ASCII\tto Navajo"
+msgid "<b>-E</b> convert ASCII to Navajo"
 msgstr "<b>-E</b> 将ASCII码转成纳瓦伙语(Navajo)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-f</b> read input from file"
 msgstr "<b>-f</b> 从文件中读取输入"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-F</b> transliterate\tto french"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-F</b> transliterate\tto french"
+msgid "<b>-F</b> transliterate to french"
 msgstr "<b>-F</b> 翻译成法语"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-g</b> generate pseudo-revolutionary\tmarxist\tcatch-phrases"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-g</b> generate pseudo-revolutionary\tmarxist\tcatch-phrases"
+msgid "<b>-g</b> generate pseudo-revolutionary marxist catch-phrases"
 msgstr "<b>-g</b> 产生伪马克斯主义革命者的妙语"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-G</b> prepend GNU manifesto"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-G</b> prepend GNU manifesto"
+msgid "<b>-G</b> prepend GNU Manifesto"
 msgstr "<b>-G</b> 预置GNU宣言"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-h</b> halt system (reboot suppressed on Suns, Apollos, and VAXen, not "
 "supported on NOS-2)"
 msgstr ""
 "<b>-h</b> 
终止系统(Suns、Apollos和VAXen禁用重启命令,NOS-2不支持该命令)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-i</b> emulate IBM OS/VU (recursive universes not supported)"
 msgstr "<b>-i</b> 模拟IBM OS/VU(不支持递归系统)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-I</b> emulate IBM VTOS 3.7.6 (chronosynclastic infundibula supported "
 "with restrictions documented in IBM VTOS)"
@@ -172,35 +244,37 @@
 "<b>-I</b> 模拟IBM VTOS 3.7.6(依照IBM 
VTOS文档里的限制说明支持异度离散空间"
 "<sup><a href=\"#TransNote1\">1</a></sup>)"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-J</b> generate junk\tmail"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-J</b> generate junk\tmail"
+msgid "<b>-J</b> generate junk mail"
 msgstr "<b>-J</b> 产生垃圾邮件"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-j</b> justify text (see <b>-b</b> option)"
 msgstr "<b>-j</b> 调整文本(参看<b>-b</b>选项)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-k</b> output &ldquo;echo&rdquo; software tools"
 msgstr "<b>-k</b> 输出&ldquo;echo&rdquo;软件工具"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-K</b> delete privileged accounts"
 msgstr "<b>-K</b> 删除有特权的账号"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-l</b> generate legalese equivalent"
 msgstr "<b>-l</b> 产生同义的法律措辞"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-L</b> load echo modules"
 msgstr "<b>-L</b> 加载echo模块"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-M</b> generate mail"
 msgstr "<b>-M</b> 产生邮件"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-N</b> send output to all reachable networks (usable with <b>-J</b>, <b>-"
 "K</b>, <b>-h</b> options)"
@@ -208,80 +282,92 @@
 "<b>-N</b> 
将输出发送到所有可到达的网络(可以和选项<b>-J</b>、<b>-K</b>、<b>-"
 "h</b>一起使用)"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-n</b> do not add newline to\tthe output"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-n</b> do not add newline to\tthe output"
+msgid "<b>-n</b> do not add newline to the output"
 msgstr "<b>-n</b> 不在输出中添加换行符"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-o</b> generate obscene text"
 msgstr "<b>-o</b> 产生淫秽的文字"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-O</b> clean\tup dirty language"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-O</b> clean\tup dirty language"
+msgid "<b>-O</b> clean up dirty language"
 msgstr "<b>-O</b> 清理污秽的语言"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-p</b> decrypt and print <code>/etc/passwd</code>"
 msgstr "<b>-p</b> 解密并打印 <code>/etc/passwd</code>"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-P</b> port echo to all reachable networks"
 msgstr "<b>-P</b> 将echo移植到所有可到达网络"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-P1</b> oolcay itay"
 msgstr "<b>-P1</b> oolcay itay<sup><a href=\"#TransNote2\">2</a></sup>"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-q</b> query\tstandard input for arguments"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-q</b> query\tstandard input for arguments"
+msgid "<b>-q</b> query standard input for arguments"
 msgstr "<b>-q</b> 查询参数的标准输入"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-r</b> read alternate &ldquo;<code>.echo</code>&rdquo; file on start up"
 msgstr "<b>-r</b> 在启动时读å…
¥æ›¿ä»£çš„&ldquo;<code>.echo</code>&rdquo;文件"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-R</b> change root password to &ldquo;RMS&rdquo;"
 msgstr "<b>-R</b> 将root密码改为&ldquo;RMS&rdquo;"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-s</b> suspend operating system during output (Sun and VAX BSD 4.2 only)"
 msgstr "<b>-s</b> 输出时暂停操作系统(仅针对Sun和VAX BSD 4.2)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-S</b> translate to Swahili"
 msgstr "<b>-S</b> 翻译成Swahili语"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-T</b> emulate TCP/IP handler"
 msgstr "<b>-T</b> 模拟TCP/IP处理程序"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-t</b> issue\ttroff output"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-t</b> issue\ttroff output"
+msgid "<b>-t</b> issue Troff output"
 msgstr "<b>-t</b> 发行troff输出"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-u</b> issue\tunix philosophy\tessay"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-u</b> issue\tunix philosophy\tessay"
+msgid "<b>-u</b> issue Unix philosophy essay"
 msgstr "<b>-u</b> 发行unix哲学短文"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid "<b>-v</b> generate reverberating echo"
 msgstr "<b>-v</b> 产生回响echo"
 
-#. type: Content of: <table><tr><td><p>
-msgid "<b>-V</b> print\tdebugging information"
+#. type: Content of: <div><table><tr><td><p>
+#, fuzzy
+#| msgid "<b>-V</b> print\tdebugging information"
+msgid "<b>-V</b> print debugging information"
 msgstr "<b>-V</b> 打印调试信息"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>-x</b> decrypt DES format messages (NSA secret algorithm CX 3.8, not "
 "distributed outside continental US)"
 msgstr ""
 "<b>-x</b> 解密DES格式的消息(这是NSA秘密算法CX 
3.8,不在美国本土之外发布)"
 
-#. type: Content of: <table><tr><td><p>
+#. type: Content of: <div><table><tr><td><p>
 msgid ""
 "<b>Echo</b> is useful for producing diagnostics in shell programs and for "
 "writing constant data on pipes.  To send diagnostics to the standard error "
@@ -290,56 +376,45 @@
 "<b>Echo</b> 
可用于在shell程序中产生诊断信息并可将常数写到管道。如果要将诊断信"
 "息写到标准错误输出文件,请&lsquo;echo &hellip; 1&gt;2&rsquo;。"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "AUTHOR"
 msgstr "作者"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "Robert Herndon"
 msgstr "Robert Herndon"
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "LICENSE"
 msgstr "许可证"
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "GNU GPL, version 2 or later."
 msgstr "GNU GPL,第二版及以后版。"
 
-#. type: Content of: <table><tr><td>
-msgid "Printed 10/28/85"
+#. type: Content of: <div><table><tr><td>
+#, fuzzy
+#| msgid "Printed 10/28/85"
+msgid "<small>Printed 10/28/85</small>"
 msgstr "打印日期:10/28/85"
 
-#. type: Content of: <table><tr><td>
-msgid "18 January 1983"
+#. type: Content of: <div><table><tr><td>
+#, fuzzy
+#| msgid "18 January 1983"
+msgid "<small>18 January 1983</small>"
 msgstr "1983年1月18日"
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/echo-msg.txt\"> plain "
-"text</a>."
-msgstr "本笑话也有<a href=\"/fun/jokes/echo-msg.txt\">纯文本版</a>。"
-
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "GNU幽默汇总里还有<a href=\"/fun/humor.html\">å…
¶ä»–幽默作品</a>。"
-
-#. 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=\"https://lists.";
-"gnu.org/\">email archives</a> of the GNU Project."
+#. type: Content of: <div><table><tr><td>
+msgid "<small>3</small>"
 msgstr ""
-"本页的笑话来自FSF的GNU工程的<a 
href=\"https://lists.gnu.org/\";>电子邮件存档</"
-"a>。"
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr "自由软件基金会不对该笑话主张版权。"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This joke is also available in <a href=\"/fun/jokes/echo-msg.txt\"> plain "
+#| "text</a>."
+msgid "<a href=\"/fun/jokes/echo-msg.txt\">Original email</a>"
+msgstr "本笑话也有<a href=\"/fun/jokes/echo-msg.txt\">纯文本版</a>。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -390,6 +465,10 @@
 "息参见 <a href=\"/server/standards/README.translators.html\">《译者
指南》</"
 "a>。"
 
+#. type: Content of: <div><p>
+msgid "<a href=\"#Licensing\">Licensing information</a>"
+msgstr ""
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
@@ -404,6 +483,36 @@
 msgstr "最后更新:"
 
 #~ msgid ""
+#~ "table { width: 100%; }\n"
+#~ "th { text-align: left; vertical-align: top; }\n"
+#~ "td, th { padding: 1em; }\n"
+#~ "td p { margin-bottom: 0; }\n"
+#~ "td p:first-child { margin-top: 0; }\n"
+#~ msgstr ""
+#~ "table { width: 100%; }\n"
+#~ "th { text-align: left; vertical-align: top; }\n"
+#~ "td, th { padding: 1em; }\n"
+#~ "td p { margin-bottom: 0; }\n"
+#~ "td p:first-child { margin-top: 0; }\n"
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "GNU幽默汇总里还有<a href=\"/fun/humor.html\">å…
¶ä»–幽默作品</a>。"
+
+#~ msgid "Disclaimer"
+#~ msgstr "免责声明"
+
+#~ 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 ""
+#~ "本页的笑话来自FSF的GNU工程的<a 
href=\"https://lists.gnu.org/\";>电子邮件存"
+#~ "档</a>。"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr "自由软件基金会不对该笑话主张版权。"
+
+#~ 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."

Index: fun/jokes/po/ed-msg.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/ed-msg.pot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/jokes/po/ed-msg.pot     6 Jul 2020 13:59:55 -0000       1.6
+++ fun/jokes/po/ed-msg.pot     15 Jul 2021 16:02:01 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ed-msg.html\n"
-"POT-Creation-Date: 2020-07-06 13:55+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,20 +20,45 @@
 msgid "Ed, man! !man ed- GNU Project - Free Software Foundation (FSF)"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Ed, man! !man ed"
+#. type: Content of: <style>
+#, no-wrap
+msgid ""
+"#ed-text p { display:inline-block; vertical-align: top; margin: 1em 1em 0; "
+"}\n"
+"@media (max-width: 40em) { #ed-text p { width: 11em; max-width:15em; }} \n"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. 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 ""
-"From: patl@athena.mit.edu (Patrick J. LoPresti)\n"
-"Subject: The True Path (long)\n"
-"Date: 11 Jul 91 03:17:31 GMT\n"
-"Newsgroups: alt.religion.emacs,alt.slack\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Documentation\">Documentation</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Ed, man! !man ed"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "From: Patrick J. LoPresti"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: The True Path (long)"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: 11 Jul 91 03:17:31 GMT"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "When I log into my Xenix system with my 110 baud teletype, both vi "
 "<b>and</b> Emacs are just too damn slow.  They print useless messages like, "
@@ -41,11 +66,11 @@
 "only&rsquo;.  So I use the editor that doesn't waste my VALUABLE time."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Ed, man!&nbsp;&nbsp;!man ed"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "ED(1)               Unix Programmer's Manual                ED(1)\n"
@@ -59,25 +84,25 @@
 "     Ed is the standard text editor.\n"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "---"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Computer Scientists love ed, not just because it comes first alphabetically, "
 "but because it's the standard.  Everyone else loves ed because it's ED!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "&ldquo;Ed is the standard text editor.&rdquo;"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "And ed doesn't waste space on my Timex Sinclair.  Just look:"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "-rwxr-xr-x  1 root          24 Oct 29  1929 /bin/ed\n"
@@ -85,7 +110,7 @@
 "-rwxr-xr-x  1 root  5.89824e37 Oct 22  1990 /usr/bin/emacs\n"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Of course, on the system <b>I</b> administrate, <code>vi</code> is symlinked "
 "to <code>ed</code>.  Emacs has been replaced by a shell script which 1) "
@@ -93,11 +118,11 @@
 "quota by 100K; and 3) RUNS ED!!!!!!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Let's look at a typical novice's session with the mighty ed:"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "golem$ ed\n"
@@ -125,18 +150,18 @@
 "?\n"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Note the consistent user interface and error reportage.  Ed is generous "
 "enough to flag errors, yet prudent enough not to overwhelm the novice with "
 "verbosity."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Ed, the greatest WYGIWYG editor of all."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "ED IS THE TRUE PATH TO NIRVANA! ED HAS BEEN THE CHOICE OF EDUCATED AND "
 "IGNORANT ALIKE FOR CENTURIES! ED WILL NOT CORRUPT YOUR PRECIOUS BODILY "
@@ -144,7 +169,7 @@
 "BIRDS SING AND THE GRASS GREEN!!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I use an editor, I don't want eight extra KILOBYTES of worthless help "
 "screens and cursor positioning code! I just want an EDitor!! Not a "
@@ -152,18 +177,18 @@
 "WORDS!!!! ED! ED! ED IS THE STANDARD!!!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "TEXT EDITOR."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "When IBM, in its ever-present omnipotence, needed to base their "
 "&ldquo;edlin&rdquo; on a Unix standard, did they mimic vi? No.  Emacs? "
 "Surely you jest.  They chose the most karmic editor of all.  The standard."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Ed is for those who can <b>remember</b> what they are working on.  If you "
 "are an idiot, you should use Emacs.  If you are an Emacs, you should not be "
@@ -172,33 +197,28 @@
 "FAITHLESS.  DO NOT GIVE IN!!! THE MIGHTY ED HAS SPOKEN!!!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "?"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/ed-msg.txt\">plain "
-"text</a>, plus an <a href=\"/fun/jokes/ed.hup\">Intel &ldquo;press "
-"release&rdquo;</a> edited with <code>ed</code>."
+#. type: Content of: <div><div><p>
+msgid "<a href=\"/fun/jokes/ed-msg.txt\">Plain text version</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><div><p>
+msgid ""
+"<a href=\"/fun/jokes/ed.hup\">Intel &ldquo;press release&rdquo;</a> "
+"edited&nbsp;with&nbsp;<code>ed</code>"
 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.
@@ -206,24 +226,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/ed-msg.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/ed-msg.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/jokes/po/ed-msg.ru.po   7 Jul 2020 09:59:53 -0000       1.6
+++ fun/jokes/po/ed-msg.ru.po   15 Jul 2021 16:02:01 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ed-msg.html\n"
-"POT-Creation-Date: 2020-07-06 13:55+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+0000\n"
 "PO-Revision-Date: 2020-07-07 08:21+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,30 +15,57 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Ed, man! !man ed- GNU Project - Free Software Foundation (FSF)"
 msgstr ""
 "Ed, man! !man ed - Проект GNU - Фонд свободного 
программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ""
+"#ed-text p { display:inline-block; vertical-align: top; margin: 1em 1em 0; 
}\n"
+"@media (max-width: 40em) { #ed-text p { width: 11em; max-width:15em; }} \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&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Documentation\">Documentation</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Ed, man! !man ed"
 msgstr "Ed, man! !man ed"
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: patl@athena.mit.edu (Patrick J. LoPresti)\n"
-"Subject: The True Path (long)\n"
-"Date: 11 Jul 91 03:17:31 GMT\n"
-"Newsgroups: alt.religion.emacs,alt.slack\n"
-msgstr ""
-"От кого: patl@athena.mit.edu (Патрик Дж. ЛоПрести)\n"
-"Тема: Истинный путь (долгий)\n"
-"Дата: 11 Jul 91 03:17:31 GMT\n"
-"Группы новостей: alt.religion.emacs,alt.slack\n"
+#. type: Content of: <div><p>
+msgid "From: Patrick J. LoPresti"
+msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "Subject: The True Path (long)"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: 11 Jul 91 03:17:31 GMT"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "When I log into my Xenix system with my 110 baud teletype, both vi <b>and</"
 "b> Emacs are just too damn slow.  They print useless messages like, &lsquo;C-"
@@ -51,11 +78,11 @@
 "чтения&rdquo;. Так что я пользуюсь 
редактором, который не разбрасывается "
 "моим ЦЕННЫМ временем."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Ed, man!&nbsp;&nbsp;!man ed"
 msgstr "Ed, man!&nbsp;&nbsp;!man ed"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "ED(1)               Unix Programmer's Manual                ED(1)\n"
@@ -78,11 +105,11 @@
 "ОПИСАНИЕ\n"
 "     Ed - стандартный текстовый редактор.\n"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "---"
 msgstr "---"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Computer Scientists love ed, not just because it comes first alphabetically, "
 "but because it's the standard.  Everyone else loves ed because it's ED!"
@@ -91,15 +118,15 @@
 "алфавиту, но потому что он стандартный. 
Все другие без ума от него, потому "
 "что это ED!"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "&ldquo;Ed is the standard text editor.&rdquo;"
 msgstr "&ldquo;Ed - стандартный текстовый 
редактор.&rdquo;"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "And ed doesn't waste space on my Timex Sinclair.  Just look:"
 msgstr "И ed не разбазаривает место на моем Timex 
Sinclair. Вот смотрите:"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "-rwxr-xr-x  1 root          24 Oct 29  1929 /bin/ed\n"
@@ -110,7 +137,7 @@
 "-rwxr-xr-t  4 root     1310720 Jan  1  1970 /usr/ucb/vi\n"
 "-rwxr-xr-x  1 root  5.89824e37 Oct 22  1990 /usr/bin/emacs\n"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Of course, on the system <b>I</b> administrate, <code>vi</code> is symlinked "
 "to <code>ed</code>.  Emacs has been replaced by a shell script which 1) "
@@ -122,11 +149,11 @@
 "интерпретатора, который 1) генерирует в 
syslog сообщение уровня LOG_EMERG; "
 "2) снижает дисковую квоту пользователя на 
100К и 3) ЗАПУСКАЕТ ED!!!!!!"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Let's look at a typical novice's session with the mighty ed:"
 msgstr "Взглянем на типичный сеанс работы 
новичка с могучим ed:"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "golem$ ed\n"
@@ -177,7 +204,7 @@
 "^D\n"
 "?\n"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Note the consistent user interface and error reportage.  Ed is generous "
 "enough to flag errors, yet prudent enough not to overwhelm the novice with "
@@ -187,13 +214,13 @@
 "об ошибках. Ed достаточно великодушен, 
чтобы отмечать ошибки, и вместе с тем "
 "достаточно благоразумен, чтобы не 
ошеломлять новичка многословием."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Ed, the greatest WYGIWYG editor of all."
 msgstr ""
 "Ed, величайший из редакторов парадигмы 
&ldquo;что ты получаешь, то и "
 "получаешь&rdquo;."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "ED IS THE TRUE PATH TO NIRVANA! ED HAS BEEN THE CHOICE OF EDUCATED AND "
 "IGNORANT ALIKE FOR CENTURIES! ED WILL NOT CORRUPT YOUR PRECIOUS BODILY "
@@ -205,7 +232,7 @@
 "СТАНДАРТНЫЙ ТЕКСТОВЫЙ РЕДАКТОР! ОТ ED 
ЗАЖИГАЕТСЯ СОЛНЫШКО, ПОЮТ ПТИЧКИ И "
 "ЗЕЛЕНЕЕТ ТРАВКА!!"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I use an editor, I don't want eight extra KILOBYTES of worthless help "
 "screens and cursor positioning code! I just want an EDitor!! Not a &ldquo;"
@@ -217,11 +244,11 @@
 "Не &ldquo;viдактор&rdquo;. Не &ldquo;emacsактор&rdquo;. 
Таких и СЛОВ-то "
 "нет!!! ED! ED! ED - СТАНДАРТ!!!"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "TEXT EDITOR."
 msgstr "ТЕКСТОВЫЙ РЕДАКТОР."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "When IBM, in its ever-present omnipotence, needed to base their &ldquo;"
 "edlin&rdquo; on a Unix standard, did they mimic vi? No.  Emacs? Surely you "
@@ -231,7 +258,7 @@
 "своем &ldquo;edlin&rdquo; на стандарт Unix, они 
подражали vi? Нет. Emacs? "
 "Шуточки! Они выбрали самый кармический из 
редакторов. Стандарт."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Ed is for those who can <b>remember</b> what they are working on.  If you "
 "are an idiot, you should use Emacs.  If you are an Emacs, you should not be "
@@ -245,72 +272,93 @@
 "РЕДАКТОРЫ НИСПОСЛАЛ НАМ ED ДЛЯ ИСКУШЕНИЯ 
НЕВЕРНЫХ. НЕ ПОДДАВАЙТЕСЬ!!! "
 "ГОВОРИТ НАМ МОГУЧИЙ ED!!!"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "?"
 msgstr "?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+msgid "<a href=\"/fun/jokes/ed-msg.txt\">Plain text version</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+# | [-This joke is also available in <a href=\"/fun/jokes/ed-msg.txt\">plain
+# | text</a>, plus an-]<a href=\"/fun/jokes/ed.hup\">Intel &ldquo;press
+# | release&rdquo;</a> [-edited with <code>ed</code>.-]
+# | {+edited&nbsp;with&nbsp;<code>ed</code>+}
+#, fuzzy
+#| msgid ""
+#| "This joke is also available in <a href=\"/fun/jokes/ed-msg.txt\">plain "
+#| "text</a>, plus an <a href=\"/fun/jokes/ed.hup\">Intel &ldquo;press "
+#| "release&rdquo;</a> edited with <code>ed</code>."
 msgid ""
-"This joke is also available in <a href=\"/fun/jokes/ed-msg.txt\">plain text</"
-"a>, plus an <a href=\"/fun/jokes/ed.hup\">Intel &ldquo;press release&rdquo;</"
-"a> edited with <code>ed</code>."
+"<a href=\"/fun/jokes/ed.hup\">Intel &ldquo;press release&rdquo;</a> "
+"edited&nbsp;with&nbsp;<code>ed</code>"
 msgstr ""
 "Оригинал этой шутки есть в виде <a 
href=\"/fun/jokes/ed-msg.txt\">простого "
 "текста</a>, а еще есть <a 
href=\"/fun/jokes/ed.hup\">Коммюнике Intel</a>, "
 "отредактированное с помощью <code>ed</code>."
 
-#. 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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -334,3 +382,23 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "From: patl@athena.mit.edu (Patrick J. LoPresti)\n"
+#~ "Subject: The True Path (long)\n"
+#~ "Date: 11 Jul 91 03:17:31 GMT\n"
+#~ "Newsgroups: alt.religion.emacs,alt.slack\n"
+#~ msgstr ""
+#~ "От кого: patl@athena.mit.edu (Патрик Дж. ЛоПрести)\n"
+#~ "Тема: Истинный путь (долгий)\n"
+#~ "Дата: 11 Jul 91 03:17:31 GMT\n"
+#~ "Группы новостей: alt.religion.emacs,alt.slack\n"
+
+#~ 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/freesoftware.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/freesoftware.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/freesoftware.pot       7 Jul 2015 05:57:58 -0000       1.9
+++ fun/jokes/po/freesoftware.pot       15 Jul 2021 16:02:01 -0000      1.10
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/freesoftware.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/freesoftware.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: freesoftware.html\n"
-"POT-Creation-Date: 2015-07-07 05:55+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,76 +17,93 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Free Software - GNU Project - Free Software Foundation"
+msgid "Tribute to Free Software - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Free Software"
+#. 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: Sun, 31 Aug 2003 23:45:42 -0500\n"
-"From: \"Harley D. Eades III\"\n"
-"To: rms@gnu.org\n"
-"Subject: Tribute to freedom.\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#TheFourthEstate\">The Fourth Estate</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Tribute to Free Software"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "From: &ldquo;Harley D. Eades III&rdquo;"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "To: rms@gnu.org"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Tribute to freedom."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Sun, 31 Aug 2003 23:45:42 -0500"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "Hello,"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "One late rainy night I had an idea.  There is a hill on IL route 29 in "
-"Peoria IL, that people climb and write a small message across this hill for "
-"everyone to view from a far.  What would be better than spreading my two "
-"most favorite words across this hill.  So we set out with a little over 200 "
-"garbage bags and nearly 400 nails.  12:30am and rainy so you can figure that "
-"a hill of that size is going to be slippery (lol) nearly falling down hill "
-"with every step we start building each letter.  At around 2:30am we have "
-"finished and now the sun will rise over a hill which spreads the words Free "
-"Software to every person that passes by.  This is by far a vary small "
-"non-complex hack but I beleve it is a hack in it self.  This is a tribute to "
-"Free Software [and the GNU Project]."
+"Peoria IL, that people climb and write a small message across for everyone "
+"to view from afar.  What would be better than spreading my two most favorite "
+"words across this hill? So we set out with a little over 200 garbage bags "
+"and nearly 400 nails.  12:30am and rainy so you can figure that a hill of "
+"that size is going to be slippery (lol). Nearly falling downhill with every "
+"step, we start building each letter.  At around 2:30am we have finished, and "
+"now the sun will rise over a hill which spreads the words Free Software to "
+"every person that passes by.  This is by far a very small non-complex hack "
+"but I believe it is a hack in itself.  This is a tribute to Free Software "
+"[and the GNU Project]."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Happy Hacking"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
+msgid "&mdash;"
+msgstr ""
+
+#. type: Content of: <div><address>
 msgid "Harley D. Eades III"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "FSF Associate Member"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "Hacker"
 msgstr ""
 
-#. type: Attribute 'alt' of: <img>
-msgid "Image of Free Software written in large white letters on a mountain 
side"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Attribute 'alt' of: <div><div><img>
+msgid ""
+"&nbsp;[Photo: 'Free Software', written in large white letters on a mountain "
+"side]&nbsp;"
 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."
-msgstr ""
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
@@ -114,7 +131,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,7 +139,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/fsf-in-german.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/fsf-in-german.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/fsf-in-german.pot      4 Jun 2019 06:59:50 -0000       1.8
+++ fun/jokes/po/fsf-in-german.pot      15 Jul 2021 16:02:01 -0000      1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fsf-in-german.html\n"
-"POT-Creation-Date: 2019-06-04 06:56+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,54 +17,63 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "FSF in German - GNU Project - Free Software Foundation (FSF)"
+msgid "FSF in German - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "FSF in German"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"Date: Fri, 7 May 93 21:30:47 PDT\n"
-"From: phr@america.telebit.com (Paul Rubin)\n"
-"To: rms@ai.mit.edu\n"
-"Subject: FSF\n"
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div>
 msgid ""
-"Did you know that FSF in Germany stands for &ldquo;Fisch sucht "
-"Fahrrad&rdquo;\"? Translation: fish seeks bicycle.  An FSF-party is a "
-"singles gathering, I think."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Dictionary\">Dictionary&nbsp;&amp;&nbsp;word&nbsp;play</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "I'm not sure whether the expression is widely used."
+#. type: Content of: <div><h2>
+msgid "FSF in German"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/fsf-in-german.txt\"> "
-"plain text</a>."
+#. type: Content of: <div><p>
+msgid "From: Paul Rubin"
 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 "To: rms@ai.mit.edu"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "Subject: FSF"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Fri, 7 May 93 21:30:47 PDT"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <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."
+"Did you know that FSF in Germany stands for &ldquo;<i>Fisch sucht "
+"Fahrrad</i>&rdquo;? Translation: fish seeks bicycle.  An FSF-party is a "
+"singles gathering, I think."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+msgid "I'm not sure whether the expression is widely used."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/fsf-in-german.txt\">Original email</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "Disclaimer"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
@@ -73,24 +82,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/fsf-in-german.uk.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/fsf-in-german.uk.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/fsf-in-german.uk.po    31 May 2021 20:31:27 -0000      1.7
+++ fun/jokes/po/fsf-in-german.uk.po    15 Jul 2021 16:02:01 -0000      1.8
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fsf-in-german.html\n"
-"POT-Creation-Date: 2019-06-04 06:56+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+0000\n"
 "PO-Revision-Date: 2014-03-07 08:28+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <www-uk-translations@gnu.org>\n"
@@ -16,72 +16,96 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 "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"
 
 #. type: Content of: <title>
-msgid "FSF in German - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid "FSF in German - GNU Project - Free Software Foundation (FSF)"
+msgid "FSF in German - GNU Project - Free Software Foundation"
 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>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Dictionary\">Dictionary&nbsp;&amp;&nbsp;word&nbsp;play</"
+"a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/education.html\">Освіта</a>&nbsp;/ <a 
href="
+"\"/education/edu-resources.html\">Ресурси</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "FSF in German"
 msgstr "ФВПЗ німецькою"
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"Date: Fri, 7 May 93 21:30:47 PDT\n"
-"From: phr@america.telebit.com (Paul Rubin)\n"
-"To: rms@ai.mit.edu\n"
-"Subject: FSF\n"
-msgstr ""
-"Дата: П'ят, 7 травня 93 21:30:47 PDT\n"
-"Від: phr@america.telebit.com (Поль Робін)\n"
-"Кому: rms@ai.mit.edu\n"
-"Тема: ФВПЗ\n"
+#. type: Content of: <div><p>
+msgid "From: Paul Rubin"
+msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid ""
-"Did you know that FSF in Germany stands for &ldquo;Fisch sucht Fahrrad&rdquo;"
-"\"? Translation: fish seeks bicycle.  An FSF-party is a singles gathering, I "
-"think."
+#. type: Content of: <div><p>
+msgid "To: rms@ai.mit.edu"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: FSF"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Fri, 7 May 93 21:30:47 PDT"
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Did you know that FSF in Germany stands for &ldquo;Fisch sucht "
+#| "Fahrrad&rdquo;\"? Translation: fish seeks bicycle.  An FSF-party is a "
+#| "singles gathering, I think."
+msgid ""
+"Did you know that FSF in Germany stands for &ldquo;<i>Fisch sucht Fahrrad</"
+"i>&rdquo;? Translation: fish seeks bicycle.  An FSF-party is a singles "
+"gathering, I think."
 msgstr ""
 "Ви знаєте, що ФВПЗ (FSF) німецькою звучить 
так &ldquo;Fisch sucht "
 "Fahrrad&rdquo;\"? Translation: риба шукає велосипед.  
Мабуть потрібна окрема "
 "збірка розшифровок ФВПЗ (FSF)."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "I'm not sure whether the expression is widely used."
 msgstr "Щоправда я не впевнений, чи цей вислів 
загальновживаний."
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/fsf-in-german.txt\"> "
-"plain text</a>."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This joke is also available in <a href=\"/fun/jokes/fsf-in-german.txt\"> "
+#| "plain text</a>."
+msgid "<a href=\"/fun/jokes/fsf-in-german.txt\">Original email</a>"
 msgstr ""
 "Цей жарт також доступний у <a 
href=\"/fun/jokes/fsf-in-german.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: <h4>
+#. 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."
-msgstr ""
-"Жарт на цій сторінці отриманий з <a 
href=\"http://lists.gnu.org/\";>архівів "
-"електронної пошти ФВПЗ</a> проекту GNU."
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 "Фонд вільного програмного забезпечення 
не заявляє авторські права на цей "
@@ -92,29 +116,47 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 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 ""
-"Будь ласка, надсилайте запити ФВПЗ &amp; 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."
+#. type: Content of: <div><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 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 ""
+"Будь-ласка надсилайте до FSF &amp; запити 
стосовно GNU на адресу <a href="
+"\"mailto:gnu@gnu.org\";><em>gnu@gnu.org</em></a>.  Також існують 
<a href=\"/"
+"contact/\">інші шляхи для зв&#146;язку із</a> FSF.  <br 
/>Будь-ласка "
+"надсилайте неробочі посилання та інші 
виправлення чи побажання на адресу <a "
+"href=\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></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>
+#, 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 ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -134,3 +176,56 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Оновлено:"
+
+#~ msgid ""
+#~ "Date: Fri, 7 May 93 21:30:47 PDT\n"
+#~ "From: phr@america.telebit.com (Paul Rubin)\n"
+#~ "To: rms@ai.mit.edu\n"
+#~ "Subject: FSF\n"
+#~ msgstr ""
+#~ "Дата: П'ят, 7 травня 93 21:30:47 PDT\n"
+#~ "Від: phr@america.telebit.com (Поль Робін)\n"
+#~ "Кому: rms@ai.mit.edu\n"
+#~ "Тема: ФВПЗ\n"
+
+#~ 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=\"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>."
+
+#~ 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/gnuemacs.acro.exp.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gnuemacs.acro.exp.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/gnuemacs.acro.exp.pot  6 Jul 2020 13:59:55 -0000       1.8
+++ fun/jokes/po/gnuemacs.acro.exp.pot  15 Jul 2021 16:02:01 -0000      1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnuemacs.acro.exp.html\n"
-"POT-Creation-Date: 2020-07-06 13:55+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,542 +17,633 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "GNU Emacs acronym expansions"
+msgid "GNU Emacs acronym expansions - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Some funny acronym expansions of Emacs"
+#. 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 ""
-"From: The Unknown User &lt;anonymous@nowhere.uucp&gt;\n"
-"Subject: EMACS -- What does it mean?\n"
-"To: mit-prep!info-gnu-emacs@TOPAZ.RUTGERS.EDU\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Documentation\">Documentation</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Some funny acronym expansions of Emacs"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "From: The Unknown User &lt;anonymous@nowhere.uucp&gt;"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "Subject: EMACS -- What does it mean?"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: mit-prep!info-gnu-emacs@TOPAZ.RUTGERS.EDU"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "EMACS belongs in <code>&lt;sys/errno.h&gt;</code>: Editor too big!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Escape-Meta-Alt-Control-Shift"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: harvard!topaz!BLUE!BRAIL@mit-eddie\n"
-"Date: 9 Sep 85 17:25:27 EDT\n"
-"Subject: EMACS -- What does it mean?\n"
-"To: mit-prep!info-gnu-emacs@TOPAZ.RUTGERS.EDU\n"
+#. type: Content of: <div><p>
+msgid "From: harvard!topaz!BLUE!BRAIL@mit-eddie"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "Date: 9 Sep 85 17:25:27 EDT"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "EMACS may stand for &ldquo;Editing MACroS,&rdquo; but some friends of mine "
 "suggested some more creative definitions.  Here they are.  Anyone have any "
 "additions?"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Eight Megabytes And Constantly Swapping"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Even a Master of Arts Comes Simpler"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs Manuals Are Cryptic and Surreal"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Energetic Merchants Always Cultivate Sales"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Each Manual's Audience is Completely Stupified"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs Means A Crappy Screen"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Eventually Munches All Computer Storage"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Even My Aunt Crashes the System"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Eradication of Memory Accomplished with Complete Simplicity"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Elsewhere Maybe Alternative Civilizations Survive"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Egregious Managers Actively Court Stallman"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Esoteric Malleability Always Considered Silly"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs Manuals Always Cause Senility"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Easily Maintained with the Assistance of Chemical Solutions"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "EMACS MACRO ACTED CREDO SODOM"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Edwardian Manifestation of All Colonial Sins"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Generally Not Used"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Except by Middle Aged Computer Scientists"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Extended Macros Are Considered Superfluous"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Every Mode Accelerates Creation of Software"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Elsewhere Maybe All Commands are Simple"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs May Allow Customized Screwups"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Excellent Manuals Are Clearly Suppressed"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emetic Macros Assault Core and Segmentation"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Embarrassed Manual-Writer Accused of Communist Subversion"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Extensibility and Modifiability Aggravate Confirmed Simpletons"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs May Annihilate Command Structures"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Easily Mangles, Aborts, Crashes and Stupifies"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Extraneous Macros And Commands Stink"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Exceptionally Mediocre Algorithm for Computer Scientists"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "EMACS Makes no Allowances Considering its Stiff price"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Equine Mammals Are Considerably Smaller"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Embarrassingly Mundane Advertising Cuts Sales"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Every Moron Assumes CCA is Superior"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Exceptionally Mediocre Autocratic Control System"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "EMACS May Alienate Clients and Supporters"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Excavating Mayan Architecture Comes Simpler"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Erasing Minds Allows Complete Submission"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Every Male Adolescent Craves Sex"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Elephantine Memory Absolutely Considered Sine que non"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs Makers Are Crazy Sickos"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Eenie-Meenie-Miney-Mo- Macros Are Completely Slow"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Experience the Mildest Ad Campaign ever Seen"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs Makefiles Annihilate C- Shells"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Epileptic MLisp Aggravates Compiler Seizures"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Eleven thousand Monkeys Asynchronously Crank out these Slogans"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: ihnss!warren@mit-eddie (Warren Montgomery)\n"
-"Newsgroups: net.emacs\n"
-"Subject: Re: EMACS -- What does it mean?\n"
-"Date: Tue, 10-Sep-85 09:14:24 EDT\n"
-"Organization: AT&amp;T Bell Labs, Naperville, IL\n"
-"Apparently-To: emacs-netnews-distribution@mit-prep\n"
+#. type: Content of: <div><p>
+msgid "From: ihnss!warren@mit-eddie (Warren Montgomery)"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Newsgroups: net.emacs"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Re: EMACS -- What does it mean?"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Tue, 10-Sep-85 09:14:24 EDT"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Organization: AT&amp;T Bell Labs, Naperville, IL"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Apparently-To: emacs-netnews-distribution@mit-prep"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Someone at a luncheon suggested it meant:"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Evenings,"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Mornings,"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "And a"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Couple of"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Saturdays"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "(In reference to the odd hours that went into the creation of my "
 "implementation)."
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div><p>
+msgid "Warren Montgomery"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "ihnss!warren"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "IH ((312)-979) x2494"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Wed, 18 Sep 85 10:11:04 edt"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
-"Warren Montgomery\n"
-"ihnss!warren\n"
-"IH ((312)-979) x2494\n"
-"Date: Wed, 18 Sep 85 10:11:04 edt\n"
 "From: inmet!tower@inmet.inmet (Leonard H. Tower Jr.) "
-"&lt;inmet!tower@cca-unix&gt;\n"
-"Subject: Re: EMACS -- What does it mean?\n"
-"To: tower@MIT-PREP.ARPA\n"
-"Received: by inmet.uucp (4.12/inmet) id AA02199; Wed, 18 Sep 85 09:10:17 "
-"edt\n"
-"Date: Wed, 18 Sep 85 09:10:17 edt\n"
-"Message-Id: &lt;8509181310.AA02199@inmet.uucp&gt;\n"
-"Uucp-Paths: {bellcore,ima,ihnp4}!inmet!tower\n"
-"Arpa-Path: ima!inmet!tower@CCA-Unix.ARPA\n"
-"Organization: \tIntermetrics, Inc., Cambridge, MA, USA\n"
-"Home: \t36 Porter Street, Somerville, MA  02143, USA   +1 (617) 623-7739\n"
+"&lt;inmet!tower@cca-unix&gt;"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><p>
+msgid "To: tower@MIT-PREP.ARPA"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Received: by inmet.uucp (4.12/inmet) id AA02199; Wed, 18 Sep 85 
09:10:17 edt"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Wed, 18 Sep 85 09:10:17 edt"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Message-Id: &lt;8509181310.AA02199@inmet.uucp&gt;"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Uucp-Paths: {bellcore,ima,ihnp4}!inmet!tower"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Arpa-Path: ima!inmet!tower@CCA-Unix.ARPA"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Organization: \tIntermetrics, Inc., Cambridge, MA, USA"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Home: \t36 Porter Street, Somerville, MA 02143, USA +1 (617) 623-7739"
+msgstr ""
+
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid "/* Written  6:48 pm  Sep 14, 1985 by gml@ssc-vax in inmet:net.emacs */"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid "/* ---------- \"Re: EMACS -- What does it mean?\" ---------- */"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Pleeeeeeeze!!! Nice try on the meaning of EMACS.  I believe the correct "
 "acronym is:"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Emacs"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Makes"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "All"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Computing"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Simple"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Thank you, and Good Night"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid "/* End of text from inmet:net.emacs */"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: ho95e!wcs@mit-eddie (Bill.Stewart.4K435.x0705)\n"
-"Newsgroups: net.emacs\n"
-"Subject: Re: EMACS -- What does it mean?\n"
-"Date: Thu, 26-Sep-85 21:43:54 EDT\n"
-"Organization: AT&amp;T Bell Labs, Holmdel NJ\n"
-"Apparently-To: emacs-netnews-distribution@mit-prep\n"
+#. type: Content of: <div><p>
+msgid "From: ho95e!wcs@mit-eddie (Bill.Stewart.4K435.x0705)"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div><p>
+msgid "Date: Thu, 26-Sep-85 21:43:54 EDT"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Organization: AT&amp;T Bell Labs, Holmdel NJ"
+msgstr ""
+
+#. type: Content of: <div><blockquote><blockquote><p>
+msgid "very interesting, but what does GNU stand for ?"
+msgstr ""
+
+#. type: Content of: <div><blockquote><p>
 msgid ""
-"> > very interesting, but what does GNU stand for ?\n"
-"> GNU = Gnu's Not Unix. There is also MINCE, for Mince Is Not a Complete "
-"Emacs.\n"
-"> More recursive acronyms, anyone?\n"
+"GNU = Gnu's Not Unix. There is also MINCE, for Mince Is Not a Complete "
+"Emacs.  More recursive acronyms, anyone?"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have also seen FINE Is Not Emacs, but the one that has character "
 "is THief Isn't Even Fine."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "--"
+#. type: Content of: <div><address>
+msgid "&mdash;"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid ""
 "## Bill Stewart, AT&amp;T Bell Labs, Holmdel NJ 1-201-949-0705 "
 "ihnp4!ho95c!wcs"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div><p>
 msgid ""
 "Path: "
-"mit-eddie!think!harvard!bbnccv!bbncca!linus!decvax!mcnc!ncsu!uvacs!edison!ta2\n"
-"From: edison!ta2@mit-eddie (tom allebrandi)\n"
-"Newsgroups: net.emacs\n"
-"Subject: Re: Re: EMACS -- What does it mean?\n"
-"Date: Sun, 29-Sep-85 18:11:55 EDT\n"
-"Organization: General Electric's Mountain Resort\n"
-"Apparently-To: emacs-netnews-distribution@mit-prep\n"
+"mit-eddie!think!harvard!bbnccv!bbncca!linus!decvax!mcnc!ncsu!uvacs!edison!ta2"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div><p>
+msgid "From: edison!ta2@mit-eddie (tom allebrandi)"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Re: Re: EMACS -- What does it mean?"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Sun, 29-Sep-85 18:11:55 EDT"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Organization: General Electric's Mountain Resort"
+msgstr ""
+
+#. type: Content of: <div><blockquote><p>
 msgid ""
-"> GNU = Gnu's Not Unix. There is also MINCE, for Mince Is Not a Complete "
-"Emacs.\n"
-">\n"
-"> More recursive acronyms, anyone?\n"
+"GNU = Gnu's Not Unix. There is also MINCE, for Mince Is Not a Complete "
+"Emacs."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
+msgid "More recursive acronyms, anyone?"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "For the DEC-system-10/20: FINE - Fine Is Not Emacs&hellip;"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "tom allebrandi 2, general electric aco, charlottesville, va"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "{decvax,duke}!mcnc!ncsu!uvacs!edison!ta2"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "box 8106, charlottesville, va, 22906"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "(804) 978-5566"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: friedman@gnu.ai.mit.edu (Noah Friedman)\n"
-"Sender: friedman@gnu.ai.mit.edu\n"
-"To: jimb@gnu.ai.mit.edu, rms@gnu.ai.mit.edu\n"
-"Subject: etc/emacs.names\n"
-"Date: Fri, 9 Oct 92 00:54:57 edt\n"
+#. type: Content of: <div><p>
+msgid "From: friedman@gnu.ai.mit.edu (Noah Friedman)"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Sender: friedman@gnu.ai.mit.edu"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: jimb@gnu.ai.mit.edu, rms@gnu.ai.mit.edu"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: etc/emacs.names"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "Date: Fri, 9 Oct 92 00:54:57 edt"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "The following should be added:"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "A"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Computer"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Slow"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: S_TITZ@iravcl.ira.uka.de (Olaf Titz)\n"
-"Newsgroups: alt.religion.emacs\n"
-"Subject: Re: what emacs stands for\n"
-"Date: 12 Oct 92 19:29:32 GMT\n"
+#. type: Content of: <div><p>
+msgid "From: S_TITZ@iravcl.ira.uka.de (Olaf Titz)"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><p>
+msgid "Newsgroups: alt.religion.emacs"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Re: what emacs stands for"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: 12 Oct 92 19:29:32 GMT"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "Emacs Masquerades As Comfortable Shell"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Ever Made A Control-key Setup?"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Emacs: My Alternative Computer Story"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Emacs Made Almost Completely Screwed (by extensive use of <code>M-x "
 "global-unset-key</code>)"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Emacs Macht Alle Computer Schoen (Deutsch: Emacs makes all computers "
 "beautiful)"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Each Mail A Continued Surprise"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Every Mode Acknowledges Customized Strokes (keystrokes, of course :-)"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Eating Memory And Cycle-Sucking"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Everyday Material Almost Compiled Successfully"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "now enough bashing for today :-)"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: elvis@gnu.ai.mit.edu\n"
-"To: emacs-19-bugs@gnu.ai.mit.edu\n"
-"Subject: missing from etc/emacs.names\n"
-"Date: Thu, 20 May 93 02:21:27 edt\n"
+#. type: Content of: <div><p>
+msgid "From: elvis@gnu.ai.mit.edu"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: emacs-19-bugs@gnu.ai.mit.edu"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: missing from etc/emacs.names"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><p>
+msgid "Date: Thu, 20 May 93 02:21:27 edt"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "Elvis"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Masterminds"
 msgstr ""
 
-#. type: Content of: <blockquote><div><p>
+#. type: Content of: <div><div><p>
 msgid "Software"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Just so you boys know the score."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Thank you very Much,"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "The King"
 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.
@@ -560,24 +651,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/gospel.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gospel.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/gospel.pot     16 Sep 2012 05:21:47 -0000      1.7
+++ fun/jokes/po/gospel.pot     15 Jul 2021 16:02:01 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/gospel.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/gospel.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,35 +7,50 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gospel.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-15 15:56+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 "Gospel - GNU Project - Free Software Foundation (FSF)"
+msgid "Gospel - 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#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid ""
 "Rules, Sins, Virtues, Gods and more of The Church of EMACS according to The "
 "Gospel of Prophet Antony"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Hierarchy of the Church"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "GODS &mdash; Creates Free ideas, software and hardware from emptiness and "
 "likes to be flattered through prayers."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "DEMIGODS &mdash; Capable of proving that NP problems and P problems are the "
 "same (NP=P), writes free software for to prove it and tries to alleviate the "
@@ -44,135 +59,127 @@
 "GODS."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "SAINTS &mdash; Writes Free software using Free software tools."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "SEMI SAINTS &mdash; Use lots of Free software and believes in the church of "
 "EMACS but signed NDAs or agreed to proprietary software licenses."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "PROPHETS &mdash; selected by ALMIGHTY (One of the GODS) to reveal his "
 "thoughts about humanity."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "LAITY &mdash; does not care about NDAs or proprietary software licenses but "
 "runs after BUZZWORDS to show that he is capable of grasping BUZZWORDS."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Sinners &mdash; Insist on using devil's software, believing that it is of "
 "superior quality."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Devils &mdash; Creating NDAs and proprietory software licenses to entangle "
 "humanity in their net"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Examples of Devils"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Evil Empire: Microsoft"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Lucifer: Bill Gates"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Evil Countries: SUN, HP, ORACLE, etc."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Other major Devil leaders: Scott Mcnalley, Larry Ellison, etc."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "CONFESSION AND REPENTANCE"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please take some time to think about yourself.  You can repent and confess "
 "at any time by visiting our <a href=\"http://donate.fsf.org\";> CONFESSION "
 "CENTER</a> which is open 7 days a week, 24 hours a day."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Rules for repentance (This is the only important principle of THE CHURCH OF "
 "EMACS):"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$10 for each invocation of a proprietory licensed software."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$1000 for each NDA you signed."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$10000 for each NDA you participated in creating."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$10000000 for each NDA you wrote."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$100 for each proprietary software license you agreed to."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$1000 for each proprietary software license you participated in 
creating."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "$10000 for each proprietary software license you are responsible for "
 "writing."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "All your sins will be forgiven if you develop a major new Free software "
 "package."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Warning: Taking THE CHURCH OF EMACS seriously is hazardous to your health; "
 "especially MENTAL HEALTH."
 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 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.
@@ -180,24 +187,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/gospel.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/gospel.ru.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fun/jokes/po/gospel.ru.po   30 Jan 2020 17:01:35 -0000      1.1
+++ fun/jokes/po/gospel.ru.po   15 Jul 2021 16:02:01 -0000      1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gospel.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,12 +15,36 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
-msgid "Gospel - GNU Project - Free Software Foundation (FSF)"
+# | Gospel - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid "Gospel - GNU Project - Free Software Foundation (FSF)"
+msgid "Gospel - 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#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid ""
 "Rules, Sins, Virtues, Gods and more of The Church of EMACS according to The "
 "Gospel of Prophet Antony"
@@ -28,11 +52,11 @@
 "Правила, грехи, добродетели, боги и так 
далее Церкви EMACS по Евангелию "
 "пророка Антония"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Hierarchy of the Church"
 msgstr "Иерархия церкви"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "GODS &mdash; Creates Free ideas, software and hardware from emptiness and "
 "likes to be flattered through prayers."
@@ -40,7 +64,7 @@
 "БОЖЕСТВА&nbsp;&mdash; создают свободные идеи, 
программы и аппаратуру из "
 "пустоты и любят, когда им льстят в молитвах
."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "DEMIGODS &mdash; Capable of proving that NP problems and P problems are the "
 "same (NP=P), writes free software for to prove it and tries to alleviate the "
@@ -54,13 +78,13 @@
 "Тем не менее настаивают на лести 
БОЖЕСТВАМ в молитвах и защищают устрашение 
"
 "БОЖЕСТВАМИ."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "SAINTS &mdash; Writes Free software using Free software tools."
 msgstr ""
 "СВЯТЫЕ&nbsp;&mdash; пишут свободные программы с 
помощью свободных "
 "программных средств."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "SEMI SAINTS &mdash; Use lots of Free software and believes in the church of "
 "EMACS but signed NDAs or agreed to proprietary software licenses."
@@ -69,7 +93,7 @@
 "Церковь EMACS, но подписали договоры о 
неразглашении либо согласились с "
 "лицензиями несвободных программ."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "PROPHETS &mdash; selected by ALMIGHTY (One of the GODS) to reveal his "
 "thoughts about humanity."
@@ -77,7 +101,7 @@
 "ПРОРОКИ&nbsp;&mdash; избранные одним из БОЖЕСТВ 
для раскрытия его мыслей о "
 "человечестве."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "LAITY &mdash; does not care about NDAs or proprietary software licenses but "
 "runs after BUZZWORDS to show that he is capable of grasping BUZZWORDS."
@@ -86,7 +110,7 @@
 "несвободных программ, но бегут на ЗВОНКИЕ 
ФРАЗЫ, чтобы показать, что "
 "способны их ухватить."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Sinners &mdash; Insist on using devil's software, believing that it is of "
 "superior quality."
@@ -94,7 +118,7 @@
 "Грешники&nbsp;&mdash; настаивают на применении 
дьявольских программ, веруя в "
 "превосходство их качеств."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "Devils &mdash; Creating NDAs and proprietory software licenses to entangle "
 "humanity in their net"
@@ -102,31 +126,31 @@
 "Дьяволы&nbsp;&mdash; Создают договоры о 
неразглашении и лицензии несвободных "
 "программ, чтобы уловить человечество в 
свои сети."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Examples of Devils"
 msgstr "Примеры дьяволов"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Evil Empire: Microsoft"
 msgstr "Империя зла: Microsoft"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Lucifer: Bill Gates"
 msgstr "Люцифер: Билл Гейтс"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Evil Countries: SUN, HP, ORACLE, etc."
 msgstr "Страны зла: SUN, HP, ORACLE и проч."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Other major Devil leaders: Scott Mcnalley, Larry Ellison, etc."
 msgstr "Другие видные дьявольские лидеры: 
Скот Макнелли, Лерри Эллисон и проч."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "CONFESSION AND REPENTANCE"
 msgstr "ПРИЧАСТИЕ И ПОКАЯНИЕ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please take some time to think about yourself.  You can repent and confess "
 "at any time by visiting our <a href=\"http://donate.fsf.org\";> CONFESSION "
@@ -136,50 +160,50 @@
 "любое время, посетив наш <a 
href=\"http://donate.fsf.org\";> ЦЕНТР "
 "ПРИЧАЩЕНИЯ</a>, он открыт 7 дней в неделю, 24 
часа в день."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Rules for repentance (This is the only important principle of THE CHURCH OF "
 "EMACS):"
 msgstr "Правила покаяния (единственный важный 
принцип Церкви EMACS):"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$10 for each invocation of a proprietory licensed software."
 msgstr "100 р. за каждый вызов несвободно 
лицензированных программ."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$1000 for each NDA you signed."
 msgstr "10000 р. за каждый подписанный договор о 
неразглашении."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$10000 for each NDA you participated in creating."
 msgstr ""
 "100000 р. за каждый договор о неразглашении, в 
создании которого вы "
 "принимали участие."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$10000000 for each NDA you wrote."
 msgstr "10000000 р. за каждый договор о 
неразглашении, который вы составили."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid "$100 for each proprietary software license you agreed to."
 msgstr ""
 "1000 р. за каждую лицензию несвободных 
программ, с которой вы согласились."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "$1000 for each proprietary software license you participated in creating."
 msgstr ""
 "10000 р. за каждую лицензию несвободных 
программ, в создании которой вы "
 "принимали участие."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "$10000 for each proprietary software license you are responsible for writing."
 msgstr ""
 "100000 р. за каждую лицензию несвободных 
программ, за составление которой вы "
 "ответственны."
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "All your sins will be forgiven if you develop a major new Free software "
 "package."
@@ -187,7 +211,7 @@
 "Все ваши грехи будут прощены, если вы 
разработаете важный пакет свободных "
 "программ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Warning: Taking THE CHURCH OF EMACS seriously is hazardous to your health; "
 "especially MENTAL HEALTH."
@@ -195,58 +219,67 @@
 "Предупреждение: Принимать Церковь EMACS 
всерьез опасно для вашего здоровья; "
 "в особенности ДУШЕВНОГО ЗДОРОВЬЯ."
 
-#. 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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -270,3 +303,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/hello_world_patent.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/hello_world_patent.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/hello_world_patent.pot 16 Sep 2012 05:21:48 -0000      1.7
+++ fun/jokes/po/hello_world_patent.pot 15 Jul 2021 16:02:01 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/hello_world_patent.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/hello_world_patent.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,36 +7,58 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello_world_patent.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-15 15:56+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 "YAAS Foundation Patent Suit"
+msgid "YAAS Foundation Patent Suit - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "The YAAS Foundation Patent Suit"
+#. 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 ""
-"Date: Wed,  6 Aug 2003 16:46:55 +0200\n"
-"From: Stefan Midjich &lt;stefan@ivan.nu&gt;\n"
-"To: Richard Stallman &lt;rms@stallman.org&gt;\n"
-"Subject: Regarding Hello World"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Philosophy\">Philosophy</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h2>
+msgid "The YAAS Foundation Patent Suit"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "From: Stefan Midjich &lt;stefan@ivan.nu&gt;"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: Richard Stallman &lt;rms@stallman.org&gt;"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Regarding Hello World"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Wed, 6 Aug 2003 16:46:55 +0200"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "Hello Mr.Stallman"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "I am representing the Swedish YAAS foundation and we would like to address "
 "an important issue that came up last week when our tech crew were going over "
@@ -46,7 +68,7 @@
 "found in numerous of your projects source codes."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "We are not unreasonable Mr.Stallman, all we demand is 50 000 in unmarked US "
 "dollars delivered in a brief case to the dumpster behind McDonalds in "
@@ -56,12 +78,16 @@
 "we wish you a good day."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "&mdash;Stefan at YAAS"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><div><h3>
+msgid "Disclaimer"
+msgstr ""
+
+#. 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.
@@ -69,24 +95,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/hello_world_patent.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/hello_world_patent.ru.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/po/hello_world_patent.ru.po       24 Sep 2015 06:35:51 -0000      
1.2
+++ fun/jokes/po/hello_world_patent.ru.po       15 Jul 2021 16:02:01 -0000      
1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello_world_patent.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-15 15:56+0000\n"
 "PO-Revision-Date: 2015-09-22 17:51+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,33 +15,57 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
-msgid "YAAS Foundation Patent Suit"
-msgstr "Патентный иск фонда YAAS"
+msgid "YAAS Foundation Patent Suit - GNU Project - Free Software Foundation"
+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: <h3>
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Philosophy\">Philosophy</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The YAAS Foundation Patent Suit"
 msgstr "Патентный иск фонда YAAS"
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"Date: Wed,  6 Aug 2003 16:46:55 +0200\n"
-"From: Stefan Midjich &lt;stefan@ivan.nu&gt;\n"
-"To: Richard Stallman &lt;rms@stallman.org&gt;\n"
-"Subject: Regarding Hello World"
-msgstr ""
-"Дата: среда, 6 авг. 2003 16:46:55 +0200\n"
-"От кого: Стефан Миджич &lt;stefan@ivan.nu&gt;\n"
-"Кому: Ричард Столмен &lt;rms@stallman.org&gt;\n"
-"Subject: Относительно \"Здравствуй, мир\""
+#. type: Content of: <div><p>
+msgid "From: Stefan Midjich &lt;stefan@ivan.nu&gt;"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: Richard Stallman &lt;rms@stallman.org&gt;"
+msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "Subject: Regarding Hello World"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Wed, 6 Aug 2003 16:46:55 +0200"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "Hello Mr.Stallman"
 msgstr "Здравствуйте, г-н Столмен!"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "I am representing the Swedish YAAS foundation and we would like to address "
 "an important issue that came up last week when our tech crew were going over "
@@ -57,7 +81,7 @@
 "Запатентованная техника \"Здравствуй, 
мир\", применяемая на множестве языков "
 "программирования, была найдена в исходных 
текстах многих Ваших проектов."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "We are not unreasonable Mr.Stallman, all we demand is 50 000 in unmarked US "
 "dollars delivered in a brief case to the dumpster behind McDonalds in "
@@ -74,14 +98,25 @@
 "Столмен, что Вы отнесетесь к этому так же 
серьезно, как и мы, и желаем вам "
 "хорошего дня."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
 msgid "&mdash;Stefan at YAAS"
 msgstr "&mdash;Стефан из YAAS"
 
-#. 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: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Disclaimer"
+msgid "Disclaimer"
+msgstr "Предупреждение"
+
+#. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "The Free Software Foundation claims no copyright on this joke."
+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.
@@ -89,29 +124,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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -131,3 +178,21 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid "YAAS Foundation Patent Suit"
+#~ msgstr "Патентный иск фонда YAAS"
+
+#~ msgid ""
+#~ "Date: Wed,  6 Aug 2003 16:46:55 +0200\n"
+#~ "From: Stefan Midjich &lt;stefan@ivan.nu&gt;\n"
+#~ "To: Richard Stallman &lt;rms@stallman.org&gt;\n"
+#~ "Subject: Regarding Hello World"
+#~ msgstr ""
+#~ "Дата: среда, 6 авг. 2003 16:46:55 +0200\n"
+#~ "От кого: Стефан Миджич &lt;stefan@ivan.nu&gt;\n"
+#~ "Кому: Ричард Столмен &lt;rms@stallman.org&gt;\n"
+#~ "Subject: Относительно \"Здравствуй, мир\""
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."

Index: fun/jokes/po/know.your.sysadmin.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/know.your.sysadmin.pot,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- fun/jokes/po/know.your.sysadmin.pot 6 Jul 2020 13:59:55 -0000       1.11
+++ fun/jokes/po/know.your.sysadmin.pot 15 Jul 2021 16:02:01 -0000      1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: know.your.sysadmin.html\n"
-"POT-Creation-Date: 2020-07-06 13:55+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,92 +17,109 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
+msgid "Know your System Administrator - GNU Project - Free Software Foundation"
+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 ""
-"Know your System Administrator - GNU Project - Free Software Foundation "
-"(FSF)"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Documentation\">Documentation</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Know your System Administrator"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "(A field guide)"
+#. type: Content of: <div><h2>
+msgid "<small>A Field Guide</small>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
+msgid "by Stephan Zielinski"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "There are four major species of Unix sysad:"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"The <b>TECHNICAL THUG</b>.  Usually a systems programmer who has been forced "
-"into system administration; writes scripts in a polyglot of the Bourne "
-"shell, sed, C, awk, perl, and APL."
+"The <b>Technical thug</b> &mdash; Usually a systems programmer who has been "
+"forced into system administration; writes scripts in a polyglot of the "
+"Bourne shell, sed, C, awk, Perl, and APL."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"The <b>ADMINISTRATIVE FASCIST</b>.  Usually a retentive drone (or rarely, a "
-"harridan ex-secretary) who has been forced into system administration."
+"The <b>Administrative fascist</b> &mdash; Usually a retentive drone (or "
+"rarely, a harridan ex-secretary) who has been forced into system "
+"administration."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"The <b>MANIAC</b>.  Usually an aging cracker who discovered that neither the "
-"Mossad nor Cuba are willing to pay a living wage for computer espionage.  "
-"Fell into system administration; occasionally approaches major competitors "
-"with indesp schemes."
+"The <b>Maniac</b> &mdash; Usually an aging cracker who discovered that "
+"neither the Mossad nor Cuba are willing to pay a living wage for computer "
+"espionage.  Fell into system administration; occasionally approaches major "
+"competitors with indesp schemes."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"The <b>IDIOT</b>.  Usually a cretin, or old COBOL programmer selected to be "
-"the system administrator by a committee of cretins, and old COBOL "
+"The <b>Idiot</b> &mdash; Usually a cretin, or old COBOL programmer selected "
+"to be the system administrator by a committee of cretins, and old COBOL "
 "programmers."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "HOW TO IDENTIFY YOUR SYSTEM ADMINISTRATOR"
+#. type: Content of: <div><h3>
+msgid "How to Identify Your System Administrator"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Low disk space"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Low disk space"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Writes a suite of scripts to monitor disk usage, "
-"maintain a database of historic disk usage, predict future disk usage via "
-"least squares regression analysis, identify users who are more than a "
+"<i>Technical thug:</i>&nbsp; Writes a suite of scripts to monitor disk "
+"usage, maintain a database of historic disk usage, predict future disk usage "
+"via least squares regression analysis, identify users who are more than a "
 "standard deviation over the mean, and send mail to the offending parties.  "
 "Places script in cron.  Disk usage does not change, since disk-hogs, by "
 "nature, either ignore script-generated mail, or file it away in triplicate."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Puts disk usage policy in "
+"<i>Administrative fascist:</i>&nbsp; Puts disk usage policy in "
 "<code>motd</code>. Uses disk quotas. Allows no exceptions, thus crippling "
 "development work.  Locks accounts that go over quota."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>MANIAC:</i>"
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Maniac:</i>"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "# cd /home\n"
 "# rm -rf `du -s * | sort -rn | head -1 | awk '{print $2}'`;\n"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>IDIOT:</i>"
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Idiot:</i>"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "# cd /home\n"
@@ -110,187 +127,189 @@
 "compress\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Excessive CPU usage"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Excessive CPU usage"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Writes a suite of scripts to monitor processes, "
+"<i>Technical thug:</i>&nbsp; Writes a suite of scripts to monitor processes, "
 "maintain a database of CPU usage, identify processes more than a standard "
 "deviation over the norm, and renice offending processes.  Places script in "
 "cron.  Ends up renicing the production database into oblivion, bringing "
 "operations to a grinding halt, much to the delight of the xtrek freaks."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Puts CPU usage policy in <code>motd</code>.  "
-"Uses CPU quotas.  Locks accounts that go over quota.  Allows no exceptions, "
-"thus crippling development work, much to the delight of the xtrek freaks."
+"<i>Administrative fascist:</i>&nbsp; Puts CPU usage policy in "
+"<code>motd</code>.  Uses CPU quotas.  Locks accounts that go over quota.  "
+"Allows no exceptions, thus crippling development work, much to the delight "
+"of the xtrek freaks."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# kill -9 `ps -augxww | sort -rn +8 -9  | head -1 | awk '{print $2}'`\n"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# compress -f `ps -augxww | sort -rn +8 -9  | head -1 | awk '{print 
$2}'`\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> New account creation"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: New account creation"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Writes perl script that creates home directory, "
+"<i>Technical thug:</i>&nbsp; Writes Perl script that creates home directory, "
 "copies in incomprehensible default environment, and places entries in "
 "<code>/etc/passwd</code>, <code>/etc/shadow</code>, and "
-"<code>/etc/group</code>.  (By hand, NOT with passmgmt.)  Slaps on setuid "
-"bit; tells a nearby secretary to handle new accounts.  Usually, said "
+"<code>/etc/group</code>.  (By hand, <em>not</em> with passmgmt.)  Slaps on "
+"setuid bit; tells a nearby secretary to handle new accounts.  Usually, said "
 "secretary is still dithering over the difference between &lsquo;enter&rsquo; "
 "and &lsquo;return&rsquo;; and so, no new accounts are ever created."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Puts new account policy in "
+"<i>Administrative fascist:</i>&nbsp; Puts new account policy in "
 "<code>motd</code>.  Since people without accounts cannot read the "
 "<code>motd</code>, nobody ever fulfills the bureaucratic requirements; and "
 "so, no new accounts are ever created."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> &ldquo;If you're too stupid to break in and create your own "
-"account, I don't want you on the system. We've got too many goddamn "
+"<i>Maniac:</i>&nbsp; &ldquo;If you're too stupid to break in and create your "
+"own account, I don't want you on the system. We've got too many goddamn "
 "sh*t-for-brains a**holes on this box anyway.&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "# cd /home; mkdir \"Bob's home directory\"\n"
 "# echo \"Bob Simon:gandalf:0:0::/dev/tty:compress -f\" > /etc/passwd\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Root disk fails"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Root disk fails"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Repairs drive.  Usually is able to repair filesystem "
-"from boot monitor.  Failing that, front-panel toggles microkernel in and "
-"starts script on neighboring machine to load binary boot code into broken "
-"machine, reformat and reinstall OS.  Lets it run over the weekend while he "
-"goes mountain climbing."
+"<i>Technical thug:</i>&nbsp; Repairs drive.  Usually is able to repair "
+"filesystem from boot monitor.  Failing that, front-panel toggles microkernel "
+"in and starts script on neighboring machine to load binary boot code into "
+"broken machine, reformat and reinstall OS.  Lets it run over the weekend "
+"while he goes mountain climbing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Begins investigation to determine who broke "
-"the drive.  Refuses to fix system until culprit is identified and charged "
-"for the equipment."
+"<i>Administrative fascist:</i>&nbsp; Begins investigation to determine who "
+"broke the drive.  Refuses to fix system until culprit is identified and "
+"charged for the equipment."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC, LARGE SYSTEM:</i> Rips drive from system, uses sledgehammer to "
-"smash same to flinders.  Calls manufacturer, threatens pets.  Abuses field "
-"engineer while they put in a new drive and reinstall the OS."
+"<i>Maniac, large system:</i>&nbsp; Rips drive from system, uses sledgehammer "
+"to smash same to flinders.  Calls manufacturer, threatens pets.  Abuses "
+"field engineer while they put in a new drive and reinstall the OS."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC, SMALL SYSTEM:</i> Rips drive from system, uses ball-peen hammer "
-"to smash same to flinders.  Calls Requisitions, threatens pets.  Abuses "
-"bystanders while putting in new drive and reinstalling OS."
+"<i>Maniac, small system:</i>&nbsp; Rips drive from system, uses ball-peen "
+"hammer to smash same to flinders.  Calls Requisitions, threatens pets.  "
+"Abuses bystanders while putting in new drive and reinstalling OS."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>IDIOT:</i> Doesn't notice anything wrong."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Idiot:</i>&nbsp; Doesn't notice anything wrong."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Poor network response"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Poor network response"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Writes scripts to monitor network, then rewires "
+"<i>Technical thug:</i>&nbsp; Writes scripts to monitor network, then rewires "
 "entire machine room, improving response time by 2%.  Shrugs shoulders, says, "
 "&ldquo;I've done all I can do,&rdquo; and goes mountain climbing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Puts network usage policy in "
+"<i>Administrative fascist:</i>&nbsp; Puts network usage policy in "
 "<code>motd</code>.  Calls up Berkeley and AT&amp;T, badgers whoever answers "
 "for network quotas.  Tries to get xtrek freaks fired."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> Every two hours, pulls ethernet cable from wall and waits for "
-"connections to time out."
+"<i>Maniac:</i>&nbsp; Every two hours, pulls ethernet cable from wall and "
+"waits for connections to time out."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# compress -f /dev/en0\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> User questions"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: User questions"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Hacks the code of emacs' <code>doctor-mode</code> to "
-"answer new users questions.  Doesn't bother to tell people how to start the "
-"new &ldquo;guru-mode&rdquo;, or for that matter, emacs."
+"<i>Technical thug:</i>&nbsp; Hacks the code of emacs' "
+"<code>doctor-mode</code> to answer new users questions.  Doesn't bother to "
+"tell people how to start the new &ldquo;guru-mode&rdquo;, or for that "
+"matter, emacs."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Puts user support policy in "
+"<i>Administrative fascist:</i>&nbsp; Puts user support policy in "
 "<code>motd</code>.  Maintains queue of questions.  Answers them when he gets "
 "a chance, often within two weeks of receipt of the proper form."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> Screams at users until they go away.  Sometimes barters "
+"<i>Maniac:</i>&nbsp; Screams at users until they go away.  Sometimes barters "
 "knowledge for powerful drink and/or sycophantic adulation."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>IDIOT:</i> Answers all questions to best of his knowledge until the user "
-"realizes few Unix systems support punched cards or JCL."
+"<i>Idiot:</i>&nbsp; Answers all questions to best of his knowledge until the "
+"user realizes few Unix systems support punched cards or JCL."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Stupid user questions"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Stupid user questions"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Answers question in hex, binary, postfix, and/or "
-"French until user gives up and goes away."
+"<i>Technical thug:</i>&nbsp; Answers question in hex, binary, postfix, "
+"and/or French until user gives up and goes away."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Locks user's account until user can present "
-"documentation demonstrating their qualification to use the machine."
+"<i>Administrative fascist:</i>&nbsp; Locks user's account until user can "
+"present documentation demonstrating their qualification to use the machine."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "# cat > > ~luser/.cshrc\n"
@@ -299,130 +318,130 @@
 "^D\n"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>IDIOT:</i> Answers all questions to best of his knowledge.  Recruits user "
-"to system administration team."
+"<i>Idiot:</i>&nbsp; Answers all questions to best of his knowledge.  "
+"Recruits user to system administration team."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Process accounting management"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Process accounting management"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Ignores packaged accounting software; trusts scripts "
-"to sniff out any problems &amp; compute charges."
+"<i>Technical thug:</i>&nbsp; Ignores packaged accounting software; trusts "
+"scripts to sniff out any problems &amp; compute charges."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Devotes 75% of disk space to accounting "
+"<i>Administrative fascist:</i>&nbsp; Devotes 75% of disk space to accounting "
 "records owned by root and <code>chmod</code>'ed 000."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>MANIAC:</i> Laughs fool head off at very mention of accounting."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Maniac:</i>&nbsp; Laughs fool head off at very mention of 
accounting."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# lpr /etc/wtmp /usr/adm/paact\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Religious war, BSD vs. System V"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Religious war, BSD vs. System V"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>TECHNICAL THUG:</i> BSD. Crippled on System V boxes."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Technical thug:</i>&nbsp; BSD. Crippled on System V boxes."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> System V. Horrified by the people who use "
-"BSD.  Places frequent calls to DEA."
+"<i>Administrative fascist:</i>&nbsp; System V. Horrified by the people who "
+"use BSD.  Places frequent calls to DEA."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> Prefers BSD, but doesn't care as long as HIS processes run "
-"quickly."
+"<i>Maniac:</i>&nbsp; Prefers BSD, but doesn't care as long as <em>his</em> "
+"processes run quickly."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# cd c:\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Religious war, System V vs. AIX"
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Religious war, System V vs. AIX"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>TECHNICAL THUG:</i> Weeps."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Technical thug:</i>&nbsp; Weeps."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> AIX&mdash;doesn't much care for the OS, but "
-"loves the jackboots."
+"<i>Administrative fascist:</i>&nbsp; AIX&mdash;doesn't much care for the OS, "
+"but loves the jackboots."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> System V, but keeps AIX skills up, knowing full well how much "
-"Big Financial Institutions love IBM&hellip;."
+"<i>Maniac:</i>&nbsp; System V, but keeps AIX skills up, knowing full well "
+"how much Big Financial Institutions love IBM&hellip;"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>IDIOT:</i> AIX."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Idiot:</i>&nbsp; AIX."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Balky printer daemons."
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Balky printer daemons"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>TECHNICAL THUG:</i> Rewrites lpd in FORTH."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Technical thug:</i>&nbsp; Rewrites lpd in FORTH."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Puts printer use policy in "
+"<i>Administrative fascist:</i>&nbsp; Puts printer use policy in "
 "<code>motd</code>.  Calls customer support every time the printer freezes.  "
 "Tries to get user who submitted the most recent job fired."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> Writes script that kills all the daemons, clears all the "
-"print queues, and maybe restarts the daemons.  Runs it once a hour from "
+"<i>Maniac:</i>&nbsp; Writes script that kills all the daemons, clears all "
+"the print queues, and maybe restarts the daemons.  Runs it once a hour from "
 "cron."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# kill -9 /dev/lp ; /dev/lp &amp;\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> OS upgrade."
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: OS upgrade"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Reads source code of new release, takes only what he "
-"likes."
+"<i>Technical thug:</i>&nbsp; Reads source code of new release, takes only "
+"what he likes."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Instigates lawsuit against the vendor for "
-"having shipped a product with bugs in it in the first place."
+"<i>Administrative fascist:</i>&nbsp; Instigates lawsuit against the vendor "
+"for having shipped a product with bugs in it in the first place."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "# uptime\n"
@@ -433,31 +452,31 @@
 "^D\n"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# dd if=/dev/rmt8 of=/vmunix\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Balky mail."
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Balky mail"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Rewrites <code>sendmail.cf</code> from scratch.  "
-"Rewrites sendmail in SNOBOL.  Hacks kernel to implement file locking.  Hacks "
-"kernel to implement &ldquo;better&rdquo; semaphores.  Rewrites sendmail in "
-"assembly.  Hacks kernel to &hellip;"
+"<i>Technical thug:</i>&nbsp; Rewrites <code>sendmail.cf</code> from "
+"scratch.  Rewrites sendmail in SNOBOL.  Hacks kernel to implement file "
+"locking.  Hacks kernel to implement &ldquo;better&rdquo; semaphores.  "
+"Rewrites sendmail in assembly.  Hacks kernel to &hellip;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Puts mail use policy in <code>motd</code>.  "
-"Locks accounts that go over mail use quota.  Keeps quota low enough that "
-"people go back to interoffice mail, thus solving problem."
+"<i>Administrative fascist:</i>&nbsp; Puts mail use policy in "
+"<code>motd</code>.  Locks accounts that go over mail use quota.  Keeps quota "
+"low enough that people go back to interoffice mail, thus solving problem."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "# kill -9 `ps -augxww | grep sendmail | awk '{print $2}'`\n"
@@ -470,56 +489,60 @@
 "^D\n"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "# echo \"HELP!\" | mail\n"
 "tech_support.AT.vendor.com%kremvax%bitnet!BIFF!!!\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "<b>SITUATION:</b> Users want phone list application."
+#. type: Content of: <div><dl><dt>
+msgid "SITUATION: Users want phone list application"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Writes RDBMS in perl and Smalltalk.  Users give up "
-"and go back to post-it notes."
+"<i>Technical thug:</i>&nbsp; Writes RDBMS in Perl and Smalltalk.  Users give "
+"up and go back to post-it notes."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Oracle.  Users give up and go back to post-it "
-"notes."
+"<i>Administrative fascist:</i>&nbsp; Oracle.  Users give up and go back to "
+"post-it notes."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> Tells the users to use flat files and grep, the way God meant "
-"man to keep track of phone numbers.  Users give up and go back to post-it "
-"notes."
+"<i>Maniac:</i>&nbsp; Tells the users to use flat files and grep, the way God "
+"meant man to keep track of phone numbers.  Users give up and go back to "
+"post-it notes."
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "% dd ibs=80 if=/dev/rdisk001s7 | grep \"Fred\"\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Typical root <code>.cshrc</code> file:"
+#. type: Content of: <div><h3>
+msgid "Other Guidelines"
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+msgid "Typical root <code>.cshrc</code> file"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Longer than eight kilobytes.  Sources the output of a "
-"perl script, rewrites itself."
+"<i>Technical thug:</i>&nbsp; Longer than eight kilobytes.  Sources the "
+"output of a Perl script, rewrites itself."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>ADMINISTRATIVE FASCIST:</i> Typical lines include:"
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Administrative fascist:</i>&nbsp; Typical lines include"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "umask 777\n"
@@ -527,11 +550,11 @@
 "&amp;'\n"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>MANIAC:</i> Typical lines include:"
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Maniac:</i>&nbsp; Typical lines include"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "alias rm 'rm -rf \\!*'\n"
@@ -540,11 +563,11 @@
 "alias renice 'echo Renice\\?  You must mean kill -9.; kill -9 \\!*'\n"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>IDIOT:</i> Typical lines include:"
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Idiot:</i>&nbsp; Typical lines include"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid ""
 "alias dir ls\n"
@@ -554,182 +577,164 @@
 "setenv DISPLAY vt100\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Hobbies, technical:"
+#. type: Content of: <div><dl><dt>
+msgid "Hobbies, technical"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Writes entries for Obsfuscated C contest.  Optimizes "
-"INTERCAL scripts.  Maintains ENIAC emulator.  Virtual reality."
+"<i>Technical thug:</i>&nbsp; Writes entries for Obsfuscated C contest.  "
+"Optimizes INTERCAL scripts.  Maintains ENIAC emulator.  Virtual reality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Bugs office.  Audits card-key logs.  Modifies "
-"old TVs to listen in on cellular phone conversations.  Listens to police "
-"band."
+"<i>Administrative fascist:</i>&nbsp; Bugs office.  Audits card-key logs.  "
+"Modifies old TVs to listen in on cellular phone conversations.  Listens to "
+"police band."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> Volunteers at Survival Research Labs.  Bugs office.  Edits "
-"card-key logs.  Modifies old TVs to listen in on cellular phone "
+"<i>Maniac:</i>&nbsp; Volunteers at Survival Research Labs.  Bugs office.  "
+"Edits card-key logs.  Modifies old TVs to listen in on cellular phone "
 "conversations.  Jams police band."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>IDIOT:</i> Ties shoes.  Maintains COBOL decimal to roman numeral "
+"<i>Idiot:</i>&nbsp; Ties shoes.  Maintains COBOL decimal to roman numeral "
 "converter.  Rereads flowcharts from his salad days at Rand."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Hobbies, nontechnical:"
+#. type: Content of: <div><dl><dt>
+msgid "Hobbies, nontechnical"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL THUG:</i> Drinks &ldquo;Smart Drinks.&rdquo; Attends raves.  "
-"Hangs out at poetry readings and Whole Earth Review events and tries to pick "
-"up Birkenstock MOTAS."
+"<i>Technical thug:</i>&nbsp; Drinks &ldquo;Smart Drinks.&rdquo; Attends "
+"raves.  Hangs out at poetry readings and Whole Earth Review events and tries "
+"to pick up Birkenstock MOTAS."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Reads Readers Digest and Mein Kampf.  "
-"Sometimes turns up car radio and sings along to John Denver.  Golfs.  Drinks "
-"gin martinis.  Hangs out in yuppie bars and tries to pick up dominatrixes."
+"<i>Administrative fascist:</i>&nbsp; Reads <cite>Readers Digest</cite> and "
+"<cite>Mein Kampf</cite>.  Sometimes turns up car radio and sings along to "
+"John Denver.  Golfs.  Drinks gin martinis.  Hangs out in yuppie bars and "
+"tries to pick up dominatrixes."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>MANIAC:</i> Reads Utne Reader and Mein Kampf.  Faithfully attends Dickies "
-"and Ramones concerts.  Punches out people who say &ldquo;virtual "
-"reality.&rdquo; Drinks damn near anything, but favors Wild Turkey, Black "
-"Bush, and grain alcohol.  Hangs out in neighborhood bars and tries to pick "
-"up MOTAS by drinking longshoremen under the table."
+"<i>Maniac:</i>&nbsp; Reads <cite>Utne Reader</cite> and <cite>Mein "
+"Kampf</cite>.  Faithfully attends Dickies and Ramones concerts.  Punches out "
+"people who say &ldquo;virtual reality.&rdquo; Drinks damn near anything, but "
+"favors Wild Turkey, Black Bush, and grain alcohol.  Hangs out in "
+"neighborhood bars and tries to pick up MOTAS by drinking longshoremen under "
+"the table."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>IDIOT:</i> Reads Time and Newsweek&mdash;and <b>believes</b> them.  "
-"Drinks Jagermeister.  Tries to pick up close blood relations&mdash;often "
-"succeeds, producing next generation of idiots."
+"<i>Idiot:</i>&nbsp; Reads <cite>Time</cite> and "
+"<cite>Newsweek</cite>&mdash;and <em>believes</em> them.  Drinks "
+"Jagermeister.  Tries to pick up close blood relations&mdash;often succeeds, "
+"producing next generation of idiots."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "1992 Presidential Election:"
+#. type: Content of: <div><dl><dt>
+msgid "1992 Presidential Election"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>TECHNICAL THUG:</i> Clinton, but only because he liked Gore's book."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Technical thug:</i>&nbsp; Clinton, but only because he liked Gore's 
book."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>ADMINISTRATIVE FASCIST:</i> Bush.  Possibly Clinton, but only because he "
-"liked Tipper."
+"<i>Administrative fascist:</i>&nbsp; Bush.  Possibly Clinton, but only "
+"because he liked Tipper."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>MANIAC:</i> Frank Zappa."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Maniac:</i>&nbsp; Frank Zappa."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>IDIOT:</i> Perot."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Idiot:</i>&nbsp; Perot."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "1996 Presidential Election:"
+#. type: Content of: <div><dl><dt>
+msgid "1996 Presidential Election"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>TECHNICAL THUG:</i> Richard Stallman &mdash; Larry Wall."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Technical thug:</i>&nbsp; Richard Stallman &mdash; Larry Wall."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>ADMINISTRATIVE FASCIST:</i> Nixon &mdash; Buchanan."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Administrative fascist:</i>&nbsp; Nixon &mdash; Buchanan."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>IDIOT:</i> Quayle."
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Idiot:</i>&nbsp; Quayle."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Compound System Administrators:"
+#. type: Content of: <div><dl><dt>
+msgid "Compound System Administrators"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL FASCIST:</i> Hacks kernel &amp; writes a horde of scripts to "
-"prevent folk from ever using more than their fair share of system "
+"<i>Technical fascist:</i>&nbsp; Hacks kernel &amp; writes a horde of scripts "
+"to prevent folk from ever using more than their fair share of system "
 "resources.  Resulting overhead and load brings system to its knees."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL MANIAC:</i> Writes scripts that SEEM to be monitoring the "
-"system, but are actually encrypting large lists of passwords.  Uses nearby "
-"nodes as beta test sites for worms."
+"<i>Technical maniac:</i>&nbsp; Writes scripts that <em>seem</em> to be "
+"monitoring the system, but are actually encrypting large lists of "
+"passwords.  Uses nearby nodes as beta test sites for worms."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>TECHNICAL IDIOT:</i> Writes superuser-run scripts that sooner or later do "
-"<code>rm -rf /</code>."
+"<i>Technical idiot:</i>&nbsp; Writes superuser-run scripts that sooner or "
+"later do <code>rm -rf /</code>."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><dl><dd><ul><li><p>
 msgid ""
-"<i>FASCISTIC MANIAC:</i> At first hint of cracker incursions, whether real "
-"or imagined, shuts down system by triggering water-on-the-brain detectors "
-"and Halon system."
+"<i>Fascistic maniac:</i>&nbsp; At first hint of cracker incursions, whether "
+"real or imagined, shuts down system by triggering water-on-the-brain "
+"detectors and Halon system."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>FASCISTIC IDIOT:</i>"
+#. type: Content of: <div><dl><dd><ul><li><p>
+msgid "<i>Fascistic idiot:</i>"
 msgstr ""
 
-#. type: Content of: <ul><li><pre>
+#. type: Content of: <div><dl><dd><ul><li><pre>
 #, no-wrap
 msgid "# cp /dev/null /etc/passwd\n"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "<i>MANIACAL IDIOT:</i> Napalms the CPU."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "&mdash;Stephan Zielinski"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "&mdash;Submitted by <b>Durval Menezes</b>"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a "
-"href=\"/fun/jokes/know.your.sysadmin.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><dl><dd><ul><li><p>
+msgid "<i>Maniacal idiot:</i>&nbsp; Napalms the CPU."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/know.your.sysadmin.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."
+"Source:&nbsp; <a "
+"href=\"https://www.netfunny.com/rhf/jokes/92q4/sysadminguide.html\";> "
+"rec.humor.funny</a> (1992), among others."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -737,24 +742,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/purchase.agreement.de.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/purchase.agreement.de.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- fun/jokes/po/purchase.agreement.de.po       31 May 2021 13:39:46 -0000      
1.31
+++ fun/jokes/po/purchase.agreement.de.po       15 Jul 2021 16:02:02 -0000      
1.32
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: purchase.agreement.html\n"
-"POT-Creation-Date: 2020-06-01 12:26+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+0000\n"
 "PO-Revision-Date: 2014-04-14 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -15,169 +15,152 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Disclaimer - GNU Project - Free Software Foundation"
 msgstr "Haftungsausschluss - GNU-Projekt - Free Software Foundation"
 
-#. 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-Startseite"
+
+#. type: Content of: <div>
+# | </a>&nbsp;/ <a [-href=\"/education/education.html\">Education</a>&nbsp;/
+# | <a href=\"/education/edu-resources.html\">Resources</a>&nbsp;/-]
+# | {+href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/+}
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
+msgid "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/\">Bildung</a>&nbsp;/ <a href=\"/education/"
+"edu-resources\">Ressourcen</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "Disclaimer!"
 msgstr "Haftungsausschluss"
 
-#. type: Content of: <p><a>
-msgid "<a href=\"/graphics/gleesons.html\">"
-msgstr "<a href=\"/graphics/gleesons\">"
-
-#. type: Attribute 'alt' of: <p><a><img>
-msgid "[colorful rounded image of the Head of a GNU]"
-msgstr "Bunter Kopf eines GNUs"
-
-#. type: Content of: <p>
-msgid "</a>"
-msgstr "</a>"
-
-#. type: Content of: <pre>
-#, no-wrap
-msgid ""
-"Disclaimer to be used when purchasing software:\n"
-"\n"
-"\n"
-"                 AGREEMENT AND LIMITED WARRANTY\n"
-"\n"
-"This check is fully warranted against physical defects and poor\n"
-"workmanship in its stationery. If the check is physically damaged,\n"
-"return it to me and I will replace or repair it at my discretion.\n"
-"No other warranty of any kind is made, neither express nor implied\n"
-"including, but not limited to, the implied warranties of\n"
-"Merchantability, Suitability for Purpose, and Validity of Currency.\n"
-"Any and all risk concerning the actual value of this check is\n"
-"assumed by you, the recipient. Even though I or my agents may have\n"
-"assured you of its worth, either verbally or in written\n"
-"communication, we may have had our fingers crossed, so don't come\n"
-"whimpering back to me if it bounces.\n"
-"\n"
-"The money, if any, represented by this instrument remains my\n"
-"property. You are licensed to use it, however you are not allowed\n"
-"to copy the original check except for your personal records, nor\n"
-"are you permitted to give the money itself to anyone else. Neither\n"
-"may you allow any other person to use the money. Remember, you may\n"
-"have it in your possession, but it still belongs to me, and I'm\n"
-"going to call on you from time to time just to keep tabs on it.\n"
-"\n"
-"This agreement supersedes all others between us, including the\n"
-"equally ridiculous one you have undoubtedly pasted on the back of\n"
-"your packaging, or concealed somewhere in the middle of it. The\n"
-"location of your version of this or any other covenant between us\n"
-"is irrelevant to its inapplicability here. Only this one pertains,\n"
-"and I really mean it. In fact, this one supersedes yours even\n"
-"though yours may say that it supersedes mine. Why, even if yours\n"
-"said it would supersede mine even if mine said it would supersede\n"
-"yours even if yours said... Oh well. You get the idea.\n"
-"\n"
-"You may decline this agreement by returning the uncashed check to\n"
-"me within twenty-four hours. If you attempt to cash it, however,\n"
-"you have implicitly accepted these terms. You may also implicitly\n"
-"accept these terms by:\n"
-"\n"
-"1) Calling my bank to inquire about the status of my account;\n"
-"\n"
-"2) Thanking me at the conclusion of our business transaction;\n"
-"\n"
-"3) Going to bed at the end of this or any other day; or\n"
-"\n"
-"4) Using any toilet or rest room.\n"
-"\n"
-"Please be advised that I have adopted a strict rubber-glue policy.\n"
-"Any nasty thing that your lawyers say bounces off of me and sticks\n"
-"back to you. Be further advised that you agree to pay my legal\n"
-"expenses if I decide to sue you for violating this agreement or for\n"
-"any other reason that might strike my fancy. Violations will be\n"
-"punishable by fine, imprisonment, death, any two of the above, or\n"
-"all three.\n"
-"\n"
-"Thank you and have a nice day!\n"
-"\n"
-msgstr ""
-"Disclaimer to be used when purchasing software:\n"
-"\n"
-"\n"
-"                 AGREEMENT AND LIMITED WARRANTY\n"
-"\n"
-"This check is fully warranted against physical defects and poor\n"
-"workmanship in its stationery. If the check is physically damaged,\n"
-"return it to me and I will replace or repair it at my discretion.\n"
-"No other warranty of any kind is made, neither express nor implied\n"
-"including, but not limited to, the implied warranties of\n"
-"Merchantability, Suitability for Purpose, and Validity of Currency.\n"
-"Any and all risk concerning the actual value of this check is\n"
-"assumed by you, the recipient. Even though I or my agents may have\n"
-"assured you of its worth, either verbally or in written\n"
-"communication, we may have had our fingers crossed, so don't come\n"
-"whimpering back to me if it bounces.\n"
-"\n"
-"The money, if any, represented by this instrument remains my\n"
-"property. You are licensed to use it, however you are not allowed\n"
-"to copy the original check except for your personal records, nor\n"
-"are you permitted to give the money itself to anyone else. Neither\n"
-"may you allow any other person to use the money. Remember, you may\n"
-"have it in your possession, but it still belongs to me, and I'm\n"
-"going to call on you from time to time just to keep tabs on it.\n"
-"\n"
-"This agreement supersedes all others between us, including the\n"
-"equally ridiculous one you have undoubtedly pasted on the back of\n"
-"your packaging, or concealed somewhere in the middle of it. The\n"
-"location of your version of this or any other covenant between us\n"
-"is irrelevant to its inapplicability here. Only this one pertains,\n"
-"and I really mean it. In fact, this one supersedes yours even\n"
-"though yours may say that it supersedes mine. Why, even if yours\n"
-"said it would supersede mine even if mine said it would supersede\n"
-"yours even if yours said... Oh well. You get the idea.\n"
-"\n"
-"You may decline this agreement by returning the uncashed check to\n"
-"me within twenty-four hours. If you attempt to cash it, however,\n"
-"you have implicitly accepted these terms. You may also implicitly\n"
-"accept these terms by:\n"
-"\n"
-"1) Calling my bank to inquire about the status of my account;\n"
-"\n"
-"2) Thanking me at the conclusion of our business transaction;\n"
-"\n"
-"3) Going to bed at the end of this or any other day; or\n"
-"\n"
-"4) Using any toilet or rest room.\n"
-"\n"
-"Please be advised that I have adopted a strict rubber-glue policy.\n"
-"Any nasty thing that your lawyers say bounces off of me and sticks\n"
-"back to you. Be further advised that you agree to pay my legal\n"
-"expenses if I decide to sue you for violating this agreement or for\n"
-"any other reason that might strike my fancy. Violations will be\n"
-"punishable by fine, imprisonment, death, any two of the above, or\n"
-"all three.\n"
-"\n"
-"Thank you and have a nice day!\n"
-"\n"
+#. type: Content of: <div><p>
+msgid "Disclaimer to be used when purchasing software:"
+msgstr ""
+
+#. type: Content of: <div><h3>
+msgid "AGREEMENT AND LIMITED WARRANTY"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"This check is fully warranted against physical defects and poor workmanship "
+"in its stationery. If the check is physically damaged, return it to me and I "
+"will replace or repair it at my discretion.  No other warranty of any kind "
+"is made, neither express nor implied including, but not limited to, the "
+"implied warranties of Merchantability, Suitability for Purpose, and Validity "
+"of Currency.  Any and all risk concerning the actual value of this check is "
+"assumed by you, the recipient. Even though I or my agents may have assured "
+"you of its worth, either verbally or in written communication, we may have "
+"had our fingers crossed, so don't come whimpering back to me if it bounces."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"The money, if any, represented by this instrument remains my property. You "
+"are licensed to use it, however you are not allowed to copy the original "
+"check except for your personal records, nor are you permitted to give the "
+"money itself to anyone else. Neither may you allow any other person to use "
+"the money. Remember, you may have it in your possession, but it still "
+"belongs to me, and I'm going to call on you from time to time just to keep "
+"tabs on it."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"This agreement supersedes all others between us, including the equally "
+"ridiculous one you have undoubtedly pasted on the back of your packaging, or "
+"concealed somewhere in the middle of it. The location of your version of "
+"this or any other covenant between us is irrelevant to its inapplicability "
+"here. Only this one pertains, and I really mean it. In fact, this one "
+"supersedes yours even though yours may say that it supersedes mine. Why, "
+"even if yours said it would supersede mine even if mine said it would "
+"supersede yours even if yours said... Oh well. You get the idea."
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "Weiterer Humor in <a href=\"/fun/\">GNUs Humor-Sammlung</a>."
+"You may decline this agreement by returning the uncashed check to me within "
+"twenty-four hours. If you attempt to cash it, however, you have implicitly "
+"accepted these terms. You may also implicitly accept these terms by:"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid "Calling my bank to inquire about the status of my account;"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid "Thanking me at the conclusion of our business transaction;"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid "Going to bed at the end of this or any other day; or"
+msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><ol><li>
+msgid "Using any toilet or rest room."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Please be advised that I have adopted a strict rubber-glue policy.  Any "
+"nasty thing that your lawyers say bounces off of me and sticks back to you. "
+"Be further advised that you agree to pay my legal expenses if I decide to "
+"sue you for violating this agreement or for any other reason that might "
+"strike my fancy. Violations will be punishable by fine, imprisonment, death, "
+"any two of the above, or all three."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Thank you and have a nice day!"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/purchase.agreement.txt\">Plain text version</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"Source:&nbsp; <a href=\"https://www.netfunny.com/rhf/jokes/91q4/softcheq.html";
+"\">rec.humor.funny</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Haftungsausschluss"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | The joke on this page was obtained from the FSF's email archives of the
+# | GNU Project. {+The Free Software Foundation claims no copyright on it.+}
+#, fuzzy
+#| msgid ""
+#| "The joke on this page was obtained from the FSF's email archives of the "
+#| "GNU Project."
 msgid ""
 "The joke on this page was obtained from the FSF's email archives of the GNU "
-"Project."
+"Project. The Free Software Foundation claims no copyright on it."
 msgstr ""
 "Der Witz wurde den <a href=\"//lists.gnu.org/\">E-Mail-Archiven</a> des GNU-"
 "Projekts der FSF entnommen."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyrights on this joke."
-msgstr "Die Free Software Foundation erhebt kein Copyright auf diesen Witz."
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -205,14 +188,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 ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -237,6 +226,141 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid "<a href=\"/graphics/gleesons.html\">"
+#~ msgstr "<a href=\"/graphics/gleesons\">"
+
+#~ msgid "[colorful rounded image of the Head of a GNU]"
+#~ msgstr "Bunter Kopf eines GNUs"
+
+#~ msgid "</a>"
+#~ msgstr "</a>"
+
+#~ msgid ""
+#~ "Disclaimer to be used when purchasing software:\n"
+#~ "\n"
+#~ "\n"
+#~ "                 AGREEMENT AND LIMITED WARRANTY\n"
+#~ "\n"
+#~ "This check is fully warranted against physical defects and poor\n"
+#~ "workmanship in its stationery. If the check is physically damaged,\n"
+#~ "return it to me and I will replace or repair it at my discretion.\n"
+#~ "No other warranty of any kind is made, neither express nor implied\n"
+#~ "including, but not limited to, the implied warranties of\n"
+#~ "Merchantability, Suitability for Purpose, and Validity of Currency.\n"
+#~ "Any and all risk concerning the actual value of this check is\n"
+#~ "assumed by you, the recipient. Even though I or my agents may have\n"
+#~ "assured you of its worth, either verbally or in written\n"
+#~ "communication, we may have had our fingers crossed, so don't come\n"
+#~ "whimpering back to me if it bounces.\n"
+#~ "\n"
+#~ "The money, if any, represented by this instrument remains my\n"
+#~ "property. You are licensed to use it, however you are not allowed\n"
+#~ "to copy the original check except for your personal records, nor\n"
+#~ "are you permitted to give the money itself to anyone else. Neither\n"
+#~ "may you allow any other person to use the money. Remember, you may\n"
+#~ "have it in your possession, but it still belongs to me, and I'm\n"
+#~ "going to call on you from time to time just to keep tabs on it.\n"
+#~ "\n"
+#~ "This agreement supersedes all others between us, including the\n"
+#~ "equally ridiculous one you have undoubtedly pasted on the back of\n"
+#~ "your packaging, or concealed somewhere in the middle of it. The\n"
+#~ "location of your version of this or any other covenant between us\n"
+#~ "is irrelevant to its inapplicability here. Only this one pertains,\n"
+#~ "and I really mean it. In fact, this one supersedes yours even\n"
+#~ "though yours may say that it supersedes mine. Why, even if yours\n"
+#~ "said it would supersede mine even if mine said it would supersede\n"
+#~ "yours even if yours said... Oh well. You get the idea.\n"
+#~ "\n"
+#~ "You may decline this agreement by returning the uncashed check to\n"
+#~ "me within twenty-four hours. If you attempt to cash it, however,\n"
+#~ "you have implicitly accepted these terms. You may also implicitly\n"
+#~ "accept these terms by:\n"
+#~ "\n"
+#~ "1) Calling my bank to inquire about the status of my account;\n"
+#~ "\n"
+#~ "2) Thanking me at the conclusion of our business transaction;\n"
+#~ "\n"
+#~ "3) Going to bed at the end of this or any other day; or\n"
+#~ "\n"
+#~ "4) Using any toilet or rest room.\n"
+#~ "\n"
+#~ "Please be advised that I have adopted a strict rubber-glue policy.\n"
+#~ "Any nasty thing that your lawyers say bounces off of me and sticks\n"
+#~ "back to you. Be further advised that you agree to pay my legal\n"
+#~ "expenses if I decide to sue you for violating this agreement or for\n"
+#~ "any other reason that might strike my fancy. Violations will be\n"
+#~ "punishable by fine, imprisonment, death, any two of the above, or\n"
+#~ "all three.\n"
+#~ "\n"
+#~ "Thank you and have a nice day!\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Disclaimer to be used when purchasing software:\n"
+#~ "\n"
+#~ "\n"
+#~ "                 AGREEMENT AND LIMITED WARRANTY\n"
+#~ "\n"
+#~ "This check is fully warranted against physical defects and poor\n"
+#~ "workmanship in its stationery. If the check is physically damaged,\n"
+#~ "return it to me and I will replace or repair it at my discretion.\n"
+#~ "No other warranty of any kind is made, neither express nor implied\n"
+#~ "including, but not limited to, the implied warranties of\n"
+#~ "Merchantability, Suitability for Purpose, and Validity of Currency.\n"
+#~ "Any and all risk concerning the actual value of this check is\n"
+#~ "assumed by you, the recipient. Even though I or my agents may have\n"
+#~ "assured you of its worth, either verbally or in written\n"
+#~ "communication, we may have had our fingers crossed, so don't come\n"
+#~ "whimpering back to me if it bounces.\n"
+#~ "\n"
+#~ "The money, if any, represented by this instrument remains my\n"
+#~ "property. You are licensed to use it, however you are not allowed\n"
+#~ "to copy the original check except for your personal records, nor\n"
+#~ "are you permitted to give the money itself to anyone else. Neither\n"
+#~ "may you allow any other person to use the money. Remember, you may\n"
+#~ "have it in your possession, but it still belongs to me, and I'm\n"
+#~ "going to call on you from time to time just to keep tabs on it.\n"
+#~ "\n"
+#~ "This agreement supersedes all others between us, including the\n"
+#~ "equally ridiculous one you have undoubtedly pasted on the back of\n"
+#~ "your packaging, or concealed somewhere in the middle of it. The\n"
+#~ "location of your version of this or any other covenant between us\n"
+#~ "is irrelevant to its inapplicability here. Only this one pertains,\n"
+#~ "and I really mean it. In fact, this one supersedes yours even\n"
+#~ "though yours may say that it supersedes mine. Why, even if yours\n"
+#~ "said it would supersede mine even if mine said it would supersede\n"
+#~ "yours even if yours said... Oh well. You get the idea.\n"
+#~ "\n"
+#~ "You may decline this agreement by returning the uncashed check to\n"
+#~ "me within twenty-four hours. If you attempt to cash it, however,\n"
+#~ "you have implicitly accepted these terms. You may also implicitly\n"
+#~ "accept these terms by:\n"
+#~ "\n"
+#~ "1) Calling my bank to inquire about the status of my account;\n"
+#~ "\n"
+#~ "2) Thanking me at the conclusion of our business transaction;\n"
+#~ "\n"
+#~ "3) Going to bed at the end of this or any other day; or\n"
+#~ "\n"
+#~ "4) Using any toilet or rest room.\n"
+#~ "\n"
+#~ "Please be advised that I have adopted a strict rubber-glue policy.\n"
+#~ "Any nasty thing that your lawyers say bounces off of me and sticks\n"
+#~ "back to you. Be further advised that you agree to pay my legal\n"
+#~ "expenses if I decide to sue you for violating this agreement or for\n"
+#~ "any other reason that might strike my fancy. Violations will be\n"
+#~ "punishable by fine, imprisonment, death, any two of the above, or\n"
+#~ "all three.\n"
+#~ "\n"
+#~ "Thank you and have a nice day!\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "Weiterer Humor in <a href=\"/fun/\">GNUs Humor-Sammlung</a>."
+
+#~ msgid "The Free Software Foundation claims no copyrights on this joke."
+#~ msgstr "Die Free Software Foundation erhebt kein Copyright auf diesen Witz."
+
 #~ msgid ""
 #~ "The joke on this page was obtained from the FSF's <a href=\"http://mail.";
 #~ "gnu.org/\">email archives</a> of the GNU Project."

Index: fun/jokes/po/purchase.agreement.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/purchase.agreement.pot,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- fun/jokes/po/purchase.agreement.pot 1 Jun 2020 12:29:55 -0000       1.12
+++ fun/jokes/po/purchase.agreement.pot 15 Jul 2021 16:02:02 -0000      1.13
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: purchase.agreement.html\n"
-"POT-Creation-Date: 2020-06-01 12:26+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,101 +20,121 @@
 msgid "Disclaimer - 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;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Disclaimer!"
 msgstr ""
 
-#. type: Content of: <p><a>
-msgid "<a href=\"/graphics/gleesons.html\">"
+#. type: Content of: <div><p>
+msgid "Disclaimer to be used when purchasing software:"
 msgstr ""
 
-#. type: Attribute 'alt' of: <p><a><img>
-msgid "[colorful rounded image of the Head of a GNU]"
+#. type: Content of: <div><h3>
+msgid "AGREEMENT AND LIMITED WARRANTY"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "</a>"
-msgstr ""
-
-#. type: Content of: <pre>
-#, no-wrap
-msgid ""
-"Disclaimer to be used when purchasing software:\n"
-"\n"
-"\n"
-"                 AGREEMENT AND LIMITED WARRANTY\n"
-"\n"
-"This check is fully warranted against physical defects and poor\n"
-"workmanship in its stationery. If the check is physically damaged,\n"
-"return it to me and I will replace or repair it at my discretion.\n"
-"No other warranty of any kind is made, neither express nor implied\n"
-"including, but not limited to, the implied warranties of\n"
-"Merchantability, Suitability for Purpose, and Validity of Currency.\n"
-"Any and all risk concerning the actual value of this check is\n"
-"assumed by you, the recipient. Even though I or my agents may have\n"
-"assured you of its worth, either verbally or in written\n"
-"communication, we may have had our fingers crossed, so don't come\n"
-"whimpering back to me if it bounces.\n"
-"\n"
-"The money, if any, represented by this instrument remains my\n"
-"property. You are licensed to use it, however you are not allowed\n"
-"to copy the original check except for your personal records, nor\n"
-"are you permitted to give the money itself to anyone else. Neither\n"
-"may you allow any other person to use the money. Remember, you may\n"
-"have it in your possession, but it still belongs to me, and I'm\n"
-"going to call on you from time to time just to keep tabs on it.\n"
-"\n"
-"This agreement supersedes all others between us, including the\n"
-"equally ridiculous one you have undoubtedly pasted on the back of\n"
-"your packaging, or concealed somewhere in the middle of it. The\n"
-"location of your version of this or any other covenant between us\n"
-"is irrelevant to its inapplicability here. Only this one pertains,\n"
-"and I really mean it. In fact, this one supersedes yours even\n"
-"though yours may say that it supersedes mine. Why, even if yours\n"
-"said it would supersede mine even if mine said it would supersede\n"
-"yours even if yours said... Oh well. You get the idea.\n"
-"\n"
-"You may decline this agreement by returning the uncashed check to\n"
-"me within twenty-four hours. If you attempt to cash it, however,\n"
-"you have implicitly accepted these terms. You may also implicitly\n"
-"accept these terms by:\n"
-"\n"
-"1) Calling my bank to inquire about the status of my account;\n"
-"\n"
-"2) Thanking me at the conclusion of our business transaction;\n"
-"\n"
-"3) Going to bed at the end of this or any other day; or\n"
-"\n"
-"4) Using any toilet or rest room.\n"
-"\n"
-"Please be advised that I have adopted a strict rubber-glue policy.\n"
-"Any nasty thing that your lawyers say bounces off of me and sticks\n"
-"back to you. Be further advised that you agree to pay my legal\n"
-"expenses if I decide to sue you for violating this agreement or for\n"
-"any other reason that might strike my fancy. Violations will be\n"
-"punishable by fine, imprisonment, death, any two of the above, or\n"
-"all three.\n"
-"\n"
-"Thank you and have a nice day!\n"
-"\n"
+#. type: Content of: <div><p>
+msgid ""
+"This check is fully warranted against physical defects and poor workmanship "
+"in its stationery. If the check is physically damaged, return it to me and I "
+"will replace or repair it at my discretion.  No other warranty of any kind "
+"is made, neither express nor implied including, but not limited to, the "
+"implied warranties of Merchantability, Suitability for Purpose, and Validity "
+"of Currency.  Any and all risk concerning the actual value of this check is "
+"assumed by you, the recipient. Even though I or my agents may have assured "
+"you of its worth, either verbally or in written communication, we may have "
+"had our fingers crossed, so don't come whimpering back to me if it bounces."
 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 money, if any, represented by this instrument remains my property. You "
+"are licensed to use it, however you are not allowed to copy the original "
+"check except for your personal records, nor are you permitted to give the "
+"money itself to anyone else. Neither may you allow any other person to use "
+"the money. Remember, you may have it in your possession, but it still "
+"belongs to me, and I'm going to call on you from time to time just to keep "
+"tabs on it."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid ""
+"This agreement supersedes all others between us, including the equally "
+"ridiculous one you have undoubtedly pasted on the back of your packaging, or "
+"concealed somewhere in the middle of it. The location of your version of "
+"this or any other covenant between us is irrelevant to its inapplicability "
+"here. Only this one pertains, and I really mean it. In fact, this one "
+"supersedes yours even though yours may say that it supersedes mine. Why, "
+"even if yours said it would supersede mine even if mine said it would "
+"supersede yours even if yours said... Oh well. You get the idea."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"The joke on this page was obtained from the FSF's email archives of the GNU "
-"Project."
+"You may decline this agreement by returning the uncashed check to me within "
+"twenty-four hours. If you attempt to cash it, however, you have implicitly "
+"accepted these terms. You may also implicitly accept these terms by:"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid "Calling my bank to inquire about the status of my account;"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid "Thanking me at the conclusion of our business transaction;"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid "Going to bed at the end of this or any other day; or"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyrights on this joke."
+#. type: Content of: <div><ol><li>
+msgid "Using any toilet or rest room."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Please be advised that I have adopted a strict rubber-glue policy.  Any "
+"nasty thing that your lawyers say bounces off of me and sticks back to "
+"you. Be further advised that you agree to pay my legal expenses if I decide "
+"to sue you for violating this agreement or for any other reason that might "
+"strike my fancy. Violations will be punishable by fine, imprisonment, death, "
+"any two of the above, or all three."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Thank you and have a nice day!"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/purchase.agreement.txt\">Plain text version</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"Source:&nbsp; <a "
+"href=\"https://www.netfunny.com/rhf/jokes/91q4/softcheq.html\";>rec.humor.funny</a>."
+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.
@@ -141,7 +161,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>. 
@@ -149,7 +169,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/users-lightbulb.de.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/users-lightbulb.de.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/users-lightbulb.de.po  31 May 2021 13:39:46 -0000      1.10
+++ fun/jokes/po/users-lightbulb.de.po  15 Jul 2021 16:02:02 -0000      1.11
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: users-lightbulb.html\n"
-"POT-Creation-Date: 2019-07-24 12:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+0000\n"
 "PO-Revision-Date: 2014-12-27 13:35+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translations@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -25,31 +26,65 @@
 "Wie viele GNU/Linux-Nutzer braucht man, um eine Glühbirne zu wechseln? - 
GNU-"
 "Projekt - Free Software Foundation"
 
-#. 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-Startseite"
+
+#. type: Content of: <div>
+# | </a>&nbsp;/ <a [-href=\"/education/education.html\">Education</a>&nbsp;/-]
+# | {+href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/+} <a
+# | [-href=\"/education/edu-resources.html\">Resources</a>&nbsp;/-]
+# | {+href=\"/fun/humor.html#Unclassified\">Unclassified</a>&nbsp;/+}
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/\">Bildung</a>&nbsp;/ <a href=\"/education/"
+"edu-resources\">Ressourcen</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "How many GNU/Linux users are needed to change a light bulb?"
 msgstr "Wie viele GNU/Linux-Nutzer braucht man, um eine Glühbirne zu 
wechseln?"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><address>
+msgid "by Andr&eacute; Ferreira Machado"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "1 to post a thread in a mailing list telling the bulb has burnt."
 msgstr ""
 "1, der einen Thread in einer Mailingliste postet und berichtet, die "
 "Glühbirne sei verbrannt."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to suggest to try to turn the lamp on through command lines."
 msgstr ""
 "1, der vorschlägt, zu versuchen, die Lampe über die Kommandozeile "
 "einzuschalten."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to complain that the user broke the thread."
 msgstr "1, der sich beschwert, der Nutzer habe den Thread versaut."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to ask what new bulb will he install."
 msgstr "1, der fragt, welche neue Glühbirne der Nutzer einbauen wird."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to advise that we shouldn't use the word burn for meaning a broken "
 "lightbulb, because it would mean that the bulb was set on fire and that it "
@@ -61,14 +96,14 @@
 "angezündet worden; es sei vielmehr richtig zu sagen, dass die Glühbirne auf 
"
 "Grund eines Übermaßes an elektrischer Spannung kaputt gegangen ist."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "25 to suggest to install all the kinds of existing and imaginable lightbulbs."
 msgstr ""
 "25, die alle existierenden und vorstellbaren Arten von Glühbirnen zur "
 "Installation vorschlagen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 who say that the burnt bulb is an upstream issue that doesn't belong to "
 "the distro. There's an open bug on the bulb's developer mail list."
@@ -77,15 +112,15 @@
 "nicht zur Distribution. Es gebe einen offenen Bug auf der Entwickler-"
 "Mailingliste der Glühbirne."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 noob to suggest to install a Microsoft lightbulb."
 msgstr "1 Noob, der die Installation einer Microsoft-Glühbirne vorschlägt."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "250 to flood the noob's mail address."
 msgstr "250, die das Postfach des Noobs überfluten."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "300 to say that a Microsoft lightbulb would turn blue and that you'd had to "
 "reboot continuously to get back to normal."
@@ -93,7 +128,7 @@
 "300, die behaupten, eine Microsoft-Glühbirne würde sich blau verfärben und 
"
 "ständige Neustarts erfordern, um sie zum Laufen zu bringen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 former GNU/Linux user who still frequents the forum, to suggest to install "
 "an Apple iBulb, which has a fresh and innovating design and it costs $250."
@@ -102,7 +137,7 @@
 "vorschlägt, eine Apple iGlühbirne zu installieren, die ein erfrischendes 
und "
 "neues Design hat und 250 Euro kostet."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "20 to say that iBulbs aren't free, and that they have less functions than a "
 "20 times cheaper standard lightbulb."
@@ -110,12 +145,12 @@
 "20, die sagen, iGlühbirnen seien unfrei und hätten weniger Funktionen als "
 "eine 20 mal günstigere Standard-Glühbirne."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "15 to suggest to install a national lightbulb."
 msgstr ""
 "15, die vorschlagen, eine Glühbirne aus heimischer Produktion einzubauen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "30 to say that national lightbulbs are crippled remasters of foreign "
 "lightbulbs and that they don't bring anything new."
@@ -123,17 +158,17 @@
 "30, die sagen, dass Glühbirnen aus heimischer Produktion bloß untaugliche "
 "Nachbauten ausländischer Glühbirnen seien und keinen Mehrwert brächten."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "23 to argue if it must be a white or a transparent bulb."
 msgstr ""
 "23, die der Ansicht sind, es müsse eine weiße oder durchsichtige Glühbirne 
"
 "eingebaut werden."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to remind everyone that the right name is GNU/Lightbulb."
 msgstr "1, der alle daran erinnert, dass der richtige Name GNU/Glühbirne ist."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that lightbulbs are a Winbugs users thing and that real GNU/Linux "
 "users aren't afraid of the dark."
@@ -141,18 +176,18 @@
 "1, der sagt, Glühbirnen seien nur für Winbugs-Nutzer notwendig; ein "
 "richtiger GNU/Linux-Nutzer fürchte die Dunkelheit nicht."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to announce finally which will be the model of the installed bulb."
 msgstr ""
 "1, der ankündigt, welches Glühbirnen-Modell letztendlich eingebaut werde."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "217 to discard the chosen model and suggest another."
 msgstr ""
 "217, die das ausgewählte Modell für untauglich halten und ein anderes 
Modell "
 "vorschlagen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "6 to complain that the chosen lightbulb has proprietary elements, and that "
 "another should be used."
@@ -160,20 +195,20 @@
 "6, die sich beschweren, die ausgewählte Glühbirne habe proprietäre "
 "Eigenschaften, und dass deshalb eine andere verwendet werden sollte."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "20 to say that a 100% free bulb, isn't compatible with the lamp switch."
 msgstr ""
 "20, die sagen, eine hundertprozentig freie Glühbirne sei inkompatibel mit "
 "dem Lichtschalter."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The same previous 6, to suggest to change the switch for a compatible one."
 msgstr ""
 "Die 6 von vorhin, die vorschlagen, den Lichtschalter durch einen kompatiblen "
 "zu ersetzen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to yell out: &ldquo;STOP ARGUING AND CHANGE THAT LIGHTBULB FOR GOD'S SAKE!"
 "&rdquo;"
@@ -181,7 +216,7 @@
 "1, der schreit: „HÖRT AUF ZU DISKUTIEREN UND WECHSELT IN GOTTES NAMEN 
DIESE "
 "GLÜHBIRNE!“"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "350 to ask the previous user what God is he talking about, and that if he "
 "has scientific proofs of His existence."
@@ -189,13 +224,13 @@
 "350, die den schreienden Nutzer fragen, von welchem Gott er spricht und ob "
 "er wissenschaftliche Beweise für dessen Existenz hat."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to explain how electricity works and why a light bulb is inefficient."
 msgstr ""
 "1, der erklärt, wie Elektrizität funktioniert und warum eine Glühbirne "
 "ineffizient ist."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that we can't trust in corporation-made bulbs and that we should "
 "trust in community-made bulbs."
@@ -203,7 +238,7 @@
 "1, der sagt, man könne kommerziell hergestellten Glühbirnen nicht vertrauen 
"
 "und sollte von der Community hergestellte Glühbirnen verwenden."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to post a link to an ODF file explaining how to build a lightbulb from "
 "scratch."
@@ -211,7 +246,7 @@
 "1, der einen Link zu einer ODF-Datei postet, in der die Herstellung einer "
 "Glühbirne von Grund auf beschrieben wird."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "14 to complain about the format of the previous file and asking to send it "
 "in txt or LaTeX."
@@ -219,7 +254,7 @@
 "14, die sich über das Format der geposteten Datei beschweren und eine TXT- "
 "oder LaTeX-Datei verlangen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 to say that they didn't like the taken decision and that they'll fork the "
 "house's electric installation and install a better lamp."
@@ -228,27 +263,27 @@
 "sind und das Stromnetz des Gebäudes forken werden, um eine bessere Lampe zu "
 "installieren."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to post a series of commands to put to change the lightbulb."
 msgstr ""
 "1, der eine Reihe von Befehlen postet, mit der die Glühbirne gewechselt "
 "werden kann."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to comment that he executed the commands and had an error message."
 msgstr ""
 "1, der behauptet, er habe die Befehle ausgeführt und eine Fehlermeldung "
 "erhalten."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to advise that the commands must be executed as root."
 msgstr "1, der den Tipp gibt, die Befehle als <em>root</em> auszuführen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "And finally:"
 msgstr "Und schlussendlich:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The father of the first user, who while everyone was discussing, went to the "
 "shop and bought the cheapest lightbulb."
@@ -256,23 +291,6 @@
 "Den Vater des ersten Nutzers, der in der Zeit der Diskussion in den Laden "
 "gegangen ist und die billigste Glühbirne gekauft hat."
 
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr "Verzichtserklärung"
-
-#. type: Content of: <p>
-msgid ""
-"The joke on this page was mailed to the FSF by its author Andre Machado."
-msgstr ""
-"Der Witz wurde von Andre Machado an die Free Software Foundation "
-"gesendet<ins>, Eric Haberstroh übernahm die deutsche Übersetzung</ins>."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Die <span xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> erhebt "
-"keine Urheberrechte an diesem Witz."
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -300,14 +318,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 ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -322,12 +346,24 @@
 
 # siehe #_d_isclaimer
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Andre Machado"
+# | Copyright &copy; 201[-4-]{+3+} Andre Machado
+#, fuzzy
+#| msgid "Copyright &copy; 2014 Andre Machado"
+msgid "Copyright &copy; 2013 Andre Machado"
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | [-This-]{+The joke on this+} page is licensed under [-a-] {+the+} <a
+# | rel=\"license\"
+# | href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons
+# | Attribution-NoDerivatives 4.0 International License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
-"This page is licensed under a <a rel=\"license\" href=\"http://";
+"The joke on this page is licensed under the <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
@@ -346,3 +382,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Letzte Änderung:"
+
+#~ msgid "Disclaimer"
+#~ msgstr "Verzichtserklärung"
+
+#~ msgid ""
+#~ "The joke on this page was mailed to the FSF by its author Andre Machado."
+#~ msgstr ""
+#~ "Der Witz wurde von Andre Machado an die Free Software Foundation "
+#~ "gesendet<ins>, Eric Haberstroh übernahm die deutsche Übersetzung</ins>."

Index: fun/jokes/po/users-lightbulb.fr.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/users-lightbulb.fr.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fun/jokes/po/users-lightbulb.fr.po  31 May 2021 21:09:02 -0000      1.5
+++ fun/jokes/po/users-lightbulb.fr.po  15 Jul 2021 16:02:02 -0000      1.6
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: users-lightbulb.html\n"
-"POT-Creation-Date: 2019-07-24 12:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+0000\n"
 "PO-Revision-Date: 2020-12-06 11:59+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -26,30 +27,57 @@
 "Combien faut-il d'utilisateurs de GNU/Linux pour changer une ampoule ? - "
 "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>
+# | </a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a
+# | [-href=\"/fun/humor.html#Software\">Software</a>&nbsp;/-]
+# | {+href=\"/fun/humor.html#Unclassified\">Unclassified</a>&nbsp;/+}
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+#| "href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">Humour GNU</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Informatique</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "How many GNU/Linux users are needed to change a light bulb?"
 msgstr "Combien faut-il d'utilisateurs de GNU/Linux pour changer une ampoule 
?"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><address>
+msgid "by Andr&eacute; Ferreira Machado"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "1 to post a thread in a mailing list telling the bulb has burnt."
 msgstr ""
 "1 pour démarrer un fil sur une liste de discussion, signalant que l'ampoule "
 "a grillé ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to suggest to try to turn the lamp on through command lines."
 msgstr "1 pour suggérer d'essayer la ligne de commande pour allumer la lampe 
;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to complain that the user broke the thread."
 msgstr ""
 "1 pour se plaindre que l'utilisateur précédent a rompu le fil(-ament) ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to ask what new bulb will he install."
 msgstr "1 pour demander quelle nouvelle ampoule il pense installer ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to advise that we shouldn't use the word burn for meaning a broken "
 "lightbulb, because it would mean that the bulb was set on fire and that it "
@@ -61,14 +89,14 @@
 "plutôt de dire que l'ampoule s'est cassée en raison d'un excès de courant "
 "électrique ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "25 to suggest to install all the kinds of existing and imaginable lightbulbs."
 msgstr ""
 "25 pour suggérer d'installer toutes sortes d'ampoules existantes ou "
 "imaginables ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 who say that the burnt bulb is an upstream issue that doesn't belong to "
 "the distro. There's an open bug on the bulb's developer mail list."
@@ -77,15 +105,15 @@
 "pas à la distribution ; un bogue a d'ailleurs été ouvert sur la liste de "
 "discussion des développeurs de l'ampoule ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 noob to suggest to install a Microsoft lightbulb."
 msgstr "1 noob pour suggérer d'installer une ampoule Microsoft ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "250 to flood the noob's mail address."
 msgstr "250 pour spammer l'adresse perso du noob ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "300 to say that a Microsoft lightbulb would turn blue and that you'd had to "
 "reboot continuously to get back to normal."
@@ -93,7 +121,7 @@
 "300 pour dire qu'une ampoule Microsoft virerait au bleu et qu'on devrait "
 "continuellement redémarrer pour revenir à la normale ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 former GNU/Linux user who still frequents the forum, to suggest to install "
 "an Apple iBulb, which has a fresh and innovating design and it costs $250."
@@ -102,7 +130,7 @@
 "suggérer d'installer une  iAmpoule d'Apple, d'une conception moderne et "
 "innovante, qui coûte 250 $ ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "20 to say that iBulbs aren't free, and that they have less functions than a "
 "20 times cheaper standard lightbulb."
@@ -110,11 +138,11 @@
 "20 pour dire que les iAmpoules ne sont pas libres et qu'elles ont moins de "
 "fonctions que des ampoules normales 20 fois moins chères ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "15 to suggest to install a national lightbulb."
 msgstr "15 pour suggérer d'installer une ampoule fabriquée localement ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "30 to say that national lightbulbs are crippled remasters of foreign "
 "lightbulbs and that they don't bring anything new."
@@ -122,17 +150,17 @@
 "30 pour dire que les ampoules locales sont de pâles copies d'ampoules "
 "étrangères et qu'elles n'apportent rien de nouveau ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "23 to argue if it must be a white or a transparent bulb."
 msgstr "23 pour discuter sur le choix d'une ampoule blanche ou transparente ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to remind everyone that the right name is GNU/Lightbulb."
 msgstr ""
 "1 pour rappeler à tout le monde que son appellation correcte est GNU/"
 "Ampoule ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that lightbulbs are a Winbugs users thing and that real GNU/Linux "
 "users aren't afraid of the dark."
@@ -140,15 +168,15 @@
 "1 pour dire que les ampoules sont des trucs pour les utilisateurs de "
 "Windaube et que les vrais utilisateurs de GNU/Linux n'ont pas peur du noir ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to announce finally which will be the model of the installed bulb."
 msgstr "1 pour annoncer enfin quel modèle d'ampoule sera installé ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "217 to discard the chosen model and suggest another."
 msgstr "217 pour rejeter le modèle choisi et en suggérer un autre ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "6 to complain that the chosen lightbulb has proprietary elements, and that "
 "another should be used."
@@ -156,20 +184,20 @@
 "6 pour se plaindre que l'ampoule choisie possède des éléments privateurs 
et "
 "qu'il faut en utiliser une autre ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "20 to say that a 100% free bulb, isn't compatible with the lamp switch."
 msgstr ""
 "20 pour dire qu'une ampoule 100% libre n'est pas compatible avec "
 "l'interrupteur de la lampe ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The same previous 6, to suggest to change the switch for a compatible one."
 msgstr ""
 "les mêmes 6 que précédemment, pour suggérer de remplacer ce dernier par 
un "
 "interrupteur compatible ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to yell out: &ldquo;STOP ARGUING AND CHANGE THAT LIGHTBULB FOR GOD'S SAKE!"
 "&rdquo;"
@@ -177,7 +205,7 @@
 "1 pour s'écrier: « ARRÊTEZ DE DISCUTER ET CHANGEZ CETTE AMPOULE, BON "
 "DIEU ! » ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "350 to ask the previous user what God is he talking about, and that if he "
 "has scientific proofs of His existence."
@@ -185,13 +213,13 @@
 "350 pour demander à l'utilisateur précédent de quel Dieu il parle et s'il 
a "
 "des preuves scientifiques de son existence ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to explain how electricity works and why a light bulb is inefficient."
 msgstr ""
 "1 pour expliquer comment fonctionne l'électricité et pourquoi les ampoules "
 "sont inefficaces ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that we can't trust in corporation-made bulbs and that we should "
 "trust in community-made bulbs."
@@ -200,7 +228,7 @@
 "par les entreprises et que nous devons faire confiance aux ampoules "
 "fabriquées par la communauté ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to post a link to an ODF file explaining how to build a lightbulb from "
 "scratch."
@@ -208,7 +236,7 @@
 "1 pour publier un lien vers un fichier ODF expliquant comment construire une "
 "ampoule à partir de zéro ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "14 to complain about the format of the previous file and asking to send it "
 "in txt or LaTeX."
@@ -216,7 +244,7 @@
 "14 pour se plaindre du format du fichier précédent et demander de l'envoyer 
"
 "en txt ou en LaTeX ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 to say that they didn't like the taken decision and that they'll fork the "
 "house's electric installation and install a better lamp."
@@ -225,27 +253,27 @@
 "vont dériver l'installation électrique de la maison pour installer une "
 "meilleure lampe ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to post a series of commands to put to change the lightbulb."
 msgstr ""
 "1 pour poster une série de commandes à utiliser pour changer l'ampoule ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to comment that he executed the commands and had an error message."
 msgstr ""
 "1 pour signaler en commentaire qu'il a exécuté les commandes et a reçu un "
 "message d'erreur ;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to advise that the commands must be executed as root."
 msgstr ""
 "1 pour lui conseiller d'exécuter les commande en tant qu'utilisateur root ;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "And finally:"
 msgstr "et enfin&hellip;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The father of the first user, who while everyone was discussing, went to the "
 "shop and bought the cheapest lightbulb."
@@ -253,21 +281,6 @@
 "le père du premier utilisateur qui, pendant que tout le monde discutait, est 
"
 "allé au magasin et a acheté l'ampoule la moins chère."
 
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr "Avis de non-responsabilité"
-
-#. type: Content of: <p>
-msgid ""
-"The joke on this page was mailed to the FSF by its author Andre Machado."
-msgstr "Cette blague a été envoyée à la FSF par son auteur, André 
Machado."
-
-#. 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 cette "
-"blague."
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -294,14 +307,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="
@@ -312,12 +325,24 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Andre Machado"
+# | Copyright &copy; 201[-4-]{+3+} Andre Machado
+#, fuzzy
+#| msgid "Copyright &copy; 2014 Andre Machado"
+msgid "Copyright &copy; 2013 Andre Machado"
 msgstr "Copyright &copy; 2014 Andre Machado"
 
 #. type: Content of: <div><p>
+# | [-This-]{+The joke on this+} page is licensed under [-a-] {+the+} <a
+# | rel=\"license\"
+# | href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons
+# | Attribution-NoDerivatives 4.0 International License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
-"This page is licensed under a <a rel=\"license\" href=\"http://";
+"The joke on this page is licensed under the <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
@@ -337,3 +362,15 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "Disclaimer"
+#~ msgstr "Avis de non-responsabilité"
+
+#~ msgid ""
+#~ "The joke on this page was mailed to the FSF by its author Andre Machado."
+#~ msgstr "Cette blague a été envoyée à la FSF par son auteur, André 
Machado."
+
+#~ 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/users-lightbulb.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/users-lightbulb.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/jokes/po/users-lightbulb.pot    24 Jul 2019 12:29:53 -0000      1.4
+++ fun/jokes/po/users-lightbulb.pot    15 Jul 2021 16:02:02 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: users-lightbulb.html\n"
-"POT-Creation-Date: 2019-07-24 12:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+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,27 +22,45 @@
 "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#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "How many GNU/Linux users are needed to change a light bulb?"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><address>
+msgid "by Andr&eacute; Ferreira Machado"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "1 to post a thread in a mailing list telling the bulb has burnt."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to suggest to try to turn the lamp on through command lines."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to complain that the user broke the thread."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to ask what new bulb will he install."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to advise that we shouldn't use the word burn for meaning a broken "
 "lightbulb, because it would mean that the bulb was set on fire and that it "
@@ -50,164 +68,152 @@
 "current."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "25 to suggest to install all the kinds of existing and imaginable "
 "lightbulbs."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 who say that the burnt bulb is an upstream issue that doesn't belong to "
 "the distro. There's an open bug on the bulb's developer mail list."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 noob to suggest to install a Microsoft lightbulb."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "250 to flood the noob's mail address."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "300 to say that a Microsoft lightbulb would turn blue and that you'd had to "
 "reboot continuously to get back to normal."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 former GNU/Linux user who still frequents the forum, to suggest to install "
 "an Apple iBulb, which has a fresh and innovating design and it costs $250."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "20 to say that iBulbs aren't free, and that they have less functions than a "
 "20 times cheaper standard lightbulb."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "15 to suggest to install a national lightbulb."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "30 to say that national lightbulbs are crippled remasters of foreign "
 "lightbulbs and that they don't bring anything new."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "23 to argue if it must be a white or a transparent bulb."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to remind everyone that the right name is GNU/Lightbulb."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that lightbulbs are a Winbugs users thing and that real GNU/Linux "
 "users aren't afraid of the dark."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to announce finally which will be the model of the installed bulb."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "217 to discard the chosen model and suggest another."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "6 to complain that the chosen lightbulb has proprietary elements, and that "
 "another should be used."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "20 to say that a 100% free bulb, isn't compatible with the lamp switch."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "The same previous 6, to suggest to change the switch for a compatible 
one."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to yell out: &ldquo;STOP ARGUING AND CHANGE THAT LIGHTBULB FOR GOD'S "
 "SAKE!&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "350 to ask the previous user what God is he talking about, and that if he "
 "has scientific proofs of His existence."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to explain how electricity works and why a light bulb is inefficient."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that we can't trust in corporation-made bulbs and that we should "
 "trust in community-made bulbs."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to post a link to an ODF file explaining how to build a lightbulb from "
 "scratch."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "14 to complain about the format of the previous file and asking to send it "
 "in txt or LaTeX."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 to say that they didn't like the taken decision and that they'll fork the "
 "house's electric installation and install a better lamp."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to post a series of commands to put to change the lightbulb."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to comment that he executed the commands and had an error message."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to advise that the commands must be executed as root."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "And finally:"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The father of the first user, who while everyone was discussing, went to the "
 "shop and bought the cheapest lightbulb."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The joke on this page was mailed to the FSF by its author Andre 
Machado."
-msgstr ""
-
-#. type: Content of: <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.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -232,7 +238,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>. 
@@ -240,16 +246,17 @@
 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; 2014 Andre Machado"
+msgid "Copyright &copy; 2013 Andre Machado"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"This page is licensed under a <a rel=\"license\" "
+"The joke on this page is licensed under the <a rel=\"license\" "
 "href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
 "Attribution-NoDerivatives 4.0 International License</a>."
 msgstr ""

Index: fun/jokes/po/users-lightbulb.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/users-lightbulb.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/jokes/po/users-lightbulb.ru.po  28 Jul 2019 10:31:26 -0000      1.4
+++ fun/jokes/po/users-lightbulb.ru.po  15 Jul 2021 16:02:02 -0000      1.5
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: users-lightbulb.html\n"
-"POT-Creation-Date: 2019-07-24 12:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:56+0000\n"
 "PO-Revision-Date: 2019-07-28 22:49+0300\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -25,28 +26,52 @@
 "Сколько нужно пользователей GNU/Linux, чтобы 
заменить лампочку? — Проект 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#Unclassified\">Unclassified</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "How many GNU/Linux users are needed to change a light bulb?"
 msgstr "Сколько нужно пользователей GNU/Linux, 
чтобы заменить лампочку?"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><address>
+msgid "by Andr&eacute; Ferreira Machado"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "1 to post a thread in a mailing list telling the bulb has burnt."
 msgstr "Один, чтобы сообщить в список 
рассылки, что лампочка сгорела."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to suggest to try to turn the lamp on through command lines."
 msgstr ""
 "Один, чтобы посоветовать попробовать 
включить лампу через командную строку."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to complain that the user broke the thread."
 msgstr "Один, чтобы пожаловаться на то, что 
другой разорвал нить обсуждения."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to ask what new bulb will he install."
 msgstr "Один, чтобы спросить, какую лампочку 
он собирается поставить."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to advise that we shouldn't use the word burn for meaning a broken "
 "lightbulb, because it would mean that the bulb was set on fire and that it "
@@ -57,12 +82,12 @@
 "неисправную лампочку, потому что это 
значит, что она воспламенилась; а "
 "правильно говорить, что лампа вышла из 
строя из-за слишком высокого тока."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "25 to suggest to install all the kinds of existing and imaginable lightbulbs."
 msgstr "25, чтобы насоветовать все мыслимые и 
немыслимые виды ламп."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 who say that the burnt bulb is an upstream issue that doesn't belong to "
 "the distro. There's an open bug on the bulb's developer mail list."
@@ -71,15 +96,15 @@
 "перегоревшими лампочками занимается 
разработчик, а не дистрибутив. И "
 "сообщение об ошибке в список рассылки 
разработчиков лампочки уже отправлено."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 noob to suggest to install a Microsoft lightbulb."
 msgstr "Один чайник, чтобы посоветовать 
поставить лампочку Микрософт."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "250 to flood the noob's mail address."
 msgstr "250, чтобы завалить чайника личными 
письмами."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "300 to say that a Microsoft lightbulb would turn blue and that you'd had to "
 "reboot continuously to get back to normal."
@@ -87,7 +112,7 @@
 "300, чтобы сказать, что лампочка Микрософт 
посинеет и ее придется постоянно "
 "перезагружать для возврата к нормальному 
состоянию."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 former GNU/Linux user who still frequents the forum, to suggest to install "
 "an Apple iBulb, which has a fresh and innovating design and it costs $250."
@@ -96,7 +121,7 @@
 "посоветовать поставить айлампочку Эпл с 
оригинальным инновационным дизайном "
 "за&nbsp;250&nbsp;долларов."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "20 to say that iBulbs aren't free, and that they have less functions than a "
 "20 times cheaper standard lightbulb."
@@ -104,11 +129,11 @@
 "20, чтобы сказать, что айлампочки 
несвободны и менее функциональны, чем "
 "стандартные лампочки, которые 
в&nbsp;20&nbsp;раз дешевле."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "15 to suggest to install a national lightbulb."
 msgstr "15, чтобы посоветовать поставить 
отечественную лампочку."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "30 to say that national lightbulbs are crippled remasters of foreign "
 "lightbulbs and that they don't bring anything new."
@@ -116,17 +141,17 @@
 "30, чтобы сказать, что отечественные 
лампочки&nbsp;&mdash; это кривые "
 "переделки импортных, не содержащие ничего 
нового."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "23 to argue if it must be a white or a transparent bulb."
 msgstr "23, чтобы завязать спор, матовая 
лампочка нужна или прозрачная."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to remind everyone that the right name is GNU/Lightbulb."
 msgstr ""
 "Один, чтобы напомнить всем, что правильное 
название&nbsp;&mdash; &ldquo;ГНУ/"
 "Лампочка&rdquo;."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that lightbulbs are a Winbugs users thing and that real GNU/Linux "
 "users aren't afraid of the dark."
@@ -134,15 +159,15 @@
 "Один, чтобы сказать, что лампочки&nbsp;&mdash; 
они для виндузятников, а "
 "настоящие гнулинуксоиды не боятся 
темноты."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to announce finally which will be the model of the installed bulb."
 msgstr "Один, чтобы сообщить наконец, что за 
модель лампочки поставят."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "217 to discard the chosen model and suggest another."
 msgstr "217, чтобы не согласиться с выбором и 
предложить другие варианты."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "6 to complain that the chosen lightbulb has proprietary elements, and that "
 "another should be used."
@@ -150,18 +175,18 @@
 "Шесть, чтобы посетовать, что у выбранной 
лампочки есть несвободные элементы "
 "и надо брать другую."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "20 to say that a 100% free bulb, isn't compatible with the lamp switch."
 msgstr ""
 "20, чтобы сказать, что стопроцентно 
свободная лампочка несовместима с "
 "выключателем."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The same previous 6, to suggest to change the switch for a compatible one."
 msgstr "Шесть из них, чтобы посоветовать 
сменить выключатель на совместимый."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to yell out: &ldquo;STOP ARGUING AND CHANGE THAT LIGHTBULB FOR GOD'S SAKE!"
 "&rdquo;"
@@ -169,7 +194,7 @@
 "Один, чтобы завопить благим матом: 
&ldquo;БОГА РАДИ, КОНЧАЙТЕ СПОРИТЬ, "
 "ПОМЕНЯЙТЕ УЖЕ ЭТУ ЛАМПОЧКУ!&rdquo;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "350 to ask the previous user what God is he talking about, and that if he "
 "has scientific proofs of His existence."
@@ -177,13 +202,13 @@
 "350, чтобы поинтересоваться, о каком боге он 
говорил и есть у него научные "
 "доказательства, что бог существует."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to explain how electricity works and why a light bulb is inefficient."
 msgstr ""
 "Один, чтобы объяснить, как работает 
электричество и почему лампочки "
 "неэффективны."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to say that we can't trust in corporation-made bulbs and that we should "
 "trust in community-made bulbs."
@@ -191,7 +216,7 @@
 "Один, чтобы сказать, что нельзя доверять 
коммерческим лампочкам, а только "
 "тем, что выпущены сообществом."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "1 to post a link to an ODF file explaining how to build a lightbulb from "
 "scratch."
@@ -199,7 +224,7 @@
 "Один, чтобы опубликовать файл ODF с 
инструкцией по изготовлению лампочки с "
 "нуля."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "14 to complain about the format of the previous file and asking to send it "
 "in txt or LaTeX."
@@ -207,7 +232,7 @@
 "14, чтобы пожаловаться на формат и 
попросить прислать инструкцию простым "
 "текстом или в ЛаТеХе."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "5 to say that they didn't like the taken decision and that they'll fork the "
 "house's electric installation and install a better lamp."
@@ -215,25 +240,25 @@
 "Пять, чтобы сказать, что им не нравится 
принятое решение, поэтому они "
 "форкнут всю домовую разводку и поставят 
лампочку получше."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to post a series of commands to put to change the lightbulb."
 msgstr "Один, чтобы опубликовать 
последовательность команд для смены 
лампочки."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to comment that he executed the commands and had an error message."
 msgstr ""
 "Один, чтобы ответить, что он проделал 
команды, но получил сообщение об "
 "ошибке."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "1 to advise that the commands must be executed as root."
 msgstr "Один, чтобы посоветовать проделать 
команды от имени рута."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "And finally:"
 msgstr "И наконец:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The father of the first user, who while everyone was discussing, went to the "
 "shop and bought the cheapest lightbulb."
@@ -241,21 +266,6 @@
 "Отец первого пользователя, который, пока 
все дискутировали, сходил в магазин "
 "и купил самую дешевую лампочку."
 
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr "Уведомление"
-
-#. type: Content of: <p>
-msgid ""
-"The joke on this page was mailed to the FSF by its author Andre Machado."
-msgstr "Шутка с этой страницы прислана в ФСПО 
ее автором, Андре Машаду."
-
-#. type: Content of: <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.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -282,14 +292,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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -300,14 +316,26 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Andre Machado"
+# | Copyright &copy; 201[-4-]{+3+} Andre Machado
+#, fuzzy
+#| msgid "Copyright &copy; 2014 Andre Machado"
+msgid "Copyright &copy; 2013 Andre Machado"
 msgstr ""
 "Copyright &copy; 2014 Andre Machado<br />Copyright &copy; 2015 Dmitry "
 "Alexandrov (translation)"
 
 #. type: Content of: <div><p>
+# | [-This-]{+The joke on this+} page is licensed under [-a-] {+the+} <a
+# | rel=\"license\"
+# | href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons
+# | Attribution-NoDerivatives 4.0 International License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
-"This page is licensed under a <a rel=\"license\" href=\"http://";
+"The joke on this page is licensed under the <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
@@ -325,3 +353,15 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid "Disclaimer"
+#~ msgstr "Уведомление"
+
+#~ msgid ""
+#~ "The joke on this page was mailed to the FSF by its author Andre Machado."
+#~ msgstr "Шутка с этой страницы прислана в 
ФСПО ее автором, Андре Машаду."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Фонд свободного программного 
обеспечения не претендует на авторство 
этой "
+#~ "шутки."

Index: fun/po/humor.de-diff.html
===================================================================
RCS file: /web/www/www/fun/po/humor.de-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/po/humor.de-diff.html   11 Jul 2021 17:30:34 -0000      1.9
+++ fun/po/humor.de-diff.html   15 Jul 2021 16:02:02 -0000      1.10
@@ -41,8 +41,9 @@
 
 &lt;ul&gt;
   &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/gcc.html"&gt;Suggested GCC 
Options&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/10-kinds-of-people.html"&gt;10 Kinds 
of People in
-  the World&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/any-key.html"&gt;Where is 
any-key??&lt;/a&gt;&lt;/li&gt;
+  the World&lt;/a&gt;&lt;/li&gt;</em></ins></span>
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/declarations.html"&gt;Funny C/C++
+  Declarations&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/any-key.html"&gt;Where is 
any-key??&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/fun/jokes/deadbeef.html"&gt;Dead 
Beef&lt;/a&gt;?&lt;/li&gt;
   &lt;li&gt;What does Dr. Emacs think of
   the &lt;a href="/fun/jokes/doctor.manifesto.html"&gt;GNU 
Manifesto&lt;/a&gt;?&lt;/li&gt;
@@ -66,9 +67,8 @@
 
 &lt;h3 id="Software"&gt;Software&lt;/h3&gt;
 
-&lt;ul&gt;</em></ins></span>
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/declarations.html"&gt;Funny C/C++
-  Declarations&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/brainfuck.html"&gt;Source code for 
ed in
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="/fun/jokes/brainfuck.html"&gt;Source code for ed in
   BrainFuck ;-)&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a href="/fun/jokes/c+-.html"&gt;C more or 
less&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;GPL'd &lt;a href="/fun/jokes/dna.html"&gt;source code&lt;/a&gt; 
for humans&lt;/li&gt;
@@ -86,7 +86,9 @@
   &lt;li&gt;&lt;a href="/fun/jokes/long-options.html"&gt;Long 
Options?&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a</em></ins></span> href="/fun/jokes/merry-xmas.html"&gt;Merry 
Christmas in 4
   languages&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/long-options.html"&gt;Long 
Options?&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/pasta.code.html"&gt;Spaghetti 
Code&lt;/a&gt;&lt;/li&gt;</em></ins></span>
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/long-options.html"&gt;Long 
Options?&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/pasta.code.html"&gt;Spaghetti 
Code&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/fun/jokes/santa_comes_to_town.html"&gt;Santa Claus 
comes to
+  town&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a href="/fun/jokes/software.terms.html"&gt;Software 
Terms&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/pasta.code.html"&gt;Spaghetti 
Code&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/ubuntu.html"&gt;Ubuntu&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a href="/fun/jokes/unix.errors.html"&gt;Unix Error 
Messages&lt;/a&gt;&lt;/li&gt;
@@ -158,7 +160,7 @@
 &lt;h3 id="TheFourthEstate"&gt;The Fourth Estate&lt;/h3&gt;
 
 &lt;ul&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/freesoftware.html"&gt;Free Software 
Hack&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/freesoftware.html"&gt;Free 
Software Hack&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/look-and-feel.html"&gt;Look and 
Feel&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a href="/fun/jokes/microsoft-church.html"&gt;Microsoft and the
   Church&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href="/fun/jokes/rectium.html"&gt;Rectium?&lt;/a&gt;&lt;/li&gt;
@@ -179,22 +181,22 @@
   Networks&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;The &lt;a 
href="/fun/jokes/vaxorcist.html"&gt;Vaxorcist&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/fun/jokes/virus-warning.html"&gt;Virus 
Warning&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/gullibility.virus.html"&gt;The Gullibility 
Virus&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/deadbeef.html"&gt;Dead 
Beef&lt;/a&gt;?&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/anagrams.html"&gt;Anagrams&lt;/a&gt; 
for some common
+  &lt;li&gt;&lt;a href="/fun/jokes/gullibility.virus.html"&gt;The Gullibility 
Virus&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/anagrams.html"&gt;Anagrams&lt;/a&gt; 
for some common
   words&lt;/li&gt;</em></ins></span>
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/deadbeef.html"&gt;Dead 
Beef&lt;/a&gt;?&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/fsf-in-german.html"&gt;FSF in 
German&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/gcc_audio.html"&gt;A Swarm of 
Gnats?&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/fundefinitions1.html"&gt;Fun 
Definitions 1&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html"&gt;
   Where Do Deleted Characters Go?&lt;/a&gt;&lt;/li&gt;</strong></del></span> 
<span class="inserted"><ins><em>href="/fun/jokes/fundefinitions2.html"&gt;Fun 
Definitions 2&lt;/a&gt;&lt;/li&gt;</em></ins></span>
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/10-kinds-of-people.html"&gt;10 
Kinds of People</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/grammar-in-the-bar.html"&gt;Grammar</em></ins></span>
 in the <span class="removed"><del><strong>World&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/xmodmap.html"&gt;Physical Xmodmap, or The 
Dvorak
-  Typewriter Hack&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/evilmalware.html"&gt;Why GNU/Linux Viruses 
are
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/10-kinds-of-people.html"&gt;10 
Kinds of People</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/grammar-in-the-bar.html"&gt;Grammar</em></ins></span>
 in the <span 
class="removed"><del><strong>World&lt;/a&gt;&lt;/li&gt;</strong></del></span> 
<span class="inserted"><ins><em>bar&lt;/a&gt;&lt;/li&gt;</em></ins></span>
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/xmodmap.html"&gt;Physical 
Xmodmap, or The Dvorak
+  Typewriter Hack&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/musical-pickup.html"&gt;Musical 
pickup&lt;/a&gt;&lt;/li&gt;</em></ins></span>
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/evilmalware.html"&gt;Why 
GNU/Linux Viruses are
   fairly uncommon&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h3 id="ScienceAndEngineering"&gt;Science and Engineering&lt;/h3&gt;
 
-&lt;ul&gt;</strong></del></span> <span 
class="inserted"><ins><em>bar&lt;/a&gt;&lt;/li&gt;</em></ins></span>
+&lt;ul&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/panama.html"&gt;Panama&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/phone.features.html"&gt;Phone 
Features&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/spilling-checker.html"&gt;Spilling 
Checker&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/physics.html"&gt;The Physics 
Store!&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;Some &lt;a href="/fun/jokes/science.facts.html"&gt;Scientific 
Facts&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/typoglycemia.html"&gt;Typoglycemia&lt;/a&gt;&lt;/li&gt;</em></ins></span>
@@ -233,27 +235,27 @@
   tree&hellip;&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>bugs&lt;/a&gt;!&lt;/li&gt;</em></ins></span>
   &lt;li&gt;Funny &lt;a href="/fun/jokes/courtroom.quips.html"&gt;Court
   Statements&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/fsf-in-german.html"&gt;FSF in 
German&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/fsf-in-german.html"&gt;FSF in 
German&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/freesoftware.html"&gt;Free Software 
Hack&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a href="/fun/jokes/gospel.html"&gt;Gospel&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/lawyers.html"&gt;Lawyer&lt;/a&gt; 
jokes&lt;/li&gt;
-  &lt;li&gt;&lt;a</strong></del></span> 
href="/fun/jokes/look-and-feel.html"&gt;Look and Feel&lt;/a&gt;&lt;/li&gt;
   <span class="inserted"><ins><em>&lt;li&gt;A luser's &lt;a 
href="/fun/jokes/luser-vs-rms.html"&gt;interaction&lt;/a&gt;
   with &lt;a href= 
"http://www.stallman.org/"&gt;rms&lt;/a&gt;&lt;/li&gt;</em></ins></span>
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/panama.html"&gt;Panama&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/lawyers.html"&gt;Lawyer&lt;/a&gt; 
jokes&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/fun/jokes/look-and-feel.html"&gt;Look and 
Feel&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/fun/jokes/panama.html"&gt;Panama&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/fun/jokes/linus-islam.html"&gt;Linus Torvalds 
converts to
-  Islam&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/musical-pickup.html"&gt;Musical 
pickup&lt;/a&gt;&lt;/li&gt;</em></ins></span>
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/quayle.html"&gt;Quayle&lt;/a&gt;&lt;/li&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/fun/jokes/panama.html"&gt;Panama&lt;/a&gt;&lt;/li&gt;</em></ins></span>
+  Islam&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href="/fun/jokes/quayle.html"&gt;Quayle&lt;/a&gt;&lt;/li&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="/fun/jokes/paging.game.html"&gt;The 
Paging Game&lt;/a&gt;&lt;/li&gt;</em></ins></span>
   &lt;li&gt;&lt;a 
href="/fun/jokes/quotations.html"&gt;Quotations&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/smileys.html"&gt;Smileys 
:-)&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/spilling-checker.html"&gt;Spilling 
Checker&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a</strong></del></span> 
href="/fun/jokes/santa_comes_to_town.html"&gt;Santa Claus comes to
+  &lt;li&gt;&lt;a href="/fun/jokes/smileys.html"&gt;Smileys 
:-)&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/spilling-checker.html"&gt;Spilling
 Checker&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/fun/jokes/santa_comes_to_town.html"&gt;Santa Claus 
comes to
   town&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/fun/jokes/top-10-election-2000-bumper-stickers.html"&gt;Top
+  &lt;li&gt;&lt;a 
href="/fun/jokes/top-10-election-2000-bumper-stickers.html"&gt;Top
   10 Election 2000 Bumper Stickers&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href="/fun/jokes/typoglycemia.html"&gt;Typoglycemia&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;The &lt;a href="/fun/jokes/wolf-logo.html"&gt;Wolf 
Logo&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/fun/jokes/filks.html"&gt;Some 
Filks&lt;/a&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/fun/jokes/smileys.html"&gt;Smileys 
:-)&lt;/a&gt;&lt;/li&gt;</em></ins></span>
-  &lt;li&gt;&lt;a href="/fun/jokes/users-lightbulb.html"&gt;How many GNU/Linux 
users are
+  &lt;li&gt;&lt;a href="/fun/jokes/filks.html"&gt;Some 
Filks&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a</strong></del></span> 
href="/fun/jokes/users-lightbulb.html"&gt;How many GNU/Linux users are
   needed to change a light bulb?&lt;/a&gt;&lt;/li&gt;
   <span class="inserted"><ins><em>&lt;li&gt;&lt;a 
href="/fun/jokes/wolf-logo.html"&gt;The Wolf 
Logo&lt;/a&gt;&lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
@@ -358,7 +360,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/07/11 17:30:34 $
+$Date: 2021/07/15 16:02:02 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: fun/po/humor.de.po
===================================================================
RCS file: /web/www/www/fun/po/humor.de.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- fun/po/humor.de.po  11 Jul 2021 17:30:34 -0000      1.71
+++ fun/po/humor.de.po  15 Jul 2021 16:02:02 -0000      1.72
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: humor.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-07-11 17:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2015-10-26 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online (PUNKT) de>\n"
 "Language-Team: www-de <www-de-translators@gnu.org>\n"
@@ -256,6 +256,13 @@
 "<a href=\"/fun/jokes/pasta.code.html\" hreflang=\"en\">Spaghetti-Code</a>"
 
 #. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
+msgstr ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\" hreflang=\"en\">Der "
+"Weihnachtsmann kommt in die Stadt</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/software.terms.html\">Software Terms</a>"
 msgstr ""
 "<a href=\"/fun/jokes/software.terms.html\" hreflang=\"en\">Software "
@@ -396,10 +403,9 @@
 msgstr "Die Vierte Gewalt"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
+msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
 msgstr ""
-"<a href=\"/fun/jokes/freesoftware.html\" hreflang=\"en\">Freie-Software-"
-"Hack</a>"
+"<a href=\"/fun/jokes/look-and-feel.html\" hreflang=\"en\">Look-und-Feel</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -428,6 +434,11 @@
 "einige häufig-vorkommende Wörter"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgstr ""
+"<a href=\"/fun/jokes/fsf-in-german.html\" hreflang=\"en\">FSF auf Deutsch</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/fundefinitions1.html\">Fun Definitions 1</a>"
 msgstr ""
 "<a href=\"/fun/jokes/fundefinitions1.html\" hreflang=\"en\">Fun-Definitionen "
@@ -448,6 +459,18 @@
 msgstr "<a href=\"/fun/jokes/hakawatha.html\" hreflang=\"en\">Hakawatha</a>"
 
 #. type: Content of: <div><ul><li>
+# | <a [-href=\"/fun/jokes/quayle.html\">Quayle</a>-]
+# | {+href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>+}
+#, fuzzy
+#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
+msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
+msgstr "<a href=\"/fun/jokes/quayle.html\" hreflang=\"en\">Quayle</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgstr "<a href=\"/fun/jokes/panama.html\" hreflang=\"en\">Panama</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/spilling-checker.html\">Spilling Checker</a>"
 msgstr ""
 "<a href=\"/fun/jokes/spilling-checker.html\" hreflang=\"en\">Spilling-"
@@ -496,20 +519,16 @@
 "Gerichtsurteile</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
 msgstr ""
-"<a href=\"/fun/jokes/fsf-in-german.html\" hreflang=\"en\">FSF auf Deutsch</a>"
+"<a href=\"/fun/jokes/freesoftware.html\" hreflang=\"en\">Freie-Software-"
+"Hack</a>"
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/gospel.html\">Gospel</a>"
 msgstr "<a href=\"/fun/jokes/gospel.html\" hreflang=\"en\">Gospel</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
-msgstr ""
-"<a href=\"/fun/jokes/look-and-feel.html\" hreflang=\"en\">Look-und-Feel</a>"
-
-#. type: Content of: <div><ul><li>
 msgid ""
 "A luser's <a href=\"/fun/jokes/luser-vs-rms.html\">interaction</a> with <a "
 "href= \"http://www.stallman.org/\";>rms</a>"
@@ -518,15 +537,11 @@
 "<a href= \"http://www.stallman.org/\"; hreflang=\"en\">RMS</a>"
 
 #. type: Content of: <div><ul><li>
-# | <a [-href=\"/fun/jokes/quayle.html\">Quayle</a>-]
-# | {+href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>+}
+# | <a [-href=\"/fun/jokes/panama.html\">Panama</a>-]
+# | {+href=\"/fun/jokes/paging.game.html\">The Paging Game</a>+}
 #, fuzzy
-#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
-msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
-msgstr "<a href=\"/fun/jokes/quayle.html\" hreflang=\"en\">Quayle</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+#| msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr "<a href=\"/fun/jokes/panama.html\" hreflang=\"en\">Panama</a>"
 
 #. type: Content of: <div><ul><li>
@@ -534,13 +549,6 @@
 msgstr "<a href=\"/fun/jokes/quotations.html\" hreflang=\"en\">Zitate</a>"
 
 #. type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
-msgstr ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\" hreflang=\"en\">Der "
-"Weihnachtsmann kommt in die Stadt</a>"
-
-#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/smileys.html\">Smileys :-)</a>"
 msgstr "<a href=\"/fun/jokes/smileys.html\" hreflang=\"en\">Smileys :-)</a>"
 

Index: fun/po/humor.fr.po
===================================================================
RCS file: /web/www/www/fun/po/humor.fr.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- fun/po/humor.fr.po  11 Jul 2021 19:09:41 -0000      1.66
+++ fun/po/humor.fr.po  15 Jul 2021 16:02:02 -0000      1.67
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2021-07-11 17:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2021-07-11 21:08+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-15 15:55+0000\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
@@ -223,6 +224,13 @@
 msgstr "<a href=\"/fun/jokes/pasta.code.html\">Code spaghetti</a>"
 
 #. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
+msgstr ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Le Père Noël vient en 
ville</"
+"a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/software.terms.html\">Software Terms</a>"
 msgstr "<a href=\"/fun/jokes/software.terms.html\">Vocabulaire du logiciel</a>"
 
@@ -344,8 +352,8 @@
 msgstr "La quatrième pouvoir"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
-msgstr "<a href=\"/fun/jokes/freesoftware.html\">Hack du logiciel libre</a>"
+msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
+msgstr "<a href=\"/fun/jokes/look-and-feel.html\">Apparence</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -370,6 +378,10 @@
 "<a href=\"/fun/jokes/anagrams.html\">Anagrames</a> de quelques mots courants"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSF en allemand</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/fundefinitions1.html\">Fun Definitions 1</a>"
 msgstr ""
 "<a href=\"/fun/jokes/fundefinitions1.html\">Définitions amusantes 1</a>"
@@ -385,6 +397,15 @@
 "<a href=\"/fun/jokes/grammar-in-the-bar.html\">La grammaire va au café</a>"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
+msgstr ""
+"<a href=\"/fun/jokes/musical-pickup.html\">Embarquer une fille en musique</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgstr "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/spilling-checker.html\">Spilling Checker</a>"
 msgstr ""
 "<a href=\"/fun/jokes/spilling-checker.html\">Collecteur orthographique</a>"
@@ -422,18 +443,14 @@
 msgstr "<a href=\"/fun/jokes/courtroom.quips.html\">Entendu au tribunal</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
-msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSF en allemand</a>"
+msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
+msgstr "<a href=\"/fun/jokes/freesoftware.html\">Hack du logiciel libre</a>"
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/gospel.html\">Gospel</a>"
 msgstr "<a href=\"/fun/jokes/gospel.html\">Évangile</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
-msgstr "<a href=\"/fun/jokes/look-and-feel.html\">Apparence</a>"
-
-#. type: Content of: <div><ul><li>
 msgid ""
 "A luser's <a href=\"/fun/jokes/luser-vs-rms.html\">interaction</a> with <a "
 "href= \"http://www.stallman.org/\";>rms</a>"
@@ -442,12 +459,11 @@
 "avec <a href= \"http://www.stallman.org/\";>rms</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
-msgstr ""
-"<a href=\"/fun/jokes/musical-pickup.html\">Embarquer une fille en musique</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+# | <a [-href=\"/fun/jokes/panama.html\">Panama</a>-]
+# | {+href=\"/fun/jokes/paging.game.html\">The Paging Game</a>+}
+#, fuzzy
+#| msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr "<a href=\"/fun/jokes/panama.html\">Panama</a>"
 
 #. type: Content of: <div><ul><li>
@@ -455,13 +471,6 @@
 msgstr "<a href=\"/fun/jokes/quotations.html\">Citations</a>"
 
 #. type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
-msgstr ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Le Père Noël vient en 
ville</"
-"a>"
-
-#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/smileys.html\">Smileys :-)</a>"
 msgstr "<a href=\"/fun/jokes/smileys.html\">Émoticones :-)</a>"
 

Index: fun/po/humor.ja.po
===================================================================
RCS file: /web/www/www/fun/po/humor.ja.po,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- fun/po/humor.ja.po  11 Jul 2021 17:30:34 -0000      1.64
+++ fun/po/humor.ja.po  15 Jul 2021 16:02:02 -0000      1.65
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2021-07-11 17:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2020-12-01 09:21+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -224,6 +224,12 @@
 msgstr "<a href=\"/fun/jokes/pasta.code.html\">スパゲッティコード</a>"
 
 #. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
+msgstr ""
+"<a 
href=\"/fun/jokes/santa_comes_to_town.html\">サンタが街にやってくる</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/software.terms.html\">Software Terms</a>"
 msgstr "<a 
href=\"/fun/jokes/software.terms.html\">ソフトウェア用語</a>"
 
@@ -342,8 +348,8 @@
 msgstr "第四階級"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
-msgstr "<a 
href=\"/fun/jokes/freesoftware.html\">自由ソフトウェアのハック</a>"
+msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
+msgstr "<a 
href=\"/fun/jokes/look-and-feel.html\">ルックアンドフィール</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -368,6 +374,10 @@
 "いくつかの一般的な言葉の<a 
href=\"/fun/jokes/anagrams.html\">アナグラム</a>"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSFをドイツ語で</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/fundefinitions1.html\">Fun Definitions 1</a>"
 msgstr "<a href=\"/fun/jokes/fundefinitions1.html\">おもしろ定義1</a>"
 
@@ -380,6 +390,16 @@
 msgstr "<a href=\"/fun/jokes/grammar-in-the-bar.html\">バーでの文法</a>"
 
 #. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
+msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
+msgstr "<a href=\"/fun/jokes/quayle.html\">クエール氏</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgstr "<a href=\"/fun/jokes/panama.html\">パナマ</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/spilling-checker.html\">Spilling Checker</a>"
 msgstr "<a href=\"/fun/jokes/spilling-checker.html\">漏洩チェッカー</a>"
 
@@ -416,18 +436,14 @@
 msgstr "おかしな<a 
href=\"/fun/jokes/courtroom.quips.html\">裁判所判決</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
-msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSFをドイツ語で</a>"
+msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
+msgstr "<a 
href=\"/fun/jokes/freesoftware.html\">自由ソフトウェアのハック</a>"
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/gospel.html\">Gospel</a>"
 msgstr "<a href=\"/fun/jokes/gospel.html\">ゴスペル</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
-msgstr "<a 
href=\"/fun/jokes/look-and-feel.html\">ルックアンドフィール</a>"
-
-#. type: Content of: <div><ul><li>
 msgid ""
 "A luser's <a href=\"/fun/jokes/luser-vs-rms.html\">interaction</a> with <a "
 "href= \"http://www.stallman.org/\";>rms</a>"
@@ -437,12 +453,8 @@
 
 #. type: Content of: <div><ul><li>
 #, fuzzy
-#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
-msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
-msgstr "<a href=\"/fun/jokes/quayle.html\">クエール氏</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+#| msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr "<a href=\"/fun/jokes/panama.html\">パナマ</a>"
 
 #. type: Content of: <div><ul><li>
@@ -450,12 +462,6 @@
 msgstr "<a href=\"/fun/jokes/quotations.html\">引用</a>"
 
 #. type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
-msgstr ""
-"<a 
href=\"/fun/jokes/santa_comes_to_town.html\">サンタが街にやってくる</a>"
-
-#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/smileys.html\">Smileys :-)</a>"
 msgstr "<a href=\"/fun/jokes/smileys.html\">スマイリーマーク :-)</a>"
 

Index: fun/po/humor.pot
===================================================================
RCS file: /web/www/www/fun/po/humor.pot,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- fun/po/humor.pot    11 Jul 2021 17:30:34 -0000      1.40
+++ fun/po/humor.pot    15 Jul 2021 16:02:02 -0000      1.41
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2021-07-11 17:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+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"
@@ -188,6 +188,12 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to "
+"town</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/software.terms.html\">Software Terms</a>"
 msgstr ""
 
@@ -294,7 +300,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
+msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -318,6 +324,10 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/fundefinitions1.html\">Fun Definitions 1</a>"
 msgstr ""
 
@@ -330,6 +340,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/spilling-checker.html\">Spilling Checker</a>"
 msgstr ""
 
@@ -364,7 +382,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -372,21 +390,13 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
-msgstr ""
-
-#. type: Content of: <div><ul><li>
 msgid ""
 "A luser's <a href=\"/fun/jokes/luser-vs-rms.html\">interaction</a> with <a "
 "href= \"http://www.stallman.org/\";>rms</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
-msgstr ""
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -394,12 +404,6 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to "
-"town</a>"
-msgstr ""
-
-#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/smileys.html\">Smileys :-)</a>"
 msgstr ""
 

Index: fun/po/humor.ru.po
===================================================================
RCS file: /web/www/www/fun/po/humor.ru.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- fun/po/humor.ru.po  11 Jul 2021 17:30:34 -0000      1.24
+++ fun/po/humor.ru.po  15 Jul 2021 16:02:02 -0000      1.25
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2021-07-11 17:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2020-11-10 17:00+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -232,6 +232,12 @@
 msgstr "<a 
href=\"/fun/jokes/pasta.code.html\">Программа-спагетти</a>"
 
 #. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
+msgstr ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Маршрут Деда 
Мороза</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/software.terms.html\">Software Terms</a>"
 msgstr "<a href=\"/fun/jokes/software.terms.html\">Компьютерные 
термины</a>"
 
@@ -353,9 +359,8 @@
 msgstr "Четвертое сословие"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
-msgstr ""
-"<a href=\"/fun/jokes/freesoftware.html\">Хак со свободными 
программами</a>"
+msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
+msgstr "<a href=\"/fun/jokes/look-and-feel.html\">Внешний вид</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -380,6 +385,10 @@
 "<a href=\"/fun/jokes/anagrams.html\">Анаграммы</a> некоторых
 общих слов"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">ФСПО 
по-немецки</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/fundefinitions1.html\">Fun Definitions 1</a>"
 msgstr "<a href=\"/fun/jokes/fundefinitions1.html\">Забавные 
определения 1</a>"
 
@@ -392,6 +401,18 @@
 msgstr "<a href=\"/fun/jokes/grammar-in-the-bar.html\">Грамматика в 
баре</a>"
 
 #. type: Content of: <div><ul><li>
+# | <a [-href=\"/fun/jokes/quayle.html\">Quayle</a>-]
+# | {+href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>+}
+#, fuzzy
+#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
+msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
+msgstr "<a href=\"/fun/jokes/quayle.html\">Квейль</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgstr "<a href=\"/fun/jokes/panama.html\">Панама</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/spilling-checker.html\">Spilling Checker</a>"
 msgstr "<a 
href=\"/fun/jokes/spilling-checker.html\">Левописание</a>"
 
@@ -433,18 +454,15 @@
 "Забавные <a 
href=\"/fun/jokes/courtroom.quips.html\">заявления на суде</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
-msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">ФСПО 
по-немецки</a>"
+msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
+msgstr ""
+"<a href=\"/fun/jokes/freesoftware.html\">Хак со свободными 
программами</a>"
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/gospel.html\">Gospel</a>"
 msgstr "<a href=\"/fun/jokes/gospel.html\">Евангелие</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
-msgstr "<a href=\"/fun/jokes/look-and-feel.html\">Внешний вид</a>"
-
-#. type: Content of: <div><ul><li>
 msgid ""
 "A luser's <a href=\"/fun/jokes/luser-vs-rms.html\">interaction</a> with <a "
 "href= \"http://www.stallman.org/\";>rms</a>"
@@ -453,15 +471,11 @@
 "пользователя</a> с <a href=\"http://www.stallman.org/\";>rms</a>"
 
 #. type: Content of: <div><ul><li>
-# | <a [-href=\"/fun/jokes/quayle.html\">Quayle</a>-]
-# | {+href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>+}
+# | <a [-href=\"/fun/jokes/panama.html\">Panama</a>-]
+# | {+href=\"/fun/jokes/paging.game.html\">The Paging Game</a>+}
 #, fuzzy
-#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
-msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
-msgstr "<a href=\"/fun/jokes/quayle.html\">Квейль</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+#| msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr "<a href=\"/fun/jokes/panama.html\">Панама</a>"
 
 #. type: Content of: <div><ul><li>
@@ -469,12 +483,6 @@
 msgstr "<a href=\"/fun/jokes/quotations.html\">Цитаты</a>"
 
 #. type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
-msgstr ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Маршрут Деда 
Мороза</a>"
-
-#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/smileys.html\">Smileys :-)</a>"
 msgstr "<a href=\"/fun/jokes/smileys.html\">Смайлики :-)</a>"
 

Index: fun/po/humor.sq.po
===================================================================
RCS file: /web/www/www/fun/po/humor.sq.po,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- fun/po/humor.sq.po  11 Jul 2021 17:30:34 -0000      1.48
+++ fun/po/humor.sq.po  15 Jul 2021 16:02:02 -0000      1.49
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2021-07-11 17:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2021-03-01 19:27+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: \n"
@@ -229,6 +229,13 @@
 msgstr "<a href=\"/fun/jokes/pasta.code.html\">Kod për Spageti</a>"
 
 #. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
+msgstr ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Babagjyshi i Vitit të Ri po "
+"mbërrin në qytet</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/software.terms.html\">Software Terms</a>"
 msgstr "<a href=\"/fun/jokes/software.terms.html\">Terma Software-i</a>"
 
@@ -347,8 +354,8 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
-msgstr ""
+msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
+msgstr "<a href=\"/fun/jokes/look-and-feel.html\">Pamja dhe Ndjesitë</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -373,6 +380,10 @@
 "<a href=\"/fun/jokes/anagrams.html\">Anagrame</a> për disa fjalë të 
rëndomta"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSF-ja në Gjermanisht</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/fundefinitions1.html\">Fun Definitions 1</a>"
 msgstr ""
 "<a href=\"/fun/jokes/fundefinitions1.html\">Përkufizime Zbavitëse 1</a>"
@@ -387,6 +398,16 @@
 msgstr "<a href=\"/fun/jokes/grammar-in-the-bar.html\">Gramatikë në bar</a>"
 
 #. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
+msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
+msgstr "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgstr "<a href=\"/fun/jokes/panama.html\">Panamaja</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/spilling-checker.html\">Spilling Checker</a>"
 msgstr ""
 
@@ -424,18 +445,14 @@
 "<a href=\"/fun/jokes/courtroom.quips.html\">Citime të Forta nga Gjykata</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
-msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSF-ja në Gjermanisht</a>"
+msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
+msgstr ""
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/gospel.html\">Gospel</a>"
 msgstr "<a href=\"/fun/jokes/gospel.html\">Ungjilli</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
-msgstr "<a href=\"/fun/jokes/look-and-feel.html\">Pamja dhe Ndjesitë</a>"
-
-#. type: Content of: <div><ul><li>
 msgid ""
 "A luser's <a href=\"/fun/jokes/luser-vs-rms.html\">interaction</a> with <a "
 "href= \"http://www.stallman.org/\";>rms</a>"
@@ -443,12 +460,8 @@
 
 #. type: Content of: <div><ul><li>
 #, fuzzy
-#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
-msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
-msgstr "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+#| msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr "<a href=\"/fun/jokes/panama.html\">Panamaja</a>"
 
 #. type: Content of: <div><ul><li>
@@ -456,13 +469,6 @@
 msgstr "<a href=\"/fun/jokes/quotations.html\">Thënie</a>"
 
 #. type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
-msgstr ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Babagjyshi i Vitit të Ri po "
-"mbërrin në qytet</a>"
-
-#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/smileys.html\">Smileys :-)</a>"
 msgstr "<a href=\"/fun/jokes/smileys.html\">Emotikone :-)</a>"
 

Index: fun/po/humor.zh-cn.po
===================================================================
RCS file: /web/www/www/fun/po/humor.zh-cn.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- fun/po/humor.zh-cn.po       12 Jul 2021 06:30:45 -0000      1.22
+++ fun/po/humor.zh-cn.po       15 Jul 2021 16:02:02 -0000      1.23
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2021-07-11 17:25+0000\n"
+"POT-Creation-Date: 2021-07-15 15:55+0000\n"
 "PO-Revision-Date: 2021-07-12 14:17+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@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-15 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Laugh along with GNU - GNU Project - Free Software Foundation"
@@ -205,6 +206,11 @@
 msgstr "<a href=\"/fun/jokes/pasta.code.html\">浆糊式代码</a>"
 
 #. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
+msgstr "<a href=\"/fun/jokes/santa_comes_to_town.html\">圣诞老人进城</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/software.terms.html\">Software Terms</a>"
 msgstr "<a href=\"/fun/jokes/software.terms.html\">软件术语</a>"
 
@@ -316,8 +322,8 @@
 msgstr "第四产业<sup><a href=\"#TransNote1\">1</a></sup>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
-msgstr "<a href=\"/fun/jokes/freesoftware.html\">刀砍自由软件</a>"
+msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
+msgstr "<a href=\"/fun/jokes/look-and-feel.html\">外观和感受</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -341,6 +347,10 @@
 msgstr "关于某些常见字的<a 
href=\"/fun/jokes/anagrams.html\">谜语</a>"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
+msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSF的德语意思</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/fundefinitions1.html\">Fun Definitions 1</a>"
 msgstr "<a href=\"/fun/jokes/fundefinitions1.html\">滑稽定义 1</a>"
 
@@ -353,6 +363,14 @@
 msgstr "<a href=\"/fun/jokes/grammar-in-the-bar.html\">é…
’吧里的老奶奶</a>"
 
 #. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
+msgstr "<a href=\"/fun/jokes/musical-pickup.html\">音乐提取</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgstr "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/spilling-checker.html\">Spilling Checker</a>"
 msgstr "<a href=\"/fun/jokes/spilling-checker.html\">拼泻检查</a>"
 
@@ -387,18 +405,14 @@
 msgstr "可笑的<a href=\"/fun/jokes/courtroom.quips.html\">法庭陈述</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/fsf-in-german.html\">FSF in German</a>"
-msgstr "<a href=\"/fun/jokes/fsf-in-german.html\">FSF的德语意思</a>"
+msgid "<a href=\"/fun/jokes/freesoftware.html\">Free Software Hack</a>"
+msgstr "<a href=\"/fun/jokes/freesoftware.html\">刀砍自由软件</a>"
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/gospel.html\">Gospel</a>"
 msgstr "<a href=\"/fun/jokes/gospel.html\">福音</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/look-and-feel.html\">Look and Feel</a>"
-msgstr "<a href=\"/fun/jokes/look-and-feel.html\">外观和感受</a>"
-
-#. type: Content of: <div><ul><li>
 msgid ""
 "A luser's <a href=\"/fun/jokes/luser-vs-rms.html\">interaction</a> with <a "
 "href= \"http://www.stallman.org/\";>rms</a>"
@@ -407,11 +421,9 @@
 "stallman.org/\">rms</a>"
 
 #. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
-msgstr "<a href=\"/fun/jokes/musical-pickup.html\">音乐提取</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+#, fuzzy
+#| msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
+msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr "<a href=\"/fun/jokes/panama.html\">Panama</a>"
 
 #. type: Content of: <div><ul><li>
@@ -419,11 +431,6 @@
 msgstr "<a href=\"/fun/jokes/quotations.html\">引用</a>"
 
 #. type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"/fun/jokes/santa_comes_to_town.html\">Santa Claus comes to town</a>"
-msgstr "<a href=\"/fun/jokes/santa_comes_to_town.html\">圣诞老人进城</a>"
-
-#. type: Content of: <div><ul><li>
 msgid "<a href=\"/fun/jokes/smileys.html\">Smileys :-)</a>"
 msgstr "<a href=\"/fun/jokes/smileys.html\">笑脸:-)</a>"
 

Index: server/gnun/compendia/compendium.af.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.af.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/gnun/compendia/compendium.af.po      14 Jul 2021 16:30:56 -0000      
1.124
+++ server/gnun/compendia/compendium.af.po      15 Jul 2021 16:02:03 -0000      
1.125
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -192,15 +192,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.ar.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ar.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.ar.po      14 Jul 2021 16:30:56 -0000      
1.129
+++ server/gnun/compendia/compendium.ar.po      15 Jul 2021 16:02:03 -0000      
1.130
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: companies\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2009-09-12 22:47+0200\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic\n"
@@ -184,19 +184,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"/graphics/graphics.html\">Other art</a> in the GNU Art Gallery."
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/graphics/graphics.html\">لوحات فنية أخرى </a> في م
عرض GNU الفني."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -446,6 +433,15 @@
 msgid "Donald Craig"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "<a href=\"/graphics/graphics.html\">Other art</a> in the GNU Art Gallery."
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/graphics/graphics.html\">لوحات فنية أخرى </a> في 
معرض GNU "
+#~ "الفني."
+
 # type: Content of: <div><p>
 #, fuzzy
 #~| msgid ""

Index: server/gnun/compendia/compendium.bg.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.bg.po,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/gnun/compendia/compendium.bg.po      14 Jul 2021 16:30:56 -0000      
1.130
+++ server/gnun/compendia/compendium.bg.po      15 Jul 2021 16:02:03 -0000      
1.131
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compendium\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bulgarian \n"
@@ -199,15 +199,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.ca.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ca.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/gnun/compendia/compendium.ca.po      14 Jul 2021 16:30:56 -0000      
1.132
+++ server/gnun/compendia/compendium.ca.po      15 Jul 2021 16:02:03 -0000      
1.133
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: software.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2012-07-12 12:23+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@gnu.org>\n"
@@ -197,17 +197,6 @@
 msgid "Disclaimer"
 msgstr "Limitació de responsabilitats"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/fun/humor.html\">Altres acudits</a> in a la Col·lecció d'Humor "
-"GNU."
-
-#. type: Content of: <p>
-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: <div>
 #, fuzzy
 #| msgid ""
@@ -489,6 +478,15 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">Altres acudits</a> in a la Col·lecció 
d'Humor "
+#~ "GNU."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr "La Free Software Foundation no té el copyright d'aquest acudit."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.cs.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.cs.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.cs.po      14 Jul 2021 16:30:56 -0000      
1.128
+++ server/gnun/compendia/compendium.cs.po      15 Jul 2021 16:02:03 -0000      
1.129
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compendium.cs.po\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2012-06-01 18:02+0200\n"
 "Last-Translator: František Kučera <franta-gnu@frantovo.cz>\n"
 "Language-Team: Czech <www-cs-general@gnu.org>\n"
@@ -195,17 +195,6 @@
 msgid "Disclaimer"
 msgstr "Varová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\">Ostatní humor</a> v kolekci GNU Humor."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Nadace pro svobodný software si nenárokuje žádná autorská práva na 
tento "
-"vtip."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -437,6 +426,15 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Ostatní humor</a> v kolekci GNU Humor."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Nadace pro svobodný software si nenárokuje žádná autorská práva na 
tento "
+#~ "vtip."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.da.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.da.po,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/gnun/compendia/compendium.da.po      14 Jul 2021 16:30:56 -0000      
1.68
+++ server/gnun/compendia/compendium.da.po      15 Jul 2021 16:02:03 -0000      
1.69
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy-menu.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2015-05-23 06:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <LL@li.org>\n"
@@ -165,15 +165,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.de.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.de.po,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- server/gnun/compendia/compendium.de.po      14 Jul 2021 16:30:56 -0000      
1.178
+++ server/gnun/compendia/compendium.de.po      15 Jul 2021 16:02:03 -0000      
1.179
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2020-03-04 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -188,16 +188,6 @@
 msgid "Disclaimer"
 msgstr "Ausschlussklausel/Verzichtserklärung"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/\">Mehr aus der GNU Humor-Sammlung …</a>"
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Die Free Software Foundation erhebt keine Urheberrechte an diesem Witz."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -471,6 +461,14 @@
 msgstr "Donald Craig"
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/\">Mehr aus der GNU Humor-Sammlung …</a>"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Die Free Software Foundation erhebt keine Urheberrechte an diesem Witz."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.el.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.el.po,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- server/gnun/compendia/compendium.el.po      14 Jul 2021 16:30:56 -0000      
1.134
+++ server/gnun/compendia/compendium.el.po      15 Jul 2021 16:02:03 -0000      
1.135
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: www-el_v0.2.0\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2015-04-27 11:03+0200\n"
 "Last-Translator: Georgios Zarkadas <gz@member.fsf.org>\n"
 "Language-Team: Greek <www-el-translators@gnu.org>\n"
@@ -187,18 +187,6 @@
 msgid "Disclaimer"
 msgstr "Αποποίηση ευθυνών"
 
-#. 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: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Το Ίδρυμα Ελεύθερου Λογισμικού δεν ισχυ
ρίζεται πνευματικά δικαιώματα σε αυτό "
-"το αστείο."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -438,6 +426,17 @@
 msgstr ""
 
 #~ 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 "The Free Software Foundation claims no copyright on this joke."
+#~ 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 ""

Index: server/gnun/compendia/compendium.eo.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.eo.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/gnun/compendia/compendium.eo.po      14 Jul 2021 16:30:56 -0000      
1.14
+++ server/gnun/compendia/compendium.eo.po      15 Jul 2021 16:02:03 -0000      
1.15
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: body-include-1.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2021-02-24 20:57-0300\n"
 "Last-Translator: Eduardo Trápani <etrapani@gmail.com>\n"
 "Language-Team: Esperanto <www-eo-tradukado@gnu.org>\n"
@@ -174,15 +174,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.es.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.es.po,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- server/gnun/compendia/compendium.es.po      14 Jul 2021 16:30:56 -0000      
1.137
+++ server/gnun/compendia/compendium.es.po      15 Jul 2021 16:02:03 -0000      
1.138
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2012-09-14 15:43+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -191,18 +191,6 @@
 msgid "Disclaimer"
 msgstr "Disclaimer"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/fun/humor.html\">Más humor</a> en la página de humor de GNU."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"La Free Software Foundation no es titular de los derechos de autor de este "
-"chiste."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -460,6 +448,16 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">Más humor</a> en la página de humor de GNU."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "La Free Software Foundation no es titular de los derechos de autor de "
+#~ "este chiste."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.fa.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fa.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/gnun/compendia/compendium.fa.po      14 Jul 2021 16:30:56 -0000      
1.126
+++ server/gnun/compendia/compendium.fa.po      15 Jul 2021 16:02:03 -0000      
1.127
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -213,15 +213,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.fi.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fi.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/gnun/compendia/compendium.fi.po      14 Jul 2021 16:30:56 -0000      
1.33
+++ server/gnun/compendia/compendium.fi.po      15 Jul 2021 16:02:03 -0000      
1.34
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: body-include-1.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2019-08-09 07:30+0000\n"
 "Last-Translator: \n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -185,15 +185,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.fr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fr.po,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/gnun/compendia/compendium.fr.po      14 Jul 2021 17:30:47 -0000      
1.135
+++ server/gnun/compendia/compendium.fr.po      15 Jul 2021 16:02:03 -0000      
1.136
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: README.translations.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2013-01-05 12:49+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -185,19 +185,6 @@
 msgid "Disclaimer"
 msgstr "Renonciation au copyright"
 
-#. 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: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"La <cite>Free Software Foundation</cite> ne revendique pas de copyright sur "
-"cette blague."
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
@@ -429,6 +416,17 @@
 msgstr ""
 
 #~ 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 <cite>Free Software Foundation</cite> ne revendique pas de copyright "
+#~ "sur cette blague."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.he.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.he.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/gnun/compendia/compendium.he.po      14 Jul 2021 16:30:56 -0000      
1.124
+++ server/gnun/compendia/compendium.he.po      15 Jul 2021 16:02:03 -0000      
1.125
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -167,15 +167,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.hr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.hr.po,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- server/gnun/compendia/compendium.hr.po      14 Jul 2021 16:30:56 -0000      
1.108
+++ server/gnun/compendia/compendium.hr.po      15 Jul 2021 16:02:03 -0000      
1.109
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: thegnuproject.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2013-04-07 10:09+0100\n"
 "Last-Translator: Marin Rameša <marin.ramesa@gmail.com>\n"
 "Language-Team: hrvatski <>\n"
@@ -207,17 +207,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "The Free Software Foundation"
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr "Zaklada za slobodan softver"
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -476,6 +465,11 @@
 msgstr ""
 
 #, fuzzy
+#~| msgid "The Free Software Foundation"
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr "Zaklada za slobodan softver"
+
+#, 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/"

Index: server/gnun/compendia/compendium.id.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.id.po,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/gnun/compendia/compendium.id.po      14 Jul 2021 16:30:56 -0000      
1.125
+++ server/gnun/compendia/compendium.id.po      15 Jul 2021 16:02:03 -0000      
1.126
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -217,20 +217,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-# type: Content of: <div><h2>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "Check out other Free Software Foundation campaigns"
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Lihat juga kampanye Free Software Foundation yang lain (Saat ini hanya "
-"tersedia dalam Bahasa Inggris)"
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
@@ -461,6 +447,14 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><h2>
+#, fuzzy
+#~| msgid "Check out other Free Software Foundation campaigns"
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Lihat juga kampanye Free Software Foundation yang lain (Saat ini hanya "
+#~ "tersedia dalam Bahasa Inggris)"
+
 # type: Content of: <p>
 #, fuzzy
 #~| msgid ""

Index: server/gnun/compendia/compendium.it.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.it.po,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- server/gnun/compendia/compendium.it.po      14 Jul 2021 16:30:56 -0000      
1.154
+++ server/gnun/compendia/compendium.it.po      15 Jul 2021 16:02:03 -0000      
1.155
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compendium.it.po\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2019-02-07 23:07+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian\n"
@@ -195,18 +195,6 @@
 msgid "Disclaimer"
 msgstr "Disclaimer"
 
-#. 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: <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."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -516,6 +504,17 @@
 msgstr "Donald Craig"
 
 #~ 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 "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "La Free Software Foundation non ha il copyright di questo testo "
+#~ "divertente."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.ja.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ja.po,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- server/gnun/compendia/compendium.ja.po      14 Jul 2021 16:30:56 -0000      
1.145
+++ server/gnun/compendia/compendium.ja.po      15 Jul 2021 16:02:03 -0000      
1.146
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compendium\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2017-01-24 12:04+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -179,19 +179,6 @@
 msgid "Disclaimer"
 msgstr "免責事項"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"GNUユーモア・コレクションの<a 
href=\"/fun/humor.html\">そのほかのユーモア</"
-"a>。"
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"フリーソフトウェアファウンデーションはこのジョークに関して著作権を主張しませ"
-"ん。"
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -445,6 +432,17 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "GNUユーモア・コレクションの<a 
href=\"/fun/humor.html\">そのほかのユーモア"
+#~ "</a>。"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ 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 ""

Index: server/gnun/compendia/compendium.ko.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ko.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/gnun/compendia/compendium.ko.po      14 Jul 2021 16:30:56 -0000      
1.132
+++ server/gnun/compendia/compendium.ko.po      15 Jul 2021 16:02:03 -0000      
1.133
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compendium.pot\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2012-05-04 15:21+0900\n"
 "Last-Translator: Chang-hun Song <chsong@gnu.org>\n"
 "Language-Team: Korean <www-ko-translators@gnu.org>\n"
@@ -182,17 +182,6 @@
 msgid "Disclaimer"
 msgstr "권리 포기 각서"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"GNU 유머 컬렉션에서 <a href=\"/fun/humor.html\">보다 다양한 유
머</a>을 즐길 "
-"수 있습니다."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr "자유 소프트웨어 재단은 이 유머에 대한 저작권을 
갖고 있지 않습니다."
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
@@ -427,6 +416,15 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "GNU 유머 컬렉션에서 <a href=\"/fun/humor.html\">보다 다양한 유
머</a>을 즐"
+#~ "길 수 있습니다."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ 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 ""

Index: server/gnun/compendia/compendium.lt.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.lt.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- server/gnun/compendia/compendium.lt.po      14 Jul 2021 16:30:56 -0000      
1.73
+++ server/gnun/compendia/compendium.lt.po      15 Jul 2021 16:02:03 -0000      
1.74
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: head-include-2.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -211,15 +211,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""

Index: server/gnun/compendia/compendium.ml.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ml.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/gnun/compendia/compendium.ml.po      14 Jul 2021 16:30:56 -0000      
1.126
+++ server/gnun/compendia/compendium.ml.po      15 Jul 2021 16:02:03 -0000      
1.127
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-system-distribution-guidelines.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2011-03-31 19:12+0300\n"
 "Last-Translator: Jinesh K J <jinesh@jinsbond.in>\n"
 "Language-Team: Malayalam <www-ml-gnu-malayalam-project-public@gnu.org>\n"
@@ -199,15 +199,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""

Index: server/gnun/compendia/compendium.ms.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ms.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/gnun/compendia/compendium.ms.po      14 Jul 2021 16:30:56 -0000      
1.32
+++ server/gnun/compendia/compendium.ms.po      15 Jul 2021 16:02:03 -0000      
1.33
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: body-include-1.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2019-08-01 00:00-0500\n"
 "Last-Translator: demo <faizal@matra.xyz>\n"
 "Language-Team: Malay <kde-i18n-doc@kde.org>\n"
@@ -185,15 +185,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.nb.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nb.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/gnun/compendia/compendium.nb.po      14 Jul 2021 16:30:56 -0000      
1.126
+++ server/gnun/compendia/compendium.nb.po      15 Jul 2021 16:02:03 -0000      
1.127
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -187,15 +187,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.nl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nl.po,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- server/gnun/compendia/compendium.nl.po      14 Jul 2021 16:30:56 -0000      
1.121
+++ server/gnun/compendia/compendium.nl.po      15 Jul 2021 16:02:03 -0000      
1.122
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2011-08-16 22:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
@@ -193,18 +193,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-# type: Content of: <ul><li>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "<a href=\"/fun/humor.html\">Laugh along with GNU</a>"
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/humor.html\">Lachen met GNU</a>"
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -462,6 +450,13 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <ul><li>
+#, fuzzy
+#~| msgid "<a href=\"/fun/humor.html\">Laugh along with GNU</a>"
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Lachen met GNU</a>"
+
 # type: Content of: <div><p>
 #~ msgid ""
 #~ "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org\";>&lt;"

Index: server/gnun/compendia/compendium.pl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pl.po,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- server/gnun/compendia/compendium.pl.po      14 Jul 2021 16:30:56 -0000      
1.143
+++ server/gnun/compendia/compendium.pl.po      15 Jul 2021 16:02:03 -0000      
1.144
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: compendium\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2021-03-19 17:16-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail DOT com>\n"
 "Language-Team: Polish <www-pl-trans@gnu.org>\n"
@@ -191,17 +191,6 @@
 msgid "Disclaimer"
 msgstr "Zastrzeżenie"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/humor.html\">Inny humor</a> z&nbsp;Kolekcji Humoru GNU."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Fundacja Wolnego Oprogramowania (FSF) nie przypisuje sobie praw autorskich "
-"do&nbsp;tego żartu."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -439,6 +428,16 @@
 msgstr "Donald Craig"
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">Inny humor</a> z&nbsp;Kolekcji Humoru GNU."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Fundacja Wolnego Oprogramowania (FSF) nie przypisuje sobie praw "
+#~ "autorskich do&nbsp;tego żartu."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.pot
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pot,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/gnun/compendia/compendium.pot        14 Jul 2021 16:30:56 -0000      
1.130
+++ server/gnun/compendia/compendium.pot        15 Jul 2021 16:02:03 -0000      
1.131
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: body-include-1.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -156,15 +156,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.pt-br.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pt-br.po,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/gnun/compendia/compendium.pt-br.po   14 Jul 2021 16:30:56 -0000      
1.133
+++ server/gnun/compendia/compendium.pt-br.po   15 Jul 2021 16:02:03 -0000      
1.134
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compendium\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2020-12-13 12:38-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -187,17 +187,6 @@
 msgid "Disclaimer"
 msgstr "Aviso legal"
 
-#. 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: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"A Fundação do Software Livre não reivindica nenhum direito autoral desta "
-"piada."
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
@@ -432,6 +421,15 @@
 msgstr "Donald Craig"
 
 #~ 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 Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "A Fundação do Software Livre não reivindica nenhum direito autoral 
desta "
+#~ "piada."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.ro.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ro.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.ro.po      14 Jul 2021 16:30:56 -0000      
1.129
+++ server/gnun/compendia/compendium.ro.po      15 Jul 2021 16:02:03 -0000      
1.130
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2010-08-24 17:38+05\n"
 "Last-Translator: Laurențiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <www-ro-translator@gnu.org>\n"
@@ -212,19 +212,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"/gnu/gnu-history.html\">Brief history of the GNU Project</a>"
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/gnu/gnu-history.ro.html\">Scurtă istorie a proiectului GNU</a>"
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
@@ -461,6 +448,14 @@
 
 #, fuzzy
 #~| msgid ""
+#~| "<a href=\"/gnu/gnu-history.html\">Brief history of the GNU Project</a>"
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/gnu/gnu-history.ro.html\">Scurtă istorie a proiectului GNU</a>"
+
+#, 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 "

Index: server/gnun/compendia/compendium.ru.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ru.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.ru.po      14 Jul 2021 16:30:56 -0000      
1.129
+++ server/gnun/compendia/compendium.ru.po      15 Jul 2021 16:02:04 -0000      
1.130
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-system-distribution-guidelines.txt\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2012-03-03 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -185,22 +185,6 @@
 msgid "Disclaimer"
 msgstr "Предупреждение"
 
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"/graphics/graphics.html\">Other art</a> in the GNU Art Gallery."
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/graphics/graphics.html\">Другие рисунки</a> в х
удожественной "
-"галерее GNU."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
-"шутку."
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
@@ -445,6 +429,20 @@
 msgid "Donald Craig"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "<a href=\"/graphics/graphics.html\">Other art</a> in the GNU Art Gallery."
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/graphics/graphics.html\">Другие рисунки</a> в х
удожественной "
+#~ "галерее GNU."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ 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."

Index: server/gnun/compendia/compendium.sk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sk.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/gnun/compendia/compendium.sk.po      14 Jul 2021 16:30:56 -0000      
1.124
+++ server/gnun/compendia/compendium.sk.po      15 Jul 2021 16:02:04 -0000      
1.125
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2009-09-27 22:36+0200\n"
 "Last-Translator: Dominik Smatana <dominik@fsf.sk>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -199,15 +199,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.sq.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sq.po,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- server/gnun/compendia/compendium.sq.po      14 Jul 2021 16:30:56 -0000      
1.143
+++ server/gnun/compendia/compendium.sq.po      15 Jul 2021 16:02:04 -0000      
1.144
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: \n"
@@ -199,20 +199,6 @@
 msgid "Disclaimer"
 msgstr "Klauzolë"
 
-# type: Content of: <ul><li>
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/fun/humor.html\">Tjetër humor</a> te Koleksioni i Humorit GNU."
-
-# type: Content of: <h3>
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"The Free Software Foundation nuk pretendon ndonjë të drejtë kopjimi mbi 
këtë "
-"anekdotë."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -454,6 +440,18 @@
 msgid "Donald Craig"
 msgstr "Donald Becker"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">Tjetër humor</a> te Koleksioni i Humorit GNU."
+
+# type: Content of: <h3>
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "The Free Software Foundation nuk pretendon ndonjë të drejtë kopjimi mbi 
"
+#~ "këtë anekdotë."
+
 #~ 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."

Index: server/gnun/compendia/compendium.sr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sr.po,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/gnun/compendia/compendium.sr.po      14 Jul 2021 16:30:56 -0000      
1.125
+++ server/gnun/compendia/compendium.sr.po      15 Jul 2021 16:02:04 -0000      
1.126
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2009-10-18 17:51+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -217,18 +217,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-# type: Content of: <div><h2>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "Check out other Free Software Foundation campaigns"
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr "Упознајте се са другим кампањама 
Задужбине за слободни софтвер"
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
@@ -468,6 +456,12 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><h2>
+#, fuzzy
+#~| msgid "Check out other Free Software Foundation campaigns"
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr "Упознајте се са другим кампањама 
Задужбине за слободни софтвер"
+
 # type: Content of: <div><p>
 #, fuzzy
 #~| msgid ""

Index: server/gnun/compendia/compendium.sv.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sv.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/gnun/compendia/compendium.sv.po      14 Jul 2021 16:30:56 -0000      
1.127
+++ server/gnun/compendia/compendium.sv.po      15 Jul 2021 16:02:04 -0000      
1.128
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+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"
@@ -193,15 +193,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.ta.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ta.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.ta.po      14 Jul 2021 16:30:56 -0000      
1.129
+++ server/gnun/compendia/compendium.ta.po      15 Jul 2021 16:02:04 -0000      
1.130
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Compendium\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -184,15 +184,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.te.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.te.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/gnun/compendia/compendium.te.po      14 Jul 2021 16:30:56 -0000      
1.39
+++ server/gnun/compendia/compendium.te.po      15 Jul 2021 16:02:04 -0000      
1.40
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: body-include-1.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2018-09-17 09:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Telugu <web-translators@gnu.org>\n"
@@ -168,15 +168,6 @@
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
 #. type: Content of: <div>
 msgid ""
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="

Index: server/gnun/compendia/compendium.tr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.tr.po,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/gnun/compendia/compendium.tr.po      14 Jul 2021 16:30:56 -0000      
1.131
+++ server/gnun/compendia/compendium.tr.po      15 Jul 2021 16:02:04 -0000      
1.132
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: body-include-1.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2020-03-08 09:14+0100\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: \n"
@@ -185,17 +185,6 @@
 msgid "Disclaimer"
 msgstr "Sorumluluk Reddi"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"GNU Mizah Koleksiyonu'ndaki <a href=\"/fun/humor.html\">diğer mizah</a> "
-"ögeleri."
-
-#. type: Content of: <p>
-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: <div>
 #, fuzzy
 #| msgid ""
@@ -436,6 +425,15 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "GNU Mizah Koleksiyonu'ndaki <a href=\"/fun/humor.html\">diğer mizah</a> "
+#~ "ögeleri."
+
+#~ 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."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.uk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.uk.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/gnun/compendia/compendium.uk.po      14 Jul 2021 16:30:56 -0000      
1.132
+++ server/gnun/compendia/compendium.uk.po      15 Jul 2021 16:02:04 -0000      
1.133
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.uk\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2010-09-02 09:05+0200\n"
 "Last-Translator: Evgeniy Sudyr <eject.in.ua@gmail.com>\n"
 "Language-Team:  <web-translators-uk@gnu.org>\n"
@@ -195,18 +195,6 @@
 msgid "Disclaimer"
 msgstr "Попередження"
 
-#. 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: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Фонд вільного програмного забезпечення 
не заявляє авторські права на цей "
-"жарт."
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -437,6 +425,16 @@
 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 ""
+#~ "Фонд вільного програмного забезпечення 
не заявляє авторські права на цей "
+#~ "жарт."
+
+#~ 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 ""

Index: server/gnun/compendia/compendium.zh-cn.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-cn.po,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/gnun/compendia/compendium.zh-cn.po   14 Jul 2021 16:30:56 -0000      
1.131
+++ server/gnun/compendia/compendium.zh-cn.po   15 Jul 2021 16:02:04 -0000      
1.132
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2012-02-15 16:59+0800\n"
 "Last-Translator: Li Fanxi <lifanxi@freemindworld.com>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -189,15 +189,6 @@
 msgid "Disclaimer"
 msgstr "免责声明"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "GNU幽默汇总里还有<a href=\"/fun/humor.html\">å…
¶ä»–幽默作品</a>。"
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr "自由软件基金会不对该笑话主张版权。"
-
 #. type: Content of: <div>
 #, fuzzy
 #| msgid ""
@@ -444,6 +435,13 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "GNU幽默汇总里还有<a href=\"/fun/humor.html\">å…
¶ä»–幽默作品</a>。"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ 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 ""

Index: server/gnun/compendia/compendium.zh-tw.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-tw.po,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/gnun/compendia/compendium.zh-tw.po   14 Jul 2021 16:30:56 -0000      
1.125
+++ server/gnun/compendia/compendium.zh-tw.po   15 Jul 2021 16:02:04 -0000      
1.126
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: body-include-2.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-24 05:25+0000\n"
+"POT-Creation-Date: 2021-07-15 06:55+0000\n"
 "PO-Revision-Date: 2019-01-18 23:30+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -192,15 +192,6 @@
 msgid "Disclaimer"
 msgstr "棄權聲明"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "GNU 幽默集裡的<a href=\"/fun/humor.html\">å…
¶ä»–幽默作品</a>。"
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr "自由軟體基金會聲明本會沒有這個笑話的著作權。"
-
 # | {+</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
@@ -445,6 +436,13 @@
 msgstr ""
 
 #~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "GNU 幽默集裡的<a href=\"/fun/humor.html\">å…
¶ä»–幽默作品</a>。"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ 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 ""



reply via email to

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