www-commits
[Top][All Lists]
Advanced

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

www/licenses old-licenses/po/gpl-2.0-faq.cs.po ...


From: GNUN
Subject: www/licenses old-licenses/po/gpl-2.0-faq.cs.po ...
Date: Wed, 29 Dec 2021 11:01:04 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/12/29 11:01:03

Modified files:
        licenses/old-licenses/po: gpl-2.0-faq.cs.po gpl-2.0-faq.de.po 
                                  gpl-2.0-faq.es.po gpl-2.0-faq.fr.po 
                                  gpl-2.0-faq.it-diff.html 
                                  gpl-2.0-faq.it.po gpl-2.0-faq.ja.po 
                                  gpl-2.0-faq.ko.po gpl-2.0-faq.pl.po 
                                  gpl-2.0-faq.pot gpl-2.0-faq.ru.po 
        licenses/po    : license-compatibility.fr.po 
                         license-compatibility.it-diff.html 
                         license-compatibility.it.po 
                         license-compatibility.pot 
                         license-compatibility.pt-br.po 
                         license-compatibility.ru.po 
                         license-compatibility.tr.po 
                         license-compatibility.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.cs.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.de.po?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.es.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.fr.po?cvsroot=www&r1=1.112&r2=1.113
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.it-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.it.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ja.po?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ko.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.pl.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.pot?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po?cvsroot=www&r1=1.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.fr.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.it-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.it.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.pot?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.pt-br.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.ru.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.tr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9

Patches:
Index: old-licenses/po/gpl-2.0-faq.cs.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.cs.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- old-licenses/po/gpl-2.0-faq.cs.po   30 May 2021 19:03:16 -0000      1.9
+++ old-licenses/po/gpl-2.0-faq.cs.po   29 Dec 2021 16:01:00 -0000      1.10
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -29,7 +29,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "Často kladené otázky o GNU GPL, verze&nbsp;2"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | This page contains answers to commonly asked questions about the GNU
 # | General Public License (GPL), version 2. {+The FAQ for the current version
 # | of the GPL is <a href=\"/licenses/gpl-faq.html\">here</a>.+} To learn more
@@ -53,7 +53,7 @@
 "Nadace pro svobodný software, podívejte se na <a href=\"/licenses/licenses."
 "html\">naši stránku licencí</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -62,17 +62,41 @@
 "<a href=\"/cgi-bin/license-quiz.cgi\">můžete si své znalosti o 
licencování "
 "svobodného software vyzkoušet v našem testu</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "Obsah"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
 msgstr "Základní otázky o GPL, projektu GNU a Nadaci pro svobodný software"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "Obecný výklad GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "Použití GPL pro vaše programy"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "Distribuce programů vydaných pod GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr "Využívání GPL programů při psaní jiného software"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "Kombinování vlastní práce s kódem vydaným pod GPL"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "Otázky o porušení GPL"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -80,7 +104,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\"> Co znamená "
 "zkratka GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -90,14 +114,14 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\"> Znamená svobodný software, že 
musím "
 "použít GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
 "the GNU GPL as its license?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -107,7 +131,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\"> Znamená použití GNU 
GPL, "
 "že se software stane součástí GNU?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -115,7 +139,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\"> Mohu "
 "použít GPL i na něco jiného, než jen na software?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -123,7 +147,7 @@
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\"> Proč "
 "nepoužívat GPL pro manuály?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -131,7 +155,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\"> Existují překlady "
 "GPL do jiných jazyků?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -140,7 +164,7 @@
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\"> Proč jsou "
 "některé knihovny kryty klasickou GPL a ne Lesser GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -152,17 +176,13 @@
 "Pokud jsem vlastníkem copyrightu na GPL program, měl bych to dělat také? "
 "Jestli ano, jak?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "Obecný výklad GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -172,7 +192,7 @@
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\"> Proč GPL "
 "povoluje uživatelům publikovat vlastní modifikovanou verzi?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -182,20 +202,20 @@
 "\"TOCGPLRequireSourcePostedPublic\"> Požaduje GPL, aby byl zveřejněn "
 "zdrojový kód modifikovaných verzí?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -207,7 +227,7 @@
 "to, že kdokoliv na světě může získat zdrojový kód jakéhokoliv GPL 
programu?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -217,7 +237,7 @@
 "\"> GPL říká, že pozměněné verze musí být, pokud jsou 
distribuovány, "
 "„licencovány &hellip; všem třetím stranám.” Kdo jsou tyto třetí 
strany?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -225,7 +245,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\"> Dovoluje "
 "mi GPL prodávat kopie programu za peníze?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#DoesTheGPLAllowDownloadFee\"
 # | id=\"TOCDoesTheGPLAllowDownloadFee\"> Does the GPL allow me to charge a
 # | fee for downloading the program from my {+distribution+} site?</a>
@@ -242,7 +262,7 @@
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Dovoluje mi GPL požadovat poplatek za stažení programu z mého 
webu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -252,7 +272,7 @@
 "Dovoluje mi GPL požadovat, aby mi každý, kdo software obdrží, musel 
platit "
 "poplatek nebo mě musel upozorňovat?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -263,7 +283,7 @@
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\"> Pokud distribuuji GPL software "
 "za peníze, musím jej poskytnout také zadarmo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -271,7 +291,7 @@
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\"> Dovoluje mi "
 "GPL distribuovat kopie pod non-disclosure agreement?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -281,7 +301,7 @@
 "mi GPL distribuovat pozměněnou verzi nebo betaverzi pod non-disclosure "
 "agreement?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -291,7 +311,7 @@
 "Dovoluje mi GPL vyvinout modifikovanou verzi pod non-disclosure agreement?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -300,7 +320,7 @@
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright"
 "\">Musím na své změny v GPL programu uvalovat copyright?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -310,7 +330,7 @@
 "\">Pokud program kombinuje kód v public domain s kódem pod GPL, mohu vzít 
tu "
 "část v public domain a zacházet s ní jako s kódem v public domain?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -320,7 +340,7 @@
 "uznání. Chci, aby lidé věděli, co jsem napsal. Je to možné i když 
použiji "
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -328,7 +348,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\"> Co to znamená, "
 "když se řekne, že dvě licence jsou „kompatibilní”?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -336,7 +356,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\"> Co to znamená, 
"
 "když se řekne, že licence je „kompatibilní s GPL”?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -344,7 +364,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\"> Proč je původní BSD licence "
 "nekompatibilní s GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -355,17 +375,13 @@
 "nějaký software, který jsem obdržel pod GNU GPL, smím jej modifikovat, "
 "vytvořit tak nový program, a ten pak komerčně prodávat?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "Použití GPL pro vaše programy"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -373,7 +389,7 @@
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\"> Mohli "
 "byste mi dát intrukce krok za krokem, jak aplikovat GPL na můj program?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -381,7 +397,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Proč bych měl použít GPL 
raději "
 "než nějakou jinou licenci svobodného software?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -389,7 +405,7 @@
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\"> Proč GPL požaduje "
 "přiložit kopii licence ke každé kopii programu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -397,7 +413,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\"> A co když "
 "program není o moc delší než sama licence?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -407,7 +423,7 @@
 "předmluvu a instrukce, jak ji použít na vlastní programy, abych tak 
ušetřil "
 "místo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -415,7 +431,7 @@
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\"> Jak získám "
 "copyright na svůj program, abych jej mohl zveřejnit pod GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -423,7 +439,7 @@
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\"> Co když bude má škola "
 "chtít zabudovat můj program do vlastního proprietárního produktu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -433,7 +449,7 @@
 "vydal program, který jsem napsal, pod GNU GPL, ale chtěl bych ten samý 
kód "
 "použít i v nesvobodných programech.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -443,13 +459,13 @@
 "vývojář programu, který již byl distribuován pod GPL, licencovat 
později "
 "tento program nějaké další straně k exkluzivnímu užívání?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -458,42 +474,38 @@
 "programech mělo být „Version&nbsp;2 of the GPL or any later version” 
(GPL "
 "verze&nbsp;2 nebo jakákoliv pozdější)?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "Distribuce programů vydaných pod GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
 "source and distribute that too?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#DistributeWithSourceOnInternet\"
 # | [-id=\"TOCDistributeWithSourceOnInternet\">If I-]
 # | {+id=\"TOCDistributeWithSourceOnInternet\">I want to+} distribute binaries
@@ -516,7 +528,7 @@
 "fyzickém médiu bez zdrojových kódů, mohu zpřístupnit zdrojové kódy 
přes FTP "
 "místo zasílání poštou?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -524,7 +536,7 @@
 "to obtain the source?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -534,7 +546,7 @@
 "\"TOCSourceAndBinaryOnDifferentSites\"> Mohu umístit binární soubory na 
svůj "
 "internetový server a zdrojový kód na jiný?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -544,7 +556,7 @@
 "Chci distribuovat rozšířenou verzi programu krytého pod GPL v binární 
formě. "
 "Stačí distribuovat pouze zdrojové kódy původní verze?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#DistributingSourceIsInconvenient\"
 # | id=\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries,
 # | but distributing complete source is inconvenient.  [-How about-]  {+Is it
@@ -571,7 +583,7 @@
 "aktuální standardní verzi dostupné z FSF a doporučil jim, ať základ 
získají "
 "odsud?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -581,7 +593,7 @@
 "zpřístupnit binární kódy přes anonymní FTP, ale zasílat zdrojové 
kódy pouze "
 "lidem, kteří si je objednají.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -591,7 +603,7 @@
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\"> Jak můžu zajistit, aby 
každý "
 "uživatel, který si stáhne binární verzi, dostal také zdrojový 
kód?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -602,66 +614,62 @@
 "program s licencí, která říká, že můžete distribuovat modifikované 
verze pod "
 "GPL, ale nesmíte pod GPL distribuovat verzi originální?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
 "must release their modified sources?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
 "right to redistribute that version?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
 "as a trade secret?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
 "secret?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
 "distribution?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
 "GPL, do I have to agree to anything?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
 "installer need to have a GPL-compatible license?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr "Využívání GPL programů při psaní jiného software"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use
 # | GPL-covered editors {+such as GNU Emacs+} to develop nonfree programs? Can
 # | I use GPL-covered tools {+such as GCC+} to compile them?</a>
@@ -679,7 +687,7 @@
 "používat programy kryté GPL k vývoji nesvobodných programů? Mohu 
používat "
 "nástroje kryté GPL k tomu, abych tyto nesvobodné programy zkompiloval?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -691,7 +699,7 @@
 "používán k vývoji designů hardware, mohl bych požadovat, aby tyto 
designy "
 "byly svobodné?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -699,7 +707,7 @@
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\"> V jakém "
 "případě je výstup z programu pod GPL taktéž krytý GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a [-href=\"#PortProgramToGL\" id=\"TOCPortProgramToGL\">If-]
 # | {+href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If+} I port my
 # | program to GNU/Linux, does that mean I have to release it as Free Software
@@ -718,17 +726,13 @@
 "program do GNU/Linuxu, znamená to, že jej musím uvolnit jako svobodný "
 "software pod GPL nebo nějakou jinou licencí svobodného software?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "Kombinování vlastní práce s kódem vydaným pod GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -737,7 +741,7 @@
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\"> Jaký je rozdíl mezi 
"
 "„pouhým seskupováním” a „kombinováním dvou modulů do jednoho 
programu?”</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -745,13 +749,13 @@
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\"> Mám práva „fair use” při 
"
 "používání zdrojového kódu GPL programu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -761,7 +765,7 @@
 "zveřejněna pod GPL (a ne LGPL), znamená to, že program, který ji 
používá, "
 "musí být taktéž pod GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -773,7 +777,7 @@
 "program. Znamená linkování s vaším programem, že i můj program musí 
být pod "
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -781,7 +785,7 @@
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\"> Jestli ano, existuje "
 "nějaká šance, že bych mohl získat licenci vašeho programu pod Lesser 
GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -793,7 +797,7 @@
 "ale nehodí se nám GPL. Učiníte pro nás výjimku? Přineslo by to tomu 
programu "
 "více uživatelů.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -805,7 +809,7 @@
 "napsané tak, aby jím byly interpretovány, musí být vydány pod licencemi 
"
 "kompatibilními s GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -815,7 +819,7 @@
 "interpretr programovacího jazyka licenci, která není kompatibilní s GPL, "
 "mohu na něm spouštět GPL programy?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -824,13 +828,13 @@
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\"> Pokud do programu "
 "pod GPL přidám modul, musím pro něj použít také jako licenci GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -840,7 +844,7 @@
 "pod GPL používá pluginy, jaké jsou požadavky kladené na licenci těchto 
"
 "pluginů?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I [-use-]
 # | {+apply+} the GPL [-for-] {+when writing+} a plug-in for a nonfree
 # | program?</a>
@@ -855,13 +859,13 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\"> Mohu použít GPL na "
 "plugin pro nějaký nesvobodný program?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -871,7 +875,7 @@
 "bych použít software krytý GPL v mém proprietárním systému. Mohu to 
udělat?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -880,7 +884,7 @@
 "proprietary part?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 #, fuzzy
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
@@ -889,7 +893,7 @@
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Mohu napsat svobodný "
 "software, který používá nesvobodné knihovny?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 #, fuzzy
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
@@ -899,7 +903,7 @@
 "právními problémy se setkám, pokud použiji GPL-nekompatibilní knihovnu 
s GPL "
 "software?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -911,7 +915,7 @@
 "chci jí vydat pod GPL. Je pod GPL dovoleno můj program dynamicky linkovat s 
"
 "run-time knihovnami Visual C++ (nebo Visual Basicu)?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -925,7 +929,7 @@
 "uživatel, který by chtěl změnit tyto verze, by musel získat tyto 
knihovny "
 "odděleně. Proč to GPL nepovoluje?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -934,7 +938,7 @@
 "I combine or link Q with a GPL-covered program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -945,7 +949,7 @@
 "nebudu ji modifikovat ani z ní odvozovat třídy nové, jakým způsobem GPL 
"
 "ovlivňuje celý program?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -956,7 +960,7 @@
 "proprietárních programů s mou GPL-knihovnou pouze přes kontrolované 
rozhraní?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -968,7 +972,7 @@
 "změnami a novým kódem, který je založen na V1.  (3)&nbsp;X chce 
zkonvertovat "
 "V2 na ne-GPL licenci.  Potřebuje X povolení od Y?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -982,11 +986,7 @@
 "požadavky jsou kladeny na můj program. Můžete mi, prosím, říci, jaké 
licence "
 "mám použít?</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "Otázky o porušení GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -994,7 +994,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\"> Co bych měl "
 "dělat, pokud odhalím porušení GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1002,7 +1002,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\"> Kdo má moc prosazovat "
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1011,7 +1011,7 @@
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\"> Slyšel jsem, že 
"
 "někdo dostal kopii GPL programu pod nějakou jinou licencí, je to 
možné?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1021,7 +1021,7 @@
 "programu krytého pod GPL nějak omezen GPL? Mohlo by být chování tohoto "
 "vývojáře za nějakých okolností porušením GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5129,14 +5129,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 ""
 "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné a 
kvalitní "
@@ -5147,13 +5153,13 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2001-] {+2001, 2006, 2007, 2008, 2014, 2015, 2017,
-# | 2018, 2019, 2020+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2001-] {+2001-2007, 2009, 2011, 2014, 2015, 2017, 2019,
+# | 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid "Copyright &copy; 2001 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr "Copyright &copy; 2001 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -5177,6 +5183,19 @@
 msgstr "Aktualizováno:"
 
 #~ 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 ""
+#~ "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné 
a "
+#~ "kvalitní překlady. Nicméně i my můžeme udělat chybu. Vaše 
komentáře a "
+#~ "návrhy na vylepšení vítáme na adrese <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\"> &lt;web-translators@gnu.org&gt;</a>.</p> <p>Přečtěte si prosím  
<a "
+#~ "href=\"/server/standards/README.translations.html\">Příručku "
+#~ "překladatele</a>, kde se dozvíte, jak koordinovat svoji práci a 
posílat "
+#~ "překlady tohoto článku."
+
+#~ msgid ""
 #~ "Linking ABC statically or dynamically with other modules is making\n"
 #~ "a combined work based on ABC.  Thus, the terms and conditions of\n"
 #~ "the GNU General Public License cover the whole combination.\n"

Index: old-licenses/po/gpl-2.0-faq.de.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.de.po,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- old-licenses/po/gpl-2.0-faq.de.po   31 May 2021 13:39:50 -0000      1.78
+++ old-licenses/po/gpl-2.0-faq.de.po   29 Dec 2021 16:01:01 -0000      1.79
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2017-03-29 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"
@@ -30,7 +30,7 @@
 msgstr "Häufig gestellte Fragen zur GNU General Public License, Version 2"
 
 # Added all current licenses to use their abbreviations below.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -50,7 +50,7 @@
 "und der <b><span xml:lang=\"en\" lang=\"en\">GNU Free Documentation License</"
 "span></b> (<b>FDL</b>), Version 1.3</ins>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -60,11 +60,11 @@
 "Antworten zur GNU GPLv2\" hreflang=\"en\">Frage- und Antwortspiel zur Freie-"
 "Software-Lizenzierung</a></cite> überprüfen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
@@ -72,7 +72,32 @@
 "Grundlegende Fragen zur GPL, dem GNU-Projekt sowie der <span xml:lang=\"en\" "
 "lang=\"en\">Free Software Foundation</span>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "Allgemeines Verständnis der GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "Verwenden der GPL für eigene Programme"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "Distribution von unter GPL freigegebenen Programmen"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr ""
+"Nutzen von GPL lizenzierten Programmen beim Schreiben anderer Programme"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "Kombination eines Werks mit unter GPL freigegebenem Quellcode"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "Fragen zu Lizenzverletzungen der GPL"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -80,7 +105,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">Wofür steht "
 "denn <em>GPL</em>?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -90,7 +115,7 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Bedeutet Freie Software die GPL zu "
 "verwenden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -100,7 +125,7 @@
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Verwendet jede GNU-"
 "Software die GNU GPL als Lizenz?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -110,7 +135,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Wird durch die Verwendung "
 "der GPL aus einem Programm GNU-Software?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -118,7 +143,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Kann die "
 "GPL für etwas anderes als Software verwendet werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -126,7 +151,7 @@
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Warum wird "
 "die GPL nicht für Handbücher verwendet?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -134,7 +159,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Gibt es Übersetzungen 
"
 "der GPL in andere Sprachen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -144,7 +169,7 @@
 "einige GNU-Bibliotheken unter der <!--gewöhnlichen -->GPL anstatt der LGPL "
 "freigegeben?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -157,7 +182,7 @@
 "von Urheberrechten eines GPL lizenzierten Programms bin, sollte ich das auch "
 "tun? Wenn ja, wie?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
@@ -165,11 +190,7 @@
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Darf die GPL modifiziert und eine "
 "modifizierte Lizenz erstellt werden?</a>"
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "Allgemeines Verständnis der GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -179,7 +200,7 @@
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Warum erlaubt "
 "die GPL Nutzern, ihre modifizierten Versionen zu veröffentlichen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -189,7 +210,7 @@
 "\"TOCGPLRequireSourcePostedPublic\">Schreibt die GNU GPL vor, dass der "
 "Quellcode modifizierter Versionen veröffentlicht wird?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
@@ -199,7 +220,7 @@
 "\">Kann ein GPL-lizenziertes Programm und ein sich damit nicht in Verbindung "
 "stehendes unfreies Programm auf demselben Rechner befinden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
@@ -208,7 +229,7 @@
 "dass jemand eine Kopie eines GPL lizenzierten Programms besitzt, kann man "
 "eine Kopie verlangen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -220,7 +241,7 @@
 "jeder auf der Welt kann den Quellcode eines beliebigen GPL lizenzierten "
 "Programms erhalten, unabhängig welches?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -230,7 +251,7 @@
 "\">Die GPL besagt, dass modifizierte Versionen, sofern freigegeben, „an 
alle "
 "Dritte […] lizenziert\" werden müssen. Wer sind diese Dritte?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -238,7 +259,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Erlaubt die "
 "GPL, Programmkopien gegen Entgelt zu verkaufen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -248,7 +269,7 @@
 "\">Erlaubt die GPL ein Entgelt für das Herunterladen des Programms über "
 "meine Internetpräsenz zu erheben?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -258,7 +279,7 @@
 "\">Erlaubt die GPL zu verlangen, dass jedermann, der die Software erhält, "
 "ein Entgelt an mich bezahlen und/oder mich benachrichtigen muss?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -270,7 +291,7 @@
 "gegen Entgelt distribuiert wird, ist man verpflichtet sie auch der "
 "Öffentlichkeit gratis bereitzustellen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -278,7 +299,7 @@
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Erlaubt die "
 "GPL, Kopien unter einer Geheimhaltungsvereinbarung zu distribuieren?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -288,7 +309,7 @@
 "die GPL eine modifizierte oder Beta-Version unter einer "
 "Geheimhaltungsvereinbarung zu distribuieren?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -298,7 +319,7 @@
 "die GPL eine modifizierte Version unter einer Geheimhaltungsvereinbarung zu "
 "entwickeln?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -308,7 +329,7 @@
 "\">Muss ich ein Copyright auf meine Änderungen an einem GPL lizenzierten "
 "Programm beanspruchen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -320,7 +341,7 @@
 "entlassene Teil als in die Gemeinfreiheit entlassener Quellcode verwendet "
 "werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -330,7 +351,7 @@
 "mein Werk erhalten. Ich möchte jedem wissen lassen, was ich geschrieben "
 "habe. Erhalte ich diese, wenn ich die GPL als Lizenz verwende?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -338,7 +359,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">Was bedeutet, zwei "
 "Lizenzen seien <em>vereinbar</em>?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -346,7 +367,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">Was bedeutet, "
 "eine Lizenz sei <em>mit der GPL vereinbar</em>?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -354,7 +375,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Warum ist die Original-BSD-Lizenz [4-"
 "Klausel-BSD] mit der GPL unvereinbar?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -366,7 +387,7 @@
 "Quellcode in einem neuen Programm modifiziert, dann vertrieben und dieses "
 "neue Programm kommerziell verkauft werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
@@ -374,11 +395,7 @@
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">Wie funktioniert die LGPL mit Java?"
 "</a>"
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "Verwenden der GPL für eigene Programme"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -387,7 +404,7 @@
 "eine Schritt-für-Schritt-Anleitung, wie man die GPL auf eigene Programm "
 "anwenden kann?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -395,7 +412,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Warum sollte die GNU GPL anderen "
 "freien Softwarelizenzen vorgezogen werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -403,7 +420,7 @@
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Warum erfordert die "
 "GPL, eine Kopie der GPL mit jeder Programmkopie beizufügen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -411,7 +428,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">Was passiert, "
 "wenn das Werk nicht viel länger als die Lizenz selbst ist?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -421,7 +438,7 @@
 "GPL oder die Anweisungen, wie sie auf eigene Programmen anwendbar sind, "
 "weglassen werden, um Speicherplatz zu sparen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -429,7 +446,7 @@
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">Wie erhalte ich ein "
 "Copyright auf mein Programm, um es unter der GPL freizugeben?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -438,7 +455,7 @@
 "Schule mein Programm möglicherweise in ein eigenes proprietäres "
 "Softwareprodukt aufnehmen möchte?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -448,7 +465,7 @@
 "ein selbst geschriebenes Programm unter GNU GPL freigeben, aber ich möchte "
 "denselben Quellcode in unfreien Programmen nutzen.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -458,7 +475,7 @@
 "der Entwickler eines unter der GPL verriebenen Programms dieses später zur "
 "exklusiven Nutzung an Dritte lizenzieren?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
@@ -466,7 +483,7 @@
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Kann die US-Regierung ein Programm "
 "unter der GNU GPL freigeben?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -475,7 +492,7 @@
 "Programme <em>„Version 2 der GPL oder jeder neueren Version“</em> 
besagen?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
@@ -484,7 +501,7 @@
 "Schriftarten anwendbar?</a>"
 
 # # String taken from FAQ text
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
@@ -496,7 +513,7 @@
 "‚„Content“-Management-System‘, CMS] bzw. eine andere Anwendung, die "
 "Internetseiten aus Vorlagen generiert.</ins>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
@@ -505,11 +522,7 @@
 "GPL freigegeben werden, welches mit unfreien Dienstprogrammen entwickelt "
 "wurde?</a>"
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "Distribution von unter GPL freigegebenen Programmen"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
@@ -518,7 +531,7 @@
 "modifizierte Version eines GPL lizenzierten Programms nur in binärer Form "
 "freigegeben werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
@@ -529,7 +542,7 @@
 "distribuiere, muss ich auch den Quellcode besorgen und ebenso distribunieren?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" id="
 "\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -541,7 +554,7 @@
 "physikalische Medien ohne begleitenden Quellcode distribuieren. Kann der "
 "Quellcode per FTP statt per Versandhandel bereitgestellt werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -554,7 +567,7 @@
 "machte eine Kopie für mich. Kann ich das Angebot nutzen, um den Quellcode zu 
"
 "erhalten?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -565,7 +578,7 @@
 "Internet-Server abgelegt werden und der Quellcode unter einer andere "
 "Internetpräsenz?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -576,7 +589,7 @@
 "Form distribunieren. Reicht es, den Quellcode für die ursprüngliche Version 
"
 "zu distribunieren?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" id="
 "\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, but "
@@ -589,7 +602,7 @@
 "distribunieren. Ist es in Ordnung, wenn ich Nutzern die Diffs der 
„Standard“-"
 "Version zusammen mit den Binärdateien aushändige?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -599,7 +612,7 @@
 "möchte Binärdateien für anonymes FTP bereitstellen, aber den Quellcode nur 
"
 "an Personen senden, die diesen anfordern.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -610,7 +623,7 @@
 "dass jeder Benutzer, der die Binärdateien herunterlädt, auch den Quellcode "
 "erhält?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -622,7 +635,7 @@
 "Versionen davon unter der GPL distribuiert werden können, nicht jedoch das "
 "Original selbst unter der GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
@@ -633,7 +646,7 @@
 "Internetpräsenz aus. Besagt die GPL, dass sie ihre modifizierten Quellcodes "
 "freigeben müssen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
@@ -642,7 +655,7 @@
 "Gebrauch innerhalb einer Organisation oder eines Unternehmens "
 "<em>Distribution</em>?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
@@ -652,7 +665,7 @@
 "die eine Version eines GPL lizenzierten Programms enthält, gibt die GPL das "
 "Recht, diese Version neu zu distribuieren?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a
 # | company distributes a copy {+of some other developers' GPL-covered work to
 # | me+} as a trade secret?</a>
@@ -668,7 +681,7 @@
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\">Was passiert, "
 "wenn ein Unternehmen eine Kopie als Geschäftsgeheimnis vertreibt?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a [-href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\">-]
 # | {+href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\">+} What if a
 # | company distributes a copy {+of its own GPL-covered work to me+} as a
@@ -685,7 +698,7 @@
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\">Was passiert, "
 "wenn ein Unternehmen eine Kopie als Geschäftsgeheimnis vertreibt?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
@@ -695,7 +708,7 @@
 "Verschieben einer Programmkopie an eine mit Mehrheit beteiligte und "
 "kontrollierte Tochtergesellschaft eine Distribution dar?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
@@ -706,7 +719,7 @@
 "Wenn ich eine GPL lizenzierte Software erhalte, muss ich irgendetwas "
 "zustimmen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
@@ -717,12 +730,7 @@
 "Muss dieses Installationsprogramm eine mit der GPL vereinbare Lizenz haben?</"
 "a>"
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr ""
-"Nutzen von GPL lizenzierten Programmen beim Schreiben anderer Programme"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
@@ -733,7 +741,7 @@
 "werden? Können sie mit unter GPL lizenzierten Dienstprogrammen wie <b>GNU "
 "Compiler Collection</b> (GCC) kompiliert werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -745,7 +753,7 @@
 "Beispielsweise wenn mein Programm benutzt wird um Hardware-Pläne zu "
 "entwickeln, kann ich verlangen, dass diese frei sein müssen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -754,7 +762,7 @@
 "Fällen wird die Ausgabe eines GPL lizenzierten Programms  auch durch die GPL 
"
 "abgedeckt?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -765,7 +773,7 @@
 "Software unter der GPL oder einer anderen freien Softwarelizenz freigeben "
 "muss?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
@@ -773,11 +781,7 @@
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Erlaubt die libstdc-"
 "Ausnahme die dynamische Verbindung?</a>"
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "Kombination eines Werks mit unter GPL freigegebenem Quellcode"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -787,7 +791,7 @@
 "Unterschied zwischen einer <em>lediglich zusammengefassten</em> und "
 "<em>Kombination von zwei Modulen in einem Programm</em>?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -796,7 +800,7 @@
 "Rechte (‚Angemessene Verwendung‘) im Umgang mit dem Quellcode eines GPL "
 "lizenzierten Programms?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
@@ -804,7 +808,7 @@
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Kann die US-Regierung "
 "Verbesserungen an einem GPL lizenzierten Programm freigeben?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -814,7 +818,7 @@
 "unter der GPL (nicht LGPL!) freigegeben wird, bedeutet das, dass jedes "
 "Programm, das diese verwendet, unter der GPL freigegeben werden muss?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -826,7 +830,7 @@
 "proprietäres Programm zu erstellen. Bedeutet die Tatsache der Verbindung, "
 "dass das eigene Programm GPL lizenziert werden muss?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -835,7 +839,7 @@
 "irgendeine Möglichkeit eine Lizenz des Programms unter der Lesser GPL zu "
 "erhalten?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -847,7 +851,7 @@
 "unserem Projekt, proprietäre Software zu entwickeln. Wird man für uns eine "
 "Ausnahme machen? Es würde mehr Nutzer dieses Programms bedeuten.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -859,7 +863,7 @@
 "dann auch, dass Programme von diesem unter mit der GPL vereinbaren Lizenzen "
 "interpretiert werden muss?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -870,7 +874,7 @@
 "nicht mit der GPL vereinbar ist, kann man damit mit der GPL vereinbare "
 "Programme ausführen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -880,7 +884,7 @@
 "einem unter GPL lizenzierten Programm hinzufügt wird, muss die GPL als "
 "Lizenz für dieses Modul verwendet werden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
@@ -888,7 +892,7 @@
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\">Wann wird ein Programm und "
 "seine Plug-ins als ein einzelnes kombiniertes Programm angesehen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -898,7 +902,7 @@
 "freigegebenes Programm Plug-ins verwendet, was sind die Voraussetzungen für "
 "die Lizenzen eines Plug-in?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
@@ -906,7 +910,7 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Kann die GPL angewendet "
 "werden, wenn ein Plug-in für ein unfreies Programm geschrieben wird?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
@@ -915,7 +919,7 @@
 "Programm freigegeben werden, dass entworfen wurde ein GPL-lizenziertes Plug-"
 "in zu laden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -925,7 +929,7 @@
 "möchte GPL lizenzierte Software in meinem proprietären System einbinden. "
 "Kann ich dies tun?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -939,7 +943,7 @@
 "permissiven Lizenz (wie der X11-Lizenz) zwischen dem GPL unterliegenden und "
 "dem proprietären Teil stellt?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
@@ -947,7 +951,7 @@
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\">Kann Freie Software "
 "geschrieben werden, die unfreie Bibliotheken nutzt?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
@@ -957,7 +961,7 @@
 "Bibliotheken mit GPL unterliegender Software nutze?</a>"
 
 # Add missing '<ins>(oder Visual Basic) </ins>'
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -970,7 +974,7 @@
 "Verbinden meines Programms mit der Visual C++<ins> (oder Visual Basic)</ins>-"
 "Laufzeitbibliothek unter der GPL erlaubt?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -985,7 +989,7 @@
 "Versionen ändern wollten, jene Bibliotheken würden separat erhalten 
müssen. "
 "Warum erlaubt die GPL dies nicht?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -1001,7 +1005,7 @@
 "ich <em>Q</em> mit einem GPL lizenzierten Programm kombinieren bzw. "
 "verbinden?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -1012,7 +1016,7 @@
 "Java aus, wenn eine unmodifizierte, GPL lizenzierte Klasse als Unterklasse "
 "verwendet wird?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -1023,7 +1027,7 @@
 "proprietären Modulen mit meiner der GPL unterliegenden Bibliothek unter "
 "ausschließlich einer kontrollierten Oberfläche erlauben?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -1035,7 +1039,7 @@
 "mit Änderungen und neuem auf V1 basierenden Quellcode bei. 3. X möchte V2 
in "
 "eine andere Lizenz als die GPL ändern. Benötigt X die Berechtigung von 
Y?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -1049,11 +1053,7 @@
 "welche Lizenzanforderungen an mein Programm gestellt sind. Können Sie mir "
 "bitte sagen, welche Lizenzen ich verwenden kann?</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "Fragen zu Lizenzverletzungen der GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -1061,7 +1061,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">Was sollte ich "
 "tun, wenn ich eine mögliche Verletzung der GNU GPL entdecke?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1069,7 +1069,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Wer hat die Befugnis, "
 "die GPL durchzusetzen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1079,7 +1079,7 @@
 "dass jemand eine Kopie eines GPL lizenzierten Programms unter einer anderen "
 "Lizenz erhielt. Ist das möglich?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1089,7 +1089,7 @@
 "eines GPL lizenzierten Programms an die GPL gebunden? Könnten die Handlungen 
"
 "des Entwicklers jemals eine Verletzung der GPL darstellen?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -4808,14 +4808,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. "
@@ -4829,15 +4835,15 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, [-2017-] {+2017,
-# | 2018, 2019, 2020+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2001, 2006, 2007, 2008,-] {+2001-2007, 2009, 2011,+}
+# | 2014, 2015, [-2017-] {+2017, 2019, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017 Free Software "
 "Foundation, Inc."

Index: old-licenses/po/gpl-2.0-faq.es.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.es.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- old-licenses/po/gpl-2.0-faq.es.po   29 Dec 2021 15:55:37 -0000      1.57
+++ old-licenses/po/gpl-2.0-faq.es.po   29 Dec 2021 16:01:01 -0000      1.58
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2020-07-11 09:44-0400\n"
 "Last-Translator: Dora Scilipoti\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-12-29 15:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 2.2\n"
 
@@ -30,7 +31,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "Preguntas frecuentes acerca de la versión 2 de la GPL de GNU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -45,7 +46,7 @@
 "Foundation</cite>, consulte <a href=\"/licenses/licenses.html\">nuestra "
 "página de licencias</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -54,11 +55,11 @@
 "\">poner a prueba sus conocimientos de las licencias de software libre con "
 "nuestro test</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "Índice general"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
@@ -66,7 +67,33 @@
 "Preguntas básicas acerca de la GPL, el proyecto GNU y la Free Software "
 "Foundation"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "Ideas generales acerca de la GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "Utilización de la GPL para sus programas"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "Distribución de programas publicados bajo la GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr ""
+"Utilización de programas publicados bajo la GPL cuando se escriben otros "
+"programas"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "Combinación de trabajos con código publicado bajo la GPL"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "Preguntas acerca de incumplimientos de la GPL"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -74,7 +101,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">¿Qué "
 "significa «GPL»?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -84,7 +111,7 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Cuando se habla de software libre, "
 "¿significa que se está empleando la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -94,7 +121,7 @@
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">¿Todos los programas de "
 "GNU utilizan como licencia la GPL de GNU?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -104,7 +131,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Utilizar la GPL para un "
 "programa, ¿lo convierte en software de GNU?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -112,7 +139,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">¿Puedo "
 "utilizar la GPL para algo que no sea software?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -120,7 +147,7 @@
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">¿Por qué no "
 "utilizan la GPL para manuales?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -128,7 +155,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">¿Hay traducciones de "
 "la GPL a otras lenguas?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -138,7 +165,7 @@
 "algunas bibliotecas de GNU están publicadas bajo la GPL ordinaria en lugar "
 "de la GPL Reducida?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -151,7 +178,7 @@
 "copyright de un programa que está bajo la GPL, ¿también yo debo hacerlo? 
Si "
 "es así, ¿cómo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
@@ -159,11 +186,7 @@
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">¿Puedo modificar la GPL y hacer "
 "una licencia modificada?</a>"
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "Ideas generales acerca de la GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -173,7 +196,7 @@
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">¿Por qué la "
 "GPL permite a los usuarios publicar versiones modificadas?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -183,7 +206,7 @@
 "\"TOCGPLRequireSourcePostedPublic\">¿Exige la GPL que el código fuente de "
 "las versiones modificadas se ponga a disposición del público?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
@@ -193,7 +216,7 @@
 "\"> ¿Puedo tener en el mismo ordenador un programa cubierto por la GPL y un "
 "programa distinto que no sea libre?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
@@ -202,7 +225,7 @@
 "tiene copias de un programa cubierto por la GPL, ¿puedo exigirle que me "
 "proporcione una copia?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -214,7 +237,7 @@
 "¿Significa que cualquier persona puede obtener el código fuente de 
cualquier "
 "programa publicado bajo la GPL, incondicionalmente?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -225,7 +248,7 @@
 "ser «licenciadas &hellip; a todas las terceras partes». ¿Quiénes son esas 
"
 "terceras partes?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -233,7 +256,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">¿Me permite 
"
 "la GPL vender copias del programa?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -243,7 +266,7 @@
 "¿Me permite la GPL cobrar por bajar el programa del sitio de mi 
distribución?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -253,7 +276,7 @@
 "¿Me autoriza la GPL a exigir que cualquiera que reciba el software haya de "
 "abonarme alguna cantidad o notificármelo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -265,7 +288,7 @@
 "licencia GPL a cambio de dinero, ¿es necesario que lo ponga a disposición "
 "también gratuitamente?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -273,7 +296,7 @@
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">¿Me permite la "
 "GPL distribuir una copia bajo un acuerdo de no divulgación?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -283,7 +306,7 @@
 "permite la GPL distribuir una versión modificada o una versión beta bajo un 
"
 "acuerdo de no divulgación?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -293,7 +316,7 @@
 "permite la GPL desarrollar una versión modificada bajo un acuerdo de no "
 "divulgación?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -303,7 +326,7 @@
 "preciso que reclame el copyright de mis modificaciones de un programa "
 "cubierto por la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -314,7 +337,7 @@
 "la GPL, ¿puedo tomar la parte que es de dominio público y utilizarla como "
 "código de dominio público?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -324,7 +347,7 @@
 "reconocimiento por mi trabajo. Quiero que la gente sepa lo que he escrito. "
 "¿Puedo obtener el reconocimiento si uso la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -332,7 +355,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">¿Qué significa que 
"
 "dos licencias son «compatibles»?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -340,7 +363,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">¿Qué significa 
"
 "que una licencia es «compatible con la GPL»?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -348,7 +371,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">¿Por qué la licencia BSD original es 
"
 "incompatible con la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -360,18 +383,14 @@
 "código original para hacer un nuevo programa, y luego distribuir y vender "
 "ese nuevo programa comercialmente?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
 msgstr ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">¿Cómo funciona la LGPL con 
Java?</a>"
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "Utilización de la GPL para sus programas"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -379,7 +398,7 @@
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">¿Podrían "
 "indicarme uno a uno los pasos a seguir para aplicar la GPL a mi programa?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -387,7 +406,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">¿Por qué debería usar la GPL de 
"
 "GNU en lugar de otras licencias de software libre?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -395,7 +414,7 @@
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">¿Por qué exige la 
GPL "
 "que en toda copia del programa se incluya una copia de la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -403,7 +422,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">¿Y si la obra no "
 "es mucho más larga que la propia licencia?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -413,7 +432,7 @@
 "preámbulo de la GPL, o las instrucciones acerca de la manera de utilizarla "
 "en los programas propios, para ahorrar espacio?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -421,7 +440,7 @@
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">¿Cómo consigo un "
 "copyright de mi programa con el fin de publicarlo bajo la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -430,7 +449,7 @@
 "enseñanza quiere incluir mi programa en sus productos de software privativo?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -440,7 +459,7 @@
 "publicar bajo la GPL de GNU un programa que he escrito, pero quisiera usar "
 "el mismo código en programas que no son libres.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -450,7 +469,7 @@
 "desarrollador de un programa que en principio lo distribuyó bajo la GPL, "
 "¿puede más adelante licenciarlo a terceras partes para su uso 
exclusivo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
@@ -458,7 +477,7 @@
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">¿Puede el gobierno de los EE. UU. "
 "publicar un programa bajo la GPL de GNU?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -467,7 +486,7 @@
 "programas deben decir «Versión 2 de la GPL o cualquier versión 
posterior»?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
@@ -475,7 +494,7 @@
 "<a href=\"#FontException\" id=\"TOCFontException\">¿Cómo se aplica la GPL a 
"
 "los tipos de letra?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
@@ -483,7 +502,7 @@
 "<a href=\"#WMS\" id=\"TOCWMS\">¿Qué licencia debería utilizar para las "
 "plantillas de un sistema de mantenimiento de un sitio web?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
@@ -491,11 +510,7 @@
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">¿Puedo publicar bajo la GPL 
"
 "un programa que he creado utilizando herramientas que no son libres?</a>"
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "Distribución de programas publicados bajo la GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
@@ -504,7 +519,7 @@
 "una versión modificada de un programa cubierto por la GPL, en forma binaria "
 "únicamente?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
@@ -514,7 +529,7 @@
 "sólo los binarios. Si distribuyo copias, ¿tengo que conseguir los archivos "
 "fuente y distribuirlos también?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" id="
 "\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -527,7 +542,7 @@
 "proporcionar el código fuente por FTP en vez de hacerlo por correo postal?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -540,7 +555,7 @@
 "para mí. ¿Puedo también yo hacer uso de la oferta para obtener los 
archivos "
 "fuente?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -550,7 +565,7 @@
 "\"TOCSourceAndBinaryOnDifferentSites\">¿Puedo poner los binarios en mi "
 "servidor y los fuente en un sitio diferente de Internet?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -561,7 +576,7 @@
 "cubierto por la GPL. ¿Basta con distribuir el código fuente de la versión "
 "original?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" id="
 "\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, but "
@@ -573,7 +588,7 @@
 "distribuir el código fuente completo es un engorro. ¿Vale si con los "
 "binarios proporciono a los usuarios los diffs de la versión 
«estándar»?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -583,7 +598,7 @@
 "poner los binarios a disposición a través de un FTP anónimo, pero enviar 
los "
 "archivos fuente sólo a quien los solicite.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -594,7 +609,7 @@
 "todo usuario que se baje los binarios obtenga también los archivos fuente?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -606,7 +621,7 @@
 "modificadas del mismo bajo la GPL, pero que no puede distribuir el original "
 "bajo la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
@@ -617,7 +632,7 @@
 "bajo la GPL. ¿Dice la GPL que deben publicar los archivos fuente 
modificados?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
@@ -625,7 +640,7 @@
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\">¿Es "
 "«distribución» el uso dentro de una organización o empresa?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
@@ -635,7 +650,7 @@
 "contiene una versión de un programa cubierto por la GPL, ¿le concede la GPL 
"
 "el derecho de redistribuir esa versión?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
@@ -645,7 +660,7 @@
 "una empresa distribuye como secreto comercial una copia de alguna obra de "
 "otros desarrolladores cubierta por la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
@@ -655,7 +670,7 @@
 "si una empresa me proporciona como secreto comercial una copia de una obra "
 "suya cubierta por la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
@@ -665,7 +680,7 @@
 "distribución trasladar una copia a una empresa subsidiaria cuyo control y "
 "propiedad se tiene en mayoría?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
@@ -676,7 +691,7 @@
 "mostrar su acuerdo con la GPL? Si obtengo un programa bajo la GPL, ¿he de "
 "manifestar mi acuerdo con algo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
@@ -687,13 +702,7 @@
 "¿Implica esto que el instalador debe tener una licencia compatible con la "
 "GPL?</a>"
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr ""
-"Utilización de programas publicados bajo la GPL cuando se escriben otros "
-"programas"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
@@ -704,7 +713,7 @@
 "desarrollar programas que no son libres? ¿Puedo emplear herramientas tales "
 "como GCC para compilarlos?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -717,7 +726,7 @@
 "diseños de hardware, ¿puedo exigir que esos diseños tengan que ser 
libres?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -726,7 +735,7 @@
 "los archivos de salida de un programa cubierto por la GPL están también "
 "cubiertos por la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -737,7 +746,7 @@
 "publicarlo como software libre, bajo la GPL o alguna otra licencia de "
 "software libre?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
@@ -745,11 +754,7 @@
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">¿La excepción de "
 "<i>libstdc++</i> permite los enlaces dinámicos?</a>"
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "Combinación de trabajos con código publicado bajo la GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -759,7 +764,7 @@
 "entre la «mera agregación» y la «combinación de dos módulos para formar 
un "
 "programa»?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -768,7 +773,7 @@
 "legítimo» [<cite>fair use</cite>] para utilizar el código fuente de un "
 "programa cubierto por la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
@@ -776,7 +781,7 @@
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">¿Puede el gobierno de los EE. 
"
 "UU. publicar mejoras de un programa cubierto por la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -786,7 +791,7 @@
 "publica bajo la GPL (y no bajo la LGPL), ¿significa esto que cualquier "
 "programa que la utilice ha de estar bajo la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -798,7 +803,7 @@
 "programa privativo. El hecho de enlazar con su programa, ¿significa que "
 "tengo que publicar mi programa bajo la GPL</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -807,7 +812,7 @@
 "posibilidad de conseguir una licencia de su programa bajo la GPL Reducida?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -819,7 +824,7 @@
 "de hacer software privativo. ¿Harían una excepción para nosotros? Eso "
 "representaría más usuarios del programa.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -831,7 +836,7 @@
 "esto que los programas escritos para ser interpretados por él han de tener "
 "licencias compatibles con la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -842,7 +847,7 @@
 "incompatible con la GPL, ¿puedo ejecutar en él programas cubiertos por la "
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -852,7 +857,7 @@
 "a un programa cubierto por la GPL, ¿tengo que usar la GPL como licencia para 
"
 "mi módulo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
@@ -860,7 +865,7 @@
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> ¿Cuándo un programa y sus "
 "accesorios se consideran un solo programa combinado?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -870,7 +875,7 @@
 "bajo la GPL utiliza accesorios [<cite>plug-ins</cite>], ¿cuáles son los "
 "requisitos para las licencias de un accesorio?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
@@ -878,7 +883,7 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">¿Puedo utilizar la GPL "
 "al escribir un accesorio para un programa que no es libre?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
@@ -887,7 +892,7 @@
 "programa privativo que está diseñado para cargar un accesorio cubierto por "
 "la GPL??</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -897,7 +902,7 @@
 "gustaría incorporar software cubierto por la GPL a mi sistema privativo. "
 "¿Puedo hacerlo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -911,7 +916,7 @@
 "permisiva (como la licencia X11), entre la parte cubierta por la GPL y la "
 "parte privativa?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
@@ -919,7 +924,7 @@
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\">¿Puedo escribir software "
 "libre que utilice bibliotecas que no son libres?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
@@ -928,7 +933,7 @@
 "problemas legales pueden producirse si utilizo bibliotecas incompatibles con "
 "la GPL con software GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -941,7 +946,7 @@
 "dinámicamente con la biblioteca en tiempo de ejecución Visual C++ (o Visual 
"
 "Basic)?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -956,7 +961,7 @@
 "quisiera cambiar esas versiones tendría que obtener dichas bibliotecas por "
 "separado. ¿Por qué la GPL no lo permite?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -971,7 +976,7 @@
 "licencia sea incompatible con la GPL? ¿Puedo combinar o enlazar Q con un "
 "programa cubierto por la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -982,7 +987,7 @@
 "la convierto en una subclase, ¿en qué modo afecta la GPL al programa 
mayor?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -993,7 +998,7 @@
 "biblioteca, cubierta por la GPL, se enlacen módulos privativos únicamente "
 "bajo una interfaz controlada?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -1006,7 +1011,7 @@
 "1.  3. X quiere poner la versión 2 bajo una licencia distinta de la GPL. "
 "¿Necesita X el permiso de Y?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -1020,11 +1025,7 @@
 "tener la licencia de mi programa. ¿Pueden explicarme qué licencias puedo "
 "usar?</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "Preguntas acerca de incumplimientos de la GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -1032,7 +1033,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">¿Qué debo 
hacer "
 "si descubro un posible incumplimiento de la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1040,7 +1041,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">¿Quién tiene la "
 "facultad de hacer cumplir la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1050,7 +1051,7 @@
 "alguien obtuvo una copia de un programa GPL bajo otra licencia. ¿Es esto "
 "posible?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1061,7 +1062,7 @@
 "¿Podrían en algún caso los actos del desarrollador constituir un "
 "incumplimiento de la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5257,7 +5258,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
@@ -5265,14 +5265,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 "
@@ -5284,9 +5284,16 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2001, 2006, 2007, 2008,-] {+2001-2007, 2009, 2011,+}
+# | 2014, 2015, 2017, [-2018,-] 2019, 202[-0-]{+1+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#| "2020 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
 "Free Software Foundation, Inc."
@@ -5313,10 +5320,9 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."

Index: old-licenses/po/gpl-2.0-faq.fr.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.fr.po,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- old-licenses/po/gpl-2.0-faq.fr.po   29 Dec 2021 15:55:37 -0000      1.112
+++ old-licenses/po/gpl-2.0-faq.fr.po   29 Dec 2021 16:01:01 -0000      1.113
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2021-05-15 18:44+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-12-29 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -30,7 +31,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "Foire aux questions sur la GNU GPL version 2"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -45,7 +46,7 @@
 "sur les autres licences de la Fondation pour le logiciel libre, veuillez "
 "consulter <a href=\"/licenses/licenses.html\">notre page des licences</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -54,11 +55,11 @@
 "tester vos connaissances sur les licences de logiciel libre avec notre quiz "
 "(en anglais)</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "Table des matières"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
@@ -66,7 +67,31 @@
 "Questions de base sur la GPL, le projet GNU, et la Fondation pour le "
 "logiciel libre"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "Compréhension générale de la GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "Utiliser la GPL pour vos programmes"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "Distribution de programmes régis par la GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr "Utiliser des programmes sous GPL pour écrire d'autres programmes"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "Combiner un travail avec du code sous GPL"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "Questions sur les violations de la GPL"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -74,7 +99,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">Que veut dire "
 "« GPL » ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -84,7 +109,7 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Est-ce que « logiciel libre » "
 "signifie utilisation de la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -94,7 +119,7 @@
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Est-ce que tous les "
 "logiciels GNU utilisent la GNU GPL comme licence ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -104,7 +129,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Est-ce que le fait "
 "d'utiliser la GPL pour un programme en fait un logiciel GNU ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -112,7 +137,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Puis-je "
 "utiliser la GPL pour autre chose que des logiciels ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -120,7 +145,7 @@
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Pourquoi "
 "n'utilisez-vous pas la GPL pour les manuels ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -128,7 +153,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Existe-t-il des "
 "traductions de la GPL en d'autres langues ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -138,7 +163,7 @@
 "certaines bibliothèques GNU sont-elles distribuées sous GPL normale plutôt 
"
 "que sous GPL amoindrie <i>[Lesser GPL]</i> ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -151,7 +176,7 @@
 "copyright d'un programme sous GPL, est-ce que je dois faire la même 
chose ? "
 "Si oui, comment ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
@@ -159,11 +184,7 @@
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Puis-je modifier la GPL et faire "
 "une licence modifiée ?</a>"
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "Compréhension générale de la GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -173,7 +194,7 @@
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Pourquoi la "
 "GPL permet-elle aux utilisateurs de publier leurs versions modifiées ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -183,7 +204,7 @@
 "\"TOCGPLRequireSourcePostedPublic\">La GPL exige-t-elle que le code source "
 "des versions modifiées soit porté à la connaissance du public ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
@@ -193,7 +214,7 @@
 "\">Puis-je avoir un programme régi par la GPL et un programme non libre "
 "indépendant sur le même ordinateur ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
@@ -202,7 +223,7 @@
 "quelqu'un qui a une copie d'un programme régi par la GPL, puis-je exiger "
 "qu'il m'en donne une copie ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -215,7 +236,7 @@
 "n'importe qui peut obtenir les sources de n'importe quel programme sous GPL "
 "dans tous les cas ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -226,7 +247,7 @@
 "une licence&hellip; à tout tiers » <i>[licensed&hellip; to all third 
parties]"
 "</i>. Qui sont ces tiers ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -234,7 +255,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Est-ce que "
 "la GPL m'autorise à faire payer des exemplaires de mon programme ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -244,7 +265,7 @@
 "\">La GPL me permet-elle de réclamer une redevance pour le téléchargement "
 "d'un programme sur mon site de distribution ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -254,7 +275,7 @@
 "\">Est-ce que la GPL m'autorise à exiger que quiconque reçoit le logiciel 
me "
 "verse une redevance ou me le signale ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -266,7 +287,7 @@
 "régi par la GPL contre une redevance, suis-je obligé de le rendre 
également "
 "disponible au public gratuitement ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -274,7 +295,7 @@
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">La GPL me "
 "permet-elle de distribuer une copie sous accord de non-divulgation ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -284,7 +305,7 @@
 "permet-elle de distribuer une version modifiée ou beta sous accord de non-"
 "divulgation ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -294,7 +315,7 @@
 "me permet-elle de développer une version modifiée sous accord de non-"
 "divulgation ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -304,7 +325,7 @@
 "\">Suis-je obligé de revendiquer un copyright sur les modifications que "
 "j'apporte à un programme régi par la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -315,7 +336,7 @@
 "GPL, puis-je prendre le code appartenant au domaine public et l'utiliser "
 "comme tel ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -325,7 +346,7 @@
 "reconnu. Je veux que les gens sachent ce que j'ai écrit. Puis-je encore 
être "
 "reconnu si j'utilise la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -333,7 +354,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">Qu'est-ce que cela "
 "signifie que deux licences soient « compatibles » ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -341,7 +362,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">Que veut dire "
 "« licence compatible avec la GPL » ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -349,7 +370,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Pourquoi la licence BSD d'origine est-"
 "elle incompatible avec la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -361,7 +382,7 @@
 "le code original pour créer un nouveau programme, puis de commercialiser ce "
 "programme ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
@@ -369,11 +390,7 @@
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">Comment la LGPL fonctionne-t-elle "
 "avec Java ?</a>"
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "Utiliser la GPL pour vos programmes"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -382,7 +399,7 @@
 "vous me donner des instructions détaillées sur la façon d'appliquer la GPL 
à "
 "mon programme ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -390,7 +407,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Pourquoi devrais-je utiliser la "
 "GNU GPL plutôt que d'autres licences de logiciel libre ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -398,7 +415,7 @@
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Pourquoi la GPL exige-"
 "t-elle d'inclure une copie de la GPL avec chaque copie du programme ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -406,7 +423,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">Et si le "
 "programme n'est guère plus long que la licence elle-même ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -416,7 +433,7 @@
 "préambule de la GPL, ou le mode d'emploi (section <i>How to Apply These "
 "Terms to Your New Programs</i>), pour économiser de l'espace ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -424,7 +441,7 @@
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">Comment obtenir un "
 "copyright sur mon programme de façon à le distribuer sous GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -432,7 +449,7 @@
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">Et si mon école décidait 
de "
 "mettre mon programme dans son propre logiciel privateur ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -442,7 +459,7 @@
 "publier sous GNU GPL un programme que j'ai écrit, mais j'aimerais utiliser "
 "le même code dans un programme non libre.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -452,7 +469,7 @@
 "développeur d'un programme qui l'a distribué sous GPL peut-il ensuite "
 "établir avec un tiers une licence pour son usage exclusif ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
@@ -460,7 +477,7 @@
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Le gouvernement américain peut-il "
 "publier un programme sous la GNU GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -469,7 +486,7 @@
 "programmes doivent-ils se référer à « la version 2 de la GPL ou toute "
 "version ultérieure » <i>[version 2 of the GPL or any later 
version]</i> ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
@@ -477,7 +494,7 @@
 "<a href=\"#FontException\" id=\"TOCFontException\">Comment la GPL s'applique-"
 "t-elle aux polices ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
@@ -486,7 +503,7 @@
 "modèles de pages faisant partie d'un système de maintenance de site web "
 "(<abbr title=\"Content Management System\">CMS</abbr>) ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
@@ -494,11 +511,7 @@
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Puis-je publier sous GPL un "
 "programme que j'ai développé en utilisant des outils non libres ?</a>"
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "Distribution de programmes régis par la GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
@@ -507,7 +520,7 @@
 "une version modifiée d'un programme régi par la GPL sous forme binaire "
 "uniquement ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
@@ -518,7 +531,7 @@
 "distribue des copies, dois-je me procurer le code source et le redistribuer "
 "aussi ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" id="
 "\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -531,7 +544,7 @@
 "associées. Puis-je fournir le code source par FTP plutôt que de l'envoyer "
 "par la poste sur demande ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -543,7 +556,7 @@
 "sous GPL avec une offre de fourniture des sources, et a fait une copie pour "
 "moi. Puis-je utiliser l'offre pour obtenir les sources ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -553,7 +566,7 @@
 "\"TOCSourceAndBinaryOnDifferentSites\">Puis-je mettre les binaires sur mon "
 "serveur Internet et les sources sur un site Internet différent ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -564,7 +577,7 @@
 "binaire. Me suffit-il de distribuer le code source de la version 
originale ?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" id="
 "\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, but "
@@ -577,7 +590,7 @@
 "donnais aux utilisateurs les différences par rapport à la version "
 "« standard » en même temps que les binaires ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -587,7 +600,7 @@
 "rendre les fichiers binaires disponibles par FTP anonyme, mais envoyer les "
 "sources uniquement à ceux qui en font la demande</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -598,7 +611,7 @@
 "tout utilisateur qui télécharge les binaires obtient également le code "
 "source ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -610,7 +623,7 @@
 "versions modifiées sous la GPL, mais qu'on ne peut pas redistribuer "
 "l'original lui-même sous la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
@@ -620,7 +633,7 @@
 "version modifiée d'un programme sous GPL sur son site web. La GPL dit-elle "
 "qu'elle doit publier les sources modifiées ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
@@ -629,7 +642,7 @@
 "l'utilisation à l'intérieur d'une organisation ou d'une société est une "
 "« distribution » ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
@@ -639,7 +652,7 @@
 "contenant une version d'un programme sous GPL, la GPL lui donne-t-elle le "
 "droit de redistribuer cette version ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
@@ -649,7 +662,7 @@
 "société me distribue sous couvert du secret industriel une copie d'un "
 "programme sous GPL développé par des tiers ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
@@ -659,7 +672,7 @@
 "société me distribue sous couvert du secret industriel une copie d'un "
 "programme sous GPL qu'elle a développé elle-même ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
@@ -669,7 +682,7 @@
 "déplacer une copie vers une filiale contrôlée majoritairement constitue 
une "
 "distribution ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
@@ -680,7 +693,7 @@
 "j'obtiens un logiciel sous GPL, est-ce que je dois accepter quelque 
chose ?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
@@ -690,11 +703,7 @@
 "fournir un logiciel sous GPL avec un installeur. Cet installeur a-t-il "
 "besoin d'avoir une licence compatible avec la GPL ?</a>"
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr "Utiliser des programmes sous GPL pour écrire d'autres programmes"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
@@ -705,7 +714,7 @@
 "programmes non libres ? Puis-je utiliser des outils sous GPL comme GCC pour 
"
 "les compiler ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -718,7 +727,7 @@
 "conception de composants matériels, puis-je exiger que ces éléments de "
 "conception soient libres ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -727,7 +736,7 @@
 "cas le résultat produit par un programme sous GPL est-il également régi 
par "
 "la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -737,7 +746,7 @@
 "portage de mon programme vers GNU/Linux, cela veut-il dire que je dois le "
 "publier comme logiciel libre, sous GPL ou autre licence libre ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
@@ -745,11 +754,7 @@
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Est-ce que "
 "l'exception de libstdc++ permet les liaisons dynamiques ?</a>"
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "Combiner un travail avec du code sous GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -760,7 +765,7 @@
 "« combinaison de deux modules dans un seul programme » 
<i>[combining]</i> ?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -769,7 +774,7 @@
 "use</i> (usage raisonnable) pour l'utilisation du code source d'un programme "
 "régi par la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
@@ -778,7 +783,7 @@
 "peut-il publier des améliorations apportées à un programme régi par la 
GPL ?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -788,7 +793,7 @@
 "distribuée sous GPL (et non sous LGPL), cela veut-il dire que tout programme 
"
 "qui l'utilise doit être sous GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -800,7 +805,7 @@
 "privateur. Le fait que je fasse une édition de liens avec votre programme "
 "implique-t-il que je doive mettre mon programme sous GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -809,7 +814,7 @@
 "d'obtenir une licence de votre programme sous la GPL amoindrie <i>[Lesser "
 "GPL]</i> ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -822,7 +827,7 @@
 "exception pour nous? Cela augmenterait le nombre d'utilisateurs de ce "
 "programme</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -834,7 +839,7 @@
 "cela signifie que les programmes écrits pour être interprétés par 
celui-ci "
 "doivent être placés sous des licences compatibles avec la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -845,7 +850,7 @@
 "avec la GPL, puis-je l'utiliser pour exécuter des programmes régis par la "
 "GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -855,7 +860,7 @@
 "module à un module régi par la GPL, dois-je utiliser la GPL comme licence "
 "pour mon module ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
@@ -863,7 +868,7 @@
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\">Quand peut-on considérer un "
 "programme et ses greffons comme un programme combiné unique ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -873,7 +878,7 @@
 "pour un programme publié sous GPL, quelles contraintes cela impose-t-il aux "
 "licences qu'il m'est possible d'utiliser pour distribuer mon greffon ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
@@ -881,7 +886,7 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Puis-je utiliser la GPL "
 "pour un greffon dans un programme non libre ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
@@ -889,7 +894,7 @@
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Puis-je faire un "
 "programme non libre conçu pour charger un greffon régi par la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -899,7 +904,7 @@
 "\">J'aimerais incorporer un logiciel sous GPL dans mon système privateur. "
 "Est-ce possible ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -913,7 +918,7 @@
 "compatible avec la GPL (la licence X11, par exemple) entre la partie régie "
 "par la GPL et la partie privatrice ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
@@ -921,7 +926,7 @@
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\">Puis-je écrire un logiciel "
 "libre qui utilise des bibliothèques non libres ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
@@ -930,7 +935,7 @@
 "problèmes juridiques puis-je rencontrer si j'utilise avec du logiciel sous "
 "GPL des bibliothèques incompatibles avec la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -942,7 +947,7 @@
 "sous GPL. Est-il permis par la GPL de lier mon programme dynamiquement avec "
 "la bibliothèque d'exécution <i>[runtime]</i> de Visual C++ ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -956,7 +961,7 @@
 "bibliothèques, aussi tout utilisateur voulant modifier ces versions devrait "
 "acheter ces bibliothèques. Pourquoi la GPL ne le permet-elle pas ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -971,7 +976,7 @@
 "compatible avec la licence GPL ? Puis-je combiner ou lier Q avec un "
 "programme régi par la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -981,7 +986,7 @@
 "Java, si j'utilise une classe qui est sous GPL sans la modifier, et que j'en "
 "hérite, dans quelle mesure la GPL affecte-t-elle le programme 
résultant ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -992,7 +997,7 @@
 "de modules privateurs avec ma bibliothèque sous GPL uniquement dans une "
 "interface contrôlée ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -1005,7 +1010,7 @@
 "code basés sur V1.<br />3) X veut convertir la version V2 vers une 
licence "
 "autre que GPL.<br />X a-t-il besoin de la permission de Y ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -1019,11 +1024,7 @@
 "clauses des licences s'appliquent à mon programme. Pourriez-vous m'expliquer 
"
 "quelles licences je peux utiliser ?</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "Questions sur les violations de la GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -1031,7 +1032,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">Que dois-je "
 "faire si je découvre une violation potentielle de la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1039,7 +1040,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Qui a la capacité de "
 "faire respecter la GPL ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1049,7 +1050,7 @@
 "parler de quelqu'un qui a obtenu une copie d'un programme, régi par la GPL, "
 "sous une autre licence. Cela est-il possible ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1060,7 +1061,7 @@
 "ce que le développeur pourrait se retrouver un jour en violation de la 
GPL ?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5333,14 +5334,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="
@@ -5351,9 +5352,16 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2001, 2006, 2007, 2008,-] {+2001-2007, 2009, 2011,+}
+# | 2014, 2015, 2017, [-2018,-] 2019, 202[-0-]{+1+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#| "2020 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006-2008, 2014, 2015, 2017-2020 Free Software "
 "Foundation, Inc."
@@ -5381,10 +5389,9 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006-2008, 2014, 2015, 2017-2021 Free Software "
-"Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006-2008, 2014, 2015, 2017-2021 Free Software "
+#~ "Foundation, Inc."

Index: old-licenses/po/gpl-2.0-faq.it-diff.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.it-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- old-licenses/po/gpl-2.0-faq.it-diff.html    30 Apr 2021 06:36:14 -0000      
1.5
+++ old-licenses/po/gpl-2.0-faq.it-diff.html    29 Dec 2021 16:01:01 -0000      
1.6
@@ -11,14 +11,30 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.86 --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Frequently Asked Questions about the GNU GPL v2.0
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="screen"&gt;&lt;!--
+ul .emph-box { padding-top: .7em; }
+#template-diagram {
+   width: 37.5em; max-width: 100%;
+   margin: auto;
+}
+#template-diagram img { width: 100%; }
+.note#fsf-licensing {
+   float: none;
+   width: 47em; max-width: 93%;
+   margin: 1.5em auto 3em;
+}
+--&gt;&lt;/style&gt;</em></ins></span>
 &lt;!--#include virtual="/licenses/old-licenses/po/gpl-2.0-faq.translist" 
--&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-&lt;h2&gt;Frequently Asked Questions about version 2 of the GNU GPL&lt;/h2&gt;
-&lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
+<span class="removed"><del><strong>&lt;h2&gt;Frequently</strong></del></span>
+<span class="inserted"><ins><em>&lt;h2 
class="c"&gt;Frequently</em></ins></span> Asked Questions about version 2 of 
the GNU GPL&lt;/h2&gt;
+<span class="removed"><del><strong>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</strong></del></span>
 
+<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
 &lt;p&gt;
 This page contains answers to commonly asked questions about the GNU General
 Public License (GPL), version 2. The FAQ for the current version of the GPL is
@@ -30,12 +46,46 @@
 After you read this FAQ, &lt;a href="/cgi-bin/license-quiz.cgi"&gt;you can
 test your knowledge of Free Software licensing with our quiz&lt;/a&gt;.
 &lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;!-- Replace this list with the page's contents. --&gt;
-&lt;h3 style="clear: both; padding: .3em 0; border-bottom: 1px solid #999"&gt;
-Table of Contents&lt;/h3&gt;
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;</em></ins></span>
+&lt;h3 <span class="removed"><del><strong>style="clear: both; padding: .3em 0; 
border-bottom: 1px solid #999"&gt;
+Table</strong></del></span> <span 
class="inserted"><ins><em>class="no-display"&gt;Table of 
Contents&lt;/h3&gt;&lt;!--#set var='CLOSE' value='&lt;/b&gt;&lt;/a&gt;' --&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a href="#basics"&gt;&lt;b&gt;' 
--&gt;&lt;!--#echo
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Basic questions about the GPL,
+the GNU Project, and the Free Software Foundation&lt;span 
class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
+encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#understanding"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;General understanding</em></ins></span> of 
<span class="removed"><del><strong>Contents&lt;/h3&gt;
+
+  &lt;h4&gt;Basic</strong></del></span> <span class="inserted"><ins><em>the
+GPL&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
+encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#licensing"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Using the GPL for your
+programs&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo 
encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#distributing"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Distribution of programs released
+under the GPL&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
+encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#using-programs"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Using programs released under
+the GPL when writing other programs&lt;span 
class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
+encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#combining"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Combining work with code
+released under the GPL&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
+encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#violations"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Questions about violations of the
+GPL&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
+encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;hr class="thin" /&gt;
 
-  &lt;h4&gt;Basic questions about the GPL, the GNU Project, and the Free
+  &lt;h4 id="basics"&gt;Basic</em></ins></span> questions about the GPL, the 
GNU Project, and the Free
   Software Foundation&lt;/h4&gt;
 
   &lt;ul&gt;
@@ -80,7 +130,9 @@
 
   &lt;/ul&gt;
 
-  &lt;h4&gt;General understanding of the GPL&lt;/h4&gt;
+  <span class="removed"><del><strong>&lt;h4&gt;General</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;h4 
id="understanding"&gt;General</em></ins></span> understanding of the 
GPL&lt;/h4&gt;
   
   &lt;ul&gt;
     &lt;li&gt;&lt;a 
href="#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions"
@@ -183,7 +235,9 @@
   
   &lt;/ul&gt;
 
-  &lt;h4&gt;Using the GPL for your programs&lt;/h4&gt;
+  <span class="removed"><del><strong>&lt;h4&gt;Using</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;h4 
id="licensing"&gt;Using</em></ins></span> the GPL for your programs&lt;/h4&gt;
 
   &lt;ul&gt;
 
@@ -239,7 +293,9 @@
     a program under the GPL which I developed using nonfree 
tools?&lt;/a&gt;&lt;/li&gt;
   &lt;/ul&gt;
 
-  &lt;h4&gt;Distribution of programs released under the GPL&lt;/h4&gt;
+  <span 
class="removed"><del><strong>&lt;h4&gt;Distribution</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;h4 
id="distributing"&gt;Distribution</em></ins></span> of programs released under 
the GPL&lt;/h4&gt;
 
   &lt;ul&gt;
 
@@ -310,12 +366,12 @@
     program, does the GPL give him the right to redistribute that
     version?&lt;/a&gt;&lt;/li&gt;
 
-    &lt;li&gt;&lt;a href="#TradeSecretRelease" <span 
class="removed"><del><strong>name="TOCTradeSecretRelease"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>id="TOCTradeSecretRelease"&gt;</em></ins></span>
-    What if a company distributes a copy <span class="inserted"><ins><em>of 
some other developers'
+    &lt;li&gt;&lt;a href="#TradeSecretRelease" <span 
class="removed"><del><strong>name="TOCTradeSecretRelease"&gt;</strong></del></span>
 <span class="inserted"><ins><em>id="TOCTradeSecretRelease"&gt;
+    What if a company distributes a copy of some other developers'
     GPL-covered work to me as a trade secret?&lt;/a&gt;&lt;/li&gt;
 
-    &lt;li&gt;&lt;a href="#TradeSecretRelease2" id="TOCTradeSecretRelease2"&gt;
-    What if a company distributes a copy of its own GPL-covered work to
+    &lt;li&gt;&lt;a href="#TradeSecretRelease2" 
id="TOCTradeSecretRelease2"&gt;</em></ins></span>
+    What if a company distributes a copy <span class="inserted"><ins><em>of 
its own GPL-covered work to
     me</em></ins></span> as a trade secret?&lt;/a&gt;&lt;/li&gt;
 
     &lt;li&gt;&lt;a href="#DistributeSubsidiary" <span 
class="removed"><del><strong>name="TOCDistributeSubsidiary"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>id="TOCDistributeSubsidiary"&gt;</em></ins></span> 
@@ -332,7 +388,9 @@
 
   &lt;/ul&gt;
 
-  &lt;h4&gt;Using programs released under the GPL when writing other
+  <span class="removed"><del><strong>&lt;h4&gt;Using</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;h4 
id="using-programs"&gt;Using</em></ins></span> programs released under the GPL 
when writing other
   programs&lt;/h4&gt;
 
   &lt;ul&gt;
@@ -359,7 +417,9 @@
   
   &lt;/ul&gt;
 
-  &lt;h4&gt;Combining work with code released under the GPL&lt;/h4&gt;
+  <span class="removed"><del><strong>&lt;h4&gt;Combining</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;h4 
id="combining"&gt;Combining</em></ins></span> work with code released under the 
GPL&lt;/h4&gt;
 
   &lt;ul&gt;
 
@@ -482,7 +542,9 @@
   
   &lt;/ul&gt;
 
-  &lt;h4&gt;Questions about violations of the GPL&lt;/h4&gt;
+  <span class="removed"><del><strong>&lt;h4&gt;Questions</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;h4 
id="violations"&gt;Questions</em></ins></span> about violations of the 
GPL&lt;/h4&gt;
 
   &lt;ul&gt;
 
@@ -507,9 +569,13 @@
 
   &lt;/ul&gt;
 
-&lt;hr /&gt;
+&lt;hr <span class="inserted"><ins><em>class="no-display"</em></ins></span> 
/&gt;
+
+<span class="removed"><del><strong>&lt;dl&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+&lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
 
-&lt;dl&gt;
+&lt;dl class="article reduced-width"&gt;</em></ins></span>
 
 &lt;dt&gt;&lt;b&gt;&lt;a href="#TOCWhatDoesGPLStandFor"
 <span 
class="removed"><del><strong>name="WhatDoesGPLStandFor"&gt;What</strong></del></span>
@@ -954,7 +1020,8 @@
 &lt;dd&gt;
 If the libraries that you link with fall within the following exception
 in the GPL:
-&lt;blockquote&gt;&lt;p&gt;
+<span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;&lt;p&gt;</em></ins></span>
      However, as a special exception, the source code distributed need not
      include anything that is normally distributed (in either source or
      binary form) with the major components (compiler, kernel, and so on) of
@@ -974,7 +1041,9 @@
 GPL. This copyright notice and license notice give permission to link
 with the program FOO:&lt;/p&gt;
 
-&lt;blockquote&gt;&lt;p&gt;      
+<span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;&lt;p&gt;</em></ins></span>      
    Copyright (C) yyyy  &lt;name of copyright holder&gt;
 &lt;/p&gt;&lt;p&gt;
     This program is free software; you can redistribute it and/or modify
@@ -1347,7 +1416,7 @@
 namely, the requirement on advertisements of the program.  The GPL
 states:
 <span class="removed"><del><strong>&lt;pre&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;&lt;p&gt;</em></ins></span>
     You may not impose any further restrictions on the recipients' exercise
     of the rights granted herein.
 <span class="removed"><del><strong>&lt;/pre&gt;</strong></del></span>
@@ -1474,7 +1543,7 @@
 the end of the text that says the file is distributed under the GNU
 GPL:
 <span class="removed"><del><strong>&lt;pre&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;blockquote&gt;
+<span class="inserted"><ins><em>&lt;blockquote class="emph-box"&gt;
 &lt;p&gt;</em></ins></span>
 Linking ABC statically or dynamically with other modules is making
 a combined work based on ABC.  Thus, the terms and conditions of
@@ -2216,7 +2285,7 @@
 <span class="removed"><del><strong>&lt;p&gt;
 &lt;tt&gt;</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;&lt;p&gt;</em></ins></span>
 As a special exception, if you create a document which uses
 this font, and embed this font or unaltered portions of this font into
 the document, this font does not by itself cause the resulting
@@ -2256,11 +2325,17 @@
 (usually under incompatible terms). &lt;/p&gt;
 
 &lt;!-- GNUN: localize URL /licenses/template-diagram.png --&gt;
-&lt;p&gt;&lt;a href="/licenses/template-diagram.png"&gt;&lt;img 
src="/licenses/template-diagram.png" alt="A diagram of the above content" 
/&gt;&lt;/a&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;&lt;a 
href="/licenses/template-diagram.png"&gt;&lt;img</strong></del></span>
+<span class="inserted"><ins><em>&lt;p id="template-diagram"&gt;&lt;a 
href="/licenses/template-diagram.png"&gt;
+&lt;img</em></ins></span> src="/licenses/template-diagram.png"
+     alt="A diagram of the above <span class="removed"><del><strong>content" 
/&gt;&lt;/a&gt;&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>content"/&gt;&lt;/a&gt;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;Here's an exception for Javascript code that does this:&lt;/p&gt;
 
-&lt;blockquote&gt;&lt;p&gt;As a special exception to GPL, any HTML file which 
merely makes
+<span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;As</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;blockquote class="emph-box"&gt;&lt;p&gt;
+As</em></ins></span> a special exception to GPL, any HTML file which merely 
makes
 function calls to this code, and for that purpose includes it by
 reference shall be deemed a separate work for copyright law purposes.
 In addition, the copyright holders of this code give you permission to
@@ -2335,7 +2410,7 @@
 An unapproved translation has no legal force, and it should say so
 explicitly.  It should be marked as follows:&lt;/p&gt;
 <span class="removed"><del><strong>&lt;pre&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;&lt;p&gt;</em></ins></span>
     This translation of the GPL is informal, and not officially approved
     by the Free Software Foundation as valid.  To be completely sure of
     what is permitted, refer to the original GPL (in English).
@@ -2549,7 +2624,7 @@
 &lt;/dl&gt;
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to &lt;a
@@ -2567,16 +2642,17 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations 
README&lt;/a&gt; for
-information on coordinating and submitting translations of this 
article.&lt;/p&gt;
+information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of this 
article.&lt;/p&gt;
 &lt;/div&gt;
 
-&lt;p&gt;Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, <span 
class="removed"><del><strong>2018</strong></del></span> <span 
class="inserted"><ins><em>2018, 2019, 2020</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008,</strong></del></span> <span class="inserted"><ins><em>2001-2007, 2009, 
2011,</em></ins></span> 2014, 2015, 2017, <span 
class="removed"><del><strong>2018</strong></del></span> <span 
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
+Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -2586,7 +2662,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/30 06:36:14 $
+$Date: 2021/12/29 16:01:01 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: old-licenses/po/gpl-2.0-faq.it.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.it.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- old-licenses/po/gpl-2.0-faq.it.po   30 Apr 2021 06:36:14 -0000      1.57
+++ old-licenses/po/gpl-2.0-faq.it.po   29 Dec 2021 16:01:01 -0000      1.58
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2018-01-20 19:53+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian\n"
@@ -32,7 +32,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "Domande poste di frequente sulla GNU GPL 2.0"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -47,7 +47,7 @@
 "della Free Software Foundation, si veda la <a href=\"/licenses/licenses.html"
 "\">pagina delle licenze</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -56,18 +56,42 @@
 "cgi\">potete misurare la vostra conoscenza delle licenze di software libero "
 "col nostro quiz</a>. (in inglese)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "Indice"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
 msgstr ""
 "Domande di base sulla GPL, il progetto GNU e la Free Software Foundation"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "Concetti generici sulla GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "Utilizzare la GPL nei propri programmi"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "Distribuzione di programmi rilasciati con licenza GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr "Usare programma coperti da GPL quando si scrivono altri programmi"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "Combinare un'opera con codice rilasciato sotto licenza GPL"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "Domande sulle violazioni della GPL"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -75,7 +99,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">Cosa "
 "significa \"GPL\"?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -85,7 +109,7 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Scrivere software libero significa "
 "usare la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -95,7 +119,7 @@
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Tutto il software GNU usa "
 "la GNU GPL come licenza?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -105,7 +129,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">L'uso della GPL per un "
 "programma lo rende automaticamente software GNU?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -113,7 +137,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">&Egrave; "
 "possibile applicare la GPL ad opere diverse dal software?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -121,7 +145,7 @@
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Perché non "
 "usate la GPL per i manuali?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -129,7 +153,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Esistono traduzioni "
 "della GPL in altre lingue?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -139,7 +163,7 @@
 "motivo alcune librerie GNU sono rilasciate sotto la  normale licenza GPL "
 "invece che sotto la Lesser GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -151,7 +175,7 @@
 "trasferire il copyright alla FSF? Se io detengo il copyright di un programma "
 "GPL, devo fare lo stesso? Se è così, come?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
@@ -159,11 +183,7 @@
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Posso modificare la GPL e "
 "ottenere una licenza diversa?</a>"
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "Concetti generici sulla GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -174,7 +194,7 @@
 "permette agli utenti di pubblicare le loro versioni  modificate di un "
 "programma?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -184,7 +204,7 @@
 "\"TOCGPLRequireSourcePostedPublic\">La GPL richiede che il codice sorgente "
 "delle versioni modificate  di un programma sia reso pubblico?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
@@ -194,7 +214,7 @@
 "\"> &Egrave; possibile avere sullo stesso computer un programma con licenza "
 "GPL e un altro programma, distinto, non libero?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
@@ -203,7 +223,7 @@
 "ha una copia di un programma con licenza GPL, è possibile ordinargli di "
 "fornirne una copia? </a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -214,7 +234,7 @@
 "\">Che significa \"written offer valid for any third party\"?  Vuol dire che "
 "chiunque può ottenere i sorgenti di qualsiasi  programma GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -225,7 +245,7 @@
 "\"concesse in licenza ... ad ogni terza parte.\"  Ma chi sono queste \"terze "
 "parti\"?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -233,7 +253,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">La GPL mi "
 "permette di vendere copie del programma a scopo di lucro?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -243,7 +263,7 @@
 "\"> La GPL mi permette di richiedere un prezzo per scaricare il programma  "
 "dal mio sito di distribuzione?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -253,7 +273,7 @@
 "La GPL mi permette di richiedere che tutti quelli che ricevono il  software "
 "debbano pagarmi una somma di denaro e/o farmelo sapere?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -265,7 +285,7 @@
 "pagamento, devo anche renderlo disponibile pubblicamente in modo  gratuito?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -274,7 +294,7 @@
 "permette di distribuire una copia soggetta ad  una clausola di non "
 "diffusione (NDA, nondisclosure agreement)?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -284,7 +304,7 @@
 "mi permette di distribuire una versione beta o modificata soggetta ad  una "
 "clausola di non diffusione (NDA, nondisclosure agreement)?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -294,7 +314,7 @@
 "mi permette di sviluppare una versione modificata soggetta ad  una clausola "
 "di non diffusione (NDA, nondisclosure agreement)?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -304,7 +324,7 @@
 "\">Sono costretto ad applicare il copyright  sulle modifiche che apporto ad "
 "un programma coperto da GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -315,7 +335,7 @@
 "coperto da GPL, posso prendere la parte  di pubblico dominio e usarla come "
 "codice di pubblico dominio?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -325,7 +345,7 @@
 "reputazione professionale. Voglio che la gente venga a conoscenza di cosa ho "
 "scritto. Usando la GPL, il mio lavoro mi verrà riconosciuto?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -333,7 +353,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">Che significa dire "
 "che due licenze sono \"compatibili\"?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -341,7 +361,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">Che significa "
 "dire che una licenza è \"compatibile con la GPL\"?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -349,7 +369,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Perché la licenza originale BSD è "
 "incompatibile con la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -361,7 +381,7 @@
 "sorgente in un nuovo programma e quindi a distribuire e vendere il nuovo "
 "programma?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
@@ -369,11 +389,7 @@
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">Come funziona la LGPL nel caso di "
 "Java?</a>"
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "Utilizzare la GPL nei propri programmi"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -382,7 +398,7 @@
 "possibile ottenere istruzioni passo per passo su come  applicare la GPL al "
 "mio programma?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -390,7 +406,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Perché è meglio la GNU GPL  "
 "piuttosto che altre licenze per il software libero?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -399,7 +415,7 @@
 "richiede che ogni copia del programma sia corredata  di una copia della "
 "licenza?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -407,7 +423,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">E se il programma "
 "fosse poco più grande della stessa licenza?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -417,7 +433,7 @@
 "allo scopo di risparmiare spazio,  il preambolo della GPL? O l'appendice  "
 "con le istruzioni su come applicare la GPL ai nuovi programmi?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -426,7 +442,7 @@
 "diritti d'autore sul mio programma,  allo scopo di rilasciarlo sotto la GPL?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -435,7 +451,7 @@
 "che la mia scuola avesse intenzione di  fare di un mio programma un suo "
 "software proprietario?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -445,7 +461,7 @@
 "rilasciare un programma che ho  scritto sotto la GNU GPL, ma mi piacerebbe "
 "anche usare lo stesso codice in programmi non liberi.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -455,7 +471,7 @@
 "sviluppatore di un programma  distribuito sotto la GPL darlo in seguito in "
 "licenza ad una terza parte per uso esclusivo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
@@ -463,7 +479,7 @@
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Può il governo statunitense "
 "rilasciare un programma con licenza GNU GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -472,7 +488,7 @@
 "motivo i programmi devono riportare la dicitura:  \"Version 2 of the GPL or "
 "any later version\"?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
@@ -480,7 +496,7 @@
 "<a href=\"#FontException\" id=\"TOCFontException\">Come funziona la GPL nel "
 "caso dei font (tipi di carattere)?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
@@ -488,7 +504,7 @@
 "<a href=\"#WMS\" id=\"TOCWMS\">Qual è la licenza più opportuna per i 
modelli "
 "da usare in sistemi di gestione dei siti web?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
@@ -497,11 +513,7 @@
 "rilasciare con licenza GPL un programma sviluppato utilizzando strumenti non "
 "liberi?</a>"
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "Distribuzione di programmi rilasciati con licenza GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
@@ -510,7 +522,7 @@
 "rilasciare una versione modificata di un programma GPL in forma solo binaria?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
@@ -520,7 +532,7 @@
 "solo il formato binario via rete. Se distribuisco copie, devo procurarmi il "
 "codice sorgente e distribuire anche quello?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" id="
 "\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -532,7 +544,7 @@
 "programma senza accompagnarli con i codici sorgenti.    Posso rendere "
 "disponibili i sorgenti via FTP anziché per    posta?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -544,7 +556,7 @@
 "coperto da GPL in forma binaria, con un'offerta per avere i sorgenti, e me "
 "ne ha dato una copia. Posso usare l'offerta per ottenere i sorgenti?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -554,7 +566,7 @@
 "\"TOCSourceAndBinaryOnDifferentSites\">Posso mettere i binari sul    mio "
 "server internet e i sorgenti su un altro server    internet?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -565,7 +577,7 @@
 "GPL, in forma binaria. È    sufficiente distribuire i codici sorgenti della "
 "versione    originale?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" id="
 "\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, but "
@@ -578,7 +590,7 @@
 "possibilità di rilasciare agli utenti solo i    file che descrivono le "
 "differenze dalla versione \"standard\"    insieme ai binari?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -588,7 +600,7 @@
 "rendere disponibili i binari attraverso un servizio FTP    anonimo, ma dare "
 "i sorgenti solo a coloro che ne fanno    esplicita richiesta.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -598,7 +610,7 @@
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">Come posso essere    sicuro che "
 "tutti coloro che scaricano i binari scarichino anche    i sorgenti?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -610,7 +622,7 @@
 "distribuire versioni    modificate del programma sotto la GPL, ma che "
 "l'originale non    si può distribuire sotto la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
@@ -620,7 +632,7 @@
 "su un sito web una copia modificata di un programma coperto da GPL. Secondo "
 "la GPL, l'azienda deve rilasciare il codice modificato?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
@@ -629,7 +641,7 @@
 "internamente ad una singola organizzazione o azienda è considerato &ldquo;"
 "distribuzione&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
@@ -639,7 +651,7 @@
 "contiene una copia di un programma coperto da GPL, la GPL gli dà diritto di "
 "redistribuire quella versione?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a
 # | company distributes a copy {+of some other developers' GPL-covered work to
 # | me+} as a trade secret?</a>
@@ -655,7 +667,7 @@
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> Cosa succede "
 "se un'azienda distribuisce una copia come segreto industriale?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a [-href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\">-]
 # | {+href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\">+} What if a
 # | company distributes a copy {+of its own GPL-covered work to me+} as a
@@ -672,7 +684,7 @@
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> Cosa succede "
 "se un'azienda distribuisce una copia come segreto industriale?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
@@ -682,7 +694,7 @@
 "considerato distribuzione il trasferimento di una copia ad un'azienda "
 "controllata a maggioranza?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
@@ -692,7 +704,7 @@
 "installazione può chiedere di accettare la GPL con un clic? Se ottengo "
 "software coperto da GPL, devo accettare qualcosa?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
@@ -703,11 +715,7 @@
 "installazione. Il programma di installazione deve avere una licenza "
 "compatibile con la GPL?</a>"
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr "Usare programma coperti da GPL quando si scrivono altri programmi"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
@@ -717,7 +725,7 @@
 "editor di testo protetti da GPL, come GNU Emacs, per sviluppare programmi "
 "non liberi? Posso usare strumenti protetti da GPL per compilarli?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -730,7 +738,7 @@
 "progetti hardware, potrei richiedere che questi progetti debbano essere "
 "liberi?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -738,7 +746,7 @@
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In quali    "
 "casi l'output di un programma GPL è coperto anch'esso dalla    GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -748,7 +756,7 @@
 "programma su GNU/Linux,    devo rilasciarlo come software libero coperto "
 "dalla GPL o da    qualche altra licenza libera?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
@@ -756,11 +764,7 @@
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">L'eccezione libstdc++ "
 "permette il linking dinamico?</a>"
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "Combinare un'opera con codice rilasciato sotto licenza GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -769,7 +773,7 @@
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">Qual è la differenza "
 "tra \"semplice aggregazione\"  e \"fondere due moduli in un programma\"?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -778,7 +782,7 @@
 "commerciale (<em>fair use</em>) del codice  sorgente di un programma coperto "
 "dalla GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
@@ -786,7 +790,7 @@
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Può il governo statunitense "
 "rilasciare miglioramenti a un programma distribuito con licenza GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -796,7 +800,7 @@
 "rilasciata sotto la GPL    (non la LGPL), significa che qualunque programma "
 "che ne faccia    uso deve essere disponibile sotto la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -808,7 +812,7 @@
 "programma    proprietario. Il fatto che io sfrutti il tuo programma mi    "
 "obbliga a usare la GPL per il mio programma?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -817,7 +821,7 @@
 "speranza che io possa    ottenere una licenza del tuo programma sotto "
 "Lesser    GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -830,7 +834,7 @@
 "Potete fare un'eccezione per noi? Questo    potrebbe significare allargare "
 "il bacino di utenza per quel    programma.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -842,7 +846,7 @@
 "significa che  tutti i programmi scritti per essere da esso interpretati "
 "devono  essere disponibili sotto licenze compatibili con la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -853,7 +857,7 @@
 "incompatibile con la  GPL, posso usarlo per eseguire dei programmi coperti "
 "dalla  GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -863,7 +867,7 @@
 "modulo ad un altro coperto    dalla GPL, devo usare la GPL come licenza per "
 "il mio    modulo?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
@@ -871,7 +875,7 @@
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\">Posso usare la GPL per un plug-"
 "in destinato    ad un programma non libero?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -881,7 +885,7 @@
 "rilasciato sotto la GPL fa    uso di plug-in, quali sono i requisiti da "
 "includere nelle    licenze di questi plug-in?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
@@ -889,7 +893,7 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Posso usare la GPL per "
 "un plug-in destinato    ad un programma non libero?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
@@ -898,7 +902,7 @@
 "programma non libero che ha come scopo quello di caricare un plug-in coperto "
 "da GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -908,7 +912,7 @@
 "piacerebbe incorporare del software coperto dalla GPL nel mio  sistema "
 "proprietario. Lo posso fare?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -921,7 +925,7 @@
 "wrapper&rdquo;, con licenza permissiva compatibile con la GPL (come la "
 "licenza di X11) tra la parte coperta da GPL e la parte proprietaria?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
@@ -929,7 +933,7 @@
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Posso scrivere    "
 "programmi liberi che fanno uso di librerie non libere?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
@@ -938,7 +942,7 @@
 "problemi legali sorgono se uso librerie incompatibili con la GPL insieme a "
 "software GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -951,7 +955,7 @@
 "programma sia dinamicamente collegato con le    librerie di run-time del "
 "Visual C++?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -966,7 +970,7 @@
 "quelle versioni, dovrebbe comprare quelle librerie.    Per quale motivo la "
 "GPL non permette questa    operazione?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -980,7 +984,7 @@
 "incluso in un programma più grande, questa licenza è compatibile con la 
GPL? "
 "Posso combinare o linkare Q con un programma coperto da GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -991,7 +995,7 @@
 "modificarla, e ne creo una    sottoclasse, in che modo il programma "
 "risultante è affetto    dalla GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -1002,7 +1006,7 @@
 "libreria coperta da GPL vengano collegati moduli proprietari  solo per mezzo "
 "di un'interfaccia controllata?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -1016,7 +1020,7 @@
 "della versione 2 in una licenza    non-GPL. X deve chiedere il permesso a Y?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -1029,11 +1033,7 @@
 "diverse. Sono molto confuso sul tipo di licenza che    posso usare per il "
 "mio programma. Mi potete dire quali licenze    posso usare?</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "Domande sulle violazioni della GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -1041,7 +1041,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">Cosa bisogna "
 "fare quando si scopre    una possibile violazione della GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1049,7 +1049,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Chi ha il potere  di "
 "far valere la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1059,7 +1059,7 @@
 "che qualcuno ha    ottenuto una copia di un programma coperto dalla GPL, ma "
 "alle    condizioni di un'altra licenza. È possibile?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1069,7 +1069,7 @@
 "un programma protetto    da GPL è da essa vincolato? Lo sviluppatore "
 "potrebbe agire in    modo da violare la GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5248,14 +5248,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -5269,15 +5269,15 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, [-2018-]
-# | {+2018, 2019, 2020+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2001, 2006, 2007, 2008,-] {+2001-2007, 2009, 2011,+}
+# | 2014, 2015, 2017, [-2018-] {+2019, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018 Free "
 #| "Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018 Free "
 "Software Foundation, Inc."

Index: old-licenses/po/gpl-2.0-faq.ja.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ja.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- old-licenses/po/gpl-2.0-faq.ja.po   29 Dec 2021 15:55:37 -0000      1.56
+++ old-licenses/po/gpl-2.0-faq.ja.po   29 Dec 2021 16:01:01 -0000      1.57
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2020-03-31 23:08+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-12-29 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -29,7 +30,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "GNU GPL v2.0に関してよく聞かれる質問"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -43,7 +44,7 @@
 "イセンスについてより詳しく知るには、<a 
href=\"/licenses/licenses.html\">ライ"
 "センスのページ</a>をご覧ください。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -51,11 +52,11 @@
 "このFAQを読んだあと、<a 
href=\"/cgi-bin/license-quiz.cgi\">自由ソフトウェアの"
 
"ライセンシングに関するご自分の知識をクイズでたしかめることができます
 </a>。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "もくじ"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
@@ -63,7 +64,31 @@
 
"GPL、GNUプロジェクト、フリーソフトウェアファウンデーションに関する基本的な質"
 "問"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "GPLの全般的な理解"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "GPLを自分のプログラムに使う"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "GPLのもとでリリースされたプログラムの配布"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr "GPLのもとでリリースされたプログラム
を使って他のプログラムを書く"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "GPLのもとでリリースされたコードを結合した著作物"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "GPL違反に関する質問"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -71,7 +96,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">&ldquo;"
 "GPL&rdquo;とは何の略ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -81,7 +106,7 @@
 
"\"TOCDoesFreeSoftwareMeanUsingTheGPL\">自由ソフトウェアとは、GPLを使っている"
 "という意味ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -91,7 +116,7 @@
 
"\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">すべてのGNUソフトウェアには"
 "ライセンスとしてGNU GPLが使われているのですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -101,7 +126,7 @@
 
"\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">GPLを使うとそのプログラãƒ
 "
 "はGNUソフトウェアになるのですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -109,7 +134,7 @@
 "<a href=\"#GPLOtherThanSoftware\" 
id=\"TOCGPLOtherThanSoftware\">GPLをソフト"
 "ウェア以外のものに使うことはできますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -117,7 +142,7 @@
 "<a href=\"#WhyNotGPLForManuals\" 
id=\"TOCWhyNotGPLForManuals\">どうしてマニュ"
 "アルにはGPLを使わないのですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -125,7 +150,7 @@
 "<a href=\"#GPLTranslations\" 
id=\"TOCGPLTranslations\">GPLを他の言語に翻訳し"
 "たものはありますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -135,7 +160,7 @@
 
"GNUライブラリが、劣等GPLではなくふつうのGPLのもとでリリースされているのはなぜ"
 "ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -147,7 +172,7 @@
 "ですか? もし、わたしがGPLが使われたプログラム
の著作権を有しているならば、わた"
 "しも著作権移譲を要求すべきでしょうか? 
もしそうなら、どうやって?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
@@ -155,11 +180,7 @@
 "<a href=\"#ModifyGPL\" 
id=\"TOCModifyGPL\">わたしがGPLを修正して修正版のライ"
 "センスを作ることはできますか?</a>"
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "GPLの全般的な理解"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -169,7 +190,7 @@
 
"\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">GPLがユーザの改"
 "変した版の公開を許可しているのはなぜですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -179,7 +200,7 @@
 
"\"TOCGPLRequireSourcePostedPublic\">GPLは、改変された版のソースコードをå
…¬é–‹ã™"
 "ることを要求しますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
@@ -189,7 +210,7 @@
 "あるGPLの及ぶプログラム
と、それと関係のない不自由なプログラム
を同じコンピュー"
 "タに置いても問題ありませんか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
@@ -198,7 +219,7 @@
 "コピーを誰かが持っていると知っているå 
´åˆã€ã‚ãŸã—はかれにコピーを下さいと要求"
 "できますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -210,7 +231,7 @@
 "か? 
これは、世界中の誰もが、GPLが適用されたどんなプログラãƒ
 ã®ã‚½ãƒ¼ã‚¹ã§ã‚‚手に入"
 "れられるということなのでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -221,7 +242,7 @@
 "&hellip; 
ライセンスされ」なければならないとされています。このå 
´åˆã€ç¬¬ä¸‰è€…とは"
 "誰のことですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -229,7 +250,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" 
id=\"TOCDoesTheGPLAllowMoney\">GPLは金銭目"
 "的でプログラム
の複製を販売することを許可していますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -239,7 +260,7 @@
 "\">GPLは、わたしの配布サイトからプログラム
をダウンロードする人に料金を課すこ"
 "とを許可していますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -249,7 +270,7 @@
 
"\">GPLは、ソフトウェアを受け取った誰もがわたしに料金を支払うこと、およびまた"
 
"は、受け取った旨を通知することを義務づけることを許可していますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -261,7 +282,7 @@
 "金を取って配布する場合、わたしはå…
¬è¡†ãŒæ–™é‡‘なしでもソフトウェアを手に入れられ"
 "るようにしなければならないでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -269,7 +290,7 @@
 "<a href=\"#DoesTheGPLAllowNDA\" 
id=\"TOCDoesTheGPLAllowNDA\">GPLは、複製物を"
 "機密保持契約(NDA)のもとでé…
å¸ƒã™ã‚‹ã“とを許可していますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -279,7 +300,7 @@
 
"変されたバージョン、あるいはベータ版を機密保持契約(NDA)のもとでé
…å¸ƒã™ã‚‹ã“とを"
 "許可していますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -289,7 +310,7 @@
 
"わたしが機密保持契約(NDA)のもとで改変されたバージョンを開発することを許可して"
 "いますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -299,7 +320,7 @@
 "\">GPLの及ぶプログラムに改変を加えたå 
´åˆã€è‡ªåˆ†ãŒæ”¹å¤‰ã—た点に関して著作権を主"
 "張する必要はありますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -310,7 +331,7 @@
 
"れていたとして、パブリックドメインな部分を取り出してパブリックドメインなコー"
 "ドとして利用することができますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -320,7 +341,7 @@
 "名声を得たいし、人々
に自分が書いたもののことを知って欲しいのです。GPLを適用し"
 
"ても、わたしはそのような名声を得ることができますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -328,7 +349,7 @@
 "<a href=\"#WhatIsCompatible\" 
id=\"TOCWhatIsCompatible\">二つのライセンスが"
 "「両立する」とはどういう意味ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -336,7 +357,7 @@
 "<a href=\"#WhatDoesCompatMean\" 
id=\"TOCWhatDoesCompatMean\">ライセンスが"
 "「GPLと両立する」とはどういう意味ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -344,7 +365,7 @@
 "<a href=\"#OrigBSD\" 
id=\"TOCOrigBSD\">どうしてオリジナルのBSDライセンスはGPL"
 "と両立しないのですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -356,18 +377,14 @@
 "グラムに合わせて取り込み、それを商業的にé…
å¸ƒã€è²©å£²ã™ã‚‹ã“とはできるでしょうか?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
 msgstr ""
 "<a href=\"#LGPLJava\" 
id=\"TOCLGPLJava\">LGPLはJavaにどう働きますか?</a>"
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "GPLを自分のプログラムに使う"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -375,7 +392,7 @@
 "<a href=\"#CouldYouHelpApplyGPL\" 
id=\"TOCCouldYouHelpApplyGPL\">GPLをわたし"
 "のプログラム
に適用するにはどうしたらよいか、逐一説明していただ
けませんか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -383,7 +400,7 @@
 "<a href=\"#WhyUseGPL\" 
id=\"TOCWhyUseGPL\">他の自由ソフトウェア・ライセンスで"
 "はなく、GNU GPLを使ったほうが良いのはなぜですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -391,7 +408,7 @@
 "<a href=\"#WhyMustIInclude\" 
id=\"TOCWhyMustIInclude\">GPLが、プログラムの複"
 
"製すべてにGPLの複製を含めることを要求するのはなぜですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -399,7 +416,7 @@
 "<a href=\"#WhatIfWorkIsShort\" 
id=\"TOCWhatIfWorkIsShort\">著作物がライセンス"
 "自身よりもそんなに長くないå 
´åˆã¯ã©ã†ã—たらよいですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -408,7 +425,7 @@
 "<a href=\"#GPLOmitPreamble\" 
id=\"TOCGPLOmitPreamble\">スペース節約のため、"
 "GPLの前文か自分のプログラム
への適用方法の説明を省いても良いですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -417,7 +434,7 @@
 "するために、わたしのプログラム
に対する著作権を得るにはどうしたら良いですか?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -426,7 +443,7 @@
 "グラムを学æ 
¡è‡ªèº«ã®ãƒ—ロプライエタリ・ソフトウェア製品にしたいと思ったらどうし"
 "ましょう?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -436,7 +453,7 @@
 "プログラムをGNU 
GPLのもとでリリースしたいのですが、同じコードを自由ではないプ"
 "ログラムでも使いたいのです。</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -446,7 +463,7 @@
 "布されているあるプログラムの開発者
が、後になって他の人に排他的利用を認めると"
 "いうことはあり得ますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
@@ -454,7 +471,7 @@
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">合衆国政府はプログラム
をGNU GPLでリ"
 "リースできますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -463,7 +480,7 @@
 
"のバージョン2かそれ以降のすべてのバージョン」というように述べるべきなのはなぜ"
 "ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
@@ -471,7 +488,7 @@
 "<a href=\"#FontException\" 
id=\"TOCFontException\">GPLはフォントにどのように"
 "適用できるでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
@@ -479,7 +496,7 @@
 "<a href=\"#WMS\" id=\"TOCWMS\">ウェブサイトのシステム
・テンプレートの保守にど"
 "のライセンスを使うべきでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
@@ -487,11 +504,7 @@
 "<a href=\"#NonFreeTools\" 
id=\"TOCNonFreeTools\">不自由なツールを用いて開発し"
 "たプログラムをGPLでリリースできるでしょうか?</a>"
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "GPLのもとでリリースされたプログラムの配布"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
@@ -499,7 +512,7 @@
 "<a href=\"#ModifiedJustBinary\" 
id=\"TOCModifiedJustBinary\">GPLの及ぶプログ"
 "ラムの改変したバージョンをバイナリ形æ…
‹ã®ã¿ã§ãƒªãƒªãƒ¼ã‚¹ã§ãã¾ã™ã‹?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
@@ -509,7 +522,7 @@
 
"ネットからダウンロードしました。もし、わたしがコピーをé
…å¸ƒã™ã‚‹ã¨ãã€ã‚½ãƒ¼ã‚¹"
 "コードを取得してそれも配布しなければなりませんか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" id="
 "\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -521,7 +534,7 @@
 "媒体でé…
å¸ƒã—たいのですが、メールオーダーの代わりに、FTPでソースコードを提供し"
 "てもよいでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -533,7 +546,7 @@
 
"コードの申し出とともに取得しました。そして、ひとつコピーをわたしにくれまし"
 
"た。その申し出を使って、わたしはソースを得ることができますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -544,7 +557,7 @@
 
"に置き、ソースは他のインターネットサイトに置くということはできるでしょうか?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -554,7 +567,7 @@
 "GPLの及ぶプログラム
の拡張したバージョンをバイナリ形式でé…
å¸ƒã—たいのですが、オ"
 "リジナルバージョンのソースを配布するだ
けで十分ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" id="
 "\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, but "
@@ -566,7 +579,7 @@
 "ソースをé…
å¸ƒã™ã‚‹ã®ã¯ä¸ä¾¿ã§ã™ã€‚ユーザに、バイナリといっしょに「標準」バージョ"
 "ンからの差分(diff)を提供するだけで良いですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -576,7 +589,7 @@
 "FTPでバイナリをå…
¥æ‰‹å¯èƒ½ã«ã—たいのですが、ソースはそれを注文した人にのみ送りた"
 "いのです。</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -586,7 +599,7 @@
 
"\"TOCHowCanIMakeSureEachDownloadGetsSource\">バイナリをダウンロードした各ユー"
 "ザがソースもå…
¥æ‰‹ã—たということを確認するにはどうしたらいいですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -599,7 +612,7 @@
 "か?</a>"
 
 # #############################
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
@@ -609,7 +622,7 @@
 "ム
の改変バージョンをウェブサイトで動かしています。GPLはかれらは改変したソース"
 "コードを配布しなければならないと言ってますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
@@ -617,7 +630,7 @@
 "<a href=\"#InternalDistribution\" 
id=\"TOCInternalDistribution\">一つの組織あ"
 "るいは会社で使うことは「配布」となりますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
@@ -627,7 +640,7 @@
 "ジョンがå…
¥ã£ãŸCDを盗みました。GPLはかれにこのバージョンを再é…
å¸ƒã™ã‚‹æ¨©åˆ©ã‚’与え"
 "ますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
@@ -637,7 +650,7 @@
 "開発者
のGPLの及ぶ作品のコピーを、わたしに対してトレード・シークレットとしてé
…"
 "布したらどうですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
@@ -647,7 +660,7 @@
 
"のGPLの及ぶ作品のコピーを、わたしに対してトレード・シークレットとしてé
…å¸ƒã—た"
 "らどうですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
@@ -656,7 +669,7 @@
 "<a href=\"#DistributeSubsidiary\" 
id=\"TOCDistributeSubsidiary\">(親会社に株"
 
"の)多数が有されて支えられた子会社にコピーを移すことはé
…å¸ƒã¨ãªã‚Šã¾ã™ã‹?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
@@ -666,7 +679,7 @@
 "人々
にGPLに同意するかクリックさせることはできますか?もし、あるソフトウェアを"
 "GPLでå…
¥æ‰‹ã—たとき、何かに同意しないといけないのですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
@@ -676,11 +689,7 @@
 
"アをある種のインストレーション・ソフトウェアと組み合わせたいと思います。この"
 "インストーラはGPLと両立するライセンスの必
要がありますか?</a>"
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr "GPLのもとでリリースされたプログラム
を使って他のプログラムを書く"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
@@ -691,7 +700,7 @@
 "しょうか? 
GCCのようなGPLの及ぶツールを使って自由でないプログラム
をコンパイル"
 "することはできますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -703,7 +712,7 @@
 
"がハードウェアの設計に使われているとして、その設計も自由でなければならないと"
 "要求することはできるでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -711,7 +720,7 @@
 "<a href=\"#WhatCaseIsOutputGPL\" 
id=\"TOCWhatCaseIsOutputGPL\">GPLプログラム"
 "の出力結果もGPLが及ぶのは、どんな場合ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -721,7 +730,7 @@
 
"GNU/Linux上へ移植したら、わたしはそれを自由ソフトウェアとしてGPLやその他の自"
 
"由ソフトウェア・ライセンスのもとでリリースしなければならないのでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
@@ -729,11 +738,7 @@
 "<a href=\"#LibGCCException\" 
id=\"TOCLibGCCException\">libstdc++例外は動的リ"
 "ンクを許可しますか?</a>"
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "GPLのもとでリリースされたコードを結合した著作物"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -742,7 +747,7 @@
 "<a href=\"#MereAggregation\" 
id=\"TOCMereAggregation\">「単なる集積」と「二つ"
 "のモジュールを一つのプログラム
に結合すること」の違いは何ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -750,7 +755,7 @@
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">GPLの及ぶプログラム
のソースコー"
 "ドを「公正使用(fair use)」する権利はありますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
@@ -758,7 +763,7 @@
 "<a href=\"#GPLUSGovAdd\" 
id=\"TOCGPLUSGovAdd\">合衆国政府はGPLの及ぶプログラ"
 "ムに対して改善をリリースできますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -768,7 +773,7 @@
 "く)GPLのもとでリリースされているå 
´åˆã€ãã®ãƒ©ã‚¤ãƒ–ラリを利用するプログラムはGPL"
 "でなければならないのでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -780,7 +785,7 @@
 "えているのですが、わたしのコードとそのプログラム
とをリンクするとわたしのプロ"
 "グラム
にもGPLを適用しなければならなくなるというのは事実でしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -788,7 +793,7 @@
 "<a href=\"#SwitchToLGPL\" 
id=\"TOCSwitchToLGPL\">もしそうならば、プログラムを"
 
"劣等GPLのもとでライセンスしてもらうことはできないでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -801,7 +806,7 @@
 "たしたちのために例外を設けてくれませんか? 
そうすればそのプログラムはより多く"
 "のユーザを得ることになるんです。</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -813,7 +818,7 @@
 "釈されるように書かれたプログラム
は、GPLと両立するライセンスでなければならない"
 "でしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -823,7 +828,7 @@
 
"言語のインタープリタにGPLと両立しないライセンスが適用されていたå
 ´åˆã€ãã®ä¸Šã§"
 "GPLの及ぶプログラムを実行することは可能でしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -833,7 +838,7 @@
 "に対してあるモジュールを追加するå 
´åˆã€ã‚ãŸã—のモジュールにもライセンスとして"
 "GPLを適用しなければなりませんか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
@@ -841,7 +846,7 @@
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\">あるプログラム
とそのプラグインが"
 "単一の組み合わせのプログラム
であると考えられるのはどういった場合ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -851,7 +856,7 @@
 "いたプログラム
がプラグインを使うとして、プラグインのライセンスにはどのような"
 "条件がありますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
@@ -859,7 +864,7 @@
 "<a href=\"#GPLPluginsInNF\" 
id=\"TOCGPLPluginsInNF\">自由でないプログラム向け"
 "のプラグインにGPLを適用することはできますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
@@ -868,7 +873,7 @@
 "ロードするように設計された不自由なプログラム
をリリースすることはできるでしょ"
 "うか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -878,7 +883,7 @@
 "プロプライエタリ・システム
に、GPLの及ぶソフトウェアを組み入れたいのですが、そ"
 "れは可能ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -891,7 +896,7 @@
 
"ライエタリの部分との間にGPLと両立するゆるい寛容なライセンス(X11ライセンスのよ"
 
"うな)の「ラッパー」モジュールをはさむことにより、これは可能ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
@@ -899,7 +904,7 @@
 "<a href=\"#FSWithNFLibs\" 
id=\"TOCFSWithNFLibs\">自由でないライブラリを利用す"
 "る自由ソフトウェアを書けますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
@@ -908,7 +913,7 @@
 "アにGPLと両立しないライブラリを用いたå 
´åˆã©ã®ã‚ˆã†ãªæ³•çš„問題が発生するでしょう"
 "か?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -920,7 +925,7 @@
 "とでリリースする予定です。GPLは、わたしのプログラム
がVisual C++のランタイムラ"
 
"イブラリとダイナミックリンクするのを許可していますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -935,7 +940,7 @@
 "しはカネヨコセ社のライブラリのソースコードをé…
å¸ƒã™ã‚‹ã“とができません。どうし"
 "てGPLはこれを許可していないのですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -949,7 +954,7 @@
 "れないというものだ
ったとします。このライセンスはGPLと両立するでしょうか? 
Qを"
 "GPLの及ぶプログラム
とリンクあるいは結合することができますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -960,7 +965,7 @@
 "します。このような場合、GPLは結果としてのプログラム
にはどのように影響するので"
 "しょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -971,7 +976,7 @@
 
"のGPLの及ぶライブラリと指定したインターフェースのもとでのみリンクすることを許"
 "可するにはどうしたらよいでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -984,7 +989,7 @@
 
"バージョン2をGPLではないライセンスに改変しようとする。このå
 ´åˆXはYの許可を得"
 "る必要がありますか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -998,11 +1003,7 @@
 
"イセンシング条件が課されるのがさっぱり分かりません。わたしが適用できるライセ"
 "ンスを教えて頂けませんか?</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "GPL違反に関する質問"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -1010,7 +1011,7 @@
 "<a href=\"#ReportingViolation\" 
id=\"TOCReportingViolation\">GPL違反の可能性"
 "がある事例を見つけたら、どうすれば良いですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1018,7 +1019,7 @@
 "<a href=\"#WhoHasThePower\" 
id=\"TOCWhoHasThePower\">GPLを強制する権力がある"
 "のは誰ですか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1028,7 +1029,7 @@
 "複製を、他のライセンスのもとで手にå…
¥ã‚ŒãŸäººãŒã„ると聞きました。こんなことはあ"
 "り得るのでしょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1038,7 +1039,7 @@
 "の開発者はGPLによって束縛されますか? 開発者
がGPL違反を犯すことはあり得るで"
 "しょうか?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5107,26 +5108,30 @@
 #.         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 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#| "2020 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
 "Free Software Foundation, Inc."
@@ -5151,13 +5156,12 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "Linking ABC statically or dynamically with other modules is making\n"

Index: old-licenses/po/gpl-2.0-faq.ko.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ko.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- old-licenses/po/gpl-2.0-faq.ko.po   9 Dec 2020 08:02:09 -0000       1.6
+++ old-licenses/po/gpl-2.0-faq.ko.po   29 Dec 2021 16:01:02 -0000      1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.O-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -37,7 +37,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "GNU GPL에 대한 빈번한 질문들"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Translator's note which should be moved-]{+This page contains answers+}
 # | to {+commonly asked questions about+} the [-end.-] {+GNU General Public
 # | License (GPL), version 2. The FAQ for the current version of the GPL is <a
@@ -58,23 +58,47 @@
 "지 않은 내용과 용어들에 대해서는 저작권 심의 조정 
위원회와 컴퓨터 법률 관련 "
 "논문들에서 제안하고 있는 용어를 사용했습니다."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "목 차"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -82,7 +106,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">&ldquo;"
 "GPL&rdquo;은 무슨 뜻입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -92,7 +116,7 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">자유 소프트웨어란 GPL을 
따르는 소프트"
 "웨어를 의미하는 것입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -102,7 +126,7 @@
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">GNU 소프트웨어들은 
모두 "
 "GNU GPL을 라이선스로 사용하고 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -112,7 +136,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">프로그램에 GPL을 ì 
ìš©í•˜ë©´ "
 "모두 GNU 소프트웨어가 되는 것입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -120,7 +144,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">GPL을 
소프트"
 "웨어가 아닌 다른 부문에도 적용할 수 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -128,7 +152,7 @@
 "<a href=\"#WhyNotGPLForManuals\" 
id=\"TOCWhyNotGPLForManuals\">매뉴얼에는 GPL"
 "을 사용하지 않는 이유가 무엇입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -136,7 +160,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">다른 언어로 
번역된 GPL"
 "이 존재합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -146,7 +170,7 @@
 "이브러리들은 Lesser GPL이 아닌 GPL로 배포되고 있습니다. 그 
이유는 무엇입니까?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -158,17 +182,13 @@
 "자유 소프트웨어 재단으로 양도하도록 하고 있습니까? ì 
œê°€ GPL 프로그램의 저작권"
 "자라면, 저 또한 저작권을 자유 소프트웨어 재단으로 
양도해야 합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -178,7 +198,7 @@
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">GPL이 
사용자들"
 "에게 자신이 개작한 버전을 공표하는 것을 허용하는 이유
는 무엇입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -188,20 +208,20 @@
 "\"TOCGPLRequireSourcePostedPublic\">GPL은 개작된 버전의 소스 
코드를 공중(불특"
 "정 다수)에게 공개하도록 요구하고 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -213,7 +233,7 @@
 "미입니까? 이것은 전세계에 있는 누구에게도, 어떠한 GPL 
프로그램에 대해서도 그 "
 "소스 코드를 얻을 수 있도록 해야 한다는 것을 
의미합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -224,7 +244,7 @@
 "스를 허용해야 한다고 되어 있는데, 여기서 말하는 ì 
œ3자란 정확히 누구를 말하는 "
 "것입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -232,14 +252,14 @@
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">GPL은 
돈을 "
 "벌기 위해 프로그램을 판매하는 것을 허용합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
 "my distribution site?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -249,7 +269,7 @@
 "\">GPL은 소#~ 프트웨어를 받은 모든 사람에게 비용을 
징수하거나 소프트웨어를 받"
 "은 사실을 통보하도록 하는 형식을 허#~ 용합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -257,41 +277,41 @@
 "charge?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
 "agreement?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
 "agreement?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
 "</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
 "take the public-domain part and use it as public domain code?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -301,7 +321,7 @@
 "시하고 싶습니다. 사람들로 하여금 제가 만든 것이라는 
사실을 알게 하고 싶은 것"
 "입니다. GPL을 사용해도 이러한 사항이 유효할 수 
있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -309,7 +329,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">두개의 라이선
스가 "
 "&ldquo;호환&rdquo; 된다는 말은 무슨 뜻입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -317,7 +337,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">어떤 라이선
스가 "
 "GPL과 호환된다는 것은 어떤 의미입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -325,7 +345,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">최초의 BSD 라이선스가 GPL과 
호환되지 "
 "않는 이유는 무엇입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -336,17 +356,13 @@
 "프트웨어의 일부를 개작해서 제가 만든 새로운 
프로그램에 포함시켰을 경우에, 이 "
 "프로그램을 상업적으로 배포하거나 판매하는 것이 
가능합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -354,7 +370,7 @@
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">제가 만든
 프"
 "로그램에 GPL을 적용하는 방법을 구체적으로 설명해 주시겠
습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -362,7 +378,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">다른 종류의 자유 
소프트웨어 라이선"
 "스 보다 GPL을 사용해야 하는 이유가 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -370,7 +386,7 @@
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">왜 GPL 
프로그램의 모"
 "든 복제물에 GPL 사본을 포함시키도록 규정하고 
있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -378,7 +394,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">저작물이 
라이선스 "
 "문서 자체보다 작은 양일 때는 어떻게 해야 합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -388,7 +404,7 @@
 "기 위해서 GPL의 전문이나 규정들을 실무에 적용하는 방법 
부분을 생략해도 무방합"
 "니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -397,7 +413,7 @@
 "을 GPL에 따라 공표하고자 하는데, 프로그램에 대한 ì 
€ìž‘권을 어떻게 인정받을 수 "
 "있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -405,7 +421,7 @@
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">제가 만든 
프로그램을 학교측"
 "이 학교의 독점 소프트웨어 제품에 포함시키려고 한다면 
어떻게 해야 합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -415,7 +431,7 @@
 "로그램을 GNU GPL로 공표하고 싶습니다. 그런데 동일한 
코드를 자유 소프트웨어가 "
 "아닌 프로그램에서도 사용하고 싶습니다. 이러한 이중ì 
ì¸ 사용이 가능한지요?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -425,13 +441,13 @@
 "로그램을 배포했던 개발자가 후에 누군가에게 그 
프로그램에 대한 독점적인 사용권"
 "을 줄 수가 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -440,42 +456,38 @@
 "&ldquo;GPL 버전 2 또는 ê·¸ 이후의 버전이 ì 
ìš©ë©ë‹ˆë‹¤.&rdquo;라는 말이 쓰여져 있"
 "는 이유는 무엇입니까? 매뉴얼에는 GPL을 사용하지 않는 
이유가 무엇입니까? </a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
 "source and distribute that too?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#DistributeWithSourceOnInternet\"
 # | id=\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries
 # | [-of a GPL-covered program-] {+via physical media+} without accompanying
@@ -501,7 +513,7 @@
 "사용자들에게 소스 코드를 보내주는 대신에, 단지 
인터넷상에 소스 코드를 올려놓"
 "으면 안될까요?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -509,7 +521,7 @@
 "to obtain the source?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -519,7 +531,7 @@
 "\"TOCSourceAndBinaryOnDifferentSites\">바이너리와 소스 코드를 
인터넷 상의 다"
 "른 사이트에 올려놓아도 괜찮습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -529,7 +541,7 @@
 "프로그램을 확장한 버전을 바이너리 형태로 배포하고자 
합니다. 바이너리와 함께 "
 "확장되기 이전의 소스 코드를 제공해도 괜찮습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#DistributingSourceIsInconvenient\"
 # | id=\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries,
 # | but distributing complete source is inconvenient.  [-How about-]  {+Is it
@@ -555,7 +567,7 @@
 "파일만을 바이너리와 함께 사용자들에게 제공하고 소스 
코드의 기본 부분은 FSF로"
 "부터 다운받도록 제안하는 것이 가능할까요?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -565,7 +577,7 @@
 "는 익명 FTP를 통해서 공개하지만, 소스 코드는 이를 
요청하는 사람들에게만 보내"
 "주고 싶습니다. 이러한 형태가 허용됩니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -575,7 +587,7 @@
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">어떤 방법으로 
바이너리를 다운받"
 "은 사용자 각각이 소스 코드도 다운받았는 지 알 수 
있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -583,66 +595,62 @@
 "under the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
 "must release their modified sources?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
 "right to redistribute that version?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
 "as a trade secret?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
 "secret?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
 "distribution?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
 "GPL, do I have to agree to anything?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
 "installer need to have a GPL-compatible license?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use
 # | GPL-covered editors {+such as GNU Emacs+} to develop nonfree programs? Can
 # | I use GPL-covered tools {+such as GCC+} to compile them?</a>
@@ -661,7 +669,7 @@
 "니까? 또한 GPL을 따르는 도구들을 이용해서 자유 
소프트웨어가 아닌 코드들을 컴"
 "파일하는 것이 가능합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -673,7 +681,7 @@
 "만들었다고 할 때, 다른 사람이 이 프로그램을 이용해서 
만든 디자인들을 모두 자"
 "유 소프트웨어가 되도록 할 수 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -681,7 +689,7 @@
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">어떤 
경우에, "
 "GPL 프로그램이 만든 결과물에도 GPL이 적용됩니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -691,17 +699,13 @@
 "스에서 사용할 수 있도록 포팅했다면, 이 프로그램을 
GPL이나 그밖의 자유 소프트"
 "웨어 라이선스를 사용해서 공표해야만 합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -711,7 +715,7 @@
 "&rdquo;과 &ldquo;두개의 모듈을 결합하여 하나의 
프로그램으로 만든다&rdquo;는 "
 "의미의 차이는 무엇입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -719,13 +723,13 @@
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">GPL 프로그램의 소스 
코드에도 "
 "&ldquo;공정 사용&rdquo;이 적용될 수 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | [-<b><a href=\"#TOCIfLibraryIsGPL\" id=\"IfLibraryIsGPL\">If-]{+<a
 # | href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If+} a library is
 # | released under the GPL (not the LGPL), does that mean that any program
@@ -744,7 +748,7 @@
 "LGPL이 아닌 GPL로 공표되어 있다면 이 라이브러리를 
사용하는 프로그램은 GPL 프"
 "로그램이 되어야 합니까?</a></b>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -755,7 +759,7 @@
 "크시켜야만 제가 만들고자 하는 독점 프로그램을 만들 수 
있습니다. 이것은 제가 "
 "만든 프로그램이 GPL 프로그램이 되어야 한다는 것을 
의미합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -763,7 +767,7 @@
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">그렇다면 링크하고자 
하는 프"
 "로그램을 Lesser GPL 라이선스로 사용할 수 있는 방법은 
없습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -776,7 +780,7 @@
 "게 예외를 인정해 줄 수 없을까요? 그렇게 되면 
프로그램을 사용하는 사람들의 수"
 "가 더욱 많아 질 수 있을 거라고 생각합니다.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -787,7 +791,7 @@
 "그래밍 언어에 대한 인터프리터가 GPL로 공표되어 있다면 
이러한 인터프리터를 사"
 "용해서 만들어진 프로그램에도 GPL과 호환되는 라이선스가 
적용되어야 합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -797,7 +801,7 @@
 "지 않는 라이선스를 사용하는 프로그래밍 언어에 대한 
인터프리터가 있다면, GPL "
 "프로그램을 이러한 인터프리터 상에서 실행할 수 
있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module
 # | to a GPL-covered [-module,-] {+program,+} do I have to use the GPL as the
 # | license for my module?</a>
@@ -815,13 +819,13 @@
 "든 모듈을 추가했을 경우에, 제가 만든 모듈에 대한 라이선
스로 GPL을 사용해야만 "
 "합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -830,7 +834,7 @@
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">플러그인을 
사용하는 프로그"
 "램을 GPL로 공표한다고 할 때, 플러그인의 라이선스에 대한 
조건이 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I [-use-]
 # | {+apply+} the GPL [-for-] {+when writing+} a plug-in for a nonfree
 # | program?</a>
@@ -845,13 +849,13 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">자유 
소프트웨어가 아닌 "
 "프로그램을 대상으로 하는 플러그인을 GPL로 만드는 것이 
가능합니까? </a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -860,7 +864,7 @@
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">GPL 
소프"
 "트웨어를 독점 시스템 안에 통합시키고 싶습니다. 
가능합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -869,7 +873,7 @@
 "proprietary part?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a [-href=\"#WritingFSWithNFLibs\"-] {+href=\"#FSWithNFLibs\"+}
 # | id=\"TOCFSWithNFLibs\"> {+Can+} I [-am writing-] {+write+} free software
 # | that uses nonfree [-libraries.  What legal issues come up if I use the
@@ -887,13 +891,13 @@
 "어가 아닌 라이브러리를 사용하는 자유 소프트웨어를 
개발하고 있습니다. 이 경"
 "우, GPL을 라이선스로 사용하게 되면 어떠한 법적 문제가 
일어날 수 있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -906,7 +910,7 @@
 "될 때, Visual C++ (또는 Visual Basic)의 라이브러리와 다이나믹 
링킹되는 것을 "
 "허용합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify
 # | GPL-covered programs and link them with the portability libraries from
 # | Money Guzzler Inc.  I cannot distribute the source code for these
@@ -933,7 +937,7 @@
 "하는 사람이 있다면 라이브러리를 직접 구입하는 형식을 
취하면 될 것입니다. 그런"
 "데 GPL에서 이러한 형태를 금지하는 이유는 무엇입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -942,7 +946,7 @@
 "I combine or link Q with a GPL-covered program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -952,14 +956,14 @@
 "GPL로 공표된 클래스를 수정없이 사용해서 서브 클래스를 
생성했을 경우, 서브 클"
 "래스가 포함된 전체 프로그램에는 GPL이 적용됩니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
 "modules with my GPL-covered library under a controlled interface only?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -972,7 +976,7 @@
 "의 개발에 기여했습니다. &nbsp;3. 이제, X가 V2를 GPL이 아닌 
라이선스로 교체하"
 "려고 합니다. &nbsp;이 경우, X는 Y의 허가를 받아야 
합니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -985,11 +989,7 @@
 "을 만들고 있습니다. 그 때문에 제가 만든 프로그램의 
라이선스를 어떻게 설정해"
 "야 할지 매우 혼란스럽습니다. 어떻게 해야 할까요</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -997,7 +997,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">GPL 
위반이라고 "
 "생각되는 일을 발견했을 때는 어떻게 해야 하나요?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1005,7 +1005,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">GPL을 법률적으로 
강제할 "
 "수 있는 사람은 누구입니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1015,7 +1015,7 @@
 "로그램을 GPL이 아닌 라이선스로 취득했다는 말을 
들었습니다. 가능한 얘기입니까?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1025,7 +1025,7 @@
 "개발자 자신도 GPL에 구속됩니까? 개발자가 한 행동이 GPL 
위반이 되었던 사례가 "
 "있습니까?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5142,27 +5142,36 @@
 #.         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>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "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>를 참고해 
주세요."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2001-] {+2001, 2006, 2007, 2008, 2014, 2015, 2017,
-# | 2018, 2019, 2020+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2001-] {+2001-2007, 2009, 2011, 2014, 2015, 2017, 2019,
+# | 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid "Copyright &copy; 2001 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr "Copyright &copy; 2001 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -5187,19 +5196,6 @@
 msgid "Updated:"
 msgstr "최종 수정일:"
 
-#, fuzzy
-#~| msgid ""
-#~| "Please see the <a href=\"/server/standards/README.translations.html"
-#~| "\">Translations README</a> for information on coordinating and "
-#~| "submitting translations of this article."
-#~ msgid ""
-#~ "Please see the <a href=\"/server/standards/README.translations.html"
-#~ "\">Translations README</a> for information on coordinating and "
-#~ "contributing translations of this article."
-#~ msgstr ""
-#~ "이 글의 다른 언어 번역문 작성이나 제출에 대한 정보는 
<a href=\"/server/"
-#~ "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
-
 #~ msgid ""
 #~ "Linking ABC statically or dynamically with other modules is making\n"
 #~ "a combined work based on ABC.  Thus, the terms and conditions of\n"

Index: old-licenses/po/gpl-2.0-faq.pl.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.pl.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- old-licenses/po/gpl-2.0-faq.pl.po   29 Dec 2021 15:55:37 -0000      1.15
+++ old-licenses/po/gpl-2.0-faq.pl.po   29 Dec 2021 16:01:02 -0000      1.16
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail DOT com>\n"
 "Language-Team: Polish <www-pl-trans@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-12-29 15:55+0000\n"
 "X-Generator: Poedit 2.3\n"
 
 #. type: Content of: <title>
@@ -31,7 +32,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "Często zadawane pytania na&nbsp;temat wersji drugiej GNU GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -46,7 +47,7 @@
 "Oprogramowania możecie dowiedzieć się więcej na&nbsp;<a href=\"/licenses/"
 "licenses.html\">naszej stronie poświęconej licencjom</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -55,11 +56,11 @@
 "\">możecie sprawdzić swoją wiedzę na&nbsp;temat licencjonowania wolnego "
 "oprogramowania rozwiązując nasz quiz</a> (w&nbsp;języku angielskim)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "Spis treści"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
@@ -67,7 +68,32 @@
 "Podstawowe pytania o&nbsp;GPL, Projekt GNU i&nbsp;Fundację Wolnego "
 "Oprogramowania"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "Ogólna orientacja w&nbsp;GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "Stosowanie GPL do&nbsp;własnych programów"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "Dystrybucja programów wydanych na&nbsp;GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr ""
+"Wykorzystywanie programów wydanych na&nbsp;GPL przy pisaniu innych 
programów"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "Łączenie pracy z&nbsp;kodem wydanym na&nbsp;GPL"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "Pytania o&nbsp;naruszenia GPL"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -75,7 +101,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">Co to znaczy "
 "&bdquo;GPL&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -85,7 +111,7 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Czy&nbsp;wolne oprogramowanie oznacza "
 "programy stosujące GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -95,7 +121,7 @@
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Czy&nbsp;wszystkie "
 "programy GNU stosują GNU GPL jako swoją licencję?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -105,7 +131,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Czy&nbsp;użycie GPL dla "
 "programu czyni z&nbsp;niego oprogramowanie GNU?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -113,7 +139,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Czy&nbsp;"
 "mogę użyć GPL do&nbsp;czegoś innego niż oprogramowanie?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -121,7 +147,7 @@
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Dlaczego nie "
 "stosujecie GPL do&nbsp;podręczników?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -129,7 +155,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Czy&nbsp;istnieją "
 "tłumaczenia GPL na&nbsp;inne języki?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -139,7 +165,7 @@
 "niektóre biblioteki GNU wydane są na&nbsp;zwykłej GPL zamiast 
na&nbsp;Lesser "
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -152,7 +178,7 @@
 "jeśli mam prawa autorskie do&nbsp;programu na&nbsp;GPL, też powinienem to "
 "zrobić? Jeśli tak, to w&nbsp;jaki sposób?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
@@ -160,11 +186,7 @@
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Czy&nbsp;mogę zmodyfikować GPL "
 "i&nbsp;utworzyć zmodyfikowaną licencję?</a>"
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "Ogólna orientacja w&nbsp;GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -174,7 +196,7 @@
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Dlaczego GPL "
 "pozwala użytkownikom na&nbsp;publikację własnych zmodyfikowanych 
wersji?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -184,7 +206,7 @@
 "\"TOCGPLRequireSourcePostedPublic\">Czy&nbsp;GPL wymaga, by kod źródłowy "
 "zmodyfikowanej wersji został udostępniony publicznie?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
@@ -194,7 +216,7 @@
 "\">Czy&nbsp;mogę w&nbsp;tym samym komputerze mieć program objęty licencją 
"
 "GPL i&nbsp;niezwiązany z&nbsp;nim inny, nie-wolny program?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
@@ -203,7 +225,7 @@
 "ma kopię programu wydanego na&nbsp;GPL, to czy&nbsp;mogę domagać się 
od&nbsp;"
 "niego, żeby dał mi kopię?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -215,7 +237,7 @@
 "Czy&nbsp;to znaczy, że&nbsp;każdy na&nbsp;świecie może dostać źródła "
 "dowolnego programu na&nbsp;GPL, wszystko jedno jakiego?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -226,7 +248,7 @@
 "publikowane, muszą być &bdquo;licencjonowane&nbsp;&hellip; dla wszelkich "
 "stron trzecich&rdquo;. Kim są te trzecie strony?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -234,7 +256,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Czy&nbsp;"
 "GPL pozwala mi na&nbsp;sprzedaż kopii programu za&nbsp;pieniądze?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -244,7 +266,7 @@
 "\">Czy&nbsp;GPL pozwala mi na&nbsp;pobieranie opłaty za&nbsp;pobranie "
 "programu z&nbsp;mojego witryny dystrybucyjnej?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -254,7 +276,7 @@
 "\">Czy&nbsp;GPL pozwala mi żądać od&nbsp;każdego, kto otrzyma program "
 "wniesienia opłaty i/lub powiadomienia mnie?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -266,7 +288,7 @@
 "za&nbsp;odpłatnością oprogramowanie na&nbsp;GPL, muszę je również 
udostępnić "
 "ogółowi bez&nbsp;opłat?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -275,7 +297,7 @@
 "pozwala mi na&nbsp;dystrybucję kopii na&nbsp;warunkach umowy o&nbsp;"
 "nieujawnianiu <cite>(nondisclosure agreement)</cite>?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -285,7 +307,7 @@
 "GPL pozwala mi na&nbsp;dystrybucję zmodyfikowanej wersji lub&nbsp;wersji "
 "beta na&nbsp;warunkach umowy o&nbsp;nieujawnianiu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -295,7 +317,7 @@
 "\">Czy&nbsp;GPL pozwala mi na&nbsp;rozwijanie zmodyfikowanej wersji w&nbsp;"
 "ramach umowy o&nbsp;nieujawnianiu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -305,7 +327,7 @@
 "\">Czy&nbsp;jestem zobowiązany do&nbsp;ogłoszenia praw autorskich "
 "(copyright) do&nbsp;własnych modyfikacji programu objętego GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -317,7 +339,7 @@
 "wziąć tę część, która jest dobrem publicznym i&nbsp;korzystać 
z&nbsp;niej "
 "tak jak z&nbsp;kodu z&nbsp;domeny publicznej?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -327,7 +349,7 @@
 "pracę. Chcę, żeby ludzie wiedzieli, co napisałem. Czy&nbsp;praca będzie 
mi "
 "nadal przypisywana jeśli stosuję GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -335,7 +357,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">Co to oznacza, "
 "że&nbsp;dwie licencje są &bdquo;zgodne&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -343,7 +365,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">Co znaczy, "
 "że&nbsp;licencja jest &bdquo;zgodna z&nbsp;GPL&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -351,7 +373,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Dlaczego pierwotna licencja BSD jest "
 "niezgodna z&nbsp;GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -363,7 +385,7 @@
 "mi zmienić oryginalny kod w&nbsp;nowy program, a&nbsp;następnie "
 "rozpowszechniać i&nbsp;sprzedawać taki nowy program komercyjnie?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
@@ -371,11 +393,7 @@
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">Jak działa LGPL w&nbsp;przypadku "
 "Javy?</a>"
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "Stosowanie GPL do&nbsp;własnych programów"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -384,7 +402,7 @@
 "moglibyście podać szczegółowe instrukcje, jak zastosować GPL 
do&nbsp;mojego "
 "programu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -392,7 +410,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Dlaczego powinienem stosować GNU "
 "GPL, a&nbsp;nie inne licencje wolnego  oprogramowania?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -400,7 +418,7 @@
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Dlaczego GPL wymaga "
 "dołączania kopii GPL do&nbsp;każdego egzemplarza programu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -408,7 +426,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">A&nbsp;co jeśli "
 "dzieło jest niewiele dłuższe niż sama licencja?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -418,7 +436,7 @@
 "zaoszczędzenia miejsca mogę pominąć preambułę GPL lub&nbsp;wskazówki, 
jak "
 "stosować tę licencję do&nbsp;własnych programów?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -426,7 +444,7 @@
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">Jak mogę uzyskać "
 "prawa autorskie do&nbsp;swojego programu, by wydać go na&nbsp;GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -435,7 +453,7 @@
 "włączyć mój program do&nbsp;swego własnego produktu oprogramowania 
prawnie "
 "zastrzeżonego?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -445,7 +463,7 @@
 "wydać napisany przez siebie program na&nbsp;GNU GPL, ale&nbsp;chciałbym "
 "wykorzystać ten sam kod w&nbsp;programach, które nie będą wolne.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -455,7 +473,7 @@
 "\">Czy&nbsp;konstruktor programu, który wypuścił go na&nbsp;GPL może 
później "
 "licencjonować go innej stronie na&nbsp;zasadzie wyłączności?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
@@ -463,7 +481,7 @@
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Czy&nbsp;rząd USA może wydać "
 "program na&nbsp;GNU GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -472,7 +490,7 @@
 "programach powinno się pisać &bdquo;w wersji&nbsp;2 GPL lub&nbsp;dowolnej "
 "późniejszej wersji&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
@@ -480,7 +498,7 @@
 "<a href=\"#FontException\" id=\"TOCFontException\">Jak stosuje się GPL "
 "do&nbsp;fontów?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
@@ -488,7 +506,7 @@
 "<a href=\"#WMS\" id=\"TOCWMS\">Jakiej licencji powinienem użyć dla systemu "
 "szablonów do&nbsp;zarządzania witryną WWW?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
@@ -496,11 +514,7 @@
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Czy&nbsp;mogę program 
wydać "
 "na&nbsp;zasadzie GPL, jeśli do&nbsp;rozwoju użyłem niewolne 
narzędzia?</a>"
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "Dystrybucja programów wydanych na&nbsp;GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
@@ -509,7 +523,7 @@
 "zmodyfikowaną wersję programu objętego GPL wydać tylko w&nbsp;postaci "
 "binarnej?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
@@ -519,7 +533,7 @@
 "z&nbsp;sieci tylko binaria. Czy&nbsp;jeśli rozprowadzam kopie, to muszę "
 "pobrać źródła i&nbsp;je też rozprowadzać?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" id="
 "\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -531,7 +545,7 @@
 "nośniku fizycznym, ale&nbsp;bez towarzyszących źródeł. Czy&nbsp;mogę "
 "zapewniać dostęp do&nbsp;źródeł przez FTP zamiast przesyłać je pocztą
?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -543,7 +557,7 @@
 "z&nbsp;ofertą dostarczenia źródeł i&nbsp;zrobił mi kopię. 
Czy&nbsp;mogę "
 "wykorzystać tę ofertę, żeby otrzymać źródła?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -554,7 +568,7 @@
 "na&nbsp;swoim serwerze internetowym, a&nbsp;źródła w&nbsp;innym ośrodku "
 "internetowym?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -565,7 +579,7 @@
 "postaci binarnej. Czy&nbsp;wystarczy rozpowszechniać źródła oryginalnej "
 "wersji?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" id="
 "\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, but "
@@ -578,7 +592,7 @@
 "gdybym razem binariami dawał użytkownikom pliki różnic w&nbsp;stosunku "
 "do&nbsp;&bdquo;standardowej&rdquo; wersji?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -588,7 +602,7 @@
 "udostępnić binaria za&nbsp;pośrednictwem anonimowego FTP, 
ale&nbsp;wysyłać "
 "źródła tylko tym, którzy ich zażądają.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -598,7 +612,7 @@
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">Jak mogę się upewnić, 
że&nbsp;"
 "użytkownik, który ściągnął binaria pobrał również źródła?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -610,7 +624,7 @@
 "jego zmodyfikowane wersje na&nbsp;GPL, ale&nbsp;samego oryginału nie można "
 "rozpowszechniać na&nbsp;GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
@@ -621,7 +635,7 @@
 "GPL. Czy&nbsp;według GPL firma musi wypuścić źródła tej swojej 
zmienionej "
 "wersji?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
@@ -630,7 +644,7 @@
 "wykonanie i&nbsp;używanie wielu kopii programu wewnątrz jednej instytucji "
 "lub&nbsp;firmy jest &bdquo;rozprowadzaniem&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
@@ -640,7 +654,7 @@
 "z&nbsp;pewną wersją programu objętego GPL, to czy&nbsp;GPL daje mu prawo "
 "do&nbsp;redystrybucji tej wersji?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
@@ -650,7 +664,7 @@
 "dystrybuuje mi kopie pracy innego programisty objętej GPL jako sekret "
 "handlowy?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
@@ -660,7 +674,7 @@
 "firma dystrybuuje kopie własnego programu objętego GPL jako sekret 
handlowy?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
@@ -670,7 +684,7 @@
 "przekazanie kopii firmie, w&nbsp;której ma się udziały większościowe 
i&nbsp;"
 "którą się kontroluje, przedsiębiorstwu zależnemu, stanowi 
rozprowadzanie?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
@@ -681,7 +695,7 @@
 "GPL? Jeśli dostanę jakieś programy na&nbsp;GPL, to czy&nbsp;muszę się "
 "na&nbsp;coś zgadzać?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
@@ -691,12 +705,7 @@
 "dołączyć do&nbsp;programu objętego GPL jakiś program instalacyjny. 
Czy&nbsp;"
 "ten program instalacyjny musi mieć licencję kompatybilną z&nbsp;GPL?</a>"
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr ""
-"Wykorzystywanie programów wydanych na&nbsp;GPL przy pisaniu innych 
programów"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
@@ -707,7 +716,7 @@
 "nie są wolne? Czy&nbsp;do ich kompilacji mogę wykorzystywać narzędzia 
objęte "
 "GPL, takie jak GCC?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -719,7 +728,7 @@
 "na&nbsp;przykład, jeśli program służy do&nbsp;opracowywania projektów "
 "sprzętu, to czy&nbsp;mogę wymagać, by te projekty musiały być wolne?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -727,7 +736,7 @@
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">W&nbsp;jakich "
 "przypadkach wynik programu na&nbsp;GPL jest również objęty GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -738,7 +747,7 @@
 "wydać go jako Wolne Oprogramowanie na&nbsp;GPL czy&nbsp;jakiejś innej "
 "licencji Wolnego Oprogramowania?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
@@ -746,11 +755,7 @@
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Czy&nbsp;wyjątek dla "
 "libstdc++ pozwala na&nbsp;dynamiczne łączenie?</a>"
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "Łączenie pracy z&nbsp;kodem wydanym na&nbsp;GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -760,7 +765,7 @@
 "&bdquo;zwyczajne gromadzenie&rdquo; i&nbsp;&bdquo;połączenie dwu modułów "
 "w&nbsp;jeden program&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -769,7 +774,7 @@
 "dozwolonego użytku&rdquo; w&nbsp;korzystaniu z&nbsp;kodu źródłowego 
programu "
 "objętego GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
@@ -777,7 +782,7 @@
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Czy&nbsp;rząd USA może 
wydać "
 "ulepszenia do&nbsp;programu objętego GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -787,7 +792,7 @@
 "bibliotekę wydano na&nbsp;warunkach GPL (nie LGPL), to znaczy, 
że&nbsp;każdy "
 "program, który jej używa musi być objęty GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -799,7 +804,7 @@
 "zastrzeżony. Czy&nbsp;z&nbsp;tego, że&nbsp;łączę z&nbsp;waszym programem 
"
 "wynika, że&nbsp;muszę wydać swój program na&nbsp;GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -808,7 +813,7 @@
 "istnieje możliwość uzyskania licencji waszego programu na&nbsp;warunkach "
 "Lesser GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -820,7 +825,7 @@
 "zbudowania oprogramowania prawnie zastrzeżonego. Zrobicie dla nas wyjątek? "
 "To oznaczałby więcej użytkowników tego programu.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -832,7 +837,7 @@
 "programy napisane do&nbsp;interpretowania przez niego muszą być na&nbsp;"
 "licencji zgodnej z&nbsp;GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -842,7 +847,7 @@
 "interpreter pewnego języka programowania ma licencję, która jest niezgodna 
"
 "z&nbsp;GPL, to czy&nbsp;mogę na&nbsp;nim uruchamiać programy objęte 
GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -852,7 +857,7 @@
 "do&nbsp;programu objętego GPL, to czy&nbsp;muszę użyć GPL jako licencji 
dla "
 "swojego modułu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
@@ -860,7 +865,7 @@
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\">Kiedy program i&nbsp;jego "
 "wtyczki są uważane za&nbsp;jeden program?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -870,7 +875,7 @@
 "wydanym na&nbsp;GPL używane są wtyczki <cite>(plug-ins)</cite>, to jakie są
 "
 "dla nich wymagania licencyjne?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
@@ -878,7 +883,7 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Czy&nbsp;mogę wydać "
 "zastosować GPL pisząc wtyczkę do&nbsp;programu, który nie jest wolny?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
@@ -887,7 +892,7 @@
 "niewolny program, zaprojektowany tak, żeby ładował wtyczkę wydaną 
na&nbsp;"
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -897,7 +902,7 @@
 "\">Chciałbym do&nbsp;swego prawnie zastrzeżonego systemu wcielić "
 "oprogramowanie objęte GPL. Czy&nbsp;mogę to zrobić?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -912,7 +917,7 @@
 "który pośredniczyłby między częścią objętą GPL a&nbsp;częścią 
własnościową?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
@@ -920,7 +925,7 @@
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\">Czy&nbsp;mogę pisać wolne "
 "oprogramowanie korzystające z&nbsp;bibliotek, które nie są wolne?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
@@ -929,7 +934,7 @@
 "prawne pojawią się, jeśli z&nbsp;oprogramowaniem GPL zastosuję biblioteki 
"
 "niezgodne z&nbsp;GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -942,7 +947,7 @@
 "programu z&nbsp;biblioteką wykonawczą <cite>(run-time)</cite> 
Visual&nbsp;C+"
 "+?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -957,7 +962,7 @@
 "zmienić te wersje, musiałby osobno uzyskać biblioteki. Dlaczego GPL 
na&nbsp;"
 "to nie pozwala?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -972,7 +977,7 @@
 "licencja ta jest zgodna z&nbsp;GPL? Czy&nbsp;mogę połączyć lub&nbsp;"
 "skonsolidować Q z&nbsp;programem objętym GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -983,7 +988,7 @@
 "GPL, a&nbsp;utworzę jej podklasę, to w&nbsp;jaki sposób GPL wpływa 
na&nbsp;"
 "powstały większy program?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -994,7 +999,7 @@
 "na&nbsp;łączenie modułów prawnie zastrzeżonych ze swoją biblioteką 
na&nbsp;"
 "GPL tylko za&nbsp;pośrednictwem ustalonego interfejsu?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -1007,7 +1012,7 @@
 "licencję V2 na&nbsp;inną niż GPL. Czy&nbsp;X potrzebuje na&nbsp;to "
 "pozwolenia ze strony Y?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -1021,11 +1026,7 @@
 "Czy&nbsp;moglibyście mi powiedzieć, z&nbsp;jakich licencji mogę 
skorzystać?</"
 "a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "Pytania o&nbsp;naruszenia GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -1033,7 +1034,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">Co powinienem "
 "zrobić, jeśli wykryję możliwe naruszenie GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1041,7 +1042,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Kto jest upoważniony "
 "do&nbsp;egzekwowania przestrzegania GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1051,7 +1052,7 @@
 "że&nbsp;ktoś ma kopię programu wydanego na&nbsp;GPL, ale&nbsp;z&nbsp;inną 
"
 "licencją. Czy&nbsp;to możliwe?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1061,7 +1062,7 @@
 "konstruktor programu objętego GPL jest nią związany? Czy&nbsp;jego 
działania "
 "mogą kiedykolwiek naruszać GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5333,14 +5334,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 ""
 "Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości, "
@@ -5353,9 +5360,16 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2001, 2006, 2007, 2008,-] {+2001-2007, 2009, 2011,+}
+# | 2014, 2015, 2017, [-2018,-] 2019, 202[-0-]{+1+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#| "2020 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
 "Free Software Foundation, Inc."
@@ -5383,10 +5397,9 @@
 msgid "Updated:"
 msgstr "Aktualizowane:"
 
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."

Index: old-licenses/po/gpl-2.0-faq.pot
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.pot,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- old-licenses/po/gpl-2.0-faq.pot     8 Dec 2020 22:04:16 -0000       1.33
+++ old-licenses/po/gpl-2.0-faq.pot     29 Dec 2021 16:01:03 -0000      1.34
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -35,75 +35,99 @@
 "href=\"/licenses/licenses.html\">our licenses page</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" "
 "id=\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the "
 "GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" "
 "id=\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software "
 "use the GNU GPL as its license?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" "
 "id=\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for "
 "a program make it GNU software?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
 "GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -111,44 +135,40 @@
 "so, how?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" "
 "id=\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does "
 "the GPL permit users to publish their modified versions?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" "
 "id=\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code "
 "of modified versions be posted to the public?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" "
 "id=\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
 "an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" "
 "id=\"TOCWhatDoesWrittenOfferValid\">What does this &ldquo;written offer "
@@ -156,7 +176,7 @@
 "can get the source to any GPL'ed program no matter what?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" "
 "id=\"TOCTheGPLSaysModifiedVersions\">The GPL says that modified versions, if "
@@ -164,27 +184,27 @@
 "are these third parties?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" "
 "id=\"TOCDoesTheGPLAllowDownloadFee\"> Does the GPL allow me to charge a fee "
 "for downloading the program from my distribution site?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
 "pay me a fee and/or notify me?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" "
 "id=\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd "
@@ -192,34 +212,34 @@
 "without a charge?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
 "agreement?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
 "agreement?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered "
 "program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" "
 "id=\"TOCCombinePublicDomainWithGPL\">If a program combines public-domain "
@@ -227,32 +247,32 @@
 "public domain code?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
 "the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -260,121 +280,113 @@
 "program commercially?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with "
 "Java?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
 "programs, to save space?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
 "the same code in nonfree programs.</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
 "another party for exclusive use?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
 "source and distribute that too?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" "
 "id=\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -382,7 +394,7 @@
 "FTP instead of by mail order?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" "
 "id=\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -390,21 +402,21 @@
 "to obtain the source?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" "
 "id=\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my "
 "Internet server and put the source on a different Internet site?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
 "form.  Is it enough to distribute the source for the original version?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" "
 "id=\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, "
@@ -413,21 +425,21 @@
 "binaries?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
 "who order them.</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" "
 "id=\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each "
 "user who downloads the binaries also gets the source?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -435,73 +447,69 @@
 "under the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
 "must release their modified sources?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
 "right to redistribute that version?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
 "as a trade secret?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
 "secret?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
 "distribution?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
 "GPL, do I have to agree to anything?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
 "installer need to have a GPL-compatible license?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
 "GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -509,56 +517,52 @@
 "free?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
 "under the GPL or some other Free Software license?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
 "modules into one program&rdquo;?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
 "uses it has to be under the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -566,13 +570,13 @@
 "program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -580,7 +584,7 @@
 "users of that program.</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -588,53 +592,53 @@
 "licenses?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
 "GPL, can I run GPL-covered programs on it?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
 "module?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
 "plug-in?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
 "this?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate "
 "GPL-covered software in my proprietary system.  Can I do this by putting a "
@@ -643,19 +647,19 @@
 "proprietary part?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -663,7 +667,7 @@
 "run-time library permitted under the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -672,7 +676,7 @@
 "libraries separately.  Why doesn't the GPL permit this?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -681,14 +685,14 @@
 "I combine or link Q with a GPL-covered program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
 "in what way does the GPL affect the larger program?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" "
 "id=\"TOCLinkingOverControlledInterface\">How can I allow linking of "
@@ -696,7 +700,7 @@
 "only?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -704,7 +708,7 @@
 "non-GPL license.  Does X need Y's permission?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -713,37 +717,33 @@
 "use?</a>"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
 "possible?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
 "be a violation of the GPL?</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -3471,7 +3471,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>. 
@@ -3479,13 +3479,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; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: old-licenses/po/gpl-2.0-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- old-licenses/po/gpl-2.0-faq.ru.po   29 Dec 2021 15:55:37 -0000      1.69
+++ old-licenses/po/gpl-2.0-faq.ru.po   29 Dec 2021 16:01:03 -0000      1.70
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2020-12-08 22:35+0100\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2020-07-09 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-12-29 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -29,7 +30,7 @@
 msgid "Frequently Asked Questions about version 2 of the GNU GPL"
 msgstr "Ответы на вопросы о версии 2 GNU GPL"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page contains answers to commonly asked questions about the GNU General "
 "Public License (GPL), version 2. The FAQ for the current version of the GPL "
@@ -44,7 +45,7 @@
 "обеспечения обращайтесь, пожалуйста, к <a 
href=\"/licenses/licenses.html"
 "\">нашей странице лицензий</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "After you read this FAQ, <a href=\"/cgi-bin/license-quiz.cgi\">you can test "
 "your knowledge of Free Software licensing with our quiz</a>."
@@ -53,11 +54,11 @@
 "свободных программ с помощью <a 
href=\"/cgi-bin/license-quiz.cgi\">нашего "
 "опросника</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "Содержание"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid ""
 "Basic questions about the GPL, the GNU Project, and the Free Software "
 "Foundation"
@@ -65,7 +66,33 @@
 "Простые вопросы о GPL, проекте GNU и Фонде 
свободного программного "
 "обеспечения"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><h4>
+msgid "General understanding of the GPL"
+msgstr "Общее понимание GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using the GPL for your programs"
+msgstr "Применение GPL в ваших программах"
+
+#. type: Content of: <div><h4>
+msgid "Distribution of programs released under the GPL"
+msgstr "Распространение программ, выпущенных 
под GPL"
+
+#. type: Content of: <div><h4>
+msgid "Using programs released under the GPL when writing other programs"
+msgstr ""
+"Использование программ, выпущенных на 
условиях GPL, при написании других "
+"программ"
+
+#. type: Content of: <div><h4>
+msgid "Combining work with code released under the GPL"
+msgstr "Комбинирование работы с текстами, 
выпущенными на условиях GPL"
+
+#. type: Content of: <div><h4>
+msgid "Questions about violations of the GPL"
+msgstr "Вопросы о нарушениях GPL"
+
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">What does "
 "&ldquo;GPL&rdquo; stand for?</a>"
@@ -73,7 +100,7 @@
 "<a href=\"#WhatDoesGPLStandFor\" id=\"TOCWhatDoesGPLStandFor\">Как "
 "расшифровывается &ldquo;GPL&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" id="
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Does free software mean using the GPL?"
@@ -83,7 +110,7 @@
 "\"TOCDoesFreeSoftwareMeanUsingTheGPL\">Подразумевает ли 
выражение &ldquo;"
 "свободная программа&rdquo; применение GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\" id="
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU software use "
@@ -93,7 +120,7 @@
 "\"TOCDoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Все ли 
программы GNU "
 "используют в качестве лицензии GNU GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesUsingTheGPLForAProgramMakeItGNUSoftware\" id="
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Does using the GPL for a "
@@ -103,7 +130,7 @@
 "\"TOCDoesUsingTheGPLForAProgramMakeItGNUSoftware\">Если для 
программы "
 "применяется GPL, то делает ли это ее 
программой GNU?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Can I use "
 "the GPL for something other than software?</a>"
@@ -111,7 +138,7 @@
 "<a href=\"#GPLOtherThanSoftware\" id=\"TOCGPLOtherThanSoftware\">Могу я "
 "применять GPL для чего-нибудь кроме 
программ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Why don't you "
 "use the GPL for manuals?</a>"
@@ -119,7 +146,7 @@
 "<a href=\"#WhyNotGPLForManuals\" id=\"TOCWhyNotGPLForManuals\">Почему 
вы не "
 "применяете GPL для руководств?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Are there "
 "translations of the GPL into other languages?</a>"
@@ -127,7 +154,7 @@
 "<a href=\"#GPLTranslations\" id=\"TOCGPLTranslations\">Существуют 
ли "
 "переводы GPL на другие языки?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Why are "
 "some GNU libraries released under the ordinary GPL rather than the Lesser "
@@ -136,7 +163,7 @@
 "<a href=\"#WhySomeGPLAndNotLGPL\" id=\"TOCWhySomeGPLAndNotLGPL\">Почему 
"
 "некоторые библиотеки GNU выпускаются по 
обычной GPL, а не по Меньшей GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AssignCopyright\" id=\"TOCAssignCopyright\">Why does the FSF "
 "require that contributors to FSF-copyrighted programs assign copyright to "
@@ -149,7 +176,7 @@
 "это, если мне принадлежат авторские права 
на программу под GPL?  Если да, то "
 "как?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Can I modify the GPL and make a "
 "modified license?</a>"
@@ -157,11 +184,7 @@
 "<a href=\"#ModifyGPL\" id=\"TOCModifyGPL\">Можно мне изменить 
GPL и сделать "
 "другую лицензию?</a>"
 
-#. type: Content of: <h4>
-msgid "General understanding of the GPL"
-msgstr "Общее понимание GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\" id="
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why does the "
@@ -171,7 +194,7 @@
 "\"TOCWhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Почему 
GPL "
 "разрешает пользователям публиковать свои 
измененные версии?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLRequireSourcePostedPublic\" id="
 "\"TOCGPLRequireSourcePostedPublic\">Does the GPL require that source code of "
@@ -181,7 +204,7 @@
 "\"TOCGPLRequireSourcePostedPublic\">Требует ли GPL, чтобы исх
одный текст "
 "измененных версий выставлялся на 
всеобщее обозрение?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
@@ -191,7 +214,7 @@
 "\">Может у меня быть программа под GPL и не 
связанная с ней несвободная "
 "программа на одном и том же компьютере?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIDemandACopy\" id=\"TOCCanIDemandACopy\">If I know someone has "
 "a copy of a GPL-covered program, can I demand he give me a copy?</a>"
@@ -200,7 +223,7 @@
 "кого-то есть копия программы под GPL, могу 
ли я требовать, чтобы он дал мне "
 "копию?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesWrittenOfferValid\" id=\"TOCWhatDoesWrittenOfferValid"
 "\">What does this &ldquo;written offer valid for any third party&rdquo; "
@@ -213,7 +236,7 @@
 "свете могут получить исходный текст любой 
программы под GPL, все равно, "
 "какой именно?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TheGPLSaysModifiedVersions\" id=\"TOCTheGPLSaysModifiedVersions"
 "\">The GPL says that modified versions, if released, must be &ldquo;licensed "
@@ -224,7 +247,7 @@
 "должны быть &ldquo;лицензированы&hellip; для 
всех третьих сторон&rdquo;. Кто "
 "эти третьи стороны?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowMoney\" id=\"TOCDoesTheGPLAllowMoney\">Does the "
 "GPL allow me to sell copies of the program for money?</a>"
@@ -232,7 +255,7 @@
 "<a href=\"#DoesTheGPLAllowMoney\" 
id=\"TOCDoesTheGPLAllowMoney\">Позволяет "
 "ли мне GPL продавать копии программы за 
деньги?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowDownloadFee\" id=\"TOCDoesTheGPLAllowDownloadFee"
 "\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -242,7 +265,7 @@
 "\">Позволяет ли мне GPL брать плату за 
получение программы с моего "
 "распространяющего сайта?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowRequireFee\" id=\"TOCDoesTheGPLAllowRequireFee\"> "
 "Does the GPL allow me to require that anyone who receives the software must "
@@ -252,7 +275,7 @@
 "\">Позволяет ли мне GPL требовать, чтобы 
всякий, кто получает программу, "
 "платил мне или извещал меня?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\" id="
 "\"TOCDoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd software "
@@ -264,7 +287,7 @@
 "под GPL за деньги, требуется ли от меня 
также предоставить ее обществу "
 "бесплатно?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowNDA\" id=\"TOCDoesTheGPLAllowNDA\">Does the GPL "
 "allow me to distribute a copy under a nondisclosure agreement?</a>"
@@ -272,7 +295,7 @@
 "<a href=\"#DoesTheGPLAllowNDA\" 
id=\"TOCDoesTheGPLAllowNDA\">Позволяет ли "
 "мне GPL распространять копии по договору о 
неразглашении?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DoesTheGPLAllowModNDA\" id=\"TOCDoesTheGPLAllowModNDA\">Does the "
 "GPL allow me to distribute a modified or beta version under a nondisclosure "
@@ -282,7 +305,7 @@
 "ли мне GPL распространять измененную или 
тестовую версию по договору о "
 "неразглашении?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DevelopChangesUnderNDA\" id=\"TOCDevelopChangesUnderNDA\">Does "
 "the GPL allow me to develop a modified version under a nondisclosure "
@@ -292,7 +315,7 @@
 "\">Позволяет ли мне GPL разрабатывать 
измененную версию по договору о "
 "неразглашении?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RequiredToClaimCopyright\" id=\"TOCRequiredToClaimCopyright\">Am "
 "I required to claim a copyright on my modifications to a GPL-covered program?"
@@ -302,7 +325,7 @@
 "\">Требуется ли от меня заявление авторских
 прав на мои изменения в "
 "программе под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CombinePublicDomainWithGPL\" id=\"TOCCombinePublicDomainWithGPL"
 "\">If a program combines public-domain code with GPL-covered code, can I "
@@ -313,7 +336,7 @@
 "GPL, могу ли я взять часть из общественного 
достояния и пользоваться ею, как "
 "текстом из общественного достояния?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IWantCredit\" id=\"TOCIWantCredit\">I want to get credit for my "
 "work. I want people to know what I wrote. Can I still get credit if I use "
@@ -323,7 +346,7 @@
 "работу. Я хочу, чтобы люди знали, что я 
написал. Могу я требовать признания, "
 "если я применяю GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">What does it mean "
 "to say that two licenses are &ldquo;compatible&rdquo;?</a>"
@@ -331,7 +354,7 @@
 "<a href=\"#WhatIsCompatible\" id=\"TOCWhatIsCompatible\">Что имеют в 
виду, "
 "когда говорят, что две лицензии 
&ldquo;совместимы&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">What does it "
 "mean to say a license is &ldquo;compatible with the GPL&rdquo;?</a>"
@@ -339,7 +362,7 @@
 "<a href=\"#WhatDoesCompatMean\" id=\"TOCWhatDoesCompatMean\">Что 
означают "
 "слова &ldquo;лицензия совместима с GPL&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Why is the original BSD license "
 "incompatible with the GPL?</a>"
@@ -347,7 +370,7 @@
 "<a href=\"#OrigBSD\" id=\"TOCOrigBSD\">Почему 
первоначальная лицензия BSD "
 "несовместима с GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCommercially\" id=\"TOCGPLCommercially\">If I use a piece of "
 "software that has been obtained under the GNU GPL, am I allowed to modify "
@@ -359,17 +382,13 @@
 "первоначальный исходный текст в новую 
программу, а затем распространять и "
 "продавать эту новую программу 
коммерчески?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">How does the LGPL work with Java?</"
 "a>"
 msgstr "<a href=\"#LGPLJava\" id=\"TOCLGPLJava\">Как LGPL работает 
с Java?</a>"
 
-#. type: Content of: <h4>
-msgid "Using the GPL for your programs"
-msgstr "Применение GPL в ваших программах"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CouldYouHelpApplyGPL\" id=\"TOCCouldYouHelpApplyGPL\">Could you "
 "give me step by step instructions on how to apply the GPL to my program?</a>"
@@ -378,7 +397,7 @@
 "вы дать мне подробные указания насчет 
того, как применить GPL к моей "
 "программе?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Why should I use the GNU GPL "
 "rather than other free software licenses?</a>"
@@ -386,7 +405,7 @@
 "<a href=\"#WhyUseGPL\" id=\"TOCWhyUseGPL\">Почему мне следует 
применять GNU "
 "GPL, а не другие лицензии свободных 
программ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Why does the GPL "
 "require including a copy of the GPL with every copy of the program?</a>"
@@ -394,7 +413,7 @@
 "<a href=\"#WhyMustIInclude\" id=\"TOCWhyMustIInclude\">Почему GPL 
требует "
 "передачи копии GPL в каждой копии 
программы?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">What if the work "
 "is not much longer than the license itself?</a>"
@@ -402,7 +421,7 @@
 "<a href=\"#WhatIfWorkIsShort\" id=\"TOCWhatIfWorkIsShort\">Что, если 
работа "
 "не намного больше самой лицензии?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOmitPreamble\" id=\"TOCGPLOmitPreamble\">Can I omit the "
 "preamble of the GPL, or the instructions for how to use it on your own "
@@ -412,7 +431,7 @@
 "преамбулу GPL или инструкции по применению 
ее для собственных программ, "
 "чтобы сэкономить место?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">How do I get a "
 "copyright on my program in order to release it under the GPL?</a>"
@@ -420,7 +439,7 @@
 "<a href=\"#HowIGetCopyright\" id=\"TOCHowIGetCopyright\">Как мне 
получить "
 "авторские права на свою программу, чтобы 
выпустить ее под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatIfSchool\" id=\"TOCWhatIfSchool\">What if my school might "
 "want to make my program into its own proprietary software product?</a>"
@@ -429,7 +448,7 @@
 "заведение захочет обратить мою программу 
в свой несвободный программный "
 "продукт?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
@@ -439,7 +458,7 @@
 "хотелось бы выпустить написанную мной 
программу под GNU GPL, но я хочу "
 "использовать те же исходные тексты в 
несвободных программах.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanDeveloperThirdParty\" id=\"TOCCanDeveloperThirdParty\">Can the "
 "developer of a program who distributed it under the GPL later license it to "
@@ -449,7 +468,7 @@
 "ли разработчик программы, 
распространявший ее по GPL, впоследствии 
передать "
 "исключительные права на нее другой 
стороне?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Can the US Government release a "
 "program under the GNU GPL?</a>"
@@ -457,7 +476,7 @@
 "<a href=\"#GPLUSGov\" id=\"TOCGPLUSGov\">Может ли 
правительство США "
 "выпустить программу под GNU GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#VersionTwoOrLater\" id=\"TOCVersionTwoOrLater\">Why should "
 "programs say &ldquo;Version 2 of the GPL or any later version&rdquo;?</a>"
@@ -466,7 +485,7 @@
 "программах должно быть сказано 
&ldquo;версия&nbsp;2 GPL или любая более "
 "поздняя версия&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FontException\" id=\"TOCFontException\">How does the GPL apply to "
 "fonts?</a>"
@@ -474,7 +493,7 @@
 "<a href=\"#FontException\" id=\"TOCFontException\">Применима ли 
GPL к "
 "шрифтам?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WMS\" id=\"TOCWMS\">What license should I use for website "
 "maintenance system templates?</a>"
@@ -482,7 +501,7 @@
 "<a href=\"#WMS\" id=\"TOCWMS\">Какую лицензию мне 
использовать для шаблонов "
 "системы поддержки сайта?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Can I release a program "
 "under the GPL which I developed using nonfree tools?</a>"
@@ -490,11 +509,7 @@
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Могу я 
выпустить программу, "
 "которую я разработал с помощью 
несвободных средств, под GPL?</a>"
 
-#. type: Content of: <h4>
-msgid "Distribution of programs released under the GPL"
-msgstr "Распространение программ, выпущенных 
под GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Can I release a "
 "modified version of a GPL-covered program in binary form only?</a>"
@@ -502,7 +517,7 @@
 "<a href=\"#ModifiedJustBinary\" id=\"TOCModifiedJustBinary\">Могу я "
 "выпустить измененную версию программы 
под GPL только в двоичном виде?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnchangedJustBinary\" id=\"TOCUnchangedJustBinary\">I downloaded "
 "just the binary from the net.  If I distribute copies, do I have to get the "
@@ -512,7 +527,7 @@
 "сети только двоичный файл. Если я 
распространяю копии, должен ли я получить "
 "исходный текст и распространять его 
тоже?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeWithSourceOnInternet\" id="
 "\"TOCDistributeWithSourceOnInternet\">I want to distribute binaries via "
@@ -524,7 +539,7 @@
 "на физическом носителе без сопровождающих
 исходных текстов. Могу я "
 "поставлять исходный текст по FTP вместо 
заказа по почте?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#RedistributedBinariesGetSource\" id="
 "\"TOCRedistributedBinariesGetSource\">My friend got a GPL-covered binary "
@@ -536,7 +551,7 @@
 "GPL с предложением поставки исходного 
текста и сделал для меня копию. Могу я "
 "воспользоваться предложением, чтобы 
получить исходный текст?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SourceAndBinaryOnDifferentSites\" id="
 "\"TOCSourceAndBinaryOnDifferentSites\">Can I put the binaries on my Internet "
@@ -547,7 +562,7 @@
 "своем сервере в Интернете, а исходные 
тексты&nbsp;&mdash; на другом сайте?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeExtendedBinary\" id=\"TOCDistributeExtendedBinary\">I "
 "want to distribute an extended version of a GPL-covered program in binary "
@@ -557,7 +572,7 @@
 "хочу распространять расширенную версию 
программы под GPL в двоичной форме.  "
 "Достаточно ли распространять исходный 
текст исходной версии?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributingSourceIsInconvenient\" id="
 "\"TOCDistributingSourceIsInconvenient\">I want to distribute binaries, but "
@@ -570,7 +585,7 @@
 "достаточно, если я с двоичными файлами 
буду передавать пользователям точные "
 "описания отличий от &ldquo;стандартной&rdquo; 
версии?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#AnonFTPAndSendSources\" id=\"TOCAnonFTPAndSendSources\">I want to "
 "make binaries available for anonymous FTP, but send sources only to people "
@@ -580,7 +595,7 @@
 "предоставлять доступ к двоичным файлам на 
сервере в сети, но высылать "
 "исходные тексты только тем, кто их 
закажет?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HowCanIMakeSureEachDownloadGetsSource\" id="
 "\"TOCHowCanIMakeSureEachDownloadGetsSource\">How can I make sure each user "
@@ -591,7 +606,7 @@
 "каждый пользователь, получающий по сети 
двоичные файлы, получает также "
 "исходный текст?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReleaseNotOriginal\" id=\"TOCReleaseNotOriginal\"> Can I release "
 "a program with a license which says that you can distribute modified "
@@ -603,7 +618,7 @@
 "версии распространять под GPL можно, а саму 
первоначальную версию&nbsp;"
 "&mdash; нельзя?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#UnreleasedMods\" id=\"TOCUnreleasedMods\"> A company is running a "
 "modified version of a GPL'ed program on a web site.  Does the GPL say they "
@@ -613,7 +628,7 @@
 "сайте модифицированную версию программы 
под GPL. Сказано ли в GPL, что они "
 "должны выпустить свои модифицированные 
исходные тексты?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InternalDistribution\" id=\"TOCInternalDistribution\"> Is use "
 "within one organization or company &ldquo;distribution&rdquo;?</a>"
@@ -622,7 +637,7 @@
 "размножение и применение многих копий 
внутри одной организации или "
 "предприятия &ldquo;распространением&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#StolenCopy\" id=\"TOCStolenCopy\"> If someone steals a CD "
 "containing a version of a GPL-covered program, does the GPL give him the "
@@ -632,7 +647,7 @@
 "диск с версией программы под GPL, дает ли GPL 
ему право распространять эту "
 "версию дальше?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease\" id=\"TOCTradeSecretRelease\"> What if a "
 "company distributes a copy of some other developers' GPL-covered work to me "
@@ -642,7 +657,7 @@
 "предприятие передает мне копию работы 
каких-то других разработчиков, "
 "распространяемой под GPL, как коммерческую 
тайну?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#TradeSecretRelease2\" id=\"TOCTradeSecretRelease2\"> What if a "
 "company distributes a copy of its own GPL-covered work to me as a trade "
@@ -652,7 +667,7 @@
 "предприятие передает копию своей 
собственной работы, распространяемой под "
 "GPL, как коммерческую тайну?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DistributeSubsidiary\" id=\"TOCDistributeSubsidiary\"> Does "
 "moving a copy to a majority-owned, and controlled, subsidiary constitute "
@@ -661,7 +676,7 @@
 "<a href=\"#DistributeSubsidiary\" 
id=\"TOCDistributeSubsidiary\">Является ли "
 "распространением передача копии в 
контролируемое дочернее предприятие?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ClickThrough\" id=\"TOCClickThrough\"> Can software installers "
 "ask people to click to agree to the GPL? If I get some software under the "
@@ -672,7 +687,7 @@
 "какую-то программу по GPL, требуется ли от 
меня соглашаться с чем бы то ни "
 "было?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLCompatInstaller\" id=\"TOCGPLCompatInstaller\">I would like to "
 "bundle GPLed software with some sort of installation software.  Does that "
@@ -682,13 +697,7 @@
 "объединить программу под GPL с некоторого 
рода программой установки. Должна "
 "ли у этой программы установки быть 
лицензия, совместимая с GPL?</a>"
 
-#. type: Content of: <h4>
-msgid "Using programs released under the GPL when writing other programs"
-msgstr ""
-"Использование программ, выпущенных на 
условиях GPL, при написании других "
-"программ"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Can I use "
 "GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
@@ -699,7 +708,7 @@
 "несвободных программ? Можно мне 
пользоваться средствами разработки под GPL, "
 "такими, как GCC, чтобы компилировать их?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLOutput\" id=\"TOCGPLOutput\">Is there some way that I can GPL "
 "the output people get from use of my program? For example, if my program is "
@@ -711,7 +720,7 @@
 "Например, если моя программа применяется 
для разработки аппаратуры, могу я "
 "потребовать, чтобы эти разработки были 
свободны?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">In what cases "
 "is the output of a GPL program covered by the GPL too?</a>"
@@ -719,7 +728,7 @@
 "<a href=\"#WhatCaseIsOutputGPL\" id=\"TOCWhatCaseIsOutputGPL\">В каких "
 "случаях GPL распространяется и на 
результат работы программы под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#PortProgramToGPL\" id=\"TOCPortProgramToGPL\">If I port my "
 "program to GNU/Linux, does that mean I have to release it as Free Software "
@@ -729,7 +738,7 @@
 "свою программу на GNU/Linux, значит ли это, что 
мне необходимо выпустить ее "
 "как свободную программу под GPL или другой 
лицензией свободных программ?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Does the libstdc++ "
 "exception permit dynamic linking?</a>"
@@ -737,11 +746,7 @@
 "<a href=\"#LibGCCException\" id=\"TOCLibGCCException\">Допускает 
ли "
 "исключение libstdc++ динамическое 
связывание?</a>"
 
-#. type: Content of: <h4>
-msgid "Combining work with code released under the GPL"
-msgstr "Комбинирование работы с текстами, 
выпущенными на условиях GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MereAggregation\" id=\"TOCMereAggregation\">What is the "
 "difference between &ldquo;mere aggregation&rdquo; and &ldquo;combining two "
@@ -751,7 +756,7 @@
 "&ldquo;простым размещением на одном 
носителе&rdquo; и &ldquo;комбинированием "
 "двух модулей в одной программе&rdquo;?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Do I have &ldquo;fair "
 "use&rdquo; rights in using the source code of a GPL-covered program?</a>"
@@ -759,7 +764,7 @@
 "<a href=\"#GPLFairUse\" id=\"TOCGPLFairUse\">Есть ли у меня 
право на &ldquo;"
 "добросовестное использование&rdquo; исх
одного текста программы под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Can the US Government release "
 "improvements to a GPL-covered program?</a>"
@@ -767,7 +772,7 @@
 "<a href=\"#GPLUSGovAdd\" id=\"TOCGPLUSGovAdd\">Может ли 
правительство США "
 "выпускать улучшения программы под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfLibraryIsGPL\" id=\"TOCIfLibraryIsGPL\">If a library is "
 "released under the GPL (not the LGPL), does that mean that any program which "
@@ -777,7 +782,7 @@
 "выпускается на условиях GPL (не LGPL), значит 
ли это, что любая программа, "
 "которая ею пользуется, должна выпускаться 
на условиях GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingWithGPL\" id=\"TOCLinkingWithGPL\">You have a GPL'ed "
 "program that I'd like to link with my code to build a proprietary program.  "
@@ -789,7 +794,7 @@
 "получить несвободную программу. Означает 
ли факт компоновки с вашей "
 "программой, что от меня требуется 
выпускать свою программу под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#SwitchToLGPL\" id=\"TOCSwitchToLGPL\">If so, is there any chance "
 "I could get a license of your program under the Lesser GPL?</a>"
@@ -798,7 +803,7 @@
 "меня хоть какая-то надежда на получение от 
вас программы на условиях Меньшей "
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WillYouMakeAnException\" id=\"TOCWillYouMakeAnException\">Using a "
 "certain GNU program under the GPL does not fit our project to make "
@@ -810,7 +815,7 @@
 "проект по созданию несвободных программ. 
Не сделаете ли вы для нас "
 "исключения? Это означало вы большее число 
пользователей этой программы.</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#IfInterpreterIsGPL\" id=\"TOCIfInterpreterIsGPL\">If a "
 "programming language interpreter is released under the GPL, does that mean "
@@ -822,7 +827,7 @@
 "программы для него должны выпускаться на 
условиях совместимых с GPL лицензий?"
 "</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#InterpreterIncompat\" id=\"TOCInterpreterIncompat\">If a "
 "programming language interpreter has a license that is incompatible with the "
@@ -832,7 +837,7 @@
 "интерпретатора языка программирования 
несовместима с GPL, могу ли я "
 "выполнять на нем программы под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLModuleLicense\" id=\"TOCGPLModuleLicense\">If I add a module "
 "to a GPL-covered program, do I have to use the GPL as the license for my "
@@ -842,7 +847,7 @@
 "модуль к программе под GPL, требуется ли от 
меня использование GPL в "
 "качестве лицензии для моего модуля?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
@@ -850,7 +855,7 @@
 "<a href=\"#GPLPlugins\" id=\"TOCGPLPlugins\"> Когда программа 
и ее внешние "
 "модули считаются единой комбинированной 
программой?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLAndPlugins\" id=\"TOCGPLAndPlugins\">If a program released "
 "under the GPL uses plug-ins, what are the requirements for the licenses of a "
@@ -860,7 +865,7 @@
 "выпущенная под GPL, пользуется внешними 
модулями, каковы требования к "
 "лицензиям модуля?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Can I apply the GPL "
 "when writing a plug-in for a nonfree program?</a>"
@@ -868,7 +873,7 @@
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Могу я 
применять GPL, "
 "когда пишу внешний модуль к несвободной 
программе?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Can I release a "
 "nonfree program that's designed to load a GPL-covered plug-in?</a>"
@@ -877,7 +882,7 @@
 "несвободную программу, составленную так, 
чтобы подгружать внешний модуль под "
 "GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLInProprietarySystem\" id=\"TOCGPLInProprietarySystem\">I'd "
 "like to incorporate GPL-covered software in my proprietary system.  Can I do "
@@ -887,7 +892,7 @@
 "хотелось бы включить программу, 
распространяемую по GPL, в свою несвободную "
 "систему. Можно мне это делать?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLWrapper\" id=\"TOCGPLWrapper\">I'd like to incorporate GPL-"
 "covered software in my proprietary system.  Can I do this by putting a "
@@ -901,7 +906,7 @@
 "неограничительной лицензией (как, 
например, лицензия X11) между частью, "
 "распространяемой по GPL, и несвободной 
частью?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\"> Can I write free software "
 "that uses nonfree libraries?</a>"
@@ -909,7 +914,7 @@
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\">Могу ли я 
написать "
 "свободную программу, которая пользуется 
несвободными библиотеками?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLibs\" id=\"TOCGPLIncompatibleLibs\"> What legal "
 "issues come up if I use GPL-incompatible libraries with GPL software?</a>"
@@ -918,7 +923,7 @@
 "юридические проблемы возникают, если я 
применяю несовместимые с GPL "
 "библиотеки с программами под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WindowsRuntimeAndGPL\" id=\"TOCWindowsRuntimeAndGPL\">I'm writing "
 "a Windows application with Microsoft Visual C++ and I will be releasing it "
@@ -931,7 +936,7 @@
 "программы с библиотеками времени 
исполнения Visual C++ (или Visual Basic)?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#MoneyGuzzlerInc\" id=\"TOCMoneyGuzzlerInc\">I'd like to modify "
 "GPL-covered programs and link them with the portability libraries from Money "
@@ -946,7 +951,7 @@
 "версии, пришлось бы получить эти 
библиотеки отдельно. Почему GPL не "
 "допускает этого?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleAlone\" id=\"TOCGPLIncompatibleAlone\">If license "
 "for a module Q has a requirement that's incompatible with the GPL, but the "
@@ -960,7 +965,7 @@
 "включается в более крупную программу, 
делает ли это лицензию несовместимой с "
 "GPL? Могу я комбинировать или связывать М с 
программой под GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#OOPLang\" id=\"TOCOOPLang\"> In an object-oriented language such "
 "as Java, if I use a class that is GPL'ed without modifying, and subclass it, "
@@ -970,7 +975,7 @@
 "языке, как Java, я использую класс под GPL без 
изменений и образую из него "
 "подкласс, каким образом GPL влияет на более 
крупную программу?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#LinkingOverControlledInterface\" id="
 "\"TOCLinkingOverControlledInterface\">How can I allow linking of proprietary "
@@ -981,7 +986,7 @@
 "несвободные модули со своей библиотекой 
под GPL только по определенному "
 "протоколу?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#Consider\" id=\"TOCConsider\">Consider this situation: 1. X "
 "releases V1 of a project under the GPL.  2. Y contributes to the development "
@@ -993,7 +998,7 @@
 "включают изменения и новые тексты 
программ, основанные на V1. 3) X хочет "
 "выпускать V2 под лицензией, отличной от GPL. 
Нужно ли X разрешение Y?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ManyDifferentLicenses\" id=\"TOCManyDifferentLicenses\">I have "
 "written an application that links with many different components, that have "
@@ -1007,11 +1012,7 @@
 "предъявляются к лицензированию моей 
программы. Не были бы вы так любезны "
 "рассказать мне, какими лицензиями я могу 
пользоваться?</a>"
 
-#. type: Content of: <h4>
-msgid "Questions about violations of the GPL"
-msgstr "Вопросы о нарушениях GPL"
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">What should I "
 "do if I discover a possible violation of the GPL?</a>"
@@ -1019,7 +1020,7 @@
 "<a href=\"#ReportingViolation\" id=\"TOCReportingViolation\">Что мне 
следует "
 "делать, если я обнаруживаю возможное 
нарушение GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Who has the power to "
 "enforce the GPL?</a>"
@@ -1027,7 +1028,7 @@
 "<a href=\"#WhoHasThePower\" id=\"TOCWhoHasThePower\">Кто вправе 
требовать "
 "соблюдения GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#HeardOtherLicense\" id=\"TOCHeardOtherLicense\">I heard that "
 "someone got a copy of a GPL'ed program under another license.  Is this "
@@ -1037,7 +1038,7 @@
 "кто-то получил копию программы под GPL по 
другой лицензии. Возможно ли это?</"
 "a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#DeveloperViolate\" id=\"TOCDeveloperViolate\">Is the developer of "
 "a GPL-covered program bound by the GPL? Could the developer's actions ever "
@@ -1047,7 +1048,7 @@
 "разработчик программы под GPL текстом 
лицензии? Могут ли быть действия "
 "разработчика нарушением GPL?</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"#CompanyGPLCostsMoney\" id=\"TOCCompanyGPLCostsMoney\"> I just "
 "found out that a company has a copy of a GPL'ed program, and it costs money "
@@ -5139,14 +5140,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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -5158,9 +5165,16 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2001, 2006, 2007, 2008,-] {+2001-2007, 2009, 2011,+}
+# | 2014, 2015, 2017, [-2018,-] 2019, 202[-0-]{+1+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#| "2020 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2007, 2009, 2011, 2014, 2015, 2017, 2019, 2021 Free "
+"Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2011, 2014, 2015, 2017, 2018, 2019, "
 "2020 Free Software Foundation, Inc."
@@ -5188,13 +5202,12 @@
 msgstr "Обновлено:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, 2020, "
-"2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2011, 2014, 2015, 2017, 2018, 2019, "
-"2020, 2021 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
+#~ "2020, 2021 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2011, 2014, 2015, 2017, 2018, "
+#~ "2019, 2020, 2021 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "Linking ABC statically or dynamically with other modules is making\n"

Index: po/license-compatibility.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.fr.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/license-compatibility.fr.po      29 Dec 2021 15:55:36 -0000      1.17
+++ po/license-compatibility.fr.po      29 Dec 2021 16:01:03 -0000      1.18
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2021-12-29 15:55+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"
@@ -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-12-29 15:55+0000\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
 #. type: Content of: <title>
@@ -24,37 +25,54 @@
 "Compatibilité des licences entre elles et placement sous nouvelle licence - "
 "Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "License Compatibility and Relicensing"
 msgstr ""
 "Compatibilité des licences entre elles et placement sous nouvelle licence"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "par Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | If you want to combine two free programs into one, or merge code from one
+# | into the other, this raises the question of whether their licenses allow
+# | combining them, or prohibit combining them.<a [-href=\"#f1\">(*)</a>-]
+# | {+href=\"#f1\">[1]</a>+}
+#, fuzzy
+#| msgid ""
+#| "If you want to combine two free programs into one, or merge code from one "
+#| "into the other, this raises the question of whether their licenses allow "
+#| "combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
+"combining them, or prohibit combining them.<a href=\"#f1\">[1]</a>"
 msgstr ""
 "Si vous souhaitez combiner deux programmes libres en un seul ou fusionner du "
 "code provenant d'un programme avec le code d'un autre, la question se pose "
 "de savoir si leurs licences permettent cette combinaison, ou bien "
 "l'interdisent (<a href=\"#f1\">1</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | There is no problem merging programs that have the same license, if it is
+# | a reasonably behaved license, as nearly all free licenses are.<a
+# | [-href=\"#f2\">(**)</a>-] {+href=\"#f2\">[2]</a>+}
+#, fuzzy
+#| msgid ""
+#| "There is no problem merging programs that have the same license, if it is "
+#| "a reasonably behaved license, as nearly all free licenses are.<a href="
+#| "\"#f2\">(**)</a>"
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
-"(**)</a>"
+"[2]</a>"
 msgstr ""
 "Fusionner des programmes qui ont la même licence ne pose aucun problème si "
 "cette licence a des clauses raisonnables, comme c'est le cas de presque "
 "toutes les licences de logiciel libre (<a href=\"#f2\">2</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What then when the licenses are different? In general we say that several "
 "licenses are <em>compatible</em> if there is a way to merge code under those "
@@ -76,7 +94,7 @@
 "détermine également quelle licence doit être utilisée pour le programme "
 "combiné."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We divide licenses into three classes: lax (also &ldquo;permissive&rdquo; or "
 "&ldquo;pushover&rdquo;), intermediate, and copyleft.  A lax license does "
@@ -93,7 +111,7 @@
 "licence. Une licence intermédiaire pose certaines conditions à l'ajout de "
 "code privateur mais n'essaie pas de l'interdire."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, lax permissive licenses (modified BSD, X11, Expat, Apache, "
 "Python, etc.) are compatible with each other.  That's because they have no "
@@ -111,14 +129,28 @@
 "les appelons « licences bonnes poires » : elles ne savent pas dire non 
quand "
 "un utilisateur essaie de priver les autres de leurs libertés."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | In a combination of programs under lax licenses, each part carries the
+# | license it came with.  When the code is merged to the point that the parts
+# | can't be distinguished any more, that merged code should carry all the
+# | licenses of the merged parts.  Since all the licenses are lax anyway, this
+# | causes no practical problem except that the list of licenses gets long.<a
+# | [-href=\"#f3\">(***)</a>-] {+href=\"#f3\">[3]</a>+}
+#, fuzzy
+#| msgid ""
+#| "In a combination of programs under lax licenses, each part carries the "
+#| "license it came with.  When the code is merged to the point that the "
+#| "parts can't be distinguished any more, that merged code should carry all "
+#| "the licenses of the merged parts.  Since all the licenses are lax anyway, "
+#| "this causes no practical problem except that the list of licenses gets "
+#| "long.<a href=\"#f3\">(***)</a>"
 msgid ""
 "In a combination of programs under lax licenses, each part carries the "
 "license it came with.  When the code is merged to the point that the parts "
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f3\">(***)</a>"
+"href=\"#f3\">[3]</a>"
 msgstr ""
 "Dans une combinaison de programmes sous licences laxistes, chaque partie "
 "conserve sa licence d'origine. Lorsque le code est fusionné à un point tel "
@@ -127,7 +159,7 @@
 "licences sont laxistes, cela ne crée aucun problème pratique, à part la "
 "longueur de la liste de licences (<a href=\"#f3\">3</a>)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the same token, lax licenses are usually compatible with any copyleft "
 "license.  In the combined program, the parts that came in under lax licenses "
@@ -144,7 +176,7 @@
 "sont incompatibles avec la version 2 de la GPL ; comme je pense que ces "
 "clauses sont bonnes, j'ai rendu la GPL version 3 compatible avec elles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one important exception is the original BSD license, because of the "
 "&ldquo;obnoxious advertising clause.&rdquo; This condition required a "
@@ -165,7 +197,7 @@
 "C'en est arrivé au point où une distribution BSD nécessitait 70 avis "
 "différents."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I mostly eliminated this problem by convincing a dean, Hal Varian, to "
 "arrange for UC Berkeley to publish the &ldquo;modified BSD license&rdquo; "
@@ -182,7 +214,7 @@
 "nous devons toujours veiller à <a href=\"/licenses/bsd.html\">ne pas parler "
 "de la « licence BSD »</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, two different copyleft licenses are unavoidably incompatible "
 "unless they have explicit compatibility provisions.  This is not due to a "
@@ -205,7 +237,7 @@
 "programme combiné (qui comprend le code de P et le code de Q) doit être A, "
 "<em>et</em> elle doit être B."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is why GPL version 2 is incompatible with GPL version 3; it could not "
 "be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
@@ -217,7 +249,7 @@
 "seraient intrinsèquement incompatibles avec celles de la CC BY-SA 3.0 et 
les "
 "auteurs n'y pourraient rien."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are two approaches for avoiding the incompatibility problem caused by "
 "different versions of copyleft licenses."
@@ -225,14 +257,30 @@
 "Il y a deux méthodes pour éviter le problème d'incompatibilité causé par 
les "
 "versions différentes de licences à copyleft."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The FSF uses the approach of asking people to release programs under
+# | &ldquo;GNU GPL version N or any later version.&rdquo; This licensing is
+# | compatible with version N, and also with N+1 (because it offers version
+# | N+1 as an option).  When you combine code under &ldquo;GPL 3 or
+# | later&rdquo; with code under &ldquo;GPL 2 or [-later&rdquo;,-]
+# | {+later,&rdquo;+} the license of the combination is their intersection,
+# | which is &ldquo;GPL 3 or [-later&rdquo;.-] {+later.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The FSF uses the approach of asking people to release programs under "
+#| "&ldquo;GNU GPL version N or any later version.&rdquo; This licensing is "
+#| "compatible with version N, and also with N+1 (because it offers version N"
+#| "+1 as an option).  When you combine code under &ldquo;GPL 3 or "
+#| "later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license of "
+#| "the combination is their intersection, which is &ldquo;GPL 3 or "
+#| "later&rdquo;."
 msgid ""
 "The FSF uses the approach of asking people to release programs under &ldquo;"
 "GNU GPL version N or any later version.&rdquo; This licensing is compatible "
 "with version N, and also with N+1 (because it offers version N+1 as an "
 "option).  When you combine code under &ldquo;GPL 3 or later&rdquo; with code "
-"under &ldquo;GPL 2 or later&rdquo;, the license of the combination is their "
-"intersection, which is &ldquo;GPL 3 or later&rdquo;."
+"under &ldquo;GPL 2 or later,&rdquo; the license of the combination is their "
+"intersection, which is &ldquo;GPL 3 or later.&rdquo;"
 msgstr ""
 "La méthode de la FSF consiste à demander aux gens de publier sous la « 
GNU "
 "GPL version N ou toute version ultérieure ». Ce choix de licences est "
@@ -241,7 +289,7 @@
 "ultérieure » avec du code sous «  GPL 2 ou ultérieure », la licence 
de la "
 "combinaison est leur intersection, c'est-à-dire « GPL 3 ou ultérieure 
»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We hope we will never need to make a GNU GPL version 4, but nothing is "
 "perfect and we can't assume we have anticipated all the issues.  By "
@@ -254,7 +302,7 @@
 "ultérieure, vous lui permettez de passer à la GPL version 4, si jamais 
nous "
 "avons besoin de cette version."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The other approach is to make each version of the license explicitly allow "
 "upgrading to later versions.  The Mozilla Foundation uses this approach, as "
@@ -269,7 +317,7 @@
 "permet explicitement à tout utilisateur de passer aux versions ultérieures "
 "de la CC BY-SA pour les œuvres modifiées."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Only the GNU licenses give authors a choice about whether to permit upgrades "
 "to future license versions.  When I wrote the first version of the GNU GPL, "
@@ -286,12 +334,26 @@
 "laisser le choix aux auteurs. L'auteur pourrait ainsi publier un programme "
 "sous « GPL 1 seule » ou « GPL 1 ou ultérieure »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Since then, I have come to question the wisdom of that decision.  Programs
+# | such as Linux, which allow only one GNU GPL version and reject license
+# | upgrades, cause practical incompatibility.<a [-href=\"#f4\">(****)</a>-]
+# | {+href=\"#f4\">[4]</a>+} If we ever make a GPL version 4, perhaps we
+# | should include an upgrade clause that automatically permits relicensing to
+# | higher-numbered versions, 5 and up.
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision.  "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> If we ever make a GPL version 4, perhaps we should include an upgrade "
+#| "clause that automatically permits relicensing to higher-numbered "
+#| "versions, 5 and up."
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
-"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">[4]</a> If we ever "
+"make a GPL version 4, perhaps we should include an upgrade clause that "
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 "Depuis, j'en suis venu à me demander si cette décision était judicieuse. 
Des "
@@ -302,7 +364,7 @@
 "à niveau qui permette automatiquement d'utiliser le programme sous les "
 "versions ultérieures, 5 et suivantes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses allow cross-copyleft combinations with an explicit "
 "relicensing clause giving permission to put the code under a different "
@@ -321,7 +383,7 @@
 "ultérieure, la CeCILL dit que vous pouvez le faire, et ensuite placer la "
 "combinaison ou le code fusionné sous GPL version 3 ou ultérieure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Explicit relicensing permission is not the same thing as compatibility "
 "(though relicensing code can make it compatible with other code) and it is "
@@ -342,16 +404,35 @@
 "programme Q. Le seul moyen licite de publier ce programme combiné est de le 
"
 "placer sous la, ou les version(s) appropriée(s) de la GPL."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Likewise, CC[---]{+ +}BY-SA 4.0 explicitly permits relicensing modified
+# | versions to GNU GPL version 3, but GPL version 3 does not permit
+# | relicensing to CC[---]{+ +}BY-SA.  This issue should never arise for
+# | software code; Creative Commons says its licenses are not meant for code,
+# | and says that the license to use for code is the GNU GPL.  But there are
+# | other kinds of works, such as hardware designs or game art, where you
+# | might have occasion to merge material released under CC-BY-SA with
+# | material released under the GNU GPL.  This can be done through CC[---]{+
+# | +}BY-SA's explicit relicensing permission.
+#, fuzzy
+#| msgid ""
+#| "Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions "
+#| "to GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-"
+#| "BY-SA.  This issue should never arise for software code; Creative Commons "
+#| "says its licenses are not meant for code, and says that the license to "
+#| "use for code is the GNU GPL.  But there are other kinds of works, such as "
+#| "hardware designs or game art, where you might have occasion to merge "
+#| "material released under CC-BY-SA with material released under the GNU "
+#| "GPL.  This can be done through CC-BY-SA's explicit relicensing permission."
 msgid ""
-"Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions to "
-"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-BY-"
+"Likewise, CC BY-SA 4.0 explicitly permits relicensing modified versions to "
+"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC BY-"
 "SA.  This issue should never arise for software code; Creative Commons says "
 "its licenses are not meant for code, and says that the license to use for "
 "code is the GNU GPL.  But there are other kinds of works, such as hardware "
 "designs or game art, where you might have occasion to merge material "
 "released under CC-BY-SA with material released under the GNU GPL.  This can "
-"be done through CC-BY-SA's explicit relicensing permission."
+"be done through CC BY-SA's explicit relicensing permission."
 msgstr ""
 "De même, la CC BY-SA 4.0 permet explicitement de relicencier les versions "
 "modifiées en GNU GPL version 3, mais la GNU GPL version 3 ne permet pas de 
"
@@ -364,15 +445,37 @@
 "peut le faire en utilisant la permission de relicencier que donne "
 "explicitement la CC BY-SA."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Unfortunately, CC[---]{+ +}BY-SA 4.0 does not permit relicensing to future
+# | GPL versions.  What you should do, when you relicense material under
+# | CC[---]{+ +}BY-SA 4.0 to the GPL, is <a
+# | href=\"/licenses/rms-why-gplv3.html#future-proofing\">specify yourself as
+# | a license version proxy</a> to indicate whether future GPL versions have
+# | been authorized for that material.  If someday there is a GPL version 4
+# | and Creative Commons decides to allow relicensing from CC[---]{+ +}BY-SA
+# | to GPL version 4, you as proxy will be able to retroactively authorize use
+# | of that relicensed material under GPL version 4.  (Alternatively, you can
+# | ask the authors of that material to give permission right away.)
+#, fuzzy
+#| msgid ""
+#| "Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
+#| "versions.  What you should do, when you relicense material under CC-BY-SA "
+#| "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
+#| "\">specify yourself as a license version proxy</a> to indicate whether "
+#| "future GPL versions have been authorized for that material.  If someday "
+#| "there is a GPL version 4 and Creative Commons decides to allow "
+#| "relicensing from CC-BY-SA to GPL version 4, you as proxy will be able to "
+#| "retroactively authorize use of that relicensed material under GPL version "
+#| "4.  (Alternatively, you can ask the authors of that material to give "
+#| "permission right away.)"
 msgid ""
-"Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
-"versions.  What you should do, when you relicense material under CC-BY-SA "
+"Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL "
+"versions.  What you should do, when you relicense material under CC BY-SA "
 "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
 "\">specify yourself as a license version proxy</a> to indicate whether "
 "future GPL versions have been authorized for that material.  If someday "
 "there is a GPL version 4 and Creative Commons decides to allow relicensing "
-"from CC-BY-SA to GPL version 4, you as proxy will be able to retroactively "
+"from CC BY-SA to GPL version 4, you as proxy will be able to retroactively "
 "authorize use of that relicensed material under GPL version 4.  "
 "(Alternatively, you can ask the authors of that material to give permission "
 "right away.)"
@@ -389,7 +492,7 @@
 "version 4 (alternativement, vous pouvez demander aux auteurs de ce document "
 "de donner dès maintenant leur permission)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The ordinary GNU General Public License and the GNU Affero General Public "
 "License are two different copyleft licenses, so they are naturally "
@@ -420,7 +523,7 @@
 "ordinaire version 2, parce que la GNU GPL Affero et la GNU GPL sont deux "
 "séries de licences différentes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Lesser General Public License, version 3, is really the GNU General "
 "Public License version 3 plus some added extra permissions.  GPL version 3 "
@@ -440,7 +543,7 @@
 "nous ferons une LGPL version N qui sera constituée de la GPL version N et 
de "
 "permissions supplémentaires."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As for GNU Lesser GPL version 2.1, that explicitly permits relicensing to "
 "GNU GPL version 2 or later."
@@ -448,7 +551,7 @@
 "La licence publique générale GNU amoindrie version 2.1, quant à elle, 
permet "
 "explicitement de relicencier en GNU GPL, version 2 ou ultérieure."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Intermediate licenses are those which have substantive requirements on "
 "redistribution but are not copyleft licenses.  Examples include the Eclipse "
@@ -467,13 +570,33 @@
 "Public License</i> permet de relicencier en GNU GPL sauf quand le code "
 "refuse explicitement cette permission."
 
-#. type: Content of: <p>
-msgid ""
-"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
-"license is a disjunction: it means that the same program carries a choice of "
-"two or more different licenses.  For instance, older versions of Perl "
-"carried a dual license: the disjunction of the Artistic License and the GNU "
-"General Public License.  This meant that each user could choose to use and "
+#. type: Content of: <div><p>
+# | Finally, what about dual licensing?<a [-href=\"#f5\">(*****)</a>-]
+# | {+href=\"#f5\">[5]</a>+} A dual license is a disjunction: it means that
+# | the same program carries a choice of two or more different licenses.  For
+# | instance, older versions of Perl carried a dual license: the disjunction
+# | of the Artistic License and the GNU General Public License.  This meant
+# | that each user could choose to use and redistribute Perl under one license
+# | or the other, or under both in disjunction like the Perl release itself. 
+# | A disjunction is compatible with a set of other licenses if any one of the
+# | license choices in the disjunction is compatible with that set.
+#, fuzzy
+#| msgid ""
+#| "Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
+#| "license is a disjunction: it means that the same program carries a choice "
+#| "of two or more different licenses.  For instance, older versions of Perl "
+#| "carried a dual license: the disjunction of the Artistic License and the "
+#| "GNU General Public License.  This meant that each user could choose to "
+#| "use and redistribute Perl under one license or the other, or under both "
+#| "in disjunction like the Perl release itself.  A disjunction is compatible "
+#| "with a set of other licenses if any one of the license choices in the "
+#| "disjunction is compatible with that set."
+msgid ""
+"Finally, what about dual licensing?<a href=\"#f5\">[5]</a> A dual license is "
+"a disjunction: it means that the same program carries a choice of two or "
+"more different licenses.  For instance, older versions of Perl carried a "
+"dual license: the disjunction of the Artistic License and the GNU General "
+"Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
@@ -491,7 +614,7 @@
 "quelconque des licences proposées en choix dans la disjonction est "
 "compatible avec cet ensemble."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When you choose a license for your code, please choose GNU GPL version 3 or "
 "later, or some license compatible with that.  This is the way to make your "
@@ -506,11 +629,11 @@
 "version 3 ou ultérieure, fera le maximum pour défendre les libertés de 
tous "
 "les utilisateurs de toutes les versions de votre code."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Combining code"
 msgstr "Comment combiner du code"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When a set of licenses are compatible, that means you can legally combine or "
 "merge a number of programs each licensed under one of those licenses.  How, "
@@ -520,7 +643,7 @@
 "combiner ou fusionner plusieurs programmes qui sont régis par l'une de ces "
 "licences. Quelle licence choisir dans ce cas pour le programme combiné ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each free software license says you must keep the license with the code that "
 "is covered by it.  So in a strict sense, the licensing of the combined "
@@ -537,7 +660,7 @@
 "programme. Quelles sont les licences auxquelles une personne utilisant le "
 "programme combiné <em>doit faire attention</em> ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To compute that, you start with a list of all the pertinent licenses.  Then "
 "you can delete from the list any license which is subsumed by another in the "
@@ -547,7 +670,7 @@
 "Ensuite, on peut supprimer toute licence qui est englobée par une autre "
 "licence de la liste."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We say that a license A <em>subsumes</em> license B when compliance with "
 "license A implies compliance with license B."
@@ -555,7 +678,7 @@
 "Nous disons qu'une licence A <em>englobe</em> une licence B lorsqu'on "
 "respecte implicitement B lorsqu'on respecte A."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For instance, the GNU GPL version N and the GNU Affero GPL version N both "
 "subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
@@ -565,7 +688,7 @@
 "toutes deux la GNU GPL amoindrie version N, et toutes trois englobent la GNU 
"
 "GPL amoindrie version 2.1."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
 "least 3."
@@ -573,7 +696,7 @@
 "Toute version N d'une licence GNU englobe la licence Apache 2.O pourvu que 
N "
 "soit au moins égal à 3."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
 "that are compatible with it."
@@ -581,17 +704,25 @@
 "La GNU GPL, version N, englobe toutes les versions de la <i>Mozilla Public "
 "License</i> et est compatible avec elle."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0
+# | licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume
+# | the Expat, X11 and ISC licenses and CC[---]0.
+#, fuzzy
+#| msgid ""
+#| "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 "
+#| "licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume "
+#| "the Expat, X11 and ISC licenses and CC-0."
 msgid ""
 "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
 "BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
-"and ISC licenses and CC-0."
+"and ISC licenses and CC0."
 msgstr ""
 "La licence Apache 2.0 englobe les licences BSD, Expat, X11, ISC et CC-0. La "
 "BSD à 3 clauses englobe la BSD à 2 clauses? Les licences BSD englobent 
les "
 "licences Expat, X11 et ISC, ainsi que la CC-0."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not meant to be a complete list, but if we are informed of other "
 "cases worth mentioning, we will add them."
@@ -599,7 +730,7 @@
 "Cette liste n'a aucune prétention à l'exhaustivité, mais si on nous 
informe "
 "d'autres cas qui n'y figurent pas, nous les ajouterons."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When some license is subsumed, you still need to include a copy of it with "
 "all distribution of the combined program."
@@ -607,16 +738,26 @@
 "Qu'une une licence soit englobée par une autre ne dispense pas d'inclure une 
"
 "copie de son texte dans toute distribution du programme combiné. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notes"
 
-#. type: Content of: <p>
-msgid ""
-"<b>*</b> It is not inconceivable that other legal issues might arise about a "
-"specific combination of programs, issues not related to the copyright "
-"licenses of the programs to be combined.  We discuss only the implications "
-"of the licenses themselves."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>*</b>-]It is not inconceivable that other legal issues might arise
+# | about a specific combination of programs, issues not related to the
+# | copyright licenses of the programs to be combined.  We discuss only the
+# | implications of the licenses themselves.
+#, fuzzy
+#| msgid ""
+#| "<b>*</b> It is not inconceivable that other legal issues might arise "
+#| "about a specific combination of programs, issues not related to the "
+#| "copyright licenses of the programs to be combined.  We discuss only the "
+#| "implications of the licenses themselves."
+msgid ""
+"It is not inconceivable that other legal issues might arise about a specific "
+"combination of programs, issues not related to the copyright licenses of the "
+"programs to be combined.  We discuss only the implications of the licenses "
+"themselves."
 msgstr ""
 "<b>1.</b> Il n'est pas exclu que d'autres problèmes juridiques se fassent "
 "jour à propos d'une combinaison donnée de programmes, problèmes qui ne "
@@ -624,18 +765,26 @@
 "l'on veut combiner. Nous ne traitons ici que des implications des licences "
 "elles-mêmes."
 
-#. type: Content of: <p>
-msgid ""
-"<b>**</b> The main license in actual use that isn't reasonably behaved is "
-"the license of TeX: if two programs are licensed just the way TeX is, there "
-"is no authorized way to distribute a merged version of them."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>**</b>-]The main license in actual use that isn't reasonably behaved
+# | is the license of TeX: if two programs are licensed just the way TeX is,
+# | there is no authorized way to distribute a merged version of them.
+#, fuzzy
+#| msgid ""
+#| "<b>**</b> The main license in actual use that isn't reasonably behaved is "
+#| "the license of TeX: if two programs are licensed just the way TeX is, "
+#| "there is no authorized way to distribute a merged version of them."
+msgid ""
+"The main license in actual use that isn't reasonably behaved is the license "
+"of TeX: if two programs are licensed just the way TeX is, there is no "
+"authorized way to distribute a merged version of them."
 msgstr ""
 "<b>2.</b> La principale licence effectivement utilisée qui ne soit pas "
 "raisonnable est la licence de TeX : si deux programmes ont des licences "
 "exactement équivalentes à celle de TeX, il n'y a aucun moyen licite d'en "
 "distribuer une version fusionnée."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "The TeX license permits distribution of a modified version only in the form "
 "of the original version plus a differences file.  If A and B are separately "
@@ -652,7 +801,7 @@
 "distribuer en tant que « B accompagné d'un fichier de différences » 
viole la "
 "licence de A. Le distribuer sous toute autre forme viole les deux licences."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "It is no coincidence that TeX was released in 1982: our community has "
 "learned, since then, to write reasonably behaved licenses."
@@ -660,12 +809,22 @@
 "Ce n'est pas une coïncidence si TeX a été publié en 1982. Notre 
communauté a "
 "depuis lors appris à rédiger des licences raisonnables."
 
-#. type: Content of: <p>
-msgid ""
-"<b>***</b> When distributing in source code form, it is usually sufficient "
-"to leave the license notices in the source code as they stand; extra license "
-"notice requirements typically only come up for lax licenses when "
-"distributing binaries without the source code."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>***</b>-]When distributing in source code form, it is usually
+# | sufficient to leave the license notices in the source code as they stand;
+# | extra license notice requirements typically only come up for lax licenses
+# | when distributing binaries without the source code.
+#, fuzzy
+#| msgid ""
+#| "<b>***</b> When distributing in source code form, it is usually "
+#| "sufficient to leave the license notices in the source code as they stand; "
+#| "extra license notice requirements typically only come up for lax licenses "
+#| "when distributing binaries without the source code."
+msgid ""
+"When distributing in source code form, it is usually sufficient to leave the "
+"license notices in the source code as they stand; extra license notice "
+"requirements typically only come up for lax licenses when distributing "
+"binaries without the source code."
 msgstr ""
 "<b>3.</b> Lorsqu'on distribue un programme sous forme de code source, il est "
 "d'habitude suffisant de laisser les avis de licence du code source tels "
@@ -673,13 +832,25 @@
 "concernant les avis de licence n'apparaissent généralement que lorsqu'on "
 "distribue des binaires sans le code source."
 
-#. type: Content of: <p>
-msgid ""
-"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
-"nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent.  <a href=\"/licenses/rms-"
-"why-gplv3.html\">We fixed those problems, and others, in version 3</a>, but "
-"we can't change version 2."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>****</b>-]In addition, GPL version 2 still allows binaries to be made
+# | nonfree by hardware that rejects all but special signed binaries, and
+# | still does not allow distribution of binaries by torrent.  <a
+# | href=\"/licenses/rms-why-gplv3.html\">We fixed those problems, and others,
+# | in version 3</a>, but we can't change version 2.
+#, fuzzy
+#| msgid ""
+#| "<b>****</b> In addition, GPL version 2 still allows binaries to be made "
+#| "nonfree by hardware that rejects all but special signed binaries, and "
+#| "still does not allow distribution of binaries by torrent.  <a href=\"/"
+#| "licenses/rms-why-gplv3.html\">We fixed those problems, and others, in "
+#| "version 3</a>, but we can't change version 2."
+msgid ""
+"In addition, GPL version 2 still allows binaries to be made nonfree by "
+"hardware that rejects all but special signed binaries, and still does not "
+"allow distribution of binaries by torrent.  <a href=\"/licenses/rms-why-"
+"gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
+"can't change version 2."
 msgstr ""
 "<b>4.</b> En outre, la version 2 de la GPL permet toujours à du matériel de 
"
 "rendre des binaires non libres en les refusant tous à l'exception de "
@@ -688,13 +859,27 @@
 "rms-why-gplv3.html\">Nous avons remédié à ces défauts et à d'autres dans 
la "
 "version 3</a>, mais nous ne pouvons changer la version 2."
 
-#. type: Content of: <p>
-msgid ""
-"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
-"selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
-"selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the program "
-"on which the license is sold includes any code that is not in the free "
-"(libre) release, that's not selling exceptions, that's nonfree software."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>*****</b>-]Some use the term &ldquo;dual licensing&rdquo; to refer to
+# | selling exceptions, but that is a misnomer.  See <a
+# | href=\"/philosophy/selling-exceptions.html\"> Selling Exceptions</a>. 
+# | Note that if the program on which the license is sold includes any code
+# | that is not in the free (libre) release, that's not selling exceptions,
+# | that's nonfree software.
+#, fuzzy
+#| msgid ""
+#| "<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
+#| "selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
+#| "selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the "
+#| "program on which the license is sold includes any code that is not in the "
+#| "free (libre) release, that's not selling exceptions, that's nonfree "
+#| "software."
+msgid ""
+"Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
+"exceptions, but that is a misnomer.  See <a href=\"/philosophy/selling-"
+"exceptions.html\"> Selling Exceptions</a>.  Note that if the program on "
+"which the license is sold includes any code that is not in the free (libre) "
+"release, that's not selling exceptions, that's nonfree software."
 msgstr ""
 "<b>5.</b> Certains, de manière inexplicable, utilisent le terme « double "
 "licence » pour désigner la vente d'exceptions, mais c'est un abus de "
@@ -729,14 +914,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="
@@ -747,8 +932,8 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -773,6 +958,5 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."

Index: po/license-compatibility.it-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.it-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/license-compatibility.it-diff.html       30 Apr 2021 06:36:15 -0000      
1.5
+++ po/license-compatibility.it-diff.html       29 Dec 2021 16:01:03 -0000      
1.6
@@ -11,22 +11,26 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;License Compatibility and Relicensing
 - GNU Project - Free Software Foundation&lt;/title&gt;
  &lt;!--#include virtual="/licenses/po/license-compatibility.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;License Compatibility and Relicensing&lt;/h2&gt;
 
-&lt;p&gt;by Richard Stallman&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;by</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
 &lt;p&gt;If you want to combine two free programs into one, or merge code from
 one into the other, this raises the question of whether their licenses
-allow combining <span 
class="removed"><del><strong>them.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>them, or prohibit combining them.&lt;a 
href="#f1"&gt;(*)&lt;/a&gt;&lt;/p&gt;</em></ins></span>
+allow combining <span 
class="removed"><del><strong>them.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>them, or prohibit combining them.&lt;a 
href="#f1"&gt;[1]&lt;/a&gt;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;There is no problem merging programs that have the same license, if it
 is a reasonably behaved license, as nearly all free licenses
-are.&lt;a <span 
class="removed"><del><strong>href="#f1"&gt;(*)&lt;/a&gt;&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="#f2"&gt;(**)&lt;/a&gt;&lt;/p&gt;</em></ins></span>
+are.&lt;a <span 
class="removed"><del><strong>href="#f1"&gt;(*)&lt;/a&gt;&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="#f2"&gt;[2]&lt;/a&gt;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;What then when the licenses are different?  In general we say that
 several licenses are &lt;em&gt;compatible&lt;/em&gt; if there is a way to merge
@@ -58,7 +62,7 @@
 parts can't be distinguished any more, that merged code should carry
 all the licenses of the merged parts.  Since all the licenses are lax
 anyway, this causes no practical problem except that the list of
-licenses gets long.&lt;a <span 
class="removed"><del><strong>href="#f2"&gt;(**)&lt;/a&gt;&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="#f3"&gt;(***)&lt;/a&gt;&lt;/p&gt;</em></ins></span>
+licenses gets long.&lt;a <span 
class="removed"><del><strong>href="#f2"&gt;(**)&lt;/a&gt;&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="#f3"&gt;[3]&lt;/a&gt;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;By the same token, lax licenses are usually compatible with any
 copyleft license.  In the combined program, the parts that came in
@@ -110,9 +114,10 @@
 &ldquo;GNU GPL version N or any later version.&rdquo;  This licensing is
 compatible with version N, and also with N+1 (because it offers
 version N+1 as an option).  When you combine code under &ldquo;GPL 3 or
-later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license
+later&rdquo; with code under &ldquo;GPL 2 or <span 
class="removed"><del><strong>later&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>later,&rdquo;</em></ins></span> the license
 of the combination is their intersection, which is &ldquo;GPL 3 or
-later&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>later&rdquo;.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>later.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;We hope we will never need to make a GNU GPL version 4, but nothing is
 perfect and we can't assume we have anticipated all the issues.  By
@@ -138,7 +143,7 @@
 &lt;p&gt;Since then, I have come to question the wisdom of that decision.
 Programs such as Linux, which allow only one GNU GPL version and
 reject license upgrades, cause practical
-incompatibility.&lt;a <span 
class="removed"><del><strong>href="#f3"&gt;(***)&lt;/a&gt;  
Perhaps</strong></del></span> <span 
class="inserted"><ins><em>href="#f4"&gt;(****)&lt;/a&gt;  If we ever make a GPL 
version
+incompatibility.&lt;a <span 
class="removed"><del><strong>href="#f3"&gt;(***)&lt;/a&gt;  
Perhaps</strong></del></span> <span 
class="inserted"><ins><em>href="#f4"&gt;[4]&lt;/a&gt;  If we ever make a GPL 
version
 4, perhaps</em></ins></span> we should include an upgrade clause <span 
class="removed"><del><strong>in GPL version 4, if we ever need a version 
4.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>that 
automatically
 permits relicensing to higher-numbered versions, 5 and 
up.&lt;/p&gt;</em></ins></span>
 
@@ -161,24 +166,27 @@
 to release that combined program is under the appropriate GPL
 version(s).&lt;/p&gt;
 
-&lt;p&gt;Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified
+&lt;p&gt;Likewise, <span 
class="removed"><del><strong>CC-BY-SA</strong></del></span> <span 
class="inserted"><ins><em>CC BY-SA</em></ins></span> 4.0 explicitly permits 
relicensing modified
 versions to GNU GPL version 3, but GPL version 3 does not permit
-relicensing to CC-BY-SA.  This issue should never arise for software
+relicensing to <span 
class="removed"><del><strong>CC-BY-SA.</strong></del></span> <span 
class="inserted"><ins><em>CC BY-SA.</em></ins></span>  This issue should never 
arise for software
 code; Creative Commons says its licenses are not meant for code, and
 says that the license to use for code is the GNU GPL.  But there are
 other kinds of works, such as hardware designs or game art, where you
 might have occasion to merge material released under CC-BY-SA with
 material released under the GNU GPL.  This can be done through
-CC-BY-SA's explicit relicensing permission.&lt;/p&gt;
+<span class="removed"><del><strong>CC-BY-SA's</strong></del></span>
+<span class="inserted"><ins><em>CC BY-SA's</em></ins></span> explicit 
relicensing permission.&lt;/p&gt;
 
-&lt;p&gt;Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL
+&lt;p&gt;Unfortunately, <span 
class="removed"><del><strong>CC-BY-SA</strong></del></span> <span 
class="inserted"><ins><em>CC BY-SA</em></ins></span> 4.0 does not permit 
relicensing to future GPL
 versions.  What you should do, when you relicense material under
-CC-BY-SA 4.0 to the GPL, is &lt;a
+<span class="removed"><del><strong>CC-BY-SA</strong></del></span>
+<span class="inserted"><ins><em>CC BY-SA</em></ins></span> 4.0 to the GPL, is 
&lt;a
 href="/licenses/rms-why-gplv3.html#future-proofing"&gt;specify
 yourself as a license version proxy&lt;/a&gt; to indicate whether future GPL
 versions have been authorized for that material.  If someday there is
 a GPL version 4 and Creative Commons decides to allow relicensing from
-CC-BY-SA to GPL version 4, you as proxy will be able to retroactively
+<span class="removed"><del><strong>CC-BY-SA</strong></del></span>
+<span class="inserted"><ins><em>CC BY-SA</em></ins></span> to GPL version 4, 
you as proxy will be able to retroactively
 authorize use of that relicensed material under GPL version 4.
 (Alternatively, you can ask the authors of that material to give
 permission right away.)&lt;/p&gt;
@@ -219,7 +227,7 @@
 the GNU GPL except when the code explicitly denies this
 permission.&lt;/p&gt;
 
-&lt;p&gt;Finally, what about dual licensing?&lt;a <span 
class="removed"><del><strong>href="#f4"&gt;(****)&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="#f5"&gt;(*****)&lt;/a&gt;</em></ins></span> A 
dual
+&lt;p&gt;Finally, what about dual licensing?&lt;a <span 
class="removed"><del><strong>href="#f4"&gt;(****)&lt;/a&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="#f5"&gt;[5]&lt;/a&gt;</em></ins></span> 
A dual
 license is a disjunction: it means that the same program carries a
 choice of two or more different licenses.  For instance, older
 versions of Perl carried a dual license: the disjunction of the
@@ -236,7 +244,9 @@
 Choosing GPL or AGPL, version 3 or later, will also do the utmost to
 defend freedom for all users of all versions of your code.&lt;/p&gt;
 
-&lt;h3 <span class="inserted"><ins><em>id="combining"&gt;Combining 
code&lt;/h3&gt;
+&lt;h3 <span 
class="removed"><del><strong>id="footnotes"&gt;Footnotes&lt;/h3&gt;
+
+&lt;p id="f1"&gt;&lt;b&gt;*&lt;/b&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="combining"&gt;Combining code&lt;/h3&gt;
 
 &lt;p&gt;When a set of licenses are compatible, that means you can legally
 combine or merge a number of programs each licensed under one of those
@@ -267,23 +277,24 @@
 License that are compatible with it.&lt;/p&gt;
 
 &lt;p&gt;The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0
-licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses
-subsume the Expat, X11 and ISC licenses and CC-0.&lt;/p&gt;
+licenses.  BSD 3 clause subsumes BSD 2 clause.</em></ins></span>  The <span 
class="inserted"><ins><em>BSD licenses
+subsume the Expat, X11 and ISC licenses and CC0.&lt;/p&gt;
 
 &lt;p&gt;This is not meant to be a complete list, but if we are informed of
 other cases worth mentioning, we will add them.&lt;/p&gt;
 
 &lt;p&gt;When some license is subsumed, you still need to include a copy
 of it with all distribution of the combined program.&lt;/p&gt;
+&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3</em></ins></span> id="footnotes"&gt;Footnotes&lt;/h3&gt;
-
-&lt;p id="f1"&gt;&lt;b&gt;*&lt;/b&gt; <span class="inserted"><ins><em>It is 
not inconceivable that other legal issues
+&lt;h3 id="footnotes" class="footnote"&gt;Footnotes&lt;/h3&gt;
+&lt;ol&gt;
+&lt;li id="f1"&gt;&lt;p&gt;It is not inconceivable that other legal issues
 might arise about a specific combination of programs, issues not
 related to the copyright licenses of the programs to be combined.  We
-discuss only the implications of the licenses themselves.&lt;/p&gt;
+discuss only the implications of the licenses themselves.&lt;/p&gt;&lt;/li&gt;
 
-&lt;p id="f2"&gt;&lt;b&gt;**&lt;/b&gt;</em></ins></span> The main license in 
actual use that isn't
+&lt;li id="f2"&gt;&lt;p&gt;The</em></ins></span> main license in actual use 
that isn't
 reasonably behaved is the license of TeX: if two programs are licensed
 just the way TeX is, there is no authorized way to distribute a merged
 version of them.&lt;/p&gt;
@@ -298,31 +309,40 @@
 &lt;p&gt;It is no coincidence that TeX was released in 1982: our community has
 learned, since then, to write reasonably behaved licenses.&lt;/p&gt;
 
-&lt;p <span 
class="removed"><del><strong>id="f2"&gt;&lt;b&gt;**&lt;/b&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>id="f3"&gt;&lt;b&gt;***&lt;/b&gt;</em></ins></span> 
When distributing in source code
+<span class="removed"><del><strong>&lt;p id="f2"&gt;&lt;b&gt;**&lt;/b&gt; 
When</strong></del></span>
+<span class="inserted"><ins><em>&lt;/li&gt;
+
+&lt;li id="f3"&gt;&lt;p&gt;When</em></ins></span> distributing in source code
 form, it is usually sufficient to leave the license notices in the
 source code as they stand; extra license notice requirements typically
 only come up for lax licenses when distributing binaries without the
-source code.&lt;/p&gt;
+source <span class="removed"><del><strong>code.&lt;/p&gt;
+
+&lt;p id="f3"&gt;&lt;b&gt;***&lt;/b&gt; In</strong></del></span> <span 
class="inserted"><ins><em>code.&lt;/p&gt;&lt;/li&gt;
 
-&lt;p <span 
class="removed"><del><strong>id="f3"&gt;&lt;b&gt;***&lt;/b&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>id="f4"&gt;&lt;b&gt;****&lt;/b&gt;</em></ins></span> 
In addition, GPL version 2 still allows
+&lt;li id="f4"&gt;&lt;p&gt;In</em></ins></span> addition, GPL version 2 still 
allows
 binaries to be made nonfree by hardware that rejects all but special
 signed binaries, and still does not allow distribution of binaries by
 <span class="removed"><del><strong>torrent, as it did when first published.  
We</strong></del></span>
 <span class="inserted"><ins><em>torrent.  &lt;a 
href="/licenses/rms-why-gplv3.html"&gt;We</em></ins></span> fixed those <span 
class="removed"><del><strong>things</strong></del></span>
 <span class="inserted"><ins><em>problems,</em></ins></span> and
-<span class="removed"><del><strong>others</strong></del></span> <span 
class="inserted"><ins><em>others,</em></ins></span> in version <span 
class="removed"><del><strong>3,</strong></del></span> <span 
class="inserted"><ins><em>3&lt;/a&gt;,</em></ins></span> but we can't change 
version 2.&lt;/p&gt;
+<span class="removed"><del><strong>others</strong></del></span> <span 
class="inserted"><ins><em>others,</em></ins></span> in version <span 
class="removed"><del><strong>3,</strong></del></span> <span 
class="inserted"><ins><em>3&lt;/a&gt;,</em></ins></span> but we can't change 
version <span class="removed"><del><strong>2.&lt;/p&gt;
+
+&lt;p id="f4"&gt;&lt;b&gt;****&lt;/b&gt; Some 
inexplicably</strong></del></span> <span 
class="inserted"><ins><em>2.&lt;/p&gt;&lt;/li&gt;
 
-&lt;p <span 
class="removed"><del><strong>id="f4"&gt;&lt;b&gt;****&lt;/b&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>id="f5"&gt;&lt;b&gt;*****&lt;/b&gt;</em></ins></span> 
Some <span class="removed"><del><strong>inexplicably</strong></del></span> use 
the term &ldquo;dual licensing&rdquo;
+&lt;li id="f5"&gt;&lt;p&gt;Some</em></ins></span> use the term &ldquo;dual 
licensing&rdquo;
 to refer to selling exceptions, but that is <span 
class="removed"><del><strong>an abuse
 of language.</strong></del></span> <span class="inserted"><ins><em>a 
misnomer.</em></ins></span>
 See &lt;a href="/philosophy/selling-exceptions.html"&gt; Selling
 Exceptions&lt;/a&gt;.  Note that if the <span 
class="inserted"><ins><em>program on which the</em></ins></span> license <span 
class="inserted"><ins><em>is</em></ins></span> sold <span 
class="removed"><del><strong>as an exception</strong></del></span>
 includes any code that is not in the <span 
class="removed"><del><strong>ordinary</strong></del></span> free <span 
class="inserted"><ins><em>(libre)</em></ins></span> release, that's not
-selling exceptions, that's nonfree software.&lt;/p&gt;
+selling exceptions, that's nonfree <span 
class="removed"><del><strong>software.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>software.&lt;/p&gt;&lt;/li&gt;
+&lt;/ol&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -340,13 +360,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -367,7 +387,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2018, 2020</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2018, 2020, 2021</em></ins></span> Free 
Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -377,7 +397,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/30 06:36:15 $
+$Date: 2021/12/29 16:01:03 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/license-compatibility.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.it.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/license-compatibility.it.po      30 Apr 2021 06:36:15 -0000      1.9
+++ po/license-compatibility.it.po      29 Dec 2021 16:01:03 -0000      1.10
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2016-10-23 15:18+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -26,19 +26,19 @@
 "La compatibilità tra le licenze e il re-licenziamento - Progetto GNU - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "License Compatibility and Relicensing"
 msgstr "La compatibilità tra le licenze e il re-licenziamento"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "di Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If you want to combine two free programs into one, or merge code from one
 # | into the other, this raises the question of whether their licenses allow
 # | combining [-them.-] {+them, or prohibit combining them.<a
-# | href=\"#f1\">(*)</a>+}
+# | href=\"#f1\">[1]</a>+}
 #, fuzzy
 #| msgid ""
 #| "If you want to combine two free programs into one, or merge code from one "
@@ -47,16 +47,16 @@
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
+"combining them, or prohibit combining them.<a href=\"#f1\">[1]</a>"
 msgstr ""
 "Qualora si vogliano combinare due programmi liberi in uno unico oppure "
 "inserire il codice di uno all'interno dell'altro, è necessario valutare se "
 "le licenze dei due programmi lo permettono."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There is no problem merging programs that have the same license, if it is
 # | a reasonably behaved license, as nearly all free licenses are.<a
-# | [-href=\"#f1\">(*)</a>-] {+href=\"#f2\">(**)</a>+}
+# | [-href=\"#f1\">(*)</a>-] {+href=\"#f2\">[2]</a>+}
 #, fuzzy
 #| msgid ""
 #| "There is no problem merging programs that have the same license, if it is "
@@ -65,13 +65,13 @@
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
-"(**)</a>"
+"[2]</a>"
 msgstr ""
 "Non vi è alcun problema ad unire programmi protetti dalla medesima licenza "
 "se la licenza è stata ben studiata e la maggior parte delle licenze libere "
 "lo è. <a href=\"#f1\">(*)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What then when the licenses are different? In general we say that several "
 "licenses are <em>compatible</em> if there is a way to merge code under those "
@@ -92,7 +92,7 @@
 "particolare combinazione di licenze determina inoltre qual è la licenza "
 "necessaria per il programma derivato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We divide licenses into three classes: lax (also &ldquo;permissive&rdquo; or "
 "&ldquo;pushover&rdquo;), intermediate, and copyleft.  A lax license does "
@@ -110,7 +110,7 @@
 "alcune condizioni circa l'aggiunta di codice proprietario, ma non cerca di "
 "proibirla."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, lax permissive licenses (modified BSD, X11, Expat, Apache, "
 "Python, etc.) are compatible with each other.  That's because they have no "
@@ -128,13 +128,13 @@
 "vengono definite &ldquo;licenze permissive&rdquo; dato che non sanno dire "
 "&ldquo;no&rdquo; quando un utente cerca di negare la libertà agli altri."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | In a combination of programs under lax licenses, each part carries the
 # | license it came with.  When the code is merged to the point that the parts
 # | can't be distinguished any more, that merged code should carry all the
 # | licenses of the merged parts.  Since all the licenses are lax anyway, this
 # | causes no practical problem except that the list of licenses gets long.<a
-# | [-href=\"#f2\">(**)</a>-] {+href=\"#f3\">(***)</a>+}
+# | [-href=\"#f2\">(**)</a>-] {+href=\"#f3\">[3]</a>+}
 #, fuzzy
 #| msgid ""
 #| "In a combination of programs under lax licenses, each part carries the "
@@ -149,7 +149,7 @@
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f3\">(***)</a>"
+"href=\"#f3\">[3]</a>"
 msgstr ""
 "In una combinazione di programmi protetti da licenze deboli, ogni programma "
 "porta con sé la licenza della quale era originariamente dotato. Quando il "
@@ -159,7 +159,7 @@
 "tipo debole, non si crea un problema effettivo, eccetto per la lunghezza "
 "della lista delle licenze.<a href=\"#f2\">(**)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the same token, lax licenses are usually compatible with any copyleft "
 "license.  In the combined program, the parts that came in under lax licenses "
@@ -176,7 +176,7 @@
 "incompatibili con la GPL versione 2, ma, dal momento che ritengo buone tali "
 "clausole, ho fatto in modo che la GPL versione 3 fosse compatibile con esse."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one important exception is the original BSD license, because of the "
 "&ldquo;obnoxious advertising clause.&rdquo; This condition required a "
@@ -198,7 +198,7 @@
 "un certo punto, una distribuzione BSD richiedeva l'aggiunta di oltre una "
 "settantina di inserzioni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I mostly eliminated this problem by convincing a dean, Hal Varian, to "
 "arrange for UC Berkeley to publish the &ldquo;modified BSD license&rdquo; "
@@ -215,7 +215,7 @@
 "raramente usata, ma è ancora necessario stare attenti a <a href=\"/licenses/"
 "bsd.html\">non parlare &ldquo;della&rdquo; licenza BSD</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | In general, two different copyleft licenses are unavoidably incompatible
 # | unless they have explicit compatibility provisions.  This is not due to a
 # | mistake in the details; it's inherent in the idea of copyleft.  The idea
@@ -268,7 +268,7 @@
 "intrinsecamente incompatibili con quelle della CC-BY-SA 3.0, e gli autori "
 "non avrebbero potuto evitarlo in alcun modo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is why GPL version 2 is incompatible with GPL version 3; it could not "
 "be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
@@ -276,7 +276,7 @@
 "avoided this."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There are two approaches for [-smoothing out-] {+avoiding+} the
 # | incompatibility [-inherent in new-] {+problem caused by different+}
 # | versions of copyleft licenses.
@@ -291,14 +291,30 @@
 "Ci sono due modi per evitare l'incompatibilità intrinseca nelle nuove "
 "versioni di licenze copyleft."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The FSF uses the approach of asking people to release programs under
+# | &ldquo;GNU GPL version N or any later version.&rdquo; This licensing is
+# | compatible with version N, and also with N+1 (because it offers version
+# | N+1 as an option).  When you combine code under &ldquo;GPL 3 or
+# | later&rdquo; with code under &ldquo;GPL 2 or [-later&rdquo;,-]
+# | {+later,&rdquo;+} the license of the combination is their intersection,
+# | which is &ldquo;GPL 3 or [-later&rdquo;.-] {+later.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The FSF uses the approach of asking people to release programs under "
+#| "&ldquo;GNU GPL version N or any later version.&rdquo; This licensing is "
+#| "compatible with version N, and also with N+1 (because it offers version N"
+#| "+1 as an option).  When you combine code under &ldquo;GPL 3 or "
+#| "later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license of "
+#| "the combination is their intersection, which is &ldquo;GPL 3 or "
+#| "later&rdquo;."
 msgid ""
 "The FSF uses the approach of asking people to release programs under &ldquo;"
 "GNU GPL version N or any later version.&rdquo; This licensing is compatible "
 "with version N, and also with N+1 (because it offers version N+1 as an "
 "option).  When you combine code under &ldquo;GPL 3 or later&rdquo; with code "
-"under &ldquo;GPL 2 or later&rdquo;, the license of the combination is their "
-"intersection, which is &ldquo;GPL 3 or later&rdquo;."
+"under &ldquo;GPL 2 or later,&rdquo; the license of the combination is their "
+"intersection, which is &ldquo;GPL 3 or later.&rdquo;"
 msgstr ""
 "L'approccio usato dalla FSF consiste nel chiedere alle persone di rilasciare "
 "il programma sotto &ldquo;licenza GNU GPL versione N o una qualunque "
@@ -309,7 +325,7 @@
 "successiva&rdquo;, la licenza del programma così combinato è la loro "
 "intersezione, ovvero la &ldquo;GPL 3 o successiva&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We hope we will never need to make a GNU GPL version 4, but nothing is "
 "perfect and we can't assume we have anticipated all the issues.  By "
@@ -322,7 +338,7 @@
 "permettete che quel codice venga aggiornato alla versione 4 della stessa, se "
 "mai un giorno ce ne sarà bisogno."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The other approach is to make each version of the license explicitly allow
 # | upgrading to later versions.  [-This is what-]  {+The Mozilla Foundation
 # | uses this approach, as does PHP.+}  Creative [-Commons does:-] {+Commons,
@@ -352,7 +368,7 @@
 "che esse diventino disponibili. Anche la Mozilla Foundation utilizza questo "
 "approccio."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Only the GNU licenses give authors a choice about whether to permit upgrades "
 "to future license versions.  When I wrote the first version of the GNU GPL, "
@@ -370,11 +386,11 @@
 "scegliere se rilasciare il programma sotto la licenza &ldquo;GPL 1&rdquo; "
 "oppure &ldquo;GPL 1 o successiva.&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Since then, I have come to question the wisdom of that decision.  Programs
 # | such as Linux, which allow only one GNU GPL version and reject license
 # | upgrades, cause practical incompatibility.<a [-href=\"#f3\">(***)</a>
-# | Perhaps-] {+href=\"#f4\">(****)</a> If we ever make a GPL version 4,
+# | Perhaps-] {+href=\"#f4\">[4]</a> If we ever make a GPL version 4,
 # | perhaps+} we should include an upgrade clause [-in GPL version 4, if we
 # | ever need a version 4.-] {+that automatically permits relicensing to
 # | higher-numbered versions, 5 and up.+}
@@ -388,8 +404,8 @@
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
-"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">[4]</a> If we ever "
+"make a GPL version 4, perhaps we should include an upgrade clause that "
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 "Mi è capitato, da allora, di mettere in discussione la saggezza di quella "
@@ -399,7 +415,7 @@
 "una clausola di aggiornamento nella versione 4 della GPL, se mai avremo "
 "bisogno della versione 4."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses allow cross-copyleft combinations with an explicit "
 "relicensing clause giving permission to put the code under a different "
@@ -418,7 +434,7 @@
 "GPL versione 3 or successiva, la CeCILL dice che potete farlo rilasciando il "
 "codice combinato con la licenza GPL versione 3 o successiva."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Explicit relicensing permission is not the same thing as compatibility "
 "(though relicensing code can make it compatible with other code) and it is "
@@ -439,16 +455,35 @@
 "programma Q. L'unica maniera legale di rilasciare un tale programma "
 "combinato è facendolo accompagnare dall'appropriata versione della GPL."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Likewise, CC[---]{+ +}BY-SA 4.0 explicitly permits relicensing modified
+# | versions to GNU GPL version 3, but GPL version 3 does not permit
+# | relicensing to CC[---]{+ +}BY-SA.  This issue should never arise for
+# | software code; Creative Commons says its licenses are not meant for code,
+# | and says that the license to use for code is the GNU GPL.  But there are
+# | other kinds of works, such as hardware designs or game art, where you
+# | might have occasion to merge material released under CC-BY-SA with
+# | material released under the GNU GPL.  This can be done through CC[---]{+
+# | +}BY-SA's explicit relicensing permission.
+#, fuzzy
+#| msgid ""
+#| "Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions "
+#| "to GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-"
+#| "BY-SA.  This issue should never arise for software code; Creative Commons "
+#| "says its licenses are not meant for code, and says that the license to "
+#| "use for code is the GNU GPL.  But there are other kinds of works, such as "
+#| "hardware designs or game art, where you might have occasion to merge "
+#| "material released under CC-BY-SA with material released under the GNU "
+#| "GPL.  This can be done through CC-BY-SA's explicit relicensing permission."
 msgid ""
-"Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions to "
-"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-BY-"
+"Likewise, CC BY-SA 4.0 explicitly permits relicensing modified versions to "
+"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC BY-"
 "SA.  This issue should never arise for software code; Creative Commons says "
 "its licenses are not meant for code, and says that the license to use for "
 "code is the GNU GPL.  But there are other kinds of works, such as hardware "
 "designs or game art, where you might have occasion to merge material "
 "released under CC-BY-SA with material released under the GNU GPL.  This can "
-"be done through CC-BY-SA's explicit relicensing permission."
+"be done through CC BY-SA's explicit relicensing permission."
 msgstr ""
 "Similmente, la licenza CC-BY-SA 4.0 permette l'esplicito re-licenziamento "
 "delle versioni modificate sotto la GNU GPL versione 3, ma la GPL versione 3 "
@@ -462,15 +497,37 @@
 "attraverso l'esplicito permesso di re-licenziamento contenuto nella licenza "
 "CC-BY-SA."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Unfortunately, CC[---]{+ +}BY-SA 4.0 does not permit relicensing to future
+# | GPL versions.  What you should do, when you relicense material under
+# | CC[---]{+ +}BY-SA 4.0 to the GPL, is <a
+# | href=\"/licenses/rms-why-gplv3.html#future-proofing\">specify yourself as
+# | a license version proxy</a> to indicate whether future GPL versions have
+# | been authorized for that material.  If someday there is a GPL version 4
+# | and Creative Commons decides to allow relicensing from CC[---]{+ +}BY-SA
+# | to GPL version 4, you as proxy will be able to retroactively authorize use
+# | of that relicensed material under GPL version 4.  (Alternatively, you can
+# | ask the authors of that material to give permission right away.)
+#, fuzzy
+#| msgid ""
+#| "Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
+#| "versions.  What you should do, when you relicense material under CC-BY-SA "
+#| "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
+#| "\">specify yourself as a license version proxy</a> to indicate whether "
+#| "future GPL versions have been authorized for that material.  If someday "
+#| "there is a GPL version 4 and Creative Commons decides to allow "
+#| "relicensing from CC-BY-SA to GPL version 4, you as proxy will be able to "
+#| "retroactively authorize use of that relicensed material under GPL version "
+#| "4.  (Alternatively, you can ask the authors of that material to give "
+#| "permission right away.)"
 msgid ""
-"Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
-"versions.  What you should do, when you relicense material under CC-BY-SA "
+"Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL "
+"versions.  What you should do, when you relicense material under CC BY-SA "
 "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
 "\">specify yourself as a license version proxy</a> to indicate whether "
 "future GPL versions have been authorized for that material.  If someday "
 "there is a GPL version 4 and Creative Commons decides to allow relicensing "
-"from CC-BY-SA to GPL version 4, you as proxy will be able to retroactively "
+"from CC BY-SA to GPL version 4, you as proxy will be able to retroactively "
 "authorize use of that relicensed material under GPL version 4.  "
 "(Alternatively, you can ask the authors of that material to give permission "
 "right away.)"
@@ -487,7 +544,7 @@
 "licenza GPL versione 4 (in alternativa, potete chiedere direttamente agli "
 "autori del materiale di concedervi il permesso necessario)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The ordinary GNU General Public License and the GNU Affero General Public "
 "License are two different copyleft licenses, so they are naturally "
@@ -517,7 +574,7 @@
 "versione 2 dal momento che la GNU Affero GPL e la GNU GPL fanno parte di due "
 "serie di licenze differenti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Lesser General Public License, version 3, is really the GNU General "
 "Public License version 3 plus some added extra permissions.  GPL version 3 "
@@ -537,7 +594,7 @@
 "(N &gt; 3), noi scriveremo una licenza LGPL versione N che sarà "
 "semplicemente la GPL versione N con l'aggiunta di alcuni permessi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As for GNU Lesser GPL version 2.1, that explicitly permits relicensing to "
 "GNU GPL version 2 or later."
@@ -546,7 +603,7 @@
 "esplicitamente il re-licenziamento verso la licenza GNU GPL versione 2 o "
 "successiva."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Intermediate licenses are those which have substantive requirements on "
 "redistribution but are not copyleft licenses.  Examples include the Eclipse "
@@ -565,17 +622,16 @@
 "permette tuttavia il re-licenziamento verso la GNU GPL, ad eccezione del "
 "caso in cui il codice lo proibisca esplicitamente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Finally, what about dual licensing?<a [-href=\"#f4\">(****)</a>-]
-# | {+href=\"#f5\">(*****)</a>+} A dual license is a disjunction: it means
-# | that the same program carries a choice of two or more different licenses. 
-# | For instance, older versions of Perl carried a dual license: the
-# | disjunction of the Artistic License and the GNU General Public License. 
-# | This meant that each user could choose to use and redistribute Perl under
-# | one license or the other, or under both in disjunction like the Perl
-# | release itself.  A disjunction is compatible with a set of other licenses
-# | if any one of the license choices in the disjunction is compatible with
-# | that set.
+# | {+href=\"#f5\">[5]</a>+} A dual license is a disjunction: it means that
+# | the same program carries a choice of two or more different licenses.  For
+# | instance, older versions of Perl carried a dual license: the disjunction
+# | of the Artistic License and the GNU General Public License.  This meant
+# | that each user could choose to use and redistribute Perl under one license
+# | or the other, or under both in disjunction like the Perl release itself. 
+# | A disjunction is compatible with a set of other licenses if any one of the
+# | license choices in the disjunction is compatible with that set.
 #, fuzzy
 #| msgid ""
 #| "Finally, what about dual licensing?<a href=\"#f4\">(****)</a> A dual "
@@ -588,11 +644,11 @@
 #| "with a set of other licenses if any one of the license choices in the "
 #| "disjunction is compatible with that set."
 msgid ""
-"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
-"license is a disjunction: it means that the same program carries a choice of "
-"two or more different licenses.  For instance, older versions of Perl "
-"carried a dual license: the disjunction of the Artistic License and the GNU "
-"General Public License.  This meant that each user could choose to use and "
+"Finally, what about dual licensing?<a href=\"#f5\">[5]</a> A dual license is "
+"a disjunction: it means that the same program carries a choice of two or "
+"more different licenses.  For instance, older versions of Perl carried a "
+"dual license: the disjunction of the Artistic License and the GNU General "
+"Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
@@ -608,7 +664,7 @@
 "compatibile con un gruppo di altre licenze se una qualunque delle opzioni di "
 "scelta è compatibile con il detto gruppo di licenze."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When you choose a license for your code, please choose GNU GPL version 3 or "
 "later, or some license compatible with that.  This is the way to make your "
@@ -624,18 +680,18 @@
 "alla difesa della libertà di tutti gli utenti per tutte le versioni del "
 "vostro codice."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Combining code"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When a set of licenses are compatible, that means you can legally combine or "
 "merge a number of programs each licensed under one of those licenses.  How, "
 "then, is the combined program licensed?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each free software license says you must keep the license with the code that "
 "is covered by it.  So in a strict sense, the licensing of the combined "
@@ -645,72 +701,72 @@
 "to pay attention to?</em>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To compute that, you start with a list of all the pertinent licenses.  Then "
 "you can delete from the list any license which is subsumed by another in the "
 "list."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We say that a license A <em>subsumes</em> license B when compliance with "
 "license A implies compliance with license B."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For instance, the GNU GPL version N and the GNU Affero GPL version N both "
 "subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
 "Lesser GPL version 2.1."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
 "least 3."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
 "that are compatible with it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
 "BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
-"and ISC licenses and CC-0."
+"and ISC licenses and CC0."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not meant to be a complete list, but if we are informed of other "
 "cases worth mentioning, we will add them."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When some license is subsumed, you still need to include a copy of it with "
 "all distribution of the combined program."
 msgstr ""
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Note"
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"<b>*</b> It is not inconceivable that other legal issues might arise about a "
-"specific combination of programs, issues not related to the copyright "
-"licenses of the programs to be combined.  We discuss only the implications "
-"of the licenses themselves."
+"It is not inconceivable that other legal issues might arise about a specific "
+"combination of programs, issues not related to the copyright licenses of the "
+"programs to be combined.  We discuss only the implications of the licenses "
+"themselves."
 msgstr ""
 
-#. type: Content of: <p>
-# | <b>*{+*+}</b> The main license in actual use that isn't reasonably behaved
+#. type: Content of: <div><ol><li><p>
+# | [-<b>*</b>-]The main license in actual use that isn't reasonably behaved
 # | is the license of TeX: if two programs are licensed just the way TeX is,
 # | there is no authorized way to distribute a merged version of them.
 #, fuzzy
@@ -719,16 +775,16 @@
 #| "the license of TeX: if two programs are licensed just the way TeX is, "
 #| "there is no authorized way to distribute a merged version of them."
 msgid ""
-"<b>**</b> The main license in actual use that isn't reasonably behaved is "
-"the license of TeX: if two programs are licensed just the way TeX is, there "
-"is no authorized way to distribute a merged version of them."
+"The main license in actual use that isn't reasonably behaved is the license "
+"of TeX: if two programs are licensed just the way TeX is, there is no "
+"authorized way to distribute a merged version of them."
 msgstr ""
 "<b>*</b> Il caso più eclatante di una licenza effettivamente utilizzata che "
 "si comporta in maniera irragionevole è la licenza di TeX: se due programmi "
 "seguono il modello della licenza di TeX, non esiste una maniera legale di "
 "distribuirne una versione combinata."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "The TeX license permits distribution of a modified version only in the form "
 "of the original version plus a differences file.  If A and B are separately "
@@ -746,7 +802,7 @@
 "l'aggiunta della differenza, viola la licenza A. Distribuire il programma in "
 "qualunque altra maniera viola entrambe le licenze."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "It is no coincidence that TeX was released in 1982: our community has "
 "learned, since then, to write reasonably behaved licenses."
@@ -755,8 +811,8 @@
 "comunità ha da allora imparato a scrivere licenze caratterizzate da un "
 "comportamento assai più ragionevole."
 
-#. type: Content of: <p>
-# | <b>**{+*+}</b> When distributing in source code form, it is usually
+#. type: Content of: <div><ol><li><p>
+# | [-<b>**</b>-]When distributing in source code form, it is usually
 # | sufficient to leave the license notices in the source code as they stand;
 # | extra license notice requirements typically only come up for lax licenses
 # | when distributing binaries without the source code.
@@ -767,10 +823,10 @@
 #| "license notice requirements typically only come up for lax licenses when "
 #| "distributing binaries without the source code."
 msgid ""
-"<b>***</b> When distributing in source code form, it is usually sufficient "
-"to leave the license notices in the source code as they stand; extra license "
-"notice requirements typically only come up for lax licenses when "
-"distributing binaries without the source code."
+"When distributing in source code form, it is usually sufficient to leave the "
+"license notices in the source code as they stand; extra license notice "
+"requirements typically only come up for lax licenses when distributing "
+"binaries without the source code."
 msgstr ""
 "<b>**</b> Quando si distribuisce un programma sotto forma di codice "
 "sorgente, è di solito sufficiente lasciare le inserzioni di licenza così "
@@ -778,9 +834,9 @@
 "nel caso di licenze deboli, quando si distribuiscono programmi binari "
 "sprovvisti del codice sorgente."
 
-#. type: Content of: <p>
-# | <b>***{+*+}</b> In addition, GPL version 2 still allows binaries to be
-# | made nonfree by hardware that rejects all but special signed binaries, and
+#. type: Content of: <div><ol><li><p>
+# | [-<b>***</b>-]In addition, GPL version 2 still allows binaries to be made
+# | nonfree by hardware that rejects all but special signed binaries, and
 # | still does not allow distribution of binaries by [-torrent, as it did when
 # | first published.  We-] {+torrent.  <a
 # | href=\"/licenses/rms-why-gplv3.html\">We+} fixed those [-things-]
@@ -794,11 +850,11 @@
 #| "first published.  We fixed those things and others in version 3, but we "
 #| "can't change version 2."
 msgid ""
-"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
-"nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent.  <a href=\"/licenses/rms-"
-"why-gplv3.html\">We fixed those problems, and others, in version 3</a>, but "
-"we can't change version 2."
+"In addition, GPL version 2 still allows binaries to be made nonfree by "
+"hardware that rejects all but special signed binaries, and still does not "
+"allow distribution of binaries by torrent.  <a href=\"/licenses/rms-why-"
+"gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
+"can't change version 2."
 msgstr ""
 "<b>***</b> In aggiunta, la licenza GPL versione 2 permette tuttora di "
 "trasformare i programmi binari in software proprietario quando l'hardware "
@@ -808,8 +864,8 @@
 "queste magagne, ed altre ancora, nella versione 3 della GPL, tuttavia non "
 "possiamo modificare la versione 2 della stessa."
 
-#. type: Content of: <p>
-# | <b>****{+*+}</b> Some [-inexplicably-] use the term &ldquo;dual
+#. type: Content of: <div><ol><li><p>
+# | [-<b>****</b>-]Some [-inexplicably-] use the term &ldquo;dual
 # | licensing&rdquo; to refer to selling exceptions, but that is [-an abuse of
 # | language.-] {+a misnomer.+}  See <a
 # | href=\"/philosophy/selling-exceptions.html\"> Selling Exceptions</a>. 
@@ -826,11 +882,11 @@
 #| "not in the ordinary free release, that's not selling exceptions, that's "
 #| "nonfree software."
 msgid ""
-"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
-"selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
-"selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the program "
-"on which the license is sold includes any code that is not in the free "
-"(libre) release, that's not selling exceptions, that's nonfree software."
+"Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
+"exceptions, but that is a misnomer.  See <a href=\"/philosophy/selling-"
+"exceptions.html\"> Selling Exceptions</a>.  Note that if the program on "
+"which the license is sold includes any code that is not in the free (libre) "
+"release, that's not selling exceptions, that's nonfree software."
 msgstr ""
 "<b>****</b> Alcuni utilizzano in maniera inesplicabile il termine &ldquo;"
 "duplice licenziamento&rdquo; per fare riferimento alle vendita di eccezioni, "
@@ -866,14 +922,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -887,11 +943,11 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2015, 2016-] {+2016, 2018, 2020+} Free Software
+# | Copyright &copy; [-2015, 2016-] {+2016, 2018, 2020, 2021+} Free Software
 # | Foundation, Inc.
 #, fuzzy
 #| msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>

Index: po/license-compatibility.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.pot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/license-compatibility.pot        20 Nov 2020 16:30:39 -0000      1.5
+++ po/license-compatibility.pot        29 Dec 2021 16:01:03 -0000      1.6
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,29 +22,29 @@
 "Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "License Compatibility and Relicensing"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
+"combining them, or prohibit combining them.<a href=\"#f1\">[1]</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a "
-"href=\"#f2\">(**)</a>"
+"href=\"#f2\">[2]</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What then when the licenses are different? In general we say that several "
 "licenses are <em>compatible</em> if there is a way to merge code under those "
@@ -56,7 +56,7 @@
 "combined program."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We divide licenses into three classes: lax (also &ldquo;permissive&rdquo; or "
 "&ldquo;pushover&rdquo;), intermediate, and copyleft.  A lax license does "
@@ -66,7 +66,7 @@
 "adding proprietary code but does not try to prohibit it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, lax permissive licenses (modified BSD, X11, Expat, Apache, "
 "Python, etc.) are compatible with each other.  That's because they have no "
@@ -77,17 +77,17 @@
 "others."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In a combination of programs under lax licenses, each part carries the "
 "license it came with.  When the code is merged to the point that the parts "
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f3\">(***)</a>"
+"href=\"#f3\">[3]</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the same token, lax licenses are usually compatible with any copyleft "
 "license.  In the combined program, the parts that came in under lax licenses "
@@ -97,7 +97,7 @@
 "good, I made GPL version 3 compatible with them."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one important exception is the original BSD license, because of the "
 "&ldquo;obnoxious advertising clause.&rdquo; This condition required a "
@@ -109,7 +109,7 @@
 "over 70 different notices."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I mostly eliminated this problem by convincing a dean, Hal Varian, to "
 "arrange for UC Berkeley to publish the &ldquo;modified BSD license&rdquo; "
@@ -120,7 +120,7 @@
 "license</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, two different copyleft licenses are unavoidably incompatible "
 "unless they have explicit compatibility provisions.  This is not due to a "
@@ -133,7 +133,7 @@
 "to be A, <em>and</em> it would have to be B."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is why GPL version 2 is incompatible with GPL version 3; it could not "
 "be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
@@ -141,23 +141,23 @@
 "avoided this."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are two approaches for avoiding the incompatibility problem caused by "
 "different versions of copyleft licenses."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The FSF uses the approach of asking people to release programs under "
 "&ldquo;GNU GPL version N or any later version.&rdquo; This licensing is "
 "compatible with version N, and also with N+1 (because it offers version N+1 "
 "as an option).  When you combine code under &ldquo;GPL 3 or later&rdquo; "
-"with code under &ldquo;GPL 2 or later&rdquo;, the license of the combination "
-"is their intersection, which is &ldquo;GPL 3 or later&rdquo;."
+"with code under &ldquo;GPL 2 or later,&rdquo; the license of the combination "
+"is their intersection, which is &ldquo;GPL 3 or later.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We hope we will never need to make a GNU GPL version 4, but nothing is "
 "perfect and we can't assume we have anticipated all the issues.  By "
@@ -165,7 +165,7 @@
 "upgrade to GNU GPL version 4 if we ever need one."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The other approach is to make each version of the license explicitly allow "
 "upgrading to later versions.  The Mozilla Foundation uses this approach, as "
@@ -174,7 +174,7 @@
 "CC-BY-SA for modified works."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Only the GNU licenses give authors a choice about whether to permit upgrades "
 "to future license versions.  When I wrote the first version of the GNU GPL, "
@@ -184,16 +184,16 @@
 "only&rdquo; or &ldquo;GPL 1 or later.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
-"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">[4]</a> If we ever "
+"make a GPL version 4, perhaps we should include an upgrade clause that "
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses allow cross-copyleft combinations with an explicit "
 "relicensing clause giving permission to put the code under a different "
@@ -204,7 +204,7 @@
 "or merged code under GPL version 3 or later."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Explicit relicensing permission is not the same thing as compatibility "
 "(though relicensing code can make it compatible with other code) and it is "
@@ -216,33 +216,33 @@
 "program is under the appropriate GPL version(s)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions to "
-"GNU GPL version 3, but GPL version 3 does not permit relicensing to "
-"CC-BY-SA.  This issue should never arise for software code; Creative Commons "
+"Likewise, CC BY-SA 4.0 explicitly permits relicensing modified versions to "
+"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC "
+"BY-SA.  This issue should never arise for software code; Creative Commons "
 "says its licenses are not meant for code, and says that the license to use "
 "for code is the GNU GPL.  But there are other kinds of works, such as "
 "hardware designs or game art, where you might have occasion to merge "
 "material released under CC-BY-SA with material released under the GNU GPL.  "
-"This can be done through CC-BY-SA's explicit relicensing permission."
+"This can be done through CC BY-SA's explicit relicensing permission."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
-"versions.  What you should do, when you relicense material under CC-BY-SA "
+"Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL "
+"versions.  What you should do, when you relicense material under CC BY-SA "
 "4.0 to the GPL, is <a "
 "href=\"/licenses/rms-why-gplv3.html#future-proofing\">specify yourself as a "
 "license version proxy</a> to indicate whether future GPL versions have been "
 "authorized for that material.  If someday there is a GPL version 4 and "
-"Creative Commons decides to allow relicensing from CC-BY-SA to GPL version "
+"Creative Commons decides to allow relicensing from CC BY-SA to GPL version "
 "4, you as proxy will be able to retroactively authorize use of that "
 "relicensed material under GPL version 4.  (Alternatively, you can ask the "
 "authors of that material to give permission right away.)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The ordinary GNU General Public License and the GNU Affero General Public "
 "License are two different copyleft licenses, so they are naturally "
@@ -259,7 +259,7 @@
 "two different series of licenses."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Lesser General Public License, version 3, is really the GNU General "
 "Public License version 3 plus some added extra permissions.  GPL version 3 "
@@ -271,13 +271,13 @@
 "permissions."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As for GNU Lesser GPL version 2.1, that explicitly permits relicensing to "
 "GNU GPL version 2 or later."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Intermediate licenses are those which have substantive requirements on "
 "redistribution but are not copyleft licenses.  Examples include the Eclipse "
@@ -288,20 +288,20 @@
 "code explicitly denies this permission."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
-"license is a disjunction: it means that the same program carries a choice of "
-"two or more different licenses.  For instance, older versions of Perl "
-"carried a dual license: the disjunction of the Artistic License and the GNU "
-"General Public License.  This meant that each user could choose to use and "
+"Finally, what about dual licensing?<a href=\"#f5\">[5]</a> A dual license is "
+"a disjunction: it means that the same program carries a choice of two or "
+"more different licenses.  For instance, older versions of Perl carried a "
+"dual license: the disjunction of the Artistic License and the GNU General "
+"Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
 "is compatible with that set."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When you choose a license for your code, please choose GNU GPL version 3 or "
 "later, or some license compatible with that.  This is the way to make your "
@@ -310,18 +310,18 @@
 "all users of all versions of your code."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Combining code"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When a set of licenses are compatible, that means you can legally combine or "
 "merge a number of programs each licensed under one of those licenses.  How, "
 "then, is the combined program licensed?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each free software license says you must keep the license with the code that "
 "is covered by it.  So in a strict sense, the licensing of the combined "
@@ -331,77 +331,77 @@
 "to pay attention to?</em>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To compute that, you start with a list of all the pertinent licenses.  Then "
 "you can delete from the list any license which is subsumed by another in the "
 "list."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We say that a license A <em>subsumes</em> license B when compliance with "
 "license A implies compliance with license B."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For instance, the GNU GPL version N and the GNU Affero GPL version N both "
 "subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
 "Lesser GPL version 2.1."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
 "least 3."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
 "that are compatible with it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
 "BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
-"and ISC licenses and CC-0."
+"and ISC licenses and CC0."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not meant to be a complete list, but if we are informed of other "
 "cases worth mentioning, we will add them."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When some license is subsumed, you still need to include a copy of it with "
 "all distribution of the combined program."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"<b>*</b> It is not inconceivable that other legal issues might arise about a "
-"specific combination of programs, issues not related to the copyright "
-"licenses of the programs to be combined.  We discuss only the implications "
-"of the licenses themselves."
+"It is not inconceivable that other legal issues might arise about a specific "
+"combination of programs, issues not related to the copyright licenses of the "
+"programs to be combined.  We discuss only the implications of the licenses "
+"themselves."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"<b>**</b> The main license in actual use that isn't reasonably behaved is "
-"the license of TeX: if two programs are licensed just the way TeX is, there "
-"is no authorized way to distribute a merged version of them."
+"The main license in actual use that isn't reasonably behaved is the license "
+"of TeX: if two programs are licensed just the way TeX is, there is no "
+"authorized way to distribute a merged version of them."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "The TeX license permits distribution of a modified version only in the form "
 "of the original version plus a differences file.  If A and B are separately "
@@ -411,33 +411,33 @@
 "both licenses."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "It is no coincidence that TeX was released in 1982: our community has "
 "learned, since then, to write reasonably behaved licenses."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"<b>***</b> When distributing in source code form, it is usually sufficient "
-"to leave the license notices in the source code as they stand; extra license "
-"notice requirements typically only come up for lax licenses when "
-"distributing binaries without the source code."
+"When distributing in source code form, it is usually sufficient to leave the "
+"license notices in the source code as they stand; extra license notice "
+"requirements typically only come up for lax licenses when distributing "
+"binaries without the source code."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
-"nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent.  <a "
+"In addition, GPL version 2 still allows binaries to be made nonfree by "
+"hardware that rejects all but special signed binaries, and still does not "
+"allow distribution of binaries by torrent.  <a "
 "href=\"/licenses/rms-why-gplv3.html\">We fixed those problems, and others, "
 "in version 3</a>, but we can't change version 2."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
-"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
-"selling exceptions, but that is a misnomer.  See <a "
+"Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
+"exceptions, but that is a misnomer.  See <a "
 "href=\"/philosophy/selling-exceptions.html\"> Selling Exceptions</a>.  Note "
 "that if the program on which the license is sold includes any code that is "
 "not in the free (libre) release, that's not selling exceptions, that's "
@@ -468,7 +468,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>. 
@@ -476,11 +476,12 @@
 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; 2016, 2018, 2020 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: po/license-compatibility.pt-br.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.pt-br.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/license-compatibility.pt-br.po   29 Dec 2021 15:55:36 -0000      1.3
+++ po/license-compatibility.pt-br.po   29 Dec 2021 16:01:03 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2021-01-02 09:35-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-12-29 15:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 3.38.0\n"
 
@@ -25,35 +26,45 @@
 "Compatibilidade e relicenciamento de licença - Projeto GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "License Compatibility and Relicensing"
 msgstr "Compatibilidade e relicenciamento de licença"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "por Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to combine two free programs into one, or merge code from one "
+#| "into the other, this raises the question of whether their licenses allow "
+#| "combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
+"combining them, or prohibit combining them.<a href=\"#f1\">[1]</a>"
 msgstr ""
 "Se você quiser combinar dois programas livres em um, ou mesclar o código de 
"
 "um para o outro, isso levanta a questão de saber se suas licenças permitem "
 "combiná-los ou  proíbem combiná-las.<a href=\"#f1\">(*)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There is no problem merging programs that have the same license, if it is "
+#| "a reasonably behaved license, as nearly all free licenses are.<a href="
+#| "\"#f2\">(**)</a>"
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
-"(**)</a>"
+"[2]</a>"
 msgstr ""
 "Não há problema em mesclar programas que possuem a mesma licença se ela 
for "
 "uma licença razoavelmente comportada, já que quase todas as licenças 
livres "
 "são.<a href=\"#f2\">(**)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What then when the licenses are different? In general we say that several "
 "licenses are <em>compatible</em> if there is a way to merge code under those "
@@ -73,7 +84,7 @@
 "não depende da ordem em que você as menciona. O conjunto de licenças 
também "
 "controla qual licença é necessária para o programa combinado."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We divide licenses into three classes: lax (also &ldquo;permissive&rdquo; or "
 "&ldquo;pushover&rdquo;), intermediate, and copyleft.  A lax license does "
@@ -90,7 +101,7 @@
 "intermediária coloca algumas condições em adicionar código privativo, mas 
"
 "não tenta proibi-lo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, lax permissive licenses (modified BSD, X11, Expat, Apache, "
 "Python, etc.) are compatible with each other.  That's because they have no "
@@ -107,14 +118,22 @@
 "software privado; assim, nós as chamamos de “licenças lenientes” porque 
eles "
 "não podem dizer “não” quando um usuário tenta negar a liberdade a 
outros."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In a combination of programs under lax licenses, each part carries the "
+#| "license it came with.  When the code is merged to the point that the "
+#| "parts can't be distinguished any more, that merged code should carry all "
+#| "the licenses of the merged parts.  Since all the licenses are lax anyway, "
+#| "this causes no practical problem except that the list of licenses gets "
+#| "long.<a href=\"#f3\">(***)</a>"
 msgid ""
 "In a combination of programs under lax licenses, each part carries the "
 "license it came with.  When the code is merged to the point that the parts "
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f3\">(***)</a>"
+"href=\"#f3\">[3]</a>"
 msgstr ""
 "Em uma combinação de programas sob licenças lenientes, cada parte carrega 
a "
 "licença com a qual veio. Quando o código é mesclado ao ponto em que as "
@@ -123,7 +142,7 @@
 "isso não causa nenhum problema prático, exceto que a lista de licenças 
fica "
 "mais longo.<a href=\"#f3\">(***)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the same token, lax licenses are usually compatible with any copyleft "
 "license.  In the combined program, the parts that came in under lax licenses "
@@ -140,7 +159,7 @@
 "que essas cláusulas de patente são boas, tornei a versão 3 da GPL 
compatível "
 "com elas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one important exception is the original BSD license, because of the "
 "&ldquo;obnoxious advertising clause.&rdquo; This condition required a "
@@ -160,7 +179,7 @@
 "publicidade semelhantes, mas diferentes. Em um ponto, uma distro BSD exigia "
 "mais de 70 avisos diferentes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I mostly eliminated this problem by convincing a dean, Hal Varian, to "
 "arrange for UC Berkeley to publish the &ldquo;modified BSD license&rdquo; "
@@ -176,7 +195,7 @@
 "(felizmente) raramente usada, mas ainda devemos tomar cuidado <a href=\"/"
 "licenses/bsd.html\">para não falar sobre “a” Licença BSD</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, two different copyleft licenses are unavoidably incompatible "
 "unless they have explicit compatibility provisions.  This is not due to a "
@@ -198,7 +217,7 @@
 "desacordo irreconciliável; a licença do programa combinado que inclui 
código "
 "de P somado ao código de Q teria que ser A <em>e</em> teria que ser B."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is why GPL version 2 is incompatible with GPL version 3; it could not "
 "be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
@@ -210,7 +229,7 @@
 "inerentemente incompatíveis com as da CC-BY-SA 3.0, e os autores não "
 "poderiam ter evitado isso."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are two approaches for avoiding the incompatibility problem caused by "
 "different versions of copyleft licenses."
@@ -218,14 +237,23 @@
 "Existem duas abordagens para evitar o problema de incompatibilidade causado "
 "por versões diferentes de licenças copyleft."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The FSF uses the approach of asking people to release programs under "
+#| "&ldquo;GNU GPL version N or any later version.&rdquo; This licensing is "
+#| "compatible with version N, and also with N+1 (because it offers version N"
+#| "+1 as an option).  When you combine code under &ldquo;GPL 3 or "
+#| "later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license of "
+#| "the combination is their intersection, which is &ldquo;GPL 3 or "
+#| "later&rdquo;."
 msgid ""
 "The FSF uses the approach of asking people to release programs under &ldquo;"
 "GNU GPL version N or any later version.&rdquo; This licensing is compatible "
 "with version N, and also with N+1 (because it offers version N+1 as an "
 "option).  When you combine code under &ldquo;GPL 3 or later&rdquo; with code "
-"under &ldquo;GPL 2 or later&rdquo;, the license of the combination is their "
-"intersection, which is &ldquo;GPL 3 or later&rdquo;."
+"under &ldquo;GPL 2 or later,&rdquo; the license of the combination is their "
+"intersection, which is &ldquo;GPL 3 or later.&rdquo;"
 msgstr ""
 "A FSF usa a abordagem de pedir às pessoas para lançar programas sob “GNU 
GPL "
 "versão N ou qualquer versão posterior”. Este licenciamento é compatível 
com "
@@ -234,7 +262,7 @@
 "posterior”, a licença da combinação é sua interseção, que é “GPL 3 
ou "
 "posterior”."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We hope we will never need to make a GNU GPL version 4, but nothing is "
 "perfect and we can't assume we have anticipated all the issues.  By "
@@ -246,7 +274,7 @@
 "código sob GNU GPL 3 ou posterior, você permite que seu código seja "
 "atualizado para GNU GPL versão 4, se precisarmos de uma."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The other approach is to make each version of the license explicitly allow "
 "upgrading to later versions.  The Mozilla Foundation uses this approach, as "
@@ -260,7 +288,7 @@
 "a versão 4.0 (a versão atual) permite explicitamente que qualquer usuário "
 "atualize para versões posteriores de CC-BY-SA para obras modificadas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Only the GNU licenses give authors a choice about whether to permit upgrades "
 "to future license versions.  When I wrote the first version of the GNU GPL, "
@@ -276,12 +304,20 @@
 "cada autor. Assim, o autor poderia lançar um programa sob “GPL 1 apenas” 
ou "
 "“GPL 1 ou posterior”."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision.  "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> If we ever make a GPL version 4, perhaps we should include an upgrade "
+#| "clause that automatically permits relicensing to higher-numbered "
+#| "versions, 5 and up."
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
-"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">[4]</a> If we ever "
+"make a GPL version 4, perhaps we should include an upgrade clause that "
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 "Desde então, comecei a questionar a sabedoria dessa decisão. Programas como 
"
@@ -291,7 +327,7 @@
 "atualização que automaticamente permite relicenciamento para versões de "
 "números maiores, 5 e superiores."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses allow cross-copyleft combinations with an explicit "
 "relicensing clause giving permission to put the code under a different "
@@ -310,7 +346,7 @@
 "pode fazer isso e colocar a combinação ou código mesclado na GPL versão 3 
ou "
 "posterior."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Explicit relicensing permission is not the same thing as compatibility "
 "(though relicensing code can make it compatible with other code) and it is "
@@ -330,16 +366,26 @@
 "no uso do programa Q. A única maneira permitida de lançar esse programa "
 "combinado é sob a(s) versão(ões) apropriada(s) da GPL."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions "
+#| "to GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-"
+#| "BY-SA.  This issue should never arise for software code; Creative Commons "
+#| "says its licenses are not meant for code, and says that the license to "
+#| "use for code is the GNU GPL.  But there are other kinds of works, such as "
+#| "hardware designs or game art, where you might have occasion to merge "
+#| "material released under CC-BY-SA with material released under the GNU "
+#| "GPL.  This can be done through CC-BY-SA's explicit relicensing permission."
 msgid ""
-"Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions to "
-"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-BY-"
+"Likewise, CC BY-SA 4.0 explicitly permits relicensing modified versions to "
+"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC BY-"
 "SA.  This issue should never arise for software code; Creative Commons says "
 "its licenses are not meant for code, and says that the license to use for "
 "code is the GNU GPL.  But there are other kinds of works, such as hardware "
 "designs or game art, where you might have occasion to merge material "
 "released under CC-BY-SA with material released under the GNU GPL.  This can "
-"be done through CC-BY-SA's explicit relicensing permission."
+"be done through CC BY-SA's explicit relicensing permission."
 msgstr ""
 "Da mesma forma, a CC-BY-SA 4.0 permite explicitamente o relicenciamento de "
 "versões modificadas para GNU GPL versão 3, mas a GPL versão 3 não permite 
o "
@@ -351,15 +397,27 @@
 "material lançado sob a GNU GPL. Isso pode ser feito por meio da permissão "
 "explícita de relicenciamento da CC-BY-SA."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
+#| "versions.  What you should do, when you relicense material under CC-BY-SA "
+#| "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
+#| "\">specify yourself as a license version proxy</a> to indicate whether "
+#| "future GPL versions have been authorized for that material.  If someday "
+#| "there is a GPL version 4 and Creative Commons decides to allow "
+#| "relicensing from CC-BY-SA to GPL version 4, you as proxy will be able to "
+#| "retroactively authorize use of that relicensed material under GPL version "
+#| "4.  (Alternatively, you can ask the authors of that material to give "
+#| "permission right away.)"
 msgid ""
-"Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
-"versions.  What you should do, when you relicense material under CC-BY-SA "
+"Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL "
+"versions.  What you should do, when you relicense material under CC BY-SA "
 "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
 "\">specify yourself as a license version proxy</a> to indicate whether "
 "future GPL versions have been authorized for that material.  If someday "
 "there is a GPL version 4 and Creative Commons decides to allow relicensing "
-"from CC-BY-SA to GPL version 4, you as proxy will be able to retroactively "
+"from CC BY-SA to GPL version 4, you as proxy will be able to retroactively "
 "authorize use of that relicensed material under GPL version 4.  "
 "(Alternatively, you can ask the authors of that material to give permission "
 "right away.)"
@@ -375,7 +433,7 @@
 "versão 4. (Alternativamente, você pode pedir aos autores desse material que 
"
 "deem permissão imediatamente.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The ordinary GNU General Public License and the GNU Affero General Public "
 "License are two different copyleft licenses, so they are naturally "
@@ -404,7 +462,7 @@
 "GNU GPL versão 2 comum, porque a GNU Affero GPL e a GNU GPL são duas 
séries "
 "diferentes de licenças."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Lesser General Public License, version 3, is really the GNU General "
 "Public License version 3 plus some added extra permissions.  GPL version 3 "
@@ -423,7 +481,7 @@
 "(N &gt; 3), faremos uma versão LGPL N que consiste na versão GPL N mais "
 "permissões adicionadas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As for GNU Lesser GPL version 2.1, that explicitly permits relicensing to "
 "GNU GPL version 2 or later."
@@ -431,7 +489,7 @@
 "Quanto à GNU Menor GPL versão 2.1, que permite explicitamente o "
 "relicenciamento para o GNU GPL versão 2 ou posterior."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Intermediate licenses are those which have substantive requirements on "
 "redistribution but are not copyleft licenses.  Examples include the Eclipse "
@@ -449,13 +507,24 @@
 "Licença Pública Mozilla permite o relicenciamento para a GNU GPL, exceto "
 "quando o código explicitamente nega essa permissão."
 
-#. type: Content of: <p>
-msgid ""
-"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
-"license is a disjunction: it means that the same program carries a choice of "
-"two or more different licenses.  For instance, older versions of Perl "
-"carried a dual license: the disjunction of the Artistic License and the GNU "
-"General Public License.  This meant that each user could choose to use and "
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
+#| "license is a disjunction: it means that the same program carries a choice "
+#| "of two or more different licenses.  For instance, older versions of Perl "
+#| "carried a dual license: the disjunction of the Artistic License and the "
+#| "GNU General Public License.  This meant that each user could choose to "
+#| "use and redistribute Perl under one license or the other, or under both "
+#| "in disjunction like the Perl release itself.  A disjunction is compatible "
+#| "with a set of other licenses if any one of the license choices in the "
+#| "disjunction is compatible with that set."
+msgid ""
+"Finally, what about dual licensing?<a href=\"#f5\">[5]</a> A dual license is "
+"a disjunction: it means that the same program carries a choice of two or "
+"more different licenses.  For instance, older versions of Perl carried a "
+"dual license: the disjunction of the Artistic License and the GNU General "
+"Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
@@ -471,7 +540,7 @@
 "compatível com um conjunto de outras licenças se qualquer uma das opções 
de "
 "licença na disjunção for compatível com aquele conjunto."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When you choose a license for your code, please choose GNU GPL version 3 or "
 "later, or some license compatible with that.  This is the way to make your "
@@ -486,11 +555,11 @@
 "para defender a liberdade de todos os usuários de todas as versões de seu "
 "código."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Combining code"
 msgstr "Combinando código"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When a set of licenses are compatible, that means you can legally combine or "
 "merge a number of programs each licensed under one of those licenses.  How, "
@@ -500,7 +569,7 @@
 "legalmente combinar ou mesclar uma série de programas, cada um licenciado "
 "sob uma dessas licenças. Como, então, o programa combinado é licenciado?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each free software license says you must keep the license with the code that "
 "is covered by it.  So in a strict sense, the licensing of the combined "
@@ -516,7 +585,7 @@
 "questão de como o programa combinado é licenciado. A quais licenças 
alguém "
 "que usa o programa combinado <em>precisa prestar atenção?</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To compute that, you start with a list of all the pertinent licenses.  Then "
 "you can delete from the list any license which is subsumed by another in the "
@@ -526,7 +595,7 @@
 "pertinentes. Em seguida, você pode excluir da lista qualquer licença "
 "incluída por outra da lista."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We say that a license A <em>subsumes</em> license B when compliance with "
 "license A implies compliance with license B."
@@ -534,7 +603,7 @@
 "Dizemos que uma licença A <em>inclui</em> a licença B quando a conformidade 
"
 "com a licença A implica conformidade com a licença B."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For instance, the GNU GPL version N and the GNU Affero GPL version N both "
 "subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
@@ -543,7 +612,7 @@
 "Por exemplo, a GNU GPL versão N e a GNU Affero GPL versão N incluem a GNU "
 "Menor GPL versão N, e todas as três incluem a GNU Menor GPL versão 2.1."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
 "least 3."
@@ -551,7 +620,7 @@
 "Qualquer licença GNU, versão N, inclui a licença Apache 2.0, desde que N "
 "seja pelo menos 3."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
 "that are compatible with it."
@@ -559,17 +628,22 @@
 "A GNU GPL, versão N, inclui todas as versões da Licença Pública Mozilla 
que "
 "são compatíveis com ela."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 "
+#| "licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume "
+#| "the Expat, X11 and ISC licenses and CC-0."
 msgid ""
 "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
 "BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
-"and ISC licenses and CC-0."
+"and ISC licenses and CC0."
 msgstr ""
 "A licença Apache 2.0 inclui as licenças BSD, Expat, X11, ISC e CC-0. A "
 "cláusula BSD 3 inclui a cláusula BSD 2. As licenças BSD incluem as 
licenças "
 "Expat, X11 e ISC e CC-0."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not meant to be a complete list, but if we are informed of other "
 "cases worth mentioning, we will add them."
@@ -577,7 +651,7 @@
 "Não se trata de uma lista completa, mas se formos informados de outros casos 
"
 "dignos de menção, iremos acrescentá-los."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When some license is subsumed, you still need to include a copy of it with "
 "all distribution of the combined program."
@@ -585,34 +659,45 @@
 "Quando alguma licença é incluída, você ainda precisa incluir uma cópia 
dela "
 "em toda a distribuição do programa combinado."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notas de rodapé"
 
-#. type: Content of: <p>
-msgid ""
-"<b>*</b> It is not inconceivable that other legal issues might arise about a "
-"specific combination of programs, issues not related to the copyright "
-"licenses of the programs to be combined.  We discuss only the implications "
-"of the licenses themselves."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>*</b> It is not inconceivable that other legal issues might arise "
+#| "about a specific combination of programs, issues not related to the "
+#| "copyright licenses of the programs to be combined.  We discuss only the "
+#| "implications of the licenses themselves."
+msgid ""
+"It is not inconceivable that other legal issues might arise about a specific "
+"combination of programs, issues not related to the copyright licenses of the "
+"programs to be combined.  We discuss only the implications of the licenses "
+"themselves."
 msgstr ""
 "<b>*</b> Não é inconcebível que outras questões legais possam surgir 
sobre "
 "uma combinação específica de programas, questões não relacionadas às "
 "licenças de direitos autorais dos programas a serem combinados. Discutimos "
 "apenas as implicações das próprias licenças."
 
-#. type: Content of: <p>
-msgid ""
-"<b>**</b> The main license in actual use that isn't reasonably behaved is "
-"the license of TeX: if two programs are licensed just the way TeX is, there "
-"is no authorized way to distribute a merged version of them."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>**</b> The main license in actual use that isn't reasonably behaved is "
+#| "the license of TeX: if two programs are licensed just the way TeX is, "
+#| "there is no authorized way to distribute a merged version of them."
+msgid ""
+"The main license in actual use that isn't reasonably behaved is the license "
+"of TeX: if two programs are licensed just the way TeX is, there is no "
+"authorized way to distribute a merged version of them."
 msgstr ""
 "<b>**</b> A licença principal em uso real que não é razoavelmente 
comportada "
 "é a licença do TeX: se dois programas são licenciados da mesma forma que o 
"
 "TeX, não existe uma maneira autorizada de distribuir uma versão mesclada "
 "deles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "The TeX license permits distribution of a modified version only in the form "
 "of the original version plus a differences file.  If A and B are separately "
@@ -628,7 +713,7 @@
 "isso como B mais um arquivo de mudanças viola a licença de A. Distribuir "
 "isso de qualquer outra forma viola ambas as licenças."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "It is no coincidence that TeX was released in 1982: our community has "
 "learned, since then, to write reasonably behaved licenses."
@@ -636,25 +721,38 @@
 "Não é coincidência que o TeX tenha sido lançado em 1982: nossa comunidade 
"
 "aprendeu, desde então, a escrever licenças razoavelmente comportadas."
 
-#. type: Content of: <p>
-msgid ""
-"<b>***</b> When distributing in source code form, it is usually sufficient "
-"to leave the license notices in the source code as they stand; extra license "
-"notice requirements typically only come up for lax licenses when "
-"distributing binaries without the source code."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>***</b> When distributing in source code form, it is usually "
+#| "sufficient to leave the license notices in the source code as they stand; "
+#| "extra license notice requirements typically only come up for lax licenses "
+#| "when distributing binaries without the source code."
+msgid ""
+"When distributing in source code form, it is usually sufficient to leave the "
+"license notices in the source code as they stand; extra license notice "
+"requirements typically only come up for lax licenses when distributing "
+"binaries without the source code."
 msgstr ""
 "<b>***</b> Ao distribuir na forma de código-fonte, geralmente é suficiente "
 "deixar os avisos de licença no código-fonte como estão; requisitos extras 
de "
 "aviso de licença normalmente aparecem apenas para licenças lenientes ao "
 "distribuir binários sem o código-fonte."
 
-#. type: Content of: <p>
-msgid ""
-"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
-"nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent.  <a href=\"/licenses/rms-"
-"why-gplv3.html\">We fixed those problems, and others, in version 3</a>, but "
-"we can't change version 2."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>****</b> In addition, GPL version 2 still allows binaries to be made "
+#| "nonfree by hardware that rejects all but special signed binaries, and "
+#| "still does not allow distribution of binaries by torrent.  <a href=\"/"
+#| "licenses/rms-why-gplv3.html\">We fixed those problems, and others, in "
+#| "version 3</a>, but we can't change version 2."
+msgid ""
+"In addition, GPL version 2 still allows binaries to be made nonfree by "
+"hardware that rejects all but special signed binaries, and still does not "
+"allow distribution of binaries by torrent.  <a href=\"/licenses/rms-why-"
+"gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
+"can't change version 2."
 msgstr ""
 "<b>****</b> Além disso, a GPL versão 2 ainda permite que binários se 
tornem "
 "não livres por hardware que rejeita tudo, exceto binários assinados "
@@ -662,13 +760,21 @@
 "href=\"/licenses/rms-why-gplv3.html\">Corrigimos essas e outras coisas na "
 "versão 3</a>, mas não podemos mudar a versão 2."
 
-#. type: Content of: <p>
-msgid ""
-"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
-"selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
-"selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the program "
-"on which the license is sold includes any code that is not in the free "
-"(libre) release, that's not selling exceptions, that's nonfree software."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
+#| "selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
+#| "selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the "
+#| "program on which the license is sold includes any code that is not in the "
+#| "free (libre) release, that's not selling exceptions, that's nonfree "
+#| "software."
+msgid ""
+"Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
+"exceptions, but that is a misnomer.  See <a href=\"/philosophy/selling-"
+"exceptions.html\"> Selling Exceptions</a>.  Note that if the program on "
+"which the license is sold includes any code that is not in the free (libre) "
+"release, that's not selling exceptions, that's nonfree software."
 msgstr ""
 "<b>*****</b> Alguns usam inexplicavelmente o termo “licenciamento duplo” "
 "para se referir a vender exceções, mas isso é um nome impróprio. Consulte 
<a "
@@ -703,14 +809,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 "
@@ -718,12 +824,12 @@
 "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>
-msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -747,6 +853,5 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."

Index: po/license-compatibility.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.ru.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/license-compatibility.ru.po      29 Dec 2021 15:55:36 -0000      1.10
+++ po/license-compatibility.ru.po      29 Dec 2021 16:01:03 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2019-11-20 10:17+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-12-29 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -24,36 +25,53 @@
 "Совместимость лицензий и 
перелицензирование - Проект GNU - Фонд 
свободного "
 "программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "License Compatibility and Relicensing"
 msgstr "Совместимость лицензий и 
перелицензирование"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "Ричард Столмен"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | If you want to combine two free programs into one, or merge code from one
+# | into the other, this raises the question of whether their licenses allow
+# | combining them, or prohibit combining them.<a [-href=\"#f1\">(*)</a>-]
+# | {+href=\"#f1\">[1]</a>+}
+#, fuzzy
+#| msgid ""
+#| "If you want to combine two free programs into one, or merge code from one "
+#| "into the other, this raises the question of whether their licenses allow "
+#| "combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
+"combining them, or prohibit combining them.<a href=\"#f1\">[1]</a>"
 msgstr ""
 "Если вы хотите сложить две свободных 
программы в одну или влить исходный "
 "текст из одной в другую, встает вопрос, 
позволяют ли их лицензии "
 "комбинировать их, или они это запрещают.<a 
href=\"#f1\">(*)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | There is no problem merging programs that have the same license, if it is
+# | a reasonably behaved license, as nearly all free licenses are.<a
+# | [-href=\"#f2\">(**)</a>-] {+href=\"#f2\">[2]</a>+}
+#, fuzzy
+#| msgid ""
+#| "There is no problem merging programs that have the same license, if it is "
+#| "a reasonably behaved license, as nearly all free licenses are.<a href="
+#| "\"#f2\">(**)</a>"
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
-"(**)</a>"
+"[2]</a>"
 msgstr ""
 "Если у программ одна и та же лицензия, 
проблем не возникает, если лицензия "
 "составлена разумно, как почти все 
лицензии свободных программ.<a href="
 "\"#f2\">(**)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What then when the licenses are different? In general we say that several "
 "licenses are <em>compatible</em> if there is a way to merge code under those "
@@ -73,7 +91,7 @@
 "порядке они перечисляются. Множество 
лицензий также диктует требования к "
 "лицензии совмещенной программы."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We divide licenses into three classes: lax (also &ldquo;permissive&rdquo; or "
 "&ldquo;pushover&rdquo;), intermediate, and copyleft.  A lax license does "
@@ -90,7 +108,7 @@
 "Промежуточные лицензии налагают 
некоторые условия на добавление 
несвободных "
 "программ, но не пытаются запрещать это."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, lax permissive licenses (modified BSD, X11, Expat, Apache, "
 "Python, etc.) are compatible with each other.  That's because they have no "
@@ -108,14 +126,28 @@
 "безвольными лицензиями&rdquo;, потому что 
они не говорят &ldquo;нет&rdquo;, "
 "когда один пользователь пытается 
отказать в свободе другим."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | In a combination of programs under lax licenses, each part carries the
+# | license it came with.  When the code is merged to the point that the parts
+# | can't be distinguished any more, that merged code should carry all the
+# | licenses of the merged parts.  Since all the licenses are lax anyway, this
+# | causes no practical problem except that the list of licenses gets long.<a
+# | [-href=\"#f3\">(***)</a>-] {+href=\"#f3\">[3]</a>+}
+#, fuzzy
+#| msgid ""
+#| "In a combination of programs under lax licenses, each part carries the "
+#| "license it came with.  When the code is merged to the point that the "
+#| "parts can't be distinguished any more, that merged code should carry all "
+#| "the licenses of the merged parts.  Since all the licenses are lax anyway, "
+#| "this causes no practical problem except that the list of licenses gets "
+#| "long.<a href=\"#f3\">(***)</a>"
 msgid ""
 "In a combination of programs under lax licenses, each part carries the "
 "license it came with.  When the code is merged to the point that the parts "
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f3\">(***)</a>"
+"href=\"#f3\">[3]</a>"
 msgstr ""
 "В комбинированной программе под 
безвольными лицензиями каждая часть 
остается "
 "под своей лицензией. Когда программы 
сливаются до такой степени, что части "
@@ -124,7 +156,7 @@
 "это не представляет практической 
проблемы, разве что список лицензий "
 "разрастается.<a href=\"#f3\">(***)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the same token, lax licenses are usually compatible with any copyleft "
 "license.  In the combined program, the parts that came in under lax licenses "
@@ -141,7 +173,7 @@
 "поскольку я думаю, что такие пункты 
полезны, я сделал версию&nbsp;3 GPL "
 "совместимой с ними."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one important exception is the original BSD license, because of the "
 "&ldquo;obnoxious advertising clause.&rdquo; This condition required a "
@@ -161,7 +193,7 @@
 "скапливаются программы со сходными, но 
разными требованиями к рекламе. В "
 "какой-то момент дистрибутив BSD требовал 
свыше 70 различных уведомлений."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I mostly eliminated this problem by convincing a dean, Hal Varian, to "
 "arrange for UC Berkeley to publish the &ldquo;modified BSD license&rdquo; "
@@ -178,7 +210,7 @@
 "чтобы <a href=\"/licenses/bsd.html\">не говорить о (&ldquo;"
 "единственной&rdquo;) лицензии BSD</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, two different copyleft licenses are unavoidably incompatible "
 "unless they have explicit compatibility provisions.  This is not due to a "
@@ -201,7 +233,7 @@
 "программы, которая содержит части из П и 
части из Р, должна быть лицензией А "
 "<em>и</em> она должна быть лицензией Б."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is why GPL version 2 is incompatible with GPL version 3; it could not "
 "be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
@@ -213,7 +245,7 @@
 "принципиально несовместимы с условиями 
CC&nbsp;BY-SA&nbsp;3.0, и авторам не "
 "удалось бы этого избежать."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are two approaches for avoiding the incompatibility problem caused by "
 "different versions of copyleft licenses."
@@ -221,14 +253,30 @@
 "Чтобы избежать проблемы несовместимости, 
вызванной разными версиями с "
 "авторским левом, есть два подхода."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The FSF uses the approach of asking people to release programs under
+# | &ldquo;GNU GPL version N or any later version.&rdquo; This licensing is
+# | compatible with version N, and also with N+1 (because it offers version
+# | N+1 as an option).  When you combine code under &ldquo;GPL 3 or
+# | later&rdquo; with code under &ldquo;GPL 2 or [-later&rdquo;,-]
+# | {+later,&rdquo;+} the license of the combination is their intersection,
+# | which is &ldquo;GPL 3 or [-later&rdquo;.-] {+later.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The FSF uses the approach of asking people to release programs under "
+#| "&ldquo;GNU GPL version N or any later version.&rdquo; This licensing is "
+#| "compatible with version N, and also with N+1 (because it offers version N"
+#| "+1 as an option).  When you combine code under &ldquo;GPL 3 or "
+#| "later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license of "
+#| "the combination is their intersection, which is &ldquo;GPL 3 or "
+#| "later&rdquo;."
 msgid ""
 "The FSF uses the approach of asking people to release programs under &ldquo;"
 "GNU GPL version N or any later version.&rdquo; This licensing is compatible "
 "with version N, and also with N+1 (because it offers version N+1 as an "
 "option).  When you combine code under &ldquo;GPL 3 or later&rdquo; with code "
-"under &ldquo;GPL 2 or later&rdquo;, the license of the combination is their "
-"intersection, which is &ldquo;GPL 3 or later&rdquo;."
+"under &ldquo;GPL 2 or later,&rdquo; the license of the combination is their "
+"intersection, which is &ldquo;GPL 3 or later.&rdquo;"
 msgstr ""
 "Подход ФСПО состоит в том, чтобы просить 
людей выпускать программы под "
 "&ldquo;GNU GPL версии N или любой более 
поздней&rdquo;. Это совместимо с "
@@ -238,7 +286,7 @@
 "поздней&rdquo;, лицензия объединенной 
программы является их пересечением, то "
 "есть &ldquo;GPL версии&nbsp;3 или более 
поздней&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We hope we will never need to make a GNU GPL version 4, but nothing is "
 "perfect and we can't assume we have anticipated all the issues.  By "
@@ -250,7 +298,7 @@
 "Выпуская свои программы под GNU GPL 
версии&nbsp;3 или более поздней, вы "
 "разрешаете обновление до GNU GPL версии&nbsp;4, 
если она нам потребуется."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The other approach is to make each version of the license explicitly allow "
 "upgrading to later versions.  The Mozilla Foundation uses this approach, as "
@@ -264,7 +312,7 @@
 "версия&nbsp;4.0 (текущая) любому пользователю 
явным образом разрешено "
 "обновляться до более поздних версий 
CC&nbsp;BY-SA для модифицированных работ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Only the GNU licenses give authors a choice about whether to permit upgrades "
 "to future license versions.  When I wrote the first version of the GNU GPL, "
@@ -281,12 +329,26 @@
 "либо &ldquo;только под GPL версии&nbsp;1&rdquo;, либо 
под &ldquo;GPL "
 "версии&nbsp;1 или более поздней&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Since then, I have come to question the wisdom of that decision.  Programs
+# | such as Linux, which allow only one GNU GPL version and reject license
+# | upgrades, cause practical incompatibility.<a [-href=\"#f4\">(****)</a>-]
+# | {+href=\"#f4\">[4]</a>+} If we ever make a GPL version 4, perhaps we
+# | should include an upgrade clause that automatically permits relicensing to
+# | higher-numbered versions, 5 and up.
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision.  "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> If we ever make a GPL version 4, perhaps we should include an upgrade "
+#| "clause that automatically permits relicensing to higher-numbered "
+#| "versions, 5 and up."
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
-"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">[4]</a> If we ever "
+"make a GPL version 4, perhaps we should include an upgrade clause that "
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 "Прошло время, и я стал сомневаться в 
мудрости этого решения. Такие "
@@ -296,7 +358,7 @@
 "включить пункт об обновлении, который 
автоматически разрешает "
 "перелицензирование на версии с 
повышением номера&nbsp;&mdash; 5 и выше."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses allow cross-copyleft combinations with an explicit "
 "relicensing clause giving permission to put the code under a different "
@@ -316,7 +378,7 @@
 "допустимо и что объединенные программы 
должны распространяться по GPL "
 "версии&nbsp;3 или более поздней."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Explicit relicensing permission is not the same thing as compatibility "
 "(though relicensing code can make it compatible with other code) and it is "
@@ -336,16 +398,35 @@
 "нарушением GPL в отношении программы Б. Эту 
объединенную программу разрешено "
 "выпускать только под GPL соответствующих 
версий."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Likewise, CC[---]{+ +}BY-SA 4.0 explicitly permits relicensing modified
+# | versions to GNU GPL version 3, but GPL version 3 does not permit
+# | relicensing to CC[---]{+ +}BY-SA.  This issue should never arise for
+# | software code; Creative Commons says its licenses are not meant for code,
+# | and says that the license to use for code is the GNU GPL.  But there are
+# | other kinds of works, such as hardware designs or game art, where you
+# | might have occasion to merge material released under CC-BY-SA with
+# | material released under the GNU GPL.  This can be done through CC[---]{+
+# | +}BY-SA's explicit relicensing permission.
+#, fuzzy
+#| msgid ""
+#| "Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions "
+#| "to GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-"
+#| "BY-SA.  This issue should never arise for software code; Creative Commons "
+#| "says its licenses are not meant for code, and says that the license to "
+#| "use for code is the GNU GPL.  But there are other kinds of works, such as "
+#| "hardware designs or game art, where you might have occasion to merge "
+#| "material released under CC-BY-SA with material released under the GNU "
+#| "GPL.  This can be done through CC-BY-SA's explicit relicensing permission."
 msgid ""
-"Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions to "
-"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-BY-"
+"Likewise, CC BY-SA 4.0 explicitly permits relicensing modified versions to "
+"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC BY-"
 "SA.  This issue should never arise for software code; Creative Commons says "
 "its licenses are not meant for code, and says that the license to use for "
 "code is the GNU GPL.  But there are other kinds of works, such as hardware "
 "designs or game art, where you might have occasion to merge material "
 "released under CC-BY-SA with material released under the GNU GPL.  This can "
-"be done through CC-BY-SA's explicit relicensing permission."
+"be done through CC BY-SA's explicit relicensing permission."
 msgstr ""
 "Подобным образом CC&nbsp;BY-SA&nbsp;4.0 явно 
разрешает перелицензирование "
 "измененных версий на GNU GPL версии&nbsp;3, но GPL 
версии&nbsp;3 не "
@@ -358,15 +439,37 @@
 "GPL. Это можно сделать благодаря явному 
разрешению перелицензировать в "
 "CC&nbsp;BY-SA."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Unfortunately, CC[---]{+ +}BY-SA 4.0 does not permit relicensing to future
+# | GPL versions.  What you should do, when you relicense material under
+# | CC[---]{+ +}BY-SA 4.0 to the GPL, is <a
+# | href=\"/licenses/rms-why-gplv3.html#future-proofing\">specify yourself as
+# | a license version proxy</a> to indicate whether future GPL versions have
+# | been authorized for that material.  If someday there is a GPL version 4
+# | and Creative Commons decides to allow relicensing from CC[---]{+ +}BY-SA
+# | to GPL version 4, you as proxy will be able to retroactively authorize use
+# | of that relicensed material under GPL version 4.  (Alternatively, you can
+# | ask the authors of that material to give permission right away.)
+#, fuzzy
+#| msgid ""
+#| "Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
+#| "versions.  What you should do, when you relicense material under CC-BY-SA "
+#| "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
+#| "\">specify yourself as a license version proxy</a> to indicate whether "
+#| "future GPL versions have been authorized for that material.  If someday "
+#| "there is a GPL version 4 and Creative Commons decides to allow "
+#| "relicensing from CC-BY-SA to GPL version 4, you as proxy will be able to "
+#| "retroactively authorize use of that relicensed material under GPL version "
+#| "4.  (Alternatively, you can ask the authors of that material to give "
+#| "permission right away.)"
 msgid ""
-"Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
-"versions.  What you should do, when you relicense material under CC-BY-SA "
+"Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL "
+"versions.  What you should do, when you relicense material under CC BY-SA "
 "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
 "\">specify yourself as a license version proxy</a> to indicate whether "
 "future GPL versions have been authorized for that material.  If someday "
 "there is a GPL version 4 and Creative Commons decides to allow relicensing "
-"from CC-BY-SA to GPL version 4, you as proxy will be able to retroactively "
+"from CC BY-SA to GPL version 4, you as proxy will be able to retroactively "
 "authorize use of that relicensed material under GPL version 4.  "
 "(Alternatively, you can ask the authors of that material to give permission "
 "right away.)"
@@ -382,7 +485,7 @@
 "этого перелицензированного материала.  
(Вместо этого можно также попросить "
 "авторов этого материала непосредственно 
выдать разрешение.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The ordinary GNU General Public License and the GNU Affero General Public "
 "License are two different copyleft licenses, so they are naturally "
@@ -412,7 +515,7 @@
 "версией&rdquo; обычной GNU GPL версии&nbsp;2, 
потому что GNU AGPL и GNU GPL "
 "представляют два различных ряда лицензий."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Lesser General Public License, version 3, is really the GNU General "
 "Public License version 3 plus some added extra permissions.  GPL version 3 "
@@ -433,7 +536,7 @@
 "&gt; 3) мы будем делать LGPL версии&nbsp;N, 
состоящей из GPL версии&nbsp;N с "
 "дополнительными разрешениями."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As for GNU Lesser GPL version 2.1, that explicitly permits relicensing to "
 "GNU GPL version 2 or later."
@@ -441,7 +544,7 @@
 "Что касается GNU LGPL версии&nbsp;2.1, то в ней 
явным образом разрешено "
 "перелицензирование на GNU GPL версии&nbsp;2 или 
более поздней."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Intermediate licenses are those which have substantive requirements on "
 "redistribution but are not copyleft licenses.  Examples include the Eclipse "
@@ -460,13 +563,33 @@
 "Общественная лицензия Mozilla допускает 
перелицензирование на GNU GPL, кроме "
 "случаев, когда в программе это явным 
образом запрещено."
 
-#. type: Content of: <p>
-msgid ""
-"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
-"license is a disjunction: it means that the same program carries a choice of "
-"two or more different licenses.  For instance, older versions of Perl "
-"carried a dual license: the disjunction of the Artistic License and the GNU "
-"General Public License.  This meant that each user could choose to use and "
+#. type: Content of: <div><p>
+# | Finally, what about dual licensing?<a [-href=\"#f5\">(*****)</a>-]
+# | {+href=\"#f5\">[5]</a>+} A dual license is a disjunction: it means that
+# | the same program carries a choice of two or more different licenses.  For
+# | instance, older versions of Perl carried a dual license: the disjunction
+# | of the Artistic License and the GNU General Public License.  This meant
+# | that each user could choose to use and redistribute Perl under one license
+# | or the other, or under both in disjunction like the Perl release itself. 
+# | A disjunction is compatible with a set of other licenses if any one of the
+# | license choices in the disjunction is compatible with that set.
+#, fuzzy
+#| msgid ""
+#| "Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
+#| "license is a disjunction: it means that the same program carries a choice "
+#| "of two or more different licenses.  For instance, older versions of Perl "
+#| "carried a dual license: the disjunction of the Artistic License and the "
+#| "GNU General Public License.  This meant that each user could choose to "
+#| "use and redistribute Perl under one license or the other, or under both "
+#| "in disjunction like the Perl release itself.  A disjunction is compatible "
+#| "with a set of other licenses if any one of the license choices in the "
+#| "disjunction is compatible with that set."
+msgid ""
+"Finally, what about dual licensing?<a href=\"#f5\">[5]</a> A dual license is "
+"a disjunction: it means that the same program carries a choice of two or "
+"more different licenses.  For instance, older versions of Perl carried a "
+"dual license: the disjunction of the Artistic License and the GNU General "
+"Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
@@ -482,7 +605,7 @@
 "других лицензий, если хотя бы одна из 
лицензий в дизъюнкции совместима с "
 "этим набором."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When you choose a license for your code, please choose GNU GPL version 3 or "
 "later, or some license compatible with that.  This is the way to make your "
@@ -497,11 +620,11 @@
 "поздней защитит также свободу всех 
пользователей всех версий вашей программы "
 "наилучшим образом."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Combining code"
 msgstr "Комбинация программ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When a set of licenses are compatible, that means you can legally combine or "
 "merge a number of programs each licensed under one of those licenses.  How, "
@@ -512,7 +635,7 @@
 "лицензирована по одной из этих лицензий. 
Но как тогда лицензируется "
 "комбинированная программа?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each free software license says you must keep the license with the code that "
 "is covered by it.  So in a strict sense, the licensing of the combined "
@@ -528,7 +651,7 @@
 "вопрос, как лицензируется объединенная 
программа. На какие лицензии те, кто "
 "пользуются программой, <em>должны обращать 
внимание</em>?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To compute that, you start with a list of all the pertinent licenses.  Then "
 "you can delete from the list any license which is subsumed by another in the "
@@ -538,7 +661,7 @@
 "Затем из списка можно удалить любые 
лицензии, которые охватываются другими "
 "лицензиями в списке."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We say that a license A <em>subsumes</em> license B when compliance with "
 "license A implies compliance with license B."
@@ -547,7 +670,7 @@
 "удовлетворения условиям лицензии А 
следует, что удовлетворяются условия "
 "лицензии Б."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For instance, the GNU GPL version N and the GNU Affero GPL version N both "
 "subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
@@ -556,7 +679,7 @@
 "Например, и GNU GPL версии N, и GNU GPL Афферо 
версии N охватывают Меньшую "
 "GPL версии N, а все три охватывают Меньшую GPL 
версии 2.1."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
 "least 3."
@@ -564,7 +687,7 @@
 "Любая лицензия GNU версии N охватывает 
лицезнию Apache&nbsp;2.0 при N, не "
 "меньшем 3."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
 "that are compatible with it."
@@ -572,17 +695,25 @@
 "GNU GPL версии N охватывает все версии 
Общественной лицензии Mozilla, "
 "которые с ней совсестимы."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0
+# | licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume
+# | the Expat, X11 and ISC licenses and CC[---]0.
+#, fuzzy
+#| msgid ""
+#| "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 "
+#| "licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume "
+#| "the Expat, X11 and ISC licenses and CC-0."
 msgid ""
 "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
 "BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
-"and ISC licenses and CC-0."
+"and ISC licenses and CC0."
 msgstr ""
 "Лицензия Apache&nbsp;2.0 охватывает лицензии BSD, 
Expat, X11, ISC и СС0. "
 "Трехпунктная BSD охватывает двухпунктную 
BSD. Лицензии BSD охватывают "
 "лицензии Expat, X11 и ISC, а также CC0."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not meant to be a complete list, but if we are informed of other "
 "cases worth mentioning, we will add them."
@@ -590,7 +721,7 @@
 "Список никоим образом не полон, но если мы 
узнаем о других достойных "
 "упоминания случаях, мы их добавим."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When some license is subsumed, you still need to include a copy of it with "
 "all distribution of the combined program."
@@ -599,34 +730,52 @@
 "распространении комбинированной 
программы."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Примечания"
 
-#. type: Content of: <p>
-msgid ""
-"<b>*</b> It is not inconceivable that other legal issues might arise about a "
-"specific combination of programs, issues not related to the copyright "
-"licenses of the programs to be combined.  We discuss only the implications "
-"of the licenses themselves."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>*</b>-]It is not inconceivable that other legal issues might arise
+# | about a specific combination of programs, issues not related to the
+# | copyright licenses of the programs to be combined.  We discuss only the
+# | implications of the licenses themselves.
+#, fuzzy
+#| msgid ""
+#| "<b>*</b> It is not inconceivable that other legal issues might arise "
+#| "about a specific combination of programs, issues not related to the "
+#| "copyright licenses of the programs to be combined.  We discuss only the "
+#| "implications of the licenses themselves."
+msgid ""
+"It is not inconceivable that other legal issues might arise about a specific "
+"combination of programs, issues not related to the copyright licenses of the "
+"programs to be combined.  We discuss only the implications of the licenses "
+"themselves."
 msgstr ""
 "<b>*</b> Маловероятно, что при конкретном 
сочетании программ могут "
 "возникнуть другие юридические проблемы, 
не связанные с лицензиями авторского "
 "права на программы, которые сочетаются. Мы 
обсуждаем только следствия самих "
 "лицензий."
 
-#. type: Content of: <p>
-msgid ""
-"<b>**</b> The main license in actual use that isn't reasonably behaved is "
-"the license of TeX: if two programs are licensed just the way TeX is, there "
-"is no authorized way to distribute a merged version of them."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>**</b>-]The main license in actual use that isn't reasonably behaved
+# | is the license of TeX: if two programs are licensed just the way TeX is,
+# | there is no authorized way to distribute a merged version of them.
+#, fuzzy
+#| msgid ""
+#| "<b>**</b> The main license in actual use that isn't reasonably behaved is "
+#| "the license of TeX: if two programs are licensed just the way TeX is, "
+#| "there is no authorized way to distribute a merged version of them."
+msgid ""
+"The main license in actual use that isn't reasonably behaved is the license "
+"of TeX: if two programs are licensed just the way TeX is, there is no "
+"authorized way to distribute a merged version of them."
 msgstr ""
 "<b>**</b> Главная из применяемых в настоящее 
время лицензий, которая "
 "несовместима сама с собой&nbsp;&mdash; лицензия 
TeXа: если две программы "
 "лицензированы так, как TeX, нет 
разрешенного способа распространять их "
 "объединенную версию."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "The TeX license permits distribution of a modified version only in the form "
 "of the original version plus a differences file.  If A and B are separately "
@@ -642,7 +791,7 @@
 "Распространение ее как Б с файлом 
изменений нарушает лицензию А. "
 "Распространение любым другим образом 
нарушает обе лицензии."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "It is no coincidence that TeX was released in 1982: our community has "
 "learned, since then, to write reasonably behaved licenses."
@@ -650,12 +799,22 @@
 "Не случайно TeX выпустили в 1982&nbsp;году: с тех 
пор наше сообщество "
 "научилось писать разумные лицензии."
 
-#. type: Content of: <p>
-msgid ""
-"<b>***</b> When distributing in source code form, it is usually sufficient "
-"to leave the license notices in the source code as they stand; extra license "
-"notice requirements typically only come up for lax licenses when "
-"distributing binaries without the source code."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>***</b>-]When distributing in source code form, it is usually
+# | sufficient to leave the license notices in the source code as they stand;
+# | extra license notice requirements typically only come up for lax licenses
+# | when distributing binaries without the source code.
+#, fuzzy
+#| msgid ""
+#| "<b>***</b> When distributing in source code form, it is usually "
+#| "sufficient to leave the license notices in the source code as they stand; "
+#| "extra license notice requirements typically only come up for lax licenses "
+#| "when distributing binaries without the source code."
+msgid ""
+"When distributing in source code form, it is usually sufficient to leave the "
+"license notices in the source code as they stand; extra license notice "
+"requirements typically only come up for lax licenses when distributing "
+"binaries without the source code."
 msgstr ""
 "<b>***</b> При распространении в форме исх
одного текста обычно достаточно "
 "оставлять уведомления о лицензиях в исх
одном тексте в том виде, в каком они "
@@ -663,13 +822,25 @@
 "лицензиях, как правило, действуют при 
распространении скомпилированных "
 "файлов без исходного текста."
 
-#. type: Content of: <p>
-msgid ""
-"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
-"nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent.  <a href=\"/licenses/rms-"
-"why-gplv3.html\">We fixed those problems, and others, in version 3</a>, but "
-"we can't change version 2."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>****</b>-]In addition, GPL version 2 still allows binaries to be made
+# | nonfree by hardware that rejects all but special signed binaries, and
+# | still does not allow distribution of binaries by torrent.  <a
+# | href=\"/licenses/rms-why-gplv3.html\">We fixed those problems, and others,
+# | in version 3</a>, but we can't change version 2.
+#, fuzzy
+#| msgid ""
+#| "<b>****</b> In addition, GPL version 2 still allows binaries to be made "
+#| "nonfree by hardware that rejects all but special signed binaries, and "
+#| "still does not allow distribution of binaries by torrent.  <a href=\"/"
+#| "licenses/rms-why-gplv3.html\">We fixed those problems, and others, in "
+#| "version 3</a>, but we can't change version 2."
+msgid ""
+"In addition, GPL version 2 still allows binaries to be made nonfree by "
+"hardware that rejects all but special signed binaries, and still does not "
+"allow distribution of binaries by torrent.  <a href=\"/licenses/rms-why-"
+"gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
+"can't change version 2."
 msgstr ""
 "<b>****</b> В дополнение, GPL версии&nbsp;2 все же 
позволяет делать двоичные "
 "файлы несвободными с помощью аппаратуры, 
которая работает только со "
@@ -678,13 +849,27 @@
 "rms-why-gplv3.html\">В&nbsp;версии&nbsp;3 мы исправили 
это и кое-что другое</"
 "a>, но мы не можем изменить версию&nbsp;2."
 
-#. type: Content of: <p>
-msgid ""
-"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
-"selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
-"selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the program "
-"on which the license is sold includes any code that is not in the free "
-"(libre) release, that's not selling exceptions, that's nonfree software."
+#. type: Content of: <div><ol><li><p>
+# | [-<b>*****</b>-]Some use the term &ldquo;dual licensing&rdquo; to refer to
+# | selling exceptions, but that is a misnomer.  See <a
+# | href=\"/philosophy/selling-exceptions.html\"> Selling Exceptions</a>. 
+# | Note that if the program on which the license is sold includes any code
+# | that is not in the free (libre) release, that's not selling exceptions,
+# | that's nonfree software.
+#, fuzzy
+#| msgid ""
+#| "<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
+#| "selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
+#| "selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the "
+#| "program on which the license is sold includes any code that is not in the "
+#| "free (libre) release, that's not selling exceptions, that's nonfree "
+#| "software."
+msgid ""
+"Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
+"exceptions, but that is a misnomer.  See <a href=\"/philosophy/selling-"
+"exceptions.html\"> Selling Exceptions</a>.  Note that if the program on "
+"which the license is sold includes any code that is not in the free (libre) "
+"release, that's not selling exceptions, that's nonfree software."
 msgstr ""
 "<b>*****</b> Некоторые употребляют выражение 
&ldquo;двойное "
 "лицензирование&rdquo; для обозначения 
продажи исключений, но это неправльное "
@@ -721,14 +906,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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -740,8 +931,8 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -770,9 +961,8 @@
 msgstr "Обновлено:"
 
 # type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
 
 # type: Content of: <div><p>
 #~ msgid "Copyright &copy; 2016 Free Software Foundation, Inc."

Index: po/license-compatibility.tr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.tr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/license-compatibility.tr.po      29 Dec 2021 15:55:36 -0000      1.3
+++ po/license-compatibility.tr.po      29 Dec 2021 16:01:03 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2021-02-14 18:27+0100\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-12-29 15:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
@@ -24,36 +25,46 @@
 msgstr ""
 "Lisans Uyumluluğu ve Yeniden Lisanslama - GNU Projesi - Özgür Yazılım 
Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "License Compatibility and Relicensing"
 msgstr "Lisans Uyumluluğu ve Yeniden Lisanslama"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "yazan Richard Stallman"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to combine two free programs into one, or merge code from one "
+#| "into the other, this raises the question of whether their licenses allow "
+#| "combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
+"combining them, or prohibit combining them.<a href=\"#f1\">[1]</a>"
 msgstr ""
 "Eğer iki özgür programı tek bir program olarak birleştirmek veya 
birinden "
 "diğerine kod aktarmak istiyorsanız, bu durum lisanslarının onları "
 "birleştirmeye izin verip vermediğini veya birleştirmeyi engelleyip "
 "engellemediği sorusunu ortaya çıkarır.<a href=\"#f1\">(*)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There is no problem merging programs that have the same license, if it is "
+#| "a reasonably behaved license, as nearly all free licenses are.<a href="
+#| "\"#f2\">(**)</a>"
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
-"(**)</a>"
+"[2]</a>"
 msgstr ""
 "Eğer birleştirilecek programlar aynı lisansa sahipse, eğer, neredeyse 
bütün "
 "özgür lisansların olduğu gibi, akla uygun davranan bir lisanssa bir sorun 
"
 "yoktur.<a href=\"#f2\">(**)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What then when the licenses are different? In general we say that several "
 "licenses are <em>compatible</em> if there is a way to merge code under those "
@@ -73,7 +84,7 @@
 "söylediğinize bağlı değildir. Lisans kümesi ayrıca birleştirilen 
program "
 "için hangi lisansın gerektiğini de düzenler."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We divide licenses into three classes: lax (also &ldquo;permissive&rdquo; or "
 "&ldquo;pushover&rdquo;), intermediate, and copyleft.  A lax license does "
@@ -90,7 +101,7 @@
 "geçer. Ara lisans özel mülk kod koymaya ilişkin bazı koşullar sunar ama 
"
 "bunun önüne geçmeye çalışmaz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, lax permissive licenses (modified BSD, X11, Expat, Apache, "
 "Python, etc.) are compatible with each other.  That's because they have no "
@@ -108,14 +119,22 @@
 "çünkü bir kullanıcı diğerlerinin özgürlüğünü engellemeye 
çalıştığında &ldquo;"
 "hayır&rdquo; diyemiyorlar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In a combination of programs under lax licenses, each part carries the "
+#| "license it came with.  When the code is merged to the point that the "
+#| "parts can't be distinguished any more, that merged code should carry all "
+#| "the licenses of the merged parts.  Since all the licenses are lax anyway, "
+#| "this causes no practical problem except that the list of licenses gets "
+#| "long.<a href=\"#f3\">(***)</a>"
 msgid ""
 "In a combination of programs under lax licenses, each part carries the "
 "license it came with.  When the code is merged to the point that the parts "
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f3\">(***)</a>"
+"href=\"#f3\">[3]</a>"
 msgstr ""
 "Esnek lisanslar altındaki programların birleşiminde, her bir kısım ilk "
 "baştaki lisanslarının altında kalır. Kod, parçaların birbirinden 
artık ayırt "
@@ -124,7 +143,7 @@
 "bu lisanslar esnek olduğu için, bu durum, lisansların oldukça uzaması "
 "dışında herhangi bir pratik sorun yaratmaz.<a href=\"#f3\">(***)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the same token, lax licenses are usually compatible with any copyleft "
 "license.  In the combined program, the parts that came in under lax licenses "
@@ -141,7 +160,7 @@
 "şartlarının iyi olduğunu düşündüğüm için, GPL sürüm 3'ü onlarla 
uyumlu "
 "yaptım."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one important exception is the original BSD license, because of the "
 "&ldquo;obnoxious advertising clause.&rdquo; This condition required a "
@@ -160,7 +179,7 @@
 "çünkü programlar benzer ama farklı tanıtım gereksinimleri 
biriktiriyordu. "
 "Bir noktada BSD dağıtımı 70 farklı bildirim gerektiriyordu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I mostly eliminated this problem by convincing a dean, Hal Varian, to "
 "arrange for UC Berkeley to publish the &ldquo;modified BSD license&rdquo; "
@@ -177,7 +196,7 @@
 "ancak <a href=\"/licenses/bsd.html\">&ldquo;BSD lisansı&rdquo; hakkında "
 "konuşmama</a> konusunda özen göstermeliyiz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, two different copyleft licenses are unavoidably incompatible "
 "unless they have explicit compatibility provisions.  This is not due to a "
@@ -199,7 +218,7 @@
 "uzlaşmazlıkları var demektir; hem P'den hem de Q'dan kod içeren "
 "birleştirilmiş programın lisansı hem A olmalıdır <em>hem de</em> B 
olmalıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is why GPL version 2 is incompatible with GPL version 3; it could not "
 "be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
@@ -210,7 +229,7 @@
 "şekilde CC-BY-SA 4.0'ın koşulları da CC-BY-SA 3.0'ın koşullarıyla 
doğası "
 "gereği uyumsuz olacaktır, yazarları bundan kaçınamazlardı."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are two approaches for avoiding the incompatibility problem caused by "
 "different versions of copyleft licenses."
@@ -218,14 +237,23 @@
 "Farklı copyleft lisanslarından kaynaklanan uyumsuzluk sorunundan kaçınmak 
"
 "için iki yaklaşım var."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The FSF uses the approach of asking people to release programs under "
+#| "&ldquo;GNU GPL version N or any later version.&rdquo; This licensing is "
+#| "compatible with version N, and also with N+1 (because it offers version N"
+#| "+1 as an option).  When you combine code under &ldquo;GPL 3 or "
+#| "later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license of "
+#| "the combination is their intersection, which is &ldquo;GPL 3 or "
+#| "later&rdquo;."
 msgid ""
 "The FSF uses the approach of asking people to release programs under &ldquo;"
 "GNU GPL version N or any later version.&rdquo; This licensing is compatible "
 "with version N, and also with N+1 (because it offers version N+1 as an "
 "option).  When you combine code under &ldquo;GPL 3 or later&rdquo; with code "
-"under &ldquo;GPL 2 or later&rdquo;, the license of the combination is their "
-"intersection, which is &ldquo;GPL 3 or later&rdquo;."
+"under &ldquo;GPL 2 or later,&rdquo; the license of the combination is their "
+"intersection, which is &ldquo;GPL 3 or later.&rdquo;"
 msgstr ""
 "FSF, insanlardan programları &ldquo;GNU GPL sürüm N veya sonraki bir "
 "sürüm&rdquo; altında yayınlamalarını isteme yaklaşımını 
kullanıyor. Bu "
@@ -235,7 +263,7 @@
 "birleştirdiğinizde, birleşimin lisansı kesişimleri olur, bu da 
&ldquo;GPL 3 "
 "veya sonraki&rdquo; lisansıdır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We hope we will never need to make a GNU GPL version 4, but nothing is "
 "perfect and we can't assume we have anticipated all the issues.  By "
@@ -248,7 +276,7 @@
 "ihtiyacımız olur da çıkarırsak, GNU GPL sürüm 4'e yükseltilmesine 
izin "
 "vermiş oluyorsunuz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The other approach is to make each version of the license explicitly allow "
 "upgrading to later versions.  The Mozilla Foundation uses this approach, as "
@@ -262,7 +290,7 @@
 "sürüm 4.0 (mevcut sürüm) herhangi bir kullanıcıya değiştirilmiş 
çalışmalar "
 "için CC-BY-SA'nın sonraki sürümlerine yükseltmesine açıkça izin 
verir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Only the GNU licenses give authors a choice about whether to permit upgrades "
 "to future license versions.  When I wrote the first version of the GNU GPL, "
@@ -279,12 +307,20 @@
 "1&rdquo; [<em>GPL 1 only</em>] isterse de &ldquo;GPL 1 veya sonrası&rdquo; "
 "[<em>GPL 1 or later</em>] altında yayınlayabilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision.  "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> If we ever make a GPL version 4, perhaps we should include an upgrade "
+#| "clause that automatically permits relicensing to higher-numbered "
+#| "versions, 5 and up."
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
-"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">[4]</a> If we ever "
+"make a GPL version 4, perhaps we should include an upgrade clause that "
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 "O zamandan beri, bu kararın bilgeliğini sorgulamaya vardım. Sadece tek bir 
"
@@ -294,7 +330,7 @@
 "gibi daha büyük sürümlere yeniden lisanslamaya izin veren bir yükseltme "
 "koşulu eklemeliyiz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses allow cross-copyleft combinations with an explicit "
 "relicensing clause giving permission to put the code under a different "
@@ -313,7 +349,7 @@
 "birleşimi veya eklenmiş kodu GPL sürüm 3 veya sonrası altına "
 "koyabileceğinizi söylüyor."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Explicit relicensing permission is not the same thing as compatibility "
 "(though relicensing code can make it compatible with other code) and it is "
@@ -333,16 +369,26 @@
 "Bu birleştirilmiş programı yayınlamanın tek izin verilen yolu, onu uygun 
GPL "
 "sürüm(leri) altında yayınlamaktır."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions "
+#| "to GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-"
+#| "BY-SA.  This issue should never arise for software code; Creative Commons "
+#| "says its licenses are not meant for code, and says that the license to "
+#| "use for code is the GNU GPL.  But there are other kinds of works, such as "
+#| "hardware designs or game art, where you might have occasion to merge "
+#| "material released under CC-BY-SA with material released under the GNU "
+#| "GPL.  This can be done through CC-BY-SA's explicit relicensing permission."
 msgid ""
-"Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions to "
-"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-BY-"
+"Likewise, CC BY-SA 4.0 explicitly permits relicensing modified versions to "
+"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC BY-"
 "SA.  This issue should never arise for software code; Creative Commons says "
 "its licenses are not meant for code, and says that the license to use for "
 "code is the GNU GPL.  But there are other kinds of works, such as hardware "
 "designs or game art, where you might have occasion to merge material "
 "released under CC-BY-SA with material released under the GNU GPL.  This can "
-"be done through CC-BY-SA's explicit relicensing permission."
+"be done through CC BY-SA's explicit relicensing permission."
 msgstr ""
 "Aynı şekilde, CC-BY-SA 4.0 açık bir şekilde değiştirilmiş 
sürümlerin GNU GPL "
 "sürüm 3 altında yeniden lisanslanmasına izin verir, ancak GPL sürüm 3 
CC-BY-"
@@ -354,15 +400,27 @@
 "tasarımları veya oyun sanat eserleri gibi başka tür çalışmalar da var. 
Bu "
 "birleştirme CC-BY-SA'nın açık yeniden lisanslama izniyle yapılabilir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
+#| "versions.  What you should do, when you relicense material under CC-BY-SA "
+#| "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
+#| "\">specify yourself as a license version proxy</a> to indicate whether "
+#| "future GPL versions have been authorized for that material.  If someday "
+#| "there is a GPL version 4 and Creative Commons decides to allow "
+#| "relicensing from CC-BY-SA to GPL version 4, you as proxy will be able to "
+#| "retroactively authorize use of that relicensed material under GPL version "
+#| "4.  (Alternatively, you can ask the authors of that material to give "
+#| "permission right away.)"
 msgid ""
-"Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
-"versions.  What you should do, when you relicense material under CC-BY-SA "
+"Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL "
+"versions.  What you should do, when you relicense material under CC BY-SA "
 "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
 "\">specify yourself as a license version proxy</a> to indicate whether "
 "future GPL versions have been authorized for that material.  If someday "
 "there is a GPL version 4 and Creative Commons decides to allow relicensing "
-"from CC-BY-SA to GPL version 4, you as proxy will be able to retroactively "
+"from CC BY-SA to GPL version 4, you as proxy will be able to retroactively "
 "authorize use of that relicensed material under GPL version 4.  "
 "(Alternatively, you can ask the authors of that material to give permission "
 "right away.)"
@@ -378,7 +436,7 @@
 "dönük olarak yetki verebileceksiniz. (Alternatif olarak, bu malzemenin "
 "yazarlarından bu izni hemen vermelerini isteyebilirsiniz.)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The ordinary GNU General Public License and the GNU Affero General Public "
 "License are two different copyleft licenses, so they are naturally "
@@ -407,7 +465,7 @@
 "2'nin &ldquo;sonraki sürümü&rdquo; değildir, çünkü GNU Affero GPL ve 
GNU GPL "
 "iki farklı lisans dizisidir."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Lesser General Public License, version 3, is really the GNU General "
 "Public License version 3 plus some added extra permissions.  GPL version 3 "
@@ -425,7 +483,7 @@
 "altında yeniden lisanslayabilirsiniz; gelecekte her bir GPL sürüm N (N 
&gt; "
 "3) için, GPL sürüm N artı ek izinlerden oluşan bir LGPL sürüm N 
yapacağız."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As for GNU Lesser GPL version 2.1, that explicitly permits relicensing to "
 "GNU GPL version 2 or later."
@@ -433,7 +491,7 @@
 "GNU Kısıtlı GPL sürüm 2.1 de, GNU GPL sürüm 2 veya sonrasına yeniden "
 "lisanslamaya açıkça izin veriyor."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Intermediate licenses are those which have substantive requirements on "
 "redistribution but are not copyleft licenses.  Examples include the Eclipse "
@@ -451,13 +509,24 @@
 "açıkça bu izni reddetmediği sürece, GNU GPL altında yeniden 
lisanslamaya "
 "izin veriyor."
 
-#. type: Content of: <p>
-msgid ""
-"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
-"license is a disjunction: it means that the same program carries a choice of "
-"two or more different licenses.  For instance, older versions of Perl "
-"carried a dual license: the disjunction of the Artistic License and the GNU "
-"General Public License.  This meant that each user could choose to use and "
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
+#| "license is a disjunction: it means that the same program carries a choice "
+#| "of two or more different licenses.  For instance, older versions of Perl "
+#| "carried a dual license: the disjunction of the Artistic License and the "
+#| "GNU General Public License.  This meant that each user could choose to "
+#| "use and redistribute Perl under one license or the other, or under both "
+#| "in disjunction like the Perl release itself.  A disjunction is compatible "
+#| "with a set of other licenses if any one of the license choices in the "
+#| "disjunction is compatible with that set."
+msgid ""
+"Finally, what about dual licensing?<a href=\"#f5\">[5]</a> A dual license is "
+"a disjunction: it means that the same program carries a choice of two or "
+"more different licenses.  For instance, older versions of Perl carried a "
+"dual license: the disjunction of the Artistic License and the GNU General "
+"Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
@@ -472,7 +541,7 @@
 "geliyor. Bir ayrışım, bu ayrışımdaki lisans seçeneklerinden biri bir 
küme "
 "ile uyumlu ise, ayrışımın kendisi de bu diğer lisans kümesiyle 
uyumludur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When you choose a license for your code, please choose GNU GPL version 3 or "
 "later, or some license compatible with that.  This is the way to make your "
@@ -487,11 +556,11 @@
 "kullanıcılarının özgürlüğünü savunmak için elden gelenin en 
iyisinin "
 "yapılmasını sağlayacaktır."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Combining code"
 msgstr "Kod birleştirme"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When a set of licenses are compatible, that means you can legally combine or "
 "merge a number of programs each licensed under one of those licenses.  How, "
@@ -502,7 +571,7 @@
 "demektir. Peki böyle bir durumda birleştirilen program nasıl "
 "lisanslanmaktadır?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each free software license says you must keep the license with the code that "
 "is covered by it.  So in a strict sense, the licensing of the combined "
@@ -518,7 +587,7 @@
 "em> yanıt isterseniz. Birleşmiş programı kullanan birisi hangi lisanslara 
"
 "<em>dikkat etmelidir?</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To compute that, you start with a list of all the pertinent licenses.  Then "
 "you can delete from the list any license which is subsumed by another in the "
@@ -528,7 +597,7 @@
 "Daha sonra bu listeden başka lisans tarafından kapsanan [<em>subsume</em>] "
 "herhangi bir lisansı silebilirsiniz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We say that a license A <em>subsumes</em> license B when compliance with "
 "license A implies compliance with license B."
@@ -536,7 +605,7 @@
 "A lisansıyla uyum, B lisansıyla uyuma işaret ettiğinde A lisansı B 
lisansını "
 "<em>kapsar</em> diyoruz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For instance, the GNU GPL version N and the GNU Affero GPL version N both "
 "subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
@@ -546,7 +615,7 @@
 "Kısıtlı GPL sürüm N'yi kapsar ve bunların üçü de GNU Kısıtlı 
sürüm 2.1'i "
 "kapsar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
 "least 3."
@@ -554,7 +623,7 @@
 "Herhangi bir GNU lisansı sürüm N, N'nin en az 3 olması koşuluyla Apache 
2.0 "
 "lisansını kapsar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
 "that are compatible with it."
@@ -562,17 +631,22 @@
 "GNU GPL sürüm N, kendisiyle uyumlu olan bütün Mozilla Kamu Lisansı "
 "sürümlerinin tümünü kapsar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 "
+#| "licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume "
+#| "the Expat, X11 and ISC licenses and CC-0."
 msgid ""
 "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
 "BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
-"and ISC licenses and CC-0."
+"and ISC licenses and CC0."
 msgstr ""
 "Apache 2.0 lisansı BSD, Expat, X11, ISC ve CC-0 lisanslarını kapsar. 3 "
 "şartlı BSD lisansı BSD 2 lisansını kapsar. BSD lisansları Expat, X11 ve 
ISC "
 "lisansları ve CC-0'ı kapsar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not meant to be a complete list, but if we are informed of other "
 "cases worth mentioning, we will add them."
@@ -580,7 +654,7 @@
 "Bu tam bir liste değildir, ancak eğer değinmenin yararlı olduğu 
düşünülen "
 "örnekler varsa, onları da ekleyeceğiz."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When some license is subsumed, you still need to include a copy of it with "
 "all distribution of the combined program."
@@ -588,33 +662,44 @@
 "Bazı lisanslar kapsandığında, tüm birleştirilmiş program 
dağıtımlarıyla "
 "birlikte bir kopyasını içermeniz gerekmektedir."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Dipnotlar"
 
-#. type: Content of: <p>
-msgid ""
-"<b>*</b> It is not inconceivable that other legal issues might arise about a "
-"specific combination of programs, issues not related to the copyright "
-"licenses of the programs to be combined.  We discuss only the implications "
-"of the licenses themselves."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>*</b> It is not inconceivable that other legal issues might arise "
+#| "about a specific combination of programs, issues not related to the "
+#| "copyright licenses of the programs to be combined.  We discuss only the "
+#| "implications of the licenses themselves."
+msgid ""
+"It is not inconceivable that other legal issues might arise about a specific "
+"combination of programs, issues not related to the copyright licenses of the "
+"programs to be combined.  We discuss only the implications of the licenses "
+"themselves."
 msgstr ""
 "<b>*</b> Programların belirli bir birleşiminden, birleştirilen 
programların "
 "telif hakkı lisanslarıyla ilişkili olmayan sorunlar, başka yasal 
sorunların "
 "ortaya çıkabileceği akla sığmaz değildir. Biz yalnızca lisansların "
 "kendilerinden kaynaklanan sonuçları tartışıyoruz."
 
-#. type: Content of: <p>
-msgid ""
-"<b>**</b> The main license in actual use that isn't reasonably behaved is "
-"the license of TeX: if two programs are licensed just the way TeX is, there "
-"is no authorized way to distribute a merged version of them."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>**</b> The main license in actual use that isn't reasonably behaved is "
+#| "the license of TeX: if two programs are licensed just the way TeX is, "
+#| "there is no authorized way to distribute a merged version of them."
+msgid ""
+"The main license in actual use that isn't reasonably behaved is the license "
+"of TeX: if two programs are licensed just the way TeX is, there is no "
+"authorized way to distribute a merged version of them."
 msgstr ""
 "<b>**</b> Fiili olarak kullanılan ve akla uygun şekilde davranmayan 
başlıca "
 "lisans TeX'in lisansıdır: eğer iki program tam da TeX gibi lisanslıysa, "
 "birleştirilmiş sürümlerini dağıtmanın yetki verilmiş bir yolu yoktur."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "The TeX license permits distribution of a modified version only in the form "
 "of the original version plus a differences file.  If A and B are separately "
@@ -631,7 +716,7 @@
 "ihlal edecek. Bunu başka bir şekilde dağıtmaksa her ikisinin lisansını 
ihlal "
 "edecek."
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "It is no coincidence that TeX was released in 1982: our community has "
 "learned, since then, to write reasonably behaved licenses."
@@ -639,25 +724,38 @@
 "TeX'in 1982'de yayınlanması bir tesadüf değil: topluluğumuz o günden 
beri "
 "akla uygun davranan lisanslar yazmayı öğrendi."
 
-#. type: Content of: <p>
-msgid ""
-"<b>***</b> When distributing in source code form, it is usually sufficient "
-"to leave the license notices in the source code as they stand; extra license "
-"notice requirements typically only come up for lax licenses when "
-"distributing binaries without the source code."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>***</b> When distributing in source code form, it is usually "
+#| "sufficient to leave the license notices in the source code as they stand; "
+#| "extra license notice requirements typically only come up for lax licenses "
+#| "when distributing binaries without the source code."
+msgid ""
+"When distributing in source code form, it is usually sufficient to leave the "
+"license notices in the source code as they stand; extra license notice "
+"requirements typically only come up for lax licenses when distributing "
+"binaries without the source code."
 msgstr ""
 "<b>***</b> Kaynak dosyası biçiminde dağıtırken, genellikle lisans "
 "bildirimlerini bulundukları haliyle kaynak kodu içerisinde bırakmak "
 "yeterlidir; ek lisans bildirim gereksinimleri esnek lisanslarda kaynak kod "
 "olmadan sadece ikili dosyalar dağıtılıyorsa ortaya çıkıyor."
 
-#. type: Content of: <p>
-msgid ""
-"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
-"nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent.  <a href=\"/licenses/rms-"
-"why-gplv3.html\">We fixed those problems, and others, in version 3</a>, but "
-"we can't change version 2."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>****</b> In addition, GPL version 2 still allows binaries to be made "
+#| "nonfree by hardware that rejects all but special signed binaries, and "
+#| "still does not allow distribution of binaries by torrent.  <a href=\"/"
+#| "licenses/rms-why-gplv3.html\">We fixed those problems, and others, in "
+#| "version 3</a>, but we can't change version 2."
+msgid ""
+"In addition, GPL version 2 still allows binaries to be made nonfree by "
+"hardware that rejects all but special signed binaries, and still does not "
+"allow distribution of binaries by torrent.  <a href=\"/licenses/rms-why-"
+"gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
+"can't change version 2."
 msgstr ""
 "<b>****</b> Ek olarak, GPL sürüm 2 hala ikili dosyaların, özel 
imzalanmış "
 "ikililer dışındaki her şeyi geri çeviren donanımlar tarafından özgür 
"
@@ -665,13 +763,21 @@
 "izin vermiyor. Sürüm 2'yi değiştiremeyiz ama <a href=\"/licenses/rms-why-"
 "gplv3.html\">bu ve başka sorunları sürüm 3'te düzelttik</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
-"selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
-"selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the program "
-"on which the license is sold includes any code that is not in the free "
-"(libre) release, that's not selling exceptions, that's nonfree software."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
+#| "selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
+#| "selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the "
+#| "program on which the license is sold includes any code that is not in the "
+#| "free (libre) release, that's not selling exceptions, that's nonfree "
+#| "software."
+msgid ""
+"Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
+"exceptions, but that is a misnomer.  See <a href=\"/philosophy/selling-"
+"exceptions.html\"> Selling Exceptions</a>.  Note that if the program on "
+"which the license is sold includes any code that is not in the free (libre) "
+"release, that's not selling exceptions, that's nonfree software."
 msgstr ""
 "<b>*****</b> Bazıları satış istisnaları için &ldquo;ikili 
lisanslama&rdquo; "
 "[<em>dual licensing</em>] terimini kullanıyor, ancak bu yanlış bir "
@@ -706,14 +812,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 "
@@ -727,8 +838,8 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -754,9 +865,8 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
 
 #~ msgid ""
 #~ "Available under the <a rel=\"license\" href=\"https://creativecommons.org/";

Index: po/license-compatibility.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/license-compatibility.zh-cn.po   29 Dec 2021 15:55:36 -0000      1.8
+++ po/license-compatibility.zh-cn.po   29 Dec 2021 16:01:03 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2021-12-29 15:55+0000\n"
 "PO-Revision-Date: 2020-11-24 10:01+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@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-12-29 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -21,33 +22,43 @@
 "Foundation"
 msgstr "许可证兼容性和再次授权 - GNU 工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "License Compatibility and Relicensing"
 msgstr "许可证兼容性和再次授权"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "Richard Stallman 著"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to combine two free programs into one, or merge code from one "
+#| "into the other, this raises the question of whether their licenses allow "
+#| "combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
+"combining them, or prohibit combining them.<a href=\"#f1\">[1]</a>"
 msgstr ""
 "如果你要把两个自由程序合而为一,或者把其中之一的代ç 
å¹¶å…¥å¦ä¸€ä¸ªï¼Œé‚£ä¹ˆå°±ä¼šæœ‰ä¸€"
 "个它们的许可证是否允许/禁止这样做的问题。<a 
href=\"#f1\">(*)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "There is no problem merging programs that have the same license, if it is "
+#| "a reasonably behaved license, as nearly all free licenses are.<a href="
+#| "\"#f2\">(**)</a>"
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
-"(**)</a>"
+"[2]</a>"
 msgstr ""
 "如果两个软件使用同æ 
·çš„许可证,应该没有问题,假定该许可证象几
乎所有的自由软件"
 "许可证一样顺理成章。<a href=\"#f2\">(**)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What then when the licenses are different? In general we say that several "
 "licenses are <em>compatible</em> if there is a way to merge code under those "
@@ -64,7 +75,7 @@
 "或者没有此å…
¼å®¹æ€§ï¼Œæ˜¯è®¸å¯è¯ç»„合在一起的特点,这个特点并不依赖于你
使用它们的顺"
 "序。该许可证组合还决定着该合并程序需要哪个许可证。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We divide licenses into three classes: lax (also &ldquo;permissive&rdquo; or "
 "&ldquo;pushover&rdquo;), intermediate, and copyleft.  A lax license does "
@@ -78,7 +89,7 @@
 "copyleft 许可证禁止专有软件使用其代ç 
ï¼Œå®ƒæ˜Žç¡®è¦æ±‚所有使用其代码的程序都要使用"
 "同æ 
·çš„许可证。中间型许可证限制但并不禁止专有软件使用å…
¶ä»£ç ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, lax permissive licenses (modified BSD, X11, Expat, Apache, "
 "Python, etc.) are compatible with each other.  That's because they have no "
@@ -93,21 +104,29 @@
 "有修改)添加到专有软件之中;因此,我们称之为 
&ldquo;顺从型许可证&rdquo;,理由"
 "是它们在用户的自由被否定时没有说 &ldquo;不&rdquo;。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "In a combination of programs under lax licenses, each part carries the "
+#| "license it came with.  When the code is merged to the point that the "
+#| "parts can't be distinguished any more, that merged code should carry all "
+#| "the licenses of the merged parts.  Since all the licenses are lax anyway, "
+#| "this causes no practical problem except that the list of licenses gets "
+#| "long.<a href=\"#f3\">(***)</a>"
 msgid ""
 "In a combination of programs under lax licenses, each part carries the "
 "license it came with.  When the code is merged to the point that the parts "
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f3\">(***)</a>"
+"href=\"#f3\">[3]</a>"
 msgstr ""
 "在把使用松散型许可证的代ç 
åˆåœ¨ä¸€èµ·æ—¶ï¼Œç»„合程序的每个部分都带有自己的许可证。"
 "当这些代码交织在一起无
法分辨时,组合程序应该带上所有代ç 
çš„许可证。由于这些许"
 "可证都是松散型的,所以å…
¨éƒ½å¸¦ä¸Šé™¤äº†å¤ªé•¿ä¹‹å¤–也没有别的问题。<a href=\"#f3\">"
 "(***)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By the same token, lax licenses are usually compatible with any copyleft "
 "license.  In the combined program, the parts that came in under lax licenses "
@@ -121,7 +140,7 @@
 "松散型许可证,Apache 2.0,带有和 GPL v2 不å…
¼å®¹çš„专利条款;由于我认为这些专利"
 "条款还不错,所以我让 GPL v3 与之兼容了。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The one important exception is the original BSD license, because of the "
 "&ldquo;obnoxious advertising clause.&rdquo; This condition required a "
@@ -139,7 +158,7 @@
 "个发行版都忍受着一种如芒在背的痛苦。有段时间,一个 
BSD 发行版需要包含 70 多个"
 "不同的声明。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "I mostly eliminated this problem by convincing a dean, Hal Varian, to "
 "arrange for UC Berkeley to publish the &ldquo;modified BSD license&rdquo; "
@@ -154,7 +173,7 @@
 "须小心 <a href=\"/licenses/bsd.html\">避免讨论 &ldquo;该&rdquo; BSD 
许可证</"
 "a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In general, two different copyleft licenses are unavoidably incompatible "
 "unless they have explicit compatibility provisions.  This is not due to a "
@@ -173,7 +192,7 @@
 "间就是不可调和;如果合并程序包含 A 和 B 的代ç 
ï¼Œé‚£ä¹ˆåˆå¹¶ç¨‹åºçš„许可证必须是"
 "甲,<em>也</em>必须是乙。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is why GPL version 2 is incompatible with GPL version 3; it could not "
 "be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
@@ -183,20 +202,29 @@
 "这就是为什么 GPL v2 和 GPL v3 不兼容;这个无法避免。同æ 
·åœ°ï¼ŒCC-BY-SA 4.0 的条"
 "件也天然不兼容 CC-BY-SA 3.0 的条件,其作者也无法避å…
è¿™ä¸€ç‚¹ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are two approaches for avoiding the incompatibility problem caused by "
 "different versions of copyleft licenses."
 msgstr "有两个方法来摆脱不同版本 copyleft 许可证带来的å…
ˆå¤©ä¸å…¼å®¹æ€§ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The FSF uses the approach of asking people to release programs under "
+#| "&ldquo;GNU GPL version N or any later version.&rdquo; This licensing is "
+#| "compatible with version N, and also with N+1 (because it offers version N"
+#| "+1 as an option).  When you combine code under &ldquo;GPL 3 or "
+#| "later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license of "
+#| "the combination is their intersection, which is &ldquo;GPL 3 or "
+#| "later&rdquo;."
 msgid ""
 "The FSF uses the approach of asking people to release programs under &ldquo;"
 "GNU GPL version N or any later version.&rdquo; This licensing is compatible "
 "with version N, and also with N+1 (because it offers version N+1 as an "
 "option).  When you combine code under &ldquo;GPL 3 or later&rdquo; with code "
-"under &ldquo;GPL 2 or later&rdquo;, the license of the combination is their "
-"intersection, which is &ldquo;GPL 3 or later&rdquo;."
+"under &ldquo;GPL 2 or later,&rdquo; the license of the combination is their "
+"intersection, which is &ldquo;GPL 3 or later.&rdquo;"
 msgstr ""
 "FSF 使用请求人们按照 &ldquo;遵循 GNU GPL 版本 N 
或任何以后版本&rdquo; 来发布"
 "程序这一方法来解决此兼容性问题。这种授权兼容版本 
N,也兼容版本 N+1(因为它确"
@@ -204,7 +232,7 @@
 "&ldquo;GPL 2 或以后版&rdquo; 的代码合并时,组合代ç 
çš„许可证是它们的交集,就"
 "是 &ldquo;GPL 3 或以后版&rdquo;。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We hope we will never need to make a GNU GPL version 4, but nothing is "
 "perfect and we can't assume we have anticipated all the issues.  By "
@@ -215,7 +243,7 @@
 "情况。通过按照遵循 GNU GPL 3 或以后版本来发布程序,你
就允许你的代码许可证升级"
 "到 GNU GPL v4,一旦我们发布了 v4。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The other approach is to make each version of the license explicitly allow "
 "upgrading to later versions.  The Mozilla Foundation uses this approach, as "
@@ -227,7 +255,7 @@
 "法,PHP 也使用该方法。Creative Commons 对 CC-BY-SA 4.0 
版(当前版)使用此方"
 "法:明确å…
è®¸ä»»ä½•ç”¨æˆ·å°†ä¿®æ”¹ç‰ˆä½œå“çš„许可证升级到以后版本的 
CC-BY-SA。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Only the GNU licenses give authors a choice about whether to permit upgrades "
 "to future license versions.  When I wrote the first version of the GNU GPL, "
@@ -242,19 +270,27 @@
 "程序按照 &ldquo;只用 GPL 1&rdquo; 或者 &ldquo;用 GPL 1 
或以后版&rdquo; 来发"
 "布。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision.  "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> If we ever make a GPL version 4, perhaps we should include an upgrade "
+#| "clause that automatically permits relicensing to higher-numbered "
+#| "versions, 5 and up."
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
-"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">[4]</a> If we ever "
+"make a GPL version 4, perhaps we should include an upgrade clause that "
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 "从那时起,我就在思量当时的决定是否明智。像 Linux 这æ 
·çš„程序,只允许一个版本"
 "的 GNU GPL 并拒绝升级许可证,这就导致实际上的不兼容。<a 
href=\"#f4\">(****)</"
 "a>或许我们应该在 GPL v4 的时侯包
含一个自动升级条款,如果我们需要版本 4 的话。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some copyleft licenses allow cross-copyleft combinations with an explicit "
 "relicensing clause giving permission to put the code under a different "
@@ -270,7 +306,7 @@
 "CeCILL 许可证授权,而你想把它和按照 GPL v3 
或以后版授权的程序 Q 合并在一起,"
 "那么 CeCILL 许可证允许你这么做,合并或组合的代码使用 
GPL v3 或以后版授权。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Explicit relicensing permission is not the same thing as compatibility "
 "(though relicensing code can make it compatible with other code) and it is "
@@ -287,16 +323,26 @@
 "它们按照 CeCILL 许可证发布;那样就违反了 Q 程序使用的 
GPL 许可证的要求。它们"
 "的合并程序只允许使用适当的 GPL 版本来发布。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions "
+#| "to GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-"
+#| "BY-SA.  This issue should never arise for software code; Creative Commons "
+#| "says its licenses are not meant for code, and says that the license to "
+#| "use for code is the GNU GPL.  But there are other kinds of works, such as "
+#| "hardware designs or game art, where you might have occasion to merge "
+#| "material released under CC-BY-SA with material released under the GNU "
+#| "GPL.  This can be done through CC-BY-SA's explicit relicensing permission."
 msgid ""
-"Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions to "
-"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-BY-"
+"Likewise, CC BY-SA 4.0 explicitly permits relicensing modified versions to "
+"GNU GPL version 3, but GPL version 3 does not permit relicensing to CC BY-"
 "SA.  This issue should never arise for software code; Creative Commons says "
 "its licenses are not meant for code, and says that the license to use for "
 "code is the GNU GPL.  But there are other kinds of works, such as hardware "
 "designs or game art, where you might have occasion to merge material "
 "released under CC-BY-SA with material released under the GNU GPL.  This can "
-"be done through CC-BY-SA's explicit relicensing permission."
+"be done through CC BY-SA's explicit relicensing permission."
 msgstr ""
 "类似,CC-BY-SA 4.0 明确允许修改版再次授权可以使用 GPL v3 
许可证,但是 GPL v3 "
 "并不允许再次授权到 
CC-BY-SA。这个问题应该不会影响软件代码;Creative Commons "
@@ -305,15 +351,27 @@
 "BY-SA 的材料和使用 GNU GPL 的材料合并的问题。这种情
况可以使用 CC-BY-SA 许可证"
 "中明确说明的再次授权条款。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
+#| "versions.  What you should do, when you relicense material under CC-BY-SA "
+#| "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
+#| "\">specify yourself as a license version proxy</a> to indicate whether "
+#| "future GPL versions have been authorized for that material.  If someday "
+#| "there is a GPL version 4 and Creative Commons decides to allow "
+#| "relicensing from CC-BY-SA to GPL version 4, you as proxy will be able to "
+#| "retroactively authorize use of that relicensed material under GPL version "
+#| "4.  (Alternatively, you can ask the authors of that material to give "
+#| "permission right away.)"
 msgid ""
-"Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
-"versions.  What you should do, when you relicense material under CC-BY-SA "
+"Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL "
+"versions.  What you should do, when you relicense material under CC BY-SA "
 "4.0 to the GPL, is <a href=\"/licenses/rms-why-gplv3.html#future-proofing"
 "\">specify yourself as a license version proxy</a> to indicate whether "
 "future GPL versions have been authorized for that material.  If someday "
 "there is a GPL version 4 and Creative Commons decides to allow relicensing "
-"from CC-BY-SA to GPL version 4, you as proxy will be able to retroactively "
+"from CC BY-SA to GPL version 4, you as proxy will be able to retroactively "
 "authorize use of that relicensed material under GPL version 4.  "
 "(Alternatively, you can ask the authors of that material to give permission "
 "right away.)"
@@ -325,7 +383,7 @@
 "从 CC-BY-SA 再次授权到 GPL v4,那么你
作为代理就能够返回来用 GPL v4 对该材料再"
 "次授权。(另外,你也可以直接请该材料的作者立即授予你
许可。)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The ordinary GNU General Public License and the GNU Affero General Public "
 "License are two different copyleft licenses, so they are naturally "
@@ -350,7 +408,7 @@
 "Affero GPL v3 不是一个 GNU GPL v2 的 &ldquo;以后版本&rdquo;,因为 
GNU Affero "
 "GPL 和 GNU GPL 是两个不同系列的许可证。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Lesser General Public License, version 3, is really the GNU General "
 "Public License version 3 plus some added extra permissions.  GPL version 3 "
@@ -366,14 +424,14 @@
 "后版本;对将来的每个 GPL 版本 N(N &gt; 
3),我们都会做一个 LGPL 版本 N,它"
 "由 GPL 版本 N 加上额外的条款构成。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "As for GNU Lesser GPL version 2.1, that explicitly permits relicensing to "
 "GNU GPL version 2 or later."
 msgstr ""
 "对 GNU LGPL 版本 2.1 来说,它明确允许再次授权到 GNU GPL v2 
或者以后版本。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Intermediate licenses are those which have substantive requirements on "
 "redistribution but are not copyleft licenses.  Examples include the Eclipse "
@@ -388,13 +446,24 @@
 "求不允许组合程序使用 copyleft 许可证,所以它们一般都不å…
¼å®¹ copyleft 许可证。"
 "Mozilla 公共许可证允许将代码再次授权到 GNU GPL,除非该代ç 
æ˜Žç¡®æ‹’绝这样做。"
 
-#. type: Content of: <p>
-msgid ""
-"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
-"license is a disjunction: it means that the same program carries a choice of "
-"two or more different licenses.  For instance, older versions of Perl "
-"carried a dual license: the disjunction of the Artistic License and the GNU "
-"General Public License.  This meant that each user could choose to use and "
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
+#| "license is a disjunction: it means that the same program carries a choice "
+#| "of two or more different licenses.  For instance, older versions of Perl "
+#| "carried a dual license: the disjunction of the Artistic License and the "
+#| "GNU General Public License.  This meant that each user could choose to "
+#| "use and redistribute Perl under one license or the other, or under both "
+#| "in disjunction like the Perl release itself.  A disjunction is compatible "
+#| "with a set of other licenses if any one of the license choices in the "
+#| "disjunction is compatible with that set."
+msgid ""
+"Finally, what about dual licensing?<a href=\"#f5\">[5]</a> A dual license is "
+"a disjunction: it means that the same program carries a choice of two or "
+"more different licenses.  For instance, older versions of Perl carried a "
+"dual license: the disjunction of the Artistic License and the GNU General "
+"Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
@@ -407,7 +476,7 @@
 "授权 Perl。如果双重许可证中的一个许可证和一组许可证å…
¼å®¹ï¼Œé‚£ä¹ˆè¯¥åŒé‡è®¸å¯è¯å°±å’Œ"
 "该组许可证兼容。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When you choose a license for your code, please choose GNU GPL version 3 or "
 "later, or some license compatible with that.  This is the way to make your "
@@ -419,11 +488,11 @@
 "是使你的代码能够和几乎所有自由软件集合的代ç 
ç»„合的正确方法。选择 GPL 或 "
 "AGPL,v3 或者以后版本,也会最大程度地保护所有使用你
各个版本代码的用户的自由。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Combining code"
 msgstr "合并代码"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When a set of licenses are compatible, that means you can legally combine or "
 "merge a number of programs each licensed under one of those licenses.  How, "
@@ -432,7 +501,7 @@
 "当一组许可证兼容时,这就意味着你
可以合法地合并或融合一系列按照其中某个许可证"
 "发布的程序。那么,合并后的程序该怎样授权呢?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Each free software license says you must keep the license with the code that "
 "is covered by it.  So in a strict sense, the licensing of the combined "
@@ -446,7 +515,7 @@
 
"答来解决合并程序该如何授权的问题。究竟哪一个许可证是使用合并程序的人
 <em>要关"
 "注的呢?</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To compute that, you start with a list of all the pertinent licenses.  Then "
 "you can delete from the list any license which is subsumed by another in the "
@@ -455,7 +524,7 @@
 "为了计算,你要从所有直接相关的许可证列表开始。然后你
可以把列表中一些能够被另"
 "外一些许可证包含的许可证删除。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We say that a license A <em>subsumes</em> license B when compliance with "
 "license A implies compliance with license B."
@@ -463,7 +532,7 @@
 
"如果遵循许可证甲意味着也遵循许可证乙,那么我们就说许可证甲
 <em>包含</em> 许可"
 "证乙。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "For instance, the GNU GPL version N and the GNU Affero GPL version N both "
 "subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
@@ -472,29 +541,34 @@
 "例如,GNU GPL 版本 N 和 GNU Affero GPL 版本 N 都包含了 GNU Lesser 
GPL 版本 "
 "N,而它们三个都包含了 GNU Lesser GPL 版本 2.1。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
 "least 3."
 msgstr ""
 "任一版本 N 的 GNU 许可证,如果 N 不小于 3,那么它就包
含了 Apache 2.0 许可证。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
 "that are compatible with it."
 msgstr "GNU GPL 版本 N 包含了与之兼容的所有版本的 Mozilla 公å…
±è®¸å¯è¯ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 "
+#| "licenses.  BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume "
+#| "the Expat, X11 and ISC licenses and CC-0."
 msgid ""
 "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
 "BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
-"and ISC licenses and CC-0."
+"and ISC licenses and CC0."
 msgstr ""
 "Apache 2.0 许可证包含了 BSD、Expat、X11、ISC 和 CC-0 
许可证。BSD 3 条款包含"
 "了 BSD 2 条款。BSD 许可证包含了 Expat、X11 和 ISC 许可证以及 
CC-0。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not meant to be a complete list, but if we are informed of other "
 "cases worth mentioning, we will add them."
@@ -502,36 +576,47 @@
 "此处并非要提供一个完整列表,但是如果我们发现还有å…
¶ä»–值得说明的例子,我们还会"
 "添加。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When some license is subsumed, you still need to include a copy of it with "
 "all distribution of the combined program."
 msgstr "当某些许可证被包含时,你
仍然需要在发布组合程序时包含该许可证的拷贝。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "脚注"
 
-#. type: Content of: <p>
-msgid ""
-"<b>*</b> It is not inconceivable that other legal issues might arise about a "
-"specific combination of programs, issues not related to the copyright "
-"licenses of the programs to be combined.  We discuss only the implications "
-"of the licenses themselves."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>*</b> It is not inconceivable that other legal issues might arise "
+#| "about a specific combination of programs, issues not related to the "
+#| "copyright licenses of the programs to be combined.  We discuss only the "
+#| "implications of the licenses themselves."
+msgid ""
+"It is not inconceivable that other legal issues might arise about a specific "
+"combination of programs, issues not related to the copyright licenses of the "
+"programs to be combined.  We discuss only the implications of the licenses "
+"themselves."
 msgstr ""
 "<b>*</b> 可以想象还可能有关于合并程序的å…
¶ä»–法律问题,这些问题可能和合并程序的"
 "许可证无关。我们只讨论和许可证本身有关的问题。"
 
-#. type: Content of: <p>
-msgid ""
-"<b>**</b> The main license in actual use that isn't reasonably behaved is "
-"the license of TeX: if two programs are licensed just the way TeX is, there "
-"is no authorized way to distribute a merged version of them."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>**</b> The main license in actual use that isn't reasonably behaved is "
+#| "the license of TeX: if two programs are licensed just the way TeX is, "
+#| "there is no authorized way to distribute a merged version of them."
+msgid ""
+"The main license in actual use that isn't reasonably behaved is the license "
+"of TeX: if two programs are licensed just the way TeX is, there is no "
+"authorized way to distribute a merged version of them."
 msgstr ""
 "<b>**</b> 实际当中用到的不那么顺理成章的许可证主要是 TeX 
的许可证:如果两个程"
 "序都按照 TeX 的方式授权,那么你
就没有办法发布两个程序的组合程序。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "The TeX license permits distribution of a modified version only in the form "
 "of the original version plus a differences file.  If A and B are separately "
@@ -545,7 +630,7 @@
 "并程序就违反了乙程序的许可证。反过来,发布乙程序加
上差异文件的话又违反了甲的"
 "许可证。按照å…
¶ä»–方式发布的话就违反了甲乙两个程序的许可证。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><ol><li><p>
 msgid ""
 "It is no coincidence that TeX was released in 1982: our community has "
 "learned, since then, to write reasonably behaved licenses."
@@ -553,36 +638,57 @@
 "这个并不意外,TeX 早在 1982 
年就发布了:社区从此逐渐学会了撰写顺理成章的许可"
 "证。"
 
-#. type: Content of: <p>
-msgid ""
-"<b>***</b> When distributing in source code form, it is usually sufficient "
-"to leave the license notices in the source code as they stand; extra license "
-"notice requirements typically only come up for lax licenses when "
-"distributing binaries without the source code."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>***</b> When distributing in source code form, it is usually "
+#| "sufficient to leave the license notices in the source code as they stand; "
+#| "extra license notice requirements typically only come up for lax licenses "
+#| "when distributing binaries without the source code."
+msgid ""
+"When distributing in source code form, it is usually sufficient to leave the "
+"license notices in the source code as they stand; extra license notice "
+"requirements typically only come up for lax licenses when distributing "
+"binaries without the source code."
 msgstr ""
 "<b>***</b> 当发布源代码时,在源代码里加å…
¥è®¸å¯è¯å£°æ˜Žé€šå¸¸å°±è¶³å¤Ÿäº†ï¼›åªæœ‰è±¡ä½¿ç”¨æ¾"
 "散型许可证的仅发布二进制而不带源代ç 
çš„程序才需要额外的许可证声明。"
 
-#. type: Content of: <p>
-msgid ""
-"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
-"nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent.  <a href=\"/licenses/rms-"
-"why-gplv3.html\">We fixed those problems, and others, in version 3</a>, but "
-"we can't change version 2."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>****</b> In addition, GPL version 2 still allows binaries to be made "
+#| "nonfree by hardware that rejects all but special signed binaries, and "
+#| "still does not allow distribution of binaries by torrent.  <a href=\"/"
+#| "licenses/rms-why-gplv3.html\">We fixed those problems, and others, in "
+#| "version 3</a>, but we can't change version 2."
+msgid ""
+"In addition, GPL version 2 still allows binaries to be made nonfree by "
+"hardware that rejects all but special signed binaries, and still does not "
+"allow distribution of binaries by torrent.  <a href=\"/licenses/rms-why-"
+"gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
+"can't change version 2."
 msgstr ""
 "<b>****</b> 另外,GPL v2 仍然å…
è®¸éžè‡ªç”±çš„二进制&mdash;&mdash;硬件只运行特别签"
 "名的二进制而拒绝其他二进制文件,而且仍然不允许使用 
torrent 发布二进制。<a "
 "href=\"/licenses/rms-why-gplv3.html\">我们在版本 3 
中修复了这些问题,还修复了"
 "其他问题</a>,但是我们不能改变版本 2。"
 
-#. type: Content of: <p>
-msgid ""
-"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
-"selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
-"selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the program "
-"on which the license is sold includes any code that is not in the free "
-"(libre) release, that's not selling exceptions, that's nonfree software."
+#. type: Content of: <div><ol><li><p>
+#, fuzzy
+#| msgid ""
+#| "<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
+#| "selling exceptions, but that is a misnomer.  See <a href=\"/philosophy/"
+#| "selling-exceptions.html\"> Selling Exceptions</a>.  Note that if the "
+#| "program on which the license is sold includes any code that is not in the "
+#| "free (libre) release, that's not selling exceptions, that's nonfree "
+#| "software."
+msgid ""
+"Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
+"exceptions, but that is a misnomer.  See <a href=\"/philosophy/selling-"
+"exceptions.html\"> Selling Exceptions</a>.  Note that if the program on "
+"which the license is sold includes any code that is not in the free (libre) "
+"release, that's not selling exceptions, that's nonfree software."
 msgstr ""
 "<b>*****</b> 有人使用 &ldquo;双重许可证&rdquo; 来å…
œå”®è®¸å¯è¯ä¾‹å¤–,但是词不达"
 "意。请参看 <a href=\"/philosophy/selling-exceptions.html\">å…
œå”®ä¾‹å¤–</a>。请注"
@@ -607,9 +713,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
@@ -617,25 +721,27 @@
 #.         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=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信"
-"息参见 <a href=\"/server/standards/README.translators.html\">《译者
指南》</"
-"a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -659,6 +765,19 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这"
+#~ "方面有评论或一般性的建议,请发送至 <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘çš„"
+#~ "更多信息参见 <a 
href=\"/server/standards/README.translators.html\">《译者"
+#~ "指南》</a>。"
+
+#~ msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."



reply via email to

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