www-commits
[Top][All Lists]
Advanced

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

www fun/jokes/po/eternal-flame.pot fun/jokes/po...


From: GNUN
Subject: www fun/jokes/po/eternal-flame.pot fun/jokes/po...
Date: Mon, 12 Jul 2021 13:02:32 -0400 (EDT)

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

Modified files:
        fun/jokes/po   : eternal-flame.pot filks.pot gnu-song.pot 
                         hackersong.pot hackforfreedom.pot hap-bash.pot 
                         nobody-owns.fr.po nobody-owns.pot 
        music/po       : blues-song.de.po blues-song.pot emacsvsvi.de.po 
                         emacsvsvi.pot free-birthday-song.de.po 
                         free-birthday-song.pot free-firmware-song.pot 
                         free-software-song.de.po 
                         free-software-song.es.po 
                         free-software-song.fr.po free-software-song.pot 
                         free-software-song.pt-br.po 
                         free-software-song.tr.po 
                         free-software-song.zh-cn.po gdb-song.de.po 
                         gdb-song.fr.po gdb-song.pot 
                         till_there_was_gnu.de.po 
                         till_there_was_gnu.fr.po till_there_was_gnu.pot 
                         whole-gnu-world.pot 
        server         : sitemap.ar.html sitemap.de.html sitemap.es.html 
                         sitemap.fr.html sitemap.it.html sitemap.ja.html 
                         sitemap.nl.html sitemap.pt-br.html 
                         sitemap.ro.html sitemap.ru.html sitemap.sq.html 
                         sitemap.uk.html 
        server/po      : sitemap.ar.po sitemap.de.po sitemap.es.po 
                         sitemap.fr.po sitemap.it.po sitemap.ja.po 
                         sitemap.nl.po sitemap.pot sitemap.pt-br.po 
                         sitemap.ro.po sitemap.ru.po sitemap.sq.po 
                         sitemap.uk.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/eternal-flame.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/filks.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gnu-song.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/hackersong.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/hackforfreedom.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/hap-bash.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/nobody-owns.fr.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/nobody-owns.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/blues-song.de.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/blues-song.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/emacsvsvi.de.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/emacsvsvi.pot?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-birthday-song.de.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-birthday-song.pot?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-firmware-song.pot?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-software-song.de.po?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-software-song.es.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-software-song.fr.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-software-song.pot?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-software-song.pt-br.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-software-song.tr.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/free-software-song.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/gdb-song.de.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/gdb-song.fr.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/gdb-song.pot?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/till_there_was_gnu.de.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/till_there_was_gnu.fr.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/till_there_was_gnu.pot?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/music/po/whole-gnu-world.pot?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ar.html?cvsroot=www&r1=1.352&r2=1.353
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.de.html?cvsroot=www&r1=1.435&r2=1.436
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.es.html?cvsroot=www&r1=1.341&r2=1.342
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.fr.html?cvsroot=www&r1=1.525&r2=1.526
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.it.html?cvsroot=www&r1=1.211&r2=1.212
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ja.html?cvsroot=www&r1=1.441&r2=1.442
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.nl.html?cvsroot=www&r1=1.352&r2=1.353
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.pt-br.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ro.html?cvsroot=www&r1=1.331&r2=1.332
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ru.html?cvsroot=www&r1=1.491&r2=1.492
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.sq.html?cvsroot=www&r1=1.367&r2=1.368
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.uk.html?cvsroot=www&r1=1.380&r2=1.381
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ar.po?cvsroot=www&r1=1.339&r2=1.340
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.de.po?cvsroot=www&r1=1.525&r2=1.526
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.es.po?cvsroot=www&r1=1.428&r2=1.429
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.fr.po?cvsroot=www&r1=1.661&r2=1.662
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.it.po?cvsroot=www&r1=1.276&r2=1.277
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ja.po?cvsroot=www&r1=1.465&r2=1.466
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.nl.po?cvsroot=www&r1=1.353&r2=1.354
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.pot?cvsroot=www&r1=1.313&r2=1.314
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.pt-br.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ro.po?cvsroot=www&r1=1.324&r2=1.325
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ru.po?cvsroot=www&r1=1.650&r2=1.651
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.sq.po?cvsroot=www&r1=1.434&r2=1.435
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.uk.po?cvsroot=www&r1=1.423&r2=1.424

Patches:
Index: fun/jokes/po/eternal-flame.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/eternal-flame.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/eternal-flame.pot      18 Aug 2015 20:57:46 -0000      1.10
+++ fun/jokes/po/eternal-flame.pot      12 Jul 2021 17:02:29 -0000      1.11
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/eternal-flame.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/eternal-flame.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: eternal-flame.html\n"
-"POT-Creation-Date: 2015-08-18 20:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,239 +17,243 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Eternal Flame"
+msgid "Eternal Flame - GNU Project - Free Software Foundation"
+msgstr ""
+
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Eternal Flame (song parody)"
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"This is a parody of the song &ldquo;God Lives on Terra&rdquo; by Julia "
-"Ecklar.  For more information about this song, visit <a "
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Eternal Flame"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "by Bob Kanefsky and Julia Ecklar"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"This is a parody of <cite>God Lives on Terra</cite> by Julia&nbsp;Ecklar.  "
+"For more information, visit <a "
 "href=\"http://www.songworm.com/db/songworm-parody/EternalFlame.html\";> "
 "Songworm</a>."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I was taught assembler"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "in my second year of school."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "It's kinda like construction work &mdash;"
+#. type: Content of: <div><div><p>
+msgid "It's kinda like construction work"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "with a toothpick for a tool."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "So when I made my senior year,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I threw my code away,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And learned the way to program"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "that I still prefer today."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Now, some folks on the Internet"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "put their faith in C++."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "They swear that it's so powerful,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "it's what God used for us."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "And maybe it lets mortals dredge"
+#. type: Content of: <div><div><p>
+msgid "And maybe it lets mortals"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "their objects from the C."
+#. type: Content of: <div><div><p>
+msgid "dredge their objects from the C."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But I think that explains"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "why only God can make a tree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "For God wrote in Lisp code"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "When he filled the leaves with green."
+#. type: Content of: <div><div><p>
+msgid "when he filled the leaves with green."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The fractal flowers and recursive roots:"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "The most lovely hack I've seen."
+#. type: Content of: <div><div><p>
+msgid "the most lovely hack I've seen."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And when I ponder snowflakes,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "never finding two the same,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I know God likes a language"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "with its own four-letter name."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Now, I've used a SUN under Unix,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "so I've seen what C can hold."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I've surfed for Perls, found what Fortran's for,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Got that Java stuff down cold."
+#. type: Content of: <div><div><p>
+msgid "got that Java stuff down cold."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Though the chance that I'd write COBOL code"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "is a SNOBOL's chance in Hell."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And I basically hate hieroglyphs,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "so I won't use APL."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Now, God must know all these languages,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and a few I haven't named."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But the Lord made sure, when each sparrow falls,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "that its flesh will be reclaimed."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And the Lord could not count grains of sand"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "with a 32-bit word."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Who knows where we would go to"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "if Lisp weren't what he preferred?"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And God wrote in Lisp code"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Every creature great and small."
+#. type: Content of: <div><div><p>
+msgid "every creature great and small."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Don't search the disk drive for man.c,"
+#. type: Content of: <div><div><p>
+msgid "Don't search the disk drive for <code>man.c</code>,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "When the listing's on the wall."
+#. type: Content of: <div><div><p>
+msgid "when the listing's on the wall."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "And when I watch the lightning burn"
+#. type: Content of: <div><div><p>
+msgid "And when I watch the lightning"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Unbelievers to a crisp,"
+#. type: Content of: <div><div><p>
+msgid "burn unbelievers to a crisp,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "I know God had six days to work,"
+#. type: Content of: <div><div><p>
+msgid "I know God had six days to work."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "So he wrote it all in Lisp."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Yes, God had a deadline."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"An <a href=\"/fun/jokes/eternal-flame.ogg\">audio recording of this song in "
-"Ogg Vorbis</a> format is available."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "<cite>Eternal Flame</cite> was performed by Julia Ecklar:"
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"<a href=\"/fun/jokes/eternal-flame.ogg\">Audio recording</a> "
+"<small>(OGG&nbsp;Vorbis&nbsp;format,&nbsp;5.5MB)</small>"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -257,7 +261,7 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 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 "
@@ -266,17 +270,41 @@
 "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 ""
-"&ldquo;The Eternal Flame&rdquo; parody lyrics Copyright &copy; 1996 by Bob "
-"Kanefsky, parodying &ldquo;God Lives on Terra&rdquo; by JuliaEcklar."
+"Please see the <a "
+"href=\"/server/standards/README.translations.html\">Translations README</a> "
+"for information on coordinating and contributing translations of this "
+"article."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Copyright &copy; Julia Ecklar 1984 (original song: lyrics and music)"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Copyright &copy; Bob Kanefsky 1996 (parody)"
 msgstr ""
 
 #. type: Content of: <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."
+"Non-commercial duplication and redistribution of the audio recording of "
+"<cite>Eternal Flame</cite>, by Julia Ecklar and Bob Kanefsky, is permitted "
+"provided the entire recording is preserved, including the entire notice."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/filks.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/filks.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/filks.pot      6 Jul 2020 13:59:55 -0000       1.10
+++ fun/jokes/po/filks.pot      12 Jul 2021 17:02:29 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: filks.html\n"
-"POT-Creation-Date: 2020-07-06 13:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,261 +17,275 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Filks - GNU Project - Free Software Foundation (FSF)"
+msgid "Filks - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Filks"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "GNUbaya"
 msgstr ""
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid "Original"
 msgstr ""
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid "Kumbaya"
 msgstr ""
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid "Filked information"
 msgstr ""
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid "Version: 1.0 Virre Annerg&aring;rd"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I listened to some music as I was waiting for the lift up time for Sweden's "
 "first astronaut.  First I filked a Swedish text, then this come and GNUbaya "
 "is just to much there."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This text was entered using GNU Emacs. No people or animals were hurt in "
 "making this song and only GNU software was used."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "GNUmbaya my system GNUbaya"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "oh system GNUbaya"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "someone coding system, GNUbaya"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "someones surfing system, GNUbaya"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "GNUbaya my system GNUbaya"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Walk on the Free Side"
 msgstr ""
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid "Walk on the Wild Side by Lou Reed"
 msgstr ""
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid "Filk information"
 msgstr ""
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid "Version 1.0 Virre Annerg&aring;rd"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "So this one is quite easy to do actually.  Oh and we got space lift up as I "
 "was creating this."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Holly lives in Miami, FLA"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Surfed through the net"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Plucked his system free"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "installed GNU/Linux"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "then he was free"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>ref</b>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "she said hey babe"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "take a walk on the free side"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "said hey honey"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Candy came from out on the island"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "in the chat-room she was everybody's darling"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "but she never lost connect even"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "when she was sharing connect"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "she says hey babe"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "said hey babe"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<em>and the soundcard goes:</em>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "do-do-do-do-de-do"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Little Joe never once buyed"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "every software at no cost"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "a GNU there a GNU here"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "New York city is the place"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "where they say:"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hey babe"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hey you"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Sugarpump fairy"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "came and hit FTP"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "looking for"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "GNU/Linux and GCC"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "went to GNU.org"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "should see him"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "compile and compile"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "They said hey sugar"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I said hey sugar"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Jackie is just hacking away"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Knows she's good"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "thought she was Turing for a day"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "slashdot would have helped that crash"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Said hey babe"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>[do's]</b>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Hackers l&auml;r av historien &mdash; Hackers learn by History"
+#. type: Content of: <div><h3>
+msgid "Hackers l&auml;r av historien"
 msgstr ""
 
-#. type: Content of: <dl><dt>
-msgid "Orginal"
+#. type: Content of: <div><h3>
+msgid "Hackers learn by History"
 msgstr ""
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid "L&auml;r av historien by Knutna N&auml;var"
 msgstr ""
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid "Version 0.1 Virre Annerg&aring;rd"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "First a Swedish text than followed with a bad translation to English.  The "
 "original is a really horrible communist text that among other things says "
@@ -287,22 +301,22 @@
 "unintentional)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Ah well have share and enjoy!"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "(oh and fix, language and propagate in a GNU way)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "/Virre"
 msgstr ""
 
 #.  This is severely broken: No proper punctuation, and as a whole
 #.      doesn't make sense.  A Swedish speaker is welcome to fix it.
 #.      (The English translation has some problems, too.) 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "1996 svepte en v&aring;g av fri mjukvara &ouml;ver n&auml;tet hackers och "
 "andra gick spontant i kamp f&ouml;r friare mjukvara, b&auml;ttre "
@@ -323,109 +337,109 @@
 "inflytandet"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<b>ref:</b> Det l&auml;r oss, l&auml;r oss, det l&auml;r oss historien <b>* "
 "3</b>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "D&auml;rf&ouml;r har vi skrivit den h&auml;r s&aring;ngen"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "N&auml;r frihetskampen flammade upp"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Och ropet vild spridning spontant br&ouml;t fram"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "b&ouml;rjade delar av r&ouml;relsens ledning att vackla"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "och kakla om f&ouml;retags v&auml;nligare licenser likt yra h&ouml;ns"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "skrivbordshackers blir r&auml;dda d&aring; frihetskampen sk&auml;rps"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Vi l&auml;ste Knuth och RMS"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "och angrep komersialisternas reformism"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "vi valde den skoningsl&ouml;sa kampens v&auml;g"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "och enhet p&aring; hacker etikens grund"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "vi handlade som hackers ska handla"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "d&aring; frihetskampen sk&auml;rps"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Nu sedan vi gjort oss kvitt"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "sm&aring;kommersialisterna som skriver Open Source"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "kan hackers b&ouml;rja bygga r&ouml;relsen"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "som &auml;r deras historiska uppgift och plikt"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "sm&aring;komersialister och reformister kan"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "aldrig bygga r&ouml;relsen"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>ref.</b>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "splitringen var en bra sak"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "vi rensade bort de som hindrade"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "r&ouml;relsens icke-komersiella utveckling"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "vi st&aring;r starkare idag en n&aring;gonsin f&ouml;rr"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "r&ouml;relsen st&auml;rks av kampen emot frihetsavikelser"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "1996 a wave of free software propagated the net hackers and others "
 "spontaneously struggled for freer software and better software licenses that "
@@ -443,122 +457,115 @@
 "movement get strength from the struggle against the commercial influence"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>ref:</b> That we learn, we learn, that we learn from history <b>* 
3</b>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's why we wrote this song"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When the freedom struggle started"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and the scream wild propagation spontaneously came front"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "parts of the movements lead started to fall"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and talk about more company friendly licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "desk-hackers become afraid when the freedom fight sharpens"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We read Knuth and RMS"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and attacked the commercialists' reformism"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "we chose the unnerving struggles way"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and unity on the hacker ethics base"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "we acted as hackers should act when"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "the struggle for freedom sharpens"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Now as we become free from"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "the small commercialists that writes Open Source"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "hackers can start to build the movement"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "that is their historic object and [plict]"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "small commercialists and reformists can"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "never build the movement"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "the fork was something good"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "we get away of those that hindered"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "the movments non-commercial development"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "we stands stronger today than ever before"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "the movement is strengthened by the struggle against"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "fails from freedom"
 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 filks on this page were obtained from the FSF's email archives of the "
+"GNU Project. Neither the author nor the Free Software Foundation claim "
+"copyright on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -566,24 +573,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"Please send general FSF &amp; GNU inquiries to <a "
 "href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>.  There are also <a "
-"href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a "
+"href=\"/contact/\">other ways to contact</a> the FSF.  Broken links and "
+"other corrections or suggestions can be sent to <a "
 "href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
 msgstr ""
 
-#. type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:web-translators@gnu.org";>
+#
+#.         &lt;web-translators@gnu.org&gt;</a>.</p>
+#
+#.         <p>For information on coordinating and contributing translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/gnu-song.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gnu-song.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/gnu-song.pot   16 Sep 2012 05:21:47 -0000      1.7
+++ fun/jokes/po/gnu-song.pot   12 Jul 2021 17:02:29 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/gnu-song.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/gnu-song.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,170 +7,175 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-song.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-12 16: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 "The GNU Song - GNU Project - Free Software Foundation (FSF)"
+msgid "The GNU Song - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The GNU Song"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "(to the tune of &ldquo;At The Drop of a Hat&rdquo;,"
+#. type: Content of: <div><address>
+msgid "by David Flynn"
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "by Michael Flanders and Donald Swann)"
+msgid ""
+"A take-off on <a "
+"href=\"https://web.archive.org/web/20051027205940/http://www.nyanko.pwp.blueyonder.co.uk/fas/hatintro.html\";>
 "
+"<cite>The Gnu song</cite></a> by Michael&nbsp;Flanders and Donald&nbsp;Swann"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A year ago last Thursday, I was in a computer shop"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When I met a man who thought he knew the lot"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "He was laying down the law about copyrights and licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And the number of patents large companies have got"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "So I asked him &ldquo;What's that creature's name?&rdquo; and he answered "
 "&ldquo;That's Unix!&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And I'd have gone on thinking that was true"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "If the animal in question hadn't put that chap to shame,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And remarked&mdash;&ldquo;GNU's not Unix&mdash;I'm a GNU!&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I'm a GNU&mdash;I'm a GNU"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The g-nicest work of g-nature in the zoo"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "I'm a GNU&mdash;how do you do?"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "You really oughtta g-know w-who's w-who"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "I'm a GNU&mdash;spelt G - N - U"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I'm not closed source or cost a buck or two"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "So let me introduce, I'm neither man nor moose"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "Oh, g-no, g-no, g-no, I'm a GNU!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I had taken a job coding down at Rustington-on-sea"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Whence I travelled on to Aston-under-lyne"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "On the second night I stayed there I was wakened from a dream"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Which I'll tell you all about some other time"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Among the thousand programs on the disk in my PC"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Installed and mounted was code I thought I knew"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "BSD? Unix? Could it be a hearty beast?"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Then I seem to hear a voice&mdash;&ldquo;I'm a GNU!&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I'm a GNU-a-g-nother GNU"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I know I could g-show my code to you"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Steal my bison or my octave and I'll sue"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Nor am I in the least like that dreadful M$ beast"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "G-no, g-no, g-no, I'm a GNU!"
 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 music on this page was provided courtesy of David Flynn <a "
-"href=\"mailto:dav@chess.plus.com\";>&lt;dav@chess.plus.com&gt;</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyrights on this music."
+"The lyrics on this page were submitted to the GNU Project by David Flynn in "
+"2004. Neither the author nor the Free Software Foundation claim copyright on "
+"them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -178,24 +183,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/hackersong.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/hackersong.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/hackersong.pot 16 Sep 2012 05:21:47 -0000      1.7
+++ fun/jokes/po/hackersong.pot 12 Jul 2021 17:02:29 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/hackersong.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/hackersong.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,147 +7,141 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hackersong.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-12 16: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 "If the Beatles were hackers&hellip; - GNU Project - Free Software 
Foundation"
+msgstr ""
+
+#
+#. h3 small { font-size: .75em; font-weight: normal; }
+#
+#. type: Content of: <style>
+#, no-wrap
+msgid ".lyrics { width: 32em; }\n"
+msgstr ""
+
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <p>
 msgid ""
-"If the Beatles were hackers&hellip; - GNU Project - Free Software Foundation "
-"(FSF)"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "If the Beatles were hackers&hellip;"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Eleanor Rigby (with apologies to the Beatles)"
+#. type: Content of: <div><h3>
+msgid "Eleanor Rigby <small>(with apologies to the Beatles)</small>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Eleanor Rigby"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Sits at the keyboard and waits for a line on the screen"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Lives in a dream"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Waits for a signal"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Writing some code that will make the machine do some more"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Who is it for?"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "All these lonely users, where do they all come from"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "All these lonely users, where do they all belong"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hacker Mackenzy"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Writing the code for a program that no one will run"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Its nearly done."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Look at him working."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Fixing the bugs late at night when there's nobody there"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "nobody cares."
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "Ahhhh&hellip; look at all those lonely users&hellip;"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Always a hacker (with apologies to Billy Joel)"
+#. type: Content of: <div><h3>
+msgid "Always a Hacker <small>(with apologies to Billy Joel)</small>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "She can kill all your files"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "She can freeze with a frown"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And a wave of her hand bring your whole system down"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And she works on her code until twelve after three"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "She lives like a bat but she's always a hacker to me."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Unknown morbid source"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "He died at the console of hunger and thirst"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "Next day he was buried"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "Face down, nine edge first."
-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 lyrics on this page were obtained from the FSF's email archives of the "
+"GNU Project. The Free Software Foundation does not claim copyright on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -155,24 +149,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/hackforfreedom.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/hackforfreedom.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/hackforfreedom.pot     22 Jan 2013 05:58:11 -0000      1.8
+++ fun/jokes/po/hackforfreedom.pot     12 Jul 2021 17:02:29 -0000      1.9
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/hackforfreedom.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/hackforfreedom.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,136 +7,146 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hackforfreedom.html\n"
-"POT-Creation-Date: 2013-01-22 00:55-0500\n"
+"POT-Creation-Date: 2021-07-12 16: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 "Hack For Freedom Song - GNU Project - Free Software Foundation"
+msgid "Hack For Freedom - Song - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Hack For Freedom Song"
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Hack For Freedom based on Manowar &mdash; Fight for Freedom"
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Hack For Freedom"
 msgstr ""
 
 #. type: Content of: <div><p>
+msgid "Sung to the tune of Manowar's <cite>Fight for&nbsp;Freedom</cite>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "There's a sound heard across the AI lab"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's heard across the world"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll only hear it if you share your software"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And one day hope to be free"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "To hear the sound of freedom many gave their nights"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "They hacked for you and me"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Those memories will always live in silence"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And now it's our time to free Unix"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "[Chorus:]"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Where the hackers play &mdash; I will soon be there"
+#. type: Content of: <div><div><p><span>
+msgid "<span>Where the hackers play &mdash; I will soon be there"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p><span>
 msgid "If you want to &mdash; come along with me my friend"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p><span>
 msgid "Share the software and you'll be free"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p><span>
 msgid "From the Hurd to Emacs"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "We'll hack for freedom again"
+#. type: Content of: <div><div><p>
+msgid "We'll hack for freedom again</span>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Scream out loud for all the world to hear"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "From MIT to the Savannah"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Let freedom ring and every hacker be king"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "To live on GNU through the years"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "[Repeat chorus]"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Now's the time we all must stand together"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "So raise your keyboard show them we are strong"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Side by side the hacking goes on forever"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Marching to the battle with our code"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "[Repeat chorus to fade]"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The song on this page was submitted by <b>Giuseppe Scrivano</b>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation does not claim copyright for this song."
+#. type: Content of: <div><div><p>
+msgid ""
+"The lyrics on this page were submitted to the GNU Project by Giuseppe "
+"Scrivano in 2006. Neither the author nor the Free Software Foundation claim "
+"copyright on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -144,24 +154,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/hap-bash.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/hap-bash.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/hap-bash.pot   16 Sep 2012 05:21:48 -0000      1.7
+++ fun/jokes/po/hap-bash.pot   12 Jul 2021 17:02:29 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/hap-bash.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/hap-bash.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,133 +7,146 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hap-bash.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-12 16: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 "Happiness is a bash prompt - GNU Project - Free Software Foundation 
(FSF)"
+msgid "Happiness is a Bash Prompt - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:   
-msgid "Happiness is a bash prompt"
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <p>
 msgid ""
-"Happiness is a bash prompt &mdash; Based on the Beatles' song "
-"&ldquo;Happiness is a Warm Gun&rdquo;"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Happiness is a Bash Prompt"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "by Janos Barbero"
 msgstr ""
 
 #. type: Content of: <div><p>
+msgid "Based on the Beatles' song <cite>Happiness is 
a&nbsp;Warm&nbsp;Gun</cite>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "It's not a prompt that misses much"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Do do do do do do- oh yea!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's well acquainted with the touch that makes a good shell"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Like a butler on the terminal"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The process in the list that forks all the time"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Spawns another, forks again"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Writing to the disk I don't know what"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Working overtime"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A soap impression of a virus on a Unix box"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The regex gets him every time"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "I need a fix 'cause I'm leaking RAM"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Swapping out my bytes to the disk"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:    
+#. type: Content of: <div><div><p>
 msgid "X server's using up my RAM"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+msgid "Happiness is a bash prompt"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "Happiness is a bash prompt, mama"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When I ssh into your domain"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And I feel my finger on the return key"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I know nobody can do me no harm"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Because happiness is a bash prompt, mama"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "-Yes it is."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Happiness is a prompt, yes it is&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Bash!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Well don't ya know that happiness is a bash prompt, mama?"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The song on this page were submitted by Janos Barbero."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyrights on this joke."
+#. type: Content of: <div><div><p>
+msgid ""
+"The lyrics on this page were submitted to the GNU Project by Janos Barbero "
+"in 2005. Neither the author nor the Free Software Foundation claim copyright "
+"on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -141,24 +154,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/nobody-owns.fr.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/nobody-owns.fr.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- fun/jokes/po/nobody-owns.fr.po      31 May 2021 21:09:02 -0000      1.28
+++ fun/jokes/po/nobody-owns.fr.po      12 Jul 2021 17:02:29 -0000      1.29
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fun/jokes/nobody-owns.html\n"
-"POT-Creation-Date: 2015-08-21 01:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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"
@@ -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-12 16:56+0000\n"
 "Plural-Forms:  \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -24,105 +25,165 @@
 msgstr ""
 "Personne ne possède cette chanson - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
-msgid "Nobody owns this song"
-msgstr "Personne ne possède cette chanson"
-
-#. type: Content of: <pre>
+#
+#
+#. .lyrics { display: inline-block; }
+#. .chorus { color: #6b3699; }
+#. type: Content of: <style>
 #, no-wrap
 msgid ""
-"Nobody owns this song\n"
-"\n"
-"(Title Subject To Change, Of Course)\n"
-"------------------------------------\n"
-"\n"
-"\n"
-"This song, it has no author\n"
-"No place of origin;\n"
-"This song, it has no ending,\n"
-"And it never did begin;\n"
-"This song can travel anywhere;\n"
-"There's no place it don't belong . . .\n"
-"'Cause nobody owns this song.\n"
-"\n"
-"Melodies can be added\n"
-"In major or minor keys.\n"
-"All parts can be rearranged\n"
-"In any ways you please.\n"
-"Many things can be done to this,\n"
-"And none of them are wrong,\n"
-"'Cause nobody owns this song.\n"
 "\n"
-"You can play it on the lute,\n"
-"You can play it on the flute,\n"
-"You can play it on the slide trombone.\n"
-"You can play it on the harp,\n"
-"You can play it flat or sharp,\n"
-"You can play it on the saxophone.\n"
-"You can play it real high or\n"
-"You can play it real low,\n"
-"You can play it real fast or\n"
-"You can play it real slow,\n"
-"You can play it real short or\n"
-"You can play it real long,\n"
-"'Cause nobody owns this song.\n"
+".reduced-width { width: 40em; }\n"
+"@media (min-width: 25em) {\n"
+"  .lyrics { display: block; box-sizing: border-box;\n"
+"            width: 28em; max-width: 100%; }\n"
+"  .s1  { padding-left:  3%; }\n"
+"  .s2  { padding-left:  6%; }\n"
+"  .s3  { padding-left:  9%; }\n"
+"  .s4  { padding-left: 12%; }\n"
+"  .s5  { padding-left: 15%; }\n"
+"  .s6  { padding-left: 18%; }\n"
+"  .s7  { padding-left: 21%; }\n"
+"  .s8  { padding-left: 24%; }\n"
+"  .s9  { padding-left: 27%; }\n"
+"  .s10 { padding-left: 30%; }\n"
+"  .s11 { padding-left: 33%; }\n"
+"}\n"
 msgstr ""
-"Personne ne possède cette chanson\n"
-"\n"
-"(titre modifiable, naturellement)\n"
-"---------------------------------\n"
-"\n"
-"\n"
-"Cette chanson n'a pas d'auteur,\n"
-"Pas de lieu d'origine ;\n"
-"Cette chanson, n'a pas de fin\n"
-"Et n'a jamais commencé ;\n"
-"Cette chanson peut voyager n'importe où ;\n"
-"Aucun lieu ne lui est interdit...\n"
-"Car personne ne possède cette chanson.\n"
-"\n"
-"Des mélodies peuvent être ajoutées\n"
-"Dans des tons majeurs ou mineurs.\n"
-"Toutes les parties peuvent être réarrangées\n"
-"De toutes les manières qui vous plairont.\n"
-"Beaucoup de choses peuvent lui être faites\n"
-"Et aucune d'elles n'est mauvaise,\n"
-"Car personne ne possède cette chanson.\n"
-"\n"
-"Vous pouvez la jouer sur un luth,\n"
-"Vous pouvez la jouer à la flûte,\n"
-"Vous pouvez la jouer au trombone à coulisse.\n"
-"Vous pouvez la jouer sur une harpe,\n"
-"Vous pouvez la jouer avec bémol ou dièse,\n"
-"Vous pouvez la jouer au saxophone.\n"
-"Vous pouvez la jouer vraiment fort ou\n"
-"Vous pouvez la jouer doucement,\n"
-"Vous pouvez la jouer vraiment vite ou\n"
-"Vous pouvez la jouer lentement,\n"
-"vous pouvez la jouer raccourcie ou\n"
-"vous pouvez la jouer rallongée,\n"
-"Car personne ne possède cette chanson.\n"
+
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
 
 #. type: Content of: <p>
 msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Nobody owns this song"
+msgstr "Personne ne possède cette chanson"
+
+#. type: Content of: <div><div><p>
+msgid "(Title Subject To Change, Of Course)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "This song, it has no author"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s1\">No place of origin;</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s2\">This song, it has no ending,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s3\">And it never did begin;</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s4\">This song can travel anywhere;</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"<span class=\"s5\">There's no place it don't belong&nbsp;.&nbsp;.&nbsp;.</"
+"span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"chorus\">'Cause nobody owns this song.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "Melodies can be added"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s1\">In major or minor keys.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s2\">All parts can be rearranged</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s3\">In any ways you please.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s4\">Many things can be done to this,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s5\">And none of them are wrong,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "You can play it on the lute,"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s1\">You can play it on the flute,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s2\">You can play it on the slide trombone.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s3\">You can play it on the harp,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s4\">You can play it flat or sharp,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s5\">You can play it on the saxophone.</span>"
 msgstr ""
-"<a href=\"/fun/humor.html\">D'autres blagues</a> dans la collection d'humour "
-"GNU."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s6\">You can play it real high or</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s7\">You can play it real low,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s8\">You can play it real fast or</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s9\">You can play it real slow,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s10\">You can play it real short or</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s11\">You can play it real long,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Renonciation au copyright"
 
-#. type: Content of: <div><p>
-msgid "Nobody knows from where this song was obtained!"
+#. type: Content of: <div><div><p>
+msgid ""
+"The lyrics on this page were obtained from the FSF's email archives of the "
+"GNU Project. The Free Software Foundation does not claim copyright on them."
 msgstr ""
-"La <i>Free Software Foundation</i> ne revendique pas de copyright sur cette "
-"chanson,"
-
-#. type: Content of: <div><p>
-msgid "The Free Software Foundation claims no copyrights on this song."
-msgstr "car personne ne sait d'où elle vient !"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -150,14 +211,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="
@@ -176,3 +237,90 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Nobody owns this song\n"
+#~ "\n"
+#~ "(Title Subject To Change, Of Course)\n"
+#~ "------------------------------------\n"
+#~ "\n"
+#~ "\n"
+#~ "This song, it has no author\n"
+#~ "No place of origin;\n"
+#~ "This song, it has no ending,\n"
+#~ "And it never did begin;\n"
+#~ "This song can travel anywhere;\n"
+#~ "There's no place it don't belong . . .\n"
+#~ "'Cause nobody owns this song.\n"
+#~ "\n"
+#~ "Melodies can be added\n"
+#~ "In major or minor keys.\n"
+#~ "All parts can be rearranged\n"
+#~ "In any ways you please.\n"
+#~ "Many things can be done to this,\n"
+#~ "And none of them are wrong,\n"
+#~ "'Cause nobody owns this song.\n"
+#~ "\n"
+#~ "You can play it on the lute,\n"
+#~ "You can play it on the flute,\n"
+#~ "You can play it on the slide trombone.\n"
+#~ "You can play it on the harp,\n"
+#~ "You can play it flat or sharp,\n"
+#~ "You can play it on the saxophone.\n"
+#~ "You can play it real high or\n"
+#~ "You can play it real low,\n"
+#~ "You can play it real fast or\n"
+#~ "You can play it real slow,\n"
+#~ "You can play it real short or\n"
+#~ "You can play it real long,\n"
+#~ "'Cause nobody owns this song.\n"
+#~ msgstr ""
+#~ "Personne ne possède cette chanson\n"
+#~ "\n"
+#~ "(titre modifiable, naturellement)\n"
+#~ "---------------------------------\n"
+#~ "\n"
+#~ "\n"
+#~ "Cette chanson n'a pas d'auteur,\n"
+#~ "Pas de lieu d'origine ;\n"
+#~ "Cette chanson, n'a pas de fin\n"
+#~ "Et n'a jamais commencé ;\n"
+#~ "Cette chanson peut voyager n'importe où ;\n"
+#~ "Aucun lieu ne lui est interdit...\n"
+#~ "Car personne ne possède cette chanson.\n"
+#~ "\n"
+#~ "Des mélodies peuvent être ajoutées\n"
+#~ "Dans des tons majeurs ou mineurs.\n"
+#~ "Toutes les parties peuvent être réarrangées\n"
+#~ "De toutes les manières qui vous plairont.\n"
+#~ "Beaucoup de choses peuvent lui être faites\n"
+#~ "Et aucune d'elles n'est mauvaise,\n"
+#~ "Car personne ne possède cette chanson.\n"
+#~ "\n"
+#~ "Vous pouvez la jouer sur un luth,\n"
+#~ "Vous pouvez la jouer à la flûte,\n"
+#~ "Vous pouvez la jouer au trombone à coulisse.\n"
+#~ "Vous pouvez la jouer sur une harpe,\n"
+#~ "Vous pouvez la jouer avec bémol ou dièse,\n"
+#~ "Vous pouvez la jouer au saxophone.\n"
+#~ "Vous pouvez la jouer vraiment fort ou\n"
+#~ "Vous pouvez la jouer doucement,\n"
+#~ "Vous pouvez la jouer vraiment vite ou\n"
+#~ "Vous pouvez la jouer lentement,\n"
+#~ "vous pouvez la jouer raccourcie ou\n"
+#~ "vous pouvez la jouer rallongée,\n"
+#~ "Car personne ne possède cette chanson.\n"
+
+#~ 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 "Nobody knows from where this song was obtained!"
+#~ msgstr ""
+#~ "La <i>Free Software Foundation</i> ne revendique pas de copyright sur "
+#~ "cette chanson,"
+
+#~ msgid "The Free Software Foundation claims no copyrights on this song."
+#~ msgstr "car personne ne sait d'où elle vient !"

Index: fun/jokes/po/nobody-owns.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/nobody-owns.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/nobody-owns.pot        21 Aug 2015 01:57:44 -0000      1.8
+++ fun/jokes/po/nobody-owns.pot        12 Jul 2021 17:02:29 -0000      1.9
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/nobody-owns.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/nobody-owns.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: nobody-owns.html\n"
-"POT-Creation-Date: 2015-08-21 01:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,64 +20,164 @@
 msgid "Nobody owns this song - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Nobody owns this song"
-msgstr ""
-
-#. type: Content of: <pre>
+#
+#. .lyrics { display: inline-block; }
+#. .chorus { color: #6b3699; }
+#
+#. type: Content of: <style>
 #, no-wrap
 msgid ""
-"Nobody owns this song\n"
-"\n"
-"(Title Subject To Change, Of Course)\n"
-"------------------------------------\n"
-"\n"
 "\n"
-"This song, it has no author\n"
-"No place of origin;\n"
-"This song, it has no ending,\n"
-"And it never did begin;\n"
-"This song can travel anywhere;\n"
-"There's no place it don't belong . . .\n"
-"'Cause nobody owns this song.\n"
-"\n"
-"Melodies can be added\n"
-"In major or minor keys.\n"
-"All parts can be rearranged\n"
-"In any ways you please.\n"
-"Many things can be done to this,\n"
-"And none of them are wrong,\n"
-"'Cause nobody owns this song.\n"
-"\n"
-"You can play it on the lute,\n"
-"You can play it on the flute,\n"
-"You can play it on the slide trombone.\n"
-"You can play it on the harp,\n"
-"You can play it flat or sharp,\n"
-"You can play it on the saxophone.\n"
-"You can play it real high or\n"
-"You can play it real low,\n"
-"You can play it real fast or\n"
-"You can play it real slow,\n"
-"You can play it real short or\n"
-"You can play it real long,\n"
-"'Cause nobody owns this song.\n"
+".reduced-width { width: 40em; }\n"
+"@media (min-width: 25em) {\n"
+"  .lyrics { display: block; box-sizing: border-box;\n"
+"            width: 28em; max-width: 100%; }\n"
+"  .s1  { padding-left:  3%; }\n"
+"  .s2  { padding-left:  6%; }\n"
+"  .s3  { padding-left:  9%; }\n"
+"  .s4  { padding-left: 12%; }\n"
+"  .s5  { padding-left: 15%; }\n"
+"  .s6  { padding-left: 18%; }\n"
+"  .s7  { padding-left: 21%; }\n"
+"  .s8  { padding-left: 24%; }\n"
+"  .s9  { padding-left: 27%; }\n"
+"  .s10 { padding-left: 30%; }\n"
+"  .s11 { padding-left: 33%; }\n"
+"}\n"
+msgstr ""
+
+#. type: Content of: <p><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <p><a><img>
+msgid "GNU Home"
 msgstr ""
 
 #. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <div><h4>
-msgid "Disclaimer"
+#. type: Content of: <div><h2>
+msgid "Nobody owns this song"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Nobody knows from where this song was obtained!"
+#. type: Content of: <div><div><p>
+msgid "(Title Subject To Change, Of Course)"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "The Free Software Foundation claims no copyrights on this song."
+#. type: Content of: <div><div><p>
+msgid "This song, it has no author"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s1\">No place of origin;</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s2\">This song, it has no ending,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s3\">And it never did begin;</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s4\">This song can travel anywhere;</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"<span class=\"s5\">There's no place it don't "
+"belong&nbsp;.&nbsp;.&nbsp;.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"chorus\">'Cause nobody owns this song.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "Melodies can be added"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s1\">In major or minor keys.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s2\">All parts can be rearranged</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s3\">In any ways you please.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s4\">Many things can be done to this,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s5\">And none of them are wrong,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "You can play it on the lute,"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s1\">You can play it on the flute,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s2\">You can play it on the slide trombone.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s3\">You can play it on the harp,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s4\">You can play it flat or sharp,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s5\">You can play it on the saxophone.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s6\">You can play it real high or</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s7\">You can play it real low,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s8\">You can play it real fast or</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s9\">You can play it real slow,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s10\">You can play it real short or</span>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "<span class=\"s11\">You can play it real long,</span>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "Disclaimer"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"The lyrics on this page were obtained from the FSF's email archives of the "
+"GNU Project. The Free Software Foundation does not claim copyright on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -104,7 +204,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>. 
@@ -112,7 +212,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: music/po/blues-song.de.po
===================================================================
RCS file: /web/www/www/music/po/blues-song.de.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- music/po/blues-song.de.po   12 Jul 2021 16:55:32 -0000      1.28
+++ music/po/blues-song.de.po   12 Jul 2021 17:02:30 -0000      1.29
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: blues-song.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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"
@@ -14,159 +14,204 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "The Programmer's Blues - GNU Project - Free Software Foundation"
 msgstr "Programmierer Blues - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ".chorus { color: #6b3699; }\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-Startseite"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Programmer's Blues"
 msgstr "Programmierer Blues"
 
-#. type: Content of: <p>
-msgid "<em>(with apologies to Glenn Frye)</em>"
-msgstr "<em>(mit der Bitte um Entschuldigung an Glenn Frye)</em>"
+#. type: Content of: <div><address>
+msgid "by Robert J. Woodhead"
+msgstr ""
 
 #. type: Content of: <div><p>
+msgid ""
+"Sung to the tune of <cite>Smuggler's Blues</cite> by Glenn&nbsp;Frye and "
+"Jack&nbsp;Tempchin"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "There's trouble in the data now, I can feel it in my bones,"
 msgstr "There's trouble in the data now, I can feel it in my bones,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Had a premonition that I shouldn't program alone,"
 msgstr "Had a premonition that I shouldn't program alone,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Had the new Rev loaded but I didn't think it'd fry,"
 msgstr "Had the new Rev loaded but I didn't think it'd fry,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Then everything exploded and 2 weeks work blew sky-high!"
 msgstr "Then everything exploded and 2 weeks work blew sky-high!"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "So baby here's a printout and a keyboard in your hand,"
 msgstr "So baby here's a printout and a keyboard in your hand,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And here's a little floppy. Now, do it just the way he planned,"
 msgstr "And here's a little floppy. Now, do it just the way he planned,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You debug for 20 days and I'll pay you 20 grand!"
 msgstr "You debug for 20 days and I'll pay you 20 grand!"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I'm sorry it went down like this, but some chip had to fuse."
 msgstr "I'm sorry it went down like this, but some chip had to fuse."
 
-#. type: Content of: <div><p>
-msgid "It's the typing of the language, it's the programmer's blues&#8230;"
+#. type: Content of: <div><div><p>
+# | It's the typing of the language, it's the programmer's [-blues&#8230;-]
+# | {+blues&hellip;+}
+#, fuzzy
+#| msgid "It's the typing of the language, it's the programmer's blues&#8230;"
+msgid "It's the typing of the language, it's the programmer's blues&hellip;"
 msgstr "It's the typing of the language, it's the programmer's blues&#8230;"
 
-#. type: Content of: <div><p>
-msgid "Programmer's blues&#8230;"
+#. type: Content of: <div><div><p>
+# | Programmer's [-blues&#8230;-] {+blues&hellip;+}
+#, fuzzy
+#| msgid "Programmer's blues&#8230;"
+msgid "Programmer's blues&hellip;"
 msgstr "Programmer's blues&#8230;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Coder's and analyst's, hacker's and sysop's,"
 msgstr "Coder's and analyst's, hacker's and sysop's,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The comments and strange bomboffs, and the bugs nobody copped,"
 msgstr "The comments and strange bomboffs, and the bugs nobody copped,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "No matter if it's Pascal, Basic, or Cobol,"
 msgstr "No matter if it's Pascal, Basic, or Cobol,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You've got to carry manuals, there's no online help at all!"
 msgstr "You've got to carry manuals, there's no online help at all!"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's lots of rotten coffee, and lots of dirty food,"
 msgstr "It's lots of rotten coffee, and lots of dirty food,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Every variable name is dangerous, it might have been pre-used,"
 msgstr "Every variable name is dangerous, it might have been pre-used,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's the lure of relaxed typing, it's so easy to be crude!"
 msgstr "It's the lure of relaxed typing, it's so easy to be crude!"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Perhaps you'll understand it better, when you see my tools,"
 msgstr "Perhaps you'll understand it better, when you see my tools,"
 
-#. type: Content of: <div><p>
-msgid "It's the ultimate enhancement, it's the programmer's blues&#8230;"
+#. type: Content of: <div><div><p>
+# | It's the ultimate enhancement, it's the programmer's [-blues&#8230;-]
+# | {+blues&hellip;+}
+#, fuzzy
+#| msgid "It's the ultimate enhancement, it's the programmer's blues&#8230;"
+msgid "It's the ultimate enhancement, it's the programmer's blues&hellip;"
 msgstr "It's the ultimate enhancement, it's the programmer's blues&#8230;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You see it in the memos, you read them every day,"
 msgstr "You see it in the memos, you read them every day,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "They say you have to fix those bugs, but they don't go away."
 msgstr "They say you have to fix those bugs, but they don't go away."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "No matter how hard you work, it just won't run ok,"
 msgstr "No matter how hard you work, it just won't run ok,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You bury them in subroutines, but you know they are here to stay!"
 msgstr "You bury them in subroutines, but you know they are here to stay!"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You hope that none'll notice them, but they always seem to do,"
 msgstr "You hope that none'll notice them, but they always seem to do,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You beg for Beta-testing, maybe one will give a clue,"
 msgstr "You beg for Beta-testing, maybe one will give a clue,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Down from the office of your manager, you learn the heat's on
+# | [-you&#8230;-] {+you&hellip;+}
+#, fuzzy
+#| msgid ""
+#| "Down from the office of your manager, you learn the heat's on you&#8230;"
 msgid ""
-"Down from the office of your manager, you learn the heat's on you&#8230;"
+"Down from the office of your manager, you learn the heat's on you&hellip;"
 msgstr ""
 "Down from the office of your manager, you learn the heat's on you&#8230;"
 
-#. type: Content of: <div><p>
-msgid "Heat's on you&#8230;"
+#. type: Content of: <div><div><p>
+# | Heat's on [-you&#8230;-] {+you&hellip;+}
+#, fuzzy
+#| msgid "Heat's on you&#8230;"
+msgid "Heat's on you&hellip;"
 msgstr "Heat's on you&#8230;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's a losing proposition, but one you can't refuse,"
 msgstr "It's a losing proposition, but one you can't refuse,"
 
-#. type: Content of: <div><p>
-msgid "It's policies of debugging, it's the programmer's blues&#8230;"
+#. type: Content of: <div><div><p>
+# | It's policies of debugging, it's the programmer's [-blues&#8230;-]
+# | {+blues&hellip;+}
+#, fuzzy
+#| msgid "It's policies of debugging, it's the programmer's blues&#8230;"
+msgid "It's policies of debugging, it's the programmer's blues&hellip;"
 msgstr "It's policies of debugging, it's the programmer's blues&#8230;"
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Lizenzierung"
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The joke on this page was obtained from the FSF's <a href=\"http://lists.gnu.";
-"org/\">email archives</a> of the GNU Project."
+"The lyrics on this page were obtained from the FSF's email archives of the "
+"GNU Project (before 1999). Neither the author nor the Free Software "
+"Foundation claim copyright on them."
 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 copyright on this joke."
-msgstr ""
-"Die <span xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> erhebt "
-"keine Urheberrechte an diesem Witz."
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "Weiterer Humor in <a href=\"/fun/humor\">GNUs Humor-Sammlung</a>."
+"Other source:&nbsp; <a href=\"http://www.poppyfields.net/filks/00189.html";
+"\">poppyfields.net</a>"
+msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -195,14 +240,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. "
@@ -215,21 +266,6 @@
 "Übersetzungen unserer Internetpräsenz finden Sie in der <a href=\"/server/"
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
-
-#. type: Content of: <div><p>
-msgid ""
-"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
-msgstr ""
-"Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
-"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
-"Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
-"Lizenz."
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
@@ -242,9 +278,38 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014, 2021 Free Software Foundation, Inc."
+#~ msgid "<em>(with apologies to Glenn Frye)</em>"
+#~ msgstr "<em>(mit der Bitte um Entschuldigung an Glenn Frye)</em>"
+
+#~ msgid "Licensing"
+#~ msgstr "Lizenzierung"
+
+#~ msgid ""
+#~ "The joke on this page was obtained from the FSF's <a href=\"http://lists.";
+#~ "gnu.org/\">email archives</a> of the GNU Project."
+#~ msgstr ""
+#~ "Der Witz wurde den <a href=\"//lists.gnu.org/\">E-Mail-Archiven</a> des "
+#~ "GNU-Projekts der FSF entnommen."
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "Weiterer Humor in <a href=\"/fun/humor\">GNUs Humor-Sammlung</a>."
+
+#~ msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
+#~ "Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
+#~ "Lizenz."
+
+#~ msgid "Copyright &copy; 2014, 2021 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2014, 2021 Free Software Foundation, Inc."
 
 #~ msgid "Copyright &copy; 1999 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 1999 Free Software Foundation, Inc."

Index: music/po/blues-song.pot
===================================================================
RCS file: /web/www/www/music/po/blues-song.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- music/po/blues-song.pot     5 Apr 2014 00:41:47 -0000       1.10
+++ music/po/blues-song.pot     12 Jul 2021 17:02:30 -0000      1.11
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/music/blues-song.html
+# LANGUAGE translation of https://www.gnu.org/music/blues-song.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,159 +7,179 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: blues-song.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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 "The Programmer's Blues - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ".chorus { color: #6b3699; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Programmer's Blues"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<em>(with apologies to Glenn Frye)</em>"
+#. type: Content of: <div><address>
+msgid "by Robert J. Woodhead"
 msgstr ""
 
 #. type: Content of: <div><p>
+msgid ""
+"Sung to the tune of <cite>Smuggler's Blues</cite> by Glenn&nbsp;Frye and "
+"Jack&nbsp;Tempchin"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "There's trouble in the data now, I can feel it in my bones,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Had a premonition that I shouldn't program alone,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Had the new Rev loaded but I didn't think it'd fry,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Then everything exploded and 2 weeks work blew sky-high!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "So baby here's a printout and a keyboard in your hand,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "And here's a little floppy. Now, do it just the way he planned,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You debug for 20 days and I'll pay you 20 grand!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I'm sorry it went down like this, but some chip had to fuse."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "It's the typing of the language, it's the programmer's blues&#8230;"
+#. type: Content of: <div><div><p>
+msgid "It's the typing of the language, it's the programmer's blues&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:   
-msgid "Programmer's blues&#8230;"
+#. type: Content of: <div><div><p>
+msgid "Programmer's blues&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Coder's and analyst's, hacker's and sysop's,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The comments and strange bomboffs, and the bugs nobody copped,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "No matter if it's Pascal, Basic, or Cobol,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You've got to carry manuals, there's no online help at all!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's lots of rotten coffee, and lots of dirty food,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Every variable name is dangerous, it might have been pre-used,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's the lure of relaxed typing, it's so easy to be crude!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Perhaps you'll understand it better, when you see my tools,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "It's the ultimate enhancement, it's the programmer's blues&#8230;"
+#. type: Content of: <div><div><p>
+msgid "It's the ultimate enhancement, it's the programmer's blues&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You see it in the memos, you read them every day,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "They say you have to fix those bugs, but they don't go away."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "No matter how hard you work, it just won't run ok,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You bury them in subroutines, but you know they are here to stay!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You hope that none'll notice them, but they always seem to do,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You beg for Beta-testing, maybe one will give a clue,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Down from the office of your manager, you learn the heat's on 
you&#8230;"
+#. type: Content of: <div><div><p>
+msgid "Down from the office of your manager, you learn the heat's on 
you&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Heat's on you&#8230;"
+#. type: Content of: <div><div><p>
+msgid "Heat's on you&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's a losing proposition, but one you can't refuse,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "It's policies of debugging, it's the programmer's blues&#8230;"
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Licensing"
+#. type: Content of: <div><div><p>
+msgid "It's policies of debugging, it's the programmer's blues&hellip;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The joke on this page was obtained from the FSF's <a "
-"href=\"http://lists.gnu.org/\";>email archives</a> of the GNU Project."
+"The lyrics on this page were obtained from the FSF's email archives of the "
+"GNU Project (before 1999). Neither the author nor the Free Software "
+"Foundation claim copyright on them."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-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 ""
+"Other source:&nbsp; <a "
+"href=\"http://www.poppyfields.net/filks/00189.html\";>poppyfields.net</a>"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -186,7 +206,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>. 
@@ -194,18 +214,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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: music/po/emacsvsvi.de.po
===================================================================
RCS file: /web/www/www/music/po/emacsvsvi.de.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- music/po/emacsvsvi.de.po    31 May 2021 13:39:51 -0000      1.29
+++ music/po/emacsvsvi.de.po    12 Jul 2021 17:02:30 -0000      1.30
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: emacsvsvi.html\n"
 "Report-Msgid-Bugs-To: webmasters@gnu.org\n"
-"POT-Creation-Date: 2015-07-28 01:30+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2015-08-12 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -15,146 +15,201 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 
 #. type: Content of: <title>
-msgid "Emacs vs VI - GNU Project - Free Software Foundation"
+# | Emacs vs V[-I-]{+i+} - GNU Project - Free Software Foundation
+#, fuzzy
+#| msgid "Emacs vs VI - GNU Project - Free Software Foundation"
+msgid "Emacs vs Vi - GNU Project - Free Software Foundation"
 msgstr "Emacs vs. VI - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
-msgid "Emacs vs VI"
-msgstr "Emacs vs. VI"
+#. type: Content of: <style>
+#, no-wrap
+msgid ""
+".chorus { color: #6b3699; }\n"
+"#download a { margin: 0 .5em; }\n"
+"}\n"
+msgstr ""
 
-#. type: Content of: <p>
+#. 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>
 msgid ""
-"<em>(To the tune of &ldquo;Ghost Riders in the Sky&rdquo;, by the Outlaws)</"
-"em>"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+# | Emacs vs V[-I-]{+i+}
+#, fuzzy
+#| msgid "Emacs vs VI"
+msgid "Emacs vs Vi"
+msgstr "Emacs vs. VI"
+
+#. type: Content of: <div><p>
+# | [-<em>(To-]{+Sung to+} the tune of [-&ldquo;Ghost-] {+<cite>Ghost+} Riders
+# | in the [-Sky&rdquo;,-] {+Sky</cite>+} by the [-Outlaws)</em>-] {+Outlaws+}
+#, fuzzy
+#| msgid ""
+#| "<em>(To the tune of &ldquo;Ghost Riders in the Sky&rdquo;, by the Outlaws)"
+#| "</em>"
+msgid "Sung to the tune of <cite>Ghost Riders in the Sky</cite> by the Outlaws"
 msgstr ""
 "<em>(Zur Melodie von <cite>Ghost Riders in the Sky</cite> von den Outlaws)</"
 "em>"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A hacker went a-coding armed with coffee and his brain"
 msgstr "A hacker went a-coding armed with coffee and his brain"
 
-#. type: Content of: <div><p>
-msgid "Debating in himself whether to put it all in &#8217;main&#8217;"
+#. type: Content of: <div><div><p>
+# | Debating in himself whether to put it all in [-&#8217;main&#8217;-]
+# | {+&ldquo;main&rdquo;+}
+#, fuzzy
+#| msgid "Debating in himself whether to put it all in &#8217;main&#8217;"
+msgid "Debating in himself whether to put it all in &ldquo;main&rdquo;"
 msgstr "Debating in himself whether to put it all in &#8217;main&#8217;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When all at once his IRC was filled with hateful spite"
 msgstr "When all at once his IRC was filled with hateful spite"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A plethora of angry words about syntax highlight"
 msgstr "A plethora of angry words about syntax highlight"
 
-#. type: Content of: <div><p>
-msgid "Their hands were writing fire and they called each other n00b&#8230;"
+#. type: Content of: <div><div><p>
+# | Their hands were writing fire and they called each other [-n00b&#8230;-]
+# | {+n00b&hellip;+}
+#, fuzzy
+#| msgid "Their hands were writing fire and they called each other n00b&#8230;"
+msgid "Their hands were writing fire and they called each other n00b&hellip;"
 msgstr "Their hands were writing fire and they called each other n00b&#8230;"
 
-#. type: Content of: <div><p>
-msgid "He&#8217;d never seen such sparking since the days of vacuum tubes"
+#. type: Content of: <div><div><p>
+# | [-He&#8217;d-]{+He'd+} never seen such sparking since the days of vacuum
+# | tubes
+#, fuzzy
+#| msgid "He&#8217;d never seen such sparking since the days of vacuum tubes"
+msgid "He'd never seen such sparking since the days of vacuum tubes"
 msgstr "He&#8217;d never seen such sparking since the days of vacuum tubes"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A bolt of fear went through him as he closed parentheses"
 msgstr "A bolt of fear went through him as he closed parentheses"
 
-#. type: Content of: <div><p>
-msgid "Torn between the &#8217;write and quit&#8217; and ol&#8217; C-x C-c"
+#. type: Content of: <div><div><p>
+# | Torn between the [-&#8217;write-] {+&ldquo;write+} and [-quit&#8217;-]
+# | {+quit&rdquo;+} and [-ol&#8217;-] {+ol'+} C-x C-c
+#, fuzzy
+#| msgid "Torn between the &#8217;write and quit&#8217; and ol&#8217; C-x C-c"
+msgid "Torn between the &ldquo;write and quit&rdquo; and ol' C-x C-c"
 msgstr "Torn between the &#8217;write and quit&#8217; and ol&#8217; C-x C-c"
 
-#. type: Content of: <div><p>
-msgid "Yippy kai yay&#8230;"
+#. type: Content of: <div><div><p>
+# | Yippy kai [-yay&#8230;-] {+yay&hellip;+}
+#, fuzzy
+#| msgid "Yippy kai yay&#8230;"
+msgid "Yippy kai yay&hellip;"
 msgstr "Yippy kai yay&#8230;"
 
-#. type: Content of: <div><p>
-msgid "File I/O&#8230;"
+#. type: Content of: <div><div><p>
+# | File [-I/O&#8230;-] {+I/O&hellip;+}
+#, fuzzy
+#| msgid "File I/O&#8230;"
+msgid "File I/O&hellip;"
 msgstr "File I/O&#8230;"
 
-#. type: Content of: <div><p>
-msgid "Emacs versus vi&#8230;"
+#. type: Content of: <div><div><p>
+# | Emacs versus [-vi&#8230;-] {+vi&hellip;+}
+#, fuzzy
+#| msgid "Emacs versus vi&#8230;"
+msgid "Emacs versus vi&hellip;"
 msgstr "Emacs versus vi&#8230;"
 
-#. type: Content of: <div><p>
-msgid "He&#8217;d long endured the arguments, he knew the story well&#8230;"
+#. type: Content of: <div><div><p>
+# | [-He&#8217;d-]{+He'd+} long endured the arguments, he knew the story
+# | [-well&#8230;-] {+well&hellip;+}
+#, fuzzy
+#| msgid "He&#8217;d long endured the arguments, he knew the story well&#8230;"
+msgid "He'd long endured the arguments, he knew the story well&hellip;"
 msgstr "He&#8217;d long endured the arguments, he knew the story well&#8230;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "So why condemn an editor and all its bytes to Hell?"
 msgstr "So why condemn an editor and all its bytes to Hell?"
 
-#. type: Content of: <div><p>
-msgid "From concepts of simplicity to a buffer-based OS&#8230;"
+#. type: Content of: <div><div><p>
+# | From concepts of simplicity to a buffer-based [-OS&#8230;-] {+OS&hellip;+}
+#, fuzzy
+#| msgid "From concepts of simplicity to a buffer-based OS&#8230;"
+msgid "From concepts of simplicity to a buffer-based OS&hellip;"
 msgstr "From concepts of simplicity to a buffer-based OS&#8230;"
 
-#. type: Content of: <div><p>
-msgid ""
-"You&#8217;d think they&#8217;d find a better way to work out daily stress!"
+#. type: Content of: <div><div><p>
+# | [-You&#8217;d-]{+You'd+} think [-they&#8217;d-] {+they'd+} find a better
+# | way to work out daily stress!
+#, fuzzy
+#| msgid ""
+#| "You&#8217;d think they&#8217;d find a better way to work out daily stress!"
+msgid "You'd think they'd find a better way to work out daily stress!"
 msgstr ""
 "You&#8217;d think they&#8217;d find a better way to work out daily stress!"
 
-#. type: Content of: <div><p>
-msgid ""
-"So learn your lesson, hacker, and you&#8217;ll not regret one day&#8230;"
+#. type: Content of: <div><div><p>
+# | So learn your lesson, hacker, and [-you&#8217;ll-] {+you'll+} not regret
+# | one [-day&#8230;-] {+day&hellip;+}
+#, fuzzy
+#| msgid ""
+#| "So learn your lesson, hacker, and you&#8217;ll not regret one day&#8230;"
+msgid "So learn your lesson, hacker, and you'll not regret one day&hellip;"
 msgstr ""
 "So learn your lesson, hacker, and you&#8217;ll not regret one day&#8230;"
 
-#. type: Content of: <div><p>
-msgid "The time you spent recovering, and throwing chars away&#8230;"
+#. type: Content of: <div><div><p>
+# | The time you spent recovering, and throwing chars [-away&#8230;-]
+# | {+away&hellip;+}
+#, fuzzy
+#| msgid "The time you spent recovering, and throwing chars away&#8230;"
+msgid "The time you spent recovering, and throwing chars away&hellip;"
 msgstr "The time you spent recovering, and throwing chars away&#8230;"
 
-#. type: Content of: <div><p>
-msgid ""
-"What&#8217;s popular is never what you&#8217;ll get into your head&#8230;"
+#. type: Content of: <div><div><p>
+# | [-What&#8217;s-]{+What's+} popular is never what [-you&#8217;ll-]
+# | {+you'll+} get into your [-head&#8230;-] {+head&hellip;+}
+#, fuzzy
+#| msgid ""
+#| "What&#8217;s popular is never what you&#8217;ll get into your head&#8230;"
+msgid "What's popular is never what you'll get into your head&hellip;"
 msgstr ""
 "What&#8217;s popular is never what you&#8217;ll get into your head&#8230;"
 
-#. type: Content of: <div><p>
-msgid "So take a pointer from the pros&#8230; and choose the mighty ED!"
+#. type: Content of: <div><div><p>
+# | So take a pointer from the [-pros&#8230;-] {+pros&hellip;+} and choose the
+# | mighty ED!
+#, fuzzy
+#| msgid "So take a pointer from the pros&#8230; and choose the mighty ED!"
+msgid "So take a pointer from the pros&hellip; and choose the mighty ED!"
 msgstr "So take a pointer from the pros&#8230; and choose the mighty ED!"
 
-#. type: Content of: <h3>
-msgid "Other formats"
-msgstr "Weitere Formate"
-
-#. type: Content of: <p>
-msgid "<a href=\"/music/emacsvsvi.tex\">Latex</a>"
-msgstr "<a href=\"/music/emacsvsvi.tex\">.tex-Datei</a>"
-
-#. type: Content of: <p>
-msgid "<a href=\"/music/emacsvsvi.pdf\">PDF</a>"
-msgstr "<a href=\"/music/emacsvsvi.pdf\">.pdf-Datei</a>"
-
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Lizenzierung"
-
-#. type: Content of: <p>
-msgid "Copyright (C) 2010 by James Taylor"
-msgstr "Copyright (C) 2010 James Taylor."
-
-# "Die Erlaubnis wird erteilt, dieses Dokument unter den Bedingungen der <a "
-# "href=\"/licenses/fdl-1.3-standalone.html\" xml:lang=\"en\" lang=\"en\">GNU "
-# "Free Documentation License</a>, Version 1.3, zu vervielfältigen, "
-# "distribuieren und/oder modifizieren."
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License, Version 1.3"
+"Other formats: <a href=\"/music/emacsvsvi.tex\">Latex</a> <a href=\"/music/"
+"emacsvsvi.pdf\">PDF</a>"
 msgstr ""
-"Dieses Werk ist lizenziert unter <a href=\"/licenses/fdl-1.3-standalone.html"
-"\">GNU Free Documentation License, Version 1.3</a>-Lizenz und darf "
-"vervielfältigt, distribuiert und/oder modifiziert werden."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this song."
-msgstr "Die Free Software Foundation erhebt kein Copyright auf dieses Werk."
-
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "Weiterer Humor in <a href=\"/fun/humor\">GNUs Humor-Sammlung</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -183,14 +238,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. "
@@ -205,22 +266,33 @@
 
 # see #license
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 by James Taylor"
+# | Copyright &copy; 2010 [-by-] James Taylor {+(the lyrics)+}
+#, fuzzy
+#| msgid "Copyright &copy; 2010 by James Taylor"
+msgid "Copyright &copy; 2010 James Taylor (the lyrics)"
 msgstr "Copyright &copy; 2010, 2014, 2015 Free Software Foundation, Inc."
 
-# deviating translation; see #license
-# -->Web page copyright FSF, work copyright James Taylor.
-#  That's totally different.
+# "Die Erlaubnis wird erteilt, dieses Dokument unter den Bedingungen der <a "
+# "href=\"/licenses/fdl-1.3-standalone.html\" xml:lang=\"en\" lang=\"en\">GNU "
+# "Free Documentation License</a>, Version 1.3, zu vervielfältigen, "
+# "distribuieren und/oder modifizieren."
 #. type: Content of: <div><p>
+# | Permission is granted to copy, distribute and/or modify this document
+# | under the terms of the [-GNU-] {+<a rel=\"license\"
+# | href=\"/licenses/fdl.html\">GNU+} Free Documentation License, [-Version
+# | 1.3-] {+version 1.3</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Permission is granted to copy, distribute and/or modify this document "
+#| "under the terms of the GNU Free Documentation License, Version 1.3"
 msgid ""
-"'Emacs vs VI' by James Taylor is licensed under the <a href=\"https://gnu.";
-"org/licenses/fdl-1.3-standalone.html\">GNU Free Documentation License, "
-"Version 1.3</a>."
-msgstr ""
-"Sofern nicht anders <a href=\"#license\">angegeben</a>, ist dieses Werk "
-"lizenziert unter einer <a rel=\"license\" href=\"https://creativecommons.org/";
-"licenses/by-nd/4.0/deed.de\">Creative Commons Namensnennung-Keine "
-"Bearbeitung 4.0 International</a>-Lizenz."
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the <a rel=\"license\" href=\"/licenses/fdl.html\">GNU Free "
+"Documentation License, version 1.3</a>."
+msgstr ""
+"Dieses Werk ist lizenziert unter <a href=\"/licenses/fdl-1.3-standalone.html"
+"\">GNU Free Documentation License, Version 1.3</a>-Lizenz und darf "
+"vervielfältigt, distribuiert und/oder modifiziert werden."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -234,6 +306,41 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid "Other formats"
+#~ msgstr "Weitere Formate"
+
+#~ msgid "<a href=\"/music/emacsvsvi.tex\">Latex</a>"
+#~ msgstr "<a href=\"/music/emacsvsvi.tex\">.tex-Datei</a>"
+
+#~ msgid "<a href=\"/music/emacsvsvi.pdf\">PDF</a>"
+#~ msgstr "<a href=\"/music/emacsvsvi.pdf\">.pdf-Datei</a>"
+
+#~ msgid "Licensing"
+#~ msgstr "Lizenzierung"
+
+#~ msgid "Copyright (C) 2010 by James Taylor"
+#~ msgstr "Copyright (C) 2010 James Taylor."
+
+#~ msgid "The Free Software Foundation claims no copyright on this song."
+#~ msgstr "Die Free Software Foundation erhebt kein Copyright auf dieses Werk."
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "Weiterer Humor in <a href=\"/fun/humor\">GNUs Humor-Sammlung</a>."
+
+# deviating translation; see #license
+# -->Web page copyright FSF, work copyright James Taylor.
+#  That's totally different.
+#~ msgid ""
+#~ "'Emacs vs VI' by James Taylor is licensed under the <a href=\"https://gnu.";
+#~ "org/licenses/fdl-1.3-standalone.html\">GNU Free Documentation License, "
+#~ "Version 1.3</a>."
+#~ msgstr ""
+#~ "Sofern nicht anders <a href=\"#license\">angegeben</a>, ist dieses Werk "
+#~ "lizenziert unter einer <a rel=\"license\" href=\"https://creativecommons.";
+#~ "org/licenses/by-nd/4.0/deed.de\">Creative Commons Namensnennung-Keine "
+#~ "Bearbeitung 4.0 International</a>-Lizenz."
+
 #~ msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 

Index: music/po/emacsvsvi.pot
===================================================================
RCS file: /web/www/www/music/po/emacsvsvi.pot,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- music/po/emacsvsvi.pot      28 Jul 2015 01:33:04 -0000      1.11
+++ music/po/emacsvsvi.pot      12 Jul 2021 17:02:30 -0000      1.12
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/music/emacsvsvi.html
+# LANGUAGE translation of https://www.gnu.org/music/emacsvsvi.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: emacsvsvi.html\n"
-"POT-Creation-Date: 2015-07-28 01:30+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,127 +17,119 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Emacs vs VI - GNU Project - Free Software Foundation"
+msgid "Emacs vs Vi - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Emacs vs VI"
-msgstr ""
-
-#. type: Content of: <p>
+#. type: Content of: <style>
+#, no-wrap
 msgid ""
-"<em>(To the tune of &ldquo;Ghost Riders in the Sky&rdquo;, by the "
-"Outlaws)</em>"
+".chorus { color: #6b3699; }\n"
+"#download a { margin: 0 .5em; }\n"
+"}\n"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "A hacker went a-coding armed with coffee and his brain"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Debating in himself whether to put it all in &#8217;main&#8217;"
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "When all at once his IRC was filled with hateful spite"
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "A plethora of angry words about syntax highlight"
+#. type: Content of: <div><h2>
+msgid "Emacs vs Vi"
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Their hands were writing fire and they called each other n00b&#8230;"
+msgid "Sung to the tune of <cite>Ghost Riders in the Sky</cite> by the Outlaws"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "He&#8217;d never seen such sparking since the days of vacuum tubes"
+#. type: Content of: <div><div><p>
+msgid "A hacker went a-coding armed with coffee and his brain"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "A bolt of fear went through him as he closed parentheses"
+#. type: Content of: <div><div><p>
+msgid "Debating in himself whether to put it all in &ldquo;main&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Torn between the &#8217;write and quit&#8217; and ol&#8217; C-x C-c"
+#. type: Content of: <div><div><p>
+msgid "When all at once his IRC was filled with hateful spite"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Yippy kai yay&#8230;"
+#. type: Content of: <div><div><p>
+msgid "A plethora of angry words about syntax highlight"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "File I/O&#8230;"
+#. type: Content of: <div><div><p>
+msgid "Their hands were writing fire and they called each other n00b&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Emacs versus vi&#8230;"
+#. type: Content of: <div><div><p>
+msgid "He'd never seen such sparking since the days of vacuum tubes"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "He&#8217;d long endured the arguments, he knew the story well&#8230;"
+#. type: Content of: <div><div><p>
+msgid "A bolt of fear went through him as he closed parentheses"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "So why condemn an editor and all its bytes to Hell?"
+#. type: Content of: <div><div><p>
+msgid "Torn between the &ldquo;write and quit&rdquo; and ol' C-x C-c"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "From concepts of simplicity to a buffer-based OS&#8230;"
+#. type: Content of: <div><div><p>
+msgid "Yippy kai yay&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "You&#8217;d think they&#8217;d find a better way to work out daily 
stress!"
+#. type: Content of: <div><div><p>
+msgid "File I/O&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "So learn your lesson, hacker, and you&#8217;ll not regret one 
day&#8230;"
+#. type: Content of: <div><div><p>
+msgid "Emacs versus vi&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "The time you spent recovering, and throwing chars away&#8230;"
+#. type: Content of: <div><div><p>
+msgid "He'd long endured the arguments, he knew the story well&hellip;"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "What&#8217;s popular is never what you&#8217;ll get into your 
head&#8230;"
+#. type: Content of: <div><div><p>
+msgid "So why condemn an editor and all its bytes to Hell?"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "So take a pointer from the pros&#8230; and choose the mighty ED!"
+#. type: Content of: <div><div><p>
+msgid "From concepts of simplicity to a buffer-based OS&hellip;"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Other formats"
+#. type: Content of: <div><div><p>
+msgid "You'd think they'd find a better way to work out daily stress!"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/music/emacsvsvi.tex\">Latex</a>"
+#. type: Content of: <div><div><p>
+msgid "So learn your lesson, hacker, and you'll not regret one day&hellip;"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/music/emacsvsvi.pdf\">PDF</a>"
+#. type: Content of: <div><div><p>
+msgid "The time you spent recovering, and throwing chars away&hellip;"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Licensing"
+#. type: Content of: <div><div><p>
+msgid "What's popular is never what you'll get into your head&hellip;"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "Copyright (C) 2010 by James Taylor"
+#. type: Content of: <div><div><p>
+msgid "So take a pointer from the pros&hellip; and choose the mighty ED!"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License, Version 1.3"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this song."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+"Other formats: <a href=\"/music/emacsvsvi.tex\">Latex</a> <a "
+"href=\"/music/emacsvsvi.pdf\">PDF</a>"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -164,7 +156,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>. 
@@ -172,18 +164,19 @@
 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; 2010 by James Taylor"
+msgid "Copyright &copy; 2010 James Taylor (the lyrics)"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"'Emacs vs VI' by James Taylor is licensed under the <a "
-"href=\"https://gnu.org/licenses/fdl-1.3-standalone.html\";>GNU Free "
-"Documentation License, Version 1.3</a>."
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the <a rel=\"license\" href=\"/licenses/fdl.html\">GNU Free "
+"Documentation License, version 1.3</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: music/po/free-birthday-song.de.po
===================================================================
RCS file: /web/www/www/music/po/free-birthday-song.de.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- music/po/free-birthday-song.de.po   12 Jul 2021 16:55:32 -0000      1.10
+++ music/po/free-birthday-song.de.po   12 Jul 2021 17:02:30 -0000      1.11
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-birthday-song.html\n"
-"POT-Creation-Date: 2014-03-25 11:25+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2014-03-30 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -14,98 +14,129 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "The Free Birthday Song - GNU Project - Free Software Foundation"
 msgstr "Free Birthday Song - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ".reduced-width { width: 40em; }\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-Startseite"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Birthday Song"
 msgstr "Free Birthday Song"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
+msgid "by Steven Sheffey"
+msgstr ""
+
+#. type: Content of: <div><p>
+# | This song was written [-by Steven Sheffey-] in celebration of Richard
+# | Stallman's birthday.  It follows the same tune as the <a
+# | [-href=\"/music/free-software-song.html\">Free-]
+# | {+href=\"/music/free-software-song.html\"><cite>Free+} Software
+# | [-Song</a>:-] {+Song</cite></a>:+} the Bulgarian folk song [-&ldquo;Sadi-]
+# | {+<cite>Sadi+} moma bela [-loza.&rdquo;-] {+loza</cite>.+}
+#, fuzzy
+#| msgid ""
+#| "This song was written by Steven Sheffey in celebration of Richard "
+#| "Stallman's birthday.  It follows the same tune as the <a href=\"/music/"
+#| "free-software-song.html\">Free Software Song</a>: the Bulgarian folk song "
+#| "&ldquo;Sadi moma bela loza.&rdquo;"
 msgid ""
-"This song was written by Steven Sheffey in celebration of Richard Stallman's "
-"birthday.  It follows the same tune as the <a href=\"/music/free-software-"
-"song.html\">Free Software Song</a>: the Bulgarian folk song &ldquo;Sadi moma "
-"bela loza.&rdquo;"
+"This song was written in celebration of Richard Stallman's birthday.  It "
+"follows the same tune as the <a href=\"/music/free-software-song.html"
+"\"><cite>Free Software Song</cite></a>: the Bulgarian folk song <cite>Sadi "
+"moma bela loza</cite>."
 msgstr ""
 "Dieses Lied wurde von Steven Sheffey anlässlich Richard Stallmans Geburtstag 
"
 "geschrieben. Es folgt derselben Melodie wie der <a href=\"/music/free-"
 "software-song\"><cite>Free Software Song</cite></a>: dem bulgarischen "
 "Volkslied <cite>Sadi Moma Bela Loza</cite>. "
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Happy birthday, Dr. Stallman"
 msgstr "Happy birthday, Dr. Stallman"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Set us free, Stallman, set us free"
 msgstr "Set us free, Stallman, set us free"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Set us free, Stallman, set us free."
 msgstr "Set us free, Stallman, set us free."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I used to use non-free software"
 msgstr "I used to use non-free software"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Sadly true, Stallman, sadly true"
 msgstr "Sadly true, Stallman, sadly true"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But now I use software libre"
 msgstr "But now I use software libre"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Learned from you, Stallman, learned from you."
 msgstr "Learned from you, Stallman, learned from you."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Spread free software to the planet"
 msgstr "Spread free software to the planet"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll help too, Stallman, we'll help too"
 msgstr "We'll help too, Stallman, we'll help too"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "One day software will be libre"
 msgstr "One day software will be libre"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "For the world, Stallman, shared with you."
 msgstr "For the world, Stallman, shared with you."
 
-#. type: Content of: <p>
-msgid ""
-"Download Steven Sheffey's performance of the <a href=\"/music/free-birthday-"
-"song.ogg\">Free Birthday Song</a> (ogg format)."
+#. type: Content of: <div><p>
+# | The [-lyrics of the Free-] {+<cite>Free+} Birthday [-Song are copyrighted
+# | &copy; 2014-] {+Song</cite> was performed by+} Steven Sheffey[-.-]{+:+}
+#, fuzzy
+#| msgid ""
+#| "The lyrics of the Free Birthday Song are copyrighted &copy; 2014 Steven "
+#| "Sheffey."
+msgid "The <cite>Free Birthday Song</cite> was performed by Steven Sheffey:"
 msgstr ""
-"Steven Sheffeys Performance vom <a href=\"/music/free-birthday-song.ogg\" "
-"type=\"audio/ogg\"><cite>Free Software Song</cite></a> (OGG-Format) kann "
-"ebenfalls abgerufen werden."
+"Text des <em>Free Birthday Song</em> Copyright &copy; 2014 Steven Sheffey."
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Lizenzierung"
-
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"The Free Birthday Song by Steven Sheffey is licensed under a <a href="
-"\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative Commons "
-"Attribution-ShareAlike 4.0 International</a> license."
+"<a href=\"/music/free-birthday-song.ogg\">Audio recording</a> <small>"
+"(OGG&nbsp;Vorbis&nbsp;format,&nbsp;1.4MB)</small>"
 msgstr ""
-"Copyright &copy; 2014 Steven Sheffey.</p>\n"
-"<p>The <cite>Free Birthday Song</cite> by Steven Sheffey is licensed under a "
-"<a href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative Commons "
-"Attribution-ShareAlike 4.0 International</a> license.</p>\n"
-"<p>Der <cite>Free Birthday Song</cite> von Steven Sheffey ist unter einer <a "
-"href=\"https://creativecommons.org/licenses/by-sa/4.0/deed.de\";>Creative "
-"Commons Namensnennung-Weitergabe unter gleichen Bedingungen 4.0 "
-"International</a>-Lizenz lizenziert."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -134,14 +165,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. "
@@ -156,24 +193,32 @@
 
 # See #license
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Steven Sheffey (the lyrics)."
+# | Copyright &copy; 2014 Steven Sheffey (the lyrics)[-.-]
+#, fuzzy
+#| msgid "Copyright &copy; 2014 Steven Sheffey (the lyrics)."
+msgid "Copyright &copy; 2014 Steven Sheffey (the lyrics)"
 msgstr " "
 
 #. type: Content of: <div><p>
+# | [-This-]{+The lyrics on this+} page [-is-] {+are+} licensed under [-a-]
+# | {+the+} <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by/4.0/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";> Creative+}
+# | Commons [-Attribution-] {+Attribution-ShareAlike+} 4.0 [-International
+# | License</a>.-] {+International</a> license.+}
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by/4.0/\">Creative Commons Attribution 4.0 "
+#| "International License</a>."
 msgid ""
-"Copyright &copy; 2014 Free Software Foundation (text other than lyrics.)"
-msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
-
-#. type: Content of: <div><p>
-msgid ""
-"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"The lyrics on this page are licensed under the <a rel=\"license\" href="
+"\"https://creativecommons.org/licenses/by-sa/4.0/\";> Creative Commons "
+"Attribution-ShareAlike 4.0 International</a> license."
 msgstr ""
 "Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
-"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
-"Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
-"Lizenz."
+"creativecommons.org/licenses/by/4.0/deed.de\">Creative Commons Namensnennung "
+"4.0 International</a>-Lizenz."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -187,11 +232,50 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2014, 2021 Free Software Foundation (text other than "
-"lyrics.)"
-msgstr "Copyright &copy; 2014, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Download Steven Sheffey's performance of the <a href=\"/music/free-"
+#~ "birthday-song.ogg\">Free Birthday Song</a> (ogg format)."
+#~ msgstr ""
+#~ "Steven Sheffeys Performance vom <a href=\"/music/free-birthday-song.ogg\" "
+#~ "type=\"audio/ogg\"><cite>Free Software Song</cite></a> (OGG-Format) kann "
+#~ "ebenfalls abgerufen werden."
+
+#~ msgid "Licensing"
+#~ msgstr "Lizenzierung"
+
+#~ msgid ""
+#~ "The Free Birthday Song by Steven Sheffey is licensed under a <a href="
+#~ "\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative Commons "
+#~ "Attribution-ShareAlike 4.0 International</a> license."
+#~ msgstr ""
+#~ "Copyright &copy; 2014 Steven Sheffey.</p>\n"
+#~ "<p>The <cite>Free Birthday Song</cite> by Steven Sheffey is licensed "
+#~ "under a <a href=\"https://creativecommons.org/licenses/by-sa/4.0/";
+#~ "\">Creative Commons Attribution-ShareAlike 4.0 International</a> license."
+#~ "</p>\n"
+#~ "<p>Der <cite>Free Birthday Song</cite> von Steven Sheffey ist unter einer "
+#~ "<a href=\"https://creativecommons.org/licenses/by-sa/4.0/deed.de";
+#~ "\">Creative Commons Namensnennung-Weitergabe unter gleichen Bedingungen "
+#~ "4.0 International</a>-Lizenz lizenziert."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014 Free Software Foundation (text other than lyrics.)"
+#~ msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"//"
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
+#~ "Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
+#~ "Lizenz."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2021 Free Software Foundation (text other than "
+#~ "lyrics.)"
+#~ msgstr "Copyright &copy; 2014, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "This song was written by Steven Sheffey in celebration of Richard "
@@ -203,9 +287,3 @@
 #~ "Geburtstag geschrieben. Es folgt derselben Melodie wie der <a href=\"/"
 #~ "music/free-software-song\"><cite>Free Software Song</cite></a>: dem "
 #~ "bulgarischen Volkslied <cite>Sadi Moma Bela Loza</cite>. "
-
-#~ msgid ""
-#~ "The lyrics of the Free Birthday Song are copyrighted &copy; 2014 Steven "
-#~ "Sheffey."
-#~ msgstr ""
-#~ "Text des <em>Free Birthday Song</em> Copyright &copy; 2014 Steven Sheffey."

Index: music/po/free-birthday-song.pot
===================================================================
RCS file: /web/www/www/music/po/free-birthday-song.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- music/po/free-birthday-song.pot     25 Mar 2014 11:29:13 -0000      1.2
+++ music/po/free-birthday-song.pot     12 Jul 2021 17:02:30 -0000      1.3
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/music/free-birthday-song.html
+# LANGUAGE translation of https://www.gnu.org/music/free-birthday-song.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,92 +7,106 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-birthday-song.html\n"
-"POT-Creation-Date: 2014-03-25 11:25+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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 "The Free Birthday Song - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "The Free Birthday Song"
+#. type: Content of: <style>
+#, no-wrap
+msgid ".reduced-width { width: 40em; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
 msgid ""
-"This song was written by Steven Sheffey in celebration of Richard Stallman's "
-"birthday.  It follows the same tune as the <a "
-"href=\"/music/free-software-song.html\">Free Software Song</a>: the "
-"Bulgarian folk song &ldquo;Sadi moma bela loza.&rdquo;"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "The Free Birthday Song"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "by Steven Sheffey"
 msgstr ""
 
 #. type: Content of: <div><p>
-#:    
+msgid ""
+"This song was written in celebration of Richard Stallman's birthday.  It "
+"follows the same tune as the <a "
+"href=\"/music/free-software-song.html\"><cite>Free Software Song</cite></a>: "
+"the Bulgarian folk song <cite>Sadi moma bela loza</cite>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "Happy birthday, Dr. Stallman"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "Set us free, Stallman, set us free"
 msgstr ""
 
-#. type: Content of: <div><p>
-#:  
+#. type: Content of: <div><div><p>
 msgid "Set us free, Stallman, set us free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I used to use non-free software"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Sadly true, Stallman, sadly true"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But now I use software libre"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Learned from you, Stallman, learned from you."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Spread free software to the planet"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll help too, Stallman, we'll help too"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "One day software will be libre"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "For the world, Stallman, shared with you."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Download Steven Sheffey's performance of the <a "
-"href=\"/music/free-birthday-song.ogg\">Free Birthday Song</a> (ogg format)."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Licensing"
+#. type: Content of: <div><p>
+msgid "The <cite>Free Birthday Song</cite> was performed by Steven Sheffey:"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"The Free Birthday Song by Steven Sheffey is licensed under a <a "
-"href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative Commons "
-"Attribution-ShareAlike 4.0 International</a> license."
+"<a href=\"/music/free-birthday-song.ogg\">Audio recording</a> "
+"<small>(OGG&nbsp;Vorbis&nbsp;format,&nbsp;1.4MB)</small>"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -119,7 +133,7 @@
 #
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
 #
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
@@ -127,22 +141,19 @@
 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 Steven Sheffey (the lyrics)."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation (text other than 
lyrics.)"
+msgid "Copyright &copy; 2014 Steven Sheffey (the lyrics)"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"The lyrics on this page are licensed under the <a rel=\"license\" "
+"href=\"https://creativecommons.org/licenses/by-sa/4.0/\";> Creative Commons "
+"Attribution-ShareAlike 4.0 International</a> license."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: music/po/free-firmware-song.pot
===================================================================
RCS file: /web/www/www/music/po/free-firmware-song.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- music/po/free-firmware-song.pot     11 Dec 2020 07:00:34 -0000      1.1
+++ music/po/free-firmware-song.pot     12 Jul 2021 17:02:30 -0000      1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-firmware-song.html\n"
-"POT-Creation-Date: 2020-12-11 06:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,6 +20,25 @@
 msgid "The Free Firmware Song - GNU Project - Free Software Foundation"
 msgstr ""
 
+#. type: Content of: <style>
+#, no-wrap
+msgid ".chorus { font-style: normal; color: #572385; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
 #. type: Content of: <div><h2>
 msgid "The Free Firmware Song"
 msgstr ""
@@ -31,7 +50,7 @@
 #. type: Content of: <div><p>
 msgid ""
 "This is a take-off on Richard Stallman's <cite>&ldquo;Free Software "
-"Song&rdquo;</cite>.  It is also published on the author's blog, with the <a "
+"Song.&rdquo;</cite> It is also published on the author's blog, with the <a "
 "href=\"https://blog.vimuser.org/free-firmware-song.html\";>story of its "
 "writing</a>, and a <a "
 "href=\"https://av.vimuser.org/firmware.webm\";>video</a> of the author "
@@ -78,12 +97,14 @@
 msgid "hackers, evermore!"
 msgstr ""
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Leah Rowe claims no copyright on this song."
+#. type: Content of: <div><div><p>
+msgid ""
+"The lyrics on this page were submitted to the GNU Project in 2020.  Neither "
+"the author nor the Free Software Foundation claim copyright on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.

Index: music/po/free-software-song.de.po
===================================================================
RCS file: /web/www/www/music/po/free-software-song.de.po,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- music/po/free-software-song.de.po   12 Jul 2021 16:55:33 -0000      1.75
+++ music/po/free-software-song.de.po   12 Jul 2021 17:02:30 -0000      1.76
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: free-software-song.html\n"
 "Report-Msgid-Bugs-To: <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2018-10-28 07:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2018-11-20 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"
@@ -16,20 +16,45 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "The Free Software Song - GNU Project - Free Software Foundation"
 msgstr "Free Software Song - 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>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Software Song"
 msgstr "Der <span xml:lang=\"en\" lang=\"en\">Free Software Song</span>"
 
-#. type: Content of: <p>
-msgid "by Richard Stallman"
-msgstr "von Richard Stallman"
+#. type: Content of: <div><address>
+# | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
+#, fuzzy
+#| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
+msgstr ""
+"von <strong><a href=\"//www.stallman.org/\">Richard Stallman</a></strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can read the story of <a href=\"/music/writing-fs-song.html\">the "
 "writing of the song</a>, too."
@@ -38,65 +63,82 @@
 "<em>Free Software Songs</em></a>."
 
 #.  :] 
-#. type: Content of: <p>
-msgid ""
-"The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody of "
-"the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi "
-"moma bela loza</a>&rdquo;"
+#. type: Content of: <div><p>
+# | The lyrics of the [-&ldquo;Free-] {+<cite>Free+} Software [-Song&rdquo;-]
+# | {+Song</cite>+} are sung to the melody of the Bulgarian folk song
+# | [-&ldquo;<a-] {+<a+} href=\"#SadiMoma\" [-id=\"REFSadiMoma\">Sadi-]
+# | {+id=\"REFSadiMoma\"><cite>Sadi+} moma bela [-loza</a>&rdquo;-]
+# | {+loza</cite></a>+}
+#, fuzzy
+#| msgid ""
+#| "The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody "
+#| "of the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma"
+#| "\">Sadi moma bela loza</a>&rdquo;"
+msgid ""
+"The lyrics of the <cite>Free Software Song</cite> are sung to the melody of "
+"the Bulgarian folk song <a href=\"#SadiMoma\" id=\"REFSadiMoma\"><cite>Sadi "
+"moma bela loza</cite></a>"
 msgstr ""
 "Die Liedtexte vom <em>Free Software Song</em> werden zur Melodie des "
 "bulgarischen Volksliedes <a href=\"#SadiMoma\" xml:lang=\"bg\" lang=\"bg"
 "\"><em>Sadi Moma</em></a> gesungen."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Join us now and share the software;"
 msgstr "Join us now and share the software;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | You'll be free, <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">hackers</a>,
+# | you'll be free.
+#, fuzzy
+#| msgid ""
+#| "You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+#| "\">hackers</a>, you'll be free."
 msgid ""
-"You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+"You'll be free, <a href=\"https://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free."
 msgstr ""
 "You'll be free, <a href=\"https://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll be free, hackers, you'll be free."
 msgstr "You'll be free, hackers, you'll be free."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hoarders can get piles of money,"
 msgstr "Hoarders can get piles of money,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That is true, hackers, that is true."
 msgstr "That is true, hackers, that is true."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But they cannot help their neighbors;"
 msgstr "But they cannot help their neighbors;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's not good, hackers, that's not good."
 msgstr "That's not good, hackers, that's not good."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When we have enough free software"
 msgstr "When we have enough free software"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "At our call, hackers, at our call,"
 msgstr "At our call, hackers, at our call,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll kick out those dirty licenses"
 msgstr "We'll kick out those dirty licenses"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Ever more, hackers, ever more."
 msgstr "Ever more, hackers, ever more."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This song is in a rhythm of 7/8; those unaccustomed to odd rhythms often "
 "take the unevenness to be a mistake. The meter can be analyzed into three "
@@ -113,27 +155,39 @@
 "befürwortet Yves Moreau, der den Tanz zusammengetragen und unterrichtet hat, 
"
 "den Takt von 7."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Downloads"
 msgstr "Herunterladen"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Performances"
 msgstr "Aufnahmen"
 
-#. type: Content of: <ul><li>
-msgid ""
-"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this song, "
-"also available in <a href=\"/music/free-software-song.ogg\">Ogg Vorbis "
-"format</a>."
+#. type: Content of: <div><ul><li>
+# | A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of
+# | [-<a href=\"http://www.stallman.org/\";>Richard Stallman</a>-] {+Richard
+# | Stallman+} singing this song, also available in <a
+# | href=\"/music/free-software-song.ogg\">Ogg Vorbis format</a>. {+(If you
+# | are not used to a meter of 7/8, you may perceive it as inability to keep
+# | time.)+}
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+#| "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this "
+#| "song, also available in <a href=\"/music/free-software-song.ogg\">Ogg "
+#| "Vorbis format</a>."
+msgid ""
+"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+"Richard Stallman singing this song, also available in <a href=\"/music/free-"
+"software-song.ogg\">Ogg Vorbis format</a>. (If you are not used to a meter "
+"of 7/8, you may perceive it as inability to keep time.)"
 msgstr ""
 "Der <em>Free Software Song</em> (<a href=\"/music/free-software-song.au\">."
 "au</a>- und <a href=\"/music/free-software-song.ogg\" type=\"audio/ogg\">."
 "ogg</a>-Format), gesungen von <a href=\"http://www.stallman.org/\";>Richard "
 "Stallman</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/FreeSWSong.ogg\">recording (.ogg)</a> of the piece "
 "accompanied by Bulgarian instruments played in traditional style."
@@ -142,10 +196,21 @@
 "\"audio/ogg\">.ogg</a>-Format), begleitet von bulgarischen Instrumenten im "
 "traditionellen Stil."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a
+# | 
[-href=\"http://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>video-]
+# | 
{+href=\"https://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>
+# | video+} of RMS performing the song (ogg)</a>, released under GFDLv1.3+ by
+# | the videographer, Julian Coccia.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"http://audio-video.gnu.org/video/";
+#| "stallman_free_software_song_320x240.ogv\">video of RMS performing the "
+#| "song (ogg)</a>, released under GFDLv1.3+ by the videographer, Julian "
+#| "Coccia."
 msgid ""
-"A <a href=\"http://audio-video.gnu.org/video/";
-"stallman_free_software_song_320x240.ogv\">video of RMS performing the song "
+"A <a href=\"https://audio-video.gnu.org/video/";
+"stallman_free_software_song_320x240.ogv\"> video of RMS performing the song "
 "(ogg)</a>, released under GFDLv1.3+ by the videographer, Julian Coccia."
 msgstr ""
 "Der <em>Free Software Song</em> (<a href=\"http://audio-video.gnu.org/video/";
@@ -153,32 +218,51 @@
 "Format), gesungen von Richard Stallman, gefilmt von Julian Coccia (Lizenz: "
 "<a href=\"/licenses/fdl\">GNU FDLv1.3+</a>)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of
+# | Katie Herzog performing the Free Software Song, released under <a
+# | href=\"http{+s+}://creativecommons.org/licenses/by-nc-nd/3.0/\">CC
+# | BY-NC-ND</a>.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> "
+#| "of Katie Herzog performing the Free Software Song, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgid ""
 "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of "
 "Katie Herzog performing the Free Software Song, released under <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
+"\"https://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgstr ""
 "Der <em>Free Software Song</em> (<a href=\"/music/free-software-song-herzog."
 "ogg\" type=\"audio/ogg\">.ogg</a>-Format), gesungen von Katie Herzog "
 "(Lizenz: <a href=\" https://creativecommons.org/licenses/by-nc-nd/3.0/deed.de";
 "\">CC BY-NC-ND 3.0</a>)."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Alternate versions"
 msgstr "Alternative Aufnahmen"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
-"\">Another song</a>, inspired by this one but mostly different, sung by the "
-"band Fenster (4.5M)."
+#. type: Content of: <div><ul><li>
+# | <a
+# | 
[-href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";>Another-]
+# | 
{+href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";>
+# | Another+} song</a>, inspired by this one but mostly different, sung by the
+# | band Fenster (4.5M{+B+}).
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+#| "\">Another song</a>, inspired by this one but mostly different, sung by "
+#| "the band Fenster (4.5M)."
+msgid ""
+"<a href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+"\"> Another song</a>, inspired by this one but mostly different, sung by the "
+"band Fenster (4.5MB)."
 msgstr ""
 "Vom <em>Free Software Song</em> inspiriert, aber zumeist anders von der Band "
 "<i>Fenster</i> gesungen (<a href=\"http://audio-video.gnu.org/audio/Fenster-";
 "Free-Software-Song.ogg\" type=\"audio/ogg\">.ogg</a>-Format, 4,5 MB)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A rhythmic version of free software song in <a href=\"/music/free-software-"
 "song-rhythmic.ogg\">Ogg Vorbis</a> format by Thor."
@@ -186,40 +270,75 @@
 "Eine rhythmische Version (<a href=\"/music/free-software-song-rhythmic.ogg\" "
 "type=\"audio/ogg\">.ogg</a>-Format) von Thor."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | An improvised piano version by Markus Haist in <a
+# | href=\"/music/markushaist-free-software-song.ogg\">Ogg Vorbis</a> format
+# | (1.2[- -]MB), released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>.
+#, fuzzy
+#| msgid ""
+#| "An improvised piano version by Markus Haist in <a href=\"/music/"
+#| "markushaist-free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), "
+#| "released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgid ""
 "An improvised piano version by Markus Haist in <a href=\"/music/markushaist-"
-"free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), released under <a "
+"free-software-song.ogg\">Ogg Vorbis</a> format (1.2MB), released under <a "
 "href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgstr ""
 "Eine improvisierte Klavierfassung (<a href=\"/music/markushaist-free-"
 "software-song.ogg\" type=\"audio/ogg\">.ogg</a>-Format, 1.2 MB) von Markus "
 "Haist (Lizenz: <a href=\"/licenses/gpl-3.0\">GNU GPLv3</a>)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | Another rock-like version by Pjj &amp; Hairyone in <a
+# | href=\"/music/pjj-and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a>
+# | format (1.6[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-"
+#| "and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
 msgid ""
 "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-and-"
-"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
+"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6MB)."
 msgstr ""
 "Eine weitere Rock-ähnliche Version (<a href=\"/music/pjj-and-hairyone-"
 "freesoftwaresong.ogg\" type=\"audio/ogg\">.ogg</a>-Format, 1.6 MB) von PJJ "
 "&amp; Hairyone."
 
-#. type: Content of: <ul><li>
-msgid ""
-"A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
-"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> "
-"format (1.7 MB)."
+#. type: Content of: <div><ul><li>
+# | A Spanish punk variant by ALEC in <a
+# | 
[-href=\"http://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>Ogg-]
+# | 
{+href=\"https://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>
+# | Ogg+} Vorbis</a> format (1.7[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
+#| "free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</"
+#| "a> format (1.7 MB)."
+msgid ""
+"A Spanish punk variant by ALEC in <a href=\"https://www.pc-freak.net/files/";
+"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\"> Ogg Vorbis</a> "
+"format (1.7MB)."
 msgstr ""
 "Eine spanische Punkrock-Version (<a href=\"http://www.pc-freak.net/files/";
 "free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\" type=\"video/ogv"
 "\">.ogv</a>-Format, 1.7 MB) von ALEC."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A version with a different structure in <a href=\"/music/freesoft.ogg\">
+# | Ogg Vorbis</a> format (3.7[- -]MB) by Robert Kay, released under <a
+# | 
[-href=\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-SA</a>.-]
+# | {+href=\"https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>
+# | CC-BY-NC-SA</a>.+}
+#, fuzzy
+#| msgid ""
+#| "A version with a different structure in <a href=\"/music/freesoft.ogg\"> "
+#| "Ogg Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-"
+#| "SA</a>."
 msgid ""
 "A version with a different structure in <a href=\"/music/freesoft.ogg\"> Ogg "
-"Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href=\"http://";
-"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\">CC-BY-NC-SA</a>."
+"Vorbis</a> format (3.7MB) by Robert Kay, released under <a href=\"https://";
+"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\"> CC-BY-NC-SA</a>."
 msgstr ""
 "Eine Version mit einer anderen Struktur (<a href=\"/music/freesoft.ogg\" "
 "type=\"audio/ogg\">.ogg</a>-Format, 3.7 MB) von Robert Kay (Lizenz: <a href="
@@ -227,33 +346,66 @@
 "3.0</a>)."
 
 # GPL -> GPLv3+
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A version by the band Zweitgolf: <a
+# | 
[-href=\"free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>,-]
+# | 
{+href=\"/music/free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>,+}
+# | released under the GPL
+#, fuzzy
+#| msgid ""
+#| "A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
+#| "\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgid ""
-"A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
-"\">free_software_song_sunnata.ogg</a>, released under the GPL"
+"A version by the band Zweitgolf: <a href=\"/music/free_software_song_sunnata."
+"ogg\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgstr ""
 "Eine Version (<a href=\"free_software_song_sunnata.ogg\" type=\"audio/ogg\">."
 "ogg</a>-Format) von der Band <i>Zweitgolf</i> (Lizenz: <a href=\"/licenses/"
 "gpl\">GNU GPLv3+</a>)."
 
-#. type: Content of: <ul><li>
-msgid ""
-"Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.net/";
-"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a> "
-"format (3.9 MB), released under <a href=\"http://creativecommons.org/";
-"licenses/by-sa/2.0/\"> CC BY-SA</a>."
+#. type: Content of: <div><ul><li>
+# | Here is a metal version by Jono Bacon in <a
+# | 
[-href=\"http://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>Ogg-]
+# | 
{+href=\"https://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>
+# | Ogg+} Vorbis</a> format (3.9[- -]MB), released under <a
+# | [-href=\"http://creativecommons.org/licenses/by-sa/2.0/\";> CC-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/2.0/\";>CC+} BY-SA</a>.
+#, fuzzy
+#| msgid ""
+#| "Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.";
+#| "net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg "
+#| "Vorbis</a> format (3.9 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by-sa/2.0/\"> CC BY-SA</a>."
+msgid ""
+"Here is a metal version by Jono Bacon in <a href=\"https://www.pc-freak.net/";
+"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\"> Ogg Vorbis</a> "
+"format (3.9MB), released under <a href=\"https://creativecommons.org/";
+"licenses/by-sa/2.0/\">CC BY-SA</a>."
 msgstr ""
 "Eine Metal-Version (<a href=\"http://www.pc-freak.net/files/free-software-";
 "songs/jonobacon-freesoftwaresong2.ogg\" type=\"audio/ogg\">.ogg</a>-Format, "
 "3.9 MB) von Jono Bacon (Lizenz: <a href=\"https://creativecommons.org/";
 "licenses/by-sa/2.0/deed.de\">CC BY-SA 2.0</a>)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | This rock/metal version is put out by <a
+# | 
href=\"https://web.archive.org/web/20150719082345/http://freesoftwaresong.altervista.org/\";>
+# | Loneload</a> available in <a
+# | href=\"/music/loneload-free-software-song.ogg\">{+ +}Ogg Vorbis</a> format
+# | (2.2[- -]MB), released under <a
+# | href=\"http{+s+}://creativecommons.org/licenses/by/3.0/\">CC BY</a>.
+#, fuzzy
+#| msgid ""
+#| "This rock/metal version is put out by <a href=\"https://web.archive.org/";
+#| "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</"
+#| "a> available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg "
+#| "Vorbis</a> format (2.2 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by/3.0/\">CC BY</a>."
 msgid ""
 "This rock/metal version is put out by <a href=\"https://web.archive.org/";
 "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</a> "
-"available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</"
-"a> format (2.2 MB), released under <a href=\"http://creativecommons.org/";
+"available in <a href=\"/music/loneload-free-software-song.ogg\"> Ogg Vorbis</"
+"a> format (2.2MB), released under <a href=\"https://creativecommons.org/";
 "licenses/by/3.0/\">CC BY</a>."
 msgstr ""
 "Rock/Metal-Version (<a href=\"/music/loneload-free-software-song.ogg\" type="
@@ -263,14 +415,29 @@
 "licenses/by/3.0/deed.de\" title=\"Creative Commons Namensnennung 3.0 Unported"
 "\">CC BY 3.0</a>)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | <a href=\"http{+s+}://archive.org/details/M00GNU\">MooGNU</a> by the
+# | anonymous posters on the 4chan technology image board /g/ is licensed
+# | under the <a
+# | 
href=\"http{+s+}://creativecommons.org/licenses/by-sa/3.0/legalcode\">Creative
+# | Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a
+# | href=\"http{+s+}://archive.org/download/M00GNU/Freedom-catmoognu.ogv\">
+# | Ogg Video</a> format (4.5[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+#| "posters on the 4chan technology image board /g/ is licensed under the <a "
+#| "href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+#| "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
+#| "href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+#| "Video</a> format (4.5 MB)."
 msgid ""
-"<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+"<a href=\"https://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
 "posters on the 4chan technology image board /g/ is licensed under the <a "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+"href=\"https://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
 "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
-"href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
-"Video</a> format (4.5 MB)."
+"href=\"https://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+"Video</a> format (4.5MB)."
 msgstr ""
 "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> (<a href=\"http://";
 "archive.org/download/M00GNU/Freedom-catmoognu.ogv\" type=\"video/ogg\">.ogv</"
@@ -278,15 +445,39 @@
 "\"en\">4chan Technology Image Board /g/</span> (Lizenz: <a href=\"https://";
 "creativecommons.org/licenses/by-sa/3.0/deed.de\">CC BY-SA 3.0</a>)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free
+# | Software Song to celebrate the death of <a
+# | href=\"http{+s+}://www.laquadrature.net/en/ACTA\">ACTA</a>. It's available
+# | in <a
+# | 
[-href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>Ogg-]
+# | 
{+href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>
+# | Ogg+} Vorbis</a> (2.3MB), or in <a
+# | 
[-href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>FLAC</a>-]
+# | 
{+href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>
+# | FLAC</a>+} (10.1MB), under the <a
+# | [-href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free+}
+# | Art License, version 1.3</a>.
+#, fuzzy
+#| msgid ""
+#| "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
+#| "Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
+#| "net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
+#| "download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> "
+#| "(2.3MB), or in <a href=\"http://archive.org/download/Sebkha-";
+#| "Chott_FSFSongIsHip_2012/SC_FSF.flac\">FLAC</a> (10.1MB), under the <a "
+#| "href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free Art "
+#| "License, version 1.3</a>."
 msgid ""
 "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
-"Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
-"net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
-"download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> (2.3MB), "
-"or in <a href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/";
-"SC_FSF.flac\">FLAC</a> (10.1MB), under the <a href=\"//directory.fsf.org/"
-"wiki/License:Free-Art-L-v1.3\">Free Art License, version 1.3</a>."
+"Software Song to celebrate the death of <a href=\"https://www.laquadrature.";
+"net/en/ACTA\">ACTA</a>. It's available in <a href=\"https://ia800207.us.";
+"archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\"> Ogg "
+"Vorbis</a> (2.3MB), or in <a href=\"https://ia800207.us.archive.org/14/items/";
+"Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\"> FLAC</a> (10.1MB), under the "
+"<a href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free Art "
+"License, version 1.3</a>."
 msgstr ""
 "„Muttermord“ des <em>Free Software Song</em>, um den Tod von <a href="
 "\"https://www.laquadrature.net/en/ACTA\";>ACTA</a> in 2012 zu feiern (<a href="
@@ -297,7 +488,7 @@
 "Software-Song\">Sebkha-Chott</a></i> (Lizenz: <a href=\"//directory.fsf.org/"
 "wiki/License:Free-Art-L-v1.3\">Free Art License 1.3</a>)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The <strong>ecantorix</strong> program, a singing synthesis frontend for "
 "espeak, released under the GPLv3+, features the <a href=\"/music/free-"
@@ -308,7 +499,7 @@
 "<b>eCantorix</b>, ein singendes Synthese-Frontend für den TTS-"
 "Sprachsynthesizer <b>eSpeak</b>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\"> Yet another version from Wikimedia Commons</a> (967kB) is licensed "
@@ -319,21 +510,43 @@
 "KB) von PasiHus via Wikimedia Commons (Lizenz: <a href=\"https://";
 "creativecommons.org/publicdomain/zero/1.0/deed.de\">CC0 1.0</a>)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a
+# | 
href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-kalimba_ogg\";>
+# | Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by Vaba
+# | &lt;vaba@riseup.net&gt; under the <a
+# | href=\"http://www.wtfpl.net/about/\";>{+ +}WTFPL</a>.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
+#| "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered "
+#| "by Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/";
+#| "about/\">WTFPL</a>."
 msgid ""
 "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by "
 "Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/about/";
-"\">WTFPL</a>."
+"\"> WTFPL</a>."
 msgstr ""
 "Eine Kalimba-Version ( <a href=\"https://anonfile.com/93uaA2j5b1/";
 "freesoftwaresong_organ-kalimba_ogg\"> .ogg</a>-Format, 690 KB) von Vaba &lt;"
 "vaba@riseup.net&gt; (Lizenz: <a href=\"//www.wtfpl.net/about/\">WTFPL</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a>
+# | of the song made with <a [-href=\"http://lilypond.org\";>GNU-]
+# | {+href=\"https://lilypond.org/\";>GNU+} LilyPond</a>. The LilyPond <a
+# | href=\"/music/free-software-song.ly\">source</a> for the typeset score is
+# | also available.
+#, fuzzy
+#| msgid ""
+#| "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> "
+#| "of the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. "
+#| "The LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the "
+#| "typeset score is also available."
 msgid ""
 "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> of "
-"the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. The "
+"the song made with <a href=\"https://lilypond.org/\";>GNU LilyPond</a>. The "
 "LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the typeset "
 "score is also available."
 msgstr ""
@@ -342,23 +555,37 @@
 "\">.pdf</a>-Format), erstellt mit <b><a href=\"/software/lilypond/\">GNU "
 "LilyPond</a></b>."
 
-#. type: Content of: <h4>
-msgid "&ldquo;Sadi moma bela loza&rdquo;"
-msgstr "Sadi Moma"
-
-#. type: Content of: <p>
+#. type: Content of: <div><h4>
+# | [-\"Sadi-]{+<cite>Sadi+} moma bela [-loza\-] {+loza</cite>+}
+#, fuzzy
+#| msgid "\"Sadi moma bela loza\""
+msgid "<cite>Sadi moma bela loza</cite>"
+msgstr "&#8218;Sadi Moma&#8216;"
+
+#. type: Content of: <div><p>
+# | Here is a description of the tune of [-\"Sadi-] {+<cite>Sadi+} moma bela
+# | [-loza\",-] {+loza</cite>,+} a Bulgarian dance tune, in an ad-hoc form of
+# | notation using letters for notes. A dash means the previous note
+# | continues. There are seven beats per measure, thus seven characters in
+# | each group.
+#, fuzzy
+#| msgid ""
+#| "Here is a description of the tune of \"Sadi moma bela loza\", a Bulgarian "
+#| "dance tune, in an ad-hoc form of notation using letters for notes. A dash "
+#| "means the previous note continues. There are seven beats per measure, "
+#| "thus seven characters in each group."
 msgid ""
-"Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+"Here is a description of the tune of <cite>Sadi moma bela loza</cite>, a "
 "Bulgarian dance tune, in an ad-hoc form of notation using letters for notes. "
 "A dash means the previous note continues. There are seven beats per measure, "
 "thus seven characters in each group."
 msgstr ""
-"Eine Beschreibung einer Melodie des bulgarischen Volksliedes <em>Sadi Moma</"
-"em> in einer Ad-hoc-Notation mit Buchstaben für Noten. Ein Strich bedeutet, "
-"dass die vorhergehende Note weitergespielt wird. Es gibt sieben Schläge pro "
-"Takt, also sieben Zeichen in jeder Gruppe."
+"Eine Beschreibung einer bulgarischen Tanzmelodie von <em>‚Sadi moma bela "
+"loza‘</em> in einer Ad-hoc-Notation mit Buchstaben für Noten. Ein Strich "
+"bedeutet, dass die vorhergehende Note weitergespielt wird. Es gibt sieben "
+"Schläge pro Takt, also sieben Zeichen in jeder Gruppe."
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
@@ -367,19 +594,19 @@
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is also available as an <a href=\"/music/sadi-moma.abc\">ABC file</a>."
 msgstr ""
 "Eine ABC-Musiknotation (<a href=\"/music/sadi-moma.abc\">.abc</a>-Datei) ist "
 "ebenfalls abrufbar."
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Lizenzierung"
+#. type: Content of: <div><div><h3>
+msgid "Disclaimer"
+msgstr "Haftungsausschluss"
 
 # Hmm, CC0 1.0?!
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Richard Stallman and the Free Software Foundation claim no copyright on this "
 "song."
@@ -454,14 +681,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. "
@@ -474,13 +707,19 @@
 "Übersetzungen unserer Internetpräsenz finden Sie in der <a href=\"/server/"
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
-# #! (Copyrigt) why RMS, why and wherefore not FSF (for whole site) ;)
 #. type: Content of: <div><p>
+# | Copyright &copy; 1993, [-2001, 2002, 2003, 2004, 2005, 2006,-]
+# | {+2001-2006,+} 2010, [-2011-] {+2011, 2014-2018, 2021+} Richard Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 "
+#| "Richard Stallman"
 msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018 Richard Stallman"
+"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018, 2021 Richard "
+"Stallman"
 msgstr ""
-"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018 Richard Stallman."
+"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 "
+"Richard Stallman."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -504,13 +743,39 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid "by Richard Stallman"
+#~ msgstr "von Richard Stallman"
+
+#~ msgid "&ldquo;Sadi moma bela loza&rdquo;"
+#~ msgstr "Sadi Moma"
+
+#~ msgid ""
+#~ "Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+#~ "Bulgarian dance tune, in an ad-hoc form of notation using letters for "
+#~ "notes. A dash means the previous note continues. There are seven beats "
+#~ "per measure, thus seven characters in each group."
+#~ msgstr ""
+#~ "Eine Beschreibung einer Melodie des bulgarischen Volksliedes <em>Sadi "
+#~ "Moma</em> in einer Ad-hoc-Notation mit Buchstaben für Noten. Ein Strich "
+#~ "bedeutet, dass die vorhergehende Note weitergespielt wird. Es gibt sieben "
+#~ "Schläge pro Takt, also sieben Zeichen in jeder Gruppe."
+
+#~ msgid "Licensing"
+#~ msgstr "Lizenzierung"
+
 # #! (Copyrigt) why RMS, why and wherefore not FSF (for whole site) ;)
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
-msgstr ""
-"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2021 Richard Stallman."
+#~ msgid ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018 Richard Stallman."
+
+# #! (Copyrigt) why RMS, why and wherefore not FSF (for whole site) ;)
+#~ msgid ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2021 Richard Stallman."
 
 #~ msgid ""
 #~ "<a href=\"https://commons.wikimedia.org/wiki/File";
@@ -607,20 +872,6 @@
 #~ msgstr ""
 #~ "Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2016 Richard Stallman."
 
-#~ msgid "\"Sadi moma bela loza\""
-#~ msgstr "&#8218;Sadi Moma&#8216;"
-
-#~ msgid ""
-#~ "Here is a description of the tune of \"Sadi moma bela loza\", a Bulgarian "
-#~ "dance tune, in an ad-hoc form of notation using letters for notes. A dash "
-#~ "means the previous note continues. There are seven beats per measure, "
-#~ "thus seven characters in each group."
-#~ msgstr ""
-#~ "Eine Beschreibung einer bulgarischen Tanzmelodie von <em>‚Sadi moma bela 
"
-#~ "loza‘</em> in einer Ad-hoc-Notation mit Buchstaben für Noten. Ein 
Strich "
-#~ "bedeutet, dass die vorhergehende Note weitergespielt wird. Es gibt sieben "
-#~ "Schläge pro Takt, also sieben Zeichen in jeder Gruppe."
-
 #~ msgid ""
 #~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
 #~ "2014, 2015 Richard Stallman"
@@ -705,16 +956,6 @@
 #~ "Art License, Version 1.3</a>."
 
 #~ msgid ""
-#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 "
-#~ "Richard Stallman"
-#~ msgstr ""
-#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 "
-#~ "Richard Stallman."
-
-#~ msgid "Disclaimer"
-#~ msgstr "Haftungsausschluss"
-
-#~ msgid ""
 #~ "Please send FSF &amp; GNU inquiries &amp; questions to <a href=\"mailto:";
 #~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Other <a href=\"/contact/\">ways "
 #~ "to contact</a> the FSF."

Index: music/po/free-software-song.es.po
===================================================================
RCS file: /web/www/www/music/po/free-software-song.es.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- music/po/free-software-song.es.po   12 Jul 2021 16:55:33 -0000      1.38
+++ music/po/free-software-song.es.po   12 Jul 2021 17:02:30 -0000      1.39
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-software-song.html\n"
-"POT-Creation-Date: 2018-10-28 07:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2018-11-03 10:44+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.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-12 16:56+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
@@ -25,15 +26,33 @@
 msgstr ""
 "La canción del software libre - Proyecto 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 "Página de inicio de GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Software Song"
 msgstr "La canción del software libre"
 
-#. type: Content of: <p>
-msgid "by Richard Stallman"
-msgstr "por Richard Stallman"
+# type: Content of: <p>
+#. type: Content of: <div><address>
+# | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
+#, fuzzy
+#| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
+msgstr "por <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can read the story of <a href=\"/music/writing-fs-song.html\">the "
 "writing of the song</a>, too."
@@ -42,65 +61,82 @@
 "cómo se escribió esta canción</a>."
 
 #.  :] 
-#. type: Content of: <p>
-msgid ""
-"The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody of "
-"the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi "
-"moma bela loza</a>&rdquo;"
+#. type: Content of: <div><p>
+# | The lyrics of the [-&ldquo;Free-] {+<cite>Free+} Software [-Song&rdquo;-]
+# | {+Song</cite>+} are sung to the melody of the Bulgarian folk song
+# | [-&ldquo;<a-] {+<a+} href=\"#SadiMoma\" [-id=\"REFSadiMoma\">Sadi-]
+# | {+id=\"REFSadiMoma\"><cite>Sadi+} moma bela [-loza</a>&rdquo;-]
+# | {+loza</cite></a>+}
+#, fuzzy
+#| msgid ""
+#| "The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody "
+#| "of the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma"
+#| "\">Sadi moma bela loza</a>&rdquo;"
+msgid ""
+"The lyrics of the <cite>Free Software Song</cite> are sung to the melody of "
+"the Bulgarian folk song <a href=\"#SadiMoma\" id=\"REFSadiMoma\"><cite>Sadi "
+"moma bela loza</cite></a>"
 msgstr ""
 "La «canción del software libre» se canta siguiendo la melodía de la 
canción "
 "folclórica búlgara «<a href=\"#SadiMoma\" id=\"REFSadiMoma\"><i>Sadi moma "
 "bela loza</i></a>»"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Join us now and share the software;"
 msgstr "Únete y comparte el software"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | You'll be free, <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">hackers</a>,
+# | you'll be free.
+#, fuzzy
+#| msgid ""
+#| "You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+#| "\">hackers</a>, you'll be free."
 msgid ""
-"You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+"You'll be free, <a href=\"https://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free."
 msgstr ""
 "Libertad, <a href=\"http://stallman.org/articles/on-hacking.html\";>hacker</"
 "a>, libertad."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll be free, hackers, you'll be free."
 msgstr "Libertad, hacker, libertad."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hoarders can get piles of money,"
 msgstr "Los avaros buscan oro,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That is true, hackers, that is true."
 msgstr "es verdad, hacker, es verdad."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But they cannot help their neighbors;"
 msgstr "No ayudan a la gente,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's not good, hackers, that's not good."
 msgstr "está mal, hacker, está mal."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When we have enough free software"
 msgstr "Sólo con el Software Libre,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "At our call, hackers, at our call,"
 msgstr "estarás, hacker, estarás,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll kick out those dirty licenses"
 msgstr "libre de licencias sucias,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Ever more, hackers, ever more."
 msgstr "reirás, hacker, reirás."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This song is in a rhythm of 7/8; those unaccustomed to odd rhythms often "
 "take the unevenness to be a mistake. The meter can be analyzed into three "
@@ -116,27 +152,39 @@
 "en esta canción es 3-2-3. Sin embargo, Yves Moreau, quien rescató y 
enseñó "
 "esta danza, sostiene que el compás es de 7."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Downloads"
 msgstr "Descargas"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Performances"
 msgstr "Interpretaciones varias"
 
-#. type: Content of: <ul><li>
-msgid ""
-"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this song, "
-"also available in <a href=\"/music/free-software-song.ogg\">Ogg Vorbis "
-"format</a>."
+#. type: Content of: <div><ul><li>
+# | A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of
+# | [-<a href=\"http://www.stallman.org/\";>Richard Stallman</a>-] {+Richard
+# | Stallman+} singing this song, also available in <a
+# | href=\"/music/free-software-song.ogg\">Ogg Vorbis format</a>. {+(If you
+# | are not used to a meter of 7/8, you may perceive it as inability to keep
+# | time.)+}
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+#| "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this "
+#| "song, also available in <a href=\"/music/free-software-song.ogg\">Ogg "
+#| "Vorbis format</a>."
+msgid ""
+"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+"Richard Stallman singing this song, also available in <a href=\"/music/free-"
+"software-song.ogg\">Ogg Vorbis format</a>. (If you are not used to a meter "
+"of 7/8, you may perceive it as inability to keep time.)"
 msgstr ""
 "<a href=\"/music/free-software-song.au\">Grabación (en formato .au)</a> de "
 "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> cantando esta "
 "canción. Disponible también en el formato <a href=\"/music/free-software-"
 "song.ogg\">Ogg Vorbis</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/FreeSWSong.ogg\">recording (.ogg)</a> of the piece "
 "accompanied by Bulgarian instruments played in traditional style."
@@ -144,10 +192,21 @@
 "<a href=\"/music/FreeSWSong.ogg\">Grabación (.ogg)</a> con acompañamiento 
de "
 "instrumentos búlgaros en estilo tradicional."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a
+# | 
[-href=\"http://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>video-]
+# | 
{+href=\"https://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>
+# | video+} of RMS performing the song (ogg)</a>, released under GFDLv1.3+ by
+# | the videographer, Julian Coccia.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"http://audio-video.gnu.org/video/";
+#| "stallman_free_software_song_320x240.ogv\">video of RMS performing the "
+#| "song (ogg)</a>, released under GFDLv1.3+ by the videographer, Julian "
+#| "Coccia."
 msgid ""
-"A <a href=\"http://audio-video.gnu.org/video/";
-"stallman_free_software_song_320x240.ogv\">video of RMS performing the song "
+"A <a href=\"https://audio-video.gnu.org/video/";
+"stallman_free_software_song_320x240.ogv\"> video of RMS performing the song "
 "(ogg)</a>, released under GFDLv1.3+ by the videographer, Julian Coccia."
 msgstr ""
 "<a href=\"http://audio-video.gnu.org/video/";
@@ -156,32 +215,51 @@
 "License\">GFDL</abbr>, versión 1.3 o posterior,  por el autor del video "
 "Julian Coccia."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of
+# | Katie Herzog performing the Free Software Song, released under <a
+# | href=\"http{+s+}://creativecommons.org/licenses/by-nc-nd/3.0/\">CC
+# | BY-NC-ND</a>.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> "
+#| "of Katie Herzog performing the Free Software Song, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgid ""
 "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of "
 "Katie Herzog performing the Free Software Song, released under <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
+"\"https://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgstr ""
 "<a href=\"/music/free-software-song-herzog.ogg\">Grabación (.ogg)</a> de "
 "Katie Herzog interpretando la canción del software libre. Publicada bajo la "
 "licencia <a href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-"
 "NC-ND</a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Alternate versions"
 msgstr "Versiones alternativas"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
-"\">Another song</a>, inspired by this one but mostly different, sung by the "
-"band Fenster (4.5M)."
+#. type: Content of: <div><ul><li>
+# | <a
+# | 
[-href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";>Another-]
+# | 
{+href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";>
+# | Another+} song</a>, inspired by this one but mostly different, sung by the
+# | band Fenster (4.5M{+B+}).
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+#| "\">Another song</a>, inspired by this one but mostly different, sung by "
+#| "the band Fenster (4.5M)."
+msgid ""
+"<a href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+"\"> Another song</a>, inspired by this one but mostly different, sung by the "
+"band Fenster (4.5MB)."
 msgstr ""
 "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
 "\">Otra canción</a>, inspirada por esta pero notablemente diferente, "
 "interpretada por el grupo Fenster (4.5M)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A rhythmic version of free software song in <a href=\"/music/free-software-"
 "song-rhythmic.ogg\">Ogg Vorbis</a> format by Thor."
@@ -189,73 +267,141 @@
 "Una versión rítmica de la canción del software libre interpretada por 
Thor. "
 "Formato <a href=\"/music/free-software-song-rhythmic.ogg\">Ogg Vorbis</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | An improvised piano version by Markus Haist in <a
+# | href=\"/music/markushaist-free-software-song.ogg\">Ogg Vorbis</a> format
+# | (1.2[- -]MB), released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>.
+#, fuzzy
+#| msgid ""
+#| "An improvised piano version by Markus Haist in <a href=\"/music/"
+#| "markushaist-free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), "
+#| "released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgid ""
 "An improvised piano version by Markus Haist in <a href=\"/music/markushaist-"
-"free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), released under <a "
+"free-software-song.ogg\">Ogg Vorbis</a> format (1.2MB), released under <a "
 "href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgstr ""
 "Versión para piano improvisada por  Markus Haist. Formato <a href=\"/music/"
 "markushaist-free-software-song.ogg\">Ogg Vorbis</a> (1.2 MB). Publicada bajo "
 "la <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | Another rock-like version by Pjj &amp; Hairyone in <a
+# | href=\"/music/pjj-and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a>
+# | format (1.6[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-"
+#| "and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
 msgid ""
 "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-and-"
-"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
+"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6MB)."
 msgstr ""
 "Otra versión en estilo rock interpretada por Pjj &amp; Hairyone. Formato <a "
 "href=\"/music/pjj-and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> (1.6 "
 "MB)."
 
-#. type: Content of: <ul><li>
-msgid ""
-"A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
-"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> "
-"format (1.7 MB)."
+#. type: Content of: <div><ul><li>
+# | A Spanish punk variant by ALEC in <a
+# | 
[-href=\"http://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>Ogg-]
+# | 
{+href=\"https://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>
+# | Ogg+} Vorbis</a> format (1.7[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
+#| "free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</"
+#| "a> format (1.7 MB)."
+msgid ""
+"A Spanish punk variant by ALEC in <a href=\"https://www.pc-freak.net/files/";
+"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\"> Ogg Vorbis</a> "
+"format (1.7MB)."
 msgstr ""
 "Versión punk en español interpretada por ALEC. Formato <a 
href=\"http://www.";
 "pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv"
 "\">Ogg Vorbis</a> (1.7 MB)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A version with a different structure in <a href=\"/music/freesoft.ogg\">
+# | Ogg Vorbis</a> format (3.7[- -]MB) by Robert Kay, released under <a
+# | 
[-href=\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-SA</a>.-]
+# | {+href=\"https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>
+# | CC-BY-NC-SA</a>.+}
+#, fuzzy
+#| msgid ""
+#| "A version with a different structure in <a href=\"/music/freesoft.ogg\"> "
+#| "Ogg Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-"
+#| "SA</a>."
 msgid ""
 "A version with a different structure in <a href=\"/music/freesoft.ogg\"> Ogg "
-"Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href=\"http://";
-"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\">CC-BY-NC-SA</a>."
+"Vorbis</a> format (3.7MB) by Robert Kay, released under <a href=\"https://";
+"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\"> CC-BY-NC-SA</a>."
 msgstr ""
 "Versión con una estructura diferente interpretada por  Robert Kay. Formato "
 "<a href=\"/music/freesoft.ogg\">Ogg Vorbis</a> (3.7 MB). Publicada bajo la "
 "licencia <a href=\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode";
 "\">CC-BY-NC-SA</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A version by the band Zweitgolf: <a
+# | 
[-href=\"free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>,-]
+# | 
{+href=\"/music/free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>,+}
+# | released under the GPL
+#, fuzzy
+#| msgid ""
+#| "A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
+#| "\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgid ""
-"A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
-"\">free_software_song_sunnata.ogg</a>, released under the GPL"
+"A version by the band Zweitgolf: <a href=\"/music/free_software_song_sunnata."
+"ogg\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgstr ""
 "Versión interpretada por el grupo Zweitgolf: <a href="
 "\"free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>, "
 "publicada bajo la GPL de GNU."
 
-#. type: Content of: <ul><li>
-msgid ""
-"Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.net/";
-"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a> "
-"format (3.9 MB), released under <a href=\"http://creativecommons.org/";
-"licenses/by-sa/2.0/\"> CC BY-SA</a>."
+#. type: Content of: <div><ul><li>
+# | Here is a metal version by Jono Bacon in <a
+# | 
[-href=\"http://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>Ogg-]
+# | 
{+href=\"https://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>
+# | Ogg+} Vorbis</a> format (3.9[- -]MB), released under <a
+# | [-href=\"http://creativecommons.org/licenses/by-sa/2.0/\";> CC-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/2.0/\";>CC+} BY-SA</a>.
+#, fuzzy
+#| msgid ""
+#| "Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.";
+#| "net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg "
+#| "Vorbis</a> format (3.9 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by-sa/2.0/\"> CC BY-SA</a>."
+msgid ""
+"Here is a metal version by Jono Bacon in <a href=\"https://www.pc-freak.net/";
+"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\"> Ogg Vorbis</a> "
+"format (3.9MB), released under <a href=\"https://creativecommons.org/";
+"licenses/by-sa/2.0/\">CC BY-SA</a>."
 msgstr ""
 "Versión <cite>heavy metal</cite> interpretada por Jono Bacon. Formato <a "
 "href=\"http://www.pc-freak.net/files/free-software-songs/jonobacon-";
 "freesoftwaresong2.ogg\">Ogg Vorbis</a> (3.9 MB). Publicada bajo la licencia "
 "<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\";> CC BY-SA</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | This rock/metal version is put out by <a
+# | 
href=\"https://web.archive.org/web/20150719082345/http://freesoftwaresong.altervista.org/\";>
+# | Loneload</a> available in <a
+# | href=\"/music/loneload-free-software-song.ogg\">{+ +}Ogg Vorbis</a> format
+# | (2.2[- -]MB), released under <a
+# | href=\"http{+s+}://creativecommons.org/licenses/by/3.0/\">CC BY</a>.
+#, fuzzy
+#| msgid ""
+#| "This rock/metal version is put out by <a href=\"https://web.archive.org/";
+#| "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</"
+#| "a> available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg "
+#| "Vorbis</a> format (2.2 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by/3.0/\">CC BY</a>."
 msgid ""
 "This rock/metal version is put out by <a href=\"https://web.archive.org/";
 "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</a> "
-"available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</"
-"a> format (2.2 MB), released under <a href=\"http://creativecommons.org/";
+"available in <a href=\"/music/loneload-free-software-song.ogg\"> Ogg Vorbis</"
+"a> format (2.2MB), released under <a href=\"https://creativecommons.org/";
 "licenses/by/3.0/\">CC BY</a>."
 msgstr ""
 "Versión <cite>rock/heavy metal</cite> interpretada por <a 
href=\"https://web.";
@@ -264,14 +410,29 @@
 "software-song.ogg\">Ogg Vorbis</a> (2.2 MB). Publicada bajo la licencia  <a "
 "href=\"http://creativecommons.org/licenses/by/3.0/\";>CC BY</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | <a href=\"http{+s+}://archive.org/details/M00GNU\">MooGNU</a> by the
+# | anonymous posters on the 4chan technology image board /g/ is licensed
+# | under the <a
+# | 
href=\"http{+s+}://creativecommons.org/licenses/by-sa/3.0/legalcode\">Creative
+# | Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a
+# | href=\"http{+s+}://archive.org/download/M00GNU/Freedom-catmoognu.ogv\">
+# | Ogg Video</a> format (4.5[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+#| "posters on the 4chan technology image board /g/ is licensed under the <a "
+#| "href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+#| "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
+#| "href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+#| "Video</a> format (4.5 MB)."
 msgid ""
-"<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+"<a href=\"https://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
 "posters on the 4chan technology image board /g/ is licensed under the <a "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+"href=\"https://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
 "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
-"href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
-"Video</a> format (4.5 MB)."
+"href=\"https://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+"Video</a> format (4.5MB)."
 msgstr ""
 "<a href=\"http://archive.org/details/M00GNU\";><i>MooGNU</i></a>, por "
 "colaboradores anónimos del canal de tecnología gráfica 4chan /g/. 
Disponible "
@@ -280,15 +441,39 @@
 "creativecommons.org/licenses/by-sa/3.0/legalcode\">Creative Commons "
 "Attribution-ShareAlike 3.0 Unported License</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free
+# | Software Song to celebrate the death of <a
+# | href=\"http{+s+}://www.laquadrature.net/en/ACTA\">ACTA</a>. It's available
+# | in <a
+# | 
[-href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>Ogg-]
+# | 
{+href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>
+# | Ogg+} Vorbis</a> (2.3MB), or in <a
+# | 
[-href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>FLAC</a>-]
+# | 
{+href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>
+# | FLAC</a>+} (10.1MB), under the <a
+# | [-href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free+}
+# | Art License, version 1.3</a>.
+#, fuzzy
+#| msgid ""
+#| "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
+#| "Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
+#| "net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
+#| "download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> "
+#| "(2.3MB), or in <a href=\"http://archive.org/download/Sebkha-";
+#| "Chott_FSFSongIsHip_2012/SC_FSF.flac\">FLAC</a> (10.1MB), under the <a "
+#| "href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free Art "
+#| "License, version 1.3</a>."
 msgid ""
 "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
-"Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
-"net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
-"download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> (2.3MB), "
-"or in <a href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/";
-"SC_FSF.flac\">FLAC</a> (10.1MB), under the <a href=\"//directory.fsf.org/"
-"wiki/License:Free-Art-L-v1.3\">Free Art License, version 1.3</a>."
+"Software Song to celebrate the death of <a href=\"https://www.laquadrature.";
+"net/en/ACTA\">ACTA</a>. It's available in <a href=\"https://ia800207.us.";
+"archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\"> Ogg "
+"Vorbis</a> (2.3MB), or in <a href=\"https://ia800207.us.archive.org/14/items/";
+"Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\"> FLAC</a> (10.1MB), under the "
+"<a href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free Art "
+"License, version 1.3</a>."
 msgstr ""
 "En 2012, el grupo musical Sebkha-Chott publicó una versión <em>matricida</"
 "em> de la canción del software libre para celebrar la muerte del <a href="
@@ -300,7 +485,7 @@
 "directory.fsf.org/wiki/License:Free-Art-L-v1.3\"><cite>Free Art License</"
 "cite>, versión 1.3</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The <strong>ecantorix</strong> program, a singing synthesis frontend for "
 "espeak, released under the GPLv3+, features the <a href=\"/music/free-"
@@ -311,7 +496,7 @@
 "href=\"/music/free-software-song-ecantorix.ogg\">la canción del software "
 "libre como ejemplo de realización</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\"> Yet another version from Wikimedia Commons</a> (967kB) is licensed "
@@ -320,22 +505,44 @@
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\"> Otra versión, de Wikimedia Commons</a> (967 kB), con licencia CC0."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a
+# | 
href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-kalimba_ogg\";>
+# | Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by Vaba
+# | &lt;vaba@riseup.net&gt; under the <a
+# | href=\"http://www.wtfpl.net/about/\";>{+ +}WTFPL</a>.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
+#| "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered "
+#| "by Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/";
+#| "about/\">WTFPL</a>."
 msgid ""
 "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by "
 "Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/about/";
-"\">WTFPL</a>."
+"\"> WTFPL</a>."
 msgstr ""
 "Una <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\">versión para Kalimba</a> (formato Ogg Vorbis, 690kB), ofrecida 
"
 "por Vaba &lt;vaba@riseup.net&gt; bajo la <a href=\"http://www.wtfpl.net/";
 "about/\">WTFPL</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a>
+# | of the song made with <a [-href=\"http://lilypond.org\";>GNU-]
+# | {+href=\"https://lilypond.org/\";>GNU+} LilyPond</a>. The LilyPond <a
+# | href=\"/music/free-software-song.ly\">source</a> for the typeset score is
+# | also available.
+#, fuzzy
+#| msgid ""
+#| "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> "
+#| "of the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. "
+#| "The LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the "
+#| "typeset score is also available."
 msgid ""
 "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> of "
-"the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. The "
+"the song made with <a href=\"https://lilypond.org/\";>GNU LilyPond</a>. The "
 "LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the typeset "
 "score is also available."
 msgstr ""
@@ -344,13 +551,24 @@
 "a>. También está disponible el <a href=\"/music/free-software-song.ly"
 "\">código fuente</a> de la partitura para LilyPond."
 
-#. type: Content of: <h4>
-msgid "&ldquo;Sadi moma bela loza&rdquo;"
-msgstr "«<i>Sadi moma bela loza</i>»"
+#. type: Content of: <div><h4>
+msgid "<cite>Sadi moma bela loza</cite>"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Here is a description of the tune of [-&ldquo;Sadi-] {+<cite>Sadi+} moma
+# | bela [-loza,&rdquo;-] {+loza</cite>,+} a Bulgarian dance tune, in an
+# | ad-hoc form of notation using letters for notes. A dash means the previous
+# | note continues. There are seven beats per measure, thus seven characters
+# | in each group.
+#, fuzzy
+#| msgid ""
+#| "Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+#| "Bulgarian dance tune, in an ad-hoc form of notation using letters for "
+#| "notes. A dash means the previous note continues. There are seven beats "
+#| "per measure, thus seven characters in each group."
 msgid ""
-"Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+"Here is a description of the tune of <cite>Sadi moma bela loza</cite>, a "
 "Bulgarian dance tune, in an ad-hoc form of notation using letters for notes. "
 "A dash means the previous note continues. There are seven beats per measure, "
 "thus seven characters in each group."
@@ -361,7 +579,7 @@
 "continúa. Hay siete pulsaciones por compás y, por lo tanto, siete 
caracteres "
 "en cada grupo."
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
@@ -370,18 +588,21 @@
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is also available as an <a href=\"/music/sadi-moma.abc\">ABC file</a>."
 msgstr ""
 "También está disponible como <a href=\"/music/sadi-moma.abc\">archivo ABC</"
 "a>."
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Licencia"
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Disclaimer"
+msgid "Disclaimer"
+msgstr "Disclaimer"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Richard Stallman and the Free Software Foundation claim no copyright on this "
 "song."
@@ -409,7 +630,6 @@
 "proponer otras correcciones o sugerencias, diríjase 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
@@ -417,14 +637,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 ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -436,9 +656,16 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1993, [-2001, 2002, 2003, 2004, 2005, 2006,-]
+# | {+2001-2006,+} 2010, 2011, [-2014, 2015, 2016, 2017, 2018-] {+2014-2018,
+# | 2021+} Richard Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#| "2014, 2015, 2016, 2017, 2018 Richard Stallman"
 msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018 Richard Stallman"
+"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018, 2021 Richard "
+"Stallman"
 msgstr ""
 "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
 "2015, 2016, 2017, 2018 Richard Stallman"
@@ -464,10 +691,18 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
-msgstr ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgid "by Richard Stallman"
+#~ msgstr "por Richard Stallman"
+
+#~ msgid "&ldquo;Sadi moma bela loza&rdquo;"
+#~ msgstr "«<i>Sadi moma bela loza</i>»"
+
+#~ msgid "Licensing"
+#~ msgstr "Licencia"
+
+#~ msgid ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"

Index: music/po/free-software-song.fr.po
===================================================================
RCS file: /web/www/www/music/po/free-software-song.fr.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- music/po/free-software-song.fr.po   12 Jul 2021 16:55:33 -0000      1.71
+++ music/po/free-software-song.fr.po   12 Jul 2021 17:02:30 -0000      1.72
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-software-song.html\n"
-"POT-Creation-Date: 2018-10-28 07:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2021-07-04 20:19+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.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-12 16:56+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -22,15 +23,32 @@
 msgid "The Free Software Song - GNU Project - Free Software Foundation"
 msgstr "La chanson du logiciel libre - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Software Song"
 msgstr "La chanson du logiciel libre"
 
-#. type: Content of: <p>
-msgid "by Richard Stallman"
-msgstr "par Richard Stallman"
+#. type: Content of: <div><address>
+# | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
+#, fuzzy
+#| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
+msgstr "par <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can read the story of <a href=\"/music/writing-fs-song.html\">the "
 "writing of the song</a>, too."
@@ -39,66 +57,83 @@
 "\">l'écriture de cette chanson</a>."
 
 #.  :] 
-#. type: Content of: <p>
-msgid ""
-"The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody of "
-"the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi "
-"moma bela loza</a>&rdquo;"
+#. type: Content of: <div><p>
+# | The lyrics of the [-&ldquo;Free-] {+<cite>Free+} Software [-Song&rdquo;-]
+# | {+Song</cite>+} are sung to the melody of the Bulgarian folk song
+# | [-&ldquo;<a-] {+<a+} href=\"#SadiMoma\" [-id=\"REFSadiMoma\">Sadi-]
+# | {+id=\"REFSadiMoma\"><cite>Sadi+} moma bela [-loza</a>&rdquo;-]
+# | {+loza</cite></a>+}
+#, fuzzy
+#| msgid ""
+#| "The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody "
+#| "of the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma"
+#| "\">Sadi moma bela loza</a>&rdquo;"
+msgid ""
+"The lyrics of the <cite>Free Software Song</cite> are sung to the melody of "
+"the Bulgarian folk song <a href=\"#SadiMoma\" id=\"REFSadiMoma\"><cite>Sadi "
+"moma bela loza</cite></a>"
 msgstr ""
 "Les paroles de la Chanson du logiciel libre sont chantées sur la mélodie de 
"
 "la chanson folklorique bulgare <i><a href=\"#SadiMoma\" id=\"REFSadiMoma"
 "\">Sadi moma bela loza</a></i>"
 
 # [Traduit en français par Emily Kanzari et Richard Stallman]
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Join us now and share the software;"
 msgstr "Rejoins-nous, partage le logiciel ;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | You'll be free, <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">hackers</a>,
+# | you'll be free.
+#, fuzzy
+#| msgid ""
+#| "You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+#| "\">hackers</a>, you'll be free."
 msgid ""
-"You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+"You'll be free, <a href=\"https://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free."
 msgstr ""
 "Libère-toi, <a 
href=\"http://stallman.org/articles/on-hacking.html\";>hacker</"
 "a>, libère-toi."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll be free, hackers, you'll be free."
 msgstr "Libère-toi, hacker, libère-toi."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hoarders can get piles of money,"
 msgstr "Les avares amassent beaucoup d'argent ;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That is true, hackers, that is true."
 msgstr "C'est exact, hacker, c'est exact."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But they cannot help their neighbors;"
 msgstr "Mais ils n'aident pas leur prochain ;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's not good, hackers, that's not good."
 msgstr "C'est très mal, hacker, c'est très mal."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When we have enough free software"
 msgstr "Quand nous aurons assez de programmes"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "At our call, hackers, at our call,"
 msgstr "Libres pour nous, hacker, libres pour nous,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll kick out those dirty licenses"
 msgstr "Ces licences néfastes, nous les jetterons"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Ever more, hackers, ever more."
 msgstr "Pour toujours, hacker, pour toujours."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This song is in a rhythm of 7/8; those unaccustomed to odd rhythms often "
 "take the unevenness to be a mistake. The meter can be analyzed into three "
@@ -114,27 +149,39 @@
 "musiciens  analysent plutôt cette chanson en 3-2-3 ; cependant, Yves 
Moreau, "
 "qui a découvert et enseigné cette danse, cautionne le rythme de 7."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Performances"
 msgstr "Quelques interprétations"
 
-#. type: Content of: <ul><li>
-msgid ""
-"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this song, "
-"also available in <a href=\"/music/free-software-song.ogg\">Ogg Vorbis "
-"format</a>."
+#. type: Content of: <div><ul><li>
+# | A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of
+# | [-<a href=\"http://www.stallman.org/\";>Richard Stallman</a>-] {+Richard
+# | Stallman+} singing this song, also available in <a
+# | href=\"/music/free-software-song.ogg\">Ogg Vorbis format</a>. {+(If you
+# | are not used to a meter of 7/8, you may perceive it as inability to keep
+# | time.)+}
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+#| "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this "
+#| "song, also available in <a href=\"/music/free-software-song.ogg\">Ogg "
+#| "Vorbis format</a>."
+msgid ""
+"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+"Richard Stallman singing this song, also available in <a href=\"/music/free-"
+"software-song.ogg\">Ogg Vorbis format</a>. (If you are not used to a meter "
+"of 7/8, you may perceive it as inability to keep time.)"
 msgstr ""
 "Un <a href=\"/music/free-software-song.au\">enregistrement (au format .au)</"
 "a> de <a href=\"http://www.stallman.org/\";>Richard Stallman</a> chantant "
 "cette chanson, également disponible au <a href=\"/music/free-software-song."
 "ogg\">format Ogg Vorbis</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/FreeSWSong.ogg\">recording (.ogg)</a> of the piece "
 "accompanied by Bulgarian instruments played in traditional style."
@@ -143,41 +190,71 @@
 "morceau, accompagné par des instruments bulgares joués dans le style "
 "traditionnel."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a
+# | 
[-href=\"http://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>video-]
+# | 
{+href=\"https://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>
+# | video+} of RMS performing the song (ogg)</a>, released under GFDLv1.3+ by
+# | the videographer, Julian Coccia.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"http://audio-video.gnu.org/video/";
+#| "stallman_free_software_song_320x240.ogv\">video of RMS performing the "
+#| "song (ogg)</a>, released under GFDLv1.3+ by the videographer, Julian "
+#| "Coccia."
 msgid ""
-"A <a href=\"http://audio-video.gnu.org/video/";
-"stallman_free_software_song_320x240.ogv\">video of RMS performing the song "
+"A <a href=\"https://audio-video.gnu.org/video/";
+"stallman_free_software_song_320x240.ogv\"> video of RMS performing the song "
 "(ogg)</a>, released under GFDLv1.3+ by the videographer, Julian Coccia."
 msgstr ""
 "Une <a href=\"http://audio-video.gnu.org/video/";
 "stallman_free_software_song_320x240.ogv\">vidéo de RMS jouant la chanson "
 "(ogg)</a>, publiée sous GNU FDL v1.3+ par le vidéographe Julian Coccia."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of
+# | Katie Herzog performing the Free Software Song, released under <a
+# | href=\"http{+s+}://creativecommons.org/licenses/by-nc-nd/3.0/\">CC
+# | BY-NC-ND</a>.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> "
+#| "of Katie Herzog performing the Free Software Song, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgid ""
 "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of "
 "Katie Herzog performing the Free Software Song, released under <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
+"\"https://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgstr ""
 "Un <a href=\"/music/free-software-song-herzog.ogg\">enregistrement (.ogg)</"
 "a> de Katie Herzog jouant la chanson du logiciel libre, publié sous <a href="
 "\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.fr\";>CC BY-NC-ND</a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Alternate versions"
 msgstr "Versions alternatives"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
-"\">Another song</a>, inspired by this one but mostly different, sung by the "
-"band Fenster (4.5M)."
+#. type: Content of: <div><ul><li>
+# | <a
+# | 
[-href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";>Another-]
+# | 
{+href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";>
+# | Another+} song</a>, inspired by this one but mostly different, sung by the
+# | band Fenster (4.5M{+B+}).
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+#| "\">Another song</a>, inspired by this one but mostly different, sung by "
+#| "the band Fenster (4.5M)."
+msgid ""
+"<a href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+"\"> Another song</a>, inspired by this one but mostly different, sung by the "
+"band Fenster (4.5MB)."
 msgstr ""
 "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
 "\">Une autre chanson</a>, inspirée de celle-ci mais essentiellement "
 "différente, chantée par le groupe Fenster (4.5 Mo)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A rhythmic version of free software song in <a href=\"/music/free-software-"
 "song-rhythmic.ogg\">Ogg Vorbis</a> format by Thor."
@@ -185,72 +262,140 @@
 "Une version rythmique de la chanson du logiciel libre au format <a href=\"/"
 "music/free-software-song-rhythmic.ogg\">Ogg Vorbis</a>, par Thor."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | An improvised piano version by Markus Haist in <a
+# | href=\"/music/markushaist-free-software-song.ogg\">Ogg Vorbis</a> format
+# | (1.2[- -]MB), released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>.
+#, fuzzy
+#| msgid ""
+#| "An improvised piano version by Markus Haist in <a href=\"/music/"
+#| "markushaist-free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), "
+#| "released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgid ""
 "An improvised piano version by Markus Haist in <a href=\"/music/markushaist-"
-"free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), released under <a "
+"free-software-song.ogg\">Ogg Vorbis</a> format (1.2MB), released under <a "
 "href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgstr ""
 "Une version improvisée au piano par Markus Haist, au format <a 
href=\"/music/"
 "markushaist-free-software-song.ogg\">Ogg Vorbis</a> (1.2 Mo), publiée sous "
 "<a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | Another rock-like version by Pjj &amp; Hairyone in <a
+# | href=\"/music/pjj-and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a>
+# | format (1.6[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-"
+#| "and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
 msgid ""
 "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-and-"
-"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
+"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6MB)."
 msgstr ""
 "Une autre version dans le style rock, par Pjj &amp; Hairyone, au format <a "
 "href=\"/music/pjj-and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> "
 "(1.6 Mo)."
 
-#. type: Content of: <ul><li>
-msgid ""
-"A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
-"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> "
-"format (1.7 MB)."
+#. type: Content of: <div><ul><li>
+# | A Spanish punk variant by ALEC in <a
+# | 
[-href=\"http://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>Ogg-]
+# | 
{+href=\"https://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>
+# | Ogg+} Vorbis</a> format (1.7[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
+#| "free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</"
+#| "a> format (1.7 MB)."
+msgid ""
+"A Spanish punk variant by ALEC in <a href=\"https://www.pc-freak.net/files/";
+"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\"> Ogg Vorbis</a> "
+"format (1.7MB)."
 msgstr ""
 "Une variante en espagnol dans le style Punk, par ALEC, au format <a href="
 "\"http://www.pc-freak.net/files/free-software-songs/";
 "Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> (1.7 Mo)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A version with a different structure in <a href=\"/music/freesoft.ogg\">
+# | Ogg Vorbis</a> format (3.7[- -]MB) by Robert Kay, released under <a
+# | 
[-href=\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-SA</a>.-]
+# | {+href=\"https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>
+# | CC-BY-NC-SA</a>.+}
+#, fuzzy
+#| msgid ""
+#| "A version with a different structure in <a href=\"/music/freesoft.ogg\"> "
+#| "Ogg Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-"
+#| "SA</a>."
 msgid ""
 "A version with a different structure in <a href=\"/music/freesoft.ogg\"> Ogg "
-"Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href=\"http://";
-"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\">CC-BY-NC-SA</a>."
+"Vorbis</a> format (3.7MB) by Robert Kay, released under <a href=\"https://";
+"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\"> CC-BY-NC-SA</a>."
 msgstr ""
 "Une version avec une structure différente par Robert Kay, au format <a href="
 "\"/music/freesoft.ogg\">Ogg Vorbis</a> (3.7 Mo), publiée sous <a href="
 "\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC BY-NC-SA</"
 "a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A version by the band Zweitgolf: <a
+# | 
[-href=\"free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>,-]
+# | 
{+href=\"/music/free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>,+}
+# | released under the GPL
+#, fuzzy
+#| msgid ""
+#| "A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
+#| "\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgid ""
-"A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
-"\">free_software_song_sunnata.ogg</a>, released under the GPL"
+"A version by the band Zweitgolf: <a href=\"/music/free_software_song_sunnata."
+"ogg\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgstr ""
 "Une version par le groupe Zweitgolf : <a href=\"free_software_song_sunnata."
 "ogg\">free_software_song_sunnata.ogg</a>, publiée sous la GPL."
 
-#. type: Content of: <ul><li>
-msgid ""
-"Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.net/";
-"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a> "
-"format (3.9 MB), released under <a href=\"http://creativecommons.org/";
-"licenses/by-sa/2.0/\"> CC BY-SA</a>."
+#. type: Content of: <div><ul><li>
+# | Here is a metal version by Jono Bacon in <a
+# | 
[-href=\"http://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>Ogg-]
+# | 
{+href=\"https://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>
+# | Ogg+} Vorbis</a> format (3.9[- -]MB), released under <a
+# | [-href=\"http://creativecommons.org/licenses/by-sa/2.0/\";> CC-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/2.0/\";>CC+} BY-SA</a>.
+#, fuzzy
+#| msgid ""
+#| "Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.";
+#| "net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg "
+#| "Vorbis</a> format (3.9 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by-sa/2.0/\"> CC BY-SA</a>."
+msgid ""
+"Here is a metal version by Jono Bacon in <a href=\"https://www.pc-freak.net/";
+"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\"> Ogg Vorbis</a> "
+"format (3.9MB), released under <a href=\"https://creativecommons.org/";
+"licenses/by-sa/2.0/\">CC BY-SA</a>."
 msgstr ""
 "Une version dans le style métal, par Jono Bacon, au format <a href=\"http://";
 "www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg"
 "\">Ogg Vorbis</a> (4 Mo), publiée sous <a 
href=\"http://creativecommons.org/";
 "licenses/by-sa/2.0/deed.fr\">CC BY-SA</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | This rock/metal version is put out by <a
+# | 
href=\"https://web.archive.org/web/20150719082345/http://freesoftwaresong.altervista.org/\";>
+# | Loneload</a> available in <a
+# | href=\"/music/loneload-free-software-song.ogg\">{+ +}Ogg Vorbis</a> format
+# | (2.2[- -]MB), released under <a
+# | href=\"http{+s+}://creativecommons.org/licenses/by/3.0/\">CC BY</a>.
+#, fuzzy
+#| msgid ""
+#| "This rock/metal version is put out by <a href=\"https://web.archive.org/";
+#| "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</"
+#| "a> available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg "
+#| "Vorbis</a> format (2.2 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by/3.0/\">CC BY</a>."
 msgid ""
 "This rock/metal version is put out by <a href=\"https://web.archive.org/";
 "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</a> "
-"available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</"
-"a> format (2.2 MB), released under <a href=\"http://creativecommons.org/";
+"available in <a href=\"/music/loneload-free-software-song.ogg\"> Ogg Vorbis</"
+"a> format (2.2MB), released under <a href=\"https://creativecommons.org/";
 "licenses/by/3.0/\">CC BY</a>."
 msgstr ""
 "Une version dans le style rock/métal proposée par <a href=\"https://web.";
@@ -259,14 +404,29 @@
 "software-song.ogg\">Ogg Vorbis</a> (2.2 Mo), publiée sous <a href=\"http://";
 "creativecommons.org/licenses/by/3.0/deed.fr\">CC BY</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | <a href=\"http{+s+}://archive.org/details/M00GNU\">MooGNU</a> by the
+# | anonymous posters on the 4chan technology image board /g/ is licensed
+# | under the <a
+# | 
href=\"http{+s+}://creativecommons.org/licenses/by-sa/3.0/legalcode\">Creative
+# | Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a
+# | href=\"http{+s+}://archive.org/download/M00GNU/Freedom-catmoognu.ogv\">
+# | Ogg Video</a> format (4.5[- -]MB).
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+#| "posters on the 4chan technology image board /g/ is licensed under the <a "
+#| "href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+#| "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
+#| "href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+#| "Video</a> format (4.5 MB)."
 msgid ""
-"<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+"<a href=\"https://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
 "posters on the 4chan technology image board /g/ is licensed under the <a "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+"href=\"https://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
 "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
-"href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
-"Video</a> format (4.5 MB)."
+"href=\"https://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+"Video</a> format (4.5MB)."
 msgstr ""
 "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a>, par des posteurs "
 "anonymes du canal de technologie graphique de 4chan /g/, disponible au "
@@ -276,15 +436,39 @@
 "paternité, partage dans les mêmes conditions 3.0 non transposée (CC 
BY-SA)</"
 "a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free
+# | Software Song to celebrate the death of <a
+# | href=\"http{+s+}://www.laquadrature.net/en/ACTA\">ACTA</a>. It's available
+# | in <a
+# | 
[-href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>Ogg-]
+# | 
{+href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>
+# | Ogg+} Vorbis</a> (2.3MB), or in <a
+# | 
[-href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>FLAC</a>-]
+# | 
{+href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>
+# | FLAC</a>+} (10.1MB), under the <a
+# | [-href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free-]
+# | {+href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free+}
+# | Art License, version 1.3</a>.
+#, fuzzy
+#| msgid ""
+#| "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
+#| "Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
+#| "net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
+#| "download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> "
+#| "(2.3MB), or in <a href=\"http://archive.org/download/Sebkha-";
+#| "Chott_FSFSongIsHip_2012/SC_FSF.flac\">FLAC</a> (10.1MB), under the <a "
+#| "href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free Art "
+#| "License, version 1.3</a>."
 msgid ""
 "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
-"Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
-"net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
-"download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> (2.3MB), "
-"or in <a href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/";
-"SC_FSF.flac\">FLAC</a> (10.1MB), under the <a href=\"//directory.fsf.org/"
-"wiki/License:Free-Art-L-v1.3\">Free Art License, version 1.3</a>."
+"Software Song to celebrate the death of <a href=\"https://www.laquadrature.";
+"net/en/ACTA\">ACTA</a>. It's available in <a href=\"https://ia800207.us.";
+"archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\"> Ogg "
+"Vorbis</a> (2.3MB), or in <a href=\"https://ia800207.us.archive.org/14/items/";
+"Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\"> FLAC</a> (10.1MB), under the "
+"<a href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free Art "
+"License, version 1.3</a>."
 msgstr ""
 "En 2012, le groupe Sebkha-Chott a publié un <em>matricide</em> de la Chanson 
"
 "du logiciel libre pour célébrer la mort d'<a 
href=\"http://www.laquadrature.";
@@ -294,7 +478,7 @@
 "SC_FSF.flac\">FLAC</a> (10.1 Mo), sous <a href=\"https://artlibre.org";
 "\">licence Art libre, version 1.3</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The <strong>ecantorix</strong> program, a singing synthesis frontend for "
 "espeak, released under the GPLv3+, features the <a href=\"/music/free-"
@@ -305,7 +489,7 @@
 "ecantorix.ogg\">Chanson du logiciel libre comme exemple de réalisation</a> "
 "(ce programme est publié sous GPLv3)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\"> Yet another version from Wikimedia Commons</a> (967kB) is licensed "
@@ -315,22 +499,44 @@
 "ogg\">Une autre version encore provient de Wikimedia Commons</a> (967 KB); "
 "elle est sous licence CC0."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+# | A <a
+# | 
href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-kalimba_ogg\";>
+# | Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by Vaba
+# | &lt;vaba@riseup.net&gt; under the <a
+# | href=\"http://www.wtfpl.net/about/\";>{+ +}WTFPL</a>.
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
+#| "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered "
+#| "by Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/";
+#| "about/\">WTFPL</a>."
 msgid ""
 "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by "
 "Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/about/";
-"\">WTFPL</a>."
+"\"> WTFPL</a>."
 msgstr ""
 "Un <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\">arrangement pour Kalimba</a> (format Ogg Vorbis, 690kB) est "
 "publié par Vaba &lt;vaba@riseup.net&gt; sous la <a href=\"http://www.wtfpl.";
 "net/about/\">WTFPL</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a>
+# | of the song made with <a [-href=\"http://lilypond.org\";>GNU-]
+# | {+href=\"https://lilypond.org/\";>GNU+} LilyPond</a>. The LilyPond <a
+# | href=\"/music/free-software-song.ly\">source</a> for the typeset score is
+# | also available.
+#, fuzzy
+#| msgid ""
+#| "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> "
+#| "of the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. "
+#| "The LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the "
+#| "typeset score is also available."
 msgid ""
 "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> of "
-"the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. The "
+"the song made with <a href=\"https://lilypond.org/\";>GNU LilyPond</a>. The "
 "LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the typeset "
 "score is also available."
 msgstr ""
@@ -340,13 +546,24 @@
 "\">code source</a> de la partition mise en page par LilyPond est aussi "
 "disponible."
 
-#. type: Content of: <h4>
-msgid "&ldquo;Sadi moma bela loza&rdquo;"
-msgstr "<cite>Sadi moma bela loza</cite>"
+#. type: Content of: <div><h4>
+msgid "<cite>Sadi moma bela loza</cite>"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Here is a description of the tune of [-&ldquo;Sadi-] {+<cite>Sadi+} moma
+# | bela [-loza,&rdquo;-] {+loza</cite>,+} a Bulgarian dance tune, in an
+# | ad-hoc form of notation using letters for notes. A dash means the previous
+# | note continues. There are seven beats per measure, thus seven characters
+# | in each group.
+#, fuzzy
+#| msgid ""
+#| "Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+#| "Bulgarian dance tune, in an ad-hoc form of notation using letters for "
+#| "notes. A dash means the previous note continues. There are seven beats "
+#| "per measure, thus seven characters in each group."
 msgid ""
-"Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+"Here is a description of the tune of <cite>Sadi moma bela loza</cite>, a "
 "Bulgarian dance tune, in an ad-hoc form of notation using letters for notes. "
 "A dash means the previous note continues. There are seven beats per measure, "
 "thus seven characters in each group."
@@ -356,7 +573,7 @@
 "notes. Un tiret signifie que la note précédente continue ; il y a sept 
temps "
 "par mesure."
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
@@ -365,18 +582,21 @@
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is also available as an <a href=\"/music/sadi-moma.abc\">ABC file</a>."
 msgstr ""
 "Elle est aussi disponible sous forme de <a href=\"/music/sadi-moma.abc"
 "\">fichier ABC</a>."
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Licence"
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Disclaimer"
+msgid "Disclaimer"
+msgstr "Renonciation au copyright"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Richard Stallman and the Free Software Foundation claim no copyright on this "
 "song."
@@ -410,14 +630,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="
@@ -428,9 +648,16 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1993, [-2001, 2002, 2003, 2004, 2005, 2006,-]
+# | {+2001-2006,+} 2010, 2011, [-2014, 2015, 2016, 2017, 2018-] {+2014-2018,
+# | 2021+} Richard Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#| "2014, 2015, 2016, 2017, 2018 Richard Stallman"
 msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018 Richard Stallman"
+"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018, 2021 Richard "
+"Stallman"
 msgstr ""
 "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
 "2015, 2016, 2017, 2018 Richard Stallman"
@@ -458,10 +685,18 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
-msgstr ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgid "by Richard Stallman"
+#~ msgstr "par Richard Stallman"
+
+#~ msgid "&ldquo;Sadi moma bela loza&rdquo;"
+#~ msgstr "<cite>Sadi moma bela loza</cite>"
+
+#~ msgid "Licensing"
+#~ msgstr "Licence"
+
+#~ msgid ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"

Index: music/po/free-software-song.pot
===================================================================
RCS file: /web/www/www/music/po/free-software-song.pot,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- music/po/free-software-song.pot     28 Oct 2018 07:57:35 -0000      1.34
+++ music/po/free-software-song.pot     12 Jul 2021 17:02:30 -0000      1.35
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-software-song.html\n"
-"POT-Creation-Date: 2018-10-28 07:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,76 +20,90 @@
 msgid "The Free Software Song - 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=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Software Song"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "by Richard Stallman"
+#. type: Content of: <div><address>
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can read the story of <a href=\"/music/writing-fs-song.html\">the "
 "writing of the song</a>, too."
 msgstr ""
 
 #.  :] 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody of "
-"the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi "
-"moma bela loza</a>&rdquo;"
+"The lyrics of the <cite>Free Software Song</cite> are sung to the melody of "
+"the Bulgarian folk song <a href=\"#SadiMoma\" id=\"REFSadiMoma\"><cite>Sadi "
+"moma bela loza</cite></a>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Join us now and share the software;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You'll be free, <a "
-"href=\"http://stallman.org/articles/on-hacking.html\";>hackers</a>, you'll be "
-"free."
+"href=\"https://stallman.org/articles/on-hacking.html\";>hackers</a>, you'll "
+"be free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll be free, hackers, you'll be free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hoarders can get piles of money,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That is true, hackers, that is true."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But they cannot help their neighbors;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's not good, hackers, that's not good."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When we have enough free software"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "At our call, hackers, at our call,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll kick out those dirty licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Ever more, hackers, ever more."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This song is in a rhythm of 7/8; those unaccustomed to odd rhythms often "
 "take the unevenness to be a mistake. The meter can be analyzed into three "
@@ -99,139 +113,140 @@
 "rhythm of 7."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Downloads"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Performances"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
-"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this song, "
-"also available in <a href=\"/music/free-software-song.ogg\">Ogg Vorbis "
-"format</a>."
+"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+"Richard Stallman singing this song, also available in <a "
+"href=\"/music/free-software-song.ogg\">Ogg Vorbis format</a>. (If you are "
+"not used to a meter of 7/8, you may perceive it as inability to keep time.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/FreeSWSong.ogg\">recording (.ogg)</a> of the piece "
 "accompanied by Bulgarian instruments played in traditional style."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a "
-"href=\"http://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>video
 "
-"of RMS performing the song (ogg)</a>, released under GFDLv1.3+ by the "
+"href=\"https://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv\";>
 "
+"video of RMS performing the song (ogg)</a>, released under GFDLv1.3+ by the "
 "videographer, Julian Coccia."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of "
 "Katie Herzog performing the Free Software Song, released under <a "
-"href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
+"href=\"https://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Alternate versions"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a "
-"href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";>Another
 "
-"song</a>, inspired by this one but mostly different, sung by the band "
-"Fenster (4.5M)."
+"href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg\";> "
+"Another song</a>, inspired by this one but mostly different, sung by the "
+"band Fenster (4.5MB)."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A rhythmic version of free software song in <a "
 "href=\"/music/free-software-song-rhythmic.ogg\">Ogg Vorbis</a> format by "
 "Thor."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "An improvised piano version by Markus Haist in <a "
 "href=\"/music/markushaist-free-software-song.ogg\">Ogg Vorbis</a> format "
-"(1.2 MB), released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
+"(1.2MB), released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Another rock-like version by Pjj &amp; Hairyone in <a "
 "href=\"/music/pjj-and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format "
-"(1.6 MB)."
+"(1.6MB)."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A Spanish punk variant by ALEC in <a "
-"href=\"http://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>Ogg
 "
-"Vorbis</a> format (1.7 MB)."
+"href=\"https://www.pc-freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\";>
 "
+"Ogg Vorbis</a> format (1.7MB)."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A version with a different structure in <a href=\"/music/freesoft.ogg\"> Ogg "
-"Vorbis</a> format (3.7 MB) by Robert Kay, released under <a "
-"href=\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-SA</a>."
+"Vorbis</a> format (3.7MB) by Robert Kay, released under <a "
+"href=\"https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";> "
+"CC-BY-NC-SA</a>."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A version by the band Zweitgolf: <a "
-"href=\"free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>, "
+"href=\"/music/free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>,
 "
 "released under the GPL"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Here is a metal version by Jono Bacon in <a "
-"href=\"http://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>Ogg
 "
-"Vorbis</a> format (3.9 MB), released under <a "
-"href=\"http://creativecommons.org/licenses/by-sa/2.0/\";> CC BY-SA</a>."
+"href=\"https://www.pc-freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\";>
 "
+"Ogg Vorbis</a> format (3.9MB), released under <a "
+"href=\"https://creativecommons.org/licenses/by-sa/2.0/\";>CC BY-SA</a>."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "This rock/metal version is put out by <a "
 
"href=\"https://web.archive.org/web/20150719082345/http://freesoftwaresong.altervista.org/\";>
 "
 "Loneload</a> available in <a "
-"href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</a> format (2.2 "
-"MB), released under <a "
-"href=\"http://creativecommons.org/licenses/by/3.0/\";>CC BY</a>."
+"href=\"/music/loneload-free-software-song.ogg\"> Ogg Vorbis</a> format "
+"(2.2MB), released under <a "
+"href=\"https://creativecommons.org/licenses/by/3.0/\";>CC BY</a>."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
-"<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+"<a href=\"https://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
 "posters on the 4chan technology image board /g/ is licensed under the <a "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+"href=\"https://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
 "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
-"href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
-"Video</a> format (4.5 MB)."
+"href=\"https://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+"Video</a> format (4.5MB)."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
 "Software Song to celebrate the death of <a "
-"href=\"http://www.laquadrature.net/en/ACTA\";>ACTA</a>. It's available in <a "
-"href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>Ogg
 "
-"Vorbis</a> (2.3MB), or in <a "
-"href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>FLAC</a>
 "
-"(10.1MB), under the <a "
-"href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free Art License, "
-"version 1.3</a>."
+"href=\"https://www.laquadrature.net/en/ACTA\";>ACTA</a>. It's available in <a "
+"href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\";>
 "
+"Ogg Vorbis</a> (2.3MB), or in <a "
+"href=\"https://ia800207.us.archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\";>
 "
+"FLAC</a> (10.1MB), under the <a "
+"href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free Art "
+"License, version 1.3</a>."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The <strong>ecantorix</strong> program, a singing synthesis frontend for "
 "espeak, released under the GPLv3+, features the <a "
@@ -239,7 +254,7 @@
 "example output</a>."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a "
 
"href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.ogg\";>
 "
@@ -247,51 +262,51 @@
 "CC0."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a "
 "href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-kalimba_ogg\";> "
 "Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by Vaba "
-"&lt;vaba@riseup.net&gt; under the <a "
-"href=\"http://www.wtfpl.net/about/\";>WTFPL</a>."
+"&lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/about/\";> "
+"WTFPL</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> of "
-"the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. The "
+"the song made with <a href=\"https://lilypond.org/\";>GNU LilyPond</a>. The "
 "LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the typeset "
 "score is also available."
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "&ldquo;Sadi moma bela loza&rdquo;"
+#. type: Content of: <div><h4>
+msgid "<cite>Sadi moma bela loza</cite>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+"Here is a description of the tune of <cite>Sadi moma bela loza</cite>, a "
 "Bulgarian dance tune, in an ad-hoc form of notation using letters for "
 "notes. A dash means the previous note continues. There are seven beats per "
 "measure, thus seven characters in each group."
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "It is also available as an <a href=\"/music/sadi-moma.abc\">ABC 
file</a>."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Licensing"
+#. type: Content of: <div><div><h3>
+msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Richard Stallman and the Free Software Foundation claim no copyright on this "
 "song."
@@ -321,7 +336,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>. 
@@ -329,13 +344,14 @@
 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; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018 Richard Stallman"
+"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018, 2021 Richard "
+"Stallman"
 msgstr ""
 
 #. type: Content of: <div><p>

Index: music/po/free-software-song.pt-br.po
===================================================================
RCS file: /web/www/www/music/po/free-software-song.pt-br.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- music/po/free-software-song.pt-br.po        12 Jul 2021 16:55:33 -0000      
1.28
+++ music/po/free-software-song.pt-br.po        12 Jul 2021 17:02:30 -0000      
1.29
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-software-song.html\n"
-"POT-Creation-Date: 2018-10-28 07:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2018-10-29 13:03-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 1.0.0-beta1\n"
 
@@ -21,15 +22,35 @@
 msgid "The Free Software Song - GNU Project - Free Software Foundation"
 msgstr "A Música do Software Livre - Projeto GNU - Free Software Foundation"
 
-#. 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 "Página inicial do GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Software Song"
 msgstr "A Música do Software Livre"
 
-#. type: Content of: <p>
-msgid "by Richard Stallman"
-msgstr "por Richard Stallman"
+#. type: Content of: <div><address>
+#, fuzzy
+#| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
+msgstr "por <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can read the story of <a href=\"/music/writing-fs-song.html\">the "
 "writing of the song</a>, too."
@@ -38,65 +59,74 @@
 "da música</a>, também."
 
 #.  :] 
-#. type: Content of: <p>
-msgid ""
-"The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody of "
-"the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi "
-"moma bela loza</a>&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody "
+#| "of the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma"
+#| "\">Sadi moma bela loza</a>&rdquo;"
+msgid ""
+"The lyrics of the <cite>Free Software Song</cite> are sung to the melody of "
+"the Bulgarian folk song <a href=\"#SadiMoma\" id=\"REFSadiMoma\"><cite>Sadi "
+"moma bela loza</cite></a>"
 msgstr ""
 "As letras da “Música do Software Livre” são cantadas na melodia da 
música "
 "popular búlgara “<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi moma bela "
 "loza</a>”  "
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Join us now and share the software;"
 msgstr "Juntem-se a nós e partilhem o software;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+#| "\">hackers</a>, you'll be free."
 msgid ""
-"You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+"You'll be free, <a href=\"https://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free."
 msgstr ""
 "Serão livres, <a href=\"http://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, serão livres."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll be free, hackers, you'll be free."
 msgstr "Serão livres, hackers, serão livres."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hoarders can get piles of money,"
 msgstr "Acumuladores podem obter pilhas de dinheiro,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That is true, hackers, that is true."
 msgstr "Isso é verdade, hackers, isso é verdade."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But they cannot help their neighbors;"
 msgstr "Mas eles não conseguem ajudar os seus vizinhos;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's not good, hackers, that's not good."
 msgstr "Isso não é bom, hackers, isso não é bom."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When we have enough free software"
 msgstr "Quando tivermos software livre suficiente"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "At our call, hackers, at our call,"
 msgstr "À nossa disposição, hackers, à nossa disposição,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll kick out those dirty licenses"
 msgstr "Pontapearemos essas licenças sujas"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Ever more, hackers, ever more."
 msgstr "Cada vez mais, hackers, cada vez mais."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This song is in a rhythm of 7/8; those unaccustomed to odd rhythms often "
 "take the unevenness to be a mistake. The meter can be analyzed into three "
@@ -112,27 +142,33 @@
 "analisam essa música como 3-2-3; porém, Yves Moreau, que colecionou e "
 "ensinou a dança, aprova o ritmo de 7."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Downloads"
 msgstr "Downloads"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Performances"
 msgstr "Performances"
 
-#. type: Content of: <ul><li>
-msgid ""
-"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this song, "
-"also available in <a href=\"/music/free-software-song.ogg\">Ogg Vorbis "
-"format</a>."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+#| "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this "
+#| "song, also available in <a href=\"/music/free-software-song.ogg\">Ogg "
+#| "Vorbis format</a>."
+msgid ""
+"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+"Richard Stallman singing this song, also available in <a href=\"/music/free-"
+"software-song.ogg\">Ogg Vorbis format</a>. (If you are not used to a meter "
+"of 7/8, you may perceive it as inability to keep time.)"
 msgstr ""
 "Uma <a href=\"/music/free-software-song.au\">gravação (formato .au)</a> do "
 "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> cantando essa "
 "música, também disponível no <a href=\"/music/free-software-song.ogg"
 "\">formato Ogg Vorbis</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/FreeSWSong.ogg\">recording (.ogg)</a> of the piece "
 "accompanied by Bulgarian instruments played in traditional style."
@@ -140,42 +176,58 @@
 "Uma <a href=\"/music/FreeSWSong.ogg\">gravação (.ogg)</a> da peça "
 "acompanhada pelos instrumentos tocados no estilo tradicional."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"http://audio-video.gnu.org/video/";
+#| "stallman_free_software_song_320x240.ogv\">video of RMS performing the "
+#| "song (ogg)</a>, released under GFDLv1.3+ by the videographer, Julian "
+#| "Coccia."
 msgid ""
-"A <a href=\"http://audio-video.gnu.org/video/";
-"stallman_free_software_song_320x240.ogv\">video of RMS performing the song "
+"A <a href=\"https://audio-video.gnu.org/video/";
+"stallman_free_software_song_320x240.ogv\"> video of RMS performing the song "
 "(ogg)</a>, released under GFDLv1.3+ by the videographer, Julian Coccia."
 msgstr ""
 "Um <a href=\"http://audio-video.gnu.org/video/";
 "stallman_free_software_song_320x240.ogv\">vídeo do RMS cantando a música "
 "(ogg)</a>, lançada sob GFDLv1.3+ pelo cinegrafista, Julian Coccia."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> "
+#| "of Katie Herzog performing the Free Software Song, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgid ""
 "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of "
 "Katie Herzog performing the Free Software Song, released under <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
+"\"https://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgstr ""
 "Uma <a href=\"/music/free-software-song-herzog.ogg\">gravação (.ogg)</a> de 
"
 "Katie Herzog cantando a Música do Software Livre, lançada sob <a href="
 "\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.pt_BR\";>CC BY-NC-ND</"
 "a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Alternate versions"
 msgstr "Versões alternativas"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
-"\">Another song</a>, inspired by this one but mostly different, sung by the "
-"band Fenster (4.5M)."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+#| "\">Another song</a>, inspired by this one but mostly different, sung by "
+#| "the band Fenster (4.5M)."
+msgid ""
+"<a href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+"\"> Another song</a>, inspired by this one but mostly different, sung by the "
+"band Fenster (4.5MB)."
 msgstr ""
 "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
 "\">Uma outra música</a>, inspirada por esta, mas muito diferente, cantada "
 "pela banda Fenster (4,5 MB)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A rhythmic version of free software song in <a href=\"/music/free-software-"
 "song-rhythmic.ogg\">Ogg Vorbis</a> format by Thor."
@@ -183,71 +235,108 @@
 "Uma versão rítmica da música do software livre no formato <a 
href=\"/music/"
 "free-software-song-rhythmic.ogg\">Ogg Vorbis</a> por Thor."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "An improvised piano version by Markus Haist in <a href=\"/music/"
+#| "markushaist-free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), "
+#| "released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgid ""
 "An improvised piano version by Markus Haist in <a href=\"/music/markushaist-"
-"free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), released under <a "
+"free-software-song.ogg\">Ogg Vorbis</a> format (1.2MB), released under <a "
 "href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgstr ""
 "Uma versão improvisada no piano por Markus Haist no formato <a 
href=\"/music/"
 "markushaist-free-software-song.ogg\">Ogg Vorbis</a> (1,2 MB), lançada sob <a 
"
 "href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-"
+#| "and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
 msgid ""
 "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-and-"
-"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
+"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6MB)."
 msgstr ""
 "Uma outra versão tipo rock por Pjj &amp; Hairyone no formato <a href=\"/"
 "music/pjj-and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> (1.6 MB)."
 
-#. type: Content of: <ul><li>
-msgid ""
-"A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
-"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> "
-"format (1.7 MB)."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
+#| "free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</"
+#| "a> format (1.7 MB)."
+msgid ""
+"A Spanish punk variant by ALEC in <a href=\"https://www.pc-freak.net/files/";
+"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\"> Ogg Vorbis</a> "
+"format (1.7MB)."
 msgstr ""
 "Uma variação punk em espanhol por ALEC no formato <a href=\"http://www.pc-";
 "freak.net/files/free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv"
 "\">Ogg Vorbis</a> (1,7 MB)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A version with a different structure in <a href=\"/music/freesoft.ogg\"> "
+#| "Ogg Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-"
+#| "SA</a>."
 msgid ""
 "A version with a different structure in <a href=\"/music/freesoft.ogg\"> Ogg "
-"Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href=\"http://";
-"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\">CC-BY-NC-SA</a>."
+"Vorbis</a> format (3.7MB) by Robert Kay, released under <a href=\"https://";
+"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\"> CC-BY-NC-SA</a>."
 msgstr ""
 "Uma versão com uma estrutura diferente no formato <a href=\"/music/freesoft."
 "ogg\">Ogg Vorbis</a> (3,7 MB) por Robert Kay, lançada sob <a href=\"http://";
 "creativecommons.org/licenses/by-nc-sa/3.0/legalcode\">CC-BY-NC-SA</a>."
 
 # Acrescentado um ponto final para se combinar com outras frases -- Rafael
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
+#| "\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgid ""
-"A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
-"\">free_software_song_sunnata.ogg</a>, released under the GPL"
+"A version by the band Zweitgolf: <a href=\"/music/free_software_song_sunnata."
+"ogg\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgstr ""
 "Uma versão da banda Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
 "\">free_software_song_sunnata.ogg</a>, lançada sob a GPL."
 
-#. type: Content of: <ul><li>
-msgid ""
-"Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.net/";
-"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a> "
-"format (3.9 MB), released under <a href=\"http://creativecommons.org/";
-"licenses/by-sa/2.0/\"> CC BY-SA</a>."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.";
+#| "net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg "
+#| "Vorbis</a> format (3.9 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by-sa/2.0/\"> CC BY-SA</a>."
+msgid ""
+"Here is a metal version by Jono Bacon in <a href=\"https://www.pc-freak.net/";
+"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\"> Ogg Vorbis</a> "
+"format (3.9MB), released under <a href=\"https://creativecommons.org/";
+"licenses/by-sa/2.0/\">CC BY-SA</a>."
 msgstr ""
 "Aqui está uma versão metal por Jono Bacon no formato <a 
href=\"http://www.pc-";
 "freak.net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg "
 "Vorbis</a> (3,9 MB), lançado sob <a href=\"http://creativecommons.org/";
 "licenses/by-sa/2.0/\">CC BY-SA</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "This rock/metal version is put out by <a href=\"https://web.archive.org/";
+#| "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</"
+#| "a> available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg "
+#| "Vorbis</a> format (2.2 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by/3.0/\">CC BY</a>."
 msgid ""
 "This rock/metal version is put out by <a href=\"https://web.archive.org/";
 "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</a> "
-"available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</"
-"a> format (2.2 MB), released under <a href=\"http://creativecommons.org/";
+"available in <a href=\"/music/loneload-free-software-song.ogg\"> Ogg Vorbis</"
+"a> format (2.2MB), released under <a href=\"https://creativecommons.org/";
 "licenses/by/3.0/\">CC BY</a>."
 msgstr ""
 "Essa versão rock/metal foi criada por <a href=\"https://web.archive.org/";
@@ -256,14 +345,22 @@
 "(2,2 MB), lançado sob <a href=\"http://creativecommons.org/licenses/by/3.0/";
 "\">CC BY</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+#| "posters on the 4chan technology image board /g/ is licensed under the <a "
+#| "href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+#| "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
+#| "href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+#| "Video</a> format (4.5 MB)."
 msgid ""
-"<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+"<a href=\"https://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
 "posters on the 4chan technology image board /g/ is licensed under the <a "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+"href=\"https://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
 "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
-"href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
-"Video</a> format (4.5 MB)."
+"href=\"https://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+"Video</a> format (4.5MB)."
 msgstr ""
 "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a>, de publicadores "
 "anônimos no quadro de imagem tecnológica /g/ do 4chan, está licenciado sob 
a "
@@ -272,15 +369,26 @@
 "Disponível no formato <a href=\"http://archive.org/download/M00GNU/Freedom-";
 "catmoognu.ogv\">Ogg Vídeo</a> (4,5 MB)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
+#| "Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
+#| "net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
+#| "download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> "
+#| "(2.3MB), or in <a href=\"http://archive.org/download/Sebkha-";
+#| "Chott_FSFSongIsHip_2012/SC_FSF.flac\">FLAC</a> (10.1MB), under the <a "
+#| "href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free Art "
+#| "License, version 1.3</a>."
 msgid ""
 "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
-"Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
-"net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
-"download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> (2.3MB), "
-"or in <a href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/";
-"SC_FSF.flac\">FLAC</a> (10.1MB), under the <a href=\"//directory.fsf.org/"
-"wiki/License:Free-Art-L-v1.3\">Free Art License, version 1.3</a>."
+"Software Song to celebrate the death of <a href=\"https://www.laquadrature.";
+"net/en/ACTA\">ACTA</a>. It's available in <a href=\"https://ia800207.us.";
+"archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\"> Ogg "
+"Vorbis</a> (2.3MB), or in <a href=\"https://ia800207.us.archive.org/14/items/";
+"Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\"> FLAC</a> (10.1MB), under the "
+"<a href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free Art "
+"License, version 1.3</a>."
 msgstr ""
 "Em 2012, a banda Sebkha-Chott lançou um <em>matricida</em> da Música do "
 "Software Livre para celebrar a morte da <a href=\"http://www.laquadrature.";
@@ -290,7 +398,7 @@
 "SC_FSF.flac\">FLAC</a> (10,1 MB), sob a <a href=\"//directory.fsf.org/wiki/"
 "License:Free-Art-L-v1.3\">Licença de Arte Livre, versão 1.3</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The <strong>ecantorix</strong> program, a singing synthesis frontend for "
 "espeak, released under the GPLv3+, features the <a href=\"/music/free-"
@@ -300,7 +408,7 @@
 "espeak, lançado sob a GPLv3+, fornecendo a <a href=\"/music/free-software-"
 "song-ecantorix.ogg\">Música de Software Livre como uma saída de 
exemplo</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\"> Yet another version from Wikimedia Commons</a> (967kB) is licensed "
@@ -310,22 +418,34 @@
 "ogg\">Mais uma versão do Wikimedia Commons</a> (967kB) está licenciada sob "
 "CC0."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
+#| "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered "
+#| "by Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/";
+#| "about/\">WTFPL</a>."
 msgid ""
 "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by "
 "Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/about/";
-"\">WTFPL</a>."
+"\"> WTFPL</a>."
 msgstr ""
 "Uma <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> versão Kalimba</a> (formato Ogg Vorbis, 690kB) é oferecido "
 "por Vaba &lt;vaba@riseup.net&gt; sob a <a href=\"http://www.wtfpl.net/about/";
 "\">WTFPL</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> "
+#| "of the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. "
+#| "The LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the "
+#| "typeset score is also available."
 msgid ""
 "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> of "
-"the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. The "
+"the song made with <a href=\"https://lilypond.org/\";>GNU LilyPond</a>. The "
 "LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the typeset "
 "score is also available."
 msgstr ""
@@ -334,13 +454,19 @@
 "LilyPond</a>. O <a href=\"/music/free-software-song.ly\">fonte</a> da "
 "formatação da partitura, feita no LilyPond, também está disponível."
 
-#. type: Content of: <h4>
-msgid "&ldquo;Sadi moma bela loza&rdquo;"
-msgstr "“Sadi moma bela loza”"
+#. type: Content of: <div><h4>
+msgid "<cite>Sadi moma bela loza</cite>"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+#| "Bulgarian dance tune, in an ad-hoc form of notation using letters for "
+#| "notes. A dash means the previous note continues. There are seven beats "
+#| "per measure, thus seven characters in each group."
 msgid ""
-"Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+"Here is a description of the tune of <cite>Sadi moma bela loza</cite>, a "
 "Bulgarian dance tune, in an ad-hoc form of notation using letters for notes. "
 "A dash means the previous note continues. There are seven beats per measure, "
 "thus seven characters in each group."
@@ -350,7 +476,7 @@
 "significa a continuação da nota anterior. Há sete batidas por medida, 
então "
 "sete caracteres em cada grupo."
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
@@ -359,18 +485,20 @@
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is also available as an <a href=\"/music/sadi-moma.abc\">ABC file</a>."
 msgstr ""
 "Também está disponível como um <a href=\"/music/sadi-moma.abc\">arquivo 
ABC</"
 "a>."
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Licenciamento"
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Disclaimer"
+msgid "Disclaimer"
+msgstr "Aviso legal"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Richard Stallman and the Free Software Foundation claim no copyright on this "
 "song."
@@ -404,14 +532,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -419,13 +547,17 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#| "2014, 2015, 2016, 2017, 2018 Richard Stallman"
 msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018 Richard Stallman"
+"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018, 2021 Richard "
+"Stallman"
 msgstr ""
 "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
 "2015, 2016, 2017, 2018 Richard Stallman"
@@ -453,13 +585,18 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
-msgstr ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgid "&ldquo;Sadi moma bela loza&rdquo;"
+#~ msgstr "“Sadi moma bela loza”"
+
+#~ msgid "Licensing"
+#~ msgstr "Licenciamento"
+
+#~ msgid ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"
 
 #~ msgid ""
 #~ "Natty Traywick has <a href=\"https://musescore.com/user/1102686/";

Index: music/po/free-software-song.tr.po
===================================================================
RCS file: /web/www/www/music/po/free-software-song.tr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- music/po/free-software-song.tr.po   12 Jul 2021 16:55:33 -0000      1.4
+++ music/po/free-software-song.tr.po   12 Jul 2021 17:02:30 -0000      1.5
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-software-song.html\n"
-"POT-Creation-Date: 2018-10-28 07:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2020-08-22 08:30+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.3\n"
 
@@ -21,15 +22,35 @@
 msgid "The Free Software Song - GNU Project - Free Software Foundation"
 msgstr "Özgür Yazılım Şarkısı - GNU Projesi - Özgür Yazılım Vakfı"
 
-#. 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 Ana Sayfası"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Software Song"
 msgstr "Özgür Yazılım Şarkısı"
 
-#. type: Content of: <p>
-msgid "by Richard Stallman"
-msgstr "yazan Richard Stallman"
+#. type: Content of: <div><address>
+#, fuzzy
+#| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
+msgstr "yazan <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can read the story of <a href=\"/music/writing-fs-song.html\">the "
 "writing of the song</a>, too."
@@ -38,83 +59,92 @@
 "okuyabilirsiniz."
 
 #.  :] 
-#. type: Content of: <p>
-msgid ""
-"The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody of "
-"the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi "
-"moma bela loza</a>&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody "
+#| "of the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma"
+#| "\">Sadi moma bela loza</a>&rdquo;"
+msgid ""
+"The lyrics of the <cite>Free Software Song</cite> are sung to the melody of "
+"the Bulgarian folk song <a href=\"#SadiMoma\" id=\"REFSadiMoma\"><cite>Sadi "
+"moma bela loza</cite></a>"
 msgstr ""
 "&ldquo;Özgür Yazılım Şarkısı (<em>Free Software Song</em>)&rdquo;nın "
 "sözleri, Bulgar halk şarkısı &ldquo;<a href=\"#SadiMoma\" 
id=\"REFSadiMoma"
 "\">Sadi moma bela loza</a>&rdquo;nın ezgisiyle söylenmiştir."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Join us now and share the software;"
 msgstr ""
 "<b>Join us now and share the software;</b> (Şimdi bize katılın ve 
yazılımı "
 "paylaşın;)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+#| "\">hackers</a>, you'll be free."
 msgid ""
-"You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+"You'll be free, <a href=\"https://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free."
 msgstr ""
 "<b>You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free.</b> (Özgür olacaksınız, <a href=\"http://";
 "stallman.org/articles/on-hacking.html\">üstatlar</a>, özgür 
olacaksınız.)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll be free, hackers, you'll be free."
 msgstr ""
 "<b>You'll be free, hackers, you'll be free.</b> (Özgür olacaksınız, "
 "üstatlar, özgür olacaksınız.)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hoarders can get piles of money,"
 msgstr ""
 "<b>Hoarders can get piles of money,</b> (İstifçiler para yığınları "
 "kazanabilir,)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That is true, hackers, that is true."
 msgstr ""
 "<b>That is true, hackers, that is true.</b> (Bu gerçek, üstatlar, bu 
gerçek.)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But they cannot help their neighbors;"
 msgstr ""
 "<b>But they cannot help their neighbors;</b> (Ancak komşularına yardım "
 "edemezler;)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's not good, hackers, that's not good."
 msgstr ""
 "<b>That's not good, hackers, that's not good.</b> (Bu iyi değil, üstatlar, "
 "bu iyi değil.)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When we have enough free software"
 msgstr ""
 "<b>When we have enough free software</b> (Yeterli özgür yazılımımız "
 "olduğunda)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "At our call, hackers, at our call,"
 msgstr ""
 "<b>At our call, hackers, at our call,</b> (Elimizde, üstatlar, elimizde,)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll kick out those dirty licenses"
 msgstr ""
 "<b>We'll kick out those dirty licenses</b> (O kirli lisansları defedeceğiz)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Ever more, hackers, ever more."
 msgstr ""
 "<b>Ever more, hackers, ever more.</b> (Sonsuza değin, üstatlar, sonsuza "
 "değin.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This song is in a rhythm of 7/8; those unaccustomed to odd rhythms often "
 "take the unevenness to be a mistake. The meter can be analyzed into three "
@@ -130,27 +160,33 @@
 "olarak çözümler; ancak dansı derleyen ve öğreten Yves Moreau, 7'lik 
ritmi "
 "onaylıyor."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Downloads"
 msgstr "Ä°ndirilebilecekler"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Performances"
 msgstr "Performanslar"
 
-#. type: Content of: <ul><li>
-msgid ""
-"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this song, "
-"also available in <a href=\"/music/free-software-song.ogg\">Ogg Vorbis "
-"format</a>."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+#| "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this "
+#| "song, also available in <a href=\"/music/free-software-song.ogg\">Ogg "
+#| "Vorbis format</a>."
+msgid ""
+"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+"Richard Stallman singing this song, also available in <a href=\"/music/free-"
+"software-song.ogg\">Ogg Vorbis format</a>. (If you are not used to a meter "
+"of 7/8, you may perceive it as inability to keep time.)"
 msgstr ""
 "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> tarafından "
 "söylenen bir <a href=\"/music/free-software-song.au\">kayıt (.au 
biçiminde)</"
 "a>, kaydın <a href=\"/music/free-software-song.ogg\">Ogg Vorbis biçimi</a> "
 "de var."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/FreeSWSong.ogg\">recording (.ogg)</a> of the piece "
 "accompanied by Bulgarian instruments played in traditional style."
@@ -158,10 +194,16 @@
 "Geleneksel stilde çalınan Bulgar çalgılarının eşlik ettiği yapıtın 
bir <a "
 "href=\"/music/FreeSWSong.ogg\">kaydı (.ogg)</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"http://audio-video.gnu.org/video/";
+#| "stallman_free_software_song_320x240.ogv\">video of RMS performing the "
+#| "song (ogg)</a>, released under GFDLv1.3+ by the videographer, Julian "
+#| "Coccia."
 msgid ""
-"A <a href=\"http://audio-video.gnu.org/video/";
-"stallman_free_software_song_320x240.ogv\">video of RMS performing the song "
+"A <a href=\"https://audio-video.gnu.org/video/";
+"stallman_free_software_song_320x240.ogv\"> video of RMS performing the song "
 "(ogg)</a>, released under GFDLv1.3+ by the videographer, Julian Coccia."
 msgstr ""
 "Videografiker Julian Coccia tarafından GFDLv1.3+ altında yayımlanan <a 
href="
@@ -169,31 +211,41 @@
 "\">şarkıyı seslendiren <abbr title=\"Richard Matthew Stallman\">RMS</"
 "abbr>'nin bir videosu (ogg)</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> "
+#| "of Katie Herzog performing the Free Software Song, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgid ""
 "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of "
 "Katie Herzog performing the Free Software Song, released under <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
+"\"https://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgstr ""
 "<a href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC-BY-NC-ND</"
 "a> altında yayımlanan Özgür Yazılım Şarkısı'nı seslendiren Katie 
Herzog'un "
 "bir <a href=\"/music/free-software-song-herzog.ogg\">kaydı (.ogg)</a>."
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Alternate versions"
 msgstr "Alternatif sürümler"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
-"\">Another song</a>, inspired by this one but mostly different, sung by the "
-"band Fenster (4.5M)."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+#| "\">Another song</a>, inspired by this one but mostly different, sung by "
+#| "the band Fenster (4.5M)."
+msgid ""
+"<a href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+"\"> Another song</a>, inspired by this one but mostly different, sung by the "
+"band Fenster (4.5MB)."
 msgstr ""
 "Fenster (4.5M) müzik grubu tarafından söylenen bu şarkılardan 
esinlenilen "
 "ancak çoğunlukla farklı olan <a href=\"http://audio-video.gnu.org/audio/";
 "Fenster-Free-Software-Song.ogg\">başka bir şarkı</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A rhythmic version of free software song in <a href=\"/music/free-software-"
 "song-rhythmic.ogg\">Ogg Vorbis</a> format by Thor."
@@ -201,72 +253,109 @@
 "Thor tarafından <a href=\"/music/free-software-song-rhythmic.ogg\">Ogg "
 "Vorbis</a> biçiminde özgür yazılım şarkısının ritmik bir sürümü."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "An improvised piano version by Markus Haist in <a href=\"/music/"
+#| "markushaist-free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), "
+#| "released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgid ""
 "An improvised piano version by Markus Haist in <a href=\"/music/markushaist-"
-"free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), released under <a "
+"free-software-song.ogg\">Ogg Vorbis</a> format (1.2MB), released under <a "
 "href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgstr ""
 "Markus Hasit tarafından <a href=\"/licenses/gpl-3.0.html\">GPLv3</a> 
altında "
 "yayımlanan <a href=\"/music/markushaist-free-software-song.ogg\">Ogg 
Vorbis</"
 "a> biçiminde (1,2 MB) doğaçlama bir piyano sürümü."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-"
+#| "and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
 msgid ""
 "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-and-"
-"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
+"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6MB)."
 msgstr ""
 "Pjj &amp; Hairyone tarafından <a href=\"/music/pjj-and-hairyone-"
 "freesoftwaresong.ogg\">Ogg Vorbis</a> biçiminde (1,6 MB) başka bir rock "
 "benzeri sürüm."
 
-#. type: Content of: <ul><li>
-msgid ""
-"A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
-"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> "
-"format (1.7 MB)."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
+#| "free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</"
+#| "a> format (1.7 MB)."
+msgid ""
+"A Spanish punk variant by ALEC in <a href=\"https://www.pc-freak.net/files/";
+"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\"> Ogg Vorbis</a> "
+"format (1.7MB)."
 msgstr ""
 "ALEC tarafından <a href=\"http://www.pc-freak.net/files/free-software-songs/";
 "Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> biçiminde (1,7 MB) "
 "İspanyol bir punk değişkesi."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A version with a different structure in <a href=\"/music/freesoft.ogg\"> "
+#| "Ogg Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-"
+#| "SA</a>."
 msgid ""
 "A version with a different structure in <a href=\"/music/freesoft.ogg\"> Ogg "
-"Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href=\"http://";
-"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\">CC-BY-NC-SA</a>."
+"Vorbis</a> format (3.7MB) by Robert Kay, released under <a href=\"https://";
+"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\"> CC-BY-NC-SA</a>."
 msgstr ""
 "Robert Kay tarafından <a href=\"http://creativecommons.org/licenses/by-nc-";
 "sa/3.0/legalcode\">CC-BY-NC-SA</a> altında yayımlanan <a href=\"/music/"
 "freesoft.ogg\">Ogg Vorbis</a> biçiminde (3,7 MB) farklı bir yapıya sahip 
bir "
 "sürüm."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
+#| "\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgid ""
-"A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
-"\">free_software_song_sunnata.ogg</a>, released under the GPL"
+"A version by the band Zweitgolf: <a href=\"/music/free_software_song_sunnata."
+"ogg\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgstr ""
 "Zweitgolf müzik grubu tarafından bir sürüm: GPL altında yayımlanan <a 
href="
 "\"free_software_song_sunnata.ogg\">free_software_song_sunnata.ogg</a>"
 
-#. type: Content of: <ul><li>
-msgid ""
-"Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.net/";
-"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a> "
-"format (3.9 MB), released under <a href=\"http://creativecommons.org/";
-"licenses/by-sa/2.0/\"> CC BY-SA</a>."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.";
+#| "net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg "
+#| "Vorbis</a> format (3.9 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by-sa/2.0/\"> CC BY-SA</a>."
+msgid ""
+"Here is a metal version by Jono Bacon in <a href=\"https://www.pc-freak.net/";
+"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\"> Ogg Vorbis</a> "
+"format (3.9MB), released under <a href=\"https://creativecommons.org/";
+"licenses/by-sa/2.0/\">CC BY-SA</a>."
 msgstr ""
 "İşte, Jono Bacon tarafından <a 
href=\"http://creativecommons.org/licenses/by-";
 "sa/2.0/\">CC-BY-SA</a> altında yayımlanan <a 
href=\"http://www.pc-freak.net/";
 "files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a> "
 "biçiminde (3,9 MB) bir metal sürüm."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "This rock/metal version is put out by <a href=\"https://web.archive.org/";
+#| "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</"
+#| "a> available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg "
+#| "Vorbis</a> format (2.2 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by/3.0/\">CC BY</a>."
 msgid ""
 "This rock/metal version is put out by <a href=\"https://web.archive.org/";
 "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</a> "
-"available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</"
-"a> format (2.2 MB), released under <a href=\"http://creativecommons.org/";
+"available in <a href=\"/music/loneload-free-software-song.ogg\"> Ogg Vorbis</"
+"a> format (2.2MB), released under <a href=\"https://creativecommons.org/";
 "licenses/by/3.0/\">CC BY</a>."
 msgstr ""
 "Bu rock/metal sürüm, <a href=\"https://web.archive.org/web/20150719082345/";
@@ -275,14 +364,22 @@
 "<a href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</a> biçiminde "
 "(2,2 MB) sunuldu."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+#| "posters on the 4chan technology image board /g/ is licensed under the <a "
+#| "href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+#| "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
+#| "href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+#| "Video</a> format (4.5 MB)."
 msgid ""
-"<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+"<a href=\"https://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
 "posters on the 4chan technology image board /g/ is licensed under the <a "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+"href=\"https://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
 "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
-"href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
-"Video</a> format (4.5 MB)."
+"href=\"https://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+"Video</a> format (4.5MB)."
 msgstr ""
 "4chan teknoloji görüntü panosu /g/'deki anonim yayıncılar tarafından <a 
href="
 "\"http://archive.org/details/M00GNU\";>MooGNU</a>, <a href=\"http://";
@@ -291,15 +388,26 @@
 "lisanslanmıştır. <a href=\"http://archive.org/download/M00GNU/Freedom-";
 "catmoognu.ogv\">Ogg Video</a> biçiminde (4,5 MB) mevcuttur."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
+#| "Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
+#| "net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
+#| "download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> "
+#| "(2.3MB), or in <a href=\"http://archive.org/download/Sebkha-";
+#| "Chott_FSFSongIsHip_2012/SC_FSF.flac\">FLAC</a> (10.1MB), under the <a "
+#| "href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free Art "
+#| "License, version 1.3</a>."
 msgid ""
 "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
-"Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
-"net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
-"download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> (2.3MB), "
-"or in <a href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/";
-"SC_FSF.flac\">FLAC</a> (10.1MB), under the <a href=\"//directory.fsf.org/"
-"wiki/License:Free-Art-L-v1.3\">Free Art License, version 1.3</a>."
+"Software Song to celebrate the death of <a href=\"https://www.laquadrature.";
+"net/en/ACTA\">ACTA</a>. It's available in <a href=\"https://ia800207.us.";
+"archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\"> Ogg "
+"Vorbis</a> (2.3MB), or in <a href=\"https://ia800207.us.archive.org/14/items/";
+"Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\"> FLAC</a> (10.1MB), under the "
+"<a href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free Art "
+"License, version 1.3</a>."
 msgstr ""
 "2012'de müzik grubu Sebkha-Chott, <a href=\"http://www.laquadrature.net/en/";
 "ACTA\"><abbr title=\"Anti-Counterfeiting Trade Agreement (Sahtecilik 
Karşıtı "
@@ -311,7 +419,7 @@
 "\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac";
 "\">FLAC</a> (10,1MB) şeklinde mevcuttur."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The <strong>ecantorix</strong> program, a singing synthesis frontend for "
 "espeak, released under the GPLv3+, features the <a href=\"/music/free-"
@@ -321,7 +429,7 @@
 "<strong>ecantorix</strong> programı, <a href=\"/music/free-software-song-"
 "ecantorix.ogg\">örnek çıktı olarak Özgür Yazılım Şarkısı</a>'nı 
içerir."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\"> Yet another version from Wikimedia Commons</a> (967kB) is licensed "
@@ -331,22 +439,34 @@
 "ogg\">Wikimedia Commons'tan bir başka sürüm</a> (967kB) CC0 altında "
 "lisanslanmıştır."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
+#| "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered "
+#| "by Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/";
+#| "about/\">WTFPL</a>."
 msgid ""
 "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by "
 "Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/about/";
-"\">WTFPL</a>."
+"\"> WTFPL</a>."
 msgstr ""
 "Bir <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> Kalimba sürümü</a> (Ogg Vorbis biçimi, 690kB), Vaba &lt;"
 "vaba@riseup.net&gt; tarafından <a href=\"http://www.wtfpl.net/about/";
 "\">WTFPL</a> altında sunulmaktadır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> "
+#| "of the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. "
+#| "The LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the "
+#| "typeset score is also available."
 msgid ""
 "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> of "
-"the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. The "
+"the song made with <a href=\"https://lilypond.org/\";>GNU LilyPond</a>. The "
 "LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the typeset "
 "score is also available."
 msgstr ""
@@ -355,13 +475,19 @@
 "edinebilirsiniz. Yazı dizgisi sonucu için LilyPond <a href=\"/music/free-"
 "software-song.ly\">kaynağı</a> da mevcuttur."
 
-#. type: Content of: <h4>
-msgid "&ldquo;Sadi moma bela loza&rdquo;"
-msgstr "&ldquo;Sadi moma bela loza&rdquo;"
+#. type: Content of: <div><h4>
+msgid "<cite>Sadi moma bela loza</cite>"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+#| "Bulgarian dance tune, in an ad-hoc form of notation using letters for "
+#| "notes. A dash means the previous note continues. There are seven beats "
+#| "per measure, thus seven characters in each group."
 msgid ""
-"Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+"Here is a description of the tune of <cite>Sadi moma bela loza</cite>, a "
 "Bulgarian dance tune, in an ad-hoc form of notation using letters for notes. "
 "A dash means the previous note continues. There are seven beats per measure, "
 "thus seven characters in each group."
@@ -371,7 +497,7 @@
 "önceki notanın sürdüğü anlamına gelir. Ölçü başına yedi vuruş 
vardır, bu "
 "nedenle her grupta yedi karakter vardır."
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
@@ -380,16 +506,18 @@
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is also available as an <a href=\"/music/sadi-moma.abc\">ABC file</a>."
 msgstr "<a href=\"/music/sadi-moma.abc\">ABC dosyası</a> olarak da mevcuttur."
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Lisanslama"
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Disclaimer"
+msgid "Disclaimer"
+msgstr "Sorumluluk Reddi"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Richard Stallman and the Free Software Foundation claim no copyright on this "
 "song."
@@ -423,14 +551,19 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "
@@ -444,9 +577,13 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#| "2014, 2015, 2016, 2017, 2018 Richard Stallman"
 msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018 Richard Stallman"
+"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018, 2021 Richard "
+"Stallman"
 msgstr ""
 "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
 "2015, 2016, 2017, 2018 Richard Stallman"
@@ -476,10 +613,18 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
-msgstr ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgid "by Richard Stallman"
+#~ msgstr "yazan Richard Stallman"
+
+#~ msgid "&ldquo;Sadi moma bela loza&rdquo;"
+#~ msgstr "&ldquo;Sadi moma bela loza&rdquo;"
+
+#~ msgid "Licensing"
+#~ msgstr "Lisanslama"
+
+#~ msgid ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"

Index: music/po/free-software-song.zh-cn.po
===================================================================
RCS file: /web/www/www/music/po/free-software-song.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- music/po/free-software-song.zh-cn.po        12 Jul 2021 16:55:33 -0000      
1.5
+++ music/po/free-software-song.zh-cn.po        12 Jul 2021 17:02:30 -0000      
1.6
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-software-song.html\n"
-"POT-Creation-Date: 2018-10-28 07:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2018-10-28 18:11+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -15,84 +15,115 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "The Free Software Song - 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>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "The Free Software Song"
 msgstr "自由软件之歌"
 
-#. type: Content of: <p>
-msgid "by Richard Stallman"
-msgstr "Richard Stallman 作"
+# type: Content of: <p>
+#. type: Content of: <div><address>
+#, fuzzy
+#| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
+msgstr "<a href=\"http://www.stallman.org/\";>理查德·斯托曼</a> 著"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "You can read the story of <a href=\"/music/writing-fs-song.html\">the "
 "writing of the song</a>, too."
 msgstr "也请阅读<a 
href=\"/music/writing-fs-song.html\">创作这首歌的故事</a>。"
 
 #.  :] 
-#. type: Content of: <p>
-msgid ""
-"The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody of "
-"the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma\">Sadi "
-"moma bela loza</a>&rdquo;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody "
+#| "of the Bulgarian folk song &ldquo;<a href=\"#SadiMoma\" id=\"REFSadiMoma"
+#| "\">Sadi moma bela loza</a>&rdquo;"
+msgid ""
+"The lyrics of the <cite>Free Software Song</cite> are sung to the melody of "
+"the Bulgarian folk song <a href=\"#SadiMoma\" id=\"REFSadiMoma\"><cite>Sadi "
+"moma bela loza</cite></a>"
 msgstr ""
 "&ldquo;自由软件之歌&rdquo;的歌词按照保加利亚民歌&ldquo;<a 
href=\"#SadiMoma\" "
 "id=\"REFSadiMoma\">Sadi moma bela loza</a>&rdquo;的旋律来唱。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Join us now and share the software;"
 msgstr "加入我们并分享软件;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+#| "\">hackers</a>, you'll be free."
 msgid ""
-"You'll be free, <a href=\"http://stallman.org/articles/on-hacking.html";
+"You'll be free, <a href=\"https://stallman.org/articles/on-hacking.html";
 "\">hackers</a>, you'll be free."
 msgstr ""
 "为自由,<a 
href=\"http://stallman.org/articles/on-hacking.html\";>黑客们</a>,"
 "为自由。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You'll be free, hackers, you'll be free."
 msgstr "为自由,黑客们,为自由。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Hoarders can get piles of money,"
 msgstr "贪婪的人有很多的金钱,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That is true, hackers, that is true."
 msgstr "是这样,黑客们,是这样。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But they cannot help their neighbors;"
 msgstr "但不能帮助他们的同行;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "That's not good, hackers, that's not good."
 msgstr "这不好,黑客们,这不好。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "When we have enough free software"
 msgstr "要有了足够自由的软件,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "At our call, hackers, at our call,"
 msgstr "齐呼唤,黑客们,齐呼唤,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We'll kick out those dirty licenses"
 msgstr "我们抛弃那些肮脏的证书。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Ever more, hackers, ever more."
 msgstr "到永远,黑客们,到永远。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This song is in a rhythm of 7/8; those unaccustomed to odd rhythms often "
 "take the unevenness to be a mistake. The meter can be analyzed into three "
@@ -106,26 +137,32 @@
 "被拖长,因
而有些音乐家认为此歌曲是3-2-3的节奏;不过,Yves 
Moreau,作为采集和"
 "教授该舞曲的艺术家,支持7拍的节奏。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Downloads"
 msgstr "下载"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Performances"
 msgstr "演唱"
 
-#. type: Content of: <ul><li>
-msgid ""
-"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this song, "
-"also available in <a href=\"/music/free-software-song.ogg\">Ogg Vorbis "
-"format</a>."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+#| "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> singing this "
+#| "song, also available in <a href=\"/music/free-software-song.ogg\">Ogg "
+#| "Vorbis format</a>."
+msgid ""
+"A <a href=\"/music/free-software-song.au\">recording (.au format)</a> of "
+"Richard Stallman singing this song, also available in <a href=\"/music/free-"
+"software-song.ogg\">Ogg Vorbis format</a>. (If you are not used to a meter "
+"of 7/8, you may perceive it as inability to keep time.)"
 msgstr ""
 "<a href=\"http://www.stallman.org/\";>Richard 
Stallman</a>演唱这首歌曲的<a "
 "href=\"/music/free-software-song.au\">录音(.au格式)</a>,还有<a 
href=\"/"
 "music/free-software-song.ogg\">Ogg Vorbis格式</a>。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A <a href=\"/music/FreeSWSong.ogg\">recording (.ogg)</a> of the piece "
 "accompanied by Bulgarian instruments played in traditional style."
@@ -133,40 +170,56 @@
 "使用保加利亚乐器用传统方式伴奏此歌的<a 
href=\"/music/FreeSWSong.ogg\">录音(."
 "ogg格式)</a>。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"http://audio-video.gnu.org/video/";
+#| "stallman_free_software_song_320x240.ogv\">video of RMS performing the "
+#| "song (ogg)</a>, released under GFDLv1.3+ by the videographer, Julian "
+#| "Coccia."
 msgid ""
-"A <a href=\"http://audio-video.gnu.org/video/";
-"stallman_free_software_song_320x240.ogv\">video of RMS performing the song "
+"A <a href=\"https://audio-video.gnu.org/video/";
+"stallman_free_software_song_320x240.ogv\"> video of RMS performing the song "
 "(ogg)</a>, released under GFDLv1.3+ by the videographer, Julian Coccia."
 msgstr ""
 "<a href=\"http://audio-video.gnu.org/video/";
 
"stallman_free_software_song_320x240.ogv\">RMS演唱此歌(ogg)的视频</a>,由摄"
 "像师Julian Coccia按照GFDLv1.3+发布。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> "
+#| "of Katie Herzog performing the Free Software Song, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgid ""
 "A <a href=\"/music/free-software-song-herzog.ogg\">recording (.ogg)</a> of "
 "Katie Herzog performing the Free Software Song, released under <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
+"\"https://creativecommons.org/licenses/by-nc-nd/3.0/\";>CC BY-NC-ND</a>."
 msgstr ""
 "Katie Herzog演唱自由软件之歌的<a 
href=\"/music/free-software-song-herzog.ogg"
 "\">录音(.ogg)</a>,按照<a 
href=\"http://creativecommons.org/licenses/by-nc-";
 "nd/3.0/\">CC BY-NC-ND</a>发布。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Alternate versions"
 msgstr "其他版本"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
-"\">Another song</a>, inspired by this one but mostly different, sung by the "
-"band Fenster (4.5M)."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+#| "\">Another song</a>, inspired by this one but mostly different, sung by "
+#| "the band Fenster (4.5M)."
+msgid ""
+"<a href=\"https://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";
+"\"> Another song</a>, inspired by this one but mostly different, sung by the "
+"band Fenster (4.5MB)."
 msgstr ""
 "受此歌启发但完全不同的<a 
href=\"http://audio-video.gnu.org/audio/Fenster-";
 
"Free-Software-Song.ogg\">另一首歌</a>,由Fenster乐队演唱(4.5M)。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "A rhythmic version of free software song in <a href=\"/music/free-software-"
 "song-rhythmic.ogg\">Ogg Vorbis</a> format by Thor."
@@ -174,70 +227,107 @@
 "由Thor演绎的自由软件之歌的旋律,<a 
href=\"/music/free-software-song-rhythmic."
 "ogg\">Ogg Vorbis</a>格式。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "An improvised piano version by Markus Haist in <a href=\"/music/"
+#| "markushaist-free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), "
+#| "released under <a href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgid ""
 "An improvised piano version by Markus Haist in <a href=\"/music/markushaist-"
-"free-software-song.ogg\">Ogg Vorbis</a> format (1.2 MB), released under <a "
+"free-software-song.ogg\">Ogg Vorbis</a> format (1.2MB), released under <a "
 "href=\"/licenses/gpl-3.0.html\">GPLv3</a>."
 msgstr ""
 "由Markus Haist演绎的即兴钢琴版,<a 
href=\"/music/markushaist-free-software-"
 "song.ogg\">Ogg Vorbis</a>格式(1.2 MB),按照<a 
href=\"/licenses/gpl-3.0.html"
 "\">GPLv3</a>发布。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-"
+#| "and-hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
 msgid ""
 "Another rock-like version by Pjj &amp; Hairyone in <a href=\"/music/pjj-and-"
-"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6 MB)."
+"hairyone-freesoftwaresong.ogg\">Ogg Vorbis</a> format (1.6MB)."
 msgstr ""
 "由Pjj &amp; Hairyone表演的摇滚版,<a href=\"/music/pjj-and-hairyone-"
 "freesoftwaresong.ogg\">Ogg Vorbis</a>格式(1.6 MB)。"
 
-#. type: Content of: <ul><li>
-msgid ""
-"A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
-"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a> "
-"format (1.7 MB)."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A Spanish punk variant by ALEC in <a href=\"http://www.pc-freak.net/files/";
+#| "free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</"
+#| "a> format (1.7 MB)."
+msgid ""
+"A Spanish punk variant by ALEC in <a href=\"https://www.pc-freak.net/files/";
+"free-software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\"> Ogg Vorbis</a> "
+"format (1.7MB)."
 msgstr ""
 "由ALEC演绎的西班牙朋克摇滚版,<a 
href=\"http://www.pc-freak.net/files/free-";
 "software-songs/Free_Software_Song_en_espa%c3%b1ol.ogv\">Ogg Vorbis</a>格式"
 "(1.7 MB)。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A version with a different structure in <a href=\"/music/freesoft.ogg\"> "
+#| "Ogg Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode\";>CC-BY-NC-"
+#| "SA</a>."
 msgid ""
 "A version with a different structure in <a href=\"/music/freesoft.ogg\"> Ogg "
-"Vorbis</a> format (3.7 MB) by Robert Kay, released under <a href=\"http://";
-"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\">CC-BY-NC-SA</a>."
+"Vorbis</a> format (3.7MB) by Robert Kay, released under <a href=\"https://";
+"creativecommons.org/licenses/by-nc-sa/3.0/legalcode\"> CC-BY-NC-SA</a>."
 msgstr ""
 "由Robert Kay演绎的不同结构版,<a href=\"/music/freesoft.ogg\">Ogg 
Vorbis</a>"
 "格式(3.7 MB),按照<a 
href=\"http://creativecommons.org/licenses/by-nc-";
 "sa/3.0/legalcode\">CC-BY-NC-SA</a>发布。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
+#| "\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgid ""
-"A version by the band Zweitgolf: <a href=\"free_software_song_sunnata.ogg"
-"\">free_software_song_sunnata.ogg</a>, released under the GPL"
+"A version by the band Zweitgolf: <a href=\"/music/free_software_song_sunnata."
+"ogg\">free_software_song_sunnata.ogg</a>, released under the GPL"
 msgstr ""
 "由Zweitgolf乐队演唱的版本,<a href=\"free_software_song_sunnata.ogg"
 "\">free_software_song_sunnata.ogg</a>,按照GPL发布。"
 
-#. type: Content of: <ul><li>
-msgid ""
-"Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.net/";
-"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a> "
-"format (3.9 MB), released under <a href=\"http://creativecommons.org/";
-"licenses/by-sa/2.0/\"> CC BY-SA</a>."
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Here is a metal version by Jono Bacon in <a href=\"http://www.pc-freak.";
+#| "net/files/free-software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg "
+#| "Vorbis</a> format (3.9 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by-sa/2.0/\"> CC BY-SA</a>."
+msgid ""
+"Here is a metal version by Jono Bacon in <a href=\"https://www.pc-freak.net/";
+"files/free-software-songs/jonobacon-freesoftwaresong2.ogg\"> Ogg Vorbis</a> "
+"format (3.9MB), released under <a href=\"https://creativecommons.org/";
+"licenses/by-sa/2.0/\">CC BY-SA</a>."
 msgstr ""
 "由Jono Bacon演唱的金属摇滚版,<a 
href=\"http://www.pc-freak.net/files/free-";
 "software-songs/jonobacon-freesoftwaresong2.ogg\">Ogg Vorbis</a>格式(3.9 "
 "MB),按照<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\";>CC 
BY-"
 "SA</a>发布。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "This rock/metal version is put out by <a href=\"https://web.archive.org/";
+#| "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</"
+#| "a> available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg "
+#| "Vorbis</a> format (2.2 MB), released under <a href=\"http://";
+#| "creativecommons.org/licenses/by/3.0/\">CC BY</a>."
 msgid ""
 "This rock/metal version is put out by <a href=\"https://web.archive.org/";
 "web/20150719082345/http://freesoftwaresong.altervista.org/\";> Loneload</a> "
-"available in <a href=\"/music/loneload-free-software-song.ogg\">Ogg Vorbis</"
-"a> format (2.2 MB), released under <a href=\"http://creativecommons.org/";
+"available in <a href=\"/music/loneload-free-software-song.ogg\"> Ogg Vorbis</"
+"a> format (2.2MB), released under <a href=\"https://creativecommons.org/";
 "licenses/by/3.0/\">CC BY</a>."
 msgstr ""
 "由<a href=\"https://web.archive.org/web/20150719082345/http://";
@@ -245,14 +335,22 @@
 "music/loneload-free-software-song.ogg\">Ogg Vorbis</a>格式(2.2 
MB),按照<a "
 "href=\"http://creativecommons.org/licenses/by/3.0/\";>CC BY</a>发布。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+#| "posters on the 4chan technology image board /g/ is licensed under the <a "
+#| "href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+#| "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
+#| "href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+#| "Video</a> format (4.5 MB)."
 msgid ""
-"<a href=\"http://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
+"<a href=\"https://archive.org/details/M00GNU\";>MooGNU</a> by the anonymous "
 "posters on the 4chan technology image board /g/ is licensed under the <a "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
+"href=\"https://creativecommons.org/licenses/by-sa/3.0/legalcode\";>Creative "
 "Commons Attribution-ShareAlike 3.0 Unported License</a>.  Available in <a "
-"href=\"http://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
-"Video</a> format (4.5 MB)."
+"href=\"https://archive.org/download/M00GNU/Freedom-catmoognu.ogv\";> Ogg "
+"Video</a> format (4.5MB)."
 msgstr ""
 "由匿名者发布在4chan技术镜像版面/g/的<a 
href=\"http://archive.org/details/";
 "M00GNU\">MooGNU</a>,按照<a href=\"http://creativecommons.org/licenses/by-";
@@ -260,15 +358,26 @@
 "License</a>发布,<a href=\"http://archive.org/download/M00GNU/Freedom-";
 "catmoognu.ogv\">Ogg Video</a>格式(4.5 MB)。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
+#| "Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
+#| "net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
+#| "download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> "
+#| "(2.3MB), or in <a href=\"http://archive.org/download/Sebkha-";
+#| "Chott_FSFSongIsHip_2012/SC_FSF.flac\">FLAC</a> (10.1MB), under the <a "
+#| "href=\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">Free Art "
+#| "License, version 1.3</a>."
 msgid ""
 "In 2012, the band Sebkha-Chott released a <em>matricide</em> of the Free "
-"Software Song to celebrate the death of <a href=\"http://www.laquadrature.";
-"net/en/ACTA\">ACTA</a>. It's available in <a href=\"http://archive.org/";
-"download/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\">Ogg Vorbis</a> (2.3MB), "
-"or in <a href=\"http://archive.org/download/Sebkha-Chott_FSFSongIsHip_2012/";
-"SC_FSF.flac\">FLAC</a> (10.1MB), under the <a href=\"//directory.fsf.org/"
-"wiki/License:Free-Art-L-v1.3\">Free Art License, version 1.3</a>."
+"Software Song to celebrate the death of <a href=\"https://www.laquadrature.";
+"net/en/ACTA\">ACTA</a>. It's available in <a href=\"https://ia800207.us.";
+"archive.org/14/items/Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.ogg\"> Ogg "
+"Vorbis</a> (2.3MB), or in <a href=\"https://ia800207.us.archive.org/14/items/";
+"Sebkha-Chott_FSFSongIsHip_2012/SC_FSF.flac\"> FLAC</a> (10.1MB), under the "
+"<a href=\"https://directory.fsf.org/wiki/License:Free-Art-L-v1.3\";>Free Art "
+"License, version 1.3</a>."
 msgstr ""
 "在2012年,Sebkha-Chott乐队为庆祝<a 
href=\"http://www.laquadrature.net/en/ACTA";
 "\">ACTA</a>之死而发布的自由软件之歌的<em>弑母</em>版,<a 
href=\"http://";
@@ -278,7 +387,7 @@
 
"\"//directory.fsf.org/wiki/License:Free-Art-L-v1.3\">自由艺术许可证,版本"
 "1.3</a>发布。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "The <strong>ecantorix</strong> program, a singing synthesis frontend for "
 "espeak, released under the GPLv3+, features the <a href=\"/music/free-"
@@ -288,7 +397,7 @@
 "布,其特点是用<a 
href=\"/music/free-software-song-ecantorix.ogg\">自由软件之"
 "歌作为范例</a>。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\"> Yet another version from Wikimedia Commons</a> (967kB) is licensed "
@@ -297,22 +406,34 @@
 "<a href=\"https://commons.wikimedia.org/wiki/File%3AFreesoftwaresong_126_mix.";
 "ogg\">另一个来自Wikimedia Commons</a>的版本(967kB),按ç…
§CC0发布。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
+#| "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered "
+#| "by Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/";
+#| "about/\">WTFPL</a>."
 msgid ""
 "A <a href=\"https://anonfile.com/93uaA2j5b1/freesoftwaresong_organ-";
 "kalimba_ogg\"> Kalimba version</a> (Ogg Vorbis format, 690kB) is offered by "
 "Vaba &lt;vaba@riseup.net&gt; under the <a href=\"http://www.wtfpl.net/about/";
-"\">WTFPL</a>."
+"\"> WTFPL</a>."
 msgstr ""
 "一个由Vaba &lt;vaba@riseup.net&gt;提供的<a href=\"https://anonfile.";
 "com/93uaA2j5b1/freesoftwaresong_organ-kalimba_ogg\">Kalimba版本</a>(Ogg "
 "Vorbis格式,690kB),按照<a 
href=\"http://www.wtfpl.net/about/\";>WTFPL</a>发"
 "布。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> "
+#| "of the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. "
+#| "The LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the "
+#| "typeset score is also available."
 msgid ""
 "You can get a <a href=\"/music/free-software-song.pdf\">typeset score</a> of "
-"the song made with <a href=\"http://lilypond.org\";>GNU LilyPond</a>. The "
+"the song made with <a href=\"https://lilypond.org/\";>GNU LilyPond</a>. The "
 "LilyPond <a href=\"/music/free-software-song.ly\">source</a> for the typeset "
 "score is also available."
 msgstr ""
@@ -320,13 +441,19 @@
 "的<a 
href=\"/music/free-software-song.pdf\">乐谱</a>,以及该乐谱的LilyPond<a
 "
 "href=\"/music/free-software-song.ly\">源代码</a>。"
 
-#. type: Content of: <h4>
-msgid "&ldquo;Sadi moma bela loza&rdquo;"
-msgstr "&ldquo;Sadi moma bela loza&rdquo;"
+#. type: Content of: <div><h4>
+msgid "<cite>Sadi moma bela loza</cite>"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+#| "Bulgarian dance tune, in an ad-hoc form of notation using letters for "
+#| "notes. A dash means the previous note continues. There are seven beats "
+#| "per measure, thus seven characters in each group."
 msgid ""
-"Here is a description of the tune of &ldquo;Sadi moma bela loza,&rdquo; a "
+"Here is a description of the tune of <cite>Sadi moma bela loza</cite>, a "
 "Bulgarian dance tune, in an ad-hoc form of notation using letters for notes. "
 "A dash means the previous note continues. There are seven beats per measure, "
 "thus seven characters in each group."
@@ -335,7 +462,7 @@
 "字母表示音符的形式展示。ç 
´æŠ˜å·è¡¨ç¤ºå»¶ç»­å‰ä¸€ä¸ªéŸ³ç¬¦ã€‚每节有7个节拍,所以每组有7"
 "个字母。"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
@@ -344,16 +471,18 @@
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---\n"
 "    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is also available as an <a href=\"/music/sadi-moma.abc\">ABC file</a>."
 msgstr "它还有<a href=\"/music/sadi-moma.abc\">ABC格式的文件</a>。"
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "许可证"
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Disclaimer"
+msgid "Disclaimer"
+msgstr "免责声明"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Richard Stallman and the Free Software Foundation claim no copyright on this "
 "song."
@@ -377,9 +506,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -387,23 +514,32 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
-"翻译须知</a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#| "2014, 2015, 2016, 2017, 2018 Richard Stallman"
 msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018 Richard Stallman"
+"Copyright &copy; 1993, 2001-2006, 2010, 2011, 2014-2018, 2021 Richard "
+"Stallman"
 msgstr ""
 "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
 "2015, 2016, 2017, 2018 Richard Stallman"
@@ -431,10 +567,29 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
-msgstr ""
-"Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, 2014, "
-"2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgid "by Richard Stallman"
+#~ msgstr "Richard Stallman 作"
+
+#~ msgid "&ldquo;Sadi moma bela loza&rdquo;"
+#~ msgstr "&ldquo;Sadi moma bela loza&rdquo;"
+
+#~ msgid "Licensing"
+#~ msgstr "许可证"
+
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html"
+#~ "\">翻译须知</a>。"
+
+#~ msgid ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011, "
+#~ "2014, 2015, 2016, 2017, 2018, 2021 Richard Stallman"

Index: music/po/gdb-song.de.po
===================================================================
RCS file: /web/www/www/music/po/gdb-song.de.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- music/po/gdb-song.de.po     2 Jun 2021 09:00:27 -0000       1.34
+++ music/po/gdb-song.de.po     12 Jul 2021 17:02:30 -0000      1.35
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gdb-song.html\n"
-"POT-Creation-Date: 2021-04-18 10:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,11 +15,40 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "The GDB Song - GNU Project - Free Software Foundation"
 msgstr "GDB-Lied - GNU-Projekt - Free Software Foundation"
 
+#. type: Content of: <style>
+#, no-wrap
+msgid ""
+".chorus { font-style: normal; color: #6b3699; }\n"
+".imgright { margin-top: -5em; }\n"
+"@media (max-width: 35em) { .imgright { display: none; }}\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-Startseite"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
 #. type: Content of: <div><h2>
 msgid "The GDB Song"
 msgstr "GDB-Lied "
@@ -37,106 +66,114 @@
 msgstr "</a>"
 
 #. type: Content of: <div><address>
-msgid "with thanks to Joel Bion, Mark Baushke, and Lynn Slater"
+# | [-with thanks to Joel Bion, Mark Baushke,-]{+by Joel&nbsp;Bion,
+# | Mark&nbsp;Baushke,+} and [-Lynn Slater-] {+Lynn&nbsp;Slater+}
+#, fuzzy
+#| msgid "with thanks to Joel Bion, Mark Baushke, and Lynn Slater"
+msgid "by Joel&nbsp;Bion, Mark&nbsp;Baushke, and Lynn&nbsp;Slater"
 msgstr "mit Dank an Joel Bion, Mark Baushke und Lynn Slater."
 
 #. type: Content of: <div><p>
+# | Somebody asked us what was GDB. With apologies to [-Oscar
+# | Hammerstein&nbsp;II, Richard Rodgers,-] {+Oscar&nbsp;Hammerstein&nbsp;II,
+# | Richard&nbsp;Rodgers,+} and [-Julie Andrews,-] {+Julie&nbsp;Andrews,+} we
+# | offered the following reply:
+#, fuzzy
+#| msgid ""
+#| "Somebody asked us what was GDB. With apologies to Oscar Hammerstein&nbsp;"
+#| "II, Richard Rodgers, and Julie Andrews, we offered the following reply:"
 msgid ""
-"published earlier in <a href=\"/bulletins/bull4.html#SEC11\">GNU's Bulletin "
-"No. 4</a>."
-msgstr ""
-"zuvor veröffentlicht im <cite><a href=\"/bulletins/bull4.html#SEC11\" "
-"hreflang=\"en\">GNU Bulletin Nr. 4</a></cite>."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"Somebody asked us what was GDB. With apologies to Oscar Hammerstein&nbsp;II, "
-"Richard Rodgers, and Julie Andrews, we offered the following reply:"
+"Somebody asked us what was GDB. With apologies to Oscar&nbsp;"
+"Hammerstein&nbsp;II, Richard&nbsp;Rodgers, and Julie&nbsp;Andrews, we "
+"offered the following reply:"
 msgstr ""
 "Jemand fragte uns, was GDB war. Stellvertretend für Oscar Hammerstein II, "
 "Richard Rodgers und Julie Andrews boten wir folgende  Antwort an:"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "Let's start at the very beginning, a very good place to start,"
 msgstr "Let's start at the very beginning, a very good place to start,"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "When you're learning to sing, its Do, Re, Mi;"
 msgstr "When you're learning to sing, its Do, Re, Mi;"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "When you're learning to code, its G, D, B."
 msgstr "When you're learning to code, its G, D, B."
 
-#. type: Content of: <div><div><div><p>
-msgid "(background) G, D, B."
+#. type: Content of: <div><div><p>
+# | [-(background)-]{+<span class=\"chorus\">(background)</span>+} G, D, B.
+#, fuzzy
+#| msgid "(background) G, D, B."
+msgid "<span class=\"chorus\">(background)</span> G, D, B."
 msgstr "(background) G, D, B."
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "The first three letters just happen to be, G, D, B."
 msgstr "The first three letters just happen to be, G, D, B."
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "(Chorus)"
 msgstr "(Chorus)"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "G!,"
 msgstr "G!,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "GNU!, it's Stallman's hope,"
 msgstr "GNU!, it's Stallman's hope,"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "D,"
 msgstr "D,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "debug that rotten code,"
 msgstr "debug that rotten code,"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "B,"
 msgstr "B,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a break I set myself."
 msgstr "a break I set myself."
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Run,"
 msgstr "Run,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a far, far way to go."
 msgstr "a far, far way to go."
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Print,"
 msgstr "Print,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "to see what you have done,"
 msgstr "to see what you have done,"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Set,"
 msgstr "Set,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a patch that follows print."
 msgstr "a patch that follows print."
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Quit,"
 msgstr "Quit,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "and recompile your code - - -"
 msgstr "and recompile your code - - -"
 
-#. type: Content of: <div><div><div><pre>
+#. type: Content of: <div><div><pre>
 #, no-wrap
 msgid ""
 "That will bring it back to G,\n"
@@ -149,36 +186,20 @@
 "                                 B,\n"
 "                                    &lt;link&gt;"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "(Resume from the Chorus)"
 msgstr "(Resume from the Chorus)"
 
-# TODO: please check.
-#. type: Content of: <div><p>
-msgid ""
-"Other songs, poems and jokes in the <a href=\"/fun/humor.html\">GNU Humor "
-"Collection</a>"
-msgstr ""
-"Weitere Lieder, Gedichte und Witze in <a href=\"/fun/humor\">GNUs Humor-"
-"Sammlung</a>."
-
 #. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Haftungsausschluss"
 
 #. type: Content of: <div><div><p>
 msgid ""
-"The song on this page was originally obtained from the FSF's email archives "
-"of the GNU Project."
+"These lyrics were first published in <a href=\"/bulletins/bull4."
+"html#SEC11\"> GNU's Bulletin No. 4</a> (1988). Neither the authors nor the "
+"Free Software Foundation claim copyright on them."
 msgstr ""
-"Das Lied wurde den <a href=\"//lists.gnu.org/\">E-Mail-Archiven</a> des GNU-"
-"Projekts der FSF entnommen."
-
-#. type: Content of: <div><div><p>
-msgid "The Free Software Foundation claims no copyright on this work."
-msgstr ""
-"Die Free Software Foundation erhebt kein Copyright auf dieses Werk bzw. "
-"Inhalt."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -207,7 +228,7 @@
 #.         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>. 
@@ -239,6 +260,26 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid ""
+#~ "published earlier in <a href=\"/bulletins/bull4.html#SEC11\">GNU's "
+#~ "Bulletin No. 4</a>."
+#~ msgstr ""
+#~ "zuvor veröffentlicht im <cite><a href=\"/bulletins/bull4.html#SEC11\" "
+#~ "hreflang=\"en\">GNU Bulletin Nr. 4</a></cite>."
+
+# TODO: please check.
+#~ msgid ""
+#~ "Other songs, poems and jokes in the <a href=\"/fun/humor.html\">GNU Humor "
+#~ "Collection</a>"
+#~ msgstr ""
+#~ "Weitere Lieder, Gedichte und Witze in <a href=\"/fun/humor\">GNUs Humor-"
+#~ "Sammlung</a>."
+
+#~ msgid "The Free Software Foundation claims no copyright on this work."
+#~ msgstr ""
+#~ "Die Free Software Foundation erhebt kein Copyright auf dieses Werk bzw. "
+#~ "Inhalt."
+
 #~ msgid "Licensing"
 #~ msgstr "Lizenzierung"
 

Index: music/po/gdb-song.fr.po
===================================================================
RCS file: /web/www/www/music/po/gdb-song.fr.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- music/po/gdb-song.fr.po     31 May 2021 21:09:09 -0000      1.22
+++ music/po/gdb-song.fr.po     12 Jul 2021 17:02:30 -0000      1.23
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gdb-song.html\n"
-"POT-Creation-Date: 2021-04-18 10:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2021-04-18 13:12+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.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-12 16:56+0000\n"
 "X-Generator: Gtranslator 2.91.5\n"
 "Plural-Forms: \n"
 
@@ -22,6 +23,28 @@
 msgid "The GDB Song - GNU Project - Free Software Foundation"
 msgstr "La chanson de GDB - Projet GNU - Free Software Foundation"
 
+#. type: Content of: <style>
+#, no-wrap
+msgid ""
+".chorus { font-style: normal; color: #6b3699; }\n"
+".imgright { margin-top: -5em; }\n"
+"@media (max-width: 35em) { .imgright { display: none; }}\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
 #. type: Content of: <div><h2>
 msgid "The GDB Song"
 msgstr "La chanson de GDB"
@@ -39,108 +62,116 @@
 msgstr "</a>"
 
 #. type: Content of: <div><address>
-msgid "with thanks to Joel Bion, Mark Baushke, and Lynn Slater"
+# | [-with thanks to Joel Bion, Mark Baushke,-]{+by Joel&nbsp;Bion,
+# | Mark&nbsp;Baushke,+} and [-Lynn Slater-] {+Lynn&nbsp;Slater+}
+#, fuzzy
+#| msgid "with thanks to Joel Bion, Mark Baushke, and Lynn Slater"
+msgid "by Joel&nbsp;Bion, Mark&nbsp;Baushke, and Lynn&nbsp;Slater"
 msgstr "Avec nos remerciements à Joel Bion, Mark Baushke, et Lynn Slater"
 
-#. type: Content of: <div><p>
-msgid ""
-"published earlier in <a href=\"/bulletins/bull4.html#SEC11\">GNU's Bulletin "
-"No. 4</a>."
-msgstr ""
-"Publié précédemment dans le <a href=\"/bulletins/bull4.html#SEC11\">GNU's "
-"Bulletin N° 4</a>."
-
 # SEC11">Bulletin du GNU"
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Somebody asked us what was GDB. With apologies to [-Oscar
+# | Hammerstein&nbsp;II, Richard Rodgers,-] {+Oscar&nbsp;Hammerstein&nbsp;II,
+# | Richard&nbsp;Rodgers,+} and [-Julie Andrews,-] {+Julie&nbsp;Andrews,+} we
+# | offered the following reply:
+#, fuzzy
+#| msgid ""
+#| "Somebody asked us what was GDB. With apologies to Oscar Hammerstein&nbsp;"
+#| "II, Richard Rodgers, and Julie Andrews, we offered the following reply:"
 msgid ""
-"Somebody asked us what was GDB. With apologies to Oscar Hammerstein&nbsp;II, "
-"Richard Rodgers, and Julie Andrews, we offered the following reply:"
+"Somebody asked us what was GDB. With apologies to Oscar&nbsp;"
+"Hammerstein&nbsp;II, Richard&nbsp;Rodgers, and Julie&nbsp;Andrews, we "
+"offered the following reply:"
 msgstr ""
 "Quelqu'un nous a demandé ce qu'était GDB. Avec nos excuses à Oscar "
 "Hammerstein II, Richard Rodgers et Julie Andrews, nous lui avons donné la "
 "réponse suivante :"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "Let's start at the very beginning, a very good place to start,"
 msgstr "Commençons par le tout début, un très bon point pour commencer,"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "When you're learning to sing, its Do, Re, Mi;"
 msgstr "Quand vous apprenez à chanter, c'est do, ré, mi ;"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "When you're learning to code, its G, D, B."
 msgstr "quand vous apprenez à coder, c'est G, D, B."
 
-#. type: Content of: <div><div><div><p>
-msgid "(background) G, D, B."
+#. type: Content of: <div><div><p>
+# | [-(background)-]{+<span class=\"chorus\">(background)</span>+} G, D, B.
+#, fuzzy
+#| msgid "(background) G, D, B."
+msgid "<span class=\"chorus\">(background)</span> G, D, B."
 msgstr "(fond) G, D, B."
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "The first three letters just happen to be, G, D, B."
 msgstr "Les trois premières lettres se trouvent être, G, D, B."
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "(Chorus)"
 msgstr "(Refrain)"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "G!,"
 msgstr "G !"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "GNU!, it's Stallman's hope,"
 msgstr "GNU ! C'est l'espoir de Stallman,"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "D,"
 msgstr "D,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "debug that rotten code,"
 msgstr "déboguons ce code pourri :"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "B,"
 msgstr "B,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a break I set myself."
 msgstr "une pause que je m'accorde."
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Run,"
 msgstr "<code>run</code>,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a far, far way to go."
 msgstr "un long, long chemin à suivre ;"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Print,"
 msgstr "<code>print</code>,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "to see what you have done,"
 msgstr "pour voir ce que vous avez accompli ;"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Set,"
 msgstr "<code>set</code>,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a patch that follows print."
 msgstr "un patch qui suit <code>print</code> ;"
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Quit,"
 msgstr "<code>quit</code>,"
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "and recompile your code - - -"
 msgstr "et recompilez votre code&hellip;"
 
-#. type: Content of: <div><div><div><pre>
+#. type: Content of: <div><div><pre>
 #, no-wrap
 msgid ""
 "That will bring it back to G,\n"
@@ -153,35 +184,20 @@
 "                              B,\n"
 "                                 &lt;link&gt;"
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "(Resume from the Chorus)"
 msgstr "(Reprendre depuis le refrain)"
 
-#. type: Content of: <div><p>
-msgid ""
-"Other songs, poems and jokes in the <a href=\"/fun/humor.html\">GNU Humor "
-"Collection</a>"
-msgstr ""
-"Autres chansons, poèmes et blagues dans la collection d'<a 
href=\"/fun/humor."
-"html\">humour GNU</a>"
-
 #. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Renonciation au copyright"
 
 #. type: Content of: <div><div><p>
 msgid ""
-"The song on this page was originally obtained from the FSF's email archives "
-"of the GNU Project."
+"These lyrics were first published in <a href=\"/bulletins/bull4."
+"html#SEC11\"> GNU's Bulletin No. 4</a> (1988). Neither the authors nor the "
+"Free Software Foundation claim copyright on them."
 msgstr ""
-"La chanson figurant sur cette page provient des archives de courriel du "
-"projet GNU maintenues par la FSF."
-
-#. type: Content of: <div><div><p>
-msgid "The Free Software Foundation claims no copyright on this work."
-msgstr ""
-"La <i>Free Software Foundation</i> ne revendique aucun droit d'auteur sur "
-"cette œuvre."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -209,7 +225,7 @@
 #.         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>. 
@@ -237,3 +253,29 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "published earlier in <a href=\"/bulletins/bull4.html#SEC11\">GNU's "
+#~ "Bulletin No. 4</a>."
+#~ msgstr ""
+#~ "Publié précédemment dans le <a 
href=\"/bulletins/bull4.html#SEC11\">GNU's "
+#~ "Bulletin N° 4</a>."
+
+#~ msgid ""
+#~ "Other songs, poems and jokes in the <a href=\"/fun/humor.html\">GNU Humor "
+#~ "Collection</a>"
+#~ msgstr ""
+#~ "Autres chansons, poèmes et blagues dans la collection d'<a href=\"/fun/"
+#~ "humor.html\">humour GNU</a>"
+
+#~ msgid ""
+#~ "The song on this page was originally obtained from the FSF's email "
+#~ "archives of the GNU Project."
+#~ msgstr ""
+#~ "La chanson figurant sur cette page provient des archives de courriel du "
+#~ "projet GNU maintenues par la FSF."
+
+#~ msgid "The Free Software Foundation claims no copyright on this work."
+#~ msgstr ""
+#~ "La <i>Free Software Foundation</i> ne revendique aucun droit d'auteur sur "
+#~ "cette œuvre."

Index: music/po/gdb-song.pot
===================================================================
RCS file: /web/www/www/music/po/gdb-song.pot,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- music/po/gdb-song.pot       18 Apr 2021 11:03:22 -0000      1.15
+++ music/po/gdb-song.pot       12 Jul 2021 17:02:30 -0000      1.16
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gdb-song.html\n"
-"POT-Creation-Date: 2021-04-18 10:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,6 +20,28 @@
 msgid "The GDB Song - GNU Project - Free Software Foundation"
 msgstr ""
 
+#. type: Content of: <style>
+#, no-wrap
+msgid ""
+".chorus { font-style: normal; color: #6b3699; }\n"
+".imgright { margin-top: -5em; }\n"
+"@media (max-width: 35em) { .imgright { display: none; }}\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
 #. type: Content of: <div><h2>
 msgid "The GDB Song"
 msgstr ""
@@ -37,102 +59,97 @@
 msgstr ""
 
 #. type: Content of: <div><address>
-msgid "with thanks to Joel Bion, Mark Baushke, and Lynn Slater"
+msgid "by Joel&nbsp;Bion, Mark&nbsp;Baushke, and Lynn&nbsp;Slater"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"published earlier in <a href=\"/bulletins/bull4.html#SEC11\">GNU's Bulletin "
-"No. 4</a>."
+"Somebody asked us what was GDB. With apologies to "
+"Oscar&nbsp;Hammerstein&nbsp;II, Richard&nbsp;Rodgers, and "
+"Julie&nbsp;Andrews, we offered the following reply:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-msgid ""
-"Somebody asked us what was GDB. With apologies to Oscar Hammerstein&nbsp;II, "
-"Richard Rodgers, and Julie Andrews, we offered the following reply:"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
 msgid "Let's start at the very beginning, a very good place to start,"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "When you're learning to sing, its Do, Re, Mi;"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "When you're learning to code, its G, D, B."
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-msgid "(background) G, D, B."
+#. type: Content of: <div><div><p>
+msgid "<span class=\"chorus\">(background)</span> G, D, B."
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "The first three letters just happen to be, G, D, B."
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "(Chorus)"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "G!,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "GNU!, it's Stallman's hope,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "D,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "debug that rotten code,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "B,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a break I set myself."
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Run,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a far, far way to go."
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Print,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "to see what you have done,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Set,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "a patch that follows print."
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "Quit,"
 msgstr ""
 
-#. type: Content of: <div><div><div><dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid "and recompile your code - - -"
 msgstr ""
 
-#. type: Content of: <div><div><div><pre>
+#. type: Content of: <div><div><pre>
 #, no-wrap
 msgid ""
 "That will bring it back to G,\n"
@@ -141,28 +158,20 @@
 "                                    &lt;link&gt;"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
+#. type: Content of: <div><div><p>
 msgid "(Resume from the Chorus)"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Other songs, poems and jokes in the <a href=\"/fun/humor.html\">GNU Humor "
-"Collection</a>"
-msgstr ""
-
 #. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 msgid ""
-"The song on this page was originally obtained from the FSF's email archives "
-"of the GNU Project."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-msgid "The Free Software Foundation claims no copyright on this work."
+"These lyrics were first published in <a "
+"href=\"/bulletins/bull4.html#SEC11\"> GNU's Bulletin No. 4</a> "
+"(1988). Neither the authors nor the Free Software Foundation claim copyright "
+"on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -189,7 +198,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>. 

Index: music/po/till_there_was_gnu.de.po
===================================================================
RCS file: /web/www/www/music/po/till_there_was_gnu.de.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- music/po/till_there_was_gnu.de.po   31 May 2021 13:39:51 -0000      1.32
+++ music/po/till_there_was_gnu.de.po   12 Jul 2021 17:02:30 -0000      1.33
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: till_there_was_gnu.html\n"
 "Report-Msgid-Bugs-To: webmasters@gnu.org\n"
-"POT-Creation-Date: 2015-07-19 23:25+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2015-07-23 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -15,101 +15,155 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "'Till There Was GNU - GNU Project - Free Software Foundation"
 msgstr "'Till There Was GNU - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ".chorus { font-style: normal; color: #572385; }\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-Startseite"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "'Till There Was GNU"
 msgstr "'Till There Was GNU"
 
-#. type: Content of: <p>
-msgid "<strong>A Song Performed By Steven R. Champagne</strong>"
-msgstr "von <strong>Steven R. Champagne</strong>"
+#. type: Content of: <div><address>
+# | [-Copyright &copy; 2011-]{+by+} Steven R. Champagne
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Steven R. Champagne"
+msgid "by Steven R. Champagne"
+msgstr "Copyright &copy; 2011 Steven R. Champagne."
 
 #. type: Content of: <div><p>
-msgid "there were applications"
+msgid "Sung to the tune of <cite>'Til There Was You</cite> by Meredith Wilson"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}here were applications{+,+}
+#, fuzzy
+#| msgid "there were applications"
+msgid "There were applications,"
 msgstr "there were applications"
 
-#. type: Content of: <div><p>
-msgid "but I never saw their source code"
+#. type: Content of: <div><div><p>
+# | but I never saw their source code{+.+}
+#, fuzzy
+#| msgid "but I never saw their source code"
+msgid "but I never saw their source code."
 msgstr "but I never saw their source code"
 
-#. type: Content of: <div><p>
-msgid "no I never saw it at all"
+#. type: Content of: <div><div><p>
+# | [-n-]{+N+}o I never saw it at all
+#, fuzzy
+#| msgid "no I never saw it at all"
+msgid "No I never saw it at all"
 msgstr "no I never saw it at all"
 
-#. type: Content of: <div><p>
-msgid "'till there was gnu"
+#. type: Content of: <div><div><p>
+# | 'till there was [-gnu-] {+GNU.+}
+#, fuzzy
+#| msgid "'till there was gnu"
+msgid "'till there was GNU."
 msgstr "'till there was gnu"
 
-#. type: Content of: <div><p>
-msgid "there were profits so high"
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}here were profits so high{+;+}
+#, fuzzy
+#| msgid "there were profits so high"
+msgid "There were profits so high;"
 msgstr "there were profits so high"
 
-#. type: Content of: <div><p>
-msgid "it was all proprietary"
+#. type: Content of: <div><div><p>
+# | it was all proprietary{+,+}
+#, fuzzy
+#| msgid "it was all proprietary"
+msgid "it was all proprietary,"
 msgstr "it was all proprietary"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "all behind a corporate wall"
 msgstr "all behind a corporate wall"
 
-#. type: Content of: <div><p>
-msgid "then there were downloads"
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}hen there were downloads{+,+}
+#, fuzzy
+#| msgid "then there were downloads"
+msgid "Then there were downloads,"
 msgstr "then there were downloads"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and wonderful mail lists"
 msgstr "and wonderful mail lists"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "that informed me"
 msgstr "that informed me"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "with sweet contributions"
 msgstr "with sweet contributions"
 
-#. type: Content of: <div><p>
-msgid "from all, it's true"
+#. type: Content of: <div><div><p>
+# | from all, it's true{+.+}
+#, fuzzy
+#| msgid "from all, it's true"
+msgid "from all, it's true."
 msgstr "from all, it's true"
 
-#. type: Content of: <div><p>
-msgid "there was code all around"
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}here was code all around{+,+}
+#, fuzzy
+#| msgid "there was code all around"
+msgid "There was code all around,"
 msgstr "there was code all around"
 
-#. type: Content of: <div><p>
-msgid "but I never heard of sharing"
+#. type: Content of: <div><div><p>
+# | but I never heard of sharing{+.+}
+#, fuzzy
+#| msgid "but I never heard of sharing"
+msgid "but I never heard of sharing."
 msgstr "but I never heard of sharing"
 
-#. type: Content of: <div><p>
-msgid "no I never heard it at all"
+#. type: Content of: <div><div><p>
+# | [-n-]{+N+}o I never heard it at all
+#, fuzzy
+#| msgid "no I never heard it at all"
+msgid "No I never heard it at all"
 msgstr "no I never heard it at all"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "&lt;instruments&gt;"
 msgstr "&lt;instruments&gt;"
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Lizenzierung"
-
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Steven R. Champagne"
-msgstr "Copyright &copy; 2011 Steven R. Champagne."
-
-#. type: Content of: <p>
-msgid ""
-"'Till There Was GNU by Steven R. Champagne is licensed under a <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative Commons "
-"Attribution-NonCommercial-NoDerivs 3.0 Unported License.</a>"
-msgstr ""
-"<i>'Till There Was GNU</i> von Steven R. Champagne ist lizenziert unter "
-"einer <a href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.de";
-"\">Creative Commons Namensnennung-NichtKommerziell-KeineBearbeitung 3.0 "
-"Unported</a>-Lizenz."
+#. type: Content of: <div><div><p>
+# | 'till there was [-gnu-] {+GNU&hellip;+}
+#, fuzzy
+#| msgid "'till there was gnu"
+msgid "'till there was GNU&hellip;"
+msgstr "'till there was gnu"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -138,14 +192,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. "
@@ -158,19 +218,33 @@
 "Übersetzungen unserer Internetpräsenz finden Sie in der <a href=\"/server/"
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
-# Text moved to #license.
-# The copyright for this _site_ should be at the FSF!
 #. type: Content of: <div><p>
+# | Copyright &copy; 2011 Steven R. Champagne {+(the lyrics)+}
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Steven R. Champagne"
+msgid "Copyright &copy; 2011 Steven R. Champagne (the lyrics)"
+msgstr "Copyright &copy; 2011 Steven R. Champagne."
+
+#. type: Content of: <div><p>
+# | [-'Till There Was GNU by Steven R. Champagne is-]{+The lyrics on this page
+# | are+} licensed under [-a-] {+the+} <a
+# | href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative
+# | Commons Attribution-NonCommercial-NoDerivs 3.0 Unported [-License.</a>-]
+# | {+License</a>.+}
+#, fuzzy
+#| msgid ""
+#| "'Till There Was GNU by Steven R. Champagne is licensed under a <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative Commons "
+#| "Attribution-NonCommercial-NoDerivs 3.0 Unported License.</a>"
 msgid ""
-"'Till There Was GNU by Steven R. Champagne is licensed under a <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/";
-"\">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License."
-"</a>"
-msgstr ""
-"Sofern nicht <a href=\"#license\">anders angegeben</a>, ist dieses Werk "
-"lizenziert unter einer <a rel=\"license\" href=\"https://creativecommons.org/";
-"licenses/by-nd/4.0/deed.de\">Creative Commons Namensnennung-Keine "
-"Bearbeitung 4.0 International</a>-Lizenz."
+"The lyrics on this page are licensed under the <a href=\"http://";
+"creativecommons.org/licenses/by-nc-nd/3.0/\">Creative Commons Attribution-"
+"NonCommercial-NoDerivs 3.0 Unported License</a>."
+msgstr ""
+"<i>'Till There Was GNU</i> von Steven R. Champagne ist lizenziert unter "
+"einer <a href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.de";
+"\">Creative Commons Namensnennung-NichtKommerziell-KeineBearbeitung 3.0 "
+"Unported</a>-Lizenz."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -184,6 +258,25 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid "<strong>A Song Performed By Steven R. Champagne</strong>"
+#~ msgstr "von <strong>Steven R. Champagne</strong>"
+
+#~ msgid "Licensing"
+#~ msgstr "Lizenzierung"
+
+# Text moved to #license.
+# The copyright for this _site_ should be at the FSF!
+#~ msgid ""
+#~ "'Till There Was GNU by Steven R. Champagne is licensed under a <a rel="
+#~ "\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/";
+#~ "\">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported "
+#~ "License.</a>"
+#~ msgstr ""
+#~ "Sofern nicht <a href=\"#license\">anders angegeben</a>, ist dieses Werk "
+#~ "lizenziert unter einer <a rel=\"license\" href=\"https://creativecommons.";
+#~ "org/licenses/by-nd/4.0/deed.de\">Creative Commons Namensnennung-Keine "
+#~ "Bearbeitung 4.0 International</a>-Lizenz."
+
 #~ msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 

Index: music/po/till_there_was_gnu.fr.po
===================================================================
RCS file: /web/www/www/music/po/till_there_was_gnu.fr.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- music/po/till_there_was_gnu.fr.po   31 May 2021 21:09:09 -0000      1.11
+++ music/po/till_there_was_gnu.fr.po   12 Jul 2021 17:02:30 -0000      1.12
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: till_there_was_gnu.html\n"
-"POT-Creation-Date: 2015-07-19 23:25+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2015-07-20 09:40+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -14,102 +14,150 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-12 16:56+0000\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
 msgid "'Till There Was GNU - GNU Project - Free Software Foundation"
 msgstr "Jusqu'au jour où vint GNU - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ".chorus { font-style: normal; color: #572385; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "'Till There Was GNU"
 msgstr "Jusqu'au jour où vint GNU"
 
-#. type: Content of: <p>
-msgid "<strong>A Song Performed By Steven R. Champagne</strong>"
-msgstr "<strong>Une chanson interprétée par Steven R. Champagne</strong>"
+#. type: Content of: <div><address>
+# | [-Copyright &copy; 2011-]{+by+} Steven R. Champagne
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Steven R. Champagne"
+msgid "by Steven R. Champagne"
+msgstr "Copyright &copy; 2011 Steven R. Champagne"
 
 #. type: Content of: <div><p>
-msgid "there were applications"
+msgid "Sung to the tune of <cite>'Til There Was You</cite> by Meredith Wilson"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}here were applications{+,+}
+#, fuzzy
+#| msgid "there were applications"
+msgid "There were applications,"
 msgstr "Il y avait des applications"
 
-#. type: Content of: <div><p>
-msgid "but I never saw their source code"
+#. type: Content of: <div><div><p>
+# | but I never saw their source code{+.+}
+#, fuzzy
+#| msgid "but I never saw their source code"
+msgid "but I never saw their source code."
 msgstr "Mais je ne voyais pas leur code source."
 
-#. type: Content of: <div><p>
-msgid "no I never saw it at all"
+#. type: Content of: <div><div><p>
+# | [-n-]{+N+}o I never saw it at all
+#, fuzzy
+#| msgid "no I never saw it at all"
+msgid "No I never saw it at all"
 msgstr "Non je ne le vis jamais"
 
-#. type: Content of: <div><p>
-msgid "'till there was gnu"
+#. type: Content of: <div><div><p>
+# | 'till there was [-gnu-] {+GNU.+}
+#, fuzzy
+#| msgid "'till there was gnu"
+msgid "'till there was GNU."
 msgstr "Jusqu'au jour où vint GNU."
 
-#. type: Content of: <div><p>
-msgid "there were profits so high"
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}here were profits so high{+;+}
+#, fuzzy
+#| msgid "there were profits so high"
+msgid "There were profits so high;"
 msgstr "Il y avait des profits si élevés,"
 
-#. type: Content of: <div><p>
-msgid "it was all proprietary"
+#. type: Content of: <div><div><p>
+# | it was all proprietary{+,+}
+#, fuzzy
+#| msgid "it was all proprietary"
+msgid "it was all proprietary,"
 msgstr "Ils étaient tous privateurs,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "all behind a corporate wall"
 msgstr "Tous derrière le mur d'une entreprise,"
 
-#. type: Content of: <div><p>
-msgid "then there were downloads"
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}hen there were downloads{+,+}
+#, fuzzy
+#| msgid "then there were downloads"
+msgid "Then there were downloads,"
 msgstr "Ensuite il y eut les téléchargements"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and wonderful mail lists"
 msgstr "Et les merveilleuses listes de diffusion"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "that informed me"
 msgstr "Qui m'informaient"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "with sweet contributions"
 msgstr "Avec de douces contributions"
 
-#. type: Content of: <div><p>
-msgid "from all, it's true"
+#. type: Content of: <div><div><p>
+# | from all, it's true{+.+}
+#, fuzzy
+#| msgid "from all, it's true"
+msgid "from all, it's true."
 msgstr "De tous, c'est vrai."
 
-#. type: Content of: <div><p>
-msgid "there was code all around"
+#. type: Content of: <div><div><p>
+# | [-t-]{+T+}here was code all around{+,+}
+#, fuzzy
+#| msgid "there was code all around"
+msgid "There was code all around,"
 msgstr "Il y avait du code partout"
 
-#. type: Content of: <div><p>
-msgid "but I never heard of sharing"
+#. type: Content of: <div><div><p>
+# | but I never heard of sharing{+.+}
+#, fuzzy
+#| msgid "but I never heard of sharing"
+msgid "but I never heard of sharing."
 msgstr "Mais je n'entendais pas le mot partage."
 
-#. type: Content of: <div><p>
-msgid "no I never heard it at all"
+#. type: Content of: <div><div><p>
+# | [-n-]{+N+}o I never heard it at all
+#, fuzzy
+#| msgid "no I never heard it at all"
+msgid "No I never heard it at all"
 msgstr "Non, je ne l'entendis jamais"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "&lt;instruments&gt;"
 msgstr "&lt;instruments&gt;"
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr "Licence"
-
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Steven R. Champagne"
-msgstr "Copyright &copy; 2011 Steven R. Champagne"
-
-#. type: Content of: <p>
-msgid ""
-"'Till There Was GNU by Steven R. Champagne is licensed under a <a href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative Commons "
-"Attribution-NonCommercial-NoDerivs 3.0 Unported License.</a>"
-msgstr ""
-"« 'Till There Was GNU », par Steven R.Champagne, est sous licence <a 
href="
-"\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.fr\";>Creative "
-"Commons attribution, pas d’utilisation commerciale, pas de modification, 
3.0 "
-"non transposée (CC BY-NC-ND 3.0)</a>."
+#. type: Content of: <div><div><p>
+# | 'till there was [-gnu-] {+GNU&hellip;+}
+#, fuzzy
+#| msgid "'till there was gnu"
+msgid "'till there was GNU&hellip;"
+msgstr "Jusqu'au jour où vint GNU."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -137,14 +185,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="
@@ -155,16 +203,32 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 2011 Steven R. Champagne {+(the lyrics)+}
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Steven R. Champagne"
+msgid "Copyright &copy; 2011 Steven R. Champagne (the lyrics)"
+msgstr "Copyright &copy; 2011 Steven R. Champagne"
+
+#. type: Content of: <div><p>
+# | [-'Till There Was GNU by Steven R. Champagne is-]{+The lyrics on this page
+# | are+} licensed under [-a-] {+the+} <a
+# | href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative
+# | Commons Attribution-NonCommercial-NoDerivs 3.0 Unported [-License.</a>-]
+# | {+License</a>.+}
+#, fuzzy
+#| msgid ""
+#| "'Till There Was GNU by Steven R. Champagne is licensed under a <a href="
+#| "\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative Commons "
+#| "Attribution-NonCommercial-NoDerivs 3.0 Unported License.</a>"
 msgid ""
-"'Till There Was GNU by Steven R. Champagne is licensed under a <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/";
-"\">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License."
-"</a>"
-msgstr ""
-"« 'Till There Was GNU », par Steven R.Champagne, est sous licence <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.fr";
-"\">Creative Commons attribution, pas d’utilisation commerciale, pas de "
-"modification, 3.0 non transposée (CC BY-NC-ND 3.0)</a>."
+"The lyrics on this page are licensed under the <a href=\"http://";
+"creativecommons.org/licenses/by-nc-nd/3.0/\">Creative Commons Attribution-"
+"NonCommercial-NoDerivs 3.0 Unported License</a>."
+msgstr ""
+"« 'Till There Was GNU », par Steven R.Champagne, est sous licence <a 
href="
+"\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.fr\";>Creative "
+"Commons attribution, pas d’utilisation commerciale, pas de modification, 
3.0 "
+"non transposée (CC BY-NC-ND 3.0)</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -177,3 +241,20 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "<strong>A Song Performed By Steven R. Champagne</strong>"
+#~ msgstr "<strong>Une chanson interprétée par Steven R. Champagne</strong>"
+
+#~ msgid "Licensing"
+#~ msgstr "Licence"
+
+#~ msgid ""
+#~ "'Till There Was GNU by Steven R. Champagne is licensed under a <a rel="
+#~ "\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/";
+#~ "\">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported "
+#~ "License.</a>"
+#~ msgstr ""
+#~ "« 'Till There Was GNU », par Steven R.Champagne, est sous licence <a 
rel="
+#~ "\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/deed.";
+#~ "fr\">Creative Commons attribution, pas d’utilisation commerciale, pas de 
"
+#~ "modification, 3.0 non transposée (CC BY-NC-ND 3.0)</a>."

Index: music/po/till_there_was_gnu.pot
===================================================================
RCS file: /web/www/www/music/po/till_there_was_gnu.pot,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- music/po/till_there_was_gnu.pot     19 Jul 2015 23:27:34 -0000      1.13
+++ music/po/till_there_was_gnu.pot     12 Jul 2021 17:02:30 -0000      1.14
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/music/till_there_was_gnu.html
+# LANGUAGE translation of https://www.gnu.org/music/till_there_was_gnu.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: till_there_was_gnu.html\n"
-"POT-Creation-Date: 2015-07-19 23:25+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,91 +20,103 @@
 msgid "'Till There Was GNU - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ".chorus { font-style: normal; color: #572385; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "'Till There Was GNU"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>A Song Performed By Steven R. Champagne</strong>"
+#. type: Content of: <div><address>
+msgid "by Steven R. Champagne"
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "there were applications"
+msgid "Sung to the tune of <cite>'Til There Was You</cite> by Meredith Wilson"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "but I never saw their source code"
+#. type: Content of: <div><div><p>
+msgid "There were applications,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "no I never saw it at all"
+#. type: Content of: <div><div><p>
+msgid "but I never saw their source code."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "'till there was gnu"
+#. type: Content of: <div><div><p>
+msgid "No I never saw it at all"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "there were profits so high"
+#. type: Content of: <div><div><p>
+msgid "'till there was GNU."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "it was all proprietary"
+#. type: Content of: <div><div><p>
+msgid "There were profits so high;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+msgid "it was all proprietary,"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid "all behind a corporate wall"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "then there were downloads"
+#. type: Content of: <div><div><p>
+msgid "Then there were downloads,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and wonderful mail lists"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "that informed me"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "with sweet contributions"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "from all, it's true"
+#. type: Content of: <div><div><p>
+msgid "from all, it's true."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "there was code all around"
+#. type: Content of: <div><div><p>
+msgid "There was code all around,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "but I never heard of sharing"
+#. type: Content of: <div><div><p>
+msgid "but I never heard of sharing."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "no I never heard it at all"
+#. type: Content of: <div><div><p>
+msgid "No I never heard it at all"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "&lt;instruments&gt;"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Licensing"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Steven R. Champagne"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"'Till There Was GNU by Steven R. Champagne is licensed under a <a "
-"href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative Commons "
-"Attribution-NonCommercial-NoDerivs 3.0 Unported License.</a>"
+#. type: Content of: <div><div><p>
+msgid "'till there was GNU&hellip;"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -131,7 +143,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>. 
@@ -139,15 +151,19 @@
 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; 2011 Steven R. Champagne (the lyrics)"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"'Till There Was GNU by Steven R. Champagne is licensed under a <a "
-"rel=\"license\" "
+"The lyrics on this page are licensed under the <a "
 "href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/\";>Creative Commons "
-"Attribution-NonCommercial-NoDerivs 3.0 Unported License.</a>"
+"Attribution-NonCommercial-NoDerivs 3.0 Unported License</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: music/po/whole-gnu-world.pot
===================================================================
RCS file: /web/www/www/music/po/whole-gnu-world.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- music/po/whole-gnu-world.pot        10 Aug 2015 05:57:24 -0000      1.1
+++ music/po/whole-gnu-world.pot        12 Jul 2021 17:02:30 -0000      1.2
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/music/whole-gnu-world.html
+# LANGUAGE translation of https://www.gnu.org/music/whole-gnu-world.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: whole-gnu-world.html\n"
-"POT-Creation-Date: 2015-08-10 05:55+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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,181 +20,200 @@
 msgid "A Whole GNU World - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ".reduced-width { width: 40em; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Music</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "A Whole GNU World"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Daniel Vukelich"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Sung to the tune of Disney's &ldquo;A Whole New World&rdquo; from the movie "
-"&ldquo;Aladdin.&rdquo;"
+"Sung to the tune of <cite>A Whole New World</cite> from Disney's movie "
+"<cite>Aladdin</cite>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: I can show you GNU"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Booting, running, compiling"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Tell me, User, now when did"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You last change the code you had?"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: I can libre your mind"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Take you distro by distro"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Trisquel, gNewSense, Ututo"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Each one's sure to make you glad"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: A whole GNU world!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A new fantastic point of view"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "No one to tell us no, or how to code"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Or say we can't be sharing"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: A whole GNU world!"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A free license I never knew"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But when it's GPL, then all is well"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Because I'm in a whole GNU world with you"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: (Now I'm in a whole GNU world with you)"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: I've retained my 4 rights"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Indescribable freedom"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Changing, giving, improving"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Make Bill Gates and Co. take fright"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: (Don't you dare write with Vim)"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: A hundred thousand things to see"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: (Use Emacs, it's much better)"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: I'm like an airplane"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I'd be insane"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "If I went back"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "To use code that's nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: (It will never get dim)"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: With new code projects you can help"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: (My BIOS is unfettered)"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>Both</b>: I'll share code everywhere"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It's free software"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Let me share this whole GNU world with you"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: A whole GNU world"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: A whole GNU world"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: And it's all free"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: And it's all free"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>RMS</b>: A hacker's dream"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>User</b>: Where freedoms gleam"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "<b>Both</b>: For you and me!"
 msgstr ""
 
@@ -222,7 +241,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>. 
@@ -230,16 +249,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; 2015 Daniel Vukelich"
+msgid "Copyright &copy; 2015 Daniel Vukelich (the lyrics)"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"This page is licensed under a <a rel=\"license\" "
+"The lyrics on this page are licensed under the <a rel=\"license\" "
 "href=\"http://creativecommons.org/licenses/by-sa/4.0/\";>Creative Commons "
 "Attribution-ShareAlike 4.0 International License</a>."
 msgstr ""

Index: server/sitemap.ar.html
===================================================================
RCS file: /web/www/www/server/sitemap.ar.html,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -b -r1.352 -r1.353
--- server/sitemap.ar.html      11 Jul 2021 17:02:11 -0000      1.352
+++ server/sitemap.ar.html      12 Jul 2021 17:02:30 -0000      1.353
@@ -423,7 +423,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (song parody)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -458,11 +458,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Happy New Year in 4 languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -474,7 +474,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -490,11 +490,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Nobody owns this song</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -542,11 +542,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1144,7 +1144,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>The Free Birthday Song</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2247,7 +2247,7 @@
 <p class="unprintable"><!-- timestamp start -->
 حُدّثت:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.de.html
===================================================================
RCS file: /web/www/www/server/sitemap.de.html,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -b -r1.435 -r1.436
--- server/sitemap.de.html      11 Jul 2021 17:02:11 -0000      1.435
+++ server/sitemap.de.html      12 Jul 2021 17:02:30 -0000      1.436
@@ -424,7 +424,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Fehlermeldungen in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (Lied-Parodie)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -459,11 +459,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>Wenn die Beatles Hacker wären&#8230;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>Hakawatha</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Glück ist eine bash-Eingabeaufforderung</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Frohes Neues Jahr (4-sprachig)</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -475,7 +475,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>Der letzte Programmfehler</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Lange Optionen?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -491,11 +491,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical Pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Niemandem gehört dieses Lied</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -543,11 +543,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Süchtig nach <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM-Lieder &#8230;</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virenwarnung</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs-Lied</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -2260,7 +2260,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.es.html
===================================================================
RCS file: /web/www/www/server/sitemap.es.html,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -b -r1.341 -r1.342
--- server/sitemap.es.html      9 Jul 2021 17:01:23 -0000       1.341
+++ server/sitemap.es.html      12 Jul 2021 17:02:30 -0000      1.342
@@ -425,7 +425,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (song parody)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -460,11 +460,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Happy New Year in 4 languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -476,7 +476,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -492,11 +492,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Nobody owns this song</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -544,11 +544,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1148,7 +1148,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>La canción del cumpleaños libre</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2251,7 +2251,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2021/07/09 17:01:23 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.fr.html
===================================================================
RCS file: /web/www/www/server/sitemap.fr.html,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -b -r1.525 -r1.526
--- server/sitemap.fr.html      11 Jul 2021 17:02:11 -0000      1.525
+++ server/sitemap.fr.html      12 Jul 2021 17:02:30 -0000      1.526
@@ -428,7 +428,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Flamme éternelle (pastiche de chanson)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -463,11 +463,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Happy New Year in 4 languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -479,7 +479,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>Les Gnus veulent juste s'amuser</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -495,11 +495,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Personne ne possède cette chanson</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -547,11 +547,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1152,7 +1152,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>La chanson d'anniversaire libre</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2273,7 +2273,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.it.html
===================================================================
RCS file: /web/www/www/server/sitemap.it.html,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- server/sitemap.it.html      11 Jul 2021 17:02:11 -0000      1.211
+++ server/sitemap.it.html      12 Jul 2021 17:02:30 -0000      1.212
@@ -424,7 +424,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (song parody)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -459,11 +459,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Happy New Year in 4 languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -475,7 +475,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -491,11 +491,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Nobody owns this song</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -543,11 +543,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1146,7 +1146,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>The Free Birthday Song</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2249,7 +2249,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.ja.html
===================================================================
RCS file: /web/www/www/server/sitemap.ja.html,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -b -r1.441 -r1.442
--- server/sitemap.ja.html      11 Jul 2021 17:02:11 -0000      1.441
+++ server/sitemap.ja.html      12 Jul 2021 17:02:30 -0000      1.442
@@ -423,7 +423,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>エラーメッセージを俳句で?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>永遠なる炎 (歌のパロディ)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>GNU/Linuxのウィルスがかなりめずらしい理由</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -457,11 +457,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>もしもビートルズがハッカーだったら&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>自由へのハックの歌</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>幸福はbashプロンプトにあり</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>新年おめでとうを4つの言語で</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -473,7 +473,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>最後のバグ</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>Gnus・ジャスト・ワナ・ハヴ・ファン</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>長いオプション?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -489,11 +489,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>音楽の言葉ピックアップ</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>ネットワーク屋のクリスマス (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>この歌は誰のものでもない</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>オンリーG.N.U. (そして G.N.U. だけ)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>IntelのP5の発表が遅れた最大の理由10</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -541,11 +541,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd><code>vi</code>に夢中</dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIMの歌 . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>ウィルスの警告</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacsの歌</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>狼のロゴ</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1141,7 +1141,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>プログラマのブルース</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs 対 VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>自由な誕生日の歌</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2206,7 +2206,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.nl.html
===================================================================
RCS file: /web/www/www/server/sitemap.nl.html,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -b -r1.352 -r1.353
--- server/sitemap.nl.html      11 Jul 2021 17:02:11 -0000      1.352
+++ server/sitemap.nl.html      12 Jul 2021 17:02:30 -0000      1.353
@@ -424,7 +424,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (song parody)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -459,11 +459,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Happy New Year in 4 languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -475,7 +475,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -491,11 +491,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Nobody owns this song</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -543,11 +543,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1146,7 +1146,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>The Free Birthday Song</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2242,7 +2242,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.pt-br.html
===================================================================
RCS file: /web/www/www/server/sitemap.pt-br.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/sitemap.pt-br.html   11 Jul 2021 17:02:11 -0000      1.12
+++ server/sitemap.pt-br.html   12 Jul 2021 17:02:30 -0000      1.13
@@ -423,7 +423,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (song parody)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -458,11 +458,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Happy New Year in 4 languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -474,7 +474,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -490,11 +490,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Nobody owns this song</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -542,11 +542,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1145,7 +1145,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>The Free Birthday Song</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2244,7 +2244,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última atualização:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.ro.html
===================================================================
RCS file: /web/www/www/server/sitemap.ro.html,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -b -r1.331 -r1.332
--- server/sitemap.ro.html      11 Jul 2021 17:02:11 -0000      1.331
+++ server/sitemap.ro.html      12 Jul 2021 17:02:30 -0000      1.332
@@ -423,7 +423,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (song parody)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -458,11 +458,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Happy New Year in 4 languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -474,7 +474,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -490,11 +490,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Nobody owns this song</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -542,11 +542,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1146,7 +1146,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>The Free Birthday Song</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2245,7 +2245,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Actualizată:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.ru.html
===================================================================
RCS file: /web/www/www/server/sitemap.ru.html,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -b -r1.491 -r1.492
--- server/sitemap.ru.html      9 Jul 2021 17:01:24 -0000       1.491
+++ server/sitemap.ru.html      12 Jul 2021 17:02:30 -0000      1.492
@@ -429,7 +429,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Сообщения об ошибках в Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Вечный пламень (пародия на песню)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Почему вирусы на GNU/Linux довольно редки</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -464,11 +464,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>Если бы &ldquo;Битлз&rdquo; были хакерами...</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Песня &ldquo;Hack for freedom&rdquo;</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>Хакавата</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Счастье&nbsp;&mdash; в приглашении BASH</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>&ldquo;С Новым годом&rdquo; на четырех языках
</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -480,7 +480,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>Последний глюк</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNU просто хотят поразвлечься</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Длинные ключи?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -496,11 +496,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Музыкальная импровизация</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>Сочельник сетеолога (версия 3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Эта песня не принадлежит никому</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Только GNU</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Десять главных причин, по которым в Intel 
задержали объявление о P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -548,11 +548,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Приверженец <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>Песни о VIM</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Предупреждение о вирусе</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>Песня о GNU Emacs</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>Эмблема волка</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1153,7 +1153,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>Блюз программиста</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs и VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>Свободная песня на день рождения</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2270,7 +2270,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/07/09 17:01:24 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.sq.html
===================================================================
RCS file: /web/www/www/server/sitemap.sq.html,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -b -r1.367 -r1.368
--- server/sitemap.sq.html      11 Jul 2021 17:02:11 -0000      1.367
+++ server/sitemap.sq.html      12 Jul 2021 17:02:30 -0000      1.368
@@ -427,7 +427,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Mesazhe gabimesh si Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Flaka e Përjetshme (parodi e një kënge)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Pse Viruset në GNU/Linux janë pak a shumë jo të zakonshëm</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -462,11 +462,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>Sikur Beatles-at të qenë hackers-a&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Kënda “Hack For Freedom”</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Lumturia është një bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>Gëzuar Vitin e Ri në 4 gjuhë</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -478,7 +478,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>E meta e Fundit</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Opsione të gjatë?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -494,11 +494,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>Kërshëndellat e Një Rrjetologjisti (v3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Askush nuk është pronar i kësaj kënge</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Dhjetë Arsyet Kryesore Pse Intel-i E Vonoi Lajmërimin e P5-s</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -546,11 +546,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>I varur nga <code>vi</code>-u</dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>Këngë VIM …</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Sinjalizim Virusi</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>Kënga për GNU Emacs</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>Logoja për Wolf-in</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1149,7 +1149,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>Kënga e Lirë e Ditëlindjes</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2263,7 +2263,7 @@
 <p class="unprintable"><!-- timestamp start -->
 U përditësua më:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.uk.html
===================================================================
RCS file: /web/www/www/server/sitemap.uk.html,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -b -r1.380 -r1.381
--- server/sitemap.uk.html      11 Jul 2021 17:02:11 -0000      1.380
+++ server/sitemap.uk.html      12 Jul 2021 17:02:30 -0000      1.381
@@ -424,7 +424,7 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Повідомлення про помилки в Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Вічне полум'я (пародія на пісню)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
@@ -459,11 +459,11 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>Якби Бітлз були хакерами</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Пісня &ldquo;Hack for freedom&rdquo;</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>ХАКАВАТА</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Щастя у запрошенні bash</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
   <dd>З Новим Роком на 4 мовах</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
@@ -475,7 +475,7 @@
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>Остання вада</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Довгі параметри?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -491,11 +491,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Музикальна імпровізація!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>Різдво інтернетомана (в3.1)</dd>
+  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Ця пісня нікому не належить</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Лише G.N.U.</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Десять головних причин, по яких в Intel 
затримали оголошення про P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -543,11 +543,11 @@
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Шанувальник <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>Пісні про VIM</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Застереження про вірус</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>Пісня про GNU Emacs</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>Емблема вовка</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1146,7 +1146,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>Блюз програміста</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs проти VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>Вільна пісня на день народження</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2254,7 +2254,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2021/07/11 17:02:11 $
+$Date: 2021/07/12 17:02:30 $
 
 <!-- timestamp end -->
 </p>

Index: server/po/sitemap.ar.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ar.po,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -b -r1.339 -r1.340
--- server/po/sitemap.ar.po     11 Jul 2021 17:02:11 -0000      1.339
+++ server/po/sitemap.ar.po     12 Jul 2021 17:02:30 -0000      1.340
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2009-09-09 10:20+0300\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic\n"
@@ -1084,7 +1084,7 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
+msgid "Eternal Flame"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1231,7 +1231,7 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
+msgid "Hack For Freedom"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1239,7 +1239,7 @@
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
+msgid "The Song of Hakawatha"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1247,7 +1247,7 @@
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1299,7 +1299,7 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1363,7 +1363,7 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1379,7 +1379,7 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1575,7 +1575,7 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1595,7 +1595,7 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -3620,7 +3620,7 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
+msgid "Emacs vs Vi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>

Index: server/po/sitemap.de.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.de.po,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -b -r1.525 -r1.526
--- server/po/sitemap.de.po     11 Jul 2021 17:02:11 -0000      1.525
+++ server/po/sitemap.de.po     12 Jul 2021 17:02:30 -0000      1.526
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+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"
@@ -1049,8 +1049,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "Eternal Flame (Lied-Parodie)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1195,24 +1195,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "Hack For Freedom Song"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "Hakawatha"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "Glück ist eine bash-Eingabeaufforderung"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1263,7 +1263,7 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1327,8 +1327,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1343,8 +1343,8 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
-msgstr "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/p5.delay.html\">p5.delay.html</a>"
@@ -1540,8 +1540,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "VIM-Lieder &#8230;"
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1560,8 +1560,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "GNU Emacs-Lied"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3526,7 +3526,7 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
+msgid "Emacs vs Vi"
 msgstr "Emacs vs. VI"
 
 #. type: Content of: <div><dl><dd><dl><dt>
@@ -7144,6 +7144,15 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid "HAKAWATHA"
+#~ msgstr "Hakawatha"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "VIM-Lieder &#8230;"
+
+#~ msgid "GNU Emacs Song"
+#~ msgstr "GNU Emacs-Lied"
+
 # duplicate!
 #~ msgid "GNU coding standards"
 #~ msgstr "GNU Coding Standards"

Index: server/po/sitemap.es.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.es.po,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -b -r1.428 -r1.429
--- server/po/sitemap.es.po     11 Jul 2021 17:02:11 -0000      1.428
+++ server/po/sitemap.es.po     12 Jul 2021 17:02:30 -0000      1.429
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@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-12 16:56+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
 #. type: Content of: <title>
@@ -1061,8 +1062,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "Eternal Flame (song parody)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1207,24 +1208,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "Hack For Freedom Song"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "HAKAWATHA"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1275,8 +1276,8 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
-msgstr "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/long-options.html\">long-options.html</a>"
@@ -1339,8 +1340,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1355,8 +1356,8 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
-msgstr "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/p5.delay.html\">p5.delay.html</a>"
@@ -1551,8 +1552,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1571,8 +1572,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3529,8 +3530,8 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
-msgstr "Emacs vs VI"
+msgid "Emacs vs Vi"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>
 msgid "<a href=\"/music/free-birthday-song.html\">free-birthday-song.html</a>"
@@ -7113,5 +7114,17 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
+#~ msgid "HAKAWATHA"
+#~ msgstr "HAKAWATHA"
+
+#~ msgid "GNUS JUST WANNA HAVE FUN"
+#~ msgstr "GNUS JUST WANNA HAVE FUN"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "VIM Songs . . ."
+
+#~ msgid "GNU Emacs Song"
+#~ msgstr "GNU Emacs Song"
+
 #~ msgid "GNU coding standards"
 #~ msgstr "Normas de programación de GNU"

Index: server/po/sitemap.fr.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.fr.po,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -b -r1.661 -r1.662
--- server/po/sitemap.fr.po     11 Jul 2021 17:02:12 -0000      1.661
+++ server/po/sitemap.fr.po     12 Jul 2021 17:02:30 -0000      1.662
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2021-07-10 09:28+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-12 16:56+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -1064,8 +1065,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "Flamme éternelle (pastiche de chanson)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1210,24 +1211,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "Hack For Freedom Song"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "HAKAWATHA"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1278,8 +1279,8 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
-msgstr "Les Gnus veulent juste s'amuser"
+msgid "GNUs Just Wanna Have Fun"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/long-options.html\">long-options.html</a>"
@@ -1342,8 +1343,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1358,8 +1359,8 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
-msgstr "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/p5.delay.html\">p5.delay.html</a>"
@@ -1554,8 +1555,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1574,8 +1575,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3537,8 +3538,8 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
-msgstr "Emacs vs VI"
+msgid "Emacs vs Vi"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>
 msgid "<a href=\"/music/free-birthday-song.html\">free-birthday-song.html</a>"
@@ -7147,3 +7148,15 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "HAKAWATHA"
+#~ msgstr "HAKAWATHA"
+
+#~ msgid "GNUS JUST WANNA HAVE FUN"
+#~ msgstr "Les Gnus veulent juste s'amuser"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "VIM Songs . . ."
+
+#~ msgid "GNU Emacs Song"
+#~ msgstr "GNU Emacs Song"

Index: server/po/sitemap.it.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.it.po,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -b -r1.276 -r1.277
--- server/po/sitemap.it.po     11 Jul 2021 17:02:12 -0000      1.276
+++ server/po/sitemap.it.po     12 Jul 2021 17:02:31 -0000      1.277
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2018-05-31 21:57+0200\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -1055,8 +1055,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "Eternal Flame (song parody)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1201,24 +1201,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "Hack For Freedom Song"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "HAKAWATHA"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1269,7 +1269,7 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1333,8 +1333,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1349,8 +1349,8 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
-msgstr "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/p5.delay.html\">p5.delay.html</a>"
@@ -1545,8 +1545,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1565,8 +1565,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3611,8 +3611,8 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
-msgstr "Emacs vs VI"
+msgid "Emacs vs Vi"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>
 msgid "<a href=\"/music/free-birthday-song.html\">free-birthday-song.html</a>"
@@ -7238,6 +7238,12 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+#~ msgid "HAKAWATHA"
+#~ msgstr "HAKAWATHA"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "VIM Songs . . ."
+
 #~ msgid "GNU coding standards"
 #~ msgstr "GNU coding standards"
 

Index: server/po/sitemap.ja.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ja.po,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -b -r1.465 -r1.466
--- server/po/sitemap.ja.po     11 Jul 2021 17:02:12 -0000      1.465
+++ server/po/sitemap.ja.po     12 Jul 2021 17:02:31 -0000      1.466
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2021-06-01 08:54+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -1058,8 +1058,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "永遠なる炎 (歌のパロディ)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1202,24 +1202,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "自由へのハックの歌"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "HAKAWATHA"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "幸福はbashプロンプトにあり"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1270,8 +1270,8 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
-msgstr "Gnus・ジャスト・ワナ・ハヴ・ファン"
+msgid "GNUs Just Wanna Have Fun"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/long-options.html\">long-options.html</a>"
@@ -1334,8 +1334,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "ネットワーク屋のクリスマス (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1350,8 +1350,8 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
-msgstr "オンリーG.N.U. (そして G.N.U. だけ)"
+msgid "Only GNU (And GNU Alone)"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/p5.delay.html\">p5.delay.html</a>"
@@ -1546,8 +1546,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "VIMの歌 . . ."
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1566,8 +1566,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "GNU Emacsの歌"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3519,8 +3519,8 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
-msgstr "Emacs 対 VI"
+msgid "Emacs vs Vi"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>
 msgid "<a href=\"/music/free-birthday-song.html\">free-birthday-song.html</a>"
@@ -7087,6 +7087,18 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid "HAKAWATHA"
+#~ msgstr "HAKAWATHA"
+
+#~ msgid "GNUS JUST WANNA HAVE FUN"
+#~ msgstr "Gnus・ジャスト・ワナ・ハヴ・ファン"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "VIMの歌 . . ."
+
+#~ msgid "GNU Emacs Song"
+#~ msgstr "GNU Emacsの歌"
+
 #~ msgid "GNU coding standards"
 #~ msgstr "GNUコーディング規約"
 

Index: server/po/sitemap.nl.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.nl.po,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -b -r1.353 -r1.354
--- server/po/sitemap.nl.po     11 Jul 2021 17:02:12 -0000      1.353
+++ server/po/sitemap.nl.po     12 Jul 2021 17:02:31 -0000      1.354
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2011-08-16 22:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
@@ -1076,7 +1076,7 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
+msgid "Eternal Flame"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1223,7 +1223,7 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
+msgid "Hack For Freedom"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1231,7 +1231,7 @@
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
+msgid "The Song of Hakawatha"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1239,7 +1239,7 @@
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1291,7 +1291,7 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1355,7 +1355,7 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1371,7 +1371,7 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1567,7 +1567,7 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1587,7 +1587,7 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -3574,7 +3574,7 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
+msgid "Emacs vs Vi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>

Index: server/po/sitemap.pot
===================================================================
RCS file: /web/www/www/server/po/sitemap.pot,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -b -r1.313 -r1.314
--- server/po/sitemap.pot       11 Jul 2021 17:02:12 -0000      1.313
+++ server/po/sitemap.pot       12 Jul 2021 17:02:31 -0000      1.314
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16: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"
@@ -972,7 +972,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
+msgid "Eternal Flame"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1110,7 +1110,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
+msgid "Hack For Freedom"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1118,7 +1118,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
+msgid "The Song of Hakawatha"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1126,7 +1126,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1174,7 +1174,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1238,7 +1238,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1254,7 +1254,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1446,7 +1446,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1464,7 +1464,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -3298,7 +3298,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
+msgid "Emacs vs Vi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>

Index: server/po/sitemap.pt-br.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.pt-br.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/po/sitemap.pt-br.po  11 Jul 2021 17:02:12 -0000      1.13
+++ server/po/sitemap.pt-br.po  12 Jul 2021 17:02:31 -0000      1.14
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2021-06-13 19:11-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -1058,7 +1058,7 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
+msgid "Eternal Flame"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1202,7 +1202,7 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
+msgid "Hack For Freedom"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1210,7 +1210,7 @@
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
+msgid "The Song of Hakawatha"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1218,7 +1218,7 @@
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1270,7 +1270,7 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1334,7 +1334,7 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1350,7 +1350,7 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1546,7 +1546,7 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1566,7 +1566,7 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -3519,7 +3519,7 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
+msgid "Emacs vs Vi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>

Index: server/po/sitemap.ro.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ro.po,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -b -r1.324 -r1.325
--- server/po/sitemap.ro.po     11 Jul 2021 17:02:12 -0000      1.324
+++ server/po/sitemap.ro.po     12 Jul 2021 17:02:31 -0000      1.325
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+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"
@@ -1063,7 +1063,7 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
+msgid "Eternal Flame"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1208,7 +1208,7 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
+msgid "Hack For Freedom"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1216,7 +1216,7 @@
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
+msgid "The Song of Hakawatha"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1224,7 +1224,7 @@
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
+msgid "Happiness is a Bash Prompt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1276,7 +1276,7 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1340,7 +1340,7 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1356,7 +1356,7 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1552,7 +1552,7 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
+msgid "Vim, Send Me an Angel!"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1572,7 +1572,7 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
+msgid "Welcome to GNU Emacs"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -3566,7 +3566,7 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
+msgid "Emacs vs Vi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>

Index: server/po/sitemap.ru.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ru.po,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -b -r1.650 -r1.651
--- server/po/sitemap.ru.po     11 Jul 2021 17:02:12 -0000      1.650
+++ server/po/sitemap.ru.po     12 Jul 2021 17:02:31 -0000      1.651
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.html\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2021-05-05 85:68+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-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Site map of www.gnu.org - GNU Project - Free Software Foundation"
@@ -1074,8 +1075,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "Вечный пламень (пародия на песню)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1221,24 +1222,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "Песня &ldquo;Hack for freedom&rdquo;"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "Хакавата"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "Счастье&nbsp;&mdash; в приглашении BASH"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1289,8 +1290,8 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
-msgstr "GNU просто хотят поразвлечься"
+msgid "GNUs Just Wanna Have Fun"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/long-options.html\">long-options.html</a>"
@@ -1353,8 +1354,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "Сочельник сетеолога (версия 3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1369,8 +1370,8 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
-msgstr "Только GNU"
+msgid "Only GNU (And GNU Alone)"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/p5.delay.html\">p5.delay.html</a>"
@@ -1565,8 +1566,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "Песни о VIM"
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1585,8 +1586,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "Песня о GNU Emacs"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3549,8 +3550,8 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
-msgstr "Emacs и VI"
+msgid "Emacs vs Vi"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>
 msgid "<a href=\"/music/free-birthday-song.html\">free-birthday-song.html</a>"
@@ -7179,6 +7180,18 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+#~ msgid "HAKAWATHA"
+#~ msgstr "Хакавата"
+
+#~ msgid "GNUS JUST WANNA HAVE FUN"
+#~ msgstr "GNU просто хотят поразвлечься"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "Песни о VIM"
+
+#~ msgid "GNU Emacs Song"
+#~ msgstr "Песня о GNU Emacs"
+
 #~ msgid "GNU coding standards"
 #~ msgstr "Стандарты программирования GNU"
 

Index: server/po/sitemap.sq.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.sq.po,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -b -r1.434 -r1.435
--- server/po/sitemap.sq.po     11 Jul 2021 17:02:12 -0000      1.434
+++ server/po/sitemap.sq.po     12 Jul 2021 17:02:31 -0000      1.435
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2021-06-01 12:35+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: besnik@programeshqip.org\n"
@@ -1070,8 +1070,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "Flaka e Përjetshme (parodi e një kënge)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1219,24 +1219,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "Kënda “Hack For Freedom”"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "HAKAWATHA"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "Lumturia është një bash prompt"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1287,8 +1287,8 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
-msgstr "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/long-options.html\">long-options.html</a>"
@@ -1351,8 +1351,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "Kërshëndellat e Një Rrjetologjisti (v3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1367,7 +1367,7 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
+msgid "Only GNU (And GNU Alone)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1565,8 +1565,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "Këngë VIM …"
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1585,8 +1585,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "Kënga për GNU Emacs"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3568,8 +3568,8 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
-msgstr "Emacs vs VI"
+msgid "Emacs vs Vi"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>
 msgid "<a href=\"/music/free-birthday-song.html\">free-birthday-song.html</a>"
@@ -7217,6 +7217,18 @@
 msgid "Updated:"
 msgstr "U përditësua më:"
 
+#~ msgid "HAKAWATHA"
+#~ msgstr "HAKAWATHA"
+
+#~ msgid "GNUS JUST WANNA HAVE FUN"
+#~ msgstr "GNUS JUST WANNA HAVE FUN"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "Këngë VIM …"
+
+#~ msgid "GNU Emacs Song"
+#~ msgstr "Kënga për GNU Emacs"
+
 #~ msgid "GNU coding standards"
 #~ msgstr "Standarde GNU për kodimin"
 

Index: server/po/sitemap.uk.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.uk.po,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -b -r1.423 -r1.424
--- server/po/sitemap.uk.po     11 Jul 2021 17:02:12 -0000      1.423
+++ server/po/sitemap.uk.po     12 Jul 2021 17:02:31 -0000      1.424
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sitemap.uk\n"
-"POT-Creation-Date: 2021-07-11 16:56+0000\n"
+"POT-Creation-Date: 2021-07-12 16:56+0000\n"
 "PO-Revision-Date: 2017-02-01 08:42+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\n"
@@ -1063,8 +1063,8 @@
 msgstr "<a href=\"/fun/jokes/eternal-flame.html\">eternal-flame.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Eternal Flame (song parody)"
-msgstr "Вічне полум'я (пародія на пісню)"
+msgid "Eternal Flame"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/evilmalware.html\">evilmalware.html</a>"
@@ -1210,24 +1210,24 @@
 msgstr "<a href=\"/fun/jokes/hackforfreedom.html\">hackforfreedom.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Hack For Freedom Song"
-msgstr "Пісня &ldquo;Hack for freedom&rdquo;"
+msgid "Hack For Freedom"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 msgstr "<a href=\"/fun/jokes/hakawatha.html\">hakawatha.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "HAKAWATHA"
-msgstr "ХАКАВАТА"
+msgid "The Song of Hakawatha"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 msgstr "<a href=\"/fun/jokes/hap-bash.html\">hap-bash.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Happiness is a bash prompt"
-msgstr "Щастя у запрошенні bash"
+msgid "Happiness is a Bash Prompt"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/happy-new-year.html\">happy-new-year.html</a>"
@@ -1278,7 +1278,7 @@
 msgstr "<a href=\"/fun/jokes/lauper.html\">lauper.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNUS JUST WANNA HAVE FUN"
+msgid "GNUs Just Wanna Have Fun"
 msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
@@ -1342,8 +1342,8 @@
 msgstr "<a href=\"/fun/jokes/networkologist.html\">networkologist.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "A Networkologist's Christmas (v3.1)"
-msgstr "Різдво інтернетомана (в3.1)"
+msgid "A Networkologist's Christmas <small>(v3.1)</small>"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/nobody-owns.html\">nobody-owns.html</a>"
@@ -1358,8 +1358,8 @@
 msgstr "<a href=\"/fun/jokes/only-gnu.html\">only-gnu.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "Only G.N.U. (And G.N.U. Alone)"
-msgstr "Лише G.N.U."
+msgid "Only GNU (And GNU Alone)"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/p5.delay.html\">p5.delay.html</a>"
@@ -1554,8 +1554,8 @@
 msgstr "<a href=\"/fun/jokes/vim-songs.html\">vim-songs.html</a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "VIM Songs . . ."
-msgstr "Пісні про VIM"
+msgid "Vim, Send Me an Angel!"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/virus-warning.html\">virus-warning.html</a>"
@@ -1574,8 +1574,8 @@
 "a>"
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-msgid "GNU Emacs Song"
-msgstr "Пісня про GNU Emacs"
+msgid "Welcome to GNU Emacs"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dt>
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">wolf-logo.html</a>"
@@ -3595,8 +3595,8 @@
 msgstr "<a href=\"/music/emacsvsvi.html\">emacsvsvi.html</a>"
 
 #. type: Content of: <div><dl><dd><dl><dd>
-msgid "Emacs vs VI"
-msgstr "Emacs проти VI"
+msgid "Emacs vs Vi"
+msgstr ""
 
 #. type: Content of: <div><dl><dd><dl><dt>
 msgid "<a href=\"/music/free-birthday-song.html\">free-birthday-song.html</a>"
@@ -7253,6 +7253,12 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
+#~ msgid "HAKAWATHA"
+#~ msgstr "ХАКАВАТА"
+
+#~ msgid "VIM Songs . . ."
+#~ msgstr "Пісні про VIM"
+
 #~ msgid "GNU coding standards"
 #~ msgstr "Стандарти програмування GNU"
 



reply via email to

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