www-commits
[Top][All Lists]
Advanced

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

www licenses/po/license-list.de.po licenses/po/...


From: GNUN
Subject: www licenses/po/license-list.de.po licenses/po/...
Date: Fri, 20 Apr 2012 16:28:52 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/04/20 16:28:52

Modified files:
        licenses/po    : license-list.de.po license-list.es.po 
                         license-list.fr.po license-list.it.po 
                         license-list.pot 
        philosophy/po  : latest-articles.de.po latest-articles.pot 
        server/gnun/compendia: compendium.it.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.113&r2=1.114
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/latest-articles.de.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/latest-articles.pot?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.it.po?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: licenses/po/license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- licenses/po/license-list.de.po      8 Apr 2012 08:54:36 -0000       1.29
+++ licenses/po/license-list.de.po      20 Apr 2012 16:28:05 -0000      1.30
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-02-22 20:27-0500\n"
+"POT-Creation-Date: 2012-04-20 12:25-0300\n"
 "PO-Revision-Date: 2012-03-02 00:07+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-20 12:25-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -54,7 +55,9 @@
 "Softwarelizenzen</a>"
 
 #. type: Content of: <ul><li><ul><li>
-msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+#, fuzzy
+#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
 msgstr "<a href=\"#NonFreeSoftwareLicense\">Unfreie Softwarelizenzen</a>"
 
 #. type: Content of: <ul><li>
@@ -67,9 +70,12 @@
 "<a href=\"#FreeDocumentationLicenses\">Freie Lizenzen für 
Dokumentationen</a>"
 
 #. type: Content of: <ul><li><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation "
+#| "Licenses</a>"
 msgid ""
-"<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
-"a>"
+"<a href=\"#NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a>"
 msgstr ""
 "<a href=\"#NonFreeDocumentationLicenses\">Unfreie Lizenzen für "
 "Dokumentationen</a>"
@@ -313,9 +319,15 @@
 "id\">(<a href=\"#LGPL\">#LGPL</a>)  (<a href=\"#LGPL\">#LGPLv3</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the latest version of the LGPL: a free software license, but not "
+#| "a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv3.  We recommend it for <a href=\"/"
+#| "licenses/why-not-lgpl.html\">special circumstances only</a>."
 msgid ""
 "This is the latest version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv3.  We recommend it for <a href=\"/licenses/why-"
 "not-lgpl.html\">special circumstances only</a>."
 msgstr ""
@@ -351,9 +363,18 @@
 "reference-id\">(<a href=\"#LGPLv2.1\">#LGPLv2.1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the previous version of the LGPL: a free software license, but "
+#| "not a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv2 and GPLv3.  We generally recommend "
+#| "<a href=\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/"
+#| "why-not-lgpl.html\">for special circumstances only</a>.  To learn more "
+#| "about how LGPLv2.1 is compatible with other GNU licenses, please <a href="
+#| "\"/licenses/gpl-faq.html#AllCompatibility\">see our FAQ</a>."
 msgid ""
 "This is the previous version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv2 and GPLv3.  We generally recommend <a href="
 "\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/why-not-"
 "lgpl.html\">for special circumstances only</a>.  To learn more about how "
@@ -628,14 +649,23 @@
 "CeCILL ist eine freie Softwarelizenz, ausdrücklich mit der GNU GPL 
vereinbar."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The text of the CeCILL uses a couple of biased terms that ought to be "
+#| "avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/"
+#| "not-ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a "
+#| "href=\"/philosophy/words-to-avoid.html\">this article</a>); this decision "
+#| "was unfortunate, because reading the license tends to spread the "
+#| "presuppositions of those terms.  However, this does not cause any "
+#| "particular problem for the programs released under the CeCILL."
 msgid ""
 "The text of the CeCILL uses a couple of biased terms that ought to be "
-"avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/not-"
-"ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a href=\"/"
-"philosophy/words-to-avoid.html\">this article</a>); this decision was "
-"unfortunate, because reading the license tends to spread the presuppositions "
-"of those terms.  However, this does not cause any particular problem for the "
-"programs released under the CeCILL."
+"avoided: <a href=\"/philosophy/not-ipr.html\">&ldquo;intellectual "
+"property&rdquo;</a> and <a href=\"/philosophy/words-to-avoid.html#Protection"
+"\"> &ldquo;protection&rdquo;</a>; this decision was unfortunate, because "
+"reading the license tends to spread the presuppositions of those terms.  "
+"However, this does not cause any particular problem for the programs "
+"released under the CeCILL."
 msgstr ""
 "Der Text der CeCILL verwendet ein paar voreingenomme Begriffe, die vermieden "
 "werden sollten: <em>Geistiges Eigentum</em> (siehe <a href=\"/philosophy/not-"
@@ -1822,12 +1852,19 @@
 "Lizenz)."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software non-free.  "
+#| "But it does cause <a href=\"/philosophy/bsd.html\">practical problems</"
+#| "a>, including incompatibility with the GNU GPL."
 msgid ""
 "This is a simple, permissive non-copyleft free software license with a "
 "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software non-free.  But it "
-"does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-"including incompatibility with the GNU GPL."
+"is not fatal; that is, it does not render the software nonfree.  But it does "
+"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+"incompatibility with the GNU GPL."
 msgstr ""
 "Dies ist eine einfache, freizügige freie Softwarelizenz ohne Copyleft mit "
 "einem ernstzunehmenden Mangel: der <em>unausstehlichen BSD-Werbeklausel</"
@@ -1936,9 +1973,14 @@
 "(<a href=\"#Condor\">#Condor</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
+#| "\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use "
+#| "this license."
 msgid ""
 "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
-"\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
+"\"#apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
 "license."
 msgstr ""
 "Neuere Versionen von Condor (ab v6.9.5 und höher) sind unter der <a href="
@@ -2148,12 +2190,20 @@
 "modifizierten Datei muss ein neuer Namen gegeben werden."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The reason this requirement is acceptable for LaTeX is that TeX has a "
+#| "facility to allow you to map file names, to specify &ldquo;use file bar "
+#| "when file foo is requested&rdquo;.  With this facility, the requirement "
+#| "is merely annoying; without the facility, the same requirement would be a "
+#| "serious obstacle, and we would have to conclude it makes the program non-"
+#| "free."
 msgid ""
 "The reason this requirement is acceptable for LaTeX is that TeX has a "
 "facility to allow you to map file names, to specify &ldquo;use file bar when "
 "file foo is requested&rdquo;.  With this facility, the requirement is merely "
 "annoying; without the facility, the same requirement would be a serious "
-"obstacle, and we would have to conclude it makes the program non-free."
+"obstacle, and we would have to conclude it makes the program nonfree."
 msgstr ""
 "Der Grund, warum dieses Anforderung für Latex akzeptabel ist, ist, dass TeX "
 "eine Fazilität enthält, die ermöglicht, Dateinamen abzubilden, um „Datei 
"
@@ -2183,9 +2233,15 @@
 "unfrei machen würde, macht den Originalkontext nicht unfrei."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The LPPL says that some files, in certain versions of LaTeX, may have "
+#| "additional restrictions, which could render them non-free.  For this "
+#| "reason, it may take some careful checking to produce a version of LaTeX "
+#| "that is free software."
 msgid ""
 "The LPPL says that some files, in certain versions of LaTeX, may have "
-"additional restrictions, which could render them non-free.  For this reason, "
+"additional restrictions, which could render them nonfree.  For this reason, "
 "it may take some careful checking to produce a version of LaTeX that is free "
 "software."
 msgstr ""
@@ -2492,12 +2548,19 @@
 "span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The license of OpenSSL is a conjunction of two licenses, one of them "
+#| "being the license of SSLeay.  You must follow both.  The combination "
+#| "results in a copyleft free software license that is incompatible with the "
+#| "GNU GPL.  It also has an advertising clause like the original BSD license "
+#| "and the Apache license."
 msgid ""
 "The license of OpenSSL is a conjunction of two licenses, one of them being "
 "the license of SSLeay.  You must follow both.  The combination results in a "
 "copyleft free software license that is incompatible with the GNU GPL.  It "
-"also has an advertising clause like the original BSD license and the Apache "
-"license."
+"also has an advertising clause like the <a href=\"#OriginalBSD\">original "
+"BSD license</a> and the <a href=\"#apache1\">Apache&nbsp;1 license</a>."
 msgstr ""
 "Die OpenSSL-Lizenz ist eine Konjunktion aus zwei Lizenzen, eine ist die "
 "SSLeay-Lizenz. Beide müssen befolgt werden. Die Kombination führt zu einer "
@@ -2852,9 +2915,14 @@
 "vereinbar."
 
 #. type: Content of: <h3>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+#| "Non-Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
+#| "href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgid ""
-"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> Non-"
-"Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
+"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+"Nonfree Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
 "\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgstr ""
 "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses"
@@ -2862,9 +2930,15 @@
 "\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a> licenses.  A non-free license "
+#| "is automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</"
+#| "strong>"
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
-"philosophy/free-sw.html\">free software</a> licenses.  A non-free license is "
+"philosophy/free-sw.html\">free software</a> licenses.  A nonfree license is "
 "automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</strong>"
 msgstr ""
 "<strong>Die folgenden Lizenzen <em>qualifizieren sich nicht</em> als <a href="
@@ -2872,16 +2946,26 @@
 "automatisch unvereinbar mit der <a href=\"#GNUGPL\">GNU GPL</a>.</strong>"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Of course, we urge you to avoid using non-free software licenses, and to "
+#| "avoid non-free software in general."
 msgid ""
-"Of course, we urge you to avoid using non-free software licenses, and to "
-"avoid non-free software in general."
+"Of course, we urge you to avoid using nonfree software licenses, and to "
+"avoid nonfree software in general."
 msgstr ""
 "Of course, we urge you to avoid using non-free software licenses, and to "
 "avoid non-free software in general."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "There is no way we could list all the known non-free software licenses "
+#| "here; after all, every proprietary software company has its own.  We "
+#| "focus here on licenses that are often mistaken for free software licenses "
+#| "but are, in fact, <strong>not</strong> free software licenses."
 msgid ""
-"There is no way we could list all the known non-free software licenses here; "
+"There is no way we could list all the known nonfree software licenses here; "
 "after all, every proprietary software company has its own.  We focus here on "
 "licenses that are often mistaken for free software licenses but are, in "
 "fact, <strong>not</strong> free software licenses."
@@ -2892,11 +2976,20 @@
 "fact, <strong>not</strong> free software licenses."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We have provided links to these licenses when we can do so without "
+#| "violating our general policy: that we do not make links to sites that "
+#| "promote, encourage or facilitate the use of non-free software packages.  "
+#| "The last thing we want to do is give any non-free program some gratis "
+#| "publicity that might encourage more people to use it.  For the same "
+#| "reason, we have avoided naming the programs for which a license is used, "
+#| "unless we think that for specific reasons it won't backfire."
 msgid ""
 "We have provided links to these licenses when we can do so without violating "
 "our general policy: that we do not make links to sites that promote, "
-"encourage or facilitate the use of non-free software packages.  The last "
-"thing we want to do is give any non-free program some gratis publicity that "
+"encourage or facilitate the use of nonfree software packages.  The last "
+"thing we want to do is give any nonfree program some gratis publicity that "
 "might encourage more people to use it.  For the same reason, we have avoided "
 "naming the programs for which a license is used, unless we think that for "
 "specific reasons it won't backfire."
@@ -2941,12 +3034,18 @@
 "\"#apsl1\">#apsl1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
+#| "\">not free software licenses (follow the link for more explanation)</"
+#| "a>.  Please don't use these licenses, and we urge you to avoid any "
+#| "software that has been released under them.  <a href=\"#apsl2\">Version "
+#| "2.0 of the APSL</a> is a free software license."
 msgid ""
 "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
-"\">not free software licenses (follow the link for more explanation)</a>.  "
-"Please don't use these licenses, and we urge you to avoid any software that "
-"has been released under them.  <a href=\"#apsl2\">Version 2.0 of the APSL</"
-"a> is a free software license."
+"\">not free software licenses</a>.  Please don't use these licenses, and we "
+"urge you to avoid any software that has been released under them.  <a href="
+"\"#apsl2\">Version 2.0 of the APSL</a> is a free software license."
 msgstr ""
 "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
 "\">not free software licenses (follow the link for more explanation)</a>.  "
@@ -2983,8 +3082,12 @@
 "reference-id\">(<a href=\"#ATTPublicLicense\">#ATTPublicLicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The AT&amp;T Public License is a non-free license.  It has several "
+#| "serious problems:"
 msgid ""
-"The AT&amp;T Public License is a non-free license.  It has several serious "
+"The AT&amp;T Public License is a nonfree license.  It has several serious "
 "problems:"
 msgstr ""
 "Die AT&amp;T Public License ist eine unfreie Lizenz und verursacht mehrere "
@@ -3051,11 +3154,18 @@
 "Quellcodes hinaus geht, sogar des eigenen geänderten Quellcode."
 
 #. type: Content of: <dl><dd><ol><li>
+#, fuzzy
+#| msgid ""
+#| "It asserts one needs a license from AT&amp;T to make a link to their web "
+#| "site.  This is not an immediate practical problem, since the license says "
+#| "it gives permission to make such a link.  (Anyway, people shouldn't make "
+#| "links to sites about non-free software.)  But such a claim should not be "
+#| "made or propagated."
 msgid ""
 "It asserts one needs a license from AT&amp;T to make a link to their web "
 "site.  This is not an immediate practical problem, since the license says it "
 "gives permission to make such a link.  (Anyway, people shouldn't make links "
-"to sites about non-free software.)  But such a claim should not be made or "
+"to sites about nonfree software.)  But such a claim should not be made or "
 "propagated."
 msgstr ""
 "Sie gibt an, eine Lizenz von AT&amp;T zu brauchen, um ein Verweis zu ihren "
@@ -3107,9 +3217,13 @@
 "meaning we're not sure of that might also be problematic."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
+#| "additional permission for linking with non-free programs."
 msgid ""
 "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
-"additional permission for linking with non-free programs."
+"additional permission for linking with nonfree programs."
 msgstr ""
 "Today <a href=\"#eCos20\">eCos ist verfügbar</a> unter GNU GPL mit "
 "zusätzlichen Berechtigungen für die Verknüpfung mit unfreien Programmen."
@@ -3127,10 +3241,15 @@
 "\">#GPL-PA</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
+#| "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;"
+#| "blica&rdquo;) is non-free for several reasons:"
 msgid ""
 "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
 "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) "
-"is non-free for several reasons:"
+"is nonfree for several reasons:"
 msgstr ""
 "Die GPL-PA (auf Portugiesisch <span xml:lang=\"pt\" lang=\"pt"
 "\"><em>Licen&ccedil;a P&uacute;blica Geral para Administra&ccedil;&atilde;o "
@@ -3247,8 +3366,12 @@
 "\">(<a href=\"#Lha\">#Lha</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The lha license must be considered non-free because it is so vague that "
+#| "you cannot be sure what permissions you have."
 msgid ""
-"The lha license must be considered non-free because it is so vague that you "
+"The lha license must be considered nonfree because it is so vague that you "
 "cannot be sure what permissions you have."
 msgstr ""
 "The lha license must be considered non-free because it is so vague that you "
@@ -3412,8 +3535,15 @@
 "\">#RPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The Reciprocal Public License is a non-free license because of three "
+#| "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  "
+#| "2.&nbsp;It requires notification of the original developer for "
+#| "publication of a modified version.  3.&nbsp;It requires publication of "
+#| "any modified version that an organization uses, even privately."
 msgid ""
-"The Reciprocal Public License is a non-free license because of three "
+"The Reciprocal Public License is a nonfree license because of three "
 "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  2."
 "&nbsp;It requires notification of the original developer for publication of "
 "a modified version.  3.&nbsp;It requires publication of any modified version "
@@ -3454,8 +3584,12 @@
 "\"#SML\">#SML</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Despite the name, this is a software license, and it's non-free for "
+#| "several reasons:"
 msgid ""
-"Despite the name, this is a software license, and it's non-free for several "
+"Despite the name, this is a software license, and it's nonfree for several "
 "reasons:"
 msgstr ""
 "Trotz des Namens ist dies aus mehreren Gründen eine unfreie Softwarelizenz:"
@@ -3578,9 +3712,15 @@
 "privater Nutzung definiert."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/";
+#| "license/\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href="
+#| "\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgid ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
-"\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> <span class="
+"\"> SystemC &ldquo;Open Source&rdquo; License, Version 3.0</a> <span class="
 "\"anchor-reference-id\"> (<a href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgstr ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
@@ -3588,12 +3728,20 @@
 "\"anchor-reference-id\">(<a href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license requires all recipients to proactively help the licensor "
+#| "enforce its trademarks.  This is an unreasonable condition to place on "
+#| "users' rights, so the license is non-free.  It also has other practical "
+#| "problems: some of the requirements are vague, and it uses the term <a "
+#| "href=\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</"
+#| "a>."
 msgid ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
-"users' rights, so the license is non-free.  It also has other practical "
+"users' rights, so the license is nonfree.  It also has other practical "
 "problems: some of the requirements are vague, and it uses the term <a href="
-"\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</a>."
+"\"/philosophy/not-ipr.html\">&ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
@@ -3621,8 +3769,16 @@
 "reference-id\">(<a href=\"#UtahPublicLicense\">#UtahPublicLicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The University of Utah Public License is a non-free license because it "
+#| "does not allow commercial redistribution.  It also purports to restrict "
+#| "commercially running the software and even commercially giving "
+#| "consultation about it.  Those restrictions are probably not legally "
+#| "enforceable under US copyright law, but they might be in some countries; "
+#| "even asserting them is outrageous."
 msgid ""
-"The University of Utah Public License is a non-free license because it does "
+"The University of Utah Public License is a nonfree license because it does "
 "not allow commercial redistribution.  It also purports to restrict "
 "commercially running the software and even commercially giving consultation "
 "about it.  Those restrictions are probably not legally enforceable under US "
@@ -3673,11 +3829,17 @@
 "\"#YaST\">#YaST</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is not a free software license.  The license prohibits distribution "
+#| "for a fee, and that makes it impossible for the software to be included "
+#| "in the many CD-ROM free software collections that are sold by companies "
+#| "and by organizations such as the FSF."
 msgid ""
 "This is not a free software license.  The license prohibits distribution for "
 "a fee, and that makes it impossible for the software to be included in the "
 "many CD-ROM free software collections that are sold by companies and by "
-"organizations such as the FSF."
+"organizations."
 msgstr ""
 "Dies ist keine freie Softwarelizenz.  The license prohibits distribution for "
 "a fee, and that makes it impossible for the software to be included in the "
@@ -3693,9 +3855,13 @@
 "there, so it is hard to be sure what meaning is really intended."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "(The YaST software itself no longer uses this non-free YaST license; "
+#| "happily, it is now free software, released under the GNU GPL.)"
 msgid ""
-"(The YaST software itself no longer uses this non-free YaST license; "
-"happily, it is now free software, released under the GNU GPL.)"
+"(The YaST software itself no longer uses this nonfree YaST license; happily, "
+"it is now free software, released under the GNU GPL.)"
 msgstr ""
 "(The YaST software itself no longer uses this non-free YaST license; "
 "happily, it is now free software, released under the GNU GPL.)"
@@ -3755,8 +3921,15 @@
 "span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a Free Documentation license that is incompatible with the GNU "
+#| "FDL.  It is incompatible because Section&nbsp;(2c) says &ldquo;You add no "
+#| "other terms or conditions to those of this License&rdquo;, and the GNU "
+#| "FDL has additional terms not accounted for in the Common Documentation "
+#| "License."
 msgid ""
-"This is a Free Documentation license that is incompatible with the GNU FDL.  "
+"This is a free documentation license that is incompatible with the GNU FDL.  "
 "It is incompatible because Section&nbsp;(2c) says &ldquo;You add no other "
 "terms or conditions to those of this License&rdquo;, and the GNU FDL has "
 "additional terms not accounted for in the Common Documentation License."
@@ -3799,12 +3972,20 @@
 "</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license <strong>can</strong> be used as a free documentation "
+#| "license.  It is a copyleft free documentation license <strong>provided</"
+#| "strong> the copyright holder does not exercise any of the &ldquo;LICENSE "
+#| "OPTIONS&rdquo; listed in Section VI of the license.  But if either of the "
+#| "options is invoked, the license becomes non-free.  In any case, it is "
+#| "incompatible with the GNU FDL."
 msgid ""
 "This license <strong>can</strong> be used as a free documentation license.  "
 "It is a copyleft free documentation license <strong>provided</strong> the "
 "copyright holder does not exercise any of the &ldquo;LICENSE OPTIONS&rdquo; "
 "listed in Section VI of the license.  But if either of the options is "
-"invoked, the license becomes non-free.  In any case, it is incompatible with "
+"invoked, the license becomes nonfree.  In any case, it is incompatible with "
 "the GNU FDL."
 msgstr ""
 "This license <strong>can</strong> be used as a free documentation license.  "
@@ -3815,12 +3996,20 @@
 "the GNU FDL."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This creates a practical pitfall in using or recommending this license: "
+#| "if you recommend &ldquo;Use the Open Publication License, Version 1.0 but "
+#| "don't enable the options&rdquo;, it would be easy for the second half of "
+#| "that recommendation to get forgotten; someone might use the license with "
+#| "the options, making a manual non-free, and yet think he or she is "
+#| "following your advice."
 msgid ""
 "This creates a practical pitfall in using or recommending this license: if "
 "you recommend &ldquo;Use the Open Publication License, Version 1.0 but don't "
 "enable the options&rdquo;, it would be easy for the second half of that "
 "recommendation to get forgotten; someone might use the license with the "
-"options, making a manual non-free, and yet think he or she is following your "
+"options, making a manual nonfree, and yet think he or she is following your "
 "advice."
 msgstr ""
 "This creates a practical pitfall in using or recommending this license: if "
@@ -3831,11 +4020,17 @@
 "advice."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Likewise, if you use this license without either of the options to make "
+#| "your manual free, someone else might decide to imitate you, then change "
+#| "his or her mind about the options thinking that that is just a detail; "
+#| "the result would be that his or her manual is non-free."
 msgid ""
 "Likewise, if you use this license without either of the options to make your "
 "manual free, someone else might decide to imitate you, then change his or "
 "her mind about the options thinking that that is just a detail; the result "
-"would be that his or her manual is non-free."
+"would be that his or her manual is nonfree."
 msgstr ""
 "Likewise, if you use this license without either of the options to make your "
 "manual free, someone else might decide to imitate you, then change his or "
@@ -3871,8 +4066,14 @@
 "make sure people understand what you say."
 
 #. type: Content of: <h3>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
+#| "a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>)  </"
+#| "span>"
 msgid ""
-"<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</a> "
+"<a id=\"NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a> "
 "<span class=\"anchor-reference-id\"> (<a href=\"#NonFreeDocumentationLicenses"
 "\">#NonFreeDocumentationLicenses</a>)  </span>"
 msgstr ""

Index: licenses/po/license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- licenses/po/license-list.es.po      23 Feb 2012 18:18:55 -0000      1.11
+++ licenses/po/license-list.es.po      20 Apr 2012 16:28:06 -0000      1.12
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: license-list.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-22 20:27-0500\n"
+"POT-Creation-Date: 2012-04-20 12:25-0300\n"
 "PO-Revision-Date: 2012-02-23 19:17+0100\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
+"Outdated-Since: 2012-04-20 12:25-0300\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 # type: Content of: <title>
@@ -69,7 +70,9 @@
 
 # type: Content of: <ul><li><ul><li>
 #. type: Content of: <ul><li><ul><li>
-msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+#, fuzzy
+#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
 msgstr ""
 "<a href=\"#NonFreeSoftwareLicense\">Licencias de software que no son libres</"
 "a>"
@@ -87,9 +90,12 @@
 
 # type: Content of: <ul><li><ul><li>
 #. type: Content of: <ul><li><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation "
+#| "Licenses</a>"
 msgid ""
-"<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
-"a>"
+"<a href=\"#NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a>"
 msgstr ""
 "<a href=\"#NonFreeDocumentationLicenses\">Licencias para documentación que "
 "no son libres</a>"
@@ -363,9 +369,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the latest version of the LGPL: a free software license, but not "
+#| "a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv3.  We recommend it for <a href=\"/"
+#| "licenses/why-not-lgpl.html\">special circumstances only</a>."
 msgid ""
 "This is the latest version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv3.  We recommend it for <a href=\"/licenses/why-"
 "not-lgpl.html\">special circumstances only</a>."
 msgstr ""
@@ -405,9 +417,18 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the previous version of the LGPL: a free software license, but "
+#| "not a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv2 and GPLv3.  We generally recommend "
+#| "<a href=\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/"
+#| "why-not-lgpl.html\">for special circumstances only</a>.  To learn more "
+#| "about how LGPLv2.1 is compatible with other GNU licenses, please <a href="
+#| "\"/licenses/gpl-faq.html#AllCompatibility\">see our FAQ</a>."
 msgid ""
 "This is the previous version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv2 and GPLv3.  We generally recommend <a href="
 "\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/why-not-"
 "lgpl.html\">for special circumstances only</a>.  To learn more about how "
@@ -716,14 +737,23 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The text of the CeCILL uses a couple of biased terms that ought to be "
+#| "avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/"
+#| "not-ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a "
+#| "href=\"/philosophy/words-to-avoid.html\">this article</a>); this decision "
+#| "was unfortunate, because reading the license tends to spread the "
+#| "presuppositions of those terms.  However, this does not cause any "
+#| "particular problem for the programs released under the CeCILL."
 msgid ""
 "The text of the CeCILL uses a couple of biased terms that ought to be "
-"avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/not-"
-"ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a href=\"/"
-"philosophy/words-to-avoid.html\">this article</a>); this decision was "
-"unfortunate, because reading the license tends to spread the presuppositions "
-"of those terms.  However, this does not cause any particular problem for the "
-"programs released under the CeCILL."
+"avoided: <a href=\"/philosophy/not-ipr.html\">&ldquo;intellectual "
+"property&rdquo;</a> and <a href=\"/philosophy/words-to-avoid.html#Protection"
+"\"> &ldquo;protection&rdquo;</a>; this decision was unfortunate, because "
+"reading the license tends to spread the presuppositions of those terms.  "
+"However, this does not cause any particular problem for the programs "
+"released under the CeCILL."
 msgstr ""
 "El texto del CeCILL usa un par de términos tendenciosos que deberían "
 "evitarse: &ldquo;propiedad intelectual&rdquo; (véase <a href=\"/philosophy/"
@@ -1995,12 +2025,19 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software non-free.  "
+#| "But it does cause <a href=\"/philosophy/bsd.html\">practical problems</"
+#| "a>, including incompatibility with the GNU GPL."
 msgid ""
 "This is a simple, permissive non-copyleft free software license with a "
 "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software non-free.  But it "
-"does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-"including incompatibility with the GNU GPL."
+"is not fatal; that is, it does not render the software nonfree.  But it does "
+"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+"incompatibility with the GNU GPL."
 msgstr ""
 "Esta es una licencia simple y permisiva de software libre, sin copyleft, con "
 "un serio fallo; la &ldquo;nociva cláusula de publicidad de BSD&rdquo;. Dicho 
"
@@ -2118,9 +2155,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
+#| "\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use "
+#| "this license."
 msgid ""
 "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
-"\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
+"\"#apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
 "license."
 msgstr ""
 "Versiones recientes de Condor (de 6.9.5 en adelante) son publicadas bajo la "
@@ -2341,12 +2383,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The reason this requirement is acceptable for LaTeX is that TeX has a "
+#| "facility to allow you to map file names, to specify &ldquo;use file bar "
+#| "when file foo is requested&rdquo;.  With this facility, the requirement "
+#| "is merely annoying; without the facility, the same requirement would be a "
+#| "serious obstacle, and we would have to conclude it makes the program non-"
+#| "free."
 msgid ""
 "The reason this requirement is acceptable for LaTeX is that TeX has a "
 "facility to allow you to map file names, to specify &ldquo;use file bar when "
 "file foo is requested&rdquo;.  With this facility, the requirement is merely "
 "annoying; without the facility, the same requirement would be a serious "
-"obstacle, and we would have to conclude it makes the program non-free."
+"obstacle, and we would have to conclude it makes the program nonfree."
 msgstr ""
 "La razón por la cual este requerimiento es aceptable para LaTeX, es que TeX "
 "posee una facilidad que permite mapear nombres de archivos; para ser "
@@ -2376,9 +2426,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The LPPL says that some files, in certain versions of LaTeX, may have "
+#| "additional restrictions, which could render them non-free.  For this "
+#| "reason, it may take some careful checking to produce a version of LaTeX "
+#| "that is free software."
 msgid ""
 "The LPPL says that some files, in certain versions of LaTeX, may have "
-"additional restrictions, which could render them non-free.  For this reason, "
+"additional restrictions, which could render them nonfree.  For this reason, "
 "it may take some careful checking to produce a version of LaTeX that is free "
 "software."
 msgstr ""
@@ -2715,12 +2771,19 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The license of OpenSSL is a conjunction of two licenses, one of them "
+#| "being the license of SSLeay.  You must follow both.  The combination "
+#| "results in a copyleft free software license that is incompatible with the "
+#| "GNU GPL.  It also has an advertising clause like the original BSD license "
+#| "and the Apache license."
 msgid ""
 "The license of OpenSSL is a conjunction of two licenses, one of them being "
 "the license of SSLeay.  You must follow both.  The combination results in a "
 "copyleft free software license that is incompatible with the GNU GPL.  It "
-"also has an advertising clause like the original BSD license and the Apache "
-"license."
+"also has an advertising clause like the <a href=\"#OriginalBSD\">original "
+"BSD license</a> and the <a href=\"#apache1\">Apache&nbsp;1 license</a>."
 msgstr ""
 "La licencia de OpenSSL es una mezcla de dos licencias, una de ellas la "
 "licencia de SSLeay. Ambas deben seguirse. La combinación resulta en una "
@@ -3107,9 +3170,14 @@
 "compatible con la GPL."
 
 #. type: Content of: <h3>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+#| "Non-Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
+#| "href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgid ""
-"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> Non-"
-"Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
+"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+"Nonfree Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
 "\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgstr ""
 "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses"
@@ -3119,9 +3187,15 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a> licenses.  A non-free license "
+#| "is automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</"
+#| "strong>"
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
-"philosophy/free-sw.html\">free software</a> licenses.  A non-free license is "
+"philosophy/free-sw.html\">free software</a> licenses.  A nonfree license is "
 "automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</strong>"
 msgstr ""
 "<strong>Las siguientes licencias <em>no se califican</em> como <a href=\"/"
@@ -3131,17 +3205,27 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Of course, we urge you to avoid using non-free software licenses, and to "
+#| "avoid non-free software in general."
 msgid ""
-"Of course, we urge you to avoid using non-free software licenses, and to "
-"avoid non-free software in general."
+"Of course, we urge you to avoid using nonfree software licenses, and to "
+"avoid nonfree software in general."
 msgstr ""
 "Por supuesto, le urgimos a evitar utilizar licencias de software privativas "
 "y software privativo en general."
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "There is no way we could list all the known non-free software licenses "
+#| "here; after all, every proprietary software company has its own.  We "
+#| "focus here on licenses that are often mistaken for free software licenses "
+#| "but are, in fact, <strong>not</strong> free software licenses."
 msgid ""
-"There is no way we could list all the known non-free software licenses here; "
+"There is no way we could list all the known nonfree software licenses here; "
 "after all, every proprietary software company has its own.  We focus here on "
 "licenses that are often mistaken for free software licenses but are, in "
 "fact, <strong>not</strong> free software licenses."
@@ -3153,11 +3237,20 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We have provided links to these licenses when we can do so without "
+#| "violating our general policy: that we do not make links to sites that "
+#| "promote, encourage or facilitate the use of non-free software packages.  "
+#| "The last thing we want to do is give any non-free program some gratis "
+#| "publicity that might encourage more people to use it.  For the same "
+#| "reason, we have avoided naming the programs for which a license is used, "
+#| "unless we think that for specific reasons it won't backfire."
 msgid ""
 "We have provided links to these licenses when we can do so without violating "
 "our general policy: that we do not make links to sites that promote, "
-"encourage or facilitate the use of non-free software packages.  The last "
-"thing we want to do is give any non-free program some gratis publicity that "
+"encourage or facilitate the use of nonfree software packages.  The last "
+"thing we want to do is give any nonfree program some gratis publicity that "
 "might encourage more people to use it.  For the same reason, we have avoided "
 "naming the programs for which a license is used, unless we think that for "
 "specific reasons it won't backfire."
@@ -3203,12 +3296,18 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
+#| "\">not free software licenses (follow the link for more explanation)</"
+#| "a>.  Please don't use these licenses, and we urge you to avoid any "
+#| "software that has been released under them.  <a href=\"#apsl2\">Version "
+#| "2.0 of the APSL</a> is a free software license."
 msgid ""
 "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
-"\">not free software licenses (follow the link for more explanation)</a>.  "
-"Please don't use these licenses, and we urge you to avoid any software that "
-"has been released under them.  <a href=\"#apsl2\">Version 2.0 of the APSL</"
-"a> is a free software license."
+"\">not free software licenses</a>.  Please don't use these licenses, and we "
+"urge you to avoid any software that has been released under them.  <a href="
+"\"#apsl2\">Version 2.0 of the APSL</a> is a free software license."
 msgstr ""
 "Las versiones 1.0, 1.1 y 1.2 son <a href=\"/philosophy/historical-apsl.html"
 "\">licencias de software no libre (siga el enlace para una explicación más "
@@ -3248,8 +3347,12 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The AT&amp;T Public License is a non-free license.  It has several "
+#| "serious problems:"
 msgid ""
-"The AT&amp;T Public License is a non-free license.  It has several serious "
+"The AT&amp;T Public License is a nonfree license.  It has several serious "
 "problems:"
 msgstr ""
 "La AT&amp;T Public License es una licencia de software privativo. Posee "
@@ -3321,11 +3424,18 @@
 
 # type: Content of: <dl><dd><ol><li>
 #. type: Content of: <dl><dd><ol><li>
+#, fuzzy
+#| msgid ""
+#| "It asserts one needs a license from AT&amp;T to make a link to their web "
+#| "site.  This is not an immediate practical problem, since the license says "
+#| "it gives permission to make such a link.  (Anyway, people shouldn't make "
+#| "links to sites about non-free software.)  But such a claim should not be "
+#| "made or propagated."
 msgid ""
 "It asserts one needs a license from AT&amp;T to make a link to their web "
 "site.  This is not an immediate practical problem, since the license says it "
 "gives permission to make such a link.  (Anyway, people shouldn't make links "
-"to sites about non-free software.)  But such a claim should not be made or "
+"to sites about nonfree software.)  But such a claim should not be made or "
 "propagated."
 msgstr ""
 "Admite que uno necesita una licencia de AT&amp;T para hacer un enlace al "
@@ -3380,9 +3490,13 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
+#| "additional permission for linking with non-free programs."
 msgid ""
 "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
-"additional permission for linking with non-free programs."
+"additional permission for linking with nonfree programs."
 msgstr ""
 "Al día de hoy <a href=\"#eCos20\">eCos está disponible</a> bajo la GPL de "
 "GNU con permisos adicionales para el enlazado con programas privativos."
@@ -3402,10 +3516,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
+#| "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;"
+#| "blica&rdquo;) is non-free for several reasons:"
 msgid ""
 "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
 "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) "
-"is non-free for several reasons:"
+"is nonfree for several reasons:"
 msgstr ""
 "La GPL-PA (cuyo nombre original en Portugués es &ldquo;Licen&ccedil;a "
 "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) "
@@ -3536,8 +3655,12 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The lha license must be considered non-free because it is so vague that "
+#| "you cannot be sure what permissions you have."
 msgid ""
-"The lha license must be considered non-free because it is so vague that you "
+"The lha license must be considered nonfree because it is so vague that you "
 "cannot be sure what permissions you have."
 msgstr ""
 "La licencia lha debe ser considerada como no libre porque es tan ambigua que "
@@ -3716,8 +3839,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The Reciprocal Public License is a non-free license because of three "
+#| "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  "
+#| "2.&nbsp;It requires notification of the original developer for "
+#| "publication of a modified version.  3.&nbsp;It requires publication of "
+#| "any modified version that an organization uses, even privately."
 msgid ""
-"The Reciprocal Public License is a non-free license because of three "
+"The Reciprocal Public License is a nonfree license because of three "
 "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  2."
 "&nbsp;It requires notification of the original developer for publication of "
 "a modified version.  3.&nbsp;It requires publication of any modified version "
@@ -3762,8 +3892,12 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Despite the name, this is a software license, and it's non-free for "
+#| "several reasons:"
 msgid ""
-"Despite the name, this is a software license, and it's non-free for several "
+"Despite the name, this is a software license, and it's nonfree for several "
 "reasons:"
 msgstr ""
 "A pesar de su nombre, es una licencia de software, y no es libre por varias "
@@ -3901,9 +4035,15 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/";
+#| "license/\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href="
+#| "\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgid ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
-"\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> <span class="
+"\"> SystemC &ldquo;Open Source&rdquo; License, Version 3.0</a> <span class="
 "\"anchor-reference-id\"> (<a href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgstr ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
@@ -3912,12 +4052,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license requires all recipients to proactively help the licensor "
+#| "enforce its trademarks.  This is an unreasonable condition to place on "
+#| "users' rights, so the license is non-free.  It also has other practical "
+#| "problems: some of the requirements are vague, and it uses the term <a "
+#| "href=\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</"
+#| "a>."
 msgid ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
-"users' rights, so the license is non-free.  It also has other practical "
+"users' rights, so the license is nonfree.  It also has other practical "
 "problems: some of the requirements are vague, and it uses the term <a href="
-"\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</a>."
+"\"/philosophy/not-ipr.html\">&ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "Esta licencia requiere que todos aquellos que reciban el software ayuden "
 "proactivamente al licenciatario en la protección de sus marcas comerciales. "
@@ -3950,8 +4098,16 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The University of Utah Public License is a non-free license because it "
+#| "does not allow commercial redistribution.  It also purports to restrict "
+#| "commercially running the software and even commercially giving "
+#| "consultation about it.  Those restrictions are probably not legally "
+#| "enforceable under US copyright law, but they might be in some countries; "
+#| "even asserting them is outrageous."
 msgid ""
-"The University of Utah Public License is a non-free license because it does "
+"The University of Utah Public License is a nonfree license because it does "
 "not allow commercial redistribution.  It also purports to restrict "
 "commercially running the software and even commercially giving consultation "
 "about it.  Those restrictions are probably not legally enforceable under US "
@@ -4007,11 +4163,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is not a free software license.  The license prohibits distribution "
+#| "for a fee, and that makes it impossible for the software to be included "
+#| "in the many CD-ROM free software collections that are sold by companies "
+#| "and by organizations such as the FSF."
 msgid ""
 "This is not a free software license.  The license prohibits distribution for "
 "a fee, and that makes it impossible for the software to be included in the "
 "many CD-ROM free software collections that are sold by companies and by "
-"organizations such as the FSF."
+"organizations."
 msgstr ""
 "Esta no es una licencia de software libre. Prohíbe la distribución onerosa 
y "
 "vuelve imposible incluir los programas en muchas colecciones de software "
@@ -4029,9 +4191,13 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "(The YaST software itself no longer uses this non-free YaST license; "
+#| "happily, it is now free software, released under the GNU GPL.)"
 msgid ""
-"(The YaST software itself no longer uses this non-free YaST license; "
-"happily, it is now free software, released under the GNU GPL.)"
+"(The YaST software itself no longer uses this nonfree YaST license; happily, "
+"it is now free software, released under the GNU GPL.)"
 msgstr ""
 "(El software de YaST no utiliza más esta licencia privativa. Afortunadamente 
"
 "ahora es software libre, publicado bajo la GPL de GNU)."
@@ -4098,8 +4264,15 @@
 # type: Content of: <dl><dd><p>
 # No veo la razón para que "Free Documentation" se encuentre escrito con 
mayúsculas, ya que no es un nombre propio. Por éllo lo cambié a minúsculas 
y lo traduje.
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a Free Documentation license that is incompatible with the GNU "
+#| "FDL.  It is incompatible because Section&nbsp;(2c) says &ldquo;You add no "
+#| "other terms or conditions to those of this License&rdquo;, and the GNU "
+#| "FDL has additional terms not accounted for in the Common Documentation "
+#| "License."
 msgid ""
-"This is a Free Documentation license that is incompatible with the GNU FDL.  "
+"This is a free documentation license that is incompatible with the GNU FDL.  "
 "It is incompatible because Section&nbsp;(2c) says &ldquo;You add no other "
 "terms or conditions to those of this License&rdquo;, and the GNU FDL has "
 "additional terms not accounted for in the Common Documentation License."
@@ -4145,12 +4318,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license <strong>can</strong> be used as a free documentation "
+#| "license.  It is a copyleft free documentation license <strong>provided</"
+#| "strong> the copyright holder does not exercise any of the &ldquo;LICENSE "
+#| "OPTIONS&rdquo; listed in Section VI of the license.  But if either of the "
+#| "options is invoked, the license becomes non-free.  In any case, it is "
+#| "incompatible with the GNU FDL."
 msgid ""
 "This license <strong>can</strong> be used as a free documentation license.  "
 "It is a copyleft free documentation license <strong>provided</strong> the "
 "copyright holder does not exercise any of the &ldquo;LICENSE OPTIONS&rdquo; "
 "listed in Section VI of the license.  But if either of the options is "
-"invoked, the license becomes non-free.  In any case, it is incompatible with "
+"invoked, the license becomes nonfree.  In any case, it is incompatible with "
 "the GNU FDL."
 msgstr ""
 "Esta licencia <strong>puede</strong> ser utilizada como de documentación "
@@ -4162,12 +4343,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This creates a practical pitfall in using or recommending this license: "
+#| "if you recommend &ldquo;Use the Open Publication License, Version 1.0 but "
+#| "don't enable the options&rdquo;, it would be easy for the second half of "
+#| "that recommendation to get forgotten; someone might use the license with "
+#| "the options, making a manual non-free, and yet think he or she is "
+#| "following your advice."
 msgid ""
 "This creates a practical pitfall in using or recommending this license: if "
 "you recommend &ldquo;Use the Open Publication License, Version 1.0 but don't "
 "enable the options&rdquo;, it would be easy for the second half of that "
 "recommendation to get forgotten; someone might use the license with the "
-"options, making a manual non-free, and yet think he or she is following your "
+"options, making a manual nonfree, and yet think he or she is following your "
 "advice."
 msgstr ""
 "Esto crea una trampa en la práctica el usar o recomendar esta licencia: si "
@@ -4178,11 +4367,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Likewise, if you use this license without either of the options to make "
+#| "your manual free, someone else might decide to imitate you, then change "
+#| "his or her mind about the options thinking that that is just a detail; "
+#| "the result would be that his or her manual is non-free."
 msgid ""
 "Likewise, if you use this license without either of the options to make your "
 "manual free, someone else might decide to imitate you, then change his or "
 "her mind about the options thinking that that is just a detail; the result "
-"would be that his or her manual is non-free."
+"would be that his or her manual is nonfree."
 msgstr ""
 "De forma similar, si utiliza esta licencia sin ninguna de las opciones para "
 "hacer un manual libre, alguien podría imitarlo, pero creyendo que las "
@@ -4219,8 +4414,14 @@
 "la gente comprenda lo que se está diciendo."
 
 #. type: Content of: <h3>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
+#| "a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>)  </"
+#| "span>"
 msgid ""
-"<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</a> "
+"<a id=\"NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a> "
 "<span class=\"anchor-reference-id\"> (<a href=\"#NonFreeDocumentationLicenses"
 "\">#NonFreeDocumentationLicenses</a>)  </span>"
 msgstr ""

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- licenses/po/license-list.fr.po      18 Mar 2012 20:47:30 -0000      1.113
+++ licenses/po/license-list.fr.po      20 Apr 2012 16:28:06 -0000      1.114
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-02-22 20:27-0500\n"
+"POT-Creation-Date: 2012-04-20 12:25-0300\n"
 "PO-Revision-Date: 2012-02-23 22:46+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-20 12:25-0300\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -59,7 +60,11 @@
 "incompatibles avec la GPL</a>"
 
 #. type: Content of: <ul><li><ul><li>
-msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+# | <a [-href=\"#NonFreeSoftwareLicenses\">Non-Free-]
+# | {+href=\"#NonFreeSoftwareLicenses\">Nonfree+} Software Licenses</a>
+#, fuzzy
+#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
 msgstr ""
 "<a href=\"#NonFreeSoftwareLicense\">Licences de logiciels non libres</a>"
 
@@ -74,9 +79,14 @@
 "documentation</a>"
 
 #. type: Content of: <ul><li><ul><li>
+# | <a href=\"#NonFreeDocumentationLicenses\"> [-Non-Free-] {+Nonfree+}
+# | Documentation Licenses</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation "
+#| "Licenses</a>"
 msgid ""
-"<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
-"a>"
+"<a href=\"#NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a>"
 msgstr ""
 "<a href=\"#NonFreeDocumentationLicenses\">Licences non libres pour la "
 "documentation</a>"
@@ -324,9 +334,19 @@
 "\">#LGPLv3</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is the latest version of the LGPL: a free software license, but not a
+# | strong copyleft license, because it permits linking with non[---]free
+# | modules.  It is compatible with GPLv3.  We recommend it for <a
+# | href=\"/licenses/why-not-lgpl.html\">special circumstances only</a>.
+#, fuzzy
+#| msgid ""
+#| "This is the latest version of the LGPL: a free software license, but not "
+#| "a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv3.  We recommend it for <a href=\"/"
+#| "licenses/why-not-lgpl.html\">special circumstances only</a>."
 msgid ""
 "This is the latest version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv3.  We recommend it for <a href=\"/licenses/why-"
 "not-lgpl.html\">special circumstances only</a>."
 msgstr ""
@@ -362,9 +382,25 @@
 "reference-id\"> (<a href=\"#LGPLv2.1\">#LGPLv2.1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is the previous version of the LGPL: a free software license, but not
+# | a strong copyleft license, because it permits linking with non[---]free
+# | modules.  It is compatible with GPLv2 and GPLv3.  We generally recommend
+# | <a href=\"#LGPL\">the latest version of the LGPL</a>, <a
+# | href=\"/licenses/why-not-lgpl.html\">for special circumstances only</a>. 
+# | To learn more about how LGPLv2.1 is compatible with other GNU licenses,
+# | please <a href=\"/licenses/gpl-faq.html#AllCompatibility\">see our FAQ</a>.
+#, fuzzy
+#| msgid ""
+#| "This is the previous version of the LGPL: a free software license, but "
+#| "not a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv2 and GPLv3.  We generally recommend "
+#| "<a href=\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/"
+#| "why-not-lgpl.html\">for special circumstances only</a>.  To learn more "
+#| "about how LGPLv2.1 is compatible with other GNU licenses, please <a href="
+#| "\"/licenses/gpl-faq.html#AllCompatibility\">see our FAQ</a>."
 msgid ""
 "This is the previous version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv2 and GPLv3.  We generally recommend <a href="
 "\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/why-not-"
 "lgpl.html\">for special circumstances only</a>.  To learn more about how "
@@ -646,14 +682,34 @@
 "compatible avec la GNU GPL."
 
 #. type: Content of: <dl><dd><p>
+# | The text of the CeCILL uses a couple of biased terms that ought to be
+# | avoided: [-&ldquo;intellectual property&rdquo; (see-] <a
+# | [-href=\"/philosophy/not-ipr.xhtml\">this article</a>)-]
+# | {+href=\"/philosophy/not-ipr.html\">&ldquo;intellectual
+# | property&rdquo;</a>+} and [-&ldquo;protection&rdquo; (see-] <a
+# | [-href=\"/philosophy/words-to-avoid.html\">this article</a>);-]
+# | {+href=\"/philosophy/words-to-avoid.html#Protection\">
+# | &ldquo;protection&rdquo;</a>;+} this decision was unfortunate, because
+# | reading the license tends to spread the presuppositions of those terms. 
+# | However, this does not cause any particular problem for the programs
+# | released under the CeCILL.
+#, fuzzy
+#| msgid ""
+#| "The text of the CeCILL uses a couple of biased terms that ought to be "
+#| "avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/"
+#| "not-ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a "
+#| "href=\"/philosophy/words-to-avoid.html\">this article</a>); this decision "
+#| "was unfortunate, because reading the license tends to spread the "
+#| "presuppositions of those terms.  However, this does not cause any "
+#| "particular problem for the programs released under the CeCILL."
 msgid ""
 "The text of the CeCILL uses a couple of biased terms that ought to be "
-"avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/not-"
-"ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a href=\"/"
-"philosophy/words-to-avoid.html\">this article</a>); this decision was "
-"unfortunate, because reading the license tends to spread the presuppositions "
-"of those terms.  However, this does not cause any particular problem for the "
-"programs released under the CeCILL."
+"avoided: <a href=\"/philosophy/not-ipr.html\">&ldquo;intellectual "
+"property&rdquo;</a> and <a href=\"/philosophy/words-to-avoid.html#Protection"
+"\"> &ldquo;protection&rdquo;</a>; this decision was unfortunate, because "
+"reading the license tends to spread the presuppositions of those terms.  "
+"However, this does not cause any particular problem for the programs "
+"released under the CeCILL."
 msgstr ""
 "Le texte de la licence CeCILL utilise des mots partiaux qui doivent être "
 "évités&nbsp;: «&nbsp;propriété intellectuelle&nbsp;» (voir <a href=\"/"
@@ -1856,12 +1912,24 @@
 "appelée «&nbsp;Licence BSD à quatre clauses&nbsp;»)."
 
 #. type: Content of: <dl><dd><p>
+# | This is a simple, permissive non-copyleft free software license with a
+# | serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The
+# | flaw is not fatal; that is, it does not render the software non[---]free. 
+# | But it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>,
+# | including incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software non-free.  "
+#| "But it does cause <a href=\"/philosophy/bsd.html\">practical problems</"
+#| "a>, including incompatibility with the GNU GPL."
 msgid ""
 "This is a simple, permissive non-copyleft free software license with a "
 "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software non-free.  But it "
-"does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-"including incompatibility with the GNU GPL."
+"is not fatal; that is, it does not render the software nonfree.  But it does "
+"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+"incompatibility with the GNU GPL."
 msgstr ""
 "C'est une licence de logiciel libre, simple et permissive, mais ce n'est pas "
 "un copyleft et elle comporte un grave défaut&nbsp;: l'odieuse «&nbsp;clause 
"
@@ -1975,9 +2043,17 @@
 "id\"> (<a href=\"#Condor\">#Condor</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | Recent versions of Condor (from 6.9.5 on) are released under the <a
+# | href=\"#[-A-]{+a+}pache2\">Apache License 2.0</a>.  Only older versions of
+# | Condor use this license.
+#, fuzzy
+#| msgid ""
+#| "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
+#| "\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use "
+#| "this license."
 msgid ""
 "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
-"\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
+"\"#apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
 "license."
 msgstr ""
 "Les versions récentes de Condor (à partir de la 6.9.5) sont distribuées 
sous "
@@ -2188,12 +2264,26 @@
 "doive être renommé."
 
 #. type: Content of: <dl><dd><p>
+# | The reason this requirement is acceptable for LaTeX is that TeX has a
+# | facility to allow you to map file names, to specify &ldquo;use file bar
+# | when file foo is requested&rdquo;.  With this facility, the requirement is
+# | merely annoying; without the facility, the same requirement would be a
+# | serious obstacle, and we would have to conclude it makes the program
+# | non[---]free.
+#, fuzzy
+#| msgid ""
+#| "The reason this requirement is acceptable for LaTeX is that TeX has a "
+#| "facility to allow you to map file names, to specify &ldquo;use file bar "
+#| "when file foo is requested&rdquo;.  With this facility, the requirement "
+#| "is merely annoying; without the facility, the same requirement would be a "
+#| "serious obstacle, and we would have to conclude it makes the program non-"
+#| "free."
 msgid ""
 "The reason this requirement is acceptable for LaTeX is that TeX has a "
 "facility to allow you to map file names, to specify &ldquo;use file bar when "
 "file foo is requested&rdquo;.  With this facility, the requirement is merely "
 "annoying; without the facility, the same requirement would be a serious "
-"obstacle, and we would have to conclude it makes the program non-free."
+"obstacle, and we would have to conclude it makes the program nonfree."
 msgstr ""
 "Pour LaTeX cette exigence est acceptable parce que ce logiciel comporte une "
 "fonctionnalité permettant de faire correspondre des noms de fichiers entre "
@@ -2224,9 +2314,19 @@
 "libre dans le contexte d'origine."
 
 #. type: Content of: <dl><dd><p>
+# | The LPPL says that some files, in certain versions of LaTeX, may have
+# | additional restrictions, which could render them non[---]free.  For this
+# | reason, it may take some careful checking to produce a version of LaTeX
+# | that is free software.
+#, fuzzy
+#| msgid ""
+#| "The LPPL says that some files, in certain versions of LaTeX, may have "
+#| "additional restrictions, which could render them non-free.  For this "
+#| "reason, it may take some careful checking to produce a version of LaTeX "
+#| "that is free software."
 msgid ""
 "The LPPL says that some files, in certain versions of LaTeX, may have "
-"additional restrictions, which could render them non-free.  For this reason, "
+"additional restrictions, which could render them nonfree.  For this reason, "
 "it may take some careful checking to produce a version of LaTeX that is free "
 "software."
 msgstr ""
@@ -2539,12 +2639,25 @@
 "\">#OpenSSL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The license of OpenSSL is a conjunction of two licenses, one of them being
+# | the license of SSLeay.  You must follow both.  The combination results in
+# | a copyleft free software license that is incompatible with the GNU GPL. 
+# | It also has an advertising clause like the [-original-] {+<a
+# | href=\"#OriginalBSD\">original+} BSD [-license-] {+license</a>+} and the
+# | [-Apache license.-] {+<a href=\"#apache1\">Apache&nbsp;1 license</a>.+}
+#, fuzzy
+#| msgid ""
+#| "The license of OpenSSL is a conjunction of two licenses, one of them "
+#| "being the license of SSLeay.  You must follow both.  The combination "
+#| "results in a copyleft free software license that is incompatible with the "
+#| "GNU GPL.  It also has an advertising clause like the original BSD license "
+#| "and the Apache license."
 msgid ""
 "The license of OpenSSL is a conjunction of two licenses, one of them being "
 "the license of SSLeay.  You must follow both.  The combination results in a "
 "copyleft free software license that is incompatible with the GNU GPL.  It "
-"also has an advertising clause like the original BSD license and the Apache "
-"license."
+"also has an advertising clause like the <a href=\"#OriginalBSD\">original "
+"BSD license</a> and the <a href=\"#apache1\">Apache&nbsp;1 license</a>."
 msgstr ""
 "La licence OpenSSL est la conjonction de deux licences, l'une d'elle étant "
 "la licence de SSLeay. Vous devez suivre les deux. Le résultat est une "
@@ -2909,9 +3022,18 @@
 "compatible avec la GPL."
 
 #. type: Content of: <h3>
+# | <a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\">
+# | [-Non-Free-] {+Nonfree+} Software Licenses</a> <span
+# | class=\"anchor-reference-id\"> (<a
+# | href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+#| "Non-Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
+#| "href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgid ""
-"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> Non-"
-"Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
+"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+"Nonfree Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
 "\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgstr ""
 "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
@@ -2919,9 +3041,19 @@
 "(<a href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 
 #. type: Content of: <p>
+# | <strong>The following licenses <em>do not qualify</em> as <a
+# | href=\"/philosophy/free-sw.html\">free software</a> licenses.  A
+# | non[---]free license is automatically incompatible with the <a
+# | href=\"#GNUGPL\">GNU GPL</a>.</strong>
+#, fuzzy
+#| msgid ""
+#| "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a> licenses.  A non-free license "
+#| "is automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</"
+#| "strong>"
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
-"philosophy/free-sw.html\">free software</a> licenses.  A non-free license is "
+"philosophy/free-sw.html\">free software</a> licenses.  A nonfree license is "
 "automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</strong>"
 msgstr ""
 "<strong>Les licences suivantes <em>ne méritent pas</em> l'appellation de <a "
@@ -2930,17 +3062,33 @@
 "\"#GNUGPL\">GPL de GNU</a>.</strong>"
 
 #. type: Content of: <p>
+# | Of course, we urge you to avoid using non[---]free software licenses, and
+# | to avoid non[---]free software in general.
+#, fuzzy
+#| msgid ""
+#| "Of course, we urge you to avoid using non-free software licenses, and to "
+#| "avoid non-free software in general."
 msgid ""
-"Of course, we urge you to avoid using non-free software licenses, and to "
-"avoid non-free software in general."
+"Of course, we urge you to avoid using nonfree software licenses, and to "
+"avoid nonfree software in general."
 msgstr ""
 "Bien entendu, nous vous demandons instamment d'éviter l'usage de licences de 
"
 "logiciels non libres et aussi, plus généralement, l'usage de logiciels non "
 "libres."
 
 #. type: Content of: <p>
+# | There is no way we could list all the known non[---]free software licenses
+# | here; after all, every proprietary software company has its own.  We focus
+# | here on licenses that are often mistaken for free software licenses but
+# | are, in fact, <strong>not</strong> free software licenses.
+#, fuzzy
+#| msgid ""
+#| "There is no way we could list all the known non-free software licenses "
+#| "here; after all, every proprietary software company has its own.  We "
+#| "focus here on licenses that are often mistaken for free software licenses "
+#| "but are, in fact, <strong>not</strong> free software licenses."
 msgid ""
-"There is no way we could list all the known non-free software licenses here; "
+"There is no way we could list all the known nonfree software licenses here; "
 "after all, every proprietary software company has its own.  We focus here on "
 "licenses that are often mistaken for free software licenses but are, in "
 "fact, <strong>not</strong> free software licenses."
@@ -2952,11 +3100,27 @@
 "strong>."
 
 #. type: Content of: <p>
+# | We have provided links to these licenses when we can do so without
+# | violating our general policy: that we do not make links to sites that
+# | promote, encourage or facilitate the use of non[---]free software
+# | packages.  The last thing we want to do is give any non[---]free program
+# | some gratis publicity that might encourage more people to use it.  For the
+# | same reason, we have avoided naming the programs for which a license is
+# | used, unless we think that for specific reasons it won't backfire.
+#, fuzzy
+#| msgid ""
+#| "We have provided links to these licenses when we can do so without "
+#| "violating our general policy: that we do not make links to sites that "
+#| "promote, encourage or facilitate the use of non-free software packages.  "
+#| "The last thing we want to do is give any non-free program some gratis "
+#| "publicity that might encourage more people to use it.  For the same "
+#| "reason, we have avoided naming the programs for which a license is used, "
+#| "unless we think that for specific reasons it won't backfire."
 msgid ""
 "We have provided links to these licenses when we can do so without violating "
 "our general policy: that we do not make links to sites that promote, "
-"encourage or facilitate the use of non-free software packages.  The last "
-"thing we want to do is give any non-free program some gratis publicity that "
+"encourage or facilitate the use of nonfree software packages.  The last "
+"thing we want to do is give any nonfree program some gratis publicity that "
 "might encourage more people to use it.  For the same reason, we have avoided "
 "naming the programs for which a license is used, unless we think that for "
 "specific reasons it won't backfire."
@@ -3002,12 +3166,24 @@
 "\"#apsl1\">#apsl1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | Versions 1.0, 1.1 and 1.2 are <a
+# | href=\"/philosophy/historical-apsl.html\">not free software [-licenses
+# | (follow the link for more explanation)</a>.-] {+licenses</a>.+}  Please
+# | don't use these licenses, and we urge you to avoid any software that has
+# | been released under them.  <a href=\"#apsl2\">Version 2.0 of the APSL</a>
+# | is a free software license.
+#, fuzzy
+#| msgid ""
+#| "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
+#| "\">not free software licenses (follow the link for more explanation)</"
+#| "a>.  Please don't use these licenses, and we urge you to avoid any "
+#| "software that has been released under them.  <a href=\"#apsl2\">Version "
+#| "2.0 of the APSL</a> is a free software license."
 msgid ""
 "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
-"\">not free software licenses (follow the link for more explanation)</a>.  "
-"Please don't use these licenses, and we urge you to avoid any software that "
-"has been released under them.  <a href=\"#apsl2\">Version 2.0 of the APSL</"
-"a> is a free software license."
+"\">not free software licenses</a>.  Please don't use these licenses, and we "
+"urge you to avoid any software that has been released under them.  <a href="
+"\"#apsl2\">Version 2.0 of the APSL</a> is a free software license."
 msgstr ""
 "Les versions 1.0, 1.1, et 1.2 <a href=\"/philosophy/historical-apsl.html"
 "\">ne sont pas des licences de logiciels libres (pour plus "
@@ -3045,8 +3221,14 @@
 "reference-id\"> (<a href=\"#ATTPublicLicense\">#ATTPublicLicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The AT&amp;T Public License is a non[---]free license.  It has several
+# | serious problems:
+#, fuzzy
+#| msgid ""
+#| "The AT&amp;T Public License is a non-free license.  It has several "
+#| "serious problems:"
 msgid ""
-"The AT&amp;T Public License is a non-free license.  It has several serious "
+"The AT&amp;T Public License is a nonfree license.  It has several serious "
 "problems:"
 msgstr ""
 "La licence publique AT&amp;T est une licence non libre. Elle comporte "
@@ -3113,11 +3295,23 @@
 "au-delà de l'usage de votre code, et même de votre code modifié&nbsp;;"
 
 #. type: Content of: <dl><dd><ol><li>
+# | It asserts one needs a license from AT&amp;T to make a link to their web
+# | site.  This is not an immediate practical problem, since the license says
+# | it gives permission to make such a link.  (Anyway, people shouldn't make
+# | links to sites about non[---]free software.)  But such a claim should not
+# | be made or propagated.
+#, fuzzy
+#| msgid ""
+#| "It asserts one needs a license from AT&amp;T to make a link to their web "
+#| "site.  This is not an immediate practical problem, since the license says "
+#| "it gives permission to make such a link.  (Anyway, people shouldn't make "
+#| "links to sites about non-free software.)  But such a claim should not be "
+#| "made or propagated."
 msgid ""
 "It asserts one needs a license from AT&amp;T to make a link to their web "
 "site.  This is not an immediate practical problem, since the license says it "
 "gives permission to make such a link.  (Anyway, people shouldn't make links "
-"to sites about non-free software.)  But such a claim should not be made or "
+"to sites about nonfree software.)  But such a claim should not be made or "
 "propagated."
 msgstr ""
 "la prétention d'imposer une autorisation de leur part pour établir un lien "
@@ -3172,9 +3366,15 @@
 "problèmes, nous ne sommes pas sûrs de leur sens."
 
 #. type: Content of: <dl><dd><p>
+# | Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with
+# | additional permission for linking with non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
+#| "additional permission for linking with non-free programs."
 msgid ""
 "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
-"additional permission for linking with non-free programs."
+"additional permission for linking with nonfree programs."
 msgstr ""
 "Actuellement, <a href=\"#eCos20\">eCos est disponible</a> sous la GNU GPL "
 "avec en plus l'autorisation de lier avec des programmes non libres."
@@ -3192,10 +3392,18 @@
 "href=\"#GPL-PA\">#GPL-PA</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a
+# | P&uacute;blica Geral para Administra&ccedil;&atilde;o
+# | P&uacute;blica&rdquo;) is non[---]free for several reasons:
+#, fuzzy
+#| msgid ""
+#| "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
+#| "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;"
+#| "blica&rdquo;) is non-free for several reasons:"
 msgid ""
 "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
 "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) "
-"is non-free for several reasons:"
+"is nonfree for several reasons:"
 msgstr ""
 "La GPL-PA (dont le nom original est en portugais «&nbsp;Licença P&uacute;"
 "blica Geral para Administraç&atilde;o P&uacute;blica&nbsp;») est non libre "
@@ -3317,8 +3525,14 @@
 "href=\"#Lha\">#Lha</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The lha license must be considered non[---]free because it is so vague
+# | that you cannot be sure what permissions you have.
+#, fuzzy
+#| msgid ""
+#| "The lha license must be considered non-free because it is so vague that "
+#| "you cannot be sure what permissions you have."
 msgid ""
-"The lha license must be considered non-free because it is so vague that you "
+"The lha license must be considered nonfree because it is so vague that you "
 "cannot be sure what permissions you have."
 msgstr ""
 "La licence Lha doit être considérée comme non libre car elle est trop "
@@ -3484,8 +3698,20 @@
 "href=\"#RPL\">#RPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The Reciprocal Public License is a non[---]free license because of three
+# | problems.  1.&nbsp;It puts limits on prices charged for an initial copy. 
+# | 2.&nbsp;It requires notification of the original developer for publication
+# | of a modified version.  3.&nbsp;It requires publication of any modified
+# | version that an organization uses, even privately.
+#, fuzzy
+#| msgid ""
+#| "The Reciprocal Public License is a non-free license because of three "
+#| "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  "
+#| "2.&nbsp;It requires notification of the original developer for "
+#| "publication of a modified version.  3.&nbsp;It requires publication of "
+#| "any modified version that an organization uses, even privately."
 msgid ""
-"The Reciprocal Public License is a non-free license because of three "
+"The Reciprocal Public License is a nonfree license because of three "
 "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  2."
 "&nbsp;It requires notification of the original developer for publication of "
 "a modified version.  3.&nbsp;It requires publication of any modified version "
@@ -3528,8 +3754,14 @@
 "href=\"#SML\">#SML</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | Despite the name, this is a software license, and it's non[---]free for
+# | several reasons:
+#, fuzzy
+#| msgid ""
+#| "Despite the name, this is a software license, and it's non-free for "
+#| "several reasons:"
 msgid ""
-"Despite the name, this is a software license, and it's non-free for several "
+"Despite the name, this is a software license, and it's nonfree for several "
 "reasons:"
 msgstr ""
 "En dépit de son nom, c'est une licence de logiciel, mais elle n'est pas "
@@ -3658,9 +3890,20 @@
 "d'usages privés. "
 
 #. type: Content of: <dl><dt>
+# | <a id=\"SystemC-3.0\"
+# | href=\"http://www.systemc.org/about/org_docs/license/\";> SystemC
+# | [-&quot;Open Source&quot;-] {+&ldquo;Open Source&rdquo;+} License, Version
+# | 3.0</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/";
+#| "license/\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href="
+#| "\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgid ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
-"\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> <span class="
+"\"> SystemC &ldquo;Open Source&rdquo; License, Version 3.0</a> <span class="
 "\"anchor-reference-id\"> (<a href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgstr ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
@@ -3669,12 +3912,26 @@
 "span>"
 
 #. type: Content of: <dl><dd><p>
+# | This license requires all recipients to proactively help the licensor
+# | enforce its trademarks.  This is an unreasonable condition to place on
+# | users' rights, so the license is non[---]free.  It also has other
+# | practical problems: some of the requirements are vague, and it uses the
+# | term <a href=\"/philosophy/not-ipr.[-x-]html\">&ldquo;intellectual
+# | property&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "This license requires all recipients to proactively help the licensor "
+#| "enforce its trademarks.  This is an unreasonable condition to place on "
+#| "users' rights, so the license is non-free.  It also has other practical "
+#| "problems: some of the requirements are vague, and it uses the term <a "
+#| "href=\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</"
+#| "a>."
 msgid ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
-"users' rights, so the license is non-free.  It also has other practical "
+"users' rights, so the license is nonfree.  It also has other practical "
 "problems: some of the requirements are vague, and it uses the term <a href="
-"\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</a>."
+"\"/philosophy/not-ipr.html\">&ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "Cette licence impose à tous les destinataires d'aider de façon active le "
 "donneur de licence à faire respecter sa marque déposée. Ce n'est pas une "
@@ -3704,8 +3961,22 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The University of Utah Public License is a non[---]free license because it
+# | does not allow commercial redistribution.  It also purports to restrict
+# | commercially running the software and even commercially giving
+# | consultation about it.  Those restrictions are probably not legally
+# | enforceable under US copyright law, but they might be in some countries;
+# | even asserting them is outrageous.
+#, fuzzy
+#| msgid ""
+#| "The University of Utah Public License is a non-free license because it "
+#| "does not allow commercial redistribution.  It also purports to restrict "
+#| "commercially running the software and even commercially giving "
+#| "consultation about it.  Those restrictions are probably not legally "
+#| "enforceable under US copyright law, but they might be in some countries; "
+#| "even asserting them is outrageous."
 msgid ""
-"The University of Utah Public License is a non-free license because it does "
+"The University of Utah Public License is a nonfree license because it does "
 "not allow commercial redistribution.  It also purports to restrict "
 "commercially running the software and even commercially giving consultation "
 "about it.  Those restrictions are probably not legally enforceable under US "
@@ -3758,11 +4029,21 @@
 "href=\"#YaST\">#YaST</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is not a free software license.  The license prohibits distribution
+# | for a fee, and that makes it impossible for the software to be included in
+# | the many CD-ROM free software collections that are sold by companies and
+# | by [-organizations such as the FSF.-] {+organizations.+}
+#, fuzzy
+#| msgid ""
+#| "This is not a free software license.  The license prohibits distribution "
+#| "for a fee, and that makes it impossible for the software to be included "
+#| "in the many CD-ROM free software collections that are sold by companies "
+#| "and by organizations such as the FSF."
 msgid ""
 "This is not a free software license.  The license prohibits distribution for "
 "a fee, and that makes it impossible for the software to be included in the "
 "many CD-ROM free software collections that are sold by companies and by "
-"organizations such as the FSF."
+"organizations."
 msgstr ""
 "Ce n'est pas une licence de logiciel libre. En effet, elle interdit toute "
 "distribution contre rétribution, ce qui empêche de l'inclure dans aucun des 
"
@@ -3778,9 +4059,15 @@
 "mot apparemment, du coup nous ne savons pas bien quel est le sens visé."
 
 #. type: Content of: <dl><dd><p>
+# | (The YaST software itself no longer uses this non[---]free YaST license;
+# | happily, it is now free software, released under the GNU GPL.)
+#, fuzzy
+#| msgid ""
+#| "(The YaST software itself no longer uses this non-free YaST license; "
+#| "happily, it is now free software, released under the GNU GPL.)"
 msgid ""
-"(The YaST software itself no longer uses this non-free YaST license; "
-"happily, it is now free software, released under the GNU GPL.)"
+"(The YaST software itself no longer uses this nonfree YaST license; happily, "
+"it is now free software, released under the GNU GPL.)"
 msgstr ""
 "(Le logiciel YaST lui-même n'utilise plus cette licence non libre "
 "YaST&nbsp;; c'est maintenant un logiciel libre, publié sous la licence GNU "
@@ -3844,8 +4131,20 @@
 "\"#ACDL\">#ACDL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-Free Documentation-] {+free documentation+} license that is
+# | incompatible with the GNU FDL.  It is incompatible because
+# | Section&nbsp;(2c) says &ldquo;You add no other terms or conditions to
+# | those of this License&rdquo;, and the GNU FDL has additional terms not
+# | accounted for in the Common Documentation License.
+#, fuzzy
+#| msgid ""
+#| "This is a Free Documentation license that is incompatible with the GNU "
+#| "FDL.  It is incompatible because Section&nbsp;(2c) says &ldquo;You add no "
+#| "other terms or conditions to those of this License&rdquo;, and the GNU "
+#| "FDL has additional terms not accounted for in the Common Documentation "
+#| "License."
 msgid ""
-"This is a Free Documentation license that is incompatible with the GNU FDL.  "
+"This is a free documentation license that is incompatible with the GNU FDL.  "
 "It is incompatible because Section&nbsp;(2c) says &ldquo;You add no other "
 "terms or conditions to those of this License&rdquo;, and the GNU FDL has "
 "additional terms not accounted for in the Common Documentation License."
@@ -3887,12 +4186,26 @@
 "\">#OpenPublicationL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This license <strong>can</strong> be used as a free documentation license.
+# |  It is a copyleft free documentation license <strong>provided</strong> the
+# | copyright holder does not exercise any of the &ldquo;LICENSE
+# | OPTIONS&rdquo; listed in Section VI of the license.  But if either of the
+# | options is invoked, the license becomes non[---]free.  In any case, it is
+# | incompatible with the GNU FDL.
+#, fuzzy
+#| msgid ""
+#| "This license <strong>can</strong> be used as a free documentation "
+#| "license.  It is a copyleft free documentation license <strong>provided</"
+#| "strong> the copyright holder does not exercise any of the &ldquo;LICENSE "
+#| "OPTIONS&rdquo; listed in Section VI of the license.  But if either of the "
+#| "options is invoked, the license becomes non-free.  In any case, it is "
+#| "incompatible with the GNU FDL."
 msgid ""
 "This license <strong>can</strong> be used as a free documentation license.  "
 "It is a copyleft free documentation license <strong>provided</strong> the "
 "copyright holder does not exercise any of the &ldquo;LICENSE OPTIONS&rdquo; "
 "listed in Section VI of the license.  But if either of the options is "
-"invoked, the license becomes non-free.  In any case, it is incompatible with "
+"invoked, the license becomes nonfree.  In any case, it is incompatible with "
 "the GNU FDL."
 msgstr ""
 "Cette licence <strong>peut</strong> être utilisée comme licence de "
@@ -3903,12 +4216,26 @@
 "non libre. En tout état de cause, elle est incompatible avec la GNU FDL."
 
 #. type: Content of: <dl><dd><p>
+# | This creates a practical pitfall in using or recommending this license: if
+# | you recommend &ldquo;Use the Open Publication License, Version 1.0 but
+# | don't enable the options&rdquo;, it would be easy for the second half of
+# | that recommendation to get forgotten; someone might use the license with
+# | the options, making a manual non[---]free, and yet think he or she is
+# | following your advice.
+#, fuzzy
+#| msgid ""
+#| "This creates a practical pitfall in using or recommending this license: "
+#| "if you recommend &ldquo;Use the Open Publication License, Version 1.0 but "
+#| "don't enable the options&rdquo;, it would be easy for the second half of "
+#| "that recommendation to get forgotten; someone might use the license with "
+#| "the options, making a manual non-free, and yet think he or she is "
+#| "following your advice."
 msgid ""
 "This creates a practical pitfall in using or recommending this license: if "
 "you recommend &ldquo;Use the Open Publication License, Version 1.0 but don't "
 "enable the options&rdquo;, it would be easy for the second half of that "
 "recommendation to get forgotten; someone might use the license with the "
-"options, making a manual non-free, and yet think he or she is following your "
+"options, making a manual nonfree, and yet think he or she is following your "
 "advice."
 msgstr ""
 "Dans la pratique, utiliser ou recommander cette licence représente un 
piège. "
@@ -3919,11 +4246,21 @@
 "non libre, et pensera qu'il ou elle a suivi votre conseil."
 
 #. type: Content of: <dl><dd><p>
+# | Likewise, if you use this license without either of the options to make
+# | your manual free, someone else might decide to imitate you, then change
+# | his or her mind about the options thinking that that is just a detail; the
+# | result would be that his or her manual is non[---]free.
+#, fuzzy
+#| msgid ""
+#| "Likewise, if you use this license without either of the options to make "
+#| "your manual free, someone else might decide to imitate you, then change "
+#| "his or her mind about the options thinking that that is just a detail; "
+#| "the result would be that his or her manual is non-free."
 msgid ""
 "Likewise, if you use this license without either of the options to make your "
 "manual free, someone else might decide to imitate you, then change his or "
 "her mind about the options thinking that that is just a detail; the result "
-"would be that his or her manual is non-free."
+"would be that his or her manual is nonfree."
 msgstr ""
 "De même, si vous utilisez cette licence sans aucune des options pour que "
 "votre manuel soit libre, quelqu'un d'autre pourrait vouloir vous imiter, "
@@ -3960,8 +4297,18 @@
 "dites."
 
 #. type: Content of: <h3>
+# | <a id=\"NonFreeDocumentationLicenses\"> [-Non-Free-] {+Nonfree+}
+# | Documentation Licenses</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>) 
+# | </span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
+#| "a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>)  </"
+#| "span>"
 msgid ""
-"<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</a> "
+"<a id=\"NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a> "
 "<span class=\"anchor-reference-id\"> (<a href=\"#NonFreeDocumentationLicenses"
 "\">#NonFreeDocumentationLicenses</a>)  </span>"
 msgstr ""

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- licenses/po/license-list.it.po      24 Feb 2012 02:04:33 -0000      1.45
+++ licenses/po/license-list.it.po      20 Apr 2012 16:28:06 -0000      1.46
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-02-22 20:27-0500\n"
+"POT-Creation-Date: 2012-04-20 12:25-0300\n"
 "PO-Revision-Date: 2012-02-23 23:11+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-20 12:25-0300\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -65,7 +66,11 @@
 
 # type: Content of: <ul><li><ul><li>
 #. type: Content of: <ul><li><ul><li>
-msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+# | <a [-href=\"#NonFreeSoftwareLicenses\">Non-Free-]
+# | {+href=\"#NonFreeSoftwareLicenses\">Nonfree+} Software Licenses</a>
+#, fuzzy
+#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
 msgstr "<a href=\"#NonFreeSoftwareLicense\">Licenze di software non libero</a>"
 
 # type: Content of: <ul><li>
@@ -81,9 +86,14 @@
 
 # type: Content of: <ul><li><ul><li>
 #. type: Content of: <ul><li><ul><li>
+# | <a href=\"#NonFreeDocumentationLicenses\"> [-Non-Free-] {+Nonfree+}
+# | Documentation Licenses</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation "
+#| "Licenses</a>"
 msgid ""
-"<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
-"a>"
+"<a href=\"#NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a>"
 msgstr ""
 "<a href=\"#NonFreeDocumentationLicenses\">Licenze per documentazione non "
 "libera</a>"
@@ -353,9 +363,19 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is the latest version of the LGPL: a free software license, but not a
+# | strong copyleft license, because it permits linking with non[---]free
+# | modules.  It is compatible with GPLv3.  We recommend it for <a
+# | href=\"/licenses/why-not-lgpl.html\">special circumstances only</a>.
+#, fuzzy
+#| msgid ""
+#| "This is the latest version of the LGPL: a free software license, but not "
+#| "a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv3.  We recommend it for <a href=\"/"
+#| "licenses/why-not-lgpl.html\">special circumstances only</a>."
 msgid ""
 "This is the latest version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv3.  We recommend it for <a href=\"/licenses/why-"
 "not-lgpl.html\">special circumstances only</a>."
 msgstr ""
@@ -396,9 +416,25 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is the previous version of the LGPL: a free software license, but not
+# | a strong copyleft license, because it permits linking with non[---]free
+# | modules.  It is compatible with GPLv2 and GPLv3.  We generally recommend
+# | <a href=\"#LGPL\">the latest version of the LGPL</a>, <a
+# | href=\"/licenses/why-not-lgpl.html\">for special circumstances only</a>. 
+# | To learn more about how LGPLv2.1 is compatible with other GNU licenses,
+# | please <a href=\"/licenses/gpl-faq.html#AllCompatibility\">see our FAQ</a>.
+#, fuzzy
+#| msgid ""
+#| "This is the previous version of the LGPL: a free software license, but "
+#| "not a strong copyleft license, because it permits linking with non-free "
+#| "modules.  It is compatible with GPLv2 and GPLv3.  We generally recommend "
+#| "<a href=\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/"
+#| "why-not-lgpl.html\">for special circumstances only</a>.  To learn more "
+#| "about how LGPLv2.1 is compatible with other GNU licenses, please <a href="
+#| "\"/licenses/gpl-faq.html#AllCompatibility\">see our FAQ</a>."
 msgid ""
 "This is the previous version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv2 and GPLv3.  We generally recommend <a href="
 "\"#LGPL\">the latest version of the LGPL</a>, <a href=\"/licenses/why-not-"
 "lgpl.html\">for special circumstances only</a>.  To learn more about how "
@@ -701,14 +737,34 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The text of the CeCILL uses a couple of biased terms that ought to be
+# | avoided: [-&ldquo;intellectual property&rdquo; (see-] <a
+# | [-href=\"/philosophy/not-ipr.xhtml\">this article</a>)-]
+# | {+href=\"/philosophy/not-ipr.html\">&ldquo;intellectual
+# | property&rdquo;</a>+} and [-&ldquo;protection&rdquo; (see-] <a
+# | [-href=\"/philosophy/words-to-avoid.html\">this article</a>);-]
+# | {+href=\"/philosophy/words-to-avoid.html#Protection\">
+# | &ldquo;protection&rdquo;</a>;+} this decision was unfortunate, because
+# | reading the license tends to spread the presuppositions of those terms. 
+# | However, this does not cause any particular problem for the programs
+# | released under the CeCILL.
+#, fuzzy
+#| msgid ""
+#| "The text of the CeCILL uses a couple of biased terms that ought to be "
+#| "avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/"
+#| "not-ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a "
+#| "href=\"/philosophy/words-to-avoid.html\">this article</a>); this decision "
+#| "was unfortunate, because reading the license tends to spread the "
+#| "presuppositions of those terms.  However, this does not cause any "
+#| "particular problem for the programs released under the CeCILL."
 msgid ""
 "The text of the CeCILL uses a couple of biased terms that ought to be "
-"avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/not-"
-"ipr.xhtml\">this article</a>) and &ldquo;protection&rdquo; (see <a href=\"/"
-"philosophy/words-to-avoid.html\">this article</a>); this decision was "
-"unfortunate, because reading the license tends to spread the presuppositions "
-"of those terms.  However, this does not cause any particular problem for the "
-"programs released under the CeCILL."
+"avoided: <a href=\"/philosophy/not-ipr.html\">&ldquo;intellectual "
+"property&rdquo;</a> and <a href=\"/philosophy/words-to-avoid.html#Protection"
+"\"> &ldquo;protection&rdquo;</a>; this decision was unfortunate, because "
+"reading the license tends to spread the presuppositions of those terms.  "
+"However, this does not cause any particular problem for the programs "
+"released under the CeCILL."
 msgstr ""
 "Il testo della CeCILL usa alcuni termini che dovrebbero essere evitati in "
 "quanto faziosi: &ldquo;proprietà intellettuale&rdquo; (si veda <a href=\"/"
@@ -1985,12 +2041,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a simple, permissive non-copyleft free software license with a
+# | serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The
+# | flaw is not fatal; that is, it does not render the software non[---]free. 
+# | But it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>,
+# | including incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software non-free.  "
+#| "But it does cause <a href=\"/philosophy/bsd.html\">practical problems</"
+#| "a>, including incompatibility with the GNU GPL."
 msgid ""
 "This is a simple, permissive non-copyleft free software license with a "
 "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software non-free.  But it "
-"does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-"including incompatibility with the GNU GPL."
+"is not fatal; that is, it does not render the software nonfree.  But it does "
+"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+"incompatibility with the GNU GPL."
 msgstr ""
 "Questa è una semplice licenza permissiva per software libero, senza copyleft 
"
 "con un problema serio: la \"noiosa clausola pubblicitaria BSD\". Il problema "
@@ -2108,9 +2176,17 @@
 "\"> (<a href=\"#Condor\">#Condor</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | Recent versions of Condor (from 6.9.5 on) are released under the <a
+# | href=\"#[-A-]{+a+}pache2\">Apache License 2.0</a>.  Only older versions of
+# | Condor use this license.
+#, fuzzy
+#| msgid ""
+#| "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
+#| "\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use "
+#| "this license."
 msgid ""
 "Recent versions of Condor (from 6.9.5 on) are released under the <a href="
-"\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
+"\"#apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
 "license."
 msgstr ""
 "Le ultime versioni di Condor (dalla 6.9.5 in poi) sono distribuite sotto <a "
@@ -2337,12 +2413,26 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The reason this requirement is acceptable for LaTeX is that TeX has a
+# | facility to allow you to map file names, to specify &ldquo;use file bar
+# | when file foo is requested&rdquo;.  With this facility, the requirement is
+# | merely annoying; without the facility, the same requirement would be a
+# | serious obstacle, and we would have to conclude it makes the program
+# | non[---]free.
+#, fuzzy
+#| msgid ""
+#| "The reason this requirement is acceptable for LaTeX is that TeX has a "
+#| "facility to allow you to map file names, to specify &ldquo;use file bar "
+#| "when file foo is requested&rdquo;.  With this facility, the requirement "
+#| "is merely annoying; without the facility, the same requirement would be a "
+#| "serious obstacle, and we would have to conclude it makes the program non-"
+#| "free."
 msgid ""
 "The reason this requirement is acceptable for LaTeX is that TeX has a "
 "facility to allow you to map file names, to specify &ldquo;use file bar when "
 "file foo is requested&rdquo;.  With this facility, the requirement is merely "
 "annoying; without the facility, the same requirement would be a serious "
-"obstacle, and we would have to conclude it makes the program non-free."
+"obstacle, and we would have to conclude it makes the program nonfree."
 msgstr ""
 "Il motivo di questa richiesta è accettabile per LaTeX poiché LaTeX ha la "
 "caratteristica di poter tracciare i nomi dei file, per specificare opzioni "
@@ -2372,9 +2462,19 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The LPPL says that some files, in certain versions of LaTeX, may have
+# | additional restrictions, which could render them non[---]free.  For this
+# | reason, it may take some careful checking to produce a version of LaTeX
+# | that is free software.
+#, fuzzy
+#| msgid ""
+#| "The LPPL says that some files, in certain versions of LaTeX, may have "
+#| "additional restrictions, which could render them non-free.  For this "
+#| "reason, it may take some careful checking to produce a version of LaTeX "
+#| "that is free software."
 msgid ""
 "The LPPL says that some files, in certain versions of LaTeX, may have "
-"additional restrictions, which could render them non-free.  For this reason, "
+"additional restrictions, which could render them nonfree.  For this reason, "
 "it may take some careful checking to produce a version of LaTeX that is free "
 "software."
 msgstr ""
@@ -2707,12 +2807,25 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The license of OpenSSL is a conjunction of two licenses, one of them being
+# | the license of SSLeay.  You must follow both.  The combination results in
+# | a copyleft free software license that is incompatible with the GNU GPL. 
+# | It also has an advertising clause like the [-original-] {+<a
+# | href=\"#OriginalBSD\">original+} BSD [-license-] {+license</a>+} and the
+# | [-Apache license.-] {+<a href=\"#apache1\">Apache&nbsp;1 license</a>.+}
+#, fuzzy
+#| msgid ""
+#| "The license of OpenSSL is a conjunction of two licenses, one of them "
+#| "being the license of SSLeay.  You must follow both.  The combination "
+#| "results in a copyleft free software license that is incompatible with the "
+#| "GNU GPL.  It also has an advertising clause like the original BSD license "
+#| "and the Apache license."
 msgid ""
 "The license of OpenSSL is a conjunction of two licenses, one of them being "
 "the license of SSLeay.  You must follow both.  The combination results in a "
 "copyleft free software license that is incompatible with the GNU GPL.  It "
-"also has an advertising clause like the original BSD license and the Apache "
-"license."
+"also has an advertising clause like the <a href=\"#OriginalBSD\">original "
+"BSD license</a> and the <a href=\"#apache1\">Apache&nbsp;1 license</a>."
 msgstr ""
 "La licenza di OpenSSL unisce due licenze, una delle quali è la licenza di "
 "SSLeay.  Dovete seguirle entrambe. La combinazione è una licenza di software 
"
@@ -3105,9 +3218,18 @@
 "compatibile con la GPL."
 
 #. type: Content of: <h3>
+# | <a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\">
+# | [-Non-Free-] {+Nonfree+} Software Licenses</a> <span
+# | class=\"anchor-reference-id\"> (<a
+# | href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+#| "Non-Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
+#| "href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgid ""
-"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> Non-"
-"Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
+"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
+"Nonfree Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
 "\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgstr ""
 "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
@@ -3116,9 +3238,19 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | <strong>The following licenses <em>do not qualify</em> as <a
+# | href=\"/philosophy/free-sw.html\">free software</a> licenses.  A
+# | non[---]free license is automatically incompatible with the <a
+# | href=\"#GNUGPL\">GNU GPL</a>.</strong>
+#, fuzzy
+#| msgid ""
+#| "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a> licenses.  A non-free license "
+#| "is automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</"
+#| "strong>"
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
-"philosophy/free-sw.html\">free software</a> licenses.  A non-free license is "
+"philosophy/free-sw.html\">free software</a> licenses.  A nonfree license is "
 "automatically incompatible with the <a href=\"#GNUGPL\">GNU GPL</a>.</strong>"
 msgstr ""
 "<strong>Le seguenti licenze <em>non si qualificano</em> come <a href=\"/"
@@ -3128,17 +3260,33 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Of course, we urge you to avoid using non[---]free software licenses, and
+# | to avoid non[---]free software in general.
+#, fuzzy
+#| msgid ""
+#| "Of course, we urge you to avoid using non-free software licenses, and to "
+#| "avoid non-free software in general."
 msgid ""
-"Of course, we urge you to avoid using non-free software licenses, and to "
-"avoid non-free software in general."
+"Of course, we urge you to avoid using nonfree software licenses, and to "
+"avoid nonfree software in general."
 msgstr ""
 "Ovviamente, vi invitiamo ad evitare l'uso di licenze per software non "
 "libero, ed evitare il software non libero in generale. "
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | There is no way we could list all the known non[---]free software licenses
+# | here; after all, every proprietary software company has its own.  We focus
+# | here on licenses that are often mistaken for free software licenses but
+# | are, in fact, <strong>not</strong> free software licenses.
+#, fuzzy
+#| msgid ""
+#| "There is no way we could list all the known non-free software licenses "
+#| "here; after all, every proprietary software company has its own.  We "
+#| "focus here on licenses that are often mistaken for free software licenses "
+#| "but are, in fact, <strong>not</strong> free software licenses."
 msgid ""
-"There is no way we could list all the known non-free software licenses here; "
+"There is no way we could list all the known nonfree software licenses here; "
 "after all, every proprietary software company has its own.  We focus here on "
 "licenses that are often mistaken for free software licenses but are, in "
 "fact, <strong>not</strong> free software licenses."
@@ -3151,11 +3299,27 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | We have provided links to these licenses when we can do so without
+# | violating our general policy: that we do not make links to sites that
+# | promote, encourage or facilitate the use of non[---]free software
+# | packages.  The last thing we want to do is give any non[---]free program
+# | some gratis publicity that might encourage more people to use it.  For the
+# | same reason, we have avoided naming the programs for which a license is
+# | used, unless we think that for specific reasons it won't backfire.
+#, fuzzy
+#| msgid ""
+#| "We have provided links to these licenses when we can do so without "
+#| "violating our general policy: that we do not make links to sites that "
+#| "promote, encourage or facilitate the use of non-free software packages.  "
+#| "The last thing we want to do is give any non-free program some gratis "
+#| "publicity that might encourage more people to use it.  For the same "
+#| "reason, we have avoided naming the programs for which a license is used, "
+#| "unless we think that for specific reasons it won't backfire."
 msgid ""
 "We have provided links to these licenses when we can do so without violating "
 "our general policy: that we do not make links to sites that promote, "
-"encourage or facilitate the use of non-free software packages.  The last "
-"thing we want to do is give any non-free program some gratis publicity that "
+"encourage or facilitate the use of nonfree software packages.  The last "
+"thing we want to do is give any nonfree program some gratis publicity that "
 "might encourage more people to use it.  For the same reason, we have avoided "
 "naming the programs for which a license is used, unless we think that for "
 "specific reasons it won't backfire."
@@ -3204,12 +3368,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | Versions 1.0, 1.1 and 1.2 are <a
+# | href=\"/philosophy/historical-apsl.html\">not free software [-licenses
+# | (follow the link for more explanation)</a>.-] {+licenses</a>.+}  Please
+# | don't use these licenses, and we urge you to avoid any software that has
+# | been released under them.  <a href=\"#apsl2\">Version 2.0 of the APSL</a>
+# | is a free software license.
+#, fuzzy
+#| msgid ""
+#| "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
+#| "\">not free software licenses (follow the link for more explanation)</"
+#| "a>.  Please don't use these licenses, and we urge you to avoid any "
+#| "software that has been released under them.  <a href=\"#apsl2\">Version "
+#| "2.0 of the APSL</a> is a free software license."
 msgid ""
 "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
-"\">not free software licenses (follow the link for more explanation)</a>.  "
-"Please don't use these licenses, and we urge you to avoid any software that "
-"has been released under them.  <a href=\"#apsl2\">Version 2.0 of the APSL</"
-"a> is a free software license."
+"\">not free software licenses</a>.  Please don't use these licenses, and we "
+"urge you to avoid any software that has been released under them.  <a href="
+"\"#apsl2\">Version 2.0 of the APSL</a> is a free software license."
 msgstr ""
 "Le versioni 1.0, 1.1 e 1.2 sono <a href=\"/philosophy/historical-apsl.html"
 "\">licenze non libere (vedere questo articolo)</a>.  Ne sconsigliamo "
@@ -3249,8 +3425,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The AT&amp;T Public License is a non[---]free license.  It has several
+# | serious problems:
+#, fuzzy
+#| msgid ""
+#| "The AT&amp;T Public License is a non-free license.  It has several "
+#| "serious problems:"
 msgid ""
-"The AT&amp;T Public License is a non-free license.  It has several serious "
+"The AT&amp;T Public License is a nonfree license.  It has several serious "
 "problems:"
 msgstr ""
 "La AT&amp;T Public License è una licenza non libera.  Ha vari problemi seri:"
@@ -3320,11 +3502,23 @@
 
 # type: Content of: <dl><dd><ol><li>
 #. type: Content of: <dl><dd><ol><li>
+# | It asserts one needs a license from AT&amp;T to make a link to their web
+# | site.  This is not an immediate practical problem, since the license says
+# | it gives permission to make such a link.  (Anyway, people shouldn't make
+# | links to sites about non[---]free software.)  But such a claim should not
+# | be made or propagated.
+#, fuzzy
+#| msgid ""
+#| "It asserts one needs a license from AT&amp;T to make a link to their web "
+#| "site.  This is not an immediate practical problem, since the license says "
+#| "it gives permission to make such a link.  (Anyway, people shouldn't make "
+#| "links to sites about non-free software.)  But such a claim should not be "
+#| "made or propagated."
 msgid ""
 "It asserts one needs a license from AT&amp;T to make a link to their web "
 "site.  This is not an immediate practical problem, since the license says it "
 "gives permission to make such a link.  (Anyway, people shouldn't make links "
-"to sites about non-free software.)  But such a claim should not be made or "
+"to sites about nonfree software.)  But such a claim should not be made or "
 "propagated."
 msgstr ""
 "Sostiene che serve una licenza di AT&amp;T per creare collegamenti al loro "
@@ -3378,9 +3572,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with
+# | additional permission for linking with non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
+#| "additional permission for linking with non-free programs."
 msgid ""
 "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
-"additional permission for linking with non-free programs."
+"additional permission for linking with nonfree programs."
 msgstr ""
 "Oggi <a href=\"#eCos20\">eCos è disponibile</a> sotto la GNU GPL con "
 "permesso aggiuntivo di collegamento con programmi non liberi."
@@ -3400,10 +3600,18 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a
+# | P&uacute;blica Geral para Administra&ccedil;&atilde;o
+# | P&uacute;blica&rdquo;) is non[---]free for several reasons:
+#, fuzzy
+#| msgid ""
+#| "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
+#| "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;"
+#| "blica&rdquo;) is non-free for several reasons:"
 msgid ""
 "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
 "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) "
-"is non-free for several reasons:"
+"is nonfree for several reasons:"
 msgstr ""
 "La GPL-PA (nome originale Portoghese: &ldquo;Licen&ccedil;a P&uacute;blica "
 "Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) è non libera "
@@ -3533,8 +3741,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The lha license must be considered non[---]free because it is so vague
+# | that you cannot be sure what permissions you have.
+#, fuzzy
+#| msgid ""
+#| "The lha license must be considered non-free because it is so vague that "
+#| "you cannot be sure what permissions you have."
 msgid ""
-"The lha license must be considered non-free because it is so vague that you "
+"The lha license must be considered nonfree because it is so vague that you "
 "cannot be sure what permissions you have."
 msgstr ""
 "La licenza di lha è da ritenersi non libera perché è così vaga che non "
@@ -3710,8 +3924,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The Reciprocal Public License is a non[---]free license because of three
+# | problems.  1.&nbsp;It puts limits on prices charged for an initial copy. 
+# | 2.&nbsp;It requires notification of the original developer for publication
+# | of a modified version.  3.&nbsp;It requires publication of any modified
+# | version that an organization uses, even privately.
+#, fuzzy
+#| msgid ""
+#| "The Reciprocal Public License is a non-free license because of three "
+#| "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  "
+#| "2.&nbsp;It requires notification of the original developer for "
+#| "publication of a modified version.  3.&nbsp;It requires publication of "
+#| "any modified version that an organization uses, even privately."
 msgid ""
-"The Reciprocal Public License is a non-free license because of three "
+"The Reciprocal Public License is a nonfree license because of three "
 "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  2."
 "&nbsp;It requires notification of the original developer for publication of "
 "a modified version.  3.&nbsp;It requires publication of any modified version "
@@ -3754,8 +3980,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | Despite the name, this is a software license, and it's non[---]free for
+# | several reasons:
+#, fuzzy
+#| msgid ""
+#| "Despite the name, this is a software license, and it's non-free for "
+#| "several reasons:"
 msgid ""
-"Despite the name, this is a software license, and it's non-free for several "
+"Despite the name, this is a software license, and it's nonfree for several "
 "reasons:"
 msgstr "Nonostante il nome è una licenza software, non libera per vari 
motivi:"
 
@@ -3888,9 +4120,20 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a id=\"SystemC-3.0\"
+# | href=\"http://www.systemc.org/about/org_docs/license/\";> SystemC
+# | [-&quot;Open Source&quot;-] {+&ldquo;Open Source&rdquo;+} License, Version
+# | 3.0</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/";
+#| "license/\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href="
+#| "\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgid ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
-"\"> SystemC &quot;Open Source&quot; License, Version 3.0</a> <span class="
+"\"> SystemC &ldquo;Open Source&rdquo; License, Version 3.0</a> <span class="
 "\"anchor-reference-id\"> (<a href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgstr ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
@@ -3899,12 +4142,26 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This license requires all recipients to proactively help the licensor
+# | enforce its trademarks.  This is an unreasonable condition to place on
+# | users' rights, so the license is non[---]free.  It also has other
+# | practical problems: some of the requirements are vague, and it uses the
+# | term <a href=\"/philosophy/not-ipr.[-x-]html\">&ldquo;intellectual
+# | property&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "This license requires all recipients to proactively help the licensor "
+#| "enforce its trademarks.  This is an unreasonable condition to place on "
+#| "users' rights, so the license is non-free.  It also has other practical "
+#| "problems: some of the requirements are vague, and it uses the term <a "
+#| "href=\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</"
+#| "a>."
 msgid ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
-"users' rights, so the license is non-free.  It also has other practical "
+"users' rights, so the license is nonfree.  It also has other practical "
 "problems: some of the requirements are vague, and it uses the term <a href="
-"\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</a>."
+"\"/philosophy/not-ipr.html\">&ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "Questa licenza richiede di aiutare chi fornisce il software a fare valere i "
 "suoi marchi registrati. E' una condizione che non si può porre agli utenti, "
@@ -3936,8 +4193,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | The University of Utah Public License is a non[---]free license because it
+# | does not allow commercial redistribution.  It also purports to restrict
+# | commercially running the software and even commercially giving
+# | consultation about it.  Those restrictions are probably not legally
+# | enforceable under US copyright law, but they might be in some countries;
+# | even asserting them is outrageous.
+#, fuzzy
+#| msgid ""
+#| "The University of Utah Public License is a non-free license because it "
+#| "does not allow commercial redistribution.  It also purports to restrict "
+#| "commercially running the software and even commercially giving "
+#| "consultation about it.  Those restrictions are probably not legally "
+#| "enforceable under US copyright law, but they might be in some countries; "
+#| "even asserting them is outrageous."
 msgid ""
-"The University of Utah Public License is a non-free license because it does "
+"The University of Utah Public License is a nonfree license because it does "
 "not allow commercial redistribution.  It also purports to restrict "
 "commercially running the software and even commercially giving consultation "
 "about it.  Those restrictions are probably not legally enforceable under US "
@@ -3991,11 +4262,21 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is not a free software license.  The license prohibits distribution
+# | for a fee, and that makes it impossible for the software to be included in
+# | the many CD-ROM free software collections that are sold by companies and
+# | by [-organizations such as the FSF.-] {+organizations.+}
+#, fuzzy
+#| msgid ""
+#| "This is not a free software license.  The license prohibits distribution "
+#| "for a fee, and that makes it impossible for the software to be included "
+#| "in the many CD-ROM free software collections that are sold by companies "
+#| "and by organizations such as the FSF."
 msgid ""
 "This is not a free software license.  The license prohibits distribution for "
 "a fee, and that makes it impossible for the software to be included in the "
 "many CD-ROM free software collections that are sold by companies and by "
-"organizations such as the FSF."
+"organizations."
 msgstr ""
 "Questa non è una licenza per software libero. La licenza proibisce la "
 "distribuzione a pagamento e rende impossibile includere il software in molti "
@@ -4014,9 +4295,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | (The YaST software itself no longer uses this non[---]free YaST license;
+# | happily, it is now free software, released under the GNU GPL.)
+#, fuzzy
+#| msgid ""
+#| "(The YaST software itself no longer uses this non-free YaST license; "
+#| "happily, it is now free software, released under the GNU GPL.)"
 msgid ""
-"(The YaST software itself no longer uses this non-free YaST license; "
-"happily, it is now free software, released under the GNU GPL.)"
+"(The YaST software itself no longer uses this nonfree YaST license; happily, "
+"it is now free software, released under the GNU GPL.)"
 msgstr ""
 "(Il programma YaST non usa più questa licenza; per fortuna è ora software "
 "libero sotto licenza GNU GPL)."
@@ -4082,8 +4369,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-Free Documentation-] {+free documentation+} license that is
+# | incompatible with the GNU FDL.  It is incompatible because
+# | Section&nbsp;(2c) says &ldquo;You add no other terms or conditions to
+# | those of this License&rdquo;, and the GNU FDL has additional terms not
+# | accounted for in the Common Documentation License.
+#, fuzzy
+#| msgid ""
+#| "This is a Free Documentation license that is incompatible with the GNU "
+#| "FDL.  It is incompatible because Section&nbsp;(2c) says &ldquo;You add no "
+#| "other terms or conditions to those of this License&rdquo;, and the GNU "
+#| "FDL has additional terms not accounted for in the Common Documentation "
+#| "License."
 msgid ""
-"This is a Free Documentation license that is incompatible with the GNU FDL.  "
+"This is a free documentation license that is incompatible with the GNU FDL.  "
 "It is incompatible because Section&nbsp;(2c) says &ldquo;You add no other "
 "terms or conditions to those of this License&rdquo;, and the GNU FDL has "
 "additional terms not accounted for in the Common Documentation License."
@@ -4130,12 +4429,26 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This license <strong>can</strong> be used as a free documentation license.
+# |  It is a copyleft free documentation license <strong>provided</strong> the
+# | copyright holder does not exercise any of the &ldquo;LICENSE
+# | OPTIONS&rdquo; listed in Section VI of the license.  But if either of the
+# | options is invoked, the license becomes non[---]free.  In any case, it is
+# | incompatible with the GNU FDL.
+#, fuzzy
+#| msgid ""
+#| "This license <strong>can</strong> be used as a free documentation "
+#| "license.  It is a copyleft free documentation license <strong>provided</"
+#| "strong> the copyright holder does not exercise any of the &ldquo;LICENSE "
+#| "OPTIONS&rdquo; listed in Section VI of the license.  But if either of the "
+#| "options is invoked, the license becomes non-free.  In any case, it is "
+#| "incompatible with the GNU FDL."
 msgid ""
 "This license <strong>can</strong> be used as a free documentation license.  "
 "It is a copyleft free documentation license <strong>provided</strong> the "
 "copyright holder does not exercise any of the &ldquo;LICENSE OPTIONS&rdquo; "
 "listed in Section VI of the license.  But if either of the options is "
-"invoked, the license becomes non-free.  In any case, it is incompatible with "
+"invoked, the license becomes nonfree.  In any case, it is incompatible with "
 "the GNU FDL."
 msgstr ""
 "Questa licenza <strong>può</strong> essere utilizzata come licenza per "
@@ -4147,12 +4460,26 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This creates a practical pitfall in using or recommending this license: if
+# | you recommend &ldquo;Use the Open Publication License, Version 1.0 but
+# | don't enable the options&rdquo;, it would be easy for the second half of
+# | that recommendation to get forgotten; someone might use the license with
+# | the options, making a manual non[---]free, and yet think he or she is
+# | following your advice.
+#, fuzzy
+#| msgid ""
+#| "This creates a practical pitfall in using or recommending this license: "
+#| "if you recommend &ldquo;Use the Open Publication License, Version 1.0 but "
+#| "don't enable the options&rdquo;, it would be easy for the second half of "
+#| "that recommendation to get forgotten; someone might use the license with "
+#| "the options, making a manual non-free, and yet think he or she is "
+#| "following your advice."
 msgid ""
 "This creates a practical pitfall in using or recommending this license: if "
 "you recommend &ldquo;Use the Open Publication License, Version 1.0 but don't "
 "enable the options&rdquo;, it would be easy for the second half of that "
 "recommendation to get forgotten; someone might use the license with the "
-"options, making a manual non-free, and yet think he or she is following your "
+"options, making a manual nonfree, and yet think he or she is following your "
 "advice."
 msgstr ""
 "Questo crea uno scompenso pratico nell'uso o nel raccomandare l'uso di "
@@ -4164,11 +4491,21 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | Likewise, if you use this license without either of the options to make
+# | your manual free, someone else might decide to imitate you, then change
+# | his or her mind about the options thinking that that is just a detail; the
+# | result would be that his or her manual is non[---]free.
+#, fuzzy
+#| msgid ""
+#| "Likewise, if you use this license without either of the options to make "
+#| "your manual free, someone else might decide to imitate you, then change "
+#| "his or her mind about the options thinking that that is just a detail; "
+#| "the result would be that his or her manual is non-free."
 msgid ""
 "Likewise, if you use this license without either of the options to make your "
 "manual free, someone else might decide to imitate you, then change his or "
 "her mind about the options thinking that that is just a detail; the result "
-"would be that his or her manual is non-free."
+"would be that his or her manual is nonfree."
 msgstr ""
 "Allo stesso modo, se utilizzate questa licenza senza nessuna delle opzioni "
 "per rendere il vostro manuale libero, qualcun altro potrebbe imitarvi e "
@@ -4206,8 +4543,18 @@
 "che si comprenda quello che state dicendo. "
 
 #. type: Content of: <h3>
+# | <a id=\"NonFreeDocumentationLicenses\"> [-Non-Free-] {+Nonfree+}
+# | Documentation Licenses</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>) 
+# | </span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</"
+#| "a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>)  </"
+#| "span>"
 msgid ""
-"<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</a> "
+"<a id=\"NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a> "
 "<span class=\"anchor-reference-id\"> (<a href=\"#NonFreeDocumentationLicenses"
 "\">#NonFreeDocumentationLicenses</a>)  </span>"
 msgstr ""

Index: licenses/po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- licenses/po/license-list.pot        23 Feb 2012 01:28:35 -0000      1.66
+++ licenses/po/license-list.pot        20 Apr 2012 16:28:06 -0000      1.67
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-22 20:27-0500\n"
+"POT-Creation-Date: 2012-04-20 12:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -50,7 +50,7 @@
 msgstr ""
 
 #. type: Content of: <ul><li><ul><li>
-msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -63,7 +63,7 @@
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation "
+"<a href=\"#NonFreeDocumentationLicenses\"> Nonfree Documentation "
 "Licenses</a>"
 msgstr ""
 
@@ -238,7 +238,7 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is the latest version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv3.  We recommend it for <a "
 "href=\"/licenses/why-not-lgpl.html\">special circumstances only</a>."
 msgstr ""
@@ -263,7 +263,7 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is the previous version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules.  "
+"strong copyleft license, because it permits linking with nonfree modules.  "
 "It is compatible with GPLv2 and GPLv3.  We generally recommend <a "
 "href=\"#LGPL\">the latest version of the LGPL</a>, <a "
 "href=\"/licenses/why-not-lgpl.html\">for special circumstances only</a>.  To "
@@ -457,13 +457,13 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "The text of the CeCILL uses a couple of biased terms that ought to be "
-"avoided: &ldquo;intellectual property&rdquo; (see <a "
-"href=\"/philosophy/not-ipr.xhtml\">this article</a>) and "
-"&ldquo;protection&rdquo; (see <a "
-"href=\"/philosophy/words-to-avoid.html\">this article</a>); this decision "
-"was unfortunate, because reading the license tends to spread the "
-"presuppositions of those terms.  However, this does not cause any particular "
-"problem for the programs released under the CeCILL."
+"avoided: <a href=\"/philosophy/not-ipr.html\">&ldquo;intellectual "
+"property&rdquo;</a> and <a "
+"href=\"/philosophy/words-to-avoid.html#Protection\"> "
+"&ldquo;protection&rdquo;</a>; this decision was unfortunate, because reading "
+"the license tends to spread the presuppositions of those terms.  However, "
+"this does not cause any particular problem for the programs released under "
+"the CeCILL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1278,9 +1278,9 @@
 msgid ""
 "This is a simple, permissive non-copyleft free software license with a "
 "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software non-free.  But it "
-"does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-"including incompatibility with the GNU GPL."
+"is not fatal; that is, it does not render the software nonfree.  But it does "
+"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+"incompatibility with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1357,7 +1357,7 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Recent versions of Condor (from 6.9.5 on) are released under the <a "
-"href=\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use "
+"href=\"#apache2\">Apache License 2.0</a>.  Only older versions of Condor use "
 "this license."
 msgstr ""
 
@@ -1500,7 +1500,7 @@
 "facility to allow you to map file names, to specify &ldquo;use file bar when "
 "file foo is requested&rdquo;.  With this facility, the requirement is merely "
 "annoying; without the facility, the same requirement would be a serious "
-"obstacle, and we would have to conclude it makes the program non-free."
+"obstacle, and we would have to conclude it makes the program nonfree."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1517,7 +1517,7 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "The LPPL says that some files, in certain versions of LaTeX, may have "
-"additional restrictions, which could render them non-free.  For this reason, "
+"additional restrictions, which could render them nonfree.  For this reason, "
 "it may take some careful checking to produce a version of LaTeX that is free "
 "software."
 msgstr ""
@@ -1733,8 +1733,8 @@
 "The license of OpenSSL is a conjunction of two licenses, one of them being "
 "the license of SSLeay.  You must follow both.  The combination results in a "
 "copyleft free software license that is incompatible with the GNU GPL.  It "
-"also has an advertising clause like the original BSD license and the Apache "
-"license."
+"also has an advertising clause like the <a href=\"#OriginalBSD\">original "
+"BSD license</a> and the <a href=\"#apache1\">Apache&nbsp;1 license</a>."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1989,27 +1989,27 @@
 #. type: Content of: <h3>
 msgid ""
 "<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
-"Non-Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
+"Nonfree Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as <a "
-"href=\"/philosophy/free-sw.html\">free software</a> licenses.  A non-free "
+"href=\"/philosophy/free-sw.html\">free software</a> licenses.  A nonfree "
 "license is automatically incompatible with the <a href=\"#GNUGPL\">GNU "
 "GPL</a>.</strong>"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Of course, we urge you to avoid using non-free software licenses, and to "
-"avoid non-free software in general."
+"Of course, we urge you to avoid using nonfree software licenses, and to "
+"avoid nonfree software in general."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"There is no way we could list all the known non-free software licenses here; "
+"There is no way we could list all the known nonfree software licenses here; "
 "after all, every proprietary software company has its own.  We focus here on "
 "licenses that are often mistaken for free software licenses but are, in "
 "fact, <strong>not</strong> free software licenses."
@@ -2019,8 +2019,8 @@
 msgid ""
 "We have provided links to these licenses when we can do so without violating "
 "our general policy: that we do not make links to sites that promote, "
-"encourage or facilitate the use of non-free software packages.  The last "
-"thing we want to do is give any non-free program some gratis publicity that "
+"encourage or facilitate the use of nonfree software packages.  The last "
+"thing we want to do is give any nonfree program some gratis publicity that "
 "might encourage more people to use it.  For the same reason, we have avoided "
 "naming the programs for which a license is used, unless we think that for "
 "specific reasons it won't backfire."
@@ -2050,10 +2050,10 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Versions 1.0, 1.1 and 1.2 are <a "
-"href=\"/philosophy/historical-apsl.html\">not free software licenses (follow "
-"the link for more explanation)</a>.  Please don't use these licenses, and we "
-"urge you to avoid any software that has been released under them.  <a "
-"href=\"#apsl2\">Version 2.0 of the APSL</a> is a free software license."
+"href=\"/philosophy/historical-apsl.html\">not free software licenses</a>.  "
+"Please don't use these licenses, and we urge you to avoid any software that "
+"has been released under them.  <a href=\"#apsl2\">Version 2.0 of the "
+"APSL</a> is a free software license."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -2080,7 +2080,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"The AT&amp;T Public License is a non-free license.  It has several serious "
+"The AT&amp;T Public License is a nonfree license.  It has several serious "
 "problems:"
 msgstr ""
 
@@ -2133,7 +2133,7 @@
 "It asserts one needs a license from AT&amp;T to make a link to their web "
 "site.  This is not an immediate practical problem, since the license says it "
 "gives permission to make such a link.  (Anyway, people shouldn't make links "
-"to sites about non-free software.)  But such a claim should not be made or "
+"to sites about nonfree software.)  But such a claim should not be made or "
 "propagated."
 msgstr ""
 
@@ -2169,7 +2169,7 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
-"additional permission for linking with non-free programs."
+"additional permission for linking with nonfree programs."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -2184,7 +2184,7 @@
 msgid ""
 "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
 "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) "
-"is non-free for several reasons:"
+"is nonfree for several reasons:"
 msgstr ""
 
 #. type: Content of: <dl><dd><ul><li>
@@ -2273,7 +2273,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"The lha license must be considered non-free because it is so vague that you "
+"The lha license must be considered nonfree because it is so vague that you "
 "cannot be sure what permissions you have."
 msgstr ""
 
@@ -2389,7 +2389,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"The Reciprocal Public License is a non-free license because of three "
+"The Reciprocal Public License is a nonfree license because of three "
 "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  "
 "2.&nbsp;It requires notification of the original developer for publication "
 "of a modified version.  3.&nbsp;It requires publication of any modified "
@@ -2418,7 +2418,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"Despite the name, this is a software license, and it's non-free for several "
+"Despite the name, this is a software license, and it's nonfree for several "
 "reasons:"
 msgstr ""
 
@@ -2509,8 +2509,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"SystemC-3.0\" "
-"href=\"http://www.systemc.org/about/org_docs/license/\";> SystemC &quot;Open "
-"Source&quot; License, Version 3.0</a> <span class=\"anchor-reference-id\"> "
+"href=\"http://www.systemc.org/about/org_docs/license/\";> SystemC &ldquo;Open "
+"Source&rdquo; License, Version 3.0</a> <span class=\"anchor-reference-id\"> "
 "(<a href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
 msgstr ""
 
@@ -2518,9 +2518,9 @@
 msgid ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
-"users' rights, so the license is non-free.  It also has other practical "
+"users' rights, so the license is nonfree.  It also has other practical "
 "problems: some of the requirements are vague, and it uses the term <a "
-"href=\"/philosophy/not-ipr.xhtml\">&ldquo;intellectual property&rdquo;</a>."
+"href=\"/philosophy/not-ipr.html\">&ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2539,7 +2539,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"The University of Utah Public License is a non-free license because it does "
+"The University of Utah Public License is a nonfree license because it does "
 "not allow commercial redistribution.  It also purports to restrict "
 "commercially running the software and even commercially giving consultation "
 "about it.  Those restrictions are probably not legally enforceable under US "
@@ -2578,7 +2578,7 @@
 "This is not a free software license.  The license prohibits distribution for "
 "a fee, and that makes it impossible for the software to be included in the "
 "many CD-ROM free software collections that are sold by companies and by "
-"organizations such as the FSF."
+"organizations."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2589,8 +2589,8 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"(The YaST software itself no longer uses this non-free YaST license; "
-"happily, it is now free software, released under the GNU GPL.)"
+"(The YaST software itself no longer uses this nonfree YaST license; happily, "
+"it is now free software, released under the GNU GPL.)"
 msgstr ""
 
 #. type: Content of: <h2>
@@ -2635,7 +2635,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a Free Documentation license that is incompatible with the GNU FDL.  "
+"This is a free documentation license that is incompatible with the GNU FDL.  "
 "It is incompatible because Section&nbsp;(2c) says &ldquo;You add no other "
 "terms or conditions to those of this License&rdquo;, and the GNU FDL has "
 "additional terms not accounted for in the Common Documentation License."
@@ -2670,7 +2670,7 @@
 "It is a copyleft free documentation license <strong>provided</strong> the "
 "copyright holder does not exercise any of the &ldquo;LICENSE OPTIONS&rdquo; "
 "listed in Section VI of the license.  But if either of the options is "
-"invoked, the license becomes non-free.  In any case, it is incompatible with "
+"invoked, the license becomes nonfree.  In any case, it is incompatible with "
 "the GNU FDL."
 msgstr ""
 
@@ -2680,7 +2680,7 @@
 "you recommend &ldquo;Use the Open Publication License, Version 1.0 but don't "
 "enable the options&rdquo;, it would be easy for the second half of that "
 "recommendation to get forgotten; someone might use the license with the "
-"options, making a manual non-free, and yet think he or she is following your "
+"options, making a manual nonfree, and yet think he or she is following your "
 "advice."
 msgstr ""
 
@@ -2689,7 +2689,7 @@
 "Likewise, if you use this license without either of the options to make your "
 "manual free, someone else might decide to imitate you, then change his or "
 "her mind about the options thinking that that is just a detail; the result "
-"would be that his or her manual is non-free."
+"would be that his or her manual is nonfree."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2712,7 +2712,7 @@
 
 #. type: Content of: <h3>
 msgid ""
-"<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</a> "
+"<a id=\"NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a> "
 "<span class=\"anchor-reference-id\"> (<a "
 "href=\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>)  "
 "</span>"

Index: philosophy/po/latest-articles.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/latest-articles.de.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/latest-articles.de.po 8 Apr 2012 08:57:48 -0000       1.8
+++ philosophy/po/latest-articles.de.po 20 Apr 2012 16:28:23 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: latest-articles.html\n"
-"POT-Creation-Date: 2012-01-24 20:25-0500\n"
+"POT-Creation-Date: 2012-04-20 12:25-0300\n"
 "PO-Revision-Date: 2012-01-30 03:54+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-20 12:25-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -39,6 +40,12 @@
 "Druckfrisch, die aktuellsten Artikel über Freie Software und dem GNU 
Projekt."
 
 #. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/philosophy/network-services-arent-free-or-nonfree.html\"> Network "
+"Services Aren't Free or Nonfree; They Raise Other Issues</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
 msgid "<a href=\"/philosophy/stallmans-law.html\">Stallman's Law</a>"
 msgstr "<a href=\"/philosophy/stallmans-law\">Stallmans Gesetz</a>"
 

Index: philosophy/po/latest-articles.pot
===================================================================
RCS file: /web/www/www/philosophy/po/latest-articles.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/latest-articles.pot   25 Jan 2012 01:25:56 -0000      1.2
+++ philosophy/po/latest-articles.pot   20 Apr 2012 16:28:24 -0000      1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 20:25-0500\n"
+"POT-Creation-Date: 2012-04-20 12:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -36,6 +36,12 @@
 msgstr ""
 
 #. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/philosophy/network-services-arent-free-or-nonfree.html\"> Network "
+"Services Aren't Free or Nonfree; They Raise Other Issues</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
 msgid "<a href=\"/philosophy/stallmans-law.html\">Stallman's Law</a>"
 msgstr ""
 

Index: server/gnun/compendia/compendium.it.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.it.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7



reply via email to

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