www-commits
[Top][All Lists]
Advanced

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

www gnusflashes.fr.include education/po/edu-faq...


From: Yavor Doganov
Subject: www gnusflashes.fr.include education/po/edu-faq...
Date: Sat, 28 Jan 2012 01:29:04 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   12/01/28 01:29:04

Modified files:
        .              : gnusflashes.fr.include 
        education/po   : edu-faq.fr.po edu-faq.translist 
        gnu            : manifesto.fr.html 
        gnu/po         : manifesto.fr-en.html manifesto.fr.po 
        graphics       : fsf-logo.fr.html 
        graphics/po    : fsf-logo.fr.po 
        licenses       : license-list.fr.html quick-guide-gplv3.fr.html 
                         translations.fr.html 
        licenses/po    : license-list.es.po license-list.fr-en.html 
                         license-list.fr.po quick-guide-gplv3.fr-en.html 
                         quick-guide-gplv3.fr.po translations.fr-en.html 
                         translations.fr.po 
        philosophy     : copyright-versus-community.fr.html 
                         digital-inclusion-in-freedom.fr.html 
                         misinterpreting-copyright.fr.html 
        philosophy/po  : copyright-versus-community.fr-en.html 
                         digital-inclusion-in-freedom.fr-en.html 
                         misinterpreting-copyright.fr-en.html 
        server         : sitemap.fr.html whatsnew.fr.html 
                         whatsnew.fr.include 
        server/po      : sitemap.fr-en.html sitemap.fr.po whatsnew.fr.po 
Added files:
        education      : edu-faq.fr.html 
        education/po   : edu-faq.fr-en.html 
        graphics/po    : fsf-logo.fr-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnusflashes.fr.include?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-faq.fr.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-faq.fr.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-faq.translist?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-faq.fr-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/manifesto.fr.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.fr-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.fr.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/fsf-logo.fr.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/fsf-logo.fr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/fsf-logo.fr-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.fr.html?cvsroot=www&r1=1.110&r2=1.111
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/quick-guide-gplv3.fr.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.fr.html?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.108&r2=1.109
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/quick-guide-gplv3.fr-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/quick-guide-gplv3.fr.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.fr-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.fr.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/copyright-versus-community.fr.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/digital-inclusion-in-freedom.fr.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/misinterpreting-copyright.fr.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/copyright-versus-community.fr-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/digital-inclusion-in-freedom.fr-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/misinterpreting-copyright.fr-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.fr.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/server/whatsnew.fr.html?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/server/whatsnew.fr.include?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.fr-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.fr.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/whatsnew.fr.po?cvsroot=www&r1=1.58&r2=1.59

Patches:
Index: gnusflashes.fr.include
===================================================================
RCS file: /web/www/www/gnusflashes.fr.include,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- gnusflashes.fr.include      23 Jan 2012 01:32:00 -0000      1.40
+++ gnusflashes.fr.include      28 Jan 2012 01:26:31 -0000      1.41
@@ -1,4 +1,4 @@
 <!--Automatically generated by GNUN; do not edit!-->
-  <p>A first installment of a <a href="/bulletins/gnustatus-2011-01.html">GNU 
Status Report</a> is available.  This is a partial revival of the original 
<cite>GNU's Bulletin</cite>, with the aim of providing GNU-wide information 
from time to time, for as many packages as possible.  <a 
href="/bulletins/bulletins.html">More info</a>.</p>
-  <p>Savannah was down for a few days recently due to a password compromise 
and then a disk failure.  Also, some Apache features have been turned off for 
web pages.  <a href="http://savannah.gnu.org/news/";>Full news items</a>.</p>
-  <p>US citizens: Stop the Internet blacklist bill. Sign the petition at <a 
href="http://demandprogress.org/blacklist/";>http://demandprogress.org/blacklist</a>,
 and see <a 
href="http://www.fsf.org/blogs/community/the-internet-blacklist-coica-is-back-take-action-before-thursday";>the
 post on fsf.org</a> for more information.</p>
+  <p>Le premier numéro du <a href="/bulletins/gnustatus-2011-01.html">GNU 
Status Report</a> vient de sortir. C'est une reprise partielle du <cite>GNU's 
Bulletin</cite> qui a pour but de donner de temps en temps des informations sur 
l'ensemble du projet GNU, pour autant de paquets logiciels que possible. <a 
href="/bulletins/bulletins.html">Plus d'info</a>.</p>
+  <p>Savannah a été hors service pendant quelques jours récemment à cause 
d'un mot de passe compromis, puis d'un disque défaillant. De plus, quelques 
fonctionnalités d'Apache ont été arrêtées pour les pages web. <a 
href="http://savannah.gnu.org/news/";>Nouvelles détaillées</a>.</p>
+  <p>Citoyens américains : arrêtez la loi sur la liste noire d'Internet. 
Signez la pétition à <a 
href="http://demandprogress.org/blacklist/";>http://demandprogress.org/blacklist</a>,
 et lisez <a 
href="http://www.fsf.org/blogs/community/the-internet-blacklist-coica-is-back-take-action-before-thursday";>l'article
 sur fsf.org</a> pour plus ample information.</p>

Index: education/po/edu-faq.fr.po
===================================================================
RCS file: /web/www/www/education/po/edu-faq.fr.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education/po/edu-faq.fr.po  27 Jan 2012 22:39:11 -0000      1.1
+++ education/po/edu-faq.fr.po  28 Jan 2012 01:26:52 -0000      1.2
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2012-01-26 19:58+0100\n"
 "Last-Translator: Arthur Godet <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>

Index: education/po/edu-faq.translist
===================================================================
RCS file: /web/www/www/education/po/edu-faq.translist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- education/po/edu-faq.translist      25 Dec 2011 05:22:20 -0000      1.4
+++ education/po/edu-faq.translist      28 Jan 2012 01:26:52 -0000      1.5
@@ -5,6 +5,8 @@
 <li><a href="/education/edu-faq.de.html">Deutsch</a>&nbsp;[de]</li>
 <!-- English -->
 <li><a href="/education/edu-faq.en.html">English</a>&nbsp;[en]</li>
+<!-- French -->
+<li><a href="/education/edu-faq.fr.html">français</a>&nbsp;[fr]</li>
 <!-- Polish -->
 <li><a href="/education/edu-faq.pl.html">polski</a>&nbsp;[pl]</li>
 </ul>

Index: gnu/manifesto.fr.html
===================================================================
RCS file: /web/www/www/gnu/manifesto.fr.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/manifesto.fr.html       27 Jan 2012 09:27:53 -0000      1.38
+++ gnu/manifesto.fr.html       28 Jan 2012 01:27:06 -0000      1.39
@@ -710,7 +710,7 @@
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
-<b>Notes de traduction</b><ol class="translator-notes-alpha">
+<b>Notes de traduction</b><ol id="translator-notes-alpha">
 <li id="TransNote1">[Révision 2011] Actuellement, on traduit souvent
 <em>proprietary</em> par « privateur ». <a
 href="#TransNote1-rev">&#8593;</a></li>
@@ -766,7 +766,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/27 09:27:53 $
+$Date: 2012/01/28 01:27:06 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/manifesto.fr-en.html
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.fr-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/po/manifesto.fr-en.html 27 Jan 2012 09:28:33 -0000      1.4
+++ gnu/po/manifesto.fr-en.html 28 Jan 2012 01:27:13 -0000      1.5
@@ -691,7 +691,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/01/27 09:28:33 $
+$Date: 2012/01/28 01:27:13 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/manifesto.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.fr.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/po/manifesto.fr.po      27 Jan 2012 18:39:12 -0000      1.32
+++ gnu/po/manifesto.fr.po      28 Jan 2012 01:27:14 -0000      1.33
@@ -12,11 +12,10 @@
 "PO-Revision-Date: 2012-01-27 14:25+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-09-20 12:27-0300\n"
+"Language: fr\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -493,8 +492,8 @@
 "<strong>&ldquo;You have to charge for the program to pay for providing the "
 "support.&rdquo;</strong>"
 msgstr ""
-"<strong>«&nbsp;Il faut faire payer le logiciel pour financer le service "
-"après-vente.&nbsp;»</strong>"
+"<strong>«&nbsp;Il faut faire payer le logiciel pour financer le service 
après-"
+"vente.&nbsp;»</strong>"
 
 #. type: Content of: <p>
 msgid ""
@@ -730,8 +729,8 @@
 #. type: Content of: <p>
 msgid "<strong>&ldquo;Won't programmers starve?&rdquo;</strong>"
 msgstr ""
-"<strong>«&nbsp;Les programmeurs ne vont-ils pas mourir de faim&nbsp;?"
-"&nbsp;»</strong>"
+"<strong>«&nbsp;Les programmeurs ne vont-ils pas mourir de 
faim&nbsp;?&nbsp;»</"
+"strong>"
 
 #. type: Content of: <p>
 msgid ""
@@ -800,8 +799,8 @@
 "<strong>&ldquo;Don't people have a right to control how their creativity is "
 "used?&rdquo;</strong>"
 msgstr ""
-"<strong>«&nbsp;Les gens n'ont-ils pas le droit de gérer l'utilisation de "
-"leur créativité&nbsp;?&nbsp;»</strong>"
+"<strong>«&nbsp;Les gens n'ont-ils pas le droit de gérer l'utilisation de 
leur "
+"créativité&nbsp;?&nbsp;»</strong>"
 
 #. type: Content of: <p>
 msgid ""
@@ -952,8 +951,8 @@
 "<strong>&ldquo;Won't everyone stop programming without a monetary incentive?"
 "&rdquo;</strong>"
 msgstr ""
-"<strong>«&nbsp;Les gens ne s'arrêteront-ils pas de programmer sans l'appât 
"
-"du gain&nbsp;?&nbsp;»</strong>"
+"<strong>«&nbsp;Les gens ne s'arrêteront-ils pas de programmer sans l'appât 
du "
+"gain&nbsp;?&nbsp;»</strong>"
 
 #. type: Content of: <p>
 msgid ""

Index: graphics/fsf-logo.fr.html
===================================================================
RCS file: /web/www/www/graphics/fsf-logo.fr.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- graphics/fsf-logo.fr.html   30 Dec 2011 05:13:25 -0000      1.3
+++ graphics/fsf-logo.fr.html   28 Jan 2012 01:27:22 -0000      1.4
@@ -1,121 +1,87 @@
-<!--#include virtual="/server/header.fr.html" -->
 
-<title>Logo FSF</title>
 
-<!--#include virtual="/server/banner.fr.html" -->
+<!--#include virtual="/server/html5-header.fr.html" -->
+<!-- Parent-Version: 1.61 -->
 
-<h2>Le logo de la Free Software Foundation</h2>
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Logo FSF - GNU Project - Free Software Foundation (FSF)</title>
 
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html.  Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
-
-<p>
-  <a href="/graphics/logo-fsf.org-tiny.png"><img 
src="/graphics/logo-fsf.org-tiny.png"
-  alt=" [Le logo officiel de la FSF] " /></a>
-</p>
+<!--#include virtual="/server/banner.fr.html" -->
+<!--#include virtual="/graphics/po/fsf-logo.translist" -->
+<h2>Le logo de la Free Software Foundation</h2>
 
-<p>
-  Le logo rouge est le nouveau logo officiel de la Free Software
-  Foundation. Ce super nouveau logo a &eacute;t&eacute; cr&eacute;&eacute; par 
Li Jiang.
-  L'utilisation de l'ancien
-  <a href="/graphics/fsf-logo-tiny.jpg">logo noir et blanc</a> est
-  arr&ecirc;t&eacute;e.
+<p><a href="/graphics/logo-fsf.org-tiny.png"><img
+src="/graphics/logo-fsf.org-tiny.png" alt="[Le logo officiel de la FSF]" /></a>
 </p>
 
-<p>
-  Ce logo rouge est disponible dans les formats suivants&nbsp;:
+<p>Le logo rouge est le nouveau logo officiel de la <i>Free Software
+Foundation</i>. Ce super nouveau logo a été créé par Li Jiang. 
L'utilisation
+de l'ancien <a href="/graphics/fsf-logo-tiny.jpg">logo noir et blanc</a> est
+arrêtée. <strong>Si vous voulez utiliser ce logo pour mettre en lien un site
+web opéré par la FSF, n'hésitez pas. Si vous voulez l'utiliser dans un autre
+but, quel qu'il soit, veuillez contacter <a
+href="mailto:address@hidden
+Logo">address@hidden</a>.</strong>
 </p>
 
+<p>Ce logo rouge est disponible dans les formats suivants&nbsp;:</p>
 <ul>
-  <li>EPS <a href="/graphics/logo-fsf.org.eps">7.8 Mo (PostScript 
encapsul&eacute;)</a></li>
-  <li>PNG <a href="/graphics/logo-fsf.org-tiny.png">9.1 Ko (environ 20% de la 
taille
-  originale et de qualit&eacute; raisonnable)</a>, <a 
href="/graphics/logo-fsf.org.png">43.6 Ko
-  (pleine taille et haute quali&eacute;)</a></li>
-  <li>SVG <a href="/graphics/logo-fsf.org.svg">14.6 Ko (graphique vectoriel 
scalaire
-  avec un fond transparent)</a></li>
+  <li>EPS <a href="/graphics/logo-fsf.org.eps">7.8 Mo (PostScript 
encapsulé)</a></li>
+  <li>PNG <a href="/graphics/logo-fsf.org-tiny.png">9.1 Ko (environ 20% de la
+taille originale et de qualité raisonnable)</a>, <a
+href="/graphics/logo-fsf.org.png">43.6 Ko (pleine taille et haute
+qualié)</a></li>
+  <li>SVG <a href="/graphics/logo-fsf.org.svg">14.6 Ko (graphique vectoriel
+scalaire avec un fond transparent)</a></li>
 </ul>
 
-<p>
-  <a href="/graphics/graphics.fr.html">D'autres illustrations</a> dans la 
galerie GNU.
+<p><a href="/graphics/graphics.html">D'autres illustrations</a> dans la galerie
+GNU.
 </p>
 
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
 </div>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 <!-- for id="content", starts in the include above -->
-
-<!--#include virtual="/server/footer-min.fr.html"-->
-
+<!--#include virtual="/server/footer.fr.html" -->
 <div id="footer">
+<p>Veuillez envoyer les requêtes concernant la FSF et GNU à <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Il existe aussi <a
+href="/contact/">d'autres moyens de contacter</a> la FSF. <br />
+Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou
+suggestions à <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Pour les questions et requ&ecirc;tes relatives &agrave; la FSF &amp;
-GNU&nbsp;: <a href="mailto:gnu&#64;gnu.org";><em>gnu&#64;gnu.org</em></a>.
-Autres <a href="/home.fr.html#ContactInfo">moyens pour contacter</a> la FSF.
+<p>Veuillez consulter le <a
+href="/server/standards/README.translations.html">README des traductions</a>
+pour des informations sur la coordination et la soumission de traductions de
+cet article.</p>
 
-Merci d'envoyer des commentaires sur cette page web &agrave; <a 
href="mailto:webmasters&#64;gnu.org";><em>webmasters&#64;gnu.org</em></a>,
-envoyer une autre question &agrave; <a 
href="mailto:gnu&#64;gnu.org";><em>gnu&#64;gnu.org</em></a>.
-</p>
+<p>Copyright &copy; 2001, 2006 Free Software Foundation, Inc.</p>
 
-<p>Copyright &copy; 2001, 2006 Free Software Foundation, Inc.,</p>
-<address>51 Franklin St - Fifth Floor, Boston, MA 02110, USA</address>
+<p>Cette page peut être utilisée suivant les conditions de la licence <a
+rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States</a>.</p>
 
-<p>Verbatim copying and distribution of this entire article is
-permitted in any medium, provided this notice is preserved.
-</p>
 
-<p>La reproduction exacte et la distribution int&eacute;grale de cet
-article est permise sur n'importe quel support d'archivage, pourvu que
-cette notice soit pr&eacute;serv&eacute;e.</p>
-
-<p>
-Derni&egrave;re mise-&agrave;-jour&nbsp;:
-<!-- timestamp start -->
-$Date: 2011/12/30 05:13:25 $
-<!-- timestamp end -->
-</p>
+<div class="translators-credits">
 
-<p>
-Traduction&nbsp;: C&eacute;dric Corazza.<br />
-R&eacute;vision&nbsp;: <a 
href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a>
-</p>
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+Traduction&nbsp;: Cédric Corazza.<br />Révision&nbsp;: <a
+href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
 
-</div>
 
-<div id="translations">
-<h3>Traductions de cette page</h3>
+ <p><!-- timestamp start -->
+Dernière mise à jour&nbsp;: 
 
-<!-- Please keep this list alphabetical, and in the original -->
-<!-- language if possible, otherwise default to English -->
-<!-- If you do not have it English, please comment what the -->
-<!-- English is.  If you add a new language here, please -->
-<!-- advise web-translators&#64;gnu.org and add it to -->
-<!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-<!--    - in /home/www/html/server/standards/README.translations.html -->
-<!--      one of the lists under the section "Translations Underway" -->
-<!--    - if there is a translation team, you also have to add an alias -->
-<!--      to mail.gnu.org:/com/mailer/aliases -->
-
-<!-- Please also check you have the 2 letter language code right versus -->
-<!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-<ul class="translations-list">
-<li> <a href="/graphics/fsf-logo.ca.html" 
title="Catalan">Catal&#x00e0;</a></li>
-<li><a href="/graphics/fsf-logo.en.html" title="English">English</a></li>
-<li><a href="/graphics/fsf-logo.fr.html" 
title="French">Fran&#x00e7;ais</a>&nbsp;[fr]</li>
-<li><a href="/graphics/fsf-logo.ro.html" 
title="Romanian">Rom&#x00e2;n&#x0103;</a></li>
-</ul>
+$Date: 2012/01/28 01:27:22 $
+<!-- timestamp end -->
+</p>
 </div>
-
 </div>
 </body>
-
 </html>

Index: graphics/po/fsf-logo.fr.po
===================================================================
RCS file: /web/www/www/graphics/po/fsf-logo.fr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- graphics/po/fsf-logo.fr.po  27 Jan 2012 22:40:01 -0000      1.3
+++ graphics/po/fsf-logo.fr.po  28 Jan 2012 01:28:00 -0000      1.4
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2012-01-25 22:21+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>

Index: licenses/license-list.fr.html
===================================================================
RCS file: /web/www/www/licenses/license-list.fr.html,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- licenses/license-list.fr.html       23 Jan 2012 01:36:06 -0000      1.110
+++ licenses/license-list.fr.html       28 Jan 2012 01:28:07 -0000      1.111
@@ -356,6 +356,28 @@
 copyleft, compatible avec la GNU GPL. Très semblable à la licence 
X11.</p></dd>
 
 
+<dt><a id="ecfonts"
+href="http://dante.ctan.org/tex-archive/fonts/ec/src/copyrite.txt";>License
+des polices ec pour LaTeX</a> <span class="anchor-reference-id">(<a
+href="#ecfonts">#ecfonts</a>)</span></dt>
+<dd>
+<p>Cette licence couvre les <i>European Computer Modern Fonts</i> et les
+<i>Text Companion Fonts</i>, utilisées couramment dans LaTeX. selon la
+manière dont elles sont utilisées, elles peuvent être libres, ou non. Si le
+paquet dit que certaines polices du paquet ne peuvent pas être modifiées,
+alors il n'est pas libre. Dans le cas contraire, le paquet est libre. Les
+polices originales n'ont pas de restrictions sur les modifications, donc
+elles sont libres.</p>
+
+<p>À l'instar de la <a href="#LPPL-1.2">LaTeX Project Public License 1.2</a>,
+cette licence exige que les version modifiées aient un nom différent du nom
+de chacune des versions antérieures. C'est acceptable pour un  travail
+destiné à être utilisé avec LaTeX, puisque LaTeX permet le « remappage 
» des
+noms de fichiers pour vos programmes, mais c'est très ennuyeux et peut même
+être très lourd à gérer dans d'autres contextes.</p>
+</dd>
+
+
 <dt><!-- without decimal, leave for compatibility -->
 <a id="eCos20"></a> <a id="eCos2.0" href="/licenses/ecos-license.html"> eCos
 license version&nbsp;2.0</a> [EN] <span class="anchor-reference-id"> (<a
@@ -2137,7 +2159,7 @@
  <p><!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/23 01:36:06 $
+$Date: 2012/01/28 01:28:07 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/quick-guide-gplv3.fr.html
===================================================================
RCS file: /web/www/www/licenses/quick-guide-gplv3.fr.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/quick-guide-gplv3.fr.html  23 Jan 2012 01:36:06 -0000      1.15
+++ licenses/quick-guide-gplv3.fr.html  28 Jan 2012 01:28:07 -0000      1.16
@@ -18,30 +18,30 @@
 
 <p>par <strong>Brett Smith</strong></p>
 
-<p>[Cet article est également disponible aux formats <a
+<p>[Cet article est également disponible en anglais aux formats <a
 href="/licenses/quick-guide-gplv3.pdf">PDF</a> et <a
 href="/licenses/quick-guide-gplv3.tar.gz">reStructuredText</a>.]</p>
 
 <p>Après une année et demie de consultation publique, des milliers de retours
-et quatre brouillons, la version 3 de la GNU General Public License (<a
-class="reference external" href="/licenses/gpl-3.0.html">GPLv3</a>) a enfin
-été publiée le 29 juin 2007. Bien qu'il y ait eu de nombreuses discussions 
à
-propos de cette licence depuis la parution de son premier brouillon, peu de
-gens ont parlé des avantages qu'elle procure aux développeurs. Nous publions
-ce guide afin de combler ce manque. Nous débuterons par un rappel succinct
-sur les logiciels libres, la gauche d'auteur [copyleft] et les objectifs de
-la GPL. Nous passerons ensuite en revue les principaux changements apportés
-à la licence afin de voir en quoi ils vont dans le sens des objectifs de la
-GPL et des intérêts des développeurs.</p>
+et quatre brouillons, la version 3 de la <i>GNU General Public License</i>
+(<a class="reference external" href="/licenses/gpl-3.0.html">GPLv3</a>) a
+enfin été publiée le 29 juin 2007. Bien qu'il y ait eu de nombreuses
+discussions à propos de cette licence depuis la parution de son premier
+brouillon, peu de gens ont parlé des avantages qu'elle procure aux
+développeurs. Nous publions ce guide afin de combler ce manque. Nous
+débuterons par un rappel succinct sur les logiciels libres, le copyleft (ou
+gauche d'auteur) et les objectifs de la GPL. Nous passerons ensuite en revue
+les principaux changements apportés à la licence afin de voir en quoi ils
+vont dans le sens des objectifs de la GPL et des intérêts des 
développeurs.</p>
 <div class="section" id="the-foundations-of-the-gpl">
 <h3>Les fondements de la GPL</h3>
 <p>Personne ne devrait être limité par les logiciels qu'il utilise. Il y a
 quatre libertés que tout utilisateur devrait avoir&nbsp;:</p>
 <ul class="simple">
-<li>La liberté d'utiliser le logiciel pour n'importe quel usage,</li>
-<li>La liberté d'améliorer le programme pour répondre à vos besoins,</li>
-<li>La liberté de redistribuer des copies à vos amis, voisins, &hellip;,</li>
-<li>La liberté de redistribuer ces améliorations.</li>
+<li>la liberté d'utiliser le logiciel pour n'importe quel usage,</li>
+<li>la liberté d'améliorer le programme pour répondre à vos besoins,</li>
+<li>la liberté de redistribuer des copies à vos amis, voisins, et</li>
+<li>la liberté de redistribuer ces améliorations.</li>
 </ul>
 <p>Quand un programme offre à ses utilisateurs toutes ces libertés, nous le
 qualifions de <a class="reference external"
@@ -49,32 +49,31 @@
 <p>Les développeurs qui écrivent des logiciels peuvent les publier sous les
 termes de la licence GNU GPL. Ce faisant, leur logiciel sera libre et le
 restera, indépendamment de qui modifiera et distribuera ce logiciel. Nous
-appelons cela la «&nbsp;gauche d'auteur&nbsp;» [copyleft]&nbsp;: le logiciel
-est bien soumis au droit d'auteur, mais plutôt que d'utiliser ces droits
-pour restreindre l'utilisation que peuvent en faire les utilisateurs (comme
-c'est le cas dans les logicielspropriétaires), nous utilisons ces droits
-d'auteur pour nous assurer que tous les utilisateurs ont ces libertés.</p>
-<p>Nous mettons à jour la GPL afin d'empêcher la gauche d'auteur d'être 
sapée
-par des évolutions légales ou technologiques. La dernière version protège
-les utilisateurs contre trois dangers récents&nbsp;:</p>
+appelons cela <i>copyleft</i> : le logiciel est bien soumis au droit
+d'auteur, mais plutôt que d'utiliser ces droits pour restreindre
+l'utilisation que peuvent en faire les utilisateurs (comme c'est le cas dans
+les logiciels privateurs<a id="TransNote1-rev"
+href="#TransNote1"><sup>1</sup></a>), nous les utilisons pour nous assurer
+que tous les utilisateurs auront ces libertés.</p>
+<p>Nous mettons à jour la GPL afin d'empêcher son copyleft d'être sapé par 
des
+évolutions légales ou technologiques. La dernière version protège les
+utilisateurs contre trois dangers récents&nbsp;:</p>
 <ul class="simple">
-<li>La «&nbsp;Tivoisation&nbsp;» [prononcer 
«&nbsp;Tivoïsation&nbsp;»]&nbsp;:
-Certaines entreprises ont créé différents types d'équipements qui font
-tourner des logiciels sous licence GPL, et ont ensuite rendu le matériel tel
-qu'elles peuvent changer les logiciels mais pas vous. Si un équipement peut
-faire tourner un logiciel arbitrairement, cet équipement est un ordinateur
+<li>La «&nbsp;tivoïsation&nbsp;»&nbsp;: Certaines entreprises ont créé
+différents types d'équipements qui font tourner des logiciels sous licence
+GPL, et ont ensuite bidouillé le matériel pour qu'elles puissent modifier
+les logiciels mais que vous ne puissiez pas le faire. Si un équipement peut
+faire tourner n'importe quel logiciel, cet équipement est un ordinateur
 multi-usage. Dès lors, son propriétaire devrait pouvoir contrôler ce que
 fait cet équipement. Quand un équipement vous empêche de faire cela, nous
-appelons cela la «&nbsp;Tivoisation&nbsp;».</li>
-<li>Des lois prohibant les logiciels libres&nbsp;: Certaines lois, comme la
-<acronym title="Digital Millennium Copyright Act">DMCA</acronym> aux
-États-Unis ou l'<acronym title="European Union Copyright
-Directive">EUCD</acronym> [dont la loi <acronym title=" Droit d’auteur et
-droits voisins dans la société de l’information">DADVSI</acronym> est la
-transposition française], ont criminalisé le fait d'écrire ou de distribuer
-des logiciels qui peuvent casser des mesures de mégestion numérique des
-droits (ou Digital Rights Mismanagement - DRM [jeu de mots avec Digital
-Rights Management], voir <a
+appelons cela la tivoïsation.</li>
+<li>Des lois prohibant les logiciels libres&nbsp;: certaines lois, comme la
+<i>Digital Millennium Copyright Act</i>,<a id="TransNote2-rev"
+href="#TransNote2"><sup>2</sup></a> ou la Directive de l'Union européenne
+sur le copyright, ont criminalisé le fait d'écrire ou de distribuer des
+logiciels qui peuvent casser des dispositifs de <acronym title="Digital
+Restrictions Managements">DRM</acronym> (gestion numérique des
+restrictions) ; voir <a
 
href="#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">ci-dessous</a>).
 Ces lois ne devraient pas interférer avec les droits que vous confère la
 licence GPL.</li>
@@ -87,7 +86,7 @@
 avec la liberté des utilisateurs. Aucune entreprise ne devrait être en
 mesure de faire cela.</li>
 </ul>
-<p>La version 3 de la GNU GPL apporte aussi un certain nombre d'améliorations
+<p>La version 3 de la GNU GPL apporte aussi un certain nombre d'améliorations
 quant à la lisibilité et l'utilisation pour tout un chacun. Mais même avec
 tous ces changements, la GPLv3 n'est pas une licence radicalement
 nouvelle&nbsp;; c'est plutôt une évolution par rapport à la version
@@ -99,30 +98,30 @@
 </div>
 <div class="section" 
id="neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">
 <h3>Neutraliser les lois prohibant les logiciels libres, sans interdire les 
DRM</h3>
-<p>Vous êtes certainement au courant de l'existence de mesures de mégestion
-numérique des droits (Digital Rights Mismanagement - DRM) sur les DVD et
-d'autres médias. Vous êtes sans doute aussi au courant des lois qui ont
-rendu illégale l'écriture de vos propres outils pour les contourner, comme
-par exemple les lois Digital Millennium Copyright Act aux États-Unis ou la
-European Union Copyright Directive [dont la loi DADVSI est la transposition
-française].Personne ne devrait pouvoir vous empêcher d'écrire le code que
-vous souhaitez écrire, et la GPLv3 protège ce droit qui est le vôtre.</p>
+<p>Vous êtes certainement au courant de l'existence de la gestion numérique 
des
+restrictions (DRM) sur les DVD et d'autres médias. Vous êtes sans doute
+aussi au courant des lois qui ont rendu illégale l'écriture de vos propres
+outils pour les contourner, comme par exemple la loi américaine dite
+<i>Digital Millennium Copyright Act</i> et la Directive de l'Union
+européenne sur le copyright. Personne ne devrait pouvoir vous empêcher
+d'écrire le code que vous souhaitez écrire, et la GPLv3 protège ce droit qui
+est le vôtre.</p>
 <p>Il est toujours possible d'utiliser du code sous licence GPL pour écrire 
des
-programmes qui mettent en &oelig;uvre des «&nbsp;DRM&nbsp;». En revanche, si
-quelqu'un le fait avec du code sous licence GPLv3, la section 3 de la
-licence stipule que le système ne pourra être considéré comme une mesure de
-protection effective. Ceci veut dire que si vous cassez le DRM, vous serez
-libres de distribuer ce logiciel et vous ne serez pas menacés de sanctions
-du fait des lois DMCA, EUCD, DADVSI ou assimilées.</p>
+programmes qui mettent en œuvre des DRM. En revanche, si quelqu'un le fait
+avec du code sous licence GPLv3, la section 3 de la licence stipule que le
+système ne pourra être considéré comme une mesure de protection
+effective. Ceci veut dire que si vous cassez le DRM, vous serez libres de
+distribuer ce logiciel et vous ne serez pas menacés de sanctions du fait des
+lois DMCA ou assimilées.</p>
 <p>Comme toujours, la licence GNU GPL ne bride pas les gens dans les logiciels
 qu'ils font, elle les empêche juste de brider l'usage que les autres en
 font.</p>
 </div>
 <div class="section" id="protecting-your-right-to-tinker">
 <h3>Protéger votre droit de bricoler</h3>
-<p>La Tivoisation est une dangereuse tentative visant à restreindre la 
liberté
+<p>La tivoïsation est une dangereuse tentative visant à restreindre la 
liberté
 des utilisateurs&nbsp;: le droit de modifier votre logiciel devient caduc si
-aucun de vos ordinateurs ne vous le permet. La GPLv3 empêche la tivoisation
+aucun de vos ordinateurs ne vous le permet. La GPLv3 empêche la tivoïsation
 en requérant du distributeur qu'il vous fournisse toutes les informations et
 toutes les données nécessaires pour installer des versions modifiées sur
 l'équipement. Cela peut être aussi simple qu'un ensemble d'instructions, ou
@@ -216,8 +215,8 @@
 quelqu'un utilise des sources sous AGPL dans un programme sans interface
 réseau, il n'aurait qu'à fournir les sources de la même façon que dans la
 GPL. En rendant les deux licences compatibles, les développeurs de logiciels
-seront en mesure de renforcer leur gauche d'auteur tout en capitalisant sur
-les portions de code mûres à leur disposition sous licence GPL.</p>
+seront en mesure de renforcer leur copyleft tout en capitalisant sur les
+portions de code mûres à leur disposition sous licence GPL.</p>
 </div>
 <div class="section" id="more-ways-for-developers-to-provide-source">
 <h3>Plus de façons pour les développeurs de fournir les sources</h3>
@@ -229,10 +228,10 @@
 transférez les codes compilés via le réseau. Par exemple, quand vous
 hébergez du code compilé sur le web ou sur des serveurs FTP, vous pouvez
 tout simplement fournir des instructions pour indiquer aux visiteurs comment
-obtenir le code sourced'un serveur tiers. Grâce à cette nouvelle option,
+obtenir le code source d'un serveur tiers. Grâce à cette nouvelle option,
 satisfaire à l'exigence de disponibilité du code source devrait être
 sensiblement plus facile pour bon nombre de petits distributeurs qui font
-seulement de petites modifications à des grands corpus de codes source.</p>
+seulement de petites modifications à de grands corpus de codes source.</p>
 <p>La nouvelle licence devrait aussi simplifier la transmission des codes
 compilés via BitTorrent. Tout d'abord, les gens qui se contentent de
 télécharger ou de partager le torrent sont exemptés des exigences de la
@@ -241,73 +240,73 @@
 du torrent sur quel serveur public elle est disponible.</p>
 <p>Ces nouvelles options aident à conserver la GPL en phase avec les usages de
 la communauté concernant la mise à disposition des sources, sans rendre
-l'obtention de ces sources plus dure pour les utilisateurs.</p>
+l'obtention de ces sources plus difficile pour les utilisateurs.</p>
 </div>
 <div class="section" 
id="less-source-to-distribute-new-system-libraries-exception">
 <h3>Moins de sources à distribuer&nbsp;: de nouvelles exceptions pour les
-bibliothèques systèmes</h3>
+bibliothèques système</h3>
 <p>Les deux versions de la GPL requièrent que vous fournissiez toutes les
 sources nécessaires à la construction du logiciel, y compris les
 bibliothèques utilisées, les scripts de compilation, etc. Elles définissent
-aussi la limite des bibliothèques systèmes&nbsp;: vous n'avez pas à fournir
-les codes sources de certains éléments de c&oelig;ur du système
-d'exploitation, tels que les bibliothèques C.</p>
-<p>La GPLv3 a ajusté la définition des bibliothèques systèmes pour y 
inclure
-les logiciels qui ne rentrent pas directement dans le systèmed'exploitation,
+aussi la limite des bibliothèques système&nbsp;: vous n'avez pas à fournir
+les codes sources de certains éléments de cœur du système d'exploitation,
+tels que les bibliothèques C.</p>
+<p>La GPLv3 a ajusté la définition des bibliothèques système pour y 
inclure les
+logiciels qui ne rentrent pas directement dans le système d'exploitation,
 mais dont on peut raisonnablement attendre que tous les utilisateurs du
 logiciel les aient. Par exemple, cela inclut les bibliothèques standards des
 langages de programmation usuels tels que Python et Ruby.</p>
 <p>Cette nouvelle définition clarifie aussi le fait que vous pouvez combiner 
un
-logiciel GPL avec des bibliothèques systèmes incompatibles avec la GPL,
-telle que la bibliothèque C d'OpenSolaris, et les distribuer de manière
+logiciel GPL avec des bibliothèques système incompatibles avec la GPL, telle
+que la bibliothèque C d'OpenSolaris, et les distribuer de manière
 combinée. Ces modifications simplifieront la vie des distributeurs de
 logiciels libres qui souhaitent fournir ces combinaisons à leurs
 utilisateurs.</p>
 </div>
 <div class="section" id="a-global-license">
 <h3>Une licence globale</h3>
-<p>La GPLv2 parle beaucoup de «&nbsp;distribution&nbsp;» [NdT&nbsp;: to
-distribute]&nbsp;: quand vous partagez le programme avec quelqu'un d'autre,
-vous le distribuez. La licence ne précise jamais de quelle distribution il
-s'agit, dans la mesure où le terme a été emprunté aux lois des États-Unis
-sur les copyrights. Nous nous attendions à ce que les juges y chercheraient
-la définition du terme. Toutefois, nous avons découvert plus tard que les
-lois similaires des autres pays utilisaient le même terme, mais dans
+<p>La GPLv2 parle beaucoup de «&nbsp;distribution&nbsp;» <i>[to
+distribute]</i>&nbsp;: quand vous partagez le programme avec quelqu'un
+d'autre, vous le distribuez. La licence ne précise jamais de quelle
+distribution il s'agit, dans la mesure où le terme a été emprunté aux lois
+des États-Unis sur le copyright. Nous nous attendions à ce que les juges y
+cherchent la définition du terme. Toutefois, nous avons découvert plus tard
+que les lois similaires des autres pays utilisaient le même terme, mais dans
 d'autres acceptions du terme. De fait, un juge dans un tel pays pourrait
-interpréter la GPLv2 différemment qu'un juge des États-Unis.</p>
-<p>La GPLv3 utilise un nouveau terme, «&nbsp;transfert&nbsp;» [NdT&nbsp;: to
-convey], et en fournit une définition. Ce «&nbsp;transfert&nbsp;» a le même
-sens que nous souhaitions donner à «&nbsp;distribution&nbsp;», mais
+interpréter la GPLv2 différemment d'un juge des États-Unis.</p>
+<p>La GPLv3 utilise un nouveau terme, «&nbsp;transfert&nbsp;» <i>[to
+convey]</i>, et en fournit une définition. Ce «&nbsp;transfert&nbsp;» a le
+même sens que nous souhaitions donner à «&nbsp;distribution&nbsp;», mais
 maintenant que le terme est directement défini dans la licence, il sera
 dorénavant facile aux gens où qu'ils soient de comprendre ce que nous
 voulions dire. Il y a par ailleurs quelques autres modifications mineures
 disséminées dans la licence qui vont aussi aider à garantir que
-l'application serait la même de par le monde.</p>
+l'application soit la même partout de par le monde.</p>
 </div>
 <div class="section" 
id="when-the-rules-are-broken-a-smooth-path-to-compliance">
 <h3>Quand les règles sont violées&nbsp;: un chemin facilité vers leur 
respect</h3>
 <p>Sous la GPLv2, si vous avez violé la licence d'une quelconque façon, vos
 droits seront automatiquement perdus et ce de manière permanente. La seule
 façon de les retrouver est d'en faire la requête écrite auprès des
-détenteurs des droits d'auteur. Bien qu'une défense solide contre de telles
+détenteurs du copyright. Bien qu'une défense solide contre de telles
 violations soit souhaitable, cette politique pouvait causer de longues
 migraines lorsque quelqu'un violait involontairement ces règles. Demander à
-tous les détenteurs des droits d'auteurs un accord formel pour la
-restauration de sa licence pouvait être ardu et coûteux&nbsp;: une
-distribution GNU/Linux typique se fonde sur le travail de milliers de gens.</p>
+tous les détenteurs de copyright un accord formel pour la restauration de sa
+licence pouvait être ardu et coûteux&nbsp;: une distribution GNU/Linux
+typique se fonde sur le travail de milliers de gens.</p>
 <p>La GPLv3 propose une remise de peine pour bonne conduite&nbsp;: si vous
 violez la licence, vous récupérerez vos droits une fois que vous arrêtez
-votre infraction, à moins qu'un détenteur des droits d'auteur ne vous
-contacte sous 60 jours. Après réception d'une telle notification, vos
-récupérerez pleinement vos droits si c'est votre première infraction et si
-vous la corrigez sous 30 jours. Sinon, vous pouvez arranger l'affaire
-directement avec le détenteur des droits qui a pris contact avec vous, et
-vos droits seront alors aussi rétablis.</p>
-<p>Le respect de la GPL a toujours été la première priorité du FSF 
Compliance
-Lab et d'autres groupes cherchant à mettre en &oelig;uvre la licence à
-l'échelle mondiale. Ces modifications assurent que le respect de la licence
-reste la première priorité pour ces gens, et incitent ceux qui violent les
-termes de la licence à la respecter.</p>
+votre infraction, à moins qu'un détenteur de copyright ne vous contacte sous
+60 jours. Après réception d'une telle notification, vos récupérerez
+pleinement vos droits si c'est votre première infraction et si vous la
+corrigez sous 30 jours. Sinon, vous pouvez arranger l'affaire directement
+avec le détenteur du copyright qui a pris contact avec vous, et vos droits
+seront alors rétablis.</p>
+<p>Le respect de la GPL a toujours été la première priorité du <i>FSF
+Compliance Lab</i> et d'autres groupes cherchant à mettre en œuvre la
+licence à l'échelle mondiale. Ces modifications assurent que le respect de
+la licence reste la première priorité pour ces gens, et incitent ceux qui
+violent les termes de la licence à la respecter.</p>
 </div>
 <div class="section" id="the-latest-and-greatest">
 <h3>L'apothéose</h3>
@@ -316,18 +315,18 @@
 différentes choses de sa licence. Mais il y a de fortes chances qu'un
 certain nombre de ces améliorations vous aident dans votre travail.</p>
 <p>Prises dans leur ensemble, toutes ces améliorations illustrent une 
dernière
-chose&nbsp;: nous avons réalisé une meilleure gauche d'auteur. Elle permet
-de mieux protéger les libertés des utilisateurs, et elle facilite aussi la
-coopération avec la communauté du logiciel libre. Mais la mise à jour de la
-licence n'est qu'une partie du travail&nbsp;: afin que les gens profitent
-des avantages qu'elle apporte, il faut aussi que les développeurs utilisent
-la GPLv3 dans leurs projets. En publiant votre propre logiciel sous cette
+chose&nbsp;: nous avons réalisé un meilleur copyleft. Il permet de mieux
+protéger les libertés des utilisateurs, et il facilite aussi la coopération
+avec la communauté du logiciel libre. Mais la mise à jour de la licence
+n'est qu'une partie du travail&nbsp;: afin que les gens profitent des
+avantages qu'elle apporte, il faut aussi que les développeurs utilisent la
+GPLv3 dans leurs projets. En publiant votre propre logiciel sous cette
 nouvelle licence, tout le monde qui aura affaire à votre logiciel en
 profitera, que ce soient les utilisateurs, les autres développeurs, les
 distributeurs ou même les avocats. Nous espérons que vous utiliserez la
-GPLv3 lors de la prochaine sortie de votre logiciel.</p>
+GPLv3 lors de votre prochaine publication de logiciel.</p>
 <p>Si vous souhaitez en apprendre plus sur le passage de votre projet vers la
-GPLv3, le FSF Compliance Lab serait enchanté de vous aider. Sur <a
+GPLv3, le <i>FSF Compliance Lab</i> serait enchanté de vous aider. Sur <a
 class="reference external" href="http://www.fsf.org/licensing/";>notre site
 web</a>, vous pouvez trouver <a class="reference external"
 href="http://www.fsf.org/licensing/licenses/gpl-howto.html";>des informations
@@ -335,9 +334,9 @@
 href="http://www.fsf.org/licensing/licenses/gpl-faq.html";>FAQ répondant aux
 questions usuelles</a> que se posent les gens à son propos. Si votre cas est
 plus compliqué que cela, prenez <a class="reference external"
-href="mailto:address@hidden";>contact avec nous</a> et nous ferons tout
-notre possible pour vous aider dans cette transition. Ensemble, nous pouvons
-aider à protéger la liberté de tous les utilisateurs.</p>
+href="mailto:licensing&#64;fsf.org";>contact avec nous</a> et nous ferons
+tout notre possible pour vous aider dans cette transition. Ensemble, nous
+pouvons aider à protéger la liberté de tous les utilisateurs.</p>
 </div>
 
 <!-- If needed, change the copyright block at the bottom. In general, -->
@@ -349,7 +348,12 @@
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
- </div>
+<b>Notes de traduction</b><ol>
+<li id="TransNote1">Autre traduction de <em>proprietary</em> :
+propriétaire. <a href="#TransNote1-rev">1</a></li>
+<li id="TransNote2">Loi sur le copyright du millénaire numérique. <a
+href="#TransNote2-rev">2</a></li>
+</ol></div>
 </div>
 
 <!-- for id="content", starts in the include above -->
@@ -361,9 +365,9 @@
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Il existe aussi <a
 href="/contact/">d'autres moyens de contacter</a> la FSF.
 <br />
-Veuillez envoyer (en anglais) les liens morts ou d'autres suggestions sur
-cette page web à <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+Veuillez envoyer (en anglais) les liens orphelins et autres corrections ou
+suggestions à <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.
 </p>
 
 <p>
@@ -394,7 +398,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/23 01:36:06 $
+$Date: 2012/01/28 01:28:07 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/translations.fr.html
===================================================================
RCS file: /web/www/www/licenses/translations.fr.html,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- licenses/translations.fr.html       25 Jan 2012 17:26:25 -0000      1.70
+++ licenses/translations.fr.html       28 Jan 2012 01:28:08 -0000      1.71
@@ -281,9 +281,6 @@
 <code>[zh-tw]</code> Traduction en <a
 href="http://www.kaveh.org/gnu/lgplv3-fa.html";>chinois (traditionnel)</a> de
 la LGPL</li>
-  <li><!-- RT #716430 -->
-<code>[cs]</code> Traduction en <a
-href="http://jxself.org/translations/lgpl-3.cs.shtml";>tchèque</a> de la 
GPL</li>
 
   <!-- TODO: the page should say it is CC-BY-ND -->
 <li><code>[de]</code> Traduction en <a
@@ -301,9 +298,6 @@
 -->
 <li><code>[fa]</code> Traduction en <a
 href="http://www.kaveh.org/gnu/lgplv3-fa.html";>farsi</a> de la LGPL</li>
-  <li><!-- RT #716430 -->
-<code>[sk]</code> Traduction en <a
-href="http://jxself.org/translations/lgpl-3.sk.shtml";>slovaque</a> de la 
GPL</li>
 
 <!-- links to hosting site
   <li>
@@ -311,7 +305,12 @@
   translation of the LGPL</li>
 -->
 </ul>
+<p>Nous espérons que quelqu'un va écrire de nouvelles traductions en 
tchèque et
+en slovaque. Il y en a déjà, mais le traducteur les a utilisées pour faire
+la promotion d'un site commercial, aussi nous ne voulons pas les mettre en
+lien.</p>
 
+<!-- RT #716430 -->
 <h4>Traductions en cours</h4>
 <p>Les efforts de traduction suivants sont en cours, veuillez contacter la
 personne ou l'équipe si vous souhaiter apporter votre aide.</p>
@@ -359,10 +358,6 @@
 <code>[zh-tw]</code> Traduction en <a
 href="http://www.chinasona.org/gnu/gnufdl-v13-tc.html";>chinois
 (traditionnel)</a> de la GFDL</li>
-  <li><!-- RT #716430 -->
-<code>[cs]</code> Traduction en <a
-href="http://jxself.org/translations/fdl-1.3.cs.shtml";>tchèque</a> de la
-GFDL</li>
 
   <!-- TODO: the page should say it is CC-BY-ND -->
 <li><code>[it]</code> Traduction en <a
@@ -370,20 +365,21 @@
 (<a href="http://home.gna.org/www-it/fdl/1.3/fdl.it.txt";>version texte
 brut</a>)</li>
 
-  <!-- many links
+<!-- many links
   <li>
 <code>[ml]</code> <a href="http://ml.wikipedia.org/wiki/WP:GFDL-ml";>
   Malayalam</a> translation of the GFDL</li>
 -->
-<li><!-- RT #716430 -->
-<code>[sk]</code> Traduction en <a
-href="http://www.kaveh.org/gnu/gplv3-fa.html";>slovaque</a> de la GFDL</li>
-
-  <!-- TODO: the page should say it is CC-BY-ND -->
+<!-- TODO: the page should say it is CC-BY-ND -->
 <li><code>[es]</code> Traduction en <a
 href="http://people.csse.uwa.edu.au/jmd/gpl_en.txt";>espagnol</a> de la 
GFDL</li>
 </ul>
+<p>Nous espérons que quelqu'un va écrire de nouvelles traductions en 
tchèque et
+en slovaque. Il y en a déjà, mais le traducteur les a utilisées pour faire
+la promotion d'un site commercial, aussi nous ne voulons pas les mettre en
+lien.</p>
 
+<!-- RT #716430 -->
 <h4>Traductions en cours</h4>
 
 <p>Les efforts de traduction suivants sont en cours, veuillez contacter la
@@ -417,29 +413,20 @@
 <code>[zh-tw]</code> Traduction en <a
 href="http://www.chinasona.org/gnu/gnu-gcc.html";>chinois (traditionnel)</a>
 de la GCC RLE 3</li>
-  <li><!-- RT #716430 -->
-<code>[cs]</code> Traduction en <a
-href="http://www.kaveh.org/gnu/gplv3-fa.html";>tchèque</a> de la GCC RLE 
3.1</li>
-  <li><!-- RT #716430 -->
-<code>[sk]</code> Traduction en <a
-href="http://jxself.org/translations/gcc-rtle-3.1.sk.shtml";>slovaque</a> de
-la GCC RLE 3.1</li>
 </ul>
+<p>Nous espérons que quelqu'un va écrire de nouvelles traductions en 
tchèque et
+en slovaque. Il y en a déjà, mais le traducteur les a utilisées pour faire
+la promotion d'un site commercial, aussi nous ne voulons pas les mettre en
+lien.</p>
 
+<!-- RT #716430 -->
 <h4>GNU Autoconf Configure Script Exception, version 3</h4>
+<p>Nous espérons que quelqu'un va écrire de nouvelles traductions en 
tchèque et
+en slovaque. Il y en a déjà, mais le traducteur les a utilisées pour faire
+la promotion d'un site commercial, aussi nous ne voulons pas les mettre en
+lien.</p>
 
-<ul>
-  <li><!-- RT #716430 -->
-<code>[cs]</code> Traduction en <a
-href="http://jxself.org/translations/autoconf-cse-3.cs.shtml";>tchèque</a> de
-la GNU Autoconf CSE</li>
-  <li><!-- RT #716430 -->
-<code>[sk]</code> Traduction en <a
-href="http://jxself.org/translations/autoconf-cse-3.sk.shtml";>slovaque</a>
-de la GNU Autoconf CSE</li>
-</ul>
-
-
+<!-- RT #716430 -->
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -486,7 +473,7 @@
  <p><!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/25 17:26:25 $
+$Date: 2012/01/28 01:28:08 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/license-list.es.po      27 Jan 2012 21:24:17 -0000      1.1
+++ licenses/po/license-list.es.po      28 Jan 2012 01:28:16 -0000      1.2
@@ -11,16 +11,18 @@
 msgstr ""
 "Project-Id-Version: license-list.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-09 20:25-0300\n"
+"POT-Creation-Date: 2012-01-23 20:25-0500\n"
 "PO-Revision-Date: 2012-01-27 22:17+0100\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
+"Outdated-Since: 2012-01-23 20:25-0500\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 # type: Content of: <title>
+#. type: Content of: <title>
 msgid ""
 "Various Licenses and Comments about Them - GNU Project - Free Software "
 "Foundation (FSF)"
@@ -29,86 +31,125 @@
 "Software Foundation (FSF)"
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "Various Licenses and Comments about Them"
 msgstr "Varias licencias y comentarios acerca de las mismas"
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "<a id=\"TableOfContents\">Table of Contents</a>"
 msgstr "<a id=\"TableOfContents\">Índice</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "<a href=\"#Introduction\">Introduction</a>"
 msgstr "<a href=\"#Introduction\">Introducción</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "<a href=\"#SoftwareLicenses\">Software Licenses</a>"
 msgstr "<a href=\"#SoftwareLicenses\">Licencias de software</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLCompatibleLicenses\">GPL-Compatible Free Software Licenses</"
+#| "a>"
 msgid ""
-"<a href=\"#GPLCompatibleLicenses\">GPL-Compatible Free Software Licenses</a>"
+"<a href=\"#GPLCompatibleLicenses\"> GPL-Compatible Free Software Licenses</a>"
 msgstr ""
 "<a href=\"#GPLCompatibleLicenses\">Licencias de software libre compatibles "
 "con la GPL</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLIncompatibleLicenses\">GPL-Incompatible Free Software "
+#| "Licenses</a>"
 msgid ""
-"<a href=\"#GPLIncompatibleLicenses\">GPL-Incompatible Free Software "
+"<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
 "Licenses</a>"
 msgstr ""
 "<a href=\"#GPLIncompatibleLicenses\">Licencias de software libre "
 "incompatibles con la GPL</a>"
 
 # type: Content of: <ul><li><ul><li>
-msgid "<a href=\"#NonFreeSoftwareLicense\">Non-Free Software Licenses</a>"
+#. type: Content of: <ul><li><ul><li>
+#, fuzzy
+#| msgid "<a href=\"#NonFreeSoftwareLicense\">Non-Free Software Licenses</a>"
+msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
 msgstr ""
 "<a href=\"#NonFreeSoftwareLicense\">Licencias de software privativo</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "<a href=\"#DocumentationLicenses\">Licenses For Documentation</a>"
 msgstr "<a href=\"#DocumentationLicenses\">Licencias para documentación</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid "<a href=\"#FreeDocumentationLicenses\">Free Documentation Licenses</a>"
 msgstr ""
 "<a href=\"#FreeDocumentationLicenses\">Licencias para Documentación 
Libre</a>"
 
 # 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\"> Non-Free Documentation Licenses</"
+"a>"
 msgstr ""
 "<a href=\"#NonFreeDocumentationLicenses\">Licencias para documentación "
 "privativa</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#OtherLicenses\">Licenses for Works of Practical Use Besides "
+#| "Software and Documentation</a>"
 msgid ""
-"<a href=\"#OtherLicenses\">Licenses for Works of Practical Use Besides "
+"<a href=\"#OtherLicenses\"> Licenses for Works of Practical Use Besides "
 "Software and Documentation</a>"
 msgstr ""
 "<a href=\"#OtherLicenses\">Licencias para trabajos de uso práctico más 
allá "
 "del software y la documentación.</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid "<a href=\"#Fonts\">Licenses for Fonts</a>"
 msgstr "<a href=\"#Fonts\">Licencias para fuentes</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#OpinionLicenses\">Licenses for Works of Opinion and Judgment</"
+#| "a>"
 msgid ""
-"<a href=\"#OpinionLicenses\">Licenses for Works of Opinion and Judgment</a>"
+"<a href=\"#OpinionLicenses\"> Licenses for Works of Opinion and Judgment</a>"
 msgstr ""
 "<a href=\"#OpinionLicenses\">Licencias para trabajos de opinión y juicio de "
 "valor</a>"
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "<a id=\"Introduction\">Introduction</a>"
 msgstr "<a id=\"Introduction\">Introducción</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid "We classify a license according to certain key criteria:"
 msgstr ""
 "Nosotros clasificamos una licencia de acuerdo a ciertos criterios clave:"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Whether it qualifies as a <a href=\"/philosophy/free-sw.html\">free "
 "software</a> license."
@@ -117,12 +158,14 @@
 "\">software libre</a>."
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Whether it is a <a href=\"/copyleft/copyleft.html\">copyleft</a> license."
 msgstr ""
 "Si es una licencia <a href=\"/copyleft/copyleft.es.html\">copyleft</a>."
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Whether it is <a href=\"/licenses/gpl-faq.html#WhatDoesCompatMean"
 "\">compatible with the GNU GPL</a>.  Unless otherwise specified, compatible "
@@ -134,10 +177,12 @@
 "GPLv2 y GPLv3."
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "Whether it causes any particular practical problems."
 msgstr "Si en la práctica causa algún problema en particular."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "We try to list the most commonly encountered free software license on this "
 "page, but cannot list them all; we'll try our best to answer questions about "
@@ -151,6 +196,7 @@
 "alfabético dentro de cada sección."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If you believe you have found a violation of one of our licenses, please "
 "refer to our <a href=\"/licenses/gpl-violation.html\">license violation "
@@ -160,19 +206,40 @@
 "diríjase a nuestra <a href=\\\"/licenses/gpl-violation.es.html\\\">página "
 "para el incumplimiento de licencias</a>."
 
+#. type: Content of: <p>
+msgid ""
+"If you've started a new project and you're not sure what license to use, <a "
+"href=\"/licenses/license-recommendations.html\">&ldquo;How to choose a "
+"license for your own work&rdquo;</a> details our recommendations in an easy-"
+"to-follow guide."
+msgstr ""
+
 # type: Content of: outside any tag (error?)
+#. type: Content of: outside any tag (error?)
 msgid "<a id=\"LicensingMailingList\"></a>"
 msgstr "<a id=\"LicensingMailingList\"></a>"
 
 # type: Content of: <p>
-msgid ""
-"If you want help choosing a license, evaluating a license, or have other "
-"questions about licenses, you can email us at <a href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  We have a very large backlog of "
-"requests, so please read our web pages here first, you'll get an answer "
-"sooner.  Also, the more specific your question is, the more likely we'll be "
-"able to answer it quickly.  (We also <a href=\"http://www.fsf.org/volunteer";
-"\">welcome knowledgeable volunteers</a> to help answer licensing questions.)"
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you want help choosing a license, evaluating a license, or have other "
+#| "questions about licenses, you can email us at <a href=\"mailto:";
+#| "address@hidden">&lt;address@hidden&gt;</a>.  We have a very large "
+#| "backlog of requests, so please read our web pages here first, you'll get "
+#| "an answer sooner.  Also, the more specific your question is, the more "
+#| "likely we'll be able to answer it quickly.  (We also <a href=\"http://www.";
+#| "fsf.org/volunteer\">welcome knowledgeable volunteers</a> to help answer "
+#| "licensing questions.)"
+msgid ""
+"If you have questions about free software licenses, you can email us at <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  Because "
+"our resources are limited, we do not answer questions that are meant to "
+"assist proprietary software development or distribution, and you'll likely "
+"get an answer faster if you ask a specific question that isn't already "
+"covered here or in <a href=\"/licenses/gpl-faq.html\">our FAQ</a>.  We <a "
+"href=\"http://www.fsf.org/volunteer\";>welcome knowledgeable volunteers</a> "
+"who want to help answer licensing questions."
 msgstr ""
 "Si desea ayuda en lo concerniente a elegir, evaluar una licencia o si tiene "
 "alguna pregunta acerca del tema, puede enviarnos un correo a <a href="
@@ -185,6 +252,7 @@
 "específicos para que nos ayuden a responder preguntas sobre licencias)."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If you are contemplating writing a new license, please also contact us at <a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. The "
@@ -202,20 +270,19 @@
 "necesides."
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "<a id=\"SoftwareLicenses\">Software Licenses</a>"
 msgstr "<a id=\"SoftwareLicenses\">Licencias de software</a>"
 
-# type: Content of: <h3>
-#
-# Aclarar el significado de GPL en
-# nota al pié.
+#. type: Content of: <h3>
 msgid ""
-"<a id=\"GPLCompatibleLicenses\"> GPL-Compatible Free Software Licenses</a>"
+"<a id=\"FreeLicenses\"></a> <a id=\"GPLCompatibleLicenses\"> GPL-Compatible "
+"Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#GPLCompatibleLicenses\">#GPLCompatibleLicenses</a>)</span>"
 msgstr ""
-"<a id=\"GPLCompatibleLicenses\">Licencias de software libre compatibless con "
-"la GPL</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses qualify as <a href=\"/philosophy/free-sw.html"
 "\">free software</a> licenses, and are compatible with the <a href=\"#GNUGPL"
@@ -225,17 +292,19 @@
 "free-sw.es.html\">software libre</a> y son compatibles con la <a href="
 "\"#GNUGPL\">GPL de GNU</a>.</strong>"
 
-# type: Content of: <dl><dt>
+#.  both generic and version-specific anchors 
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"GNUGPL\" href=\"/licenses/gpl.html\"> GNU General Public License "
-"(GPL) version 3</a>"
+"<a id=\"GNUGPL\"></a> <a id=\"GNUGPLv3\" href=\"/licenses/gpl.html\"> GNU "
+"General Public License (GPL) version 3</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#GNUGPL\">#GNUGPL</a>)  (<a href=\"#GNUGPL\">#GNUGPLv3</a>)  "
+"</span>"
 msgstr ""
-"<a id=\"GNUGPL\" href=\"/licenses/gpl.html\">GNU General Public License "
-"(GPL) version 3</a>"
 
 # type: Content of: <dl><dd><p>
 #
 # aclarar qué es copyleft en nota al pié
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the latest version of the GNU GPL: a free software license, and a "
 "copyleft license.  We recommend it for most software packages."
@@ -249,6 +318,7 @@
 # "the terms of later versions". Tema 
 # legal?
 # Tengo varias dudas sobre este párrafo.
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that GPLv3 is not compatible with GPLv2 by itself.  However, "
 "most software released under GPLv2 allows you to use the terms of later "
@@ -266,14 +336,21 @@
 "frecuentes</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"GPLv2\" href=\"/licenses/old-licenses/gpl-2.0.html\"> GNU General "
+#| "Public License (GPL) version 2</a>"
 msgid ""
 "<a id=\"GPLv2\" href=\"/licenses/old-licenses/gpl-2.0.html\"> GNU General "
-"Public License (GPL) version 2</a>"
+"Public License (GPL) version 2</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#GPLv2\">#GPLv2</a>)</span>"
 msgstr ""
 "<a id=\"GPLv2\" href=\"/licenses/old-licenses/gpl-2.0.html\">GNU General "
 "Public License (GPL) version 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the previous version of the GNU GPL: a free software license, and a "
 "copyleft license.  We recommend <a href=\"#GNUGPL\">the latest version</a> "
@@ -284,6 +361,7 @@
 "para la mayoría de software."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that GPLv2 is, by itself, not compatible with GPLv3.  However, "
 "most software released under GPLv2 allows you to use the terms of later "
@@ -301,14 +379,22 @@
 "más frecuentes</a>."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"LGPL\" href=\"/licenses/lgpl.html\"> GNU Lesser General Public "
-"License (LGPL) version 3</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"LGPL\" href=\"/licenses/lgpl.html\"> GNU Lesser General Public "
+#| "License (LGPL) version 3</a>"
+msgid ""
+"<a id=\"LGPL\"></a> <a id=\"LGPLv3\" href=\"/licenses/lgpl.html\"> GNU "
+"Lesser General Public License (LGPL) version 3</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#LGPL\">#LGPL</a>)  (<a href=\"#LGPL\">#LGPLv3</"
+"a>)</span>"
 msgstr ""
 "<a id=\"LGPL\" href=\"/licenses/lgpl.html\">GNU Lesser General Public "
 "License (LGPL) version 3</a>"
 
 # type: Content of: <dl><dd><p>
+#. 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.  "
@@ -321,6 +407,7 @@
 "licenses/why-not-lgpl.html\">circunstancias especiales</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that LGPLv3 is not compatible with GPLv2 by itself.  However, "
 "most software released under GPLv2 allows you to use the terms of later "
@@ -338,14 +425,21 @@
 "preguntas más frecuentes</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"LGPLv2.1\" href=\"/licenses/old-licenses/lgpl-2.1.html\"> GNU "
+#| "Lesser General Public License (LGPL) version 2.1</a>"
 msgid ""
 "<a id=\"LGPLv2.1\" href=\"/licenses/old-licenses/lgpl-2.1.html\"> GNU Lesser "
-"General Public License (LGPL) version 2.1</a>"
+"General Public License (LGPL) version 2.1</a> <span class=\"anchor-reference-"
+"id\"> (<a href=\"#LGPLv2.1\">#LGPLv2.1</a>)</span>"
 msgstr ""
 "<a id=\"LGPLv2.1\" href=\"/licenses/old-licenses/lgpl-2.1.html\">GNU Lesser "
 "General Public License (LGPL) version 2.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. 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.  "
@@ -365,14 +459,22 @@
 "frecuentes</a>."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\">GNU Affero General Public "
-"License (AGPL) version 3</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\">GNU Affero General Public "
+#| "License (AGPL) version 3</a>"
+msgid ""
+"<a id=\"AGPL\"></a> <a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\"> GNU "
+"Affero General Public License (AGPL) version 3</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#AGPL\">#AGPL</a>)  (<a href=\"#AGPLv3.0"
+"\">#AGPLv3.0</a>)</span>"
 msgstr ""
 "<a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\">GNU Affero General Public "
 "License (AGPL) version 3</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software, copyleft license.  Its terms effectively consist of "
 "the terms of GPLv3, with an additional paragraph in section 13 to allow "
@@ -388,6 +490,7 @@
 "corra comunmente en una red."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that the GNU AGPL is not compatible with GPLv2.  It is also "
 "technically not compatible with GPLv3 in a strict sense: you cannot take "
@@ -408,14 +511,21 @@
 "ambas licencias para más detalles."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a href=\"/prep/maintain/html_node/License-Notices-for-Other-Files.html\" id="
-"\"GNUAllPermissive\">GNU All-Permissive License</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/prep/maintain/html_node/License-Notices-for-Other-Files.html\" "
+#| "id=\"GNUAllPermissive\">GNU All-Permissive License</a>"
+msgid ""
+"<a id=\"GNUAllPermissive\" href=\"/prep/maintain/html_node/License-Notices-"
+"for-Other-Files.html\"> GNU All-Permissive License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#GNUAllPermissive\">#GNUAllPermissive</a>)</span>"
 msgstr ""
 "<a href=\"/prep/maintain/html_node/License-Notices-for-Other-Files.html\" id="
 "\"GNUAllPermissive\">GNU All-Permissive License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
@@ -428,6 +538,7 @@
 "pueden usarla en situaciones similares."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Older versions of this license did not have the second sentence with the "
 "express warranty disclaimer.  This same analysis applies to both versions."
@@ -437,14 +548,21 @@
 "versiones."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apache2\" href=\"http://www.apache.org/licenses/LICENSE-2.0\";> "
+#| "Apache License, Version 2.0</a>"
 msgid ""
 "<a id=\"apache2\" href=\"http://www.apache.org/licenses/LICENSE-2.0\";> "
-"Apache License, Version 2.0</a>"
+"Apache License, Version 2.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#apache2\">#apache2</a>)</span>"
 msgstr ""
 "<a id=\"apache2\" href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache "
 "License, Version 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, compatible with version 3 of the GPL."
 msgstr ""
 "Esta es una licencias de software libre compatible con la versión 3 de la "
@@ -454,6 +572,7 @@
 #
 # No estoy seguro del significado de
 # "termination" en este caso.
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
 "it has some requirements that are not in the older version.  These include "
@@ -465,9 +584,15 @@
 "patentes."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ArtisticLicense2\" href=\"http://www.perlfoundation.org/";
+#| "artistic_license_2_0\">Artistic License 2.0</a>"
 msgid ""
 "<a id=\"ArtisticLicense2\" href=\"http://www.perlfoundation.org/";
-"artistic_license_2_0\">Artistic License 2.0</a>"
+"artistic_license_2_0\"> Artistic License 2.0</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>"
 msgstr ""
 "<a id=\"ArtisticLicense2\" href=\"http://www.perlfoundation.org/";
 "artistic_license_2_0\">Artistic License 2.0</a>"
@@ -476,6 +601,7 @@
 #
 # inseguro acerca de cómo traducir
 # "relicencing"
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is a free software license, compatible with the GPL thanks to "
 "the relicensing option in section 4(c)(ii)."
@@ -484,28 +610,45 @@
 "opción de reposición de la licencia en la sección 4(c)(ii)."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"BerkleyDB\" href=\"http://www.oracle.com/technology/software/";
-"products/berkeley-db/htdocs/oslicense.html\"> Berkeley Database License</a> "
-"(aka the Sleepycat Software Product License)"
+#.  misspelled id, leave for compatibility 
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"BerkleyDB\" href=\"http://www.oracle.com/technology/software/";
+#| "products/berkeley-db/htdocs/oslicense.html\"> Berkeley Database License</"
+#| "a> (aka the Sleepycat Software Product License)"
+msgid ""
+"<a id=\"BerkleyDB\"></a> <a id=\"BerkeleyDB\" href=\"http://www.oracle.com/";
+"technetwork/database/berkeleydb/downloads/oslicense-093458.html\"> Berkeley "
+"Database License</a> (a.k.a. the Sleepycat Software Product License)  <span "
+"class=\"anchor-reference-id\"> (<a href=\"#BerkeleyDB\">#BerkeleyDB</a>)</"
+"span>"
 msgstr ""
 "<a id=\"BerkleyDB\" href=\"http://www.oracle.com/technology/software/";
 "products/berkeley-db/htdocs/oslicense.html\">Berkeley Database License</a> "
 "(aka the Sleepycat Software Product License)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, compatible with the GNU GPL."
 msgstr "Esta es una licencia de software libre compatible con la GPL de GNU."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"boost\" href=\"http://www.boost.org/LICENSE_1_0.txt\";> Boost "
+#| "Software License</a>"
 msgid ""
 "<a id=\"boost\" href=\"http://www.boost.org/LICENSE_1_0.txt\";> Boost "
-"Software License</a>"
+"Software License</a> <span class=\"anchor-reference-id\">(<a href=\"#boost"
+"\">#boost</a>)</span>"
 msgstr ""
 "<a id=\"boost\" href=\"http://www.boost.org/LICENSE_1_0.txt\";>Boost Software "
 "License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
@@ -514,14 +657,21 @@
 "compatible con la GPL de GNU."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
+#| "html#5\"> Modified BSD license</a>"
 msgid ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\"> Modified BSD license</a>"
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\"> Modified BSD license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
 msgstr ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\">Modified BSD license</a>"
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\">Modified BSD license</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "(Note: on the preceding link, the modified BSD license is listed in the "
 "<em>General</em> section.)"
@@ -530,6 +680,7 @@
 "sección <em>general</em> .)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
 "clause.  It is a simple, permissive non-copyleft free software license, "
@@ -540,6 +691,7 @@
 "compatible con la GPL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If you want a simple, permissive non-copyleft free software license, the "
 "modified BSD license is a reasonable choice.  However, it is risky to "
@@ -558,20 +710,50 @@
 "lugar. Ambas (X11 y BSD modificada) son más o menos equivalentes."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This license is sometimes referred to as the 3-clause BSD license."
 msgstr ""
 "A esta licencia se la llama algunas veces &quot;licencia BSD de 3 "
 "cláusulas&quot;."
 
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"CC0\" href=\"http://creativecommons.org/publicdomain/zero/1.0/";
+"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href=\"#CC0"
+"\">#CC0</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"CC0 is a public domain dedication from Creative Commons.  A work released "
+"under CC0 is dedicated to the public domain to the fullest extent permitted "
+"by law.  If that is not possible for any reason, CC0 also provides a simple "
+"permissive license as a fallback.  Both public domain works and the simple "
+"license provided by CC0 are compatible with the GNU GPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"If you want to release your work to the public domain, we recommend you use "
+"CC0."
+msgstr ""
+
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"CeCILL\" href=\"http://www.cecill.info/licences.en.html\";> CeCILL "
+#| "version 2</a>"
 msgid ""
 "<a id=\"CeCILL\" href=\"http://www.cecill.info/licences.en.html\";> CeCILL "
-"version 2</a>"
+"version 2</a> <span class=\"anchor-reference-id\">(<a href=\"#CeCILL"
+"\">#CeCILL</a>)</span>"
 msgstr ""
 "<a id=\"CeCILL\" href=\"http://www.cecill.info/licences.en.html\";>CeCILL "
 "version 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The CeCILL is a free software license, explicitly compatible with the GNU "
 "GPL."
@@ -580,6 +762,7 @@
 "la GPL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. 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-"
@@ -598,6 +781,7 @@
 "particular a los programas lanzados bajo CeCILL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Section 9.4 of the CeCILL commits the program's developers to certain forms "
 "of cooperation with the users, if someone attacks the program with a "
@@ -612,14 +796,21 @@
 "los usuarios de dicha manera, entonces no lo será para usted."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
+#| "html#license\">The Clear BSD License</a>"
 msgid ""
 "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
-"html#license\">The Clear BSD License</a>"
+"html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
 msgstr ""
 "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
 "html#license\">The Clear BSD License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, compatible with both GPLv2 and GPLv3.  It "
 "is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and adds "
@@ -639,14 +830,21 @@
 "ponerle una trampa, sería inteligente evitar utilizar el programa."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"CryptixGeneralLicense\" href=\"http://www.cryptix.org/LICENSE.TXT";
+#| "\"> Cryptix General License</a>"
 msgid ""
 "<a id=\"CryptixGeneralLicense\" href=\"http://www.cryptix.org/LICENSE.TXT\";> "
-"Cryptix General License</a>"
+"Cryptix General License</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#CryptixGeneralLicense\">#CryptixGeneralLicense</a>)</span>"
 msgstr ""
 "<a id=\"CryptixGeneralLicense\" href=\"http://www.cryptix.org/LICENSE.TXT";
 "\">Cryptix General License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
@@ -654,15 +852,49 @@
 "Esta es una licencia simple, permisiva, de software libre, que no incluye "
 "copyleft, compatible con la GPL de GNU. Es muy similar a la licencia X11."
 
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"ecfonts\" href=\"http://dante.ctan.org/tex-archive/fonts/ec/src/";
+"copyrite.txt\">License of the ec fonts for LaTeX</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This license covers the European Computer Modern Fonts and Text Companion "
+"Fonts, commonly used with LaTeX.  Depending on how it is used, it may be "
+"free or not.  If the package says that some fonts in the package may not be "
+"modified, then the package is nonfree.  Otherwise the package is free.  The "
+"original fonts have no restrictions on modification, so they are free."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Much like <a href=\"#LPPL-1.2\">the LaTeX Project Public License 1.2</a>, "
+"this license requires modified versions of the work to use a name that's "
+"different from the name of any prior version.  This is acceptable for work "
+"meant to be used with LaTeX, since TeX allows you to create filename "
+"mappings for your programs, but it's very annoying and could be overly "
+"burdensome in other contexts."
+msgstr ""
+
 # type: Content of: <dl><dt>
+#.  without decimal, leave for compatibility 
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"eCos20\" href=\"/licenses/ecos-license.html\"> eCos license "
+#| "version 2.0</a>"
 msgid ""
-"<a id=\"eCos20\" href=\"/licenses/ecos-license.html\"> eCos license version "
-"2.0</a>"
+"<a id=\"eCos20\"></a> <a id=\"eCos2.0\" href=\"/licenses/ecos-license.html"
+"\"> eCos license version 2.0</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"#eCos20\">#eCos2.0</a>)</span>"
 msgstr ""
 "<a id=\"eCos20\" href=\"/licenses/ecos-license.html\">eCos license version "
 "2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The eCos license version 2.0 is a GPL-compatible free software license.  It "
 "consists of the GPL, plus an exception allowing linking to software not "
@@ -674,22 +906,30 @@
 "encuentra bajo dicha licencia. Tiene las mismas <a href=\"/philosophy/why-"
 "not-lgpl.html\">desventajas</a> que la LGPL."
 
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0\">Educational "
-"Community License 2.0</a>"
+"<a id=\"ECL2.0\" href=\"http://www.opensource.org/licenses/ecl2.php\";> "
+"Educational Community License 2.0</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#ECL2.0\">#ECL2.0</a>)</span>"
 msgstr ""
-"<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0\">Educational "
-"Community License 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, and it is compatible with GPLv3.  It is "
+#| "based on the <a href=\"#apache2\">Apache License 2.0</a>; the scope of "
+#| "the patent license has changed so that when an organization's employee "
+#| "works on a project, the organization does not have to license all of its "
+#| "patents to recipients.  This patent license and the indemnification "
+#| "clause in section 9 make this license incompatible with GPLv2."
 msgid ""
 "This is a free software license, and it is compatible with GPLv3.  It is "
 "based on the <a href=\"#apache2\">Apache License 2.0</a>; the scope of the "
 "patent license has changed so that when an organization's employee works on "
 "a project, the organization does not have to license all of its patents to "
-"recipients.  This patent license and the indemnification clause in section 9 "
-"make this license incompatible with GPLv2."
+"recipients.  This patent license and the indemnification clause in "
+"section&nbsp;9 make this license incompatible with GPLv2."
 msgstr ""
 "Esta es una licencia de software libre compatible con la GPLv3. Se basa en "
 "la <a href=\"#apache2\">Apache License 2.0</a>; el alcance de la licencia de "
@@ -700,14 +940,21 @@
 "incompatible con la GPLv2."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Eiffel\" href=\"/licenses/eiffel-forum-license-2.html\"> Eiffel "
+#| "Forum License, version 2</a>"
 msgid ""
 "<a id=\"Eiffel\" href=\"/licenses/eiffel-forum-license-2.html\"> Eiffel "
-"Forum License, version 2</a>"
+"Forum License, version 2</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#Eiffel\">#Eiffel</a>)</span>"
 msgstr ""
 "<a id=\"Eiffel\" href=\"/licenses/eiffel-forum-license-2.html\">Eiffel Forum "
 "License, version 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, compatible with the GNU GPL.  <a href="
 "\"http://www.eiffel-nice.org/license/forum.txt\";>Previous releases</a> of "
@@ -718,22 +965,35 @@
 "a> de la licencia Eiffel no son compatibles con la GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EUDataGrid\" href=\"http://www.opensource.org/licenses/eudatagrid.";
+#| "php\"> EU DataGrid Software License</a>"
 msgid ""
 "<a id=\"EUDataGrid\" href=\"http://www.opensource.org/licenses/eudatagrid.php";
-"\"> EU DataGrid Software License</a>"
+"\"> EU DataGrid Software License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#EUDataGrid\">#EUDataGrid</a>)</span>"
 msgstr ""
 "<a id=\"EUDataGrid\" href=\"http://www.opensource.org/licenses/eudatagrid.php";
 "\">EU DataGrid Software License</a>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Expat\" href=\"http://www.jclark.com/xml/copying.txt\";> Expat "
+#| "License</a>"
 msgid ""
 "<a id=\"Expat\" href=\"http://www.jclark.com/xml/copying.txt\";> Expat "
-"License</a>"
+"License</a> <span class=\"anchor-reference-id\">(<a href=\"#Expat\">#Expat</"
+"a>)</span>"
 msgstr ""
 "<a id=\"Expat\" href=\"http://www.jclark.com/xml/copying.txt\";>Expat "
 "License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
@@ -744,14 +1004,21 @@
 "em>, pero esta definición es ambigua."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"FreeBSD\" href=\"http://www.freebsd.org/copyright/freebsd-license.";
+#| "html\"> FreeBSD license</a>"
 msgid ""
 "<a id=\"FreeBSD\" href=\"http://www.freebsd.org/copyright/freebsd-license.";
-"html\"> FreeBSD license</a>"
+"html\"> FreeBSD license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#FreeBSD\">#FreeBSD</a>)</span>"
 msgstr ""
 "<a id=\"FreeBSD\" href=\"http://www.freebsd.org/copyright/freebsd-license.";
 "html\">FreeBSD license</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
@@ -764,6 +1031,7 @@
 "copyleft, compatible con la GPL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If you want a simple, permissive non-copyleft free software license, the "
 "FreeBSD license is a reasonable choice.  However, please don't call it a "
@@ -777,15 +1045,15 @@
 "podría llevar al uso erróneo de la licencia BSD <a href=\"#OriginalBSD"
 "\"><em>original</em></a> y defectuosa."
 
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a href=\"http://freetype.fis.uniroma2.it/FTL.TXT\"; id=\"freetype\">Freetype "
-"Project License</a>"
+"<a id=\"freetype\" href=\"http://freetype.fis.uniroma2.it/FTL.TXT\";> "
+"Freetype Project License</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#freetype\">#freetype</a>)</span>"
 msgstr ""
-"<a href=\"http://freetype.fis.uniroma2.it/FTL.TXT\"; id=\"freetype\">Freetype "
-"Project License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, and compatible with GPLv3.  It has some "
 "attribution requirements which make it incompatible with GPLv2."
@@ -794,26 +1062,40 @@
 "algunas características que la hacen incompatible con GPLv2."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"iMatix\" href=\"http://legacy.imatix.com/html/sfl/sfl4.htm#license";
+#| "\"> License of the iMatix Standard Function Library</a>"
 msgid ""
 "<a id=\"iMatix\" href=\"http://legacy.imatix.com/html/sfl/sfl4.htm#license";
-"\"> License of the iMatix Standard Function Library</a>"
+"\"> License of the iMatix Standard Function Library</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#iMatix\">#iMatix</a>)</span>"
 msgstr ""
 "<a id=\"iMatix\" href=\"http://legacy.imatix.com/html/sfl/sfl4.htm#license";
 "\">License of the iMatix Standard Function Library</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license and is GPL compatible."
 msgstr "Esta es una licencia de software libre compatible con GPL."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a href=\"http://dev.w3.org/cvsweb/Amaya/libjpeg/Attic/README?rev=1.2\"; id="
-"\"ijg\">Independent JPEG Group License</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://dev.w3.org/cvsweb/Amaya/libjpeg/Attic/README?rev=1.2\"; "
+#| "id=\"ijg\">Independent JPEG Group License</a>"
+msgid ""
+"<a id=\"ijg\" href=\"http://dev.w3.org/cvsweb/Amaya/libjpeg/Attic/README?";
+"rev=1.2\"> Independent JPEG Group License</a> <span class=\"anchor-reference-"
+"id\">(<a href=\"#ijg\">#ijg</a>)</span>"
 msgstr ""
 "<a href=\"http://dev.w3.org/cvsweb/Amaya/libjpeg/Attic/README?rev=1.2\"; id="
 "\"ijg\">Independent JPEG Group License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, and compatible with the GNU GPL.  The "
 "authors have assured us that developers who document changes as required by "
@@ -825,14 +1107,21 @@
 "de esta licencia."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a href=\"http://trac.enlightenment.org/e/browser/trunk/imlib2/COPYING\"; id="
-"\"imlib\">License of imlib2</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://trac.enlightenment.org/e/browser/trunk/imlib2/COPYING\"; "
+#| "id=\"imlib\">License of imlib2</a>"
+msgid ""
+"<a id=\"imlib\" href=\"http://trac.enlightenment.org/e/browser/trunk/imlib2/";
+"COPYING\"> License of imlib2</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#imlib\">#imlib</a>)</span>"
 msgstr ""
 "<a href=\"http://trac.enlightenment.org/e/browser/trunk/imlib2/COPYING\"; id="
 "\"imlib\">License of imlib2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, and GPL-compatible.  The author has "
 "explained to us that the GPL's options for providing source all mean the "
@@ -844,24 +1133,27 @@
 "propias palabras."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"intel\" href=\"http://www.opensource.org/licenses/intel-open-";
+#| "source-license.html\"> Intel Open Source License</a>"
 msgid ""
 "<a id=\"intel\" href=\"http://www.opensource.org/licenses/intel-open-source-";
-"license.html\"> Intel Open Source License</a>"
+"license.html\"> Intel Open Source License</a> <span class=\"anchor-reference-"
+"id\">(<a href=\"#intel\">#intel</a>)</span>"
 msgstr ""
 "<a id=\"intel\" href=\"http://www.opensource.org/licenses/intel-open-source-";
 "license.html\">Intel Open Source License</a>"
 
-# type: Content of: <dl><dd><p>
-msgid "This is a Free Software license, compatible with the GNU GPL."
-msgstr "Esta es una licencia de software libre, compatible con la GPL de GNU."
-
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a href=\"http://www.isc.org/software/license\"; id=\"ISC\">ISC License</a>"
+"<a id=\"ISC\" href=\"http://www.isc.org/software/license\";> ISC License</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 msgstr ""
-"<a href=\"http://www.isc.org/software/license\"; id=\"ISC\">ISC License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is sometimes also known as the OpenBSD License.  It is a free "
 "software license, and compatible with the GNU GPL."
@@ -870,10 +1162,18 @@
 "software libre compatible con la GPL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license does have an unfortunate wording choice: it provides "
+#| "recipients with &quot;Permission to use, copy, modify, and/or distribute "
+#| "this software....&quot; This is roughly the same language from the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software."
 msgid ""
 "This license does have an unfortunate wording choice: it provides recipients "
 "with &quot;Permission to use, copy, modify, and/or distribute this "
-"software....&quot; This is roughly the same language from the license of "
+"software&hellip;&quot; This is roughly the same language from the license of "
 "Pine that the University of Washington later claimed prohibited people from "
 "distributing modified versions of the software."
 msgstr ""
@@ -884,6 +1184,7 @@
 "público distribuir versiones modificadas del software."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "ISC has told us they do not share the University of Washington's "
 "interpretation, and we have every reason to believe them.  Thus, there's no "
@@ -902,14 +1203,88 @@
 "\">FreeBSD</a> son similarmente permisivas y breves."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a>"
+msgid ""
+"<a id=\"MPL-2.0\" href=\"http://www.mozilla.org/MPL/2.0/\";>Mozilla Public "
+"License (MPL) version 2.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+msgstr ""
+"<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";>Mozilla "
+"Public License (MPL)</a>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"<a id=\"NCSA\" href=\"http://www.otm.uiuc.edu/faculty/forms/opensource.asp";
-"\"> NCSA/University of Illinois Open Source License</a>"
+"This is a free software license.  Section 3.3 provides indirect "
+"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
+"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
+"Work&rdquo; that combines that work with work under those GNU licenses.  "
+"When you do, section 3.3 gives you permission to distribute the MPL-covered "
+"work under the terms of the same GNU licenses, with one condition: you must "
+"make sure that the files that were originally under the MPL are still "
+"available under the MPL's terms as well.  In other words, when you make a "
+"combination this way, the files that were originally under the MPL will be "
+"dual licensed under the MPL and the GNU license(s).  The end result is that "
+"the Larger Work, as a whole, will be covered under the GNU license(s).  "
+"People who receive that combination from you will have the option to use any "
+"files that were originally covered by the MPL under that license's terms, or "
+"distribute the Larger Work in whole or in part under the GNU licenses' terms "
+"with no further restrictions."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It's important to understand that the condition to distribute files under "
+"the MPL's terms only applies to the party that first creates and distributes "
+"the Larger Work.  If it applied to their recipients as well, it would be a "
+"further restriction and incompatible with the GPL and AGPL.  That said, when "
+"you make contributions to an existing project, we usually <a href=\"/"
+"licenses/license-recommendations.html#contributing\">recommend that you keep "
+"your changes under the same license</a>, even when you're not required to do "
+"so.  If you receive a work under a GNU license where some files are also "
+"under the MPL, you should only remove the MPL from those files when there's "
+"a strong reason to justify it."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Check the license notices on the MPL-covered software before you make a "
+"Larger Work this way.  Parties who release original work under MPL 2.0 may "
+"choose to opt out of this compatibility by including a sentence in the "
+"license notices that says that the work is &ldquo;Incompatible With "
+"Secondary Licenses.&rdquo; Any software that includes this notice is "
+"<strong>not</strong> compatible with the GPL or AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Software under previous versions of the MPL can be upgraded to version 2.0, "
+"but any software that isn't already available under one of the listed GNU "
+"licenses <strong>must</strong> be marked as Incompatible With Secondary "
+"Licenses.  This means that software that's only available under previous "
+"versions of the MPL is still incompatible with the GPL and AGPL."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NCSA\" href=\"http://www.otm.uiuc.edu/faculty/forms/opensource.asp";
+#| "\"> NCSA/University of Illinois Open Source License</a>"
+msgid ""
+"<a id=\"NCSA\" href=\"http://www.opensource.org/licenses/UoI-NCSA.php\";> "
+"NCSA/University of Illinois Open Source License</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#NCSA\">#NCSA</a>)</span>"
 msgstr ""
 "<a id=\"NCSA\" href=\"http://www.otm.uiuc.edu/faculty/forms/opensource.asp";
 "\">NCSA/University of Illinois Open Source License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
 "<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
@@ -919,11 +1294,16 @@
 "y <a href=\"#ModifiedBSD\">BSD modificada</a>. Es una licencia simple y "
 "permisiva de software libre, sin copyleft, compatible con la GPL de GNU."
 
-# type: Content of: <dl><dt>
-msgid "License of Netscape Javascript"
-msgstr "License of Netscape Javascript"
+#.  lc `s', leave for compatibility 
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"NetscapeJavascript\"></a> <a id=\"NetscapeJavaScript\"></a> License "
+"of Netscape JavaScript <span class=\"anchor-reference-id\"> (<a href="
+"\"#NetscapeJavaScript\">#NetscapeJavaScript</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the disjunction of the <a href=\"#NPL\">Netscape Public License</a> "
 "and the <a href=\"/licenses/gpl.html\">GNU GPL</a>.  Because of that, it is "
@@ -935,46 +1315,36 @@
 "licencia de software libre, compatible con la GPL de GNU, pero con un "
 "copyleft débil."
 
-# type: Content of: <dl><dd><p>
-msgid ""
-"This disjunctive license is a good choice if you want to make your package "
-"GPL-compatible and MPL-compatible.  However, you can also accomplish that by "
-"using the LGPL or the Guile license."
-msgstr ""
-"Esta licencia disyuntiva es una buena elección si desea hacer su paquete "
-"compatible con la GPL y la MPL. Sin embargo, puede lograr el mismo propósito 
"
-"utilizando la LGPL o la licencia Guile."
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"Such a disjunctive license might be a good choice if you have been using the "
-"MPL, and want to change to a GPL-compatible license without subtracting any "
-"permission you have given for previous versions."
-msgstr ""
-"Esta licencia disyuntiva puede ser una buena opción si ha estado utilizando "
-"la MPL, y desea cambiar a una compatible con GPL sin quitar ningún permiso "
-"que hay otorgado para las versiones anteriores."
-
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newOpenLDAP\" href=\"http://www.openldap.org/software/release/";
+#| "license.html\"> OpenLDAP License, Version 2.7</a>"
 msgid ""
 "<a id=\"newOpenLDAP\" href=\"http://www.openldap.org/software/release/";
-"license.html\"> OpenLDAP License, Version 2.7</a>"
+"license.html\"> OpenLDAP License, Version 2.7</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#newOpenLDAP\">#newOpenLDAP</a>)</span>"
 msgstr ""
 "<a id=\"newOpenLDAP\" href=\"http://www.openldap.org/software/release/";
 "license.html\">OpenLDAP License, Version 2.7</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free software license that is compatible "
 "with the GNU GPL."
 msgstr ""
 "Es una licencia sin copyleft permisiva que es compatible con la GPL de GNU."
 
-# type: Content of: <dl><dt>
-msgid "<a id=\"PerlLicense\">License of Perl 5 and below</a>"
-msgstr "<a id=\"PerlLicense\">License of Perl 5 and below</a>"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"PerlLicense\">License of Perl 5 and below</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#PerlLicense\">#PerlLicense</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is the disjunction of the <a href=\"#ArtisticLicense\">Artistic "
 "License 1.0</a> and the <a href=\"/licenses/gpl.html\">GNU GPL</a>&mdash;in "
@@ -991,6 +1361,7 @@
 "de GNU</a> porque esta útlima es una de las alternativas."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend you use this license for any Perl 4 or Perl 5 package you "
 "write, to promote coherence and uniformity in Perl programming.  Outside of "
@@ -1002,11 +1373,14 @@
 "programado en este lenguaje. Fuera de él, urgimos a que esta licencia no sea 
"
 "utilizada, ya que es preferible la GPL de GNU."
 
-# type: Content of: <dl><dt>
-msgid "<a id=\"PublicDomain\">Public Domain</a>"
-msgstr "<a id=\"PublicDomain\">Public Domain</a>"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"PublicDomain\">Public Domain</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#PublicDomain\">#PublicDomain</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Being in the public domain is not a license; rather, it means the material "
 "is not copyrighted and no license is needed.  Practically speaking, though, "
@@ -1020,15 +1394,33 @@
 "puede a su vez tener una licencia de software libre totalmente permisiva sin "
 "copyleft. El material en dominio público es compatible con la GPL de GNU."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"If you want to release your work to the public domain, we encourage you to "
+"use formal tools to do so.  We ask people who make small contributions to "
+"GNU to sign a disclaimer form; that's one solution.  If you're working on a "
+"project that doesn't have formal contribution policies like that, <a href="
+"\"#CC0\">CC0</a> is a good tool that anyone can use.  It formally dedicates "
+"your work to the public domain, and provides a fallback license for cases "
+"where that is not legally possible."
+msgstr ""
+
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Python\" href=\"http://www.python.org/2.0.1/license.html\";> "
+#| "License of Python 2.0.1, 2.1.1, and newer versions</a>"
 msgid ""
 "<a id=\"Python\" href=\"http://www.python.org/2.0.1/license.html\";> License "
-"of Python 2.0.1, 2.1.1, and newer versions</a>"
+"of Python 2.0.1, 2.1.1, and newer versions</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#Python\">#Python</a>)</span>"
 msgstr ""
 "<a id=\"Python\" href=\"http://www.python.org/2.0.1/license.html\";>License "
 "of Python 2.0.1, 2.1.1, and newer versions</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license and is compatible with the GNU GPL.  Please "
 "note, however, that intermediate versions of Python (1.6b1, through 2.0 and "
@@ -1039,11 +1431,15 @@
 "2.0 y 2.1) se encuentras bajo una licencia diferente (<a href=\"#PythonOld"
 "\">ver siguiente punto</a>)."
 
-# type: Content of: <dl><dt>
-msgid "License of Python 1.6a2 and earlier versions"
-msgstr "License of Python 1.6a2 y anteriores"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"Python1.6a2\"></a> License of Python 1.6a2 and earlier versions "
+"<span class=\"anchor-reference-id\"> (<a href=\"#Python1.6a2\">#Python1.6a2</"
+"a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license and is compatible with the GNU GPL.  Please "
 "note, however, that newer versions of Python are under other licenses (see "
@@ -1054,14 +1450,21 @@
 "licencias (ver puntos previo y siguientes)."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Ruby\" href=\"http://www.ruby-lang.org/en/LICENSE.txt\";> License "
+#| "of Ruby</a>"
 msgid ""
 "<a id=\"Ruby\" href=\"http://www.ruby-lang.org/en/LICENSE.txt\";> License of "
-"Ruby</a>"
+"Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)</"
+"span>"
 msgstr ""
 "<a id=\"Ruby\" href=\"http://www.ruby-lang.org/en/LICENSE.txt\";>License of "
 "Ruby</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, compatible with the GPL via an explicit "
 "dual-licensing clause."
@@ -1070,9 +1473,15 @@
 "cláusula explícita de licencia dual."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a href=\"http://oss.sgi.com/projects/FreeB/\"; id=\"SGIFreeB\"> SGI Free "
-"Software License B, version 2.0</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://oss.sgi.com/projects/FreeB/\"; id=\"SGIFreeB\"> SGI Free "
+#| "Software License B, version 2.0</a>"
+msgid ""
+"<a id=\"SGIFreeB\" href=\"http://oss.sgi.com/projects/FreeB/\";> SGI Free "
+"Software License B, version 2.0</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"#SGIFreeB\">#SGIFreeB</a>)</span>"
 msgstr ""
 "<a href=\"http://oss.sgi.com/projects/FreeB/\"; id=\"SGIFreeB\">SGI Free "
 "Software License B, version 2.0</a>"
@@ -1082,6 +1491,7 @@
 #
 # No estoy seguro de la traducción de "license notices" a "notificación 
sobre licencias"
 # (Edit)
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The SGI Free Software License B version 2.0 is a free software license.  It "
 "is essentially identical to the <a href=\"#X11License\">X11 License</a>, "
@@ -1092,6 +1502,7 @@
 "a>, con una alternativa opcional para proveer notificación sobre licencias."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Previous versions of the SGI Free Software License B were not free software "
 "licenses, despite their name.  However, they all included clauses that allow "
@@ -1107,24 +1518,36 @@
 "términos de esta versión libre."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"StandardMLofNJ\" href=\"http://cm.bell-labs.com/cm/cs/what/smlnj/";
+#| "license.html\">Standard ML of New Jersey Copyright License</a>"
 msgid ""
 "<a id=\"StandardMLofNJ\" href=\"http://cm.bell-labs.com/cm/cs/what/smlnj/";
-"license.html\">Standard ML of New Jersey Copyright License</a>"
+"license.html\"> Standard ML of New Jersey Copyright License</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#StandardMLofNJ\">#StandardMLofNJ</a>)</"
+"span>"
 msgstr ""
 "<a id=\"StandardMLofNJ\" href=\"http://cm.bell-labs.com/cm/cs/what/smlnj/";
 "license.html\">Standard ML of New Jersey Copyright License</a>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.html#Exhibit1";
+#| "\">Unicode, Inc. License Agreement for Data Files and Software</a>"
 msgid ""
-"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.";
-"html#Exhibit1\">Unicode, Inc. License Agreement for Data Files and Software</"
-"a>"
+"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.html#Exhibit1\";> "
+"Unicode, Inc. License Agreement for Data Files and Software</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#Unicode\">#Unicode</a>)</span>"
 msgstr ""
-"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.";
-"html#Exhibit1\">Unicode, Inc. License Agreement for Data Files and Software</"
-"a>"
+"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.html#Exhibit1";
+"\">Unicode, Inc. License Agreement for Data Files and Software</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
@@ -1137,6 +1560,7 @@
 "licencia simple y permisiva, compatible con todas las versiones de la GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If you want to use files covered by this License Agreement in your own "
 "software, that shouldn't be any problem, but we recommend that you also "
@@ -1157,6 +1581,7 @@
 "es bastante simple."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please take care to ensure that the files you are using are covered by this "
 "License Agreement.  Other files published by Unicode, Inc. are covered by "
@@ -1172,6 +1597,7 @@
 "cubiertos por él."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
 "to use a simple permissive license for your project, please use the <a href="
@@ -1183,15 +1609,44 @@
 "licencia <a href=\"#Expat\">Expat</a>; es de lejos la más común y la más "
 "ampliamente reconocida en la comunidad del software libre."
 
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"Unlicense\" href=\"http://unlicense.org/\";> The Unlicense</a> <span "
+"class=\"anchor-reference-id\"> (<a href=\"#Unlicense\">#Unlicense</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"The Unlicense is a public domain dedication.  A work released under the "
+"Unlicense is dedicated to the public domain to the fullest extent permitted "
+"by law, and also comes with an additional simple license that helps cover "
+"any cases where the dedication is inadequate.  Both public domain works and "
+"the simple license provided by the Unlicense are compatible with the GNU GPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"If you want to release your work to the public domain, we recommend you use "
+"<a href=\"#CC0\">CC0</a>.  CC0 also provides a public domain dedication with "
+"a fallback license, and is more thorough and mature than the Unlicense."
+msgstr ""
+
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Vim\" href=\"http://www.gnu.org/licenses/vim-license.txt\";> "
+#| "License of Vim, Version 6.1 or later</a>"
 msgid ""
 "<a id=\"Vim\" href=\"http://www.gnu.org/licenses/vim-license.txt\";> License "
-"of Vim, Version 6.1 or later</a>"
+"of Vim, Version 6.1 or later</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#Vim\">#Vim</a>)</span>"
 msgstr ""
 "<a id=\"Vim\" href=\"http://www.gnu.org/licenses/vim-license.txt\";>License "
 "of Vim, Version 6.1 or later</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, partially copyleft but not really. It is "
 "compatible with the GPL, by an explicit conversion clause."
@@ -1200,22 +1655,35 @@
 "completamente compatible con la GPL, por una cláusula expresa de 
conversión."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"W3C\" href=\"http://www.w3.org/Consortium/Legal/2002/copyright-";
+#| "software-20021231\"> W3C Software Notice and License</a>"
 msgid ""
 "<a id=\"W3C\" href=\"http://www.w3.org/Consortium/Legal/2002/copyright-";
-"software-20021231\"> W3C Software Notice and License</a>"
+"software-20021231\"> W3C Software Notice and License</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#W3C\">#W3C</a>)</span>"
 msgstr ""
 "<a id=\"W3C\" href=\"http://www.w3.org/Consortium/Legal/2002/copyright-";
 "software-20021231\">W3C Software Notice and License</a>"
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"WebM\" href=\"http://www.webmproject.org/license/\";>License of WebM</"
-"a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"WebM\" href=\"http://www.webmproject.org/license/\";>License of "
+#| "WebM</a>"
+msgid ""
+"<a id=\"WebM\" href=\"http://www.webmproject.org/license/\";> License of "
+"WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</a>)</"
+"span>"
 msgstr ""
 "<a id=\"WebM\" href=\"http://www.webmproject.org/license/\";>License of WebM</"
 "a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Google's WebM implementation is covered by the <a href=\"#ModifiedBSD"
 "\">Modified BSD License</a>.  Google also provides a separate patent license "
@@ -1237,27 +1705,40 @@
 "de la WebM son compatibles con GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"WTFPL\" href=\"http://sam.zoy.org/wtfpl/COPYING\";>WTFPL, Version "
+#| "2</a>"
 msgid ""
-"<a id=\"WTFPL\" href=\"http://sam.zoy.org/wtfpl/COPYING\";>WTFPL, Version 2</"
-"a>"
+"<a id=\"WTFPL\" href=\"http://sam.zoy.org/wtfpl/COPYING\";> WTFPL, Version 2</"
+"a> <span class=\"anchor-reference-id\">(<a href=\"#WTFPL\">#WTFPL</a>)</span>"
 msgstr ""
 "<a id=\"WTFPL\" href=\"http://sam.zoy.org/wtfpl/COPYING\";>WTFPL, Version 2</"
 "a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, very permissive and GPL-compatible."
 msgstr ""
 "Esta es una licencia de software libre muy permisiva y compatible con la GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+#| "\"> X11 License</a>"
 msgid ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\"> X11 License</a>"
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\"> X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#X11License\">#X11License</a>)</span>"
 msgstr ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\">X11 License</a>"
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\">X11 License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  Older versions of XFree86 used the same license, and some "
@@ -1271,6 +1752,7 @@
 "\">XFree86 1.1 license</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is sometimes called the <em>MIT license</em>, but that term is "
 "misleading, since MIT has used many licenses for software."
@@ -1279,14 +1761,21 @@
 "confusa, ya que MIT ha utilizado varias licencias distintas de software."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a href=\"http://www.xfree86.org/current/LICENSE4.html\"; id="
-"\"XFree861.1License\">XFree86 1.1 License</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://www.xfree86.org/current/LICENSE4.html\"; id="
+#| "\"XFree861.1License\">XFree86 1.1 License</a>"
+msgid ""
+"<a id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
+"html\"> XFree86 1.1 License</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
 msgstr ""
 "<a href=\"http://www.xfree86.org/current/LICENSE4.html\"; id="
 "\"XFree861.1License\">XFree86 1.1 License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
@@ -1295,6 +1784,7 @@
 "compatible con la versión 3 de la GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is incompatible with version 2 of the GPL, "
 "because of its requirements that apply to all documentation in the "
@@ -1305,6 +1795,7 @@
 "contenga reconocimientos al trabajo de otros autores."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "There are currently several variants of XFree86, and only some of them use "
 "this license.  Some continue to use the <a href=\"#X11License\">X11 license</"
@@ -1315,26 +1806,41 @@
 "license</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#| "License of ZLib</a>"
 msgid ""
 "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
-"of ZLib</a>"
+"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
+"</span>"
 msgstr ""
 "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";>License "
 "of ZLib</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, and compatible with the GPL."
 msgstr "Esta es una licencia de software libre compatible con la GPL."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Zope20\" href=\"http://www.zope.org/Resources/ZPL\";> Zope Public "
-"License, versions 2.0 and 2.1</a>"
+#.  without decimal, leave for compatibility 
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope20\" href=\"http://www.zope.org/Resources/ZPL\";> Zope Public "
+#| "License, versions 2.0 and 2.1</a>"
+msgid ""
+"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.org/Resources/";
+"ZPL\"> Zope Public License, versions 2.0 and 2.1</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
 msgstr ""
 "<a id=\"Zope20\" href=\"http://www.zope.org/Resources/ZPL\";>Zope Public "
 "License, versions 2.0 and 2.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
@@ -1342,15 +1848,15 @@
 "Esta es una licencia de software libre simple y permisiva, sin copyleft, "
 "compatible con la GPL sw GNU."
 
-# type: Content of: <h3>
+#. type: Content of: <h3>
 msgid ""
 "<a id=\"GPLIncompatibleLicenses\"> GPL-Incompatible Free Software Licenses</"
-"a>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLIncompatibleLicenses"
+"\">#GPLIncompatibleLicenses</a>)</span>"
 msgstr ""
-"<a id=\"GPLIncompatibleLicenses\">Licencias de software incompatibles con la "
-"GPL</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses are <a href=\"/philosophy/free-sw.html\">free "
 "software</a> licenses, but are <a href=\"/licenses/gpl-faq."
@@ -1363,14 +1869,21 @@
 "</strong>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"AGPLv1.0\" href=\"http://www.affero.org/oagpl.html\";> Affero "
+#| "General Public License version 1</a>"
 msgid ""
 "<a id=\"AGPLv1.0\" href=\"http://www.affero.org/oagpl.html\";> Affero General "
-"Public License version 1</a>"
+"Public License version 1</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#AGPLv1.0\">#AGPLv1.0</a>)</span>"
 msgstr ""
 "<a id=\"AGPLv1.0\" href=\"http://www.affero.org/oagpl.html\";>Affero General "
 "Public License version 1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Affero General Public License is a free software license, copyleft, and "
 "incompatible with the GNU GPL.  It consists of the GNU GPL version 2, with "
@@ -1385,6 +1898,7 @@
 "programas de aplicación a través de servicios web o redes de computadoras."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license has been succeeded by the <a href=\"#AGPLv3.0\">GNU Affero "
 "General Public License version 3</a>; please use that instead."
@@ -1394,14 +1908,22 @@
 "en su lugar."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"AcademicFreeLicense\" href=\"http://opensource.org/licenses/";
+#| "academic.php\"> Academic Free License, all versions through 3.0</a>"
 msgid ""
 "<a id=\"AcademicFreeLicense\" href=\"http://opensource.org/licenses/academic.";
-"php\"> Academic Free License, all versions through 3.0</a>"
+"php\"> Academic Free License, all versions through 3.0</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#AcademicFreeLicense"
+"\">#AcademicFreeLicense</a>)</span>"
 msgstr ""
 "<a id=\"AcademicFreeLicense\" href=\"http://opensource.org/licenses/academic.";
 "php\">Academic Free License, all versions through 3.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Academic Free License is a free software license, not copyleft, and "
 "incompatible with the GNU GPL.  Recent versions contain contract clauses "
@@ -1414,14 +1936,21 @@
 "License</a> y debería ser evitada por las mismas razones que aquélla."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apache1.1\" href=\"http://www.apache.org/licenses/LICENSE-1.1\";> "
+#| "Apache License, Version 1.1</a>"
 msgid ""
 "<a id=\"apache1.1\" href=\"http://www.apache.org/licenses/LICENSE-1.1\";> "
-"Apache License, Version 1.1</a>"
+"Apache License, Version 1.1</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"#apache1.1\">#apache1.1</a>)</span>"
 msgstr ""
-"<a id=\"apache1.1\" href=\"http://www.apache.org/licenses/";
-"LICENSE-1.1\">Apache License, Version 1.1</a>"
+"<a id=\"apache1.1\" href=\"http://www.apache.org/licenses/LICENSE-1.1";
+"\">Apache License, Version 1.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free software license.  It has a few "
 "requirements that render it incompatible with the GNU GPL, such as strong "
@@ -1432,14 +1961,21 @@
 "como fuertes prohibiciones en el uso de nombres relacionados con Apache."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apache1\" href=\"http://www.apache.org/licenses/LICENSE-1.0\";> "
+#| "Apache License, Version 1.0</a>"
 msgid ""
 "<a id=\"apache1\" href=\"http://www.apache.org/licenses/LICENSE-1.0\";> "
-"Apache License, Version 1.0</a>"
+"Apache License, Version 1.0</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"#apache1\">#apache1</a>)</span>"
 msgstr ""
 "<a id=\"apache1\" href=\"http://www.apache.org/licenses/LICENSE-1.0\";>Apache "
 "License, Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
@@ -1452,14 +1988,21 @@
 "original BSD, incluyendo la incompatibilidad con la GNU GPL."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl/2.0.txt\";> Apple "
-"Public Source License (APSL), version 2</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl/2.0.txt\";> "
+#| "Apple Public Source License (APSL), version 2</a>"
+msgid ""
+"<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl\";> Apple Public "
+"Source License (APSL), version 2</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#apsl2\">#apsl2</a>)</span>"
 msgstr ""
 "<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl/2.0.txt\";>Apple "
 "Public Source License (APSL), version 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, incompatible with the GNU GPL.  We "
 "recommend that you not use this license for new software that you write, but "
@@ -1472,14 +2015,21 @@
 "es.html\">Más información.</a>"
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a href=\"http://www.bittorrent.com/bittorrent-open-source-license\"; id="
-"\"bittorrent\">BitTorrent Open Source License</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://www.bittorrent.com/bittorrent-open-source-license\"; id="
+#| "\"bittorrent\">BitTorrent Open Source License</a>"
+msgid ""
+"<a id=\"bittorrent\" href=\"http://www.bittorrent.com/bittorrent-open-source-";
+"license\"> BitTorrent Open Source License</a> <span class=\"anchor-reference-"
+"id\"> (<a href=\"#bittorrent\">#bittorrent</a>)</span>"
 msgstr ""
 "<a href=\"http://www.bittorrent.com/bittorrent-open-source-license\"; id="
 "\"bittorrent\">BitTorrent Open Source License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, but incompatible with the GPL, for the same "
 "reasons as the <a href=\"#josl\">Jabber Open Source License</a>."
@@ -1488,14 +2038,21 @@
 "mismas razones que la <a href=\"#josl\">Jabber Open Source License</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
+#| "html#6\"> Original BSD license</a>"
 msgid ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\"> Original BSD license</a>"
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\"> Original BSD license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#OriginalBSD\">#OriginalBSD</a>)</span>"
 msgstr ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\">Original BSD license</a>"
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\">Original BSD license</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "(Note: on the preceding link, the original BSD license is listed in the "
 "<em>UCB/LBL</em> section.  This license is also sometimes called the "
@@ -1506,6 +2063,7 @@
 "BSD license&rdquo;.)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license with a "
 "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
@@ -1520,6 +2078,7 @@
 "prácticos</a>, incluyendo la incompatibilidad con la GPL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
 "you want to use a simple, permissive non-copyleft free software license, it "
@@ -1534,14 +2093,21 @@
 "utilizar software lanzado bajo la licencia BSD original."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"CDDL\" href=\"http://www.opensolaris.org/os/licensing/cddllicense.";
+#| "txt\"> Common Development and Distribution License (CDDL), version 1.0</a>"
 msgid ""
 "<a id=\"CDDL\" href=\"http://www.opensolaris.org/os/licensing/cddllicense.txt";
-"\"> Common Development and Distribution License (CDDL), version 1.0</a>"
+"\"> Common Development and Distribution License (CDDL), version 1.0</a> "
+"<span class=\"anchor-reference-id\"> (<a href=\"#CDDL\">#CDDL</a>)</span>"
 msgstr ""
 "<a id=\"CDDL\" href=\"http://www.opensolaris.org/os/licensing/cddllicense.txt";
 "\">Common Development and Distribution License (CDDL), version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It has a copyleft with a scope that's "
 "similar to the one in the Mozilla Public License, which makes it "
@@ -1556,6 +2122,7 @@
 "enlazados juntos. Es por lo anterior que lo urgimos a que no utilice la CDDL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Also unfortunate in the CDDL is its use of the term &ldquo;<a href=\"/"
 "philosophy/not-ipr.html\">intellectual property</a>&rdquo;."
@@ -1564,20 +2131,34 @@
 "philosophy/not-ipr.es.html\">propiedad intelectual</a>&rdquo;."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"CPAL\" href=\"http://opensource.org/licenses/cpal_1.0\";>Common "
-"Public Attribution License 1.0 (CPAL)</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"CPAL\" href=\"http://opensource.org/licenses/cpal_1.0\";>Common "
+#| "Public Attribution License 1.0 (CPAL)</a>"
+msgid ""
+"<a id=\"CPAL\" href=\"http://opensource.org/licenses/cpal_1.0\";> Common "
+"Public Attribution License 1.0 (CPAL)</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#CPAL\">#CPAL</a>)</span>"
 msgstr ""
 "<a id=\"CPAL\" href=\"http://opensource.org/licenses/cpal_1.0\";>Common "
 "Public Attribution License 1.0 (CPAL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  It is based on the <a href=\"#MPL"
+#| "\">Mozilla Public License</a>, and is incompatible with the GPL for the "
+#| "same reasons: it has several requirements for modified versions that do "
+#| "not exist in the GPL.  It also requires you to publish the source of the "
+#| "program if you allow others to use it."
 msgid ""
 "This is a free software license.  It is based on the <a href=\"#MPL"
-"\">Mozilla Public License</a>, and is incompatible with the GPL for the same "
-"reasons: it has several requirements for modified versions that do not exist "
-"in the GPL.  It also requires you to publish the source of the program if "
-"you allow others to use it."
+"\">Mozilla Public License</a> version 1, and is incompatible with the GPL "
+"for the same reasons: it has several requirements for modified versions that "
+"do not exist in the GPL.  It also requires you to publish the source of the "
+"program if you allow others to use it."
 msgstr ""
 "Esta es una licencia de software libre.  Se basa en la <a href=\"#MPL"
 "\">Mozilla Public License</a> y es incompatible con la GPL por las mismas "
@@ -1586,14 +2167,21 @@
 "del programa si se va a permitir a otros usuarios que lo utilicen."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"CommonPublicLicense10\" href=\"http://www.eclipse.org/legal/cpl-";
+#| "v10.html\"> Common Public License Version 1.0</a>"
 msgid ""
 "<a id=\"CommonPublicLicense10\" href=\"http://www.eclipse.org/legal/cpl-v10.";
-"html\"> Common Public License Version 1.0</a>"
+"html\"> Common Public License Version 1.0</a> <span class=\"anchor-reference-"
+"id\"> (<a href=\"#CommonPublicLicense10\">#CommonPublicLicense10</a>)</span>"
 msgstr ""
 "<a id=\"CommonPublicLicense10\" href=\"http://www.eclipse.org/legal/cpl-v10.";
 "html\">Common Public License Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  Unfortunately, its weak copyleft and "
 "choice of law clause make it incompatible with the GNU GPL."
@@ -1603,19 +2191,48 @@
 "GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Condor\" href=\"http://www.cs.wisc.edu/condor/condor-public-";
+#| "license.html#condor\"> Condor Public License</a>"
 msgid ""
 "<a id=\"Condor\" href=\"http://www.cs.wisc.edu/condor/condor-public-license.";
-"html#condor\"> Condor Public License</a>"
+"html#condor\"> Condor Public License</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#Condor\">#Condor</a>)</span>"
 msgstr ""
 "<a id=\"Condor\" href=\"http://www.cs.wisc.edu/condor/condor-public-license.";
 "html#condor\">Condor Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Recent versions of Squeak are released under an <a href=\"#Expat\">Expat-"
+#| "style License</a> with some portions of the code under the <a href="
+#| "\"#apache2\">Apache License 2.0</a>."
 msgid ""
-"This is a free software license.  It has a couple of requirements that make "
-"it incompatible with the GNU GPL, including strong restrictions on the use "
-"of Condor-related names, and a condition that you must comply with United "
-"States export laws."
+"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."
+msgstr ""
+"Versiones recientes de Squeak son lanzadas bajo una <a href=\"#Expat"
+"\">licencia estilo Expat</a> con algunas partes del código puestas bajo la "
+"<a href=\"#apache2\">Apache License 2.0</a>."
+
+# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  It has a couple of requirements that "
+#| "make it incompatible with the GNU GPL, including strong restrictions on "
+#| "the use of Condor-related names, and a condition that you must comply "
+#| "with United States export laws."
+msgid ""
+"The Condor Public License is a free software license.  It has a couple of "
+"requirements that make it incompatible with the GNU GPL, including strong "
+"restrictions on the use of Condor-related names, and a condition that you "
+"must comply with United States export laws."
 msgstr ""
 "Esta es una licencia de software libre.  Posee un par de requisitos que la "
 "hacen incompatible con la GPL de GNU, incluyendo fuertes restricciones al "
@@ -1623,27 +2240,51 @@
 "cumpla con las leyes de exportación de los Estados Unidos."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://www.eclipse.org/legal/epl-v10.html\";> Eclipse "
+#| "Public License Version 1.0</a>"
 msgid ""
 "<a id=\"EPL\" href=\"http://www.eclipse.org/legal/epl-v10.html\";> Eclipse "
-"Public License Version 1.0</a>"
+"Public License Version 1.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#EPL\">#EPL</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"http://www.eclipse.org/legal/epl-v10.html\";>Eclipse "
 "Public License Version 1.0</a>"
 
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"<a href=\"http://ec.europa.eu/idabc/eupl\"; id=\"EUPL\">European Union Public "
-"License (EUPL) version 1.1</a>"
+"The Eclipse Public License is similar to the <a href=\"#CommonPublicLicense10"
+"\">Common Public License</a>, and our comments on the CPL apply equally to "
+"the EPL.  The only change is that the EPL removes the broader patent "
+"retaliation language regarding patent infringement suits specifically "
+"against Contributors to the EPL'd program."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"EUPL\" href=\"http://www.osor.eu/eupl\";> European Union Public "
+"License (EUPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#EUPL\">#EUPL</a>)</span>"
 msgstr ""
-"<a href=\"http://ec.europa.eu/idabc/eupl\"; id=\"EUPL\">European Union Public "
-"License (EUPL) version 1.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  By itself, it has a copyleft comparable "
+#| "to the GPL's.  However, it allows recipients to distribute the work under "
+#| "the terms of other selected licenses, and some of those&mdash;the <a href="
+#| "\"#EPL\">Eclipse Public License</a> and the <a href="
+#| "\"#CommonPublicLicense10\">Common Public License</a> in particular&mdash;"
+#| "only provide a weaker copyleft.  Thus, developers can't rely on this "
+#| "license to provide a strong copyleft."
 msgid ""
 "This is a free software license.  By itself, it has a copyleft comparable to "
-"the GPL's.  However, it allows recipients to distribute the work under the "
-"terms of other selected licenses, and some of those&mdash;the <a href=\"#EPL"
-"\">Eclipse Public License</a> and the <a href="
+"the GPL's, and incompatible with it.  However, it gives recipients ways to "
+"relicense the work under the terms of other selected licenses, and some of "
+"those&mdash;the <a href=\"#EPL\">Eclipse Public License</a> and the <a href="
 "\"#CommonPublicLicense10\">Common Public License</a> in particular&mdash;"
 "only provide a weaker copyleft.  Thus, developers can't rely on this license "
 "to provide a strong copyleft."
@@ -1656,26 +2297,37 @@
 "los desarrolladores no puden confiar en esta licencia para proveerse de un "
 "copyleft fuerte."
 
-# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"The EUPL is compatible with GPLv2, because that is listed as one of the "
-"alternative licenses that recipients may use.  However, it is incompatible "
-"with GPLv3, because recipients are not given permission to use GPLv3's "
-"terms, and the EUPL's copyleft conflicts with GPLv3's.  Because of this "
-"incompatibility, we urge you not to use the EUPL for any software you write."
-msgstr ""
-"La EUPL es compatible con la GPLv2, al estar listada como una de las "
-"licencias alternativas que los receptores del software pueden utilizar. Sin "
-"embargo, es incompatible con los términos de la GPLv3, porque a dichos "
-"receptores no se les otorga permiso para utilizar los términos de la GPLv3 y 
"
-"el copyleft de la EUPL entra en conflicto con el de la GPLv3. Por esta "
-"incompatibilidad es que urgimos a que no se utilice la EUPL para nuevo "
-"software."
+"The EUPL allows relicensing to GPLv2, because that is listed as one of the "
+"alternative licenses that users may convert to.  It also, indirectly, allows "
+"relicensing to GPL version 3, because there is a way to relicense to the "
+"CeCILL v2, and the CeCILL v2 gives a way to relicense to any version of the "
+"GNU GPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"To do this two-step relicensing, you need to first write a piece of code "
+"which you can license under the CeCILL v2, or find a suitable module already "
+"available that way, and add it to the program.  Adding that code to the EUPL-"
+"covered program provides grounds to relicense it to the CeCILL v2.  Then you "
+"need to write a piece of code which you can license under the GPLv3+, or "
+"find a suitable module already available that way, and add it to the "
+"program.  Adding that code to the CeCILL-covered program provides grounds to "
+"relicense it to GPLv3+."
+msgstr ""
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"IBMPL\" href=\"http://www.opensource.org/licenses/ibmpl.php\";> "
+#| "IBM Public License, Version 1.0</a>"
 msgid ""
 "<a id=\"IBMPL\" href=\"http://www.opensource.org/licenses/ibmpl.php\";> IBM "
-"Public License, Version 1.0</a>"
+"Public License, Version 1.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#IBMPL\">#IBMPL</a>)</span>"
 msgstr ""
 "<a id=\"IBMPL\" href=\"http://www.opensource.org/licenses/ibmpl.php\";>IBM "
 "Public License, Version 1.0</a>"
@@ -1683,6 +2335,7 @@
 # type: Content of: <dl><dd><p>
 #
 # qué es "choice of a law clause"?
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  Unfortunately, it has a choice of law "
 "clause which makes it incompatible with the GNU GPL."
@@ -1691,38 +2344,23 @@
 "cláusula legal que la hace incompatible con la GPL de GNU."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/opensource/";
-"IPL.html\"> Interbase Public License, Version 1.0</a>"
-msgstr ""
-"<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/opensource/";
-"IPL.html\">Interbase Public License, Version 1.0</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the IPL has some complex "
-"restrictions that make it incompatible with the GNU GPL.  That is, a module "
-"covered by the GPL and a module covered by the IPL cannot legally be linked "
-"together.  We urge you not to use the IPL for this reason."
-msgstr ""
-"Esta es una licencia de software libre que es esencialmente igual a la "
-"Mozilla Public License Version 1.1. Como la MPL, la IPL tiene complejas "
-"restricciones que la hacen incompatible con la GPL de GNU. Esto implica que, "
-"un módulo cubierto por la GPL y otro por la IPL no pueden legalmente ser "
-"enlazados juntos.  Urgimos a que no se utilice la IPL por esta razón."
-
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"josl\" href=\"http://code.google.com/p/jabber-net/source/browse/";
+#| "branches/RELEASE_1_0/LICENSE.txt\"> Jabber Open Source License, Version "
+#| "1.0</a>"
 msgid ""
 "<a id=\"josl\" href=\"http://code.google.com/p/jabber-net/source/browse/";
 "branches/RELEASE_1_0/LICENSE.txt\"> Jabber Open Source License, Version 1.0</"
-"a>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#josl\">#josl</a>)</span>"
 msgstr ""
 "<a id=\"josl\" href=\"http://code.google.com/p/jabber-net/source/browse/";
 "branches/RELEASE_1_0/LICENSE.txt\">Jabber Open Source License, Version 1.0</"
 "a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The license is a free software license, incompatible with the GPL.  It "
 "permits relicensing under a certain class of licenses, those which include "
@@ -1736,14 +2374,21 @@
 "licencia Jabber no permite el cambio a la GPL. Por lo tanto no es compatible."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"LPPL-1.3a\" href=\"http://www.latex-project.org/lppl/lppl-1-3a.txt";
+#| "\"> LaTeX Project Public License 1.3a</a>"
 msgid ""
 "<a id=\"LPPL-1.3a\" href=\"http://www.latex-project.org/lppl/lppl-1-3a.txt";
-"\"> LaTeX Project Public License 1.3a</a>"
+"\"> LaTeX Project Public License 1.3a</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#LPPL-1.3a\">#LPPL-1.3a</a>)</span>"
 msgstr ""
 "<a id=\"LPPL-1.3a\" href=\"http://www.latex-project.org/lppl/lppl-1-3a.txt";
 "\">LaTeX Project Public License 1.3a</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We have not written a full analysis of this license, but it is a free "
 "software license, with less stringent requirements on distribution than "
@@ -1758,14 +2403,21 @@
 "referencia a) una versión no modificada."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"LPPL-1.2\" href=\"http://www.latex-project.org/lppl/lppl-1-2.txt";
+#| "\"> LaTeX Project Public License 1.2</a>"
 msgid ""
 "<a id=\"LPPL-1.2\" href=\"http://www.latex-project.org/lppl/lppl-1-2.txt\";> "
-"LaTeX Project Public License 1.2</a>"
+"LaTeX Project Public License 1.2</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#LPPL-1.2\">#LPPL-1.2</a>)</span>"
 msgstr ""
 "<a id=\"LPPL-1.2\" href=\"http://www.latex-project.org/lppl/lppl-1-2.txt";
 "\">LaTeX Project Public License 1.2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is an incomplete statement of the distribution terms for "
 "LaTeX.  As far as it goes, it is a free software license, but incompatible "
@@ -1778,6 +2430,7 @@
 "requerimientos que esta úlima no posee."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license contains complex and annoying restrictions on how to publish a "
 "modified version, including one requirement that falls just barely on the "
@@ -1790,6 +2443,7 @@
 "cualquier archivo modificado debe tener un nuevo nombre."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 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 "
@@ -1804,7 +2458,19 @@
 "molesto; sin élla sería un serio obstáculo y deberíamos concluír que el "
 "programa no es libre."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This condition may cause trouble with some major modifications.  For "
+"example, if you wanted to port an LPPL-covered work to another system that "
+"lacked a similar remapping facility, but still required users to request "
+"this file by name, you would need to implement a remapping facility too to "
+"keep this software free.  That would be a nuisance, but the fact that a "
+"license would make code nonfree if transplanted into a very different "
+"context does not make it nonfree in the original context."
+msgstr ""
+
 # type: Content of: <dl><dd><p>
+#. 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, "
@@ -1817,6 +2483,7 @@
 "software libre."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The LPPL makes the controversial claim that simply having files on a machine "
 "where a few other people could log in and access them in itself constitutes "
@@ -1830,24 +2497,33 @@
 "hacerla."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "Please do not use this license for any other project."
 msgstr "Por favor, no utilice esta licencia para ningún otro proyecto."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "Note: These comments are for version 1.2 (3 Sep 1999) of the LPPL."
 msgstr ""
 "Nota: estos comentarios son para la versión 1.2 (3 de septiembre de 1999) de 
"
 "la LPPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"lucent102\" href=\"http://plan9.bell-labs.com/plan9dist/license.";
+#| "html\"> Lucent Public License Version 1.02 (Plan 9 license)</a>"
 msgid ""
 "<a id=\"lucent102\" href=\"http://plan9.bell-labs.com/plan9dist/license.html";
-"\"> Lucent Public License Version 1.02 (Plan 9 license)</a>"
+"\"> Lucent Public License Version 1.02 (Plan 9 license)</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</a>)</span>"
 msgstr ""
 "<a id=\"lucent102\" href=\"http://plan9.bell-labs.com/plan9dist/license.html";
 "\">Lucent Public License Version 1.02 (Plan 9 license)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, but it is incompatible with the GNU GPL "
 "because of its choice of law clause.  We recommend that you not use this "
@@ -1860,14 +2536,21 @@
 "Plan&nbsp;9 bajo esta licencia."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ms-pl\" href=\"http://www.microsoft.com/opensource/licenses.";
+#| "mspx#Ms-PL\">Microsoft Public License (Ms-PL)</a>"
 msgid ""
 "<a id=\"ms-pl\" href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-";
-"PL\">Microsoft Public License (Ms-PL)</a>"
+"PL\"> Microsoft Public License (Ms-PL)</a> <span class=\"anchor-reference-id"
+"\">(<a href=\"#ms-pl\">#ms-pl</a>)</span>"
 msgstr ""
 "<a id=\"ms-pl\" href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-";
 "PL\">Microsoft Public License (Ms-PL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license; it has a copyleft that is not strong, but "
 "incompatible with the GNU GPL.  We urge you not to use the Ms-PL for this "
@@ -1878,14 +2561,21 @@
 "utilizar esta licencia."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ms-rl\" href=\"http://www.microsoft.com/opensource/licenses.";
+#| "mspx#Ms-RL\">Microsoft Reciprocal License (Ms-RL)</a>"
 msgid ""
 "<a id=\"ms-rl\" href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-";
-"RL\">Microsoft Reciprocal License (Ms-RL)</a>"
+"RL\"> Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
 msgstr ""
 "<a id=\"ms-rl\" href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-";
 "RL\">Microsoft Reciprocal License (Ms-RL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It's based on the <a href=\"#ms-pl"
 "\">Microsoft Public License</a>, and has an additional clause to make the "
@@ -1898,14 +2588,21 @@
 "a no utilizarla por dicha razón."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a>"
 msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
-"Public License (MPL)</a>"
+"Public License (MPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#MPL\">#MPL</a>)</span>"
 msgstr ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";>Mozilla "
 "Public License (MPL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license which is not a strong copyleft; unlike the "
 "<a href=\"#X11License\">X11 license</a>, it has some complex restrictions "
@@ -1922,6 +2619,7 @@
 "instamos a no utilizar esta licencia."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "However, MPL 1.1 has a provision (section 13) that allows a program (or "
 "parts of it) to offer a choice of another license as well.  If part of a "
@@ -1936,17 +2634,32 @@
 "programa está bajo una licencia compatible con la GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NOSL\" href=\"http://bits.netizen.com.au/licenses/NOSL/nosl.txt";
+#| "\"> Netizen Open Source License (NOSL), Version 1.0</a>"
 msgid ""
 "<a id=\"NOSL\" href=\"http://bits.netizen.com.au/licenses/NOSL/nosl.txt\";> "
-"Netizen Open Source License (NOSL), Version 1.0</a>"
+"Netizen Open Source License (NOSL), Version 1.0</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#NOSL\">#NOSL</a>)</span>"
 msgstr ""
 "<a id=\"NOSL\" href=\"http://bits.netizen.com.au/licenses/NOSL/nosl.txt";
 "\">Netizen Open Source License (NOSL), Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license that is essentially the same as the "
+#| "Mozilla Public License, Version 1.1.  Like the MPL, the NOSL has some "
+#| "complex restrictions that make it incompatible with the GNU GPL.  That "
+#| "is, a module covered by the GPL and a module covered by the NOSL cannot "
+#| "legally be linked together.  We urge you not to use the NOSL for this "
+#| "reason."
 msgid ""
 "This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the NOSL has some complex "
+"Public License version 1.1.  Like the MPL, the NOSL has some complex "
 "restrictions that make it incompatible with the GNU GPL.  That is, a module "
 "covered by the GPL and a module covered by the NOSL cannot legally be linked "
 "together.  We urge you not to use the NOSL for this reason."
@@ -1958,21 +2671,36 @@
 "legalmente enlazados. Por esta razón urgimos a no utilizar esta licencia."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NPL\" href=\"http://www.mozilla.org/NPL/NPL-1.1.html\";> Netscape "
-"Public License (NPL)</a>, versions 1.0 and 1.1"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NPL\" href=\"http://www.mozilla.org/NPL/NPL-1.1.html\";> Netscape "
+#| "Public License (NPL)</a>, versions 1.0 and 1.1"
+msgid ""
+"<a id=\"NPL\" href=\"http://www.mozilla.org/MPL/NPL-1.1.html\";> Netscape "
+"Public License (NPL)</a>, versions 1.0 and 1.1 <span class=\"anchor-"
+"reference-id\">(<a href=\"#NPL\">#NPL</a>)</span>"
 msgstr ""
 "<a id=\"NPL\" href=\"http://www.mozilla.org/NPL/NPL-1.1.html\";>Netscape "
 "Public License (NPL)</a>, versions 1.0 and 1.1"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, not a strong copyleft, and incompatible "
+#| "with the GNU GPL.  It consists of the Mozilla Public License with an "
+#| "added clause that permits Netscape to use your added code <em>even in "
+#| "their proprietary versions of the program</em>.  Of course, they do not "
+#| "give <em>you</em> permission to use <em>their</em> code in the analogous "
+#| "way.  We urge you not to use the NPL."
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
-"with the GNU GPL.  It consists of the Mozilla Public License with an added "
-"clause that permits Netscape to use your added code <em>even in their "
-"proprietary versions of the program</em>.  Of course, they do not give "
-"<em>you</em> permission to use <em>their</em> code in the analogous way.  We "
-"urge you not to use the NPL."
+"with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
+"with an added clause that permits Netscape to use your added code <em>even "
+"in their proprietary versions of the program</em>.  Of course, they do not "
+"give <em>you</em> permission to use <em>their</em> code in the analogous "
+"way.  We urge you not to use the NPL."
 msgstr ""
 "Esta es una licencia de software libre, sin copyleft fuerte, incompatible "
 "con la GPL de GNU. Consiste en la Mozilla Public License con una cláusula "
@@ -1982,26 +2710,40 @@
 "<em>éllos</em> en forma análoga. Le  a no utilizar esta licencia."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Nokia\" href=\"http://opensource.org/licenses/nokia.html\";> Nokia "
+#| "Open Source License</a>"
 msgid ""
 "<a id=\"Nokia\" href=\"http://opensource.org/licenses/nokia.html\";> Nokia "
-"Open Source License</a>"
+"Open Source License</a> <span class=\"anchor-reference-id\">(<a href=\"#Nokia"
+"\">#Nokia</a>)</span>"
 msgstr ""
 "<a id=\"Nokia\" href=\"http://opensource.org/licenses/nokia.html\";>Nokia "
 "Open Source License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is similar to the Mozilla Public License: a free software license "
+#| "incompatible with the GNU GPL."
 msgid ""
-"This is similar to the Mozilla Public License: a free software license "
-"incompatible with the GNU GPL."
+"This is similar to the Mozilla Public License version 1: a free software "
+"license incompatible with the GNU GPL."
 msgstr ""
 "Es similar a la Mozilla Public License: una licencia de software libre "
 "incompatible con la GPL de GNU."
 
-# type: Content of: <dl><dt>
-msgid "Old OpenLDAP License, Version 2.3"
-msgstr "Old OpenLDAP License, Version 2.3"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"oldOpenLDAP\"> Old OpenLDAP License, Version 2.3</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#oldOpenLDAP\">#oldOpenLDAP</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free software license with a few "
 "requirements (in sections 4 and 5) that render it incompatible with the GNU "
@@ -2015,6 +2757,7 @@
 "GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the older OpenLDAP license for software you write.  "
 "However, there is no reason to avoid running programs that have been "
@@ -2025,14 +2768,21 @@
 "programas que fueses publicados bajo esta licencua."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OSL\" href=\"http://www.opensource.org/licenses/osl-3.0.php\";> "
+#| "Open Software License, all versions through 3.0</a>"
 msgid ""
 "<a id=\"OSL\" href=\"http://www.opensource.org/licenses/osl-3.0.php\";> Open "
-"Software License, all versions through 3.0</a>"
+"Software License, all versions through 3.0</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#OSL\">#OSL</a>)</span>"
 msgstr ""
 "<a id=\"OSL\" href=\"http://www.opensource.org/licenses/osl-3.0.php\";>Open "
 "Software License, all versions through 3.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Open Software License is a free software license.  It is incompatible "
 "with the GNU GPL in several ways."
@@ -2045,6 +2795,7 @@
 # Puse la primer línea dentro del 
 # link a la OSLRant, porque estaba
 # vacío y me pareció un error.
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<a id=\"OSLRant\"></a>Recent versions of the Open Software License have a "
 "term which requires distributors to try to obtain explicit assent to the "
@@ -2069,6 +2820,7 @@
 "de la OSL sea utilizada para ningún tipo de software."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the Open Software License for software you write.  "
 "However, there is no reason to avoid running programs that have been "
@@ -2079,14 +2831,21 @@
 "encuentren bajo esta licencia."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OpenSSL\" href=\"http://www.sdisw.com/openssl.htm\";> OpenSSL "
+#| "license</a>"
 msgid ""
 "<a id=\"OpenSSL\" href=\"http://www.sdisw.com/openssl.htm\";> OpenSSL "
-"license</a>"
+"license</a> <span class=\"anchor-reference-id\"> (<a href=\"#OpenSSL"
+"\">#OpenSSL</a>)</span>"
 msgstr ""
 "<a id=\"OpenSSL\" href=\"http://www.sdisw.com/openssl.htm\";>OpenSSL license</"
 "a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 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 "
@@ -2101,6 +2860,7 @@
 "BSD original y Apache."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend using GNUTLS instead of OpenSSL in software you write.  "
 "However, there is no reason not to use OpenSSL and applications that work "
@@ -2111,14 +2871,21 @@
 "que trabajen con OpenSSL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Phorum\" href=\"http://phorum.org/license.txt\";> Phorum License, "
+#| "Version 2.0</a>"
 msgid ""
 "<a id=\"Phorum\" href=\"http://phorum.org/license.txt\";> Phorum License, "
-"Version 2.0</a>"
+"Version 2.0</a> <span class=\"anchor-reference-id\"> (<a href=\"#Phorum"
+"\">#Phorum</a>)</span>"
 msgstr ""
 "<a id=\"Phorum\" href=\"http://phorum.org/license.txt\";>Phorum License, "
 "Version 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license but it is incompatible with the <a href=\"/"
 "licenses/gpl.html\">GPL</a>.  Section 5 makes the license incompatible with "
@@ -2128,14 +2895,21 @@
 "licenses/gpl.html\">GPL</a>. La sección 5 es la que la vuelve incompatible."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"PHP-3.01\" href=\"http://www.php.net/license/3_01.txt\";> PHP "
+#| "License, Version 3.01</a>"
 msgid ""
 "<a id=\"PHP-3.01\" href=\"http://www.php.net/license/3_01.txt\";> PHP "
-"License, Version 3.01</a>"
+"License, Version 3.01</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#PHP-3.01\">#PHP-3.01</a>)</span>"
 msgstr ""
 "<a id=\"PHP-3.01\" href=\"http://www.php.net/license/3_01.txt\";>PHP License, "
 "Version 3.01</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is used by most of PHP4.  It is a non-copyleft free software "
 "license.  It is incompatible with the GNU GPL because it includes strong "
@@ -2147,19 +2921,27 @@
 "nombre de los productos derivados."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend that you not use this license for anything except PHP add-ons."
 msgstr "Recomendamos no utilice esta licencia salvo para añadidos a PHP."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
+#| "python1.6_9-5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a>"
 msgid ""
-"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-"python1.6_9-5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a>"
+"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/python1.6_9-";
+"5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</a>)</span>"
 msgstr ""
-"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-"python1.6_9-5-00.html\">License of Python 1.6b1 through 2.0 and 2.1</a>"
+"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/python1.6_9-";
+"5-00.html\">License of Python 1.6b1 through 2.0 and 2.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license but is incompatible with the GNU GPL.  The "
 "primary incompatibility is that this Python license is governed by the laws "
@@ -2170,14 +2952,21 @@
 "las leyes del Estado de Virginia, en los EE.UU., y la GPL no lo permite."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"QPL\" href=\"http://doc.trolltech.com/3.0/license.html\";> Q "
+#| "Public License (QPL), Version 1.0</a>"
 msgid ""
 "<a id=\"QPL\" href=\"http://doc.trolltech.com/3.0/license.html\";> Q Public "
-"License (QPL), Version 1.0</a>"
+"License (QPL), Version 1.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#QPL\">#QPL</a>)</span>"
 msgstr ""
 "<a id=\"QPL\" href=\"http://doc.trolltech.com/3.0/license.html\";>Q Public "
 "License (QPL), Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a non-copyleft free software license which is incompatible with the "
 "GNU GPL.  It also causes major practical inconvenience, because modified "
@@ -2188,6 +2977,7 @@
 "fuentes modificadas sólo pueden distribuírse como parches."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend that you avoid using the QPL for anything that you write, and "
 "use QPL-covered software packages only when absolutely necessary.  However, "
@@ -2200,6 +2990,7 @@
 "GPL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Since the QPL is incompatible with the GNU GPL, you cannot take a GPL-"
 "covered program and QPL-covered program and link them together, no matter "
@@ -2209,6 +3000,7 @@
 "cubierto con la GPL y enlazarlo con uno cubierto con la QPL, no importa como."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "However, if you have written a program that uses QPL-covered library (called "
 "FOO), and you want to release your program under the GNU GPL, you can easily "
@@ -2221,9 +3013,15 @@
 "em> agregando una nota como la siguiente:"
 
 # type: Content of: <dl><dd><pre>
-#, no-wrap
+#. type: Content of: <dl><dd><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "  As a special exception, you have permission to link this program\n"
+#| "  with the FOO library and distribute executables, as long as you\n"
+#| "  follow the requirements of the GNU GPL in regard to all of the\n"
+#| "  software in the executable aside from FOO.\n"
 msgid ""
-"\n"
 "  As a special exception, you have permission to link this program\n"
 "  with the FOO library and distribute executables, as long as you\n"
 "  follow the requirements of the GNU GPL in regard to all of the\n"
@@ -2236,6 +3034,7 @@
 "  software in the executable aside from FOO.\n"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "You can do this, legally, if you are the copyright holder for the program.  "
 "Add it in the source files, after the notice that says the program is "
@@ -2246,14 +3045,21 @@
 "programa está cubierto bajo la GPL de GNU."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"RPSL\" href=\"http://www.opensource.org/licenses/real.php";
-"\">RealNetworks Public Source License (RPSL), Version 1.0</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"RPSL\" href=\"http://www.opensource.org/licenses/real.php";
+#| "\">RealNetworks Public Source License (RPSL), Version 1.0</a>"
+msgid ""
+"<a id=\"RPSL\" href=\"http://www.opensource.org/licenses/real.php\";> "
+"RealNetworks Public Source License (RPSL), Version 1.0</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#RPSL\">#RPSL</a>)</span>"
 msgstr ""
 "<a id=\"RPSL\" href=\"http://www.opensource.org/licenses/real.php";
 "\">RealNetworks Public Source License (RPSL), Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The RPSL is a free software license that is GPL-incompatible for a number of "
 "reasons: it requires that derivative works be licensed under the terms of "
@@ -2265,14 +3071,21 @@
 "Seattle, Washington."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SISSL\" href=\"http://www.openoffice.org/licenses/sissl_license.";
+#| "html\"> Sun Industry Standards Source License 1.0</a>"
 msgid ""
 "<a id=\"SISSL\" href=\"http://www.openoffice.org/licenses/sissl_license.html";
-"\"> Sun Industry Standards Source License 1.0</a>"
+"\"> Sun Industry Standards Source License 1.0</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#SISSL\">#SISSL</a>)</span>"
 msgstr ""
 "<a id=\"SISSL\" href=\"http://www.openoffice.org/licenses/sissl_license.html";
 "\">Sun Industry Standards Source License 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, not a strong copyleft, which is "
 "incompatible with the GNU GPL because of details rather than any major "
@@ -2283,17 +3096,29 @@
 "política relevantes."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SPL\" href=\"http://java.sun.com/spl.html\";>Sun Public License</a>"
 msgid ""
-"<a id=\"SPL\" href=\"http://java.sun.com/spl.html\";>Sun Public License</a>"
+"<a id=\"SPL\" href=\"http://java.sun.com/spl.html\";> Sun Public License</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</span>"
 msgstr ""
 "<a id=\"SPL\" href=\"http://java.sun.com/spl.html\";>Sun Public License</a>"
 
 # type: Content of: <dl><dd><p>
-msgid ""
-"This is essentially the same as the Mozilla Public License: a free software "
-"license incompatible with the GNU GPL.  Please do not confuse this with the "
-"<a href=\"#SunCommunitySourceLicense\">Sun Community Source License</a> "
-"which is not a free software license."
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is essentially the same as the Mozilla Public License: a free "
+#| "software license incompatible with the GNU GPL.  Please do not confuse "
+#| "this with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+#| "License</a> which is not a free software license."
+msgid ""
+"This is essentially the same as the Mozilla Public License version 1: a free "
+"software license incompatible with the GNU GPL.  Please do not confuse this "
+"with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+"License</a>, which is not a free software license."
 msgstr ""
 "Es esencialmente igual que la Mozilla Public License: una licencia de "
 "software libre incompatible con la GPL de GNU. Por favor no la confunda con "
@@ -2301,14 +3126,21 @@
 "que no es una licencia de software libre."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Xinetd_License\"> License of xinetd</a>"
 msgid ""
 "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
-"Xinetd_License\"> License of xinetd</a>"
+"Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#xinetd\">#xinetd</a>)</span>"
 msgstr ""
 "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
 "Xinetd_License\">License of xinetd</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a copyleft free software license, incompatible with the GPL.  It is "
 "incompatible because it places extra restrictions on redistribution of "
@@ -2320,18 +3152,32 @@
 "la distribución de la GPL."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
-"publiclicense-1813.html\"> Yahoo! Public License 1.0</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
+#| "publiclicense-1813.html\"> Yahoo! Public License 1.0</a>"
+msgid ""
+"<a id=\"Yahoo\" href=\"http://www.zimbra.com/license/";
+"yahoo_public_license_1.1.html\"> Yahoo! Public License 1.1</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#Yahoo\">#Yahoo</a>)</span>"
 msgstr ""
 "<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
 "publiclicense-1813.html\">Yahoo! Public License 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  It has a copyleft similar to the one "
+#| "found in the Mozilla Public License.  It also has a choice of law clause "
+#| "in section 7.  These features both make the license GPL-incompatible.  "
+#| "The license also unfortunately uses the term &ldquo;<a href=\"/philosophy/"
+#| "not-ipr.html\">intellectual property</a>&rdquo;."
 msgid ""
 "This is a free software license.  It has a copyleft similar to the one found "
 "in the Mozilla Public License.  It also has a choice of law clause in "
-"section 7.  These features both make the license GPL-incompatible.  The "
+"section&nbsp;7.  These features both make the license GPL-incompatible.  The "
 "license also unfortunately uses the term &ldquo;<a href=\"/philosophy/not-"
 "ipr.html\">intellectual property</a>&rdquo;."
 msgstr ""
@@ -2342,14 +3188,21 @@
 "&lqduo;<a href=\"/philosophy/not-ipr.html\">propiedad intelectual</a>&rdquo;."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zend\" href=\"http://www.zend.com/license/2_00.txt\";> Zend "
+#| "License, Version 2.0</a>"
 msgid ""
 "<a id=\"Zend\" href=\"http://www.zend.com/license/2_00.txt\";> Zend License, "
-"Version 2.0</a>"
+"Version 2.0</a> <span class=\"anchor-reference-id\">(<a href=\"#Zend"
+"\">#Zend</a>)</span>"
 msgstr ""
 "<a id=\"Zend\" href=\"http://www.zend.com/license/2_00.txt\";>Zend License, "
 "Version 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is used by one part of PHP4.  It is a non-copyleft free "
 "software license which is incompatible with the GNU GPL, and has <a href=\"/"
@@ -2362,18 +3215,41 @@
 "original."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "We recommend that you not use this license for anything you write."
 msgstr "Recomendamos no utilice esta licencia para nada de lo que escriba."
 
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-license-";
+"1-3.html\"> Zimbra Public License 1.3</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This license is identical to the <a href=\"#Yahoo\">Yahoo! Public License "
+"1.1</a>, except that the license is provided by VMWare instead of Yahoo!.  "
+"Our comments there apply here as well; this is a GPL-incompatible, partial "
+"copyleft free software license."
+msgstr ""
+
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope\" href=\"http://www.zope.org/Resources/ZPL\";> Zope Public "
+#| "License version 1</a>"
 msgid ""
 "<a id=\"Zope\" href=\"http://www.zope.org/Resources/ZPL\";> Zope Public "
-"License version 1</a>"
+"License version 1</a> <span class=\"anchor-reference-id\"> (<a href=\"#Zope"
+"\">#Zope</a>)</span>"
 msgstr ""
 "<a id=\"Zope\" href=\"http://www.zope.org/Resources/ZPL\";>Zope Public "
 "License version 1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, fairly permissive non-copyleft free software license with "
 "<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
@@ -2386,6 +3262,7 @@
 "la <a href=\"/licenses/gpl.html\">GPL de GNU</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the ZPL version 1 for software you write.  However, "
 "there is no reason to avoid running programs that have been released under "
@@ -2396,6 +3273,7 @@
 "bajo élla, como versiones previas de Zope."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<a href=\"#Zope20\">Version 2.0 of the Zope Public License</a> is GPL-"
 "compatible."
@@ -2403,12 +3281,15 @@
 "<a href=\"#Zope20\">La versión 2.0 of the Zope Public License</a> es "
 "compatible con la GPL."
 
-# type: Content of: <h3>
-msgid "<a id=\"NonFreeSoftwareLicense\">Non-Free Software Licenses</a>"
+#. type: Content of: <h3>
+msgid ""
+"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> Non-"
+"Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
 msgstr ""
-"<a id=\"NonFreeSoftwareLicense\">Licencias que no son de software libre</a>"
 
 # type: Content of: <p>
+#. 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 license is "
@@ -2420,6 +3301,7 @@
 "a>.</strong>"
 
 # type: Content of: <p>
+#. 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."
@@ -2428,6 +3310,7 @@
 "y software privativo en general."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 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 "
@@ -2440,6 +3323,7 @@
 "como de &quot;software libre&quot;, pero de hecho <strong>no lo son</strong> "
 
 # type: Content of: <p>
+#. type: Content of: <p>
 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, "
@@ -2457,11 +3341,14 @@
 "nombrar aquellos programas para los cuales una de estas licencias es "
 "utilizada, al menos que consideremos tener razones específicas de peso."
 
-# type: Content of: <dl><dt>
-msgid "Aladdin Free Public License"
-msgstr "Aladdin Free Public License"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"Aladdin\">Aladdin Free Public License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#Aladdin\">#Aladdin</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Despite its name, this is not a free software license because it does not "
 "allow charging for distribution, and largely prohibits simply packaging "
@@ -2471,15 +3358,16 @@
 "permite cobrar las distribuciones y prohibe empaquetar software bajo élla "
 "con cualquier otro por el cual se cobre un precio."
 
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"apsl1\" href=\"http://www.opensource.apple.com/apsl/1.2.txt\";> Apple "
-"Public Source License (APSL), version 1.x</a>"
+"<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
+"Apple_Public_Source_License_1.2\"> Apple Public Source License (APSL), "
+"version 1.x</a> <span class=\"anchor-reference-id\">(<a href=\"#apsl1"
+"\">#apsl1</a>)</span>"
 msgstr ""
-"<a id=\"apsl1\" href=\"http://www.opensource.apple.com/apsl/1.2.txt\";> Apple "
-"Public Source License (APSL), version 1.x</a>"
 
 # type: Content of: <dl><dd><p>
+#. 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>.  "
@@ -2493,11 +3381,14 @@
 "bajo las mismas  La <a href=\"#apsl2\">version 2.0 de la APSL</a> sí es de "
 "software libre."
 
-# type: Content of: <dl><dt>
-msgid "<a id=\"ArtisticLicense\">Artistic License 1.0</a>"
-msgstr "<a id=\"ArtisticLicense\">Artistic License 1.0</a>"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We cannot say that this is a free software license because it is too vague; "
 "some passages are too clever for their own good, and their meaning is not "
@@ -2510,11 +3401,14 @@
 "exceptuando como parte de la <a href=\"#PerlLicense\">separadora licencia de "
 "Perl</a>."
 
-# type: Content of: <dl><dt>
-msgid "AT&amp;T Public License"
-msgstr "AT&amp;T Public License"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"ATTPublicLicense\">AT&amp;T Public License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#ATTPublicLicense\">#ATTPublicLicense</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The AT&amp;T Public License is a non-free license.  It has several serious "
 "problems:"
@@ -2523,6 +3417,7 @@
 "varios problemas a tener en cuenta:"
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "The patent license is voided by any modification, no matter how small, of "
 "the pertinent code."
@@ -2531,6 +3426,7 @@
 "cuan pequeña sea, del código pertinente."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "You must demand a written agreement when you distribute the sources or "
 "patches."
@@ -2538,15 +3434,18 @@
 "Debe exigir un acuerdo por escrito cuando distribuye copias de los paquetes."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid "It requires notifying AT&amp;T if you distribute a patch."
 msgstr "Requiere que notifique a AT&amp;T si distribuye un parche."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "Your license can be terminated through no fault of yours, under section 8/3."
 msgstr "Su licencia puede finalizarse sin culpa suya, bajo la sección 8/3."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "It makes compliance with export control laws a condition of the license."
 msgstr ""
@@ -2554,10 +3453,12 @@
 "exportaciones."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid "Some versions of the license require you to provide support."
 msgstr "Algunas versiones requieren que preste servicios de apoyo."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "Some versions of the license say you cannot sell a copy of the software for "
 "more than the expense of distribution."
@@ -2566,10 +3467,12 @@
 "mayor que el coste de la distribución."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "The license has two other obnoxious features:"
 msgstr "La licencia posee otras características odiosas:"
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "It has a very broad reverse license to AT&amp;T, which goes far beyond the "
 "use of your code, even your code modified."
@@ -2578,6 +3481,7 @@
 "utilización de su código, incluso el que usted mismo haya modificado."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 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 "
@@ -2591,11 +3495,29 @@
 "todas maneras, nadie debería hacer enlaces a sitios referidos a software que 
"
 "no sea libre). Pero esa afirmación no debería propagarse."
 
-# type: Content of: <dl><dt>
-msgid "eCos Public License, version 1.1"
-msgstr "eCos Public License, version 1.1"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"cpol\">Code Project Open License, version 1.02</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#cpol\">#cpol</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"The Code Project Open License is not a free software license.  Section 5.6 "
+"restricts how you can use the work.  Section 5.4 prohibits commercial "
+"distribution of the software by itself&mdash;and depending on how you read "
+"section 3.4, you may not have permission to distribute the software by "
+"itself at all."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This was the old license of eCos.  It is not a free software license, "
 "because it requires sending every published modified version to a specific "
@@ -2609,6 +3531,7 @@
 "problemáticas."
 
 # type: Content of: <dl><dd><p>
+#. 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."
@@ -2617,16 +3540,24 @@
 "GNU con permisos adicionales para el enlazado con programas privativos."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"GPL-PA\" href=\"http://www.celepar.pr.gov.br/modules/conteudo/";
+#| "conteudo.php?conteudo=69\"> GPL for Computer Programs of the Public "
+#| "Administration</a>"
 msgid ""
 "<a id=\"GPL-PA\" href=\"http://www.celepar.pr.gov.br/modules/conteudo/";
 "conteudo.php?conteudo=69\"> GPL for Computer Programs of the Public "
-"Administration</a>"
+"Administration</a> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
+"\">#GPL-PA</a>)</span>"
 msgstr ""
 "<a id=\"GPL-PA\" href=\"http://www.celepar.pr.gov.br/modules/conteudo/";
 "conteudo.php?conteudo=69\">GPL for Computer Programs of the Public "
 "Administration</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 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;) "
@@ -2637,26 +3568,36 @@
 "es privativa por diversas razones:"
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid "It permits use only in &ldquo;normal circumstances&rdquo;."
 msgstr "Permite su uso sólo en &ldquo;circunstancias normales&rdquo;."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid "It does not allow distribution of source code without binaries."
 msgstr "No permite la distibución del código fuente sin los binarios."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid "Its permissions lapse after 50 years."
 msgstr "Sus permisos expiran a los 50 años."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"HESSLA\" href=\"http://www.hacktivismo.com/about/hessla.php\";> "
+#| "Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)"
 msgid ""
 "<a id=\"HESSLA\" href=\"http://www.hacktivismo.com/about/hessla.php\";> "
-"Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)"
+"Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)  <span "
+"class=\"anchor-reference-id\"> (<a href=\"#HESSLA\">#HESSLA</a>)</span>"
 msgstr ""
 "<a id=\"HESSLA\" href=\"http://www.hacktivismo.com/about/hessla.php";
 "\">Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license, because it <a href=\"/licenses/hessla."
 "html\">restricts what jobs people can use the software for, and restricts in "
@@ -2667,14 +3608,21 @@
 "y también limita lo que se puede realizar con versiones modificadas</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Jahia\" href=\"http://www.jahia.org/jahia/Jahia/pid/145\";> Jahia "
+#| "Community Source License</a>"
 msgid ""
 "<a id=\"Jahia\" href=\"http://www.jahia.org/jahia/Jahia/pid/145\";> Jahia "
-"Community Source License</a>"
+"Community Source License</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#Jahia\">#Jahia</a>)</span>"
 msgstr ""
 "<a id=\"Jahia\" href=\"http://www.jahia.org/jahia/Jahia/pid/145\";>Jahia "
 "Community Source License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Jahia Community Source License is not a free software license.  Use of "
 "the source code is limited to research purposes."
@@ -2683,12 +3631,19 @@
 "suente está limitado a propósitos de investigación."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"JSON\" href=\"http://www.json.org/license.html\";>The JSON "
+#| "License</a>"
 msgid ""
-"<a id=\"JSON\" href=\"http://www.json.org/license.html\";>The JSON License</a>"
+"<a id=\"JSON\" href=\"http://www.json.org/license.html\";> The JSON License</"
+"a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</span>"
 msgstr ""
 "<a id=\"JSON\" href=\"http://www.json.org/license.html\";>The JSON License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the license of the original implementation of the JSON data "
 "interchange format.  This license uses the Expat license as a base, but adds "
@@ -2705,11 +3660,14 @@
 "imposible de hacer cumplir, pero no podemos presumir ésto. Como "
 "consecuencia, esta licencia es privativa."
 
-# type: Content of: <dl><dt>
-msgid "Old license of ksh93"
-msgstr "Old license of ksh93"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"ksh93\">Old license of ksh93</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ksh93\">#ksh93</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "ksh93 used to be shipped with an original license that was not a free "
 "software license.  One reason for this is that it required that all changes "
@@ -2720,6 +3678,7 @@
 "desarrollador."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "ksh93 is now released under the <a href=\"#CommonPublicLicense10\">Common "
 "Public License</a>."
@@ -2728,14 +3687,21 @@
 "Public License</a>."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a href=\"http://packages.debian.org/changelogs/pool/non-free/l/lha/current/";
-"copyright\"> License of Lha</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://packages.debian.org/changelogs/pool/non-free/l/lha/";
+#| "current/copyright\"> License of Lha</a>"
+msgid ""
+"<a id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/l/";
+"lha/current/copyright\"> License of Lha</a> <span class=\"anchor-reference-id"
+"\">(<a href=\"#Lha\">#Lha</a>)</span>"
 msgstr ""
 "<a href=\"http://packages.debian.org/changelogs/pool/non-free/l/lha/current/";
 "copyright\">License of Lha</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The lha license must be considered non-free because it is so vague that you "
 "cannot be sure what permissions you have."
@@ -2744,78 +3710,24 @@
 "no se puede estar seguro que qué permisos otorga."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Ms-SS\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Microsoft_Shared_Source_License\"> Microsoft's Shared Source CLI, C#, and "
+#| "Jscript License</a>"
 msgid ""
-"<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public License "
-"(Ms-LPL)</a>"
-msgstr ""
-"<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public License "
-"(Ms-LPL)</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This license is non-free because of section 3(F), which requires that any "
-"modified software you make from the original code must run on Windows.  The "
-"<a href=\"#ms-pl\">Microsoft Public License</a> does not have this "
-"restriction."
-msgstr ""
-"Esta licencia no es libre debido a la sección 3(F), que requiere que "
-"cualquier software devenido de una modificación del código original debe "
-"ejecutarse en Windows. La <a href=\"#ms-pl\">Microsoft Public License</a> no "
-"posee esta restricción."
-
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited Reciprocal "
-"License (Ms-LRL)</a>"
-msgstr ""
-"<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited Reciprocal "
-"License (Ms-LRL)</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This license is non-free because of section 3(G), which requires that any "
-"modified software you make from the original code must run on Windows.  The "
-"<a href=\"#ms-rl\">Microsoft Reciprocal License</a> does not have this "
-"restriction."
-msgstr ""
-"Esta licencia no es libre debido a la sección 3(G), requiere que cualquier "
-"software devenido de una modificación del código original debe ejecutarse 
en "
-"Windows. La <a href=\"#ms-pl\">Microsoft Reciprocal License</a> no posee "
-"esta restricción."
-
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
-msgstr ""
-"<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This is a non-free license: you are not allowed to modify the software at "
-"all, and you are only allowed to share it under very particular "
-"circumstances."
-msgstr ""
-"Esta es una licencia que no es libre: no se permite moficación alguna del "
-"software y sólo se permite compartir el mismo bajo circunstancias muy "
-"especiales."
-
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Ms-SS\" href=\"http://fedoraproject.org/wiki/Licensing/";
+"<a id=\"Ms-SS\" href= \"http://fedoraproject.org/wiki/Licensing/";
 "Microsoft_Shared_Source_License\"> Microsoft's Shared Source CLI, C#, and "
-"Jscript License</a>"
+"Jscript License</a> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
+"\">#Ms-SS</a>)</span>"
 msgstr ""
 "<a id=\"Ms-SS\" href=\"http://fedoraproject.org/wiki/Licensing/";
 "Microsoft_Shared_Source_License\">Microsoft's Shared Source CLI, C#, and "
 "Jscript License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license does not permit commercial distribution, and only allows "
 "commercial use under certain circumstances."
@@ -2824,6 +3736,7 @@
 "uso para fines lucrativos bajo ciertas circunstancias."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Microsoft has other licenses which it describes as &ldquo;Shared "
 "Source&rdquo;, some of which have different restrictions."
@@ -2831,33 +3744,15 @@
 "Microsoft posee otras licencias que describe como &lqduo;Shared "
 "Source&lqduo;, algunas de las cuales poseen diferentes restricciones."
 
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
-"bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</a>"
-msgstr ""
-"<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
-"bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</a>"
-
-# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dt>
 msgid ""
-"This license is non-free because it places various limitations on the kinds "
-"of modifications you can make.  For example, your modified software must run "
-"on Wince, and you are required to provide end user support for your software."
+"<a id=\"NASA\" href=\"http://www.opensource.org/licenses/nasa1.3\";> NASA "
+"Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#NASA\">#NASA</a>)</span>"
 msgstr ""
-"Esta licencia no es libre porque impone varias limitaciones al tipo de "
-"modificaciones que se pueden hacer.  Por ejemplo, el software modificado "
-"debe correr en Wince y se requiere proveer al usuario final soporte técnico."
-
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/site/";
-"docs/NASA_Open_Source_Agreement_1.3.txt\"> NASA Open Source Agreement</a>"
-msgstr ""
-"<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/site/";
-"docs/NASA_Open_Source_Agreement_1.3.txt\">NASA Open Source Agreement</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The NASA Open Source Agreement, version 1.3, is not a free software license "
 "because it includes a provision requiring changes to be your &ldquo;original "
@@ -2870,6 +3765,7 @@
 "combinar código de terceras partes y la licencia de NASA no lo permite."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use this license.  In addition, if you are a United "
 "States citizen, please write to NASA and call for the use of a truly free "
@@ -2880,16 +3776,25 @@
 "verdadera licencia de software libre."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"OPL\" title=\"Open Public License at Fedora Project wiki\" href="
-"\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";> Open "
-"Public License</a>"
+#.  old id, leave for compatibility 
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OPL\" title=\"Open Public License at Fedora Project wiki\" href="
+#| "\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";> Open "
+#| "Public License</a>"
+msgid ""
+"<a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at "
+"Fedora Project wiki\" href=\"https://fedoraproject.org/wiki/Licensing/";
+"Open_Public_License\"> Open Public License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#OpenPublicL\">#OpenPublicL</a>)</span>"
 msgstr ""
 "<a id=\"OPL\" title=\"Open Public License at Fedora Project wiki\" href="
 "\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";>Open Public "
 "License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license, because it requires sending every "
 "published modified version to a specific initial developer.  There are also "
@@ -2901,11 +3806,14 @@
 "Existen, a su vez, términos es dicha licencia que no estamos seguros acerca "
 "de si pueden ser problemáticos."
 
-# type: Content of: <dl><dt>
-msgid "License of PINE"
-msgstr "Licencia de PINE"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#PINE\">#PINE</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The license of PINE is not a free software license because it mostly "
 "prohibits the distribution of modified versions.  It also restricts the "
@@ -2918,6 +3826,7 @@
 "selling.es.html\">vender copias</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that a successor to Pine, Alpine, is released under the <a href="
 "\"#apache2\">Apache License, version 2.0</a>."
@@ -2925,11 +3834,14 @@
 "Nótese que un sucesor de Pine, Alpine, se encuentra bajo la <a href="
 "\"#apache2\">Apache License, version 2.0</a>."
 
-# type: Content of: <dl><dt>
-msgid "Old Plan 9 license"
-msgstr "Licencia Old Plan 9"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"Plan9\">Old Plan 9 license</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#Plan9\">#Plan9</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license; it lacks essential freedoms such as the "
 "right to make and use private changes.  Of course you should not use this "
@@ -2946,6 +3858,7 @@
 # type: Content of: <dl><dd><p>
 #
 # el tener el 9 dentro de las comillas (for Plan&nbsp;9) parece un error de la 
fuente original en inglés. Lo dejé igual.
+#. type: Content of: <dl><dd><p>
 msgid ""
 "In September 2002 it was observed that the published license for Plan&nbsp;9 "
 "had been modified, adding more restrictions to it, although its date still "
@@ -2958,14 +3871,21 @@
 "posterior en 2003 hizo a Plan&nbsp;9 software libre</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"RPL\" href=\"http://www.opensource.org/licenses/rpl.php\";> "
+#| "Reciprocal Public License</a>"
 msgid ""
 "<a id=\"RPL\" href=\"http://www.opensource.org/licenses/rpl.php\";> "
-"Reciprocal Public License</a>"
+"Reciprocal Public License</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#RPL\">#RPL</a>)</span>"
 msgstr ""
 "<a id=\"RPL\" href=\"http://www.opensource.org/licenses/rpl.php\";>Reciprocal "
 "Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 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."
@@ -2980,15 +3900,23 @@
 "cualquier versión modificada que una organización utilice, incluso si lo "
 "hace en forma privada."
 
-# type: Content of: <dl><dt>
-msgid "Scilab license"
-msgstr "Licencia Scilab"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"#Scilab\">#Scilab</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is not a free software license because it does not allow commercial "
+#| "distribution of a modified version.  Thankfully, recent versions of the "
+#| "Scilab software are free software, released under CeCILL version 2."
 msgid ""
 "This is not a free software license because it does not allow commercial "
 "distribution of a modified version.  Thankfully, recent versions of the "
-"Scilab software are free software, released under CeCILL version 2."
+"Scilab software are free software, released under CeCILL version&nbsp;2."
 msgstr ""
 "Esta no es una licencia de software libre porque no permite la distribución "
 "de versiones modificadas con fines comerciales.  Por suerte, versiones "
@@ -2996,14 +3924,21 @@
 "licencia CeCILL versión 2."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
+#| "Simple Machines License</a>"
 msgid ""
 "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
-"Simple Machines License</a>"
+"Simple Machines License</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#SML\">#SML</a>)</span>"
 msgstr ""
 "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php";
 "\">Simple Machines License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Despite the name, this is a software license, and it's non-free for several "
 "reasons:"
@@ -3012,12 +3947,14 @@
 "razones:"
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid ""
 "You must get the licensor's permission before distributing the software."
 msgstr ""
 "Debe obtenerse permiso del licenciatario antes de distribuir el software."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid ""
 "You <a href=\"/philosophy/selling.html\">cannot sell copies of the software</"
 "a>."
@@ -3026,6 +3963,7 @@
 "software</a>."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid ""
 "It's possible that your license can be terminated if you received the "
 "software from someone who did not obey the license's terms."
@@ -3034,16 +3972,16 @@
 "haberse obtenido la copia de alguien que no cumplió con lo establecido por "
 "la licencia."
 
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";> Squeak license</"
-"a>"
+"<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#Squeak\">#Squeak</a>)</span>"
 msgstr ""
-"<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";>Squeak license</a>"
 
 # type: Content of: <dl><dd><p>
 #
 # No estoy seguro de que sea correcto traducir "fonts" como "fuentes de 
caracteres"
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The original Squeak license, as applied to software, is not a free software "
 "license because it requires all users in whatever country to obey US export "
@@ -3056,6 +3994,7 @@
 "caracteres, no permite tampoco su modificación."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "In addition, it has a requirement for users to indemnify the developer, "
 "which is enough to make many users think twice about using it at all."
@@ -3065,20 +4004,30 @@
 "veces antes de utilizarla en absoluto."
 
 # type: Content of: <dl><dd><p>
-msgid ""
-"Recent versions of Squeak are released under an <a href=\"#Expat\">Expat-"
-"style License</a> with some portions of the code under the <a href="
-"\"#apache2\">Apache License 2.0</a>."
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Recent versions of Squeak are released under an <a href=\"#Expat\">Expat-"
+#| "style License</a> with some portions of the code under the <a href="
+#| "\"#apache2\">Apache License 2.0</a>."
+msgid ""
+"Recent versions of Squeak (from 4.0 on) are released under an <a href="
+"\"#Expat\">Expat-style License</a> with some portions of the code under the "
+"<a href=\"#apache2\">Apache License&nbsp;2.0</a>."
 msgstr ""
 "Versiones recientes de Squeak son lanzadas bajo una <a href=\"#Expat"
 "\">licencia estilo Expat</a> con algunas partes del código puestas bajo la "
 "<a href=\"#apache2\">Apache License 2.0</a>."
 
-# type: Content of: <dl><dt>
-msgid "<a id=\"SunCommunitySourceLicense\"> Sun Community Source License</a>"
-msgstr "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a>"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
+"class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+"\">#SunCommunitySourceLicense</a>)  </span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license; it lacks essential freedoms such as "
 "publication of modified versions.  Please don't use this license, and we "
@@ -3088,11 +4037,15 @@
 "como la de publicar versiones modificadas.  Por favor no utilice esta "
 "licencia y evite cualquier software lanzado bajo la misma."
 
-# type: Content of: <dl><dt>
-msgid "Sun Solaris Source Code (Foundation Release) License, Version 1.1"
-msgstr "Sun Solaris Source Code (Foundation Release) License, Version 1.1"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"SunSolarisSourceCode\"> Sun Solaris Source Code (Foundation Release) "
+"License, Version 1.1</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#SunSolarisSourceCode\">#SunSolarisSourceCode</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license.  The license prohibits redistribution, "
 "prohibits commercial use of the software, and can be revoked."
@@ -3100,15 +4053,36 @@
 "Esta no es una licencia de software libre. Prohibe la redistribución, así "
 "también como el uso comercial del software y puede ser revocada."
 
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"Sybase\"></a> <a id=\"Watcom\" href=\"http://www.opensource.org/";
+"licenses/Watcom-1.0\"> Sybase Open Watcom Public License version 1.0</a> "
+"<span class=\"anchor-reference-id\"> (<a href=\"#Watcom\">#Watcom</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is not a free software license. It requires you to publish the source "
+"code publicly whenever you &ldquo;Deploy&rdquo; the covered software, and "
+"&ldquo;Deploy&rdquo; is defined to include many kinds of private use."
+msgstr ""
+
 # 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>"
 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>"
+"\"> 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>"
 msgstr ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
 "\">SystemC &quot;Open Source&quot; License, Version 3.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
@@ -3124,6 +4098,7 @@
 "\"/philosophy/not-ipr.es.xhtml\">&ldquo;propiedad intelectual&rdquo;</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Despite the name, this license has not been approved as an open source "
 "license as of this writing."
@@ -3132,14 +4107,22 @@
 "abierto al momento en que este documento ha sido escrito."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"UtahPublicLicense\" href=\"http://www.cs.utah.edu/~gk/teem/txt/";
+#| "LICENSE.txt\"> University of Utah Public License</a>"
 msgid ""
 "<a id=\"UtahPublicLicense\" href=\"http://www.cs.utah.edu/~gk/teem/txt/";
-"LICENSE.txt\"> University of Utah Public License</a>"
+"LICENSE.txt\"> University of Utah Public License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#UtahPublicLicense\">#UtahPublicLicense</a>)</"
+"span>"
 msgstr ""
 "<a id=\"UtahPublicLicense\" href=\"http://www.cs.utah.edu/~gk/teem/txt/";
 "LICENSE.txt\">University of Utah Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The University of Utah Public License is a non-free license because it does "
 "not allow commercial redistribution.  It also purports to restrict "
@@ -3157,6 +4140,7 @@
 "mero hecho de afirmar lo que afirman es vergonzoso."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The use of this license by the University of Utah exemplifies a <a href="
 "\"http://www.colorado.edu/Sociology/gimenez/papers/keptu.html\";>dangerous "
@@ -3169,6 +4153,7 @@
 "conocimiento</a> en lugar de contribuir a su esparcimiento público."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If a university tries to impose a license like this on the software you are "
 "writing, don't give up hope.  <a href=\"/philosophy/university.html\">With "
@@ -3181,14 +4166,18 @@
 "posible derrotar a los administradores de universidades avaros.</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "The earlier you raise the issue, the better."
 msgstr "Cuanto más temprano plantee la cuestión, mejor."
 
-# type: Content of: <dl><dt>
-msgid "YaST License"
-msgstr "YaST License"
+#. type: Content of: <dl><dt>
+msgid ""
+"<a id=\"YaST\"> YaST License</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#YaST\">#YaST</a>)</span>"
+msgstr ""
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 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 "
@@ -3201,6 +4190,7 @@
 "la FSF."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "There may be another problem in section 2a, but a word seems to be missing "
 "there, so it is hard to be sure what meaning is really intended."
@@ -3209,6 +4199,7 @@
 "faltar allí, es difícil saber qué es lo que se quiso decir."
 
 # type: Content of: <dl><dd><p>
+#. 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.)"
@@ -3217,14 +4208,19 @@
 "ahora es software libre, publicado bajo la GPL de GNU)."
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "<a id=\"DocumentationLicenses\">Licenses For Documentation</a>"
 msgstr "<a id=\"DocumentationLicenses\">Licencias para documentación</a>"
 
-# type: Content of: <h3>
-msgid "<a id=\"FreeDocumentationLicenses\">Free Documentation Licenses</a>"
-msgstr "<a id=\"NonFreeSoftwareLicense\">Licencias de documentación 
libres</a>"
+#. type: Content of: <h3>
+msgid ""
+"<a id=\"FreeDocumentationLicenses\">Free Documentation Licenses</a> <span "
+"class=\"anchor-reference-id\"> (<a href=\"#FreeDocumentationLicenses"
+"\">#FreeDocumentationLicenses</a>)  </span>"
+msgstr ""
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses qualify as <a href=\"/philosophy/free-doc.html"
 "\">free documentation</a> licenses.</strong>"
@@ -3233,12 +4229,19 @@
 "doc.html\">licencias de documentación libre</a>.</strong>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"FDL\" href=\"/licenses/fdl.html\"> GNU Free Documentation "
+#| "License</a>"
 msgid ""
-"<a id=\"FDL\" href=\"/licenses/fdl.html\"> GNU Free Documentation License</a>"
+"<a id=\"FDL\" href=\"/licenses/fdl.html\"> GNU Free Documentation License</"
+"a> <span class=\"anchor-reference-id\">(<a href=\"#FDL\">#FDL</a>)</span>"
 msgstr ""
 "<a id=\"FDL\" href=\"/licenses/fdl.html\">GNU Free Documentation License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a license intended for use on copylefted free documentation.  We "
 "plan to adopt it for all GNU manuals.  It is also suitable for other kinds "
@@ -3251,10 +4254,17 @@
 "aplicabilidad no se limita a textos (&ldquo;libros&lqduo;)."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ACDL\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Common_Documentation_License\"> Apple's Common Documentation License, "
+#| "Version 1.0</a>"
 msgid ""
 "<a id=\"ACDL\" href=\"http://fedoraproject.org/wiki/Licensing/";
 "Common_Documentation_License\"> Apple's Common Documentation License, "
-"Version 1.0</a>"
+"Version 1.0</a> <span class=\"anchor-reference-id\">(<a href=\"#ACDL"
+"\">#ACDL</a>)</span>"
 msgstr ""
 "<a id=\"ACDL\" href=\"http://fedoraproject.org/wiki/Licensing/";
 "Common_Documentation_License\">Apple's Common Documentation License, Version "
@@ -3262,6 +4272,7 @@
 
 # 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>
 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 "
@@ -3274,14 +4285,21 @@
 "adicionales no encontradon en la Common Documentation License."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"FreeBSDDL\" href=\"http://www.freebsd.org/copyright/freebsd-doc-";
+#| "license.html\"> FreeBSD Documentation License</a>"
 msgid ""
 "<a id=\"FreeBSDDL\" href=\"http://www.freebsd.org/copyright/freebsd-doc-";
-"license.html\"> FreeBSD Documentation License</a>"
+"license.html\"> FreeBSD Documentation License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#FreeBSDDL\">#FreeBSDDL</a>)</span>"
 msgstr ""
 "<a id=\"FreeBSDDL\" href=\"http://www.freebsd.org/copyright/freebsd-doc-";
 "license.html\">FreeBSD Documentation License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free documentation license that is "
 "compatible with the GNU FDL."
@@ -3290,14 +4308,23 @@
 "incompatible con la FDL de GNU."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"RealOPL\" href=\"http://opencontent.org/openpub/\";> Open Publication "
-"License, Version 1.0</a>"
+#.  old id, leave for compatibility 
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"RealOPL\" href=\"http://opencontent.org/openpub/\";> Open "
+#| "Publication License, Version 1.0</a>"
+msgid ""
+"<a id=\"RealOPL\"></a> <a id=\"OpenPublicationL\" href=\"http://opencontent.";
+"org/openpub/\"> Open Publication License, Version 1.0</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#OpenPublicationL\">#OpenPublicationL</"
+"a>)</span>"
 msgstr ""
 "<a id=\"RealOPL\" href=\"http://opencontent.org/openpub/\";>Open Publication "
 "License, Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license <strong>can</strong> be used as a free documentation license.  "
 "It is a copyleft free documentation license <strong>provided</strong> the "
@@ -3314,6 +4341,7 @@
 "cualquiera de los casos, es incompatible con la FDL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 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 "
@@ -3329,6 +4357,7 @@
 "creyendo que está siguiendo sus consejos."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 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 "
@@ -3340,6 +4369,7 @@
 "opciones son un detalle menor; el resultado sería más manuales privativos."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Thus, while manuals published under this license do qualify as free "
 "documentation if neither license option was used, it is better to use the "
@@ -3352,6 +4382,7 @@
 "equivocado."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is not the same as the <a href=\"#OCL\">Open "
 "Content License</a>.  These two licenses are frequently confused, as the "
@@ -3367,14 +4398,15 @@
 "dos. Vale la pena decir el nombre completo de ambas, para asegurarse de que "
 "la gente comprenda lo que se está diciendo."
 
-# type: Content of: <h3>
+#. type: Content of: <h3>
 msgid ""
-"<a id=\"NonFreeDocumentationLicenses\">Non-Free Documentation Licenses</a>"
+"<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</a> "
+"<span class=\"anchor-reference-id\"> (<a href=\"#NonFreeDocumentationLicenses"
+"\">#NonFreeDocumentationLicenses</a>)  </span>"
 msgstr ""
-"<a id=\"NonFreeSoftwareLicense\">Licencias de documentación que no son "
-"libres</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as free documentation "
 "licenses:</strong>"
@@ -3383,14 +4415,22 @@
 "libre:</strong>"
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"OCL\" href=\"http://opencontent.org/opl.shtml\";> Open Content "
-"License, Version 1.0</a>"
+#.  brief id, leave for compatibility 
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OCL\" href=\"http://opencontent.org/opl.shtml\";> Open Content "
+#| "License, Version 1.0</a>"
+msgid ""
+"<a id=\"OCL\"></a> <a id=\"OpenContentL\" href=\"http://opencontent.org/opl.";
+"shtml\"> Open Content License, Version 1.0</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#OpenContentL\">#OpenContentL</a>)</span>"
 msgstr ""
 "<a id=\"OCL\" href=\"http://opencontent.org/opl.shtml\";>Open Content "
 "License, Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license does not qualify as free, because there are restrictions on "
 "charging money for copies.  We recommend you do not use this license."
@@ -3399,6 +4439,7 @@
 "por las copias. Recomendamos no se utilice dicha licencia."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is not the same as the <a href=\"#RealOPL"
 "\">Open Publication License</a>.  The practice of abbreviating &ldquo;Open "
@@ -3415,15 +4456,22 @@
 "comprenda lo que se está diciendo."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OpenDirectory\" href=\"http://dmoz.org/license.html\";> Open "
+#| "Directory License (aka dmoz.org License)</a>"
 msgid ""
 "<a id=\"OpenDirectory\" href=\"http://dmoz.org/license.html\";> Open "
-"Directory License (aka dmoz.org License)</a>"
+"Directory License (aka dmoz.org License)</a> <span class=\"anchor-reference-"
+"id\"> (<a href=\"#OpenDirectory\">#OpenDirectory</a>)</span>"
 msgstr ""
 "<a id=\"OpenDirectory\" href=\"http://dmoz.org/license.html\";>Open Directory "
 "License (aka dmoz.org License)</a>"
 
 # type: Content of: <dl><dd><p>
 # La versión en inglés me resulta poco clara. Asumo que con "site" se 
refiere al sitio web de la organización que emitió la licencia.
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free documentation license.  The primary problems are that "
 "your right to redistribute any given version is not permanent and that it "
@@ -3436,18 +4484,35 @@
 "restrictivo para la libertad del mismo."
 
 # type: Content of: <h2>
-msgid ""
-"<a id=\"OtherLicenses\">Licenses for Works of Practical Use Besides Software "
-"and Documentation</a>"
+#. type: Content of: <h2>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OtherLicenses\">Licenses for Works of Practical Use Besides "
+#| "Software and Documentation</a>"
+msgid ""
+"<a id=\"OtherLicenses\"> Licenses for Works of Practical Use Besides "
+"Software and Documentation</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#OtherLicenses\">#OtherLicenses</a>)</span>"
 msgstr ""
 "<a id=\"OtherLicenses\">Licencias para otros trabajos de uso práctico, más "
 "allá del software y la documentacion</a>"
 
 # type: Content of: <dl><dt>
-msgid "<a href=\"/licenses/gpl.html\"> GNU General Public License</a>"
-msgstr "<a href=\"/licenses/gpl.html\">GNU General Public License</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"GNUGPL\" href=\"/licenses/gpl.html\"> GNU General Public License "
+#| "(GPL) version 3</a>"
+msgid ""
+"<a id=\"GPLOther\" href=\"/licenses/gpl.html\"> GNU General Public License</"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)"
+"</span>"
+msgstr ""
+"<a id=\"GNUGPL\" href=\"/licenses/gpl.html\">GNU General Public License "
+"(GPL) version 3</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The GNU GPL <strong>can</strong> be used for general data which is not "
 "software, as long as one can determine what the definition of &ldquo;source "
@@ -3463,10 +4528,20 @@
 "la GPL."
 
 # type: Content of: <dl><dt>
-msgid "<a href=\"/licenses/fdl.html\"> GNU Free Documentation License</a>"
-msgstr "<a href=\"/licenses/fdl.html\">GNU Free Documentation License</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"FDL\" href=\"/licenses/fdl.html\"> GNU Free Documentation "
+#| "License</a>"
+msgid ""
+"<a id=\"FDLOther\" href=\"/licenses/fdl.html\"> GNU Free Documentation "
+"License</a> <span class=\"anchor-reference-id\"> (<a href=\"#FDLOther"
+"\">#FDLOther</a>)</span>"
+msgstr ""
+"<a id=\"FDL\" href=\"/licenses/fdl.html\">GNU Free Documentation License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The GNU FDL is recommended for textbooks and teaching materials for all "
 "topics.  (&ldquo;Documentation&rdquo; simply means textbooks and other "
@@ -3481,14 +4556,21 @@
 "cualquier otro trabajo que provea información de uso práctico."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
+#| "\"> Creative Commons Attribution 2.0 license</a> (a.k.a. CC-BY)"
 msgid ""
 "<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
-"\"> Creative Commons Attribution 2.0 license</a> (a.k.a. CC-BY)"
+"\"> Creative Commons Attribution 2.0 license</a> (a.k.a. CC&nbsp;BY)  <span "
+"class=\"anchor-reference-id\">(<a href=\"#ccby\">#ccby</a>)</span>"
 msgstr ""
 "<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
 "\">Creative Commons Attribution 2.0 license</a> (a.k.a. CC-BY)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  Please don't use it for software or "
@@ -3501,14 +4583,26 @@
 "como con la FDL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Creative Commons publishes many licenses which are very different.  "
+#| "Therefore, to say that a work &ldquo;uses a Creative Commons "
+#| "license&rdquo; is to leave the principal questions about the work's "
+#| "licensing unanswered.  When you see such a statement in a work, please "
+#| "ask the author to highlight the substance of the license choices.  And if "
+#| "someone proposes to &ldquo;use a Creative Commons license&rdquo; for a "
+#| "certain work, it is vital to ask immediately, &ldquo;Which one?&rdquo;"
 msgid ""
+"<span class=\"anchor-reference-id\">(<a href=\"#\">#which-cc</a>)</span> "
 "Creative Commons publishes many licenses which are very different.  "
 "Therefore, to say that a work &ldquo;uses a Creative Commons license&rdquo; "
 "is to leave the principal questions about the work's licensing unanswered.  "
-"When you see such a statement in a work, please ask the author to highlight "
-"the substance of the license choices.  And if someone proposes to &ldquo;use "
-"a Creative Commons license&rdquo; for a certain work, it is vital to ask "
-"immediately, &ldquo;Which one?&rdquo;"
+"When you see such a statement in a work, please ask the author to change the "
+"work to state clearly and visibly <em>which</em>of the Creative Commons "
+"license it uses.  And if someone proposes to &ldquo;use a Creative Commons "
+"license&rdquo; for a certain work, it is vital to ask &ldquo;Which Creative "
+"Commons license?&rdquo; before proceeding any further."
 msgstr ""
 "Creative Commons publica varias licencias que son muy diferentes.  Por lo "
 "tanto, el decir que un trabajo &lqduo;utiliza una licencia de Creative "
@@ -3520,16 +4614,24 @@
 "particular, es vital preguntar inmediatamente &ldquo;cuál de éllas?&rdquo"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccbysa\" href=\"http://creativecommons.org/licenses/by-sa/2.0/";
+#| "legalcode\"> Creative Commons Attribution-Sharealike 2.0 license</a> (a.k."
+#| "a. CC-BY-SA)"
 msgid ""
 "<a id=\"ccbysa\" href=\"http://creativecommons.org/licenses/by-sa/2.0/";
 "legalcode\"> Creative Commons Attribution-Sharealike 2.0 license</a> (a.k.a. "
-"CC-BY-SA)"
+"CC&nbsp;BY-SA)  <span class=\"anchor-reference-id\"> (<a href=\"#ccbysa"
+"\">#ccbysa</a>)</span>"
 msgstr ""
 "<a id=\"ccbysa\" href=\"http://creativecommons.org/licenses/by-sa/2.0/";
 "legalcode\">Creative Commons Attribution-Sharealike 2.0 license</a> "
 "(conocida como CC-BY-SA)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
 "works, and educational works.  Please don't use it for software or "
@@ -3542,6 +4644,7 @@
 "como con la FDL de GNU."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please <a href=\"#which-cc\">be specific about which Creative Commons "
 "license is being used</a>."
@@ -3550,12 +4653,19 @@
 "Creative Commons está utilizando</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"dsl\" href=\"/licenses/dsl.html\"> Design Science License (DSL)</"
+#| "a>"
 msgid ""
-"<a id=\"dsl\" href=\"/licenses/dsl.html\"> Design Science License (DSL)</a>"
+"<a id=\"dsl\" href=\"/licenses/dsl.html\"> Design Science License (DSL)</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#dsl\">#dsl</a>)</span>"
 msgstr ""
 "<a id=\"dsl\" href=\"/licenses/dsl.html\"> Design Science License (DSL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free and copyleft license meant for general data.  Please don't "
 "use it for software or documentation, since it is incompatible with the GNU "
@@ -3567,15 +4677,22 @@
 "de datos"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"FreeArt\" href=\"http://artlibre.org/licence/lalgb.html\";> Free "
+#| "Art License</a>"
 msgid ""
 "<a id=\"FreeArt\" href=\"http://artlibre.org/licence/lalgb.html\";> Free Art "
-"License</a>"
+"License</a> <span class=\"anchor-reference-id\"> (<a href=\"#FreeArt"
+"\">#FreeArt</a>)</span>"
 msgstr ""
 "<a id=\"FreeArt\" href=\"http://artlibre.org/licence/lalgb.html\";>Free Art "
 "License</a>"
 
 # type: Content of: <dl><dd><p>
 # Otra vez el texto en inglés es poco claro: donde dice "larger work" se 
refiere a "trabajo que la incluya", supongo.
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free and copyleft license meant for artistic works.  It permits "
 "commercial distribution, but any larger work including the copylefted work "
@@ -3588,12 +4705,14 @@
 "documentación, ya que es incompatible con la GPL de GNU tanto como con la "
 "FDL de GNU."
 
-# type: Content of: <h3>
-# Fonts -> Fuentes de Caracteres... no me cierra mucho, pero no se me ocurre 
nada mejor.
-msgid "<a id=\"Fonts\">Licenses for Fonts</a>"
-msgstr "<a id=\"Fonts\">Licencias para fuentes [de caracteres]</a>"
+#. type: Content of: <h3>
+msgid ""
+"<a id=\"Fonts\">Licenses for Fonts</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#Fonts\">#Fonts</a>)</span>"
+msgstr ""
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "The licenses below apply to an instantation of a design in a computer file, "
 "not the artistic design.  As far as we know, an implementation of a design "
@@ -3605,7 +4724,22 @@
 "una implementación de un diseño puede ser sometida al copyright. El estatus 
"
 "legal de el diseño artístico es complejo y varía según la jurisdicción."
 
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"GNUGPL\" href=\"/licenses/gpl.html\"> GNU General Public License "
+#| "(GPL) version 3</a>"
+msgid ""
+"<a id=\"GPLFonts\" href=\"/licenses/gpl.html\"> GNU General Public License</"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)"
+"</span>"
+msgstr ""
+"<a id=\"GNUGPL\" href=\"/licenses/gpl.html\">GNU General Public License "
+"(GPL) version 3</a>"
+
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The GNU GPL <strong>can</strong> be used for fonts.  However, note that it "
 "does not permit embedding the font in a document unless that document is "
@@ -3623,14 +4757,21 @@
 "excepción para fuentes de caracteres de la GPL </a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Arphic\" href=\"http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-";
+#| "truetype/LICENSE\"> Arphic Public License</a>"
 msgid ""
 "<a id=\"Arphic\" href=\"http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-";
-"truetype/LICENSE\"> Arphic Public License</a>"
+"truetype/LICENSE\"> Arphic Public License</a> <span class=\"anchor-reference-"
+"id\"> (<a href=\"#Arphic\">#Arphic</a>)</span>"
 msgstr ""
 "<a id=\"Arphic\" href=\"http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-";
 "truetype/LICENSE\"> Arphic Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a copyleft free software license, incompatible with the GPL. Its "
 "normal use is for fonts, and in that use, the incompatibility does not cause "
@@ -3641,15 +4782,22 @@
 "incompatibilidad no causa dificultades."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SILOFL\" href=\"http://scripts.sil.org/OFL_web\";> SIL Open Font "
+#| "License 1.1</a>"
 msgid ""
 "<a id=\"SILOFL\" href=\"http://scripts.sil.org/OFL_web\";> SIL Open Font "
-"License 1.1</a>"
+"License 1.1</a> <span class=\"anchor-reference-id\"> (<a href=\"#SILOFL"
+"\">#SILOFL</a>)</span>"
 msgstr ""
 "<a id=\"SILOFL\" href=\"http://scripts.sil.org/OFL_web\";> SIL Open Font "
 "License 1.1</a>"
 
 # type: Content of: <dl><dd><p>
 # SIL???
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Open Font License (including its original release, version 1.0)  is a "
 "free copyleft license for fonts.  Its only unusual requirement is that fonts "
@@ -3666,12 +4814,19 @@
 "fuentes de caracteres."
 
 # type: Content of: <h2>
-msgid ""
-"<a id=\"OpinionLicenses\">Licenses for Works of Opinion and Judgment</a>"
+#. type: Content of: <h2>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"OpinionLicenses\">Licenses for Works of Opinion and Judgment</a>"
+msgid ""
+"<a id=\"OpinionLicenses\">Licenses for Works of Opinion and Judgment</a> "
+"<span class=\"anchor-reference-id\"> (<a href=\"#OpinionLicenses"
+"\">#OpinionLicenses</a>)</span>"
 msgstr ""
 "<a id=\"OpinionLicenses\">Licencias para trabajos de opinión y juicio</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Works that express someone's opinion&mdash;memoirs, editorials, and so "
 "on&mdash;serve a fundamentally different purpose than works for practical "
@@ -3693,6 +4848,7 @@
 "discute ésto</a> freqcuentemente en sus disertaciones."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Because so many licenses meet these criteria, we cannot list them all.  If "
 "you are looking for one to use yourself, however, there are two that we "
@@ -3703,37 +4859,63 @@
 "aquí están las dos que le podemos recomendar:"
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"GNUVerbatim\" href=\"/licenses/licenses.html#VerbatimCopying\">GNU "
-"Verbatim Copying License</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"GNUVerbatim\" href=\"/licenses/licenses.html#VerbatimCopying"
+#| "\">GNU Verbatim Copying License</a>"
+msgid ""
+"<a id=\"GNUVerbatim\" href=\"/licenses/licenses.html#VerbatimCopying\"> GNU "
+"Verbatim Copying License</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#GNUVerbatim\">#GNUVerbatim</a>)</span>"
 msgstr ""
 "<a id=\"GNUVerbatim\" href=\"/licenses/licenses.html#VerbatimCopying\">GNU "
 "Verbatim Copying License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the license used throughout the GNU and FSF web sites.  It is "
+#| "very simple, and especially well-suited to written works."
 msgid ""
-"This is the license used throughout the GNU and FSF web sites.  It is very "
-"simple, and especially well-suited to written works."
+"This was the license used throughout the GNU web site for many years.  It is "
+"very simple, and especially well-suited to written works."
 msgstr ""
 "Esta es la licencia utilizada a lo largo y ancho del proyecto GNU y los "
 "sitios web de la FSF.  Es muy simple y especialmente adecuada para escritos."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
+#| "legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-"
+#| "BY-ND)</a>"
 msgid ""
 "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
-"legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-BY-"
-"ND)</a>"
+"legalcode\"> Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. "
+"CC&nbsp;BY-ND)</a> <span class=\"anchor-reference-id\"> (<a href=\"#ccbynd"
+"\">#ccbynd</a>)</span>"
 msgstr ""
 "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
 "legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-BY-"
 "ND)</a>"
 
 # type: Content of: <dl><dd><p>
-msgid ""
-"This license provides much the same permissions as our verbatim copying "
-"license, but it's much more detailed.  We particularly recommend it for "
-"audio and/or video works of opinion.  Please <a href=\"#which-cc\">be "
-"specific about which Creative Commons license is being used</a>."
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license provides much the same permissions as our verbatim copying "
+#| "license, but it's much more detailed.  We particularly recommend it for "
+#| "audio and/or video works of opinion.  Please <a href=\"#which-cc\">be "
+#| "specific about which Creative Commons license is being used</a>."
+msgid ""
+"This is the license used throughout the FSF web site.  This license provides "
+"much the same permissions as our verbatim copying license, but it's much "
+"more detailed.  We particularly recommend it for audio and/or video works of "
+"opinion.  Please <a href=\"#which-cc\">be specific about which Creative "
+"Commons license is being used</a>."
 msgstr ""
 "Esta licencia provee básicamente los mismos permisos que nuestra licencia de 
"
 "copiado textual, pero es mucho más detallada.  La recomendamos especialmente 
"
@@ -3742,6 +4924,7 @@
 "de Creative Commons está utilizando</a>."
 
 # type: Content of: outside any tag (error?)
+#. type: Content of: outside any tag (error?)
 msgid ""
 "<strong><a href=\"/licenses/licenses.html\">More about licenses.</a></strong>"
 msgstr ""
@@ -3750,16 +4933,23 @@
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
+#. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
 # type: Content of: <div><p>
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF.  <br /> Please send broken links and other corrections "
-"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
+#| "contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>."
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF."
 msgstr ""
 "Por favor envíe a la FSF &amp; preguntas acerca de GNU a <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>.  Existen también <a 
href=\"/contact/"
@@ -3767,7 +4957,14 @@
 "enlaces rotos y otras correcciones o sugerencias a <a href=\"mailto:web-";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
+#. type: Content of: <div><p>
+msgid ""
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+msgstr ""
+
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and submitting "
@@ -3777,18 +4974,29 @@
 "de las traducciones</a> para informarse acerca cómo coordinar o enviar "
 "traducciones de este artículo."
 
-# type: Content of: <div><p>
+#. type: Content of: <div><p>
+msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
+#| "legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-"
+#| "BY-ND)</a>"
 msgid ""
-"Copyright &copy; 2010 Free Software Foundation, Inc.  <br /> Verbatim "
-"copying and distribution of this entire article is permitted in any medium "
-"without royalty provided this notice is preserved."
-msgstr ""
-"Copyright &copy; 2010 Free Software Foundation, Inc.  <br /> Verbatim "
-"copying and distribution of this entire article is permitted in any medium "
-"without royalty provided this notice is preserved."
+"This page is licensed under a <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a>."
+msgstr ""
+"<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
+"legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-BY-"
+"ND)</a>"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 "Actualización 2011:Gustavo Martín Domato &lt;gm.domato en el dominio gmail."
@@ -3800,9 +5008,340 @@
 
 # type: Content of: <div><p>
 #.  timestamp start 
+#. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
 
+# type: Content of: <h3>
+#
+# Aclarar el significado de GPL en
+# nota al pié.
+#~ msgid ""
+#~ "<a id=\"GPLCompatibleLicenses\"> GPL-Compatible Free Software Licenses</a>"
+#~ msgstr ""
+#~ "<a id=\"GPLCompatibleLicenses\">Licencias de software libre compatibless "
+#~ "con la GPL</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0"
+#~ "\">Educational Community License 2.0</a>"
+#~ msgstr ""
+#~ "<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0"
+#~ "\">Educational Community License 2.0</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a href=\"http://freetype.fis.uniroma2.it/FTL.TXT\"; id=\"freetype"
+#~ "\">Freetype Project License</a>"
+#~ msgstr ""
+#~ "<a href=\"http://freetype.fis.uniroma2.it/FTL.TXT\"; id=\"freetype"
+#~ "\">Freetype Project License</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid "This is a Free Software license, compatible with the GNU GPL."
+#~ msgstr ""
+#~ "Esta es una licencia de software libre, compatible con la GPL de GNU."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a href=\"http://www.isc.org/software/license\"; id=\"ISC\">ISC License</a>"
+#~ msgstr ""
+#~ "<a href=\"http://www.isc.org/software/license\"; id=\"ISC\">ISC License</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "License of Netscape Javascript"
+#~ msgstr "License of Netscape Javascript"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This disjunctive license is a good choice if you want to make your "
+#~ "package GPL-compatible and MPL-compatible.  However, you can also "
+#~ "accomplish that by using the LGPL or the Guile license."
+#~ msgstr ""
+#~ "Esta licencia disyuntiva es una buena elección si desea hacer su paquete "
+#~ "compatible con la GPL y la MPL. Sin embargo, puede lograr el mismo "
+#~ "propósito utilizando la LGPL o la licencia Guile."
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "Such a disjunctive license might be a good choice if you have been using "
+#~ "the MPL, and want to change to a GPL-compatible license without "
+#~ "subtracting any permission you have given for previous versions."
+#~ msgstr ""
+#~ "Esta licencia disyuntiva puede ser una buena opción si ha estado "
+#~ "utilizando la MPL, y desea cambiar a una compatible con GPL sin quitar "
+#~ "ningún permiso que hay otorgado para las versiones anteriores."
+
+# type: Content of: <dl><dt>
+#~ msgid "<a id=\"PerlLicense\">License of Perl 5 and below</a>"
+#~ msgstr "<a id=\"PerlLicense\">License of Perl 5 and below</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "<a id=\"PublicDomain\">Public Domain</a>"
+#~ msgstr "<a id=\"PublicDomain\">Public Domain</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "License of Python 1.6a2 and earlier versions"
+#~ msgstr "License of Python 1.6a2 y anteriores"
+
+# type: Content of: <h3>
+#~ msgid ""
+#~ "<a id=\"GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
+#~ "Licenses</a>"
+#~ msgstr ""
+#~ "<a id=\"GPLIncompatibleLicenses\">Licencias de software incompatibles con "
+#~ "la GPL</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a href=\"http://ec.europa.eu/idabc/eupl\"; id=\"EUPL\">European Union "
+#~ "Public License (EUPL) version 1.1</a>"
+#~ msgstr ""
+#~ "<a href=\"http://ec.europa.eu/idabc/eupl\"; id=\"EUPL\">European Union "
+#~ "Public License (EUPL) version 1.1</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "The EUPL is compatible with GPLv2, because that is listed as one of the "
+#~ "alternative licenses that recipients may use.  However, it is "
+#~ "incompatible with GPLv3, because recipients are not given permission to "
+#~ "use GPLv3's terms, and the EUPL's copyleft conflicts with GPLv3's.  "
+#~ "Because of this incompatibility, we urge you not to use the EUPL for any "
+#~ "software you write."
+#~ msgstr ""
+#~ "La EUPL es compatible con la GPLv2, al estar listada como una de las "
+#~ "licencias alternativas que los receptores del software pueden utilizar. "
+#~ "Sin embargo, es incompatible con los términos de la GPLv3, porque a "
+#~ "dichos receptores no se les otorga permiso para utilizar los términos de "
+#~ "la GPLv3 y el copyleft de la EUPL entra en conflicto con el de la GPLv3. "
+#~ "Por esta incompatibilidad es que urgimos a que no se utilice la EUPL para "
+#~ "nuevo software."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/";
+#~ "opensource/IPL.html\"> Interbase Public License, Version 1.0</a>"
+#~ msgstr ""
+#~ "<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/";
+#~ "opensource/IPL.html\">Interbase Public License, Version 1.0</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This is a free software license that is essentially the same as the "
+#~ "Mozilla Public License, Version 1.1.  Like the MPL, the IPL has some "
+#~ "complex restrictions that make it incompatible with the GNU GPL.  That "
+#~ "is, a module covered by the GPL and a module covered by the IPL cannot "
+#~ "legally be linked together.  We urge you not to use the IPL for this "
+#~ "reason."
+#~ msgstr ""
+#~ "Esta es una licencia de software libre que es esencialmente igual a la "
+#~ "Mozilla Public License Version 1.1. Como la MPL, la IPL tiene complejas "
+#~ "restricciones que la hacen incompatible con la GPL de GNU. Esto implica "
+#~ "que, un módulo cubierto por la GPL y otro por la IPL no pueden legalmente 
"
+#~ "ser enlazados juntos.  Urgimos a que no se utilice la IPL por esta razón."
+
+# type: Content of: <dl><dt>
+#~ msgid "Old OpenLDAP License, Version 2.3"
+#~ msgstr "Old OpenLDAP License, Version 2.3"
+
+# type: Content of: <h3>
+#~ msgid "<a id=\"NonFreeSoftwareLicense\">Non-Free Software Licenses</a>"
+#~ msgstr ""
+#~ "<a id=\"NonFreeSoftwareLicense\">Licencias que no son de software libre</"
+#~ "a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "Aladdin Free Public License"
+#~ msgstr "Aladdin Free Public License"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"apsl1\" href=\"http://www.opensource.apple.com/apsl/1.2.txt\";> "
+#~ "Apple Public Source License (APSL), version 1.x</a>"
+#~ msgstr ""
+#~ "<a id=\"apsl1\" href=\"http://www.opensource.apple.com/apsl/1.2.txt\";> "
+#~ "Apple Public Source License (APSL), version 1.x</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "<a id=\"ArtisticLicense\">Artistic License 1.0</a>"
+#~ msgstr "<a id=\"ArtisticLicense\">Artistic License 1.0</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "AT&amp;T Public License"
+#~ msgstr "AT&amp;T Public License"
+
+# type: Content of: <dl><dt>
+#~ msgid "eCos Public License, version 1.1"
+#~ msgstr "eCos Public License, version 1.1"
+
+# type: Content of: <dl><dt>
+#~ msgid "Old license of ksh93"
+#~ msgstr "Old license of ksh93"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public "
+#~ "License (Ms-LPL)</a>"
+#~ msgstr ""
+#~ "<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public "
+#~ "License (Ms-LPL)</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This license is non-free because of section 3(F), which requires that any "
+#~ "modified software you make from the original code must run on Windows.  "
+#~ "The <a href=\"#ms-pl\">Microsoft Public License</a> does not have this "
+#~ "restriction."
+#~ msgstr ""
+#~ "Esta licencia no es libre debido a la sección 3(F), que requiere que "
+#~ "cualquier software devenido de una modificación del código original debe 
"
+#~ "ejecutarse en Windows. La <a href=\"#ms-pl\">Microsoft Public License</a> "
+#~ "no posee esta restricción."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited "
+#~ "Reciprocal License (Ms-LRL)</a>"
+#~ msgstr ""
+#~ "<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited "
+#~ "Reciprocal License (Ms-LRL)</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This license is non-free because of section 3(G), which requires that any "
+#~ "modified software you make from the original code must run on Windows.  "
+#~ "The <a href=\"#ms-rl\">Microsoft Reciprocal License</a> does not have "
+#~ "this restriction."
+#~ msgstr ""
+#~ "Esta licencia no es libre debido a la sección 3(G), requiere que "
+#~ "cualquier software devenido de una modificación del código original debe 
"
+#~ "ejecutarse en Windows. La <a href=\"#ms-pl\">Microsoft Reciprocal "
+#~ "License</a> no posee esta restricción."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
+#~ msgstr ""
+#~ "<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This is a non-free license: you are not allowed to modify the software at "
+#~ "all, and you are only allowed to share it under very particular "
+#~ "circumstances."
+#~ msgstr ""
+#~ "Esta es una licencia que no es libre: no se permite moficación alguna del 
"
+#~ "software y sólo se permite compartir el mismo bajo circunstancias muy "
+#~ "especiales."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
+#~ "bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</"
+#~ "a>"
+#~ msgstr ""
+#~ "<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
+#~ "bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</"
+#~ "a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This license is non-free because it places various limitations on the "
+#~ "kinds of modifications you can make.  For example, your modified software "
+#~ "must run on Wince, and you are required to provide end user support for "
+#~ "your software."
+#~ msgstr ""
+#~ "Esta licencia no es libre porque impone varias limitaciones al tipo de "
+#~ "modificaciones que se pueden hacer.  Por ejemplo, el software modificado "
+#~ "debe correr en Wince y se requiere proveer al usuario final soporte "
+#~ "técnico."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/";
+#~ "site/docs/NASA_Open_Source_Agreement_1.3.txt\"> NASA Open Source "
+#~ "Agreement</a>"
+#~ msgstr ""
+#~ "<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/";
+#~ "site/docs/NASA_Open_Source_Agreement_1.3.txt\">NASA Open Source "
+#~ "Agreement</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "License of PINE"
+#~ msgstr "Licencia de PINE"
+
+# type: Content of: <dl><dt>
+#~ msgid "Old Plan 9 license"
+#~ msgstr "Licencia Old Plan 9"
+
+# type: Content of: <dl><dt>
+#~ msgid "Scilab license"
+#~ msgstr "Licencia Scilab"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";> Squeak "
+#~ "license</a>"
+#~ msgstr ""
+#~ "<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";>Squeak "
+#~ "license</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"SunCommunitySourceLicense\"> Sun Community Source License</a>"
+#~ msgstr ""
+#~ "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "Sun Solaris Source Code (Foundation Release) License, Version 1.1"
+#~ msgstr "Sun Solaris Source Code (Foundation Release) License, Version 1.1"
+
+# type: Content of: <dl><dt>
+#~ msgid "YaST License"
+#~ msgstr "YaST License"
+
+# type: Content of: <h3>
+#~ msgid "<a id=\"FreeDocumentationLicenses\">Free Documentation Licenses</a>"
+#~ msgstr ""
+#~ "<a id=\"NonFreeSoftwareLicense\">Licencias de documentación libres</a>"
+
+# type: Content of: <h3>
+#~ msgid ""
+#~ "<a id=\"NonFreeDocumentationLicenses\">Non-Free Documentation Licenses</a>"
+#~ msgstr ""
+#~ "<a id=\"NonFreeSoftwareLicense\">Licencias de documentación que no son "
+#~ "libres</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "<a href=\"/licenses/gpl.html\"> GNU General Public License</a>"
+#~ msgstr "<a href=\"/licenses/gpl.html\">GNU General Public License</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid "<a href=\"/licenses/fdl.html\"> GNU Free Documentation License</a>"
+#~ msgstr "<a href=\"/licenses/fdl.html\">GNU Free Documentation License</a>"
+
+# type: Content of: <h3>
+# Fonts -> Fuentes de Caracteres... no me cierra mucho, pero no se me ocurre 
nada mejor.
+#~ msgid "<a id=\"Fonts\">Licenses for Fonts</a>"
+#~ msgstr "<a id=\"Fonts\">Licencias para fuentes [de caracteres]</a>"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2010 Free Software Foundation, Inc.  <br /> Verbatim "
+#~ "copying and distribution of this entire article is permitted in any "
+#~ "medium without royalty provided this notice is preserved."
+#~ msgstr ""
+#~ "Copyright &copy; 2010 Free Software Foundation, Inc.  <br /> Verbatim "
+#~ "copying and distribution of this entire article is permitted in any "
+#~ "medium without royalty provided this notice is preserved."
+
 # type: Content of: <div><h4>
-msgid "Translations of this page"
-msgstr "Traducciones de esta página"
+#~ msgid "Translations of this page"
+#~ msgstr "Traducciones de esta página"

Index: licenses/po/license-list.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/license-list.fr-en.html 23 Jan 2012 01:36:29 -0000      1.3
+++ licenses/po/license-list.fr-en.html 28 Jan 2012 01:28:16 -0000      1.4
@@ -369,6 +369,27 @@
 compatible with the GNU GPL.  It is very similar to the X11 license.</p></dd>
 
 
+<dt><a id="ecfonts"
+       
href="http://dante.ctan.org/tex-archive/fonts/ec/src/copyrite.txt";>License
+       of the ec fonts for LaTeX</a>
+    <span class="anchor-reference-id">(<a 
href="#ecfonts">#ecfonts</a>)</span></dt>
+<dd>
+<p>This license covers the European Computer Modern Fonts and Text
+Companion Fonts, commonly used with LaTeX.  Depending on how it is
+used, it may be free or not.  If the package says that some fonts in
+the package may not be modified, then the package is nonfree.
+Otherwise the package is free.  The original fonts have no
+restrictions on modification, so they are free.</p>
+
+<p>Much like <a href="#LPPL-1.2">the LaTeX Project Public
+License 1.2</a>, this license requires modified versions of the work
+to use a name that's different from the name of any prior version.
+This is acceptable for work meant to be used with LaTeX, since TeX
+allows you to create filename mappings for your programs, but it's
+very annoying and could be overly burdensome in other contexts.</p>
+</dd>
+
+
 <dt><a id="eCos20"></a>  <!-- without decimal, leave for compatibility -->
     <a id="eCos2.0" href="/licenses/ecos-license.html">
     eCos license version 2.0</a>
@@ -2189,7 +2210,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/01/23 01:36:29 $
+$Date: 2012/01/28 01:28:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- licenses/po/license-list.fr.po      27 Jan 2012 22:40:13 -0000      1.108
+++ licenses/po/license-list.fr.po      28 Jan 2012 01:28:16 -0000      1.109
@@ -13,11 +13,10 @@
 "PO-Revision-Date: 2012-01-26 09:31+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-01-23 20:25-0500\n"
+"Language: fr\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -385,13 +384,13 @@
 msgid ""
 "<a id=\"AGPL\"></a> <a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\"> GNU "
 "Affero General Public License (AGPL) version 3</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#AGPL\">#AGPL</a>)  (<a href="
-"\"#AGPLv3.0\">#AGPLv3.0</a>)</span>"
+"reference-id\"> (<a href=\"#AGPL\">#AGPL</a>)  (<a href=\"#AGPLv3.0"
+"\">#AGPLv3.0</a>)</span>"
 msgstr ""
 "<a id=\"AGPL\"></a> <a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\"> GNU "
 "Affero General Public License (AGPL) version&nbsp;3</a> [EN] <span class="
-"\"anchor-reference-id\"> (<a href=\"#AGPL\">#AGPL</a>)  (<a href="
-"\"#AGPLv3.0\">#AGPLv3.0</a>)</span>"
+"\"anchor-reference-id\"> (<a href=\"#AGPL\">#AGPL</a>)  (<a href=\"#AGPLv3.0"
+"\">#AGPLv3.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -545,13 +544,13 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\"> Modified BSD license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\"> Modified BSD license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
 msgstr ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\"> Licence BSD modifiée</a> [EN] <span class=\"anchor-reference-id\"> 
"
-"(<a href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\"> Licence BSD modifiée</a> [EN] <span class=\"anchor-reference-id\"> (<a "
+"href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -598,12 +597,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CC0\" href=\"http://creativecommons.org/publicdomain/zero/1.0/";
-"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#CC0\">#CC0</a>)</span>"
+"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href=\"#CC0"
+"\">#CC0</a>)</span>"
 msgstr ""
 "<a id=\"CC0\" href=\"http://creativecommons.org/publicdomain/zero/1.0/";
-"legalcode\"> CC0</a> [EN] <span class=\"anchor-reference-id\">(<a href="
-"\"#CC0\">#CC0</a>)</span>"
+"legalcode\"> CC0</a> [EN] <span class=\"anchor-reference-id\">(<a href=\"#CC0"
+"\">#CC0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -658,12 +657,11 @@
 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=\"/"
-"philosophy/not-ipr.xhtml\">cet article</a>) et «&nbsp;"
-"protection&nbsp;» (voir <a href=\"/philosophy/words-to-avoid.html\">cet "
-"autre article</a>)&nbsp;; cette décision a été malheureuse, car la lecture 
"
-"de la licence tend à répandre les présupposés associés à ces termes. "
-"Cependant, cela ne pose pas de problème particulier pour les programmes sous 
"
-"licence CeCILL."
+"philosophy/not-ipr.xhtml\">cet article</a>) et «&nbsp;protection&nbsp;» 
(voir "
+"<a href=\"/philosophy/words-to-avoid.html\">cet autre article</a>)&nbsp;; "
+"cette décision a été malheureuse, car la lecture de la licence tend à "
+"répandre les présupposés associés à ces termes. Cependant, cela ne pose 
pas "
+"de problème particulier pour les programmes sous licence CeCILL."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -726,12 +724,6 @@
 "Il s'agit d'une licence de logiciel libre simple et permissive, sans "
 "copyleft, compatible avec la GNU GPL. Très semblable à la licence X11."
 
-# | <a [-id=\"Vim\" href=\"http://www.gnu.org/licenses/vim-license.txt\";>
-# | License-] {+id=\"ecfonts\"
-# | 
href=\"http://dante.ctan.org/tex-archive/fonts/ec/src/copyrite.txt\";>License+}
-# | of [-Vim, Version 6.1 or later</a>-] {+the ec fonts for LaTeX</a>+} <span
-# | class=\"anchor-reference-id\">(<a [-href=\"#Vim\">#Vim</a>)</span>-]
-# | {+href=\"#ecfonts\">#ecfonts</a>)</span>+}
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ecfonts\" href=\"http://dante.ctan.org/tex-archive/fonts/ec/src/";
@@ -907,9 +899,9 @@
 msgstr ""
 "Si vous voulez une licence de logiciel libre, permissive, simple, sans "
 "copyleft, la licence FreeBSD est un choix raisonnable. Cependant, veuillez "
-"ne pas l'appeler «&nbsp;licence BSD&nbsp;» ou «&nbsp;de style BSD&nbsp;», 
"
-"car cela causera sans doute une confusion qui pourrait amener à utiliser la "
-"<a href=\"#OriginalBSD\">licence BSD <em>originelle</em></a>."
+"ne pas l'appeler «&nbsp;licence BSD&nbsp;» ou «&nbsp;de style BSD&nbsp;», 
car "
+"cela causera sans doute une confusion qui pourrait amener à utiliser la <a "
+"href=\"#OriginalBSD\">licence BSD <em>originelle</em></a>."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1579,12 +1571,12 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\"> X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\"> X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
 "\"#X11License\">#X11License</a>)</span>"
 msgstr ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\"> Licence X11</a> [EN] <span class=\"anchor-reference-id\"> (<a href="
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\"> Licence X11</a> [EN] <span class=\"anchor-reference-id\"> (<a href="
 "\"#X11License\">#X11License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
@@ -1844,13 +1836,13 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\"> Original BSD license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#OriginalBSD\">#OriginalBSD</a>)</span>"
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\"> Original BSD license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#OriginalBSD\">#OriginalBSD</a>)</span>"
 msgstr ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\"> Licence BSD d'origine</a> [EN] <span class=\"anchor-reference-id"
-"\"> (<a href=\"#OriginalBSD\">#OriginalBSD</a>)</span>"
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\"> Licence BSD d'origine</a> [EN] <span class=\"anchor-reference-id\"> (<a "
+"href=\"#OriginalBSD\">#OriginalBSD</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1859,8 +1851,8 @@
 "&ldquo;4-clause BSD license&rdquo;.)"
 msgstr ""
 "(Note&nbsp;: dans la page référencée ci-dessus, la licence en question "
-"figure au paragraphe «&nbsp;UCB/LBL&nbsp;». Cette licence est parfois "
-"appelée «&nbsp;Licence BSD à quatre clauses&nbsp;»)."
+"figure au paragraphe «&nbsp;UCB/LBL&nbsp;». Cette licence est parfois 
appelée "
+"«&nbsp;Licence BSD à quatre clauses&nbsp;»)."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2015,18 +2007,18 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"The Eclipse Public License is similar to the <a href="
-"\"#CommonPublicLicense10\">Common Public License</a>, and our comments on "
-"the CPL apply equally to the EPL.  The only change is that the EPL removes "
-"the broader patent retaliation language regarding patent infringement suits "
-"specifically against Contributors to the EPL'd program."
-msgstr ""
-"L'Eclipse Public License est similaire à la <a href="
-"\"#CommonPublicLicense10\">Common Public License</a>, et nos commentaires "
-"sur la CPL s'appliquent également à l'EPL. La seule différence est que 
l'EPL "
-"supprime la formulation plus générale des représailles faisant usage de "
-"brevets en cas de poursuites pour violation de brevet engagées "
-"spécifiquement contre les contributeurs du programme qu'on place sous EPL."
+"The Eclipse Public License is similar to the <a href=\"#CommonPublicLicense10"
+"\">Common Public License</a>, and our comments on the CPL apply equally to "
+"the EPL.  The only change is that the EPL removes the broader patent "
+"retaliation language regarding patent infringement suits specifically "
+"against Contributors to the EPL'd program."
+msgstr ""
+"L'Eclipse Public License est similaire à la <a href=\"#CommonPublicLicense10"
+"\">Common Public License</a>, et nos commentaires sur la CPL s'appliquent "
+"également à l'EPL. La seule différence est que l'EPL supprime la 
formulation "
+"plus générale des représailles faisant usage de brevets en cas de 
poursuites "
+"pour violation de brevet engagées spécifiquement contre les contributeurs 
du "
+"programme qu'on place sous EPL."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -2034,8 +2026,8 @@
 "License (EUPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a href="
 "\"#EUPL\">#EUPL</a>)</span>"
 msgstr ""
-"<a href=\"http://joinup.ec.europa.eu/system/files/FR/EUPL%20v.1.1%20-";
-"%20Licence.pdf\"> Licence publique de l'Union européenne (EUPL), "
+"<a href=\"http://joinup.ec.europa.eu/system/files/FR/EUPL%20v.1.1%20-%";
+"20Licence.pdf\"> Licence publique de l'Union européenne (EUPL), "
 "version&nbsp;1.1</a> <span class=\"anchor-reference-id\">(<a href=\"#EUPL"
 "\">#EUPL</a>)</span>"
 
@@ -2609,10 +2601,9 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-"python1.6_9-5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</a>)"
-"</span>"
+"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/python1.6_9-";
+"5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</a>)</span>"
 msgstr ""
 "<a name=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
 "python1.6_9-5-00.html\">Licence de Python, versions 1.6b1 à 2.0, et 2.1</a> "
@@ -2812,8 +2803,8 @@
 "C'est une licence de logiciel libre. Elle a un copyleft similaire à celui de 
"
 "la Mozilla Public License. De plus, elle a une assortiment de clauses "
 "juridiques dans la section&nbsp;7. Ces deux raisons la rendent incompatible "
-"avec la GPL. La licence utilise aussi malheureusement le terme «&nbsp;<a "
-"href=\"/philosophy/not-ipr.html\">propriété intellectuelle</a>&nbsp;»."
+"avec la GPL. La licence utilise aussi malheureusement le terme «&nbsp;<a 
href="
+"\"/philosophy/not-ipr.html\">propriété intellectuelle</a>&nbsp;»."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -2845,12 +2836,12 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-";
-"license-1-3.html\"> Zimbra Public License 1.3</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
+"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-license-";
+"1-3.html\"> Zimbra Public License 1.3</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
 msgstr ""
-"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-";
-"license-1-3.html\"> Zimbra Public License 1.3</a> [EN] <span class=\"anchor-"
+"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-license-";
+"1-3.html\"> Zimbra Public License 1.3</a> [EN] <span class=\"anchor-"
 "reference-id\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
@@ -2991,8 +2982,8 @@
 msgid ""
 "<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
 "Apple_Public_Source_License_1.2\"> Apple Public Source License (APSL), "
-"version 1.x</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#apsl1\">#apsl1</a>)</span>"
+"version 1.x</a> <span class=\"anchor-reference-id\">(<a href=\"#apsl1"
+"\">#apsl1</a>)</span>"
 msgstr ""
 "<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
 "Apple_Public_Source_License_1.2\"> Apple Public Source License (APSL), "
@@ -3301,8 +3292,8 @@
 "ksh93 is now released under the <a href=\"#CommonPublicLicense10\">Common "
 "Public License</a>."
 msgstr ""
-"ksh93 est maintenant publié sous la <a href="
-"\"#CommonPublicLicense10\">Common Public License</a>."
+"ksh93 est maintenant publié sous la <a href=\"#CommonPublicLicense10"
+"\">Common Public License</a>."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -3678,8 +3669,8 @@
 "donneur de licence à faire respecter sa marque déposée. Ce n'est pas une "
 "condition raisonnable à placer sur les droits des utilisateurs, donc cette "
 "licence n'est pas libre. Il y a aussi d'autres problèmes pratiques&nbsp;: "
-"certaines des exigences sont vagues, et la licence utilise le terme «&nbsp;"
-"<a href=\"/philosophy/not-ipr.xhtml\">propriété intellectuelle</a>&nbsp;»."
+"certaines des exigences sont vagues, et la licence utilise le terme 
«&nbsp;<a "
+"href=\"/philosophy/not-ipr.xhtml\">propriété intellectuelle</a>&nbsp;»."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3910,11 +3901,11 @@
 "advice."
 msgstr ""
 "Dans la pratique, utiliser ou recommander cette licence représente un 
piège. "
-"Si vous formulez ainsi votre recommandation&nbsp;: «&nbsp;Utilisez la "
-"licence Open Publication, version&nbsp;1.0, mais pas les options&nbsp;», la "
-"deuxième partie risque fort de tomber aux oubliettes&nbsp;; votre "
-"interlocuteur va utiliser la licence avec ses options, publiera un manuel "
-"non libre, et pensera qu'il ou elle a suivi votre conseil."
+"Si vous formulez ainsi votre recommandation&nbsp;: «&nbsp;Utilisez la 
licence "
+"Open Publication, version&nbsp;1.0, mais pas les options&nbsp;», la 
deuxième "
+"partie risque fort de tomber aux oubliettes&nbsp;; votre interlocuteur va "
+"utiliser la licence avec ses options, publiera un manuel non libre, et "
+"pensera qu'il ou elle a suivi votre conseil."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -4354,9 +4345,9 @@
 "\"#GNUVerbatim\">#GNUVerbatim</a>)</span>"
 msgstr ""
 "<a id=\"GNUVerbatim\" href=\"/licenses/licenses.html#VerbatimCopying\"> "
-"Licence GNU «&nbsp;copie et distribution conformes (verbatim)&nbsp;»</a> "
-"[EN] <span class=\"anchor-reference-id\"> (<a href=\"#GNUVerbatim"
-"\">#GNUVerbatim</a>)</span>"
+"Licence GNU «&nbsp;copie et distribution conformes (verbatim)&nbsp;»</a> 
[EN] "
+"<span class=\"anchor-reference-id\"> (<a href=\"#GNUVerbatim\">#GNUVerbatim</"
+"a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""

Index: licenses/po/quick-guide-gplv3.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/quick-guide-gplv3.fr-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/quick-guide-gplv3.fr-en.html    23 Jan 2012 01:36:30 -0000      
1.3
+++ licenses/po/quick-guide-gplv3.fr-en.html    28 Jan 2012 01:28:17 -0000      
1.4
@@ -60,7 +60,7 @@
 <li>Laws prohibiting free software: Legislation like the Digital Millennium
 Copyright Act and the European Union Copyright Directive make it a crime
 to write or share software that can break DRM (Digital Restrictions
-Mismanagement; see 
+Management; see 
 <a 
href="#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">below</a>).
  These laws should not
 interfere with the rights the GPL grants you.</li>
 <li>Discriminatory patent deals: Microsoft has recently started
@@ -82,7 +82,7 @@
 <div class="section" 
id="neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">
 <h3>Neutralizing Laws That Prohibit Free Software &mdash; But Not
 Forbidding DRM</h3>
-<p>You're probably familiar with the Digital Restrictions Mismanagement
+<p>You're probably familiar with the Digital Restrictions Management
 (DRM) on
 DVDs and other media.  You're probably also familiar with the laws that
 make it illegal to write your own tools to bypass those restrictions, like
@@ -324,7 +324,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/01/23 01:36:30 $
+$Date: 2012/01/28 01:28:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/quick-guide-gplv3.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/quick-guide-gplv3.fr.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- licenses/po/quick-guide-gplv3.fr.po 27 Jan 2012 22:40:13 -0000      1.17
+++ licenses/po/quick-guide-gplv3.fr.po 28 Jan 2012 01:28:17 -0000      1.18
@@ -12,11 +12,10 @@
 "PO-Revision-Date: 2012-01-26 09:01+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-01-24 12:25-0500\n"
+"Language: fr\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -119,9 +118,9 @@
 "appelons cela <i>copyleft</i> : le logiciel est bien soumis au droit "
 "d'auteur, mais plutôt que d'utiliser ces droits pour restreindre "
 "l'utilisation que peuvent en faire les utilisateurs (comme c'est le cas dans "
-"les logiciels privateurs<a id=\"TransNote1-rev\" href="
-"\"#TransNote1\"><sup>1</sup></a>), nous les utilisons pour nous assurer que "
-"tous les utilisateurs auront ces libertés."
+"les logiciels privateurs<a id=\"TransNote1-rev\" href=\"#TransNote1"
+"\"><sup>1</sup></a>), nous les utilisons pour nous assurer que tous les "
+"utilisateurs auront ces libertés."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -142,21 +141,15 @@
 "control what it does.  When a device thwarts you from doing that, we call "
 "that tivoization."
 msgstr ""
-"La «&nbsp;tivoïsation&nbsp;»&nbsp;: Certaines entreprises ont créé "
-"différents types d'équipements qui font tourner des logiciels sous licence "
-"GPL, et ont ensuite bidouillé le matériel pour qu'elles puissent modifier "
-"les logiciels mais que vous ne puissiez pas le faire. Si un équipement peut "
-"faire tourner n'importe quel logiciel, cet équipement est un ordinateur "
-"multi-usage. Dès lors, son propriétaire devrait pouvoir contrôler ce que "
-"fait cet équipement. Quand un équipement vous empêche de faire cela, nous "
-"appelons cela la tivoïsation."
-
-# | Laws prohibiting free software: Legislation like the Digital Millennium
-# | Copyright Act and the European Union Copyright Directive make it a crime
-# | to write or share software that can break DRM (Digital Restrictions
-# | [-Mismanagement;-] {+Management;+} see <a
-# | 
href=\"#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm\">below</a>).
-# |  These laws should not interfere with the rights the GPL grants you.
+"La «&nbsp;tivoïsation&nbsp;»&nbsp;: Certaines entreprises ont créé 
différents "
+"types d'équipements qui font tourner des logiciels sous licence GPL, et ont "
+"ensuite bidouillé le matériel pour qu'elles puissent modifier les logiciels 
"
+"mais que vous ne puissiez pas le faire. Si un équipement peut faire tourner "
+"n'importe quel logiciel, cet équipement est un ordinateur multi-usage. Dès "
+"lors, son propriétaire devrait pouvoir contrôler ce que fait cet 
équipement. "
+"Quand un équipement vous empêche de faire cela, nous appelons cela la "
+"tivoïsation."
+
 #. type: Content of: <div><ul><li>
 msgid ""
 "Laws prohibiting free software: Legislation like the Digital Millennium "
@@ -219,12 +212,6 @@
 msgstr ""
 "Neutraliser les lois prohibant les logiciels libres, sans interdire les DRM"
 
-# | You're probably familiar with the Digital Restrictions [-Mismanagement-]
-# | {+Management+} (DRM) on DVDs and other media.  You're probably also
-# | familiar with the laws that make it illegal to write your own tools to
-# | bypass those restrictions, like the Digital Millennium Copyright Act and
-# | the European Union Copyright Directive.  Nobody should be able to stop you
-# | from writing any code that you want, and GPLv3 protects this right for you.
 #. type: Content of: <div><p>
 msgid ""
 "You're probably familiar with the Digital Restrictions Management (DRM) on "
@@ -626,10 +613,10 @@
 msgstr ""
 "La GPLv3 utilise un nouveau terme, «&nbsp;transfert&nbsp;» <i>[to convey]</"
 "i>, et en fournit une définition. Ce «&nbsp;transfert&nbsp;» a le même 
sens "
-"que nous souhaitions donner à «&nbsp;distribution&nbsp;», mais maintenant "
-"que le terme est directement défini dans la licence, il sera dorénavant "
-"facile aux gens où qu'ils soient de comprendre ce que nous voulions dire. Il 
"
-"y a par ailleurs quelques autres modifications mineures disséminées dans la 
"
+"que nous souhaitions donner à «&nbsp;distribution&nbsp;», mais maintenant 
que "
+"le terme est directement défini dans la licence, il sera dorénavant facile "
+"aux gens où qu'ils soient de comprendre ce que nous voulions dire. Il y a "
+"par ailleurs quelques autres modifications mineures disséminées dans la "
 "licence qui vont aussi aider à garantir que l'application soit la même "
 "partout de par le monde."
 

Index: licenses/po/translations.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/translations.fr-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/translations.fr-en.html 25 Jan 2012 17:26:53 -0000      1.3
+++ licenses/po/translations.fr-en.html 28 Jan 2012 01:28:17 -0000      1.4
@@ -243,9 +243,6 @@
   <li><code>[zh-tw]</code> <!-- RT #715288 -->
   <a href="http://www.chinasona.org/gnu/gnulgpl-v3-tc.html";>
   Chinese (Traditional)</a> translation of the LGPL</li>
-  <li><code>[cs]</code> <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/lgpl-3.cs.shtml";>Czech</a>
-  translation of the LGPL</li>
 <!-- TODO: the page should say it is CC-BY-ND -->
   <li><code>[de]</code> <a href="http://www.gnu.de/documents/lgpl-3.0.de.html";>
   German</a> translation of the LGPL</li>
@@ -259,14 +256,15 @@
 -->
   <li><code>[fa]</code> <a 
href="http://www.kaveh.org/gnu/lgplv3-fa.html";>Persian
   (Farsi)</a> translation of the LGPL</li>
-  <li><code>[sk]</code> <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/lgpl-3.sk.shtml";>Slovak</a>
-  translation of the LGPL</li>
 <!-- links to hosting site
   <li><code>[es]</code> <a 
href="http://www.viti.es/gnu/licenses/lgpl.html";>Spanish</a>
   translation of the LGPL</li>
 -->
 </ul>
+<p>We hope someone will write new unofficial translations in Czech and 
+Slovak. Some were made, but the translator used them to advertise a 
+commercial site, so we are not willing to link to them.</p>
+<!-- RT #716430 -->
 
 <h4>Translations Underway</h4>
 <p>The following translation efforts are underway, please contact the
@@ -312,9 +310,6 @@
   <li><code>[zh-tw]</code> <!-- RT #715288 -->
   <a href="http://www.chinasona.org/gnu/gnufdl-v13-tc.html";>
   Chinese (Traditional)</a> translation of the GFDL</li>
-  <li><code>[cs]</code> <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/fdl-1.3.cs.shtml";>Czech</a>
-  translation of the GFDL</li>
 <!-- TODO: the page should say it is CC-BY-ND -->
   <li><code>[it]</code>
   <a href="http://home.gna.org/www-it/fdl/1.3/fdl.it.html";>
@@ -325,13 +320,14 @@
   <li><code>[ml]</code> <a href="http://ml.wikipedia.org/wiki/WP:GFDL-ml";>
   Malayalam</a> translation of the GFDL</li>
 -->
-  <li><code>[sk]</code> <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/fdl-1.3.sk.shtml";>Slovak</a>
-  translation of the GFDL</li>
 <!-- TODO: the page should say it is CC-BY-ND -->
   <li><code>[es]</code> <a href="http://docs.danexlandia.com.mx/gfdl_es.html";>
   Spanish</a> translation of the GFDL</li>
 </ul>
+<p>We hope someone will write new unofficial translations in Czech and 
+Slovak. Some were made, but the translator used them to advertise a 
+commercial site, so we are not willing to link to them.</p>
+<!-- RT #716430 -->
 
 <h4>Translations Underway</h4>
 
@@ -365,24 +361,17 @@
   <li><code>[zh-tw]</code> <!-- RT #715288 -->
   <a href="http://www.chinasona.org/gnu/gnu-gcc.html";>
   Chinese (Traditional)</a> translation of the GCC RLE 3</li>
-  <li><code>[cs]</code>  <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/gcc-rtle-3.1.cs.shtml";>Czech</a>
-  translation of the GCC RLE 3.1</li>
-  <li><code>[sk]</code> <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/gcc-rtle-3.1.sk.shtml";>Slovak</a>
-  translation of the GCC RLE 3.1</li>
 </ul>
+<p>We hope someone will write new unofficial translations in Czech and 
+Slovak. Some were made, but the translator used them to advertise a 
+commercial site, so we are not willing to link to them.</p>
+<!-- RT #716430 -->
 
 <h4>GNU Autoconf Configure Script Exception, version 3</h4>
-
-<ul>
-  <li><code>[cs]</code> <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/autoconf-cse-3.cs.shtml";>Czech</a>
-  translation of the GNU Autoconf CSE</li>
-  <li><code>[sk]</code> <!-- RT #716430 -->
-  <a href="http://jxself.org/translations/autoconf-cse-3.sk.shtml";>Slovak</a>
-  translation of the GNU Autoconf CSE</li>
-</ul>
+<p>We hope someone will write new unofficial translations in Czech and 
+Slovak. Some were made, but the translator used them to advertise a 
+commercial site, so we are not willing to link to them.</p>
+<!-- RT #716430 -->
 
 </div>
 <!--#include virtual="/server/footer.html" -->
@@ -414,7 +403,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/01/25 17:26:53 $
+$Date: 2012/01/28 01:28:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/translations.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.fr.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- licenses/po/translations.fr.po      27 Jan 2012 22:40:13 -0000      1.84
+++ licenses/po/translations.fr.po      28 Jan 2012 01:28:17 -0000      1.85
@@ -11,11 +11,10 @@
 "PO-Revision-Date: 2012-01-27 20:52+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-01-26 04:25-0500\n"
+"Language: fr\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -160,8 +159,8 @@
 msgstr ""
 "Pour spécifier que votre traduction n'est pas officielle, veuillez ajoutez "
 "le texte suivant au début, à la fois en anglais et dans la langue de la "
-"traduction. Remplacez <em>language</em> par le nom de cette langue, et "
-"«&nbsp;GNU General Public License&nbsp;» et «&nbsp;GPL&nbsp;» par le nom 
et "
+"traduction. Remplacez <em>language</em> par le nom de cette langue, et 
«&nbsp;"
+"GNU General Public License&nbsp;» et «&nbsp;GPL&nbsp;» par le nom et "
 "l'abréviation de la licence que vous traduisez, s'il ne s'agit pas de la "
 "GPL&nbsp;:"
 
@@ -234,8 +233,8 @@
 "<code>[cs]</code> <a href=\"http://jxself.org/translations/gpl-3.cz.shtml";
 "\">Czech</a> translation of the GPL"
 msgstr ""
-"<code>[cs]</code> Traduction en <a href=\"http://jxself.org/translations/";
-"gpl-3.cz.shtml\">tchèque</a> de la GPL"
+"<code>[cs]</code> Traduction en <a href=\"http://jxself.org/translations/gpl-";
+"3.cz.shtml\">tchèque</a> de la GPL"
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -328,8 +327,8 @@
 "<code>[sk]</code> <a href=\"http://jxself.org/translations/gpl-3.sk.shtml";
 "\">Slovak</a> translation of the GPL"
 msgstr ""
-"<code>[sk]</code> Traduction en <a href=\"http://jxself.org/translations/";
-"gpl-3.sk.shtml\">slovaque</a> de la GPL"
+"<code>[sk]</code> Traduction en <a href=\"http://jxself.org/translations/gpl-";
+"3.sk.shtml\">slovaque</a> de la GPL"
 
 #. type: Content of: <h3>
 msgid "The GNU Lesser General Public License, version 3"
@@ -370,8 +369,8 @@
 "<code>[de]</code> <a href=\"http://www.gnu.de/documents/lgpl-3.0.de.html\";> "
 "German</a> translation of the LGPL"
 msgstr ""
-"<code>[de]</code> Traduction en <a href=\"http://www.gnu.de/documents/";
-"lgpl-3.0.de.html\">allemand</a> de la LGPL"
+"<code>[de]</code> Traduction en <a href=\"http://www.gnu.de/documents/lgpl-";
+"3.0.de.html\">allemand</a> de la LGPL"
 
 #. type: Content of: <ul><li>
 msgid ""

Index: philosophy/copyright-versus-community.fr.html
===================================================================
RCS file: /web/www/www/philosophy/copyright-versus-community.fr.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/copyright-versus-community.fr.html       27 Jan 2012 09:29:33 
-0000      1.19
+++ philosophy/copyright-versus-community.fr.html       28 Jan 2012 01:28:23 
-0000      1.20
@@ -1001,7 +1001,7 @@
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
-<b>Notes de traduction</b><ol class="translator-notes-alpha">
+<b>Notes de traduction</b><ol id="translator-notes-alpha">
 <li id="TransNote1">nz-libs&nbsp;: liste de discussion des bibliothécaires
 de Nouvelle-Zélande. <a href="#TransNote1-rev">&#8593;</a></li>
 <li id="TransNote2">La <i>ponga</i> est une fougère arborescente, symbole de
@@ -1076,7 +1076,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/27 09:29:33 $
+$Date: 2012/01/28 01:28:23 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/digital-inclusion-in-freedom.fr.html
===================================================================
RCS file: /web/www/www/philosophy/digital-inclusion-in-freedom.fr.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/digital-inclusion-in-freedom.fr.html     27 Jan 2012 09:29:33 
-0000      1.5
+++ philosophy/digital-inclusion-in-freedom.fr.html     28 Jan 2012 01:28:24 
-0000      1.6
@@ -1059,7 +1059,7 @@
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
-<b>Notes de traduction</b><ol class="translator-notes-alpha">
+<b>Notes de traduction</b><ol id="translator-notes-alpha">
 <li id="TransNote1">Également appelé «&nbsp;logiciel propriétaire&nbsp;»
 <em>[proprietary software]</em>. <a href="#TransNote1-rev">&#8593;</a></li>
 <li id="TransNote2">Également appelés «&nbsp;formats restreints&nbsp;»
@@ -1144,7 +1144,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/27 09:29:33 $
+$Date: 2012/01/28 01:28:24 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/misinterpreting-copyright.fr.html
===================================================================
RCS file: /web/www/www/philosophy/misinterpreting-copyright.fr.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/misinterpreting-copyright.fr.html        27 Jan 2012 09:29:34 
-0000      1.28
+++ philosophy/misinterpreting-copyright.fr.html        28 Jan 2012 01:28:24 
-0000      1.29
@@ -674,7 +674,7 @@
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
-<b>Notes de traduction</b><ol class="translator-notes-alpha">
+<b>Notes de traduction</b><ol id="translator-notes-alpha">
 <li id="TransNote1">Le copyright américain a beaucoup de points communs avec
 le droit d'auteur français, mais il y a aussi des différences
 significatives. C'est pourquoi <em>copyright</em> n'est pas traduit dans cet
@@ -735,7 +735,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/27 09:29:34 $
+$Date: 2012/01/28 01:28:24 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/copyright-versus-community.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/copyright-versus-community.fr-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/copyright-versus-community.fr-en.html 27 Jan 2012 09:29:50 
-0000      1.3
+++ philosophy/po/copyright-versus-community.fr-en.html 28 Jan 2012 01:28:36 
-0000      1.4
@@ -969,7 +969,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/01/27 09:29:50 $
+$Date: 2012/01/28 01:28:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/digital-inclusion-in-freedom.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/digital-inclusion-in-freedom.fr-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/digital-inclusion-in-freedom.fr-en.html       27 Jan 2012 
09:29:50 -0000      1.5
+++ philosophy/po/digital-inclusion-in-freedom.fr-en.html       28 Jan 2012 
01:28:36 -0000      1.6
@@ -1027,7 +1027,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/01/27 09:29:50 $
+$Date: 2012/01/28 01:28:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/misinterpreting-copyright.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/misinterpreting-copyright.fr-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/misinterpreting-copyright.fr-en.html  27 Jan 2012 09:29:51 
-0000      1.4
+++ philosophy/po/misinterpreting-copyright.fr-en.html  28 Jan 2012 01:28:36 
-0000      1.5
@@ -647,7 +647,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/01/27 09:29:51 $
+$Date: 2012/01/28 01:28:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/sitemap.fr.html
===================================================================
RCS file: /web/www/www/server/sitemap.fr.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/sitemap.fr.html      23 Jan 2012 01:39:32 -0000      1.20
+++ server/sitemap.fr.html      28 Jan 2012 01:28:48 -0000      1.21
@@ -248,8 +248,8 @@
   <li><a href="/education/edu-cases.html">edu-cases.html - Études de 
cas</a></li>
   <li><a href="/education/edu-contents.html">edu-contents.html - Logiciel 
libre et
 éducation - Table des matières</a></li>
-  <li><a href="/education/edu-faq.html">edu-faq.html - Educational Frequently
-Asked Questions</a></li>
+  <li><a href="/education/edu-faq.html">edu-faq.html - Foire Aux Questions sur
+l'éducation</a></li>
   <li><a href="/education/edu-projects.html">edu-projects.html - Other 
Education
 Groups and Projects</a></li>
   <li><a href="/education/edu-resources.html">edu-resources.html - Ressources
@@ -506,12 +506,10 @@
 <div id="directory-graphics" class="sitemap-directory 
sitemap-directory-depth-1">
 <div class="sitemap-header"><a href="/graphics/graphics.html">graphics - La 
galerie du projet GNU</a></div>
 <ul>
-  <li><a href="/graphics/3dbabygnutux.html">3dbabygnutux.html - Projet GNU - Un
-bébé GNU en 3D et un bébé Tux</a></li>
-  <li><a href="/graphics/3dgnuhead.html">3dgnuhead.html - Projet GNU - Tête 
de GNU
-en 3D</a></li>
-  <li><a href="/graphics/agnubody.html">agnubody.html -Un corps de GNU - 
Section
-enfants</a></li>
+  <li><a href="/graphics/3dbabygnutux.html">3dbabygnutux.html - Un bébé GNU 
en 3D
+et un bébé Tux</a></li>
+  <li><a href="/graphics/agnuhead.html">agnuhead.html - Une tête de GNU en 
3D</a></li>
+  <li><a href="/graphics/agnubody.html">agnubody.html - Un corps de 
GNU</a></li>
   <li><a href="/graphics/agnuhead.html">agnuhead.html - Une tête de 
GNU</a></li>
   <li><a href="/graphics/ahurdlogo.html">ahurdlogo.html - Un logo Hurd</a></li>
   <li><a href="/graphics/alternative-ascii.html">alternative-ascii.html - Une
@@ -535,7 +533,7 @@
 - GNU Art - GNU Art - Gestion numérique des restrictions</a></li>
   <li><a href="/graphics/distros-dragora.html">distros-dragora.html - Logo de
 Dragora</a></li>
-  <li><a href="/graphics/fromagnulinux.html">fromagnulinux.html - Projet GNU -
+  <li><a href="/graphics/fromagnulinux.html">fromagnulinux.html -
 Fromagnulinux</a></li>
   <li><a href="/graphics/fsf-logo.html">fsf-logo.html - Le logo de la 
FSF</a></li>
   <li><a href="/graphics/FSFS-logo.html">FSFS-logo.html - Logiciel libre, 
société
@@ -546,8 +544,7 @@
 alternative</a></li>
   <li><a href="/graphics/gnu-ascii-liberty.html">gnu-ascii-liberty.html - GNU 
is
 Liberty</a></li>
-  <li><a href="/graphics/gnu-ascii.html">gnu-ascii.html - Projet GNU - Un GNU 
en
-ASCII</a></li>
+  <li><a href="/graphics/gnu-ascii2.html">gnu-ascii2.html - Un Gnou en 
ASCII</a></li>
   <li><a href="/graphics/gnu-ascii2.html">gnu-ascii2.html - Un autre GNU en
 ASCII</a></li>
   <li><a href="/graphics/gnu-head-shadow.html">gnu-head-shadow.html - Une 
tête de
@@ -583,12 +580,11 @@
   <li><a href="/graphics/kafa.html">kafa.html - Art abstrait GNU</a></li>
   <li><a href="/graphics/license-logos.html">license-logos.html - Logos des
 licences GNU</a></li>
-  <li><a href="/graphics/listen.html">listen.html - Projet GNU - Gnou avec
-écouteurs</a></li>
+  <li><a href="/graphics/listen.html">listen.html - Gnou avec 
écouteurs</a></li>
   <li><a href="/graphics/lovchik-gnu.html">lovchik-gnu.html - Art GNU de Lisa
 J. Lovchik</a></li>
-  <li><a href="/graphics/meditate.html">meditate.html - projet GNU - GNU en
-lévitation et en méditation jouant de la flûte</a></li>
+  <li><a href="/graphics/meditate.html">meditate.html - GNU en lévitation et 
en
+méditation jouant de la flûte</a></li>
   <li><a href="/graphics/package-logos.html">package-logos.html - Logos des
 paquets GNU</a></li>
   <li><a href="/graphics/philosophicalgnu.html">philosophicalgnu.html - Un GNU
@@ -597,19 +593,17 @@
 couleur</a></li>
   <li><a href="/graphics/runfreegnu.html">runfreegnu.html - Bannière 
«&nbsp;Run
 free run GNU&nbsp;»</a></li>
-  <li><a href="/graphics/slickgnu.html">slickgnu.html - GNU Project - Un logo 
GNU
-affiné</a></li>
+  <li><a href="/graphics/slickgnu.html">slickgnu.html - Un logo GNU 
affiné</a></li>
   <li><a href="/graphics/social.html">social.html - Le logo social GNU</a></li>
-  <li><a href="/graphics/spiritoffreedom.html">spiritoffreedom.html - GNU 
Project
-- L'esprit de la liberté</a></li>
+  <li><a href="/graphics/spiritoffreedom.html">spiritoffreedom.html - L'esprit 
de
+la liberté</a></li>
   <li><a href="/graphics/stark-gnuherd.html">stark-gnuherd.html - Bannières de
 troupeau de Jochen Stärk</a></li>
   <li><a href="/graphics/supergnu-ascii.html">supergnu-ascii.html - Super GNU 
en
 ASCII</a></li>
   <li><a href="/graphics/Trisquel.html">Trisquel.html - Trisquel</a></li>
   <li><a href="/graphics/usegnu.html">usegnu.html - Use `GNU</a></li>
-  <li><a href="/graphics/wallpapers.html">wallpapers.html - Fonds d'écran -
-GNU/Linux</a></li>
+  <li><a href="/graphics/wallpapers.html">wallpapers.html - Fonds 
d'écran</a></li>
   <li><a href="/graphics/whatsgnu.html">whatsgnu.html - Qu'est-ce que 
GNU</a></li>
   <li><a href="/graphics/winkler-gnu.html">winkler-gnu.html - Alternative de 
Kyle
 Winkler aux logos GNU</a></li>
@@ -910,7 +904,7 @@
 - Copyright contre Communauté à l'âge des réseaux informatiques</a></li>
   <li><a
 
href="/philosophy/copyright-versus-community.html">copyright-versus-community.html
-- Copyright versus Community in the Age of Computer Networks</a></li>
+- Copyright contre communauté à l'âge des réseaux informatiques</a></li>
   <li><a
 
href="/philosophy/danger-of-software-patents.html">danger-of-software-patents.html
 - The Danger of Software Patents</a></li>
@@ -1562,7 +1556,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/23 01:39:32 $
+$Date: 2012/01/28 01:28:48 $
 
 <!-- timestamp end -->
 </p>

Index: server/whatsnew.fr.html
===================================================================
RCS file: /web/www/www/server/whatsnew.fr.html,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/whatsnew.fr.html     23 Jan 2012 09:26:37 -0000      1.62
+++ server/whatsnew.fr.html     28 Jan 2012 01:28:48 -0000      1.63
@@ -2,17 +2,17 @@
 <!--#include virtual="/server/header.fr.html" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>What's New in and about the GNU Project - GNU Project - Free Software
+<title>Quoi de neuf dans le projet GNU et à son sujet - GNU Project - Free 
Software
 Foundation (FSF)</title>
 
 <!--#include virtual="/server/banner.fr.html" -->
-<h2>What's New in and about the GNU Project</h2>
+<h2>Quoi de neuf dans le projet GNU et à son sujet</h2>
 
 <!--#include virtual="/server/whatsnew.fr.include" -->
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
-*GNUN-SLOT: TRANSLATOR'S NOTES*</div>
+ </div>
 </div>
 
 <!--#include virtual="/server/footer.fr.html" -->
@@ -49,14 +49,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-*GNUN-SLOT: TRANSLATOR'S CREDITS*</div>
+ </div>
 
 
  <p>
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/01/23 09:26:37 $
+$Date: 2012/01/28 01:28:48 $
 
 <!-- timestamp end -->
 </p>

Index: server/whatsnew.fr.include
===================================================================
RCS file: /web/www/www/server/whatsnew.fr.include,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/whatsnew.fr.include  23 Jan 2012 01:39:32 -0000      1.49
+++ server/whatsnew.fr.include  28 Jan 2012 01:28:48 -0000      1.50
@@ -1,76 +1,77 @@
-<p><a href="http://www.fsf.org/events";><strong>Coming Events</strong></a> | <a
-href="/keepingup.html"><strong>Keeping Up With GNU/FSF</strong></a> | <a
-href="/press/press.html"><strong>Press Information</strong></a> and <a
-href="/press/press.html#releases"><strong>Releases</strong></a></p><dl>
-  <dt>26 January 2011</dt>
-  <dd>A first installment of a <a href="/bulletins/gnustatus-2011-01.html">GNU 
Status Report</a> is available.  This is a partial revival of the original 
<cite>GNU's Bulletin</cite>, with the aim of providing GNU-wide information 
from time to time, for as many packages as possible.  <a 
href="/bulletins/bulletins.html">More info</a>.</dd>
+<p><a href="http://www.fsf.org/events";><strong>Prochains
+évènements</strong></a> | <a href="/keepingup.html"><strong>Suivez GNU et la
+FSF</strong></a> | <a href="/press/press.html"><strong>Informations pour la
+presse</strong></a> et <a
+href="/press/press.html#releases"><strong>Communiqués</strong></a></p><dl>
+  <dt>26 janvier 2011</dt>
+  <dd>Le premier numéro du <a href="/bulletins/gnustatus-2011-01.html">GNU 
Status Report</a> vient de sortir. C'est une reprise partielle du <cite>GNU's 
Bulletin</cite> qui a pour but de donner de temps en temps des informations sur 
l'ensemble du projet GNU, pour autant de paquets logiciels que possible. <a 
href="/bulletins/bulletins.html">Plus d'info</a>.</dd>
 </dl><dl>
-  <dt>9 December 2010</dt>
-  <dd>Savannah was down for a few days recently due to a password compromise 
and then a disk failure.  Also, some Apache features have been turned off for 
web pages.  <a href="http://savannah.gnu.org/news/";>Full news items</a>.</dd>
+  <dt>9 décembre 2010</dt>
+  <dd>Savannah a été hors service pendant quelques jours récemment à cause 
d'un mot de passe compromis, puis d'un disque défaillant. De plus, quelques 
fonctionnalités d'Apache ont été arrêtées pour les pages web. <a 
href="http://savannah.gnu.org/news/";>Nouvelles détaillées</a>.</dd>
 </dl><dl>
-  <dt>16 November 2010</dt>
-  <dd>US citizens: Stop the Internet blacklist bill. Sign the petition at <a 
href="http://demandprogress.org/blacklist/";>http://demandprogress.org/blacklist</a>,
 and see <a 
href="http://www.fsf.org/blogs/community/the-internet-blacklist-coica-is-back-take-action-before-thursday";>the
 post on fsf.org</a> for more information.</dd>
+  <dt>16 novembre 2010</dt>
+  <dd>Citoyens américains : arrêtez la loi sur la liste noire d'Internet. 
Signez la pétition à <a 
href="http://demandprogress.org/blacklist/";>http://demandprogress.org/blacklist</a>,
 et lisez <a 
href="http://www.fsf.org/blogs/community/the-internet-blacklist-coica-is-back-take-action-before-thursday";>l'article
 sur fsf.org</a> pour plus ample information.</dd>
 </dl><dl>
-  <dt>29 September 2010</dt>
-  <dd>Interested in free video formats? We need your help! <a 
href="http://www.fsf.org/blogs/community/interested-in-free-video-formats-we-need-your-help";>The
 FSF is looking</a> for a few volunteers willing to commit an average of a few 
hours per week as reliable technical consultants helping people transcode their 
videos to free formats like WebM and Ogg Theora.</dd>
+  <dt>29 septembre 2010</dt>
+  <dd>Vous êtes intéressé par les formats vidéo ? Nous avons besoin de 
votre aide  ! <a 
href="http://www.fsf.org/blogs/community/interested-in-free-video-formats-we-need-your-help";>La
 FSF recherche</a> quelques volontaires disposés à consacrer quelques heures 
par semaine en moyenne, comme consultants techniques fiables pour aider les 
gens à transcoder leurs vidéos dans des formats libres comme WebM et Ogg 
Theora.</dd>
 </dl><dl>
-  <dt>30 June 2010</dt>
-  <dd>The June issue of the <cite>Free Software Supporter</cite> is out -- you 
can <a 
href="http://lists.fsf.org/archive/html/info-fsf/2010-06/msg00003.html";>read 
it</a> and <a href="http://www.fsf.org/free-software-supporter";>subscribe</a> 
to receive future monthly issues by e-mail.</dd>
+  <dt>30 juin 2010</dt>
+  <dd>Le numéro de juin du <cite>Free Software Supporter</cite> est sorti - 
vous pouvez <a 
href="http://lists.fsf.org/archive/html/info-fsf/2010-06/msg00003.html";>le 
lire</a> et <a href="http://www.fsf.org/free-software-supporter";>vous 
inscrire</a> pour recevoir les numéros mensuels à venir par courriel.</dd>
 </dl><dl>
-  <dt>25 March 2010</dt>
-  <dd>GNU urges people working on free software to follow standards and 
guidelines for universal accessibility on GNU/Linux and other free operating 
systems with the release of <a 
href="http://www.gnu.org/accessibility/accessibility.html";>the GNU 
Accessibility Statement</a>.</dd>
+  <dt>25 mars 2010</dt>
+  <dd>GNU insiste pour que les personnes travaillant sur du logiciel libre 
suivent les standards et recommandations pour l'accessibilité universelle sur 
GNU/Linux et autres systèmes d'exploitation libres, avec la publication de <a 
href="http://www.gnu.org/accessibility/accessibility.html";>l'appel à 
l'accessibilité GNU</a>.</dd>
 </dl><dl>
-  <dt>20 March 2010</dt>
-  <dd>FSF President Richard Stallman explains the dangers of Software as a 
Service for free software in <a 
href="http://www.gnu.org/philosophy/who-does-that-server-really-serve.html";>a 
new article</a>.</dd>
+  <dt>20 mars 2010</dt>
+  <dd>Le président de la FSF Richard Stallman explique les dangers du 
logiciel en tant que service dans <a 
href="http://www.gnu.org/philosophy/who-does-that-server-really-serve.html";>un 
nouvel article</a>.</dd>
 </dl><dl>
-  <dt>2 January 2010</dt>
-  <dd>All packages using <a href="/software/automake/">GNU Automake</a> to 
produce distribution tarballs with <tt>make dist</tt> should update to the 
1.11.1 or 1.10.3 release, or otherwise work around <a 
href="http://thread.gmane.org/gmane.comp.sysutils.autotools.announce/131";>the 
problem</a>.</dd>
+  <dt>2 janvier 2010</dt>
+  <dd>Tous les paquets utilisant <a href="/software/automake/">GNU 
Automake</a> pour produire des archives de distribution avec <tt>make dist</tt> 
doivent mettre à jour à la version 1.11.1 or 1.10.3, ou contourner <a 
href="http://thread.gmane.org/gmane.comp.sysutils.autotools.announce/131";>ce 
problème</a> par un autre moyen.</dd>
 </dl><dl>
-  <dt>31 December 2009</dt>
-  <dd>The FSF is hosting a GNU Hackers' Meeting for GNU maintainers and 
contributors from March 18th-21st as part of the LibrePlanet 2010 conference in 
Cambridge, Massachusetts. <a 
href="http://groups.fsf.org/wiki/LibrePlanet2010/GNUHackersMeeting";>Read the 
details and RSVP.</a></dd>
+  <dt>31 décembre 2009</dt>
+  <dd>La FSF est l'hôte d'une Rencontre des hackers GNU pour les mainteneurs 
et contributeurs GNU du 18 au 21 mars, dans le cadre de la conférence 
LibrePlanet 2010 à Cambridge, Massachussetts. <a 
href="http://groups.fsf.org/wiki/LibrePlanet2010/GNUHackersMeeting";>Lisez les 
détails et RSVP.</a></dd>
 </dl><dl>
-  <dt>23 July 2009</dt>
-  <dd>FSF president Richard Stallman explains the unintended interactions 
between the Swedish Pirate Party's platform and free software -- and proposes a 
solution -- in his new article, <a 
href="http://www.gnu.org/philosophy/pirate-party.html";>How the Swedish Pirate 
Party Platform Backfires on Free Software</a>.</dd>
+  <dt>23 juillet 2009</dt>
+  <dd>Le président de la FSF Richard Stallman explique les interactions non 
intentionnelles entre le programme du Parti Pirate suédois et le logiciel 
libre - dans son nouvel article, <a 
href="http://www.gnu.org/philosophy/pirate-party.html";>Pourquoi les 
propositions du Parti Pirate suédois se retournent contre le logiciel 
libre</a>.</dd>
 </dl><dl>
-  <dt>27 May 2009</dt>
-  <dd>Help improve Canadian copyright law! The Globe and Mail has put C-61, a 
copyright reform bill, on a wiki for editing. See <a 
href="http://groups.fsf.org/wiki/Canada/RewriteCanadianCopyrightLaw";>the 
LibrePlanet page</a> for information on participating.</dd>
+  <dt>27 mai 2009</dt>
+  <dd>Aidez à améliorer la loi canadienne sur le copyright ! <i>The Globe 
and Mail</i> a mis C-61, une proposition de loi réformant le copyright, sur un 
wiki pour édition. Lisez <a 
href="http://groups.fsf.org/wiki/Canada/RewriteCanadianCopyrightLaw";>la page 
LibrePlanet</a> pour savoir comment participer. </dd>
 </dl><dl>
-  <dt>27 May 2009</dt>
-  <dd>The FSF is hiring a new campaigns manager, to help with GNU and to run 
DefectiveByDesign, PlayOgg, and other exciting free software campaigns. <a 
href="http://www.fsf.org/news/campaigns-manager";>Read about the job and how to 
apply</a>.</dd>
+  <dt>27 mai 2009</dt>
+  <dd>La FSF recrute un nouveau directeur de campagne, pour aider le projet 
GNU et pour diriger DefectiveByDesign, PlayOgg, et autres campagnes 
passionnantes du logiciel libre. <a 
href="http://www.fsf.org/news/campaigns-manager";>Lisez la description du poste 
et comment poser votre candidature</a>.</dd>
 </dl><dl>
-  <dt>7 May 2009</dt>
-  <dd>FSF has launched a new free software activist internship program. 
Applications for the summer term are due Monday, May 25. <a 
href="http://fsf.org/news/new-internship-program";>Read the full 
announcement.</a></dd>
+  <dt>7 mai 2009</dt>
+  <dd>La FSF a lancé un nouveau programme de résident activiste du logiciel 
libre. La date limite de dépôt des dossiers pour le trimestre d'été est le 
25 mai. <a href="http://fsf.org/news/new-internship-program";>Lisez l'annonce 
complète</a></dd>
 </dl><dl>
-  <dt>14 April 2009</dt>
+  <dt>14 avril2009</dt>
   <dd>Richard Stallman has given an interview to O'Reilly Media in which he 
talks  about Free Software licencing and a number of other current issues 
including  software patents, free device drivers, and the FSF's current 
campaigns. <a 
href="http://www.gnu.org/philosophy/speeches-and-interview.html";>Read the 
interview here.</a></dd>
 </dl><dl>
-  <dt>25 March 2009</dt>
-  <dd>CREDIL is hosting a contest where you can win prize money for working on 
free software. It's been going for a couple of days already, but the deadline 
isn't until Sunday, March 28th, so there's still time. <a 
href="http://www.fsf.org/blogs/community/credil-contest-2009";>Read 
more.</a></dd>
+  <dt>25 mars 2009</dt>
+  <dd>CREDIL organise un concours où vous pouvez gagner un prix en numéraire 
pour votre travail sur le logiciel libre. Il a commencé il y a déjà deux 
jours, mais vous avez jusqu'au dimanche 28 mars pour vous inscrire, donc vous 
avez encore le temps. <a 
href="http://www.fsf.org/blogs/community/credil-contest-2009";>Plus 
d'info.</a></dd>
 </dl><dl>
-  <dt>24 March 2009</dt>
-  <dd>Wietse Venema and Creative Commons were announced as winners of the 
annual free software awards at LibrePlanet last weekend. <a 
href="http://www.fsf.org/news/2008_free_software_awards";>Read more</a> about 
their work and the awards.</dd>
+  <dt>24 mars 2009</dt>
+  <dd><i>Wietse Venema</i> et <i>Creative Commons</i> ont été désignés 
comme gagnants des prix annuels du logiciel libre à LibrePlanet le week-end 
dernier. <a href="http://www.fsf.org/news/2008_free_software_awards";>Lisez-en 
plus</a> sur leur travail et sur les prix.</dd>
 </dl><dl>
-  <dt>23 March 2009</dt>
-  <dd>Help spring the <a 
href="http://www.gnu.org/philosophy/javascript-trap.html";>Javascript Trap!</a> 
During the LibrePlanet conference, Richard Stallman announced a plan of action 
for addressing the problem of non-free Javascript, Flash and Silverlight 
programs. <a href="http://www.fsf.org/news/javascript-trap";>Read more</a> about 
this threat to user freedom and how you can help.</dd>
+  <dt>23 mars 2009</dt>
+  <dd>Aidez à ouvrir le <a 
href="http://www.gnu.org/philosophy/javascript-trap.html";>piège 
JavaScript</a> ! Pendant la conférence LibrePlanet, Richard Stallman a 
annoncé un plan d'action pour s'attaquer au problème des programmes non 
libres JavaScript, Flash et Silverlight. <a 
href="http://www.fsf.org/news/javascript-trap";>Lisez-en plus</a> sur cette 
menace à la liberté de l'utilisateur et comment vous pouvez aider.</dd>
 </dl><dl>
-  <dt>7 March 2009</dt>
+  <dt>7 mars 2009</dt>
   <dd>More and more students are considering whether a university teaches 
computer  science and software development using Free Software when deciding 
where they  will study. If you know of a Free-Software-oriented university then 
 <a href="mailto:address@hidden";>email us</a>.</dd>
 </dl><dl>
-  <dt>24 February 2009</dt>
-  <dd>New Zealanders, please support the <a 
href="http://creativefreedom.org.nz/";>Creative Freedom Foundation</a>.</dd>
+  <dt>24 février 2009</dt>
+  <dd>Néozélandais, merci de soutenir la <a 
href="http://creativefreedom.org.nz/";>Creative Freedom Foundation</a>.</dd>
 </dl><dl>
-  <dt>16 February 2009</dt>
+  <dt>16 février 2009</dt>
   <dd>Europeans, please attend <a 
href="http://www.greens-efa.org/cms/default/dok/270/address@hidden";>this  
conference</a> on the Telecom package, called "Who wants to control the 
Internet?".</dd>
 </dl><dl>
-  <dt>1 February 2009</dt>
-  <dd>PDF is a free format supported by free software but many PDF documents 
instruct you to use a particular vendor's reader. Find out more about free 
software PDF readers and their advantages at <a 
href="http://pdfreaders.org/";>pdfreaders.org</a>.</dd>
+  <dt>1er février 2009</dt>
+  <dd>PDF est un format libre géré par des logiciels libres mais beaucoup de 
documents PDF vous demandent d'utiliser le lecteur d'un fournisseur 
particulier. Découvrez-en plus à propos des lecteurs PDF libres et de leurs 
avantages à <a href="http://pdfreaders.org/";>pdfreaders.org</a>.</dd>
 </dl><dl>
-  <dt>27 January 2009</dt>
-  <dd>The FSF has published a <a href="/licenses/gcc-exception.html">new GCC 
Runtime Library Exception</a> which will allow the entire <a 
href="/software/gcc/">GCC</a> codebase to be upgraded to GPLv3, and enable the 
development of a plugin framework for GCC.</dd>
+  <dt>27 janvier 2009</dt>
+  <dd>La FSF a publié une <a href="/licenses/gcc-exception.html">nouvelle 
exception <i>GCC Runtime Library</i></a> qui permettra à l'ensemble du code de 
GCC d'être mis à jour à la GPLv3 et rendra possible le développement d'un 
framework pour les plug-in de GCC.</dd>
 </dl><dl>
-  <dt>9 January 2009</dt>
-  <dd>With the release of the Windows 7 public beta today, the FSF is 
declaring victory in its BadVista.org campaign. <a 
href="http://badvista.org";>Read and share the full announcement.</a></dd>
-</dl><h4>What was New in Prior Years</h4><ul>
+  <dt>9 janvier 2009</dt>
+  <dd>Avec la sortie publique de Windows 7 beta aujourd'hui, la FSF crie 
victoire dans sa campagne BadVista.org. <a href="http://badvista.org";>Lisez et 
partagez l'annonce complète.</a></dd>
+</dl><h4>Ce qui était nouveau les années passées</h4><ul>
   <li>
     <a href="/server/08whatsnew.html"> <strong>2008</strong> </a>
   </li>

Index: server/po/sitemap.fr-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.fr-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/po/sitemap.fr-en.html        23 Jan 2012 01:39:39 -0000      1.1
+++ server/po/sitemap.fr-en.html        28 Jan 2012 01:28:55 -0000      1.2
@@ -350,9 +350,9 @@
 <div id="directory-graphics" class="sitemap-directory 
sitemap-directory-depth-1">
 <div class="sitemap-header"><a href="/graphics/graphics.html">graphics - The 
GNU Art Gallery</a></div>
 <ul>
-  <li><a href="/graphics/3dbabygnutux.html">3dbabygnutux.html - GNU Project - 
3D Baby GNU and Tux</a></li>
-  <li><a href="/graphics/3dgnuhead.html">3dgnuhead.html - GNU Project - 3D GNU 
head</a></li>
-  <li><a href="/graphics/agnubody.html">agnubody.html - A GNU Body - Kids 
Section</a></li>
+  <li><a href="/graphics/3dbabygnutux.html">3dbabygnutux.html - 3D Baby GNU 
and Tux</a></li>
+  <li><a href="/graphics/3dgnuhead.html">3dgnuhead.html - 3D GNU head</a></li>
+  <li><a href="/graphics/agnubody.html">agnubody.html - A GNU Body</a></li>
   <li><a href="/graphics/agnuhead.html">agnuhead.html - A GNU Head</a></li>
   <li><a href="/graphics/ahurdlogo.html">ahurdlogo.html - A Hurd Logo</a></li>
   <li><a href="/graphics/alternative-ascii.html">alternative-ascii.html - An 
alternative ASCII Gnu</a></li>
@@ -367,14 +367,14 @@
   <li><a href="/graphics/bwcartoon.html">bwcartoon.html - The Dynamic Duo: The 
Gnu and the Penguin in flight</a></li>
   <li><a 
href="/graphics/digital-restrictions-management.html">digital-restrictions-management.html
 - GNU Art - Digital Restrictions Management</a></li>
   <li><a href="/graphics/distros-dragora.html">distros-dragora.html - Dragora 
Logo</a></li>
-  <li><a href="/graphics/fromagnulinux.html">fromagnulinux.html - GNU Project 
- Fromagnulinux</a></li>
+  <li><a href="/graphics/fromagnulinux.html">fromagnulinux.html - 
Fromagnulinux</a></li>
   <li><a href="/graphics/fsf-logo.html">fsf-logo.html - FSF Logo</a></li>
   <li><a href="/graphics/FSFS-logo.html">FSFS-logo.html - Free Software, Free 
Society Title Logo</a></li>
   <li><a href="/graphics/gleesons.html">gleesons.html - Gleeson's GNU 
Art</a></li>
   <li><a href="/graphics/gNewSense.html">gNewSense.html - gNewSense</a></li>
   <li><a href="/graphics/gnu-alternative.html">gnu-alternative.html - GNU 
Alternative</a></li>
   <li><a href="/graphics/gnu-ascii-liberty.html">gnu-ascii-liberty.html - GNU 
is Liberty</a></li>
-  <li><a href="/graphics/gnu-ascii.html">gnu-ascii.html - GNU Project - ASCII 
Gnu</a></li>
+  <li><a href="/graphics/gnu-ascii.html">gnu-ascii.html - ASCII Gnu</a></li>
   <li><a href="/graphics/gnu-ascii2.html">gnu-ascii2.html - Another ASCII 
Gnu</a></li>
   <li><a href="/graphics/gnu-head-shadow.html">gnu-head-shadow.html - GNU head 
shadowed</a></li>
   <li><a href="/graphics/gnu-jacket.html">gnu-jacket.html - A Gnu wearing a 
jacket</a></li>
@@ -394,21 +394,21 @@
   <li><a href="/graphics/jesus-cartoon.html">jesus-cartoon.html - 
Cartoon</a></li>
   <li><a href="/graphics/kafa.html">kafa.html - Abstract GNU Art</a></li>
   <li><a href="/graphics/license-logos.html">license-logos.html - GNU License 
Logos</a></li>
-  <li><a href="/graphics/listen.html">listen.html - GNU Project - Listening 
Gnu</a></li>
+  <li><a href="/graphics/listen.html">listen.html - Listening Gnu</a></li>
   <li><a href="/graphics/lovchik-gnu.html">lovchik-gnu.html - Lisa J. Lovchik 
GNU Art</a></li>
-  <li><a href="/graphics/meditate.html">meditate.html - GNU Project - 
Levitating, Meditating, Flute-playing Gnu</a></li>
+  <li><a href="/graphics/meditate.html">meditate.html - Levitating, 
Meditating, Flute-playing Gnu</a></li>
   <li><a href="/graphics/package-logos.html">package-logos.html - Logos of GNU 
packages</a></li>
   <li><a href="/graphics/philosophicalgnu.html">philosophicalgnu.html - A 
Philosophical GNU</a></li>
   <li><a href="/graphics/reiss-gnuhead.html">reiss-gnuhead.html - Color Gnu 
Head</a></li>
   <li><a href="/graphics/runfreegnu.html">runfreegnu.html - banner: run free 
run GNU</a></li>
-  <li><a href="/graphics/slickgnu.html">slickgnu.html - GNU Project - Slick 
GNU</a></li>
+  <li><a href="/graphics/slickgnu.html">slickgnu.html - Slick GNU</a></li>
   <li><a href="/graphics/social.html">social.html - GNU social</a></li>
-  <li><a href="/graphics/spiritoffreedom.html">spiritoffreedom.html - GNU 
Project - The Spirit of Freedom</a></li>
+  <li><a href="/graphics/spiritoffreedom.html">spiritoffreedom.html - The 
Spirit of Freedom</a></li>
   <li><a href="/graphics/stark-gnuherd.html">stark-gnuherd.html - Jochen 
St&auml;rk Herd Banners</a></li>
   <li><a href="/graphics/supergnu-ascii.html">supergnu-ascii.html - ASCII 
Super Gnu</a></li>
   <li><a href="/graphics/Trisquel.html">Trisquel.html - Trisquel</a></li>
   <li><a href="/graphics/usegnu.html">usegnu.html - Use 'GNU</a></li>
-  <li><a href="/graphics/wallpapers.html">wallpapers.html - Wallpapers - 
GNU/Linux</a></li>
+  <li><a href="/graphics/wallpapers.html">wallpapers.html - Wallpapers</a></li>
   <li><a href="/graphics/whatsgnu.html">whatsgnu.html - What's GNU</a></li>
   <li><a href="/graphics/winkler-gnu.html">winkler-gnu.html - Alternative GNU 
Logos by Kyle Winkler</a></li>
 </ul>
@@ -967,7 +967,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/01/23 01:39:39 $
+$Date: 2012/01/28 01:28:55 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/po/sitemap.fr.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.fr.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/po/sitemap.fr.po     27 Jan 2012 22:40:21 -0000      1.39
+++ server/po/sitemap.fr.po     28 Jan 2012 01:28:55 -0000      1.40
@@ -12,11 +12,10 @@
 "PO-Revision-Date: 2012-01-27 20:26+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-01-27 12:25-0500\n"
+"Language: fr\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -28,9 +27,9 @@
 msgid ""
 ".sitemap-directory { margin-left: 1.2em } .sitemap-directory-depth-0, ."
 "sitemap-directory-depth-1 { margin-left: auto } #content .sitemap-directory "
-"ul { margin-left: 0em; margin-top: 0.5em } #content .sitemap-directory-"
-"depth-0 ul li { list-style: decimal } #content .sitemap-directory-depth-1 ul "
-"li { list-style: decimal } #content .sitemap-directory-depth-2 ul li { list-"
+"ul { margin-left: 0em; margin-top: 0.5em } #content .sitemap-directory-depth-"
+"0 ul li { list-style: decimal } #content .sitemap-directory-depth-1 ul li "
+"{ list-style: decimal } #content .sitemap-directory-depth-2 ul li { list-"
 "style: lower-alpha } #content .sitemap-directory-depth-3 ul li { list-style: "
 "decimal } #content .sitemap-directory-depth-4 ul li { list-style: lower-"
 "alpha } #content .sitemap-directory-depth-5 ul li { list-style: decimal } "
@@ -40,9 +39,9 @@
 msgstr ""
 ".sitemap-directory { margin-left: 1.2em } .sitemap-directory-depth-0, ."
 "sitemap-directory-depth-1 { margin-left: auto } #content .sitemap-directory "
-"ul { margin-left: 0em; margin-top: 0.5em } #content .sitemap-directory-"
-"depth-0 ul li { list-style: decimal } #content .sitemap-directory-depth-1 ul "
-"li { list-style: decimal } #content .sitemap-directory-depth-2 ul li { list-"
+"ul { margin-left: 0em; margin-top: 0.5em } #content .sitemap-directory-depth-"
+"0 ul li { list-style: decimal } #content .sitemap-directory-depth-1 ul li "
+"{ list-style: decimal } #content .sitemap-directory-depth-2 ul li { list-"
 "style: lower-alpha } #content .sitemap-directory-depth-3 ul li { list-style: "
 "decimal } #content .sitemap-directory-depth-4 ul li { list-style: lower-"
 "alpha } #content .sitemap-directory-depth-5 ul li { list-style: decimal } "
@@ -1438,8 +1437,6 @@
 msgstr ""
 "<a href=\"/graphics/graphics.html\">graphics - La galerie du projet GNU</a>"
 
-# | <a href=\"/graphics/3dbabygnutux.html\">3dbabygnutux.html - [-GNU Project
-# | --] 3D Baby GNU and Tux</a>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"/graphics/3dbabygnutux.html\">3dbabygnutux.html - 3D Baby GNU and "
@@ -1448,16 +1445,11 @@
 "<a href=\"/graphics/3dbabygnutux.html\">3dbabygnutux.html - Un bébé GNU en "
 "3D et un bébé Tux</a>"
 
-# | <a [-href=\"/graphics/agnuhead.html\">agnuhead.html-]
-# | {+href=\"/graphics/3dgnuhead.html\">3dgnuhead.html+} - [-A-] {+3D+} GNU
-# | [-H-]{+h+}ead</a>
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/graphics/3dgnuhead.html\">3dgnuhead.html - 3D GNU head</a>"
 msgstr ""
 "<a href=\"/graphics/agnuhead.html\">agnuhead.html - Une tête de GNU en 
3D</a>"
 
-# | <a href=\"/graphics/agnubody.html\">agnubody.html - A GNU [-Body - Kids
-# | Section</a>-] {+Body</a>+}
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/graphics/agnubody.html\">agnubody.html - A GNU Body</a>"
 msgstr ""
@@ -1554,8 +1546,6 @@
 "<a href=\"/graphics/distros-dragora.html\">distros-dragora.html - Logo de "
 "Dragora</a>"
 
-# | <a href=\"/graphics/fromagnulinux.html\">fromagnulinux.html - [-GNU
-# | Project --] Fromagnulinux</a>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"/graphics/fromagnulinux.html\">fromagnulinux.html - Fromagnulinux</"
@@ -1603,9 +1593,6 @@
 "<a href=\"/graphics/gnu-ascii-liberty.html\">gnu-ascii-liberty.html - GNU is "
 "Liberty</a>"
 
-# | <a [-href=\"/graphics/gnu-ascii2.html\">gnu-ascii2.html-]
-# | {+href=\"/graphics/gnu-ascii.html\">gnu-ascii.html+} - [-Another-] ASCII
-# | Gnu</a>
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/graphics/gnu-ascii.html\">gnu-ascii.html - ASCII Gnu</a>"
 msgstr ""
@@ -1748,8 +1735,6 @@
 "<a href=\"/graphics/license-logos.html\">license-logos.html - Logos des "
 "licences GNU</a>"
 
-# | <a href=\"/graphics/listen.html\">listen.html - [-GNU Project --]
-# | Listening Gnu</a>
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/graphics/listen.html\">listen.html - Listening Gnu</a>"
 msgstr ""
@@ -1763,8 +1748,6 @@
 "<a href=\"/graphics/lovchik-gnu.html\">lovchik-gnu.html - Art GNU de Lisa J. "
 "Lovchik</a>"
 
-# | <a href=\"/graphics/meditate.html\">meditate.html - [-GNU Project --]
-# | Levitating, Meditating, Flute-playing Gnu</a>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"/graphics/meditate.html\">meditate.html - Levitating, Meditating, "
@@ -1805,8 +1788,6 @@
 "<a href=\"/graphics/runfreegnu.html\">runfreegnu.html - Bannière «&nbsp;Run 
"
 "free run GNU&nbsp;»</a>"
 
-# | <a href=\"/graphics/slickgnu.html\">slickgnu.html - [-GNU Project --]
-# | Slick GNU</a>
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/graphics/slickgnu.html\">slickgnu.html - Slick GNU</a>"
 msgstr ""
@@ -1816,8 +1797,6 @@
 msgid "<a href=\"/graphics/social.html\">social.html - GNU social</a>"
 msgstr "<a href=\"/graphics/social.html\">social.html - Le logo social GNU</a>"
 
-# | <a href=\"/graphics/spiritoffreedom.html\">spiritoffreedom.html - [-GNU
-# | Project --] The Spirit of Freedom</a>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"/graphics/spiritoffreedom.html\">spiritoffreedom.html - The Spirit "
@@ -1850,8 +1829,6 @@
 msgid "<a href=\"/graphics/usegnu.html\">usegnu.html - Use 'GNU</a>"
 msgstr "<a href=\"/graphics/usegnu.html\">usegnu.html - Use `GNU</a>"
 
-# | <a href=\"/graphics/wallpapers.html\">wallpapers.html - [-Wallpapers -
-# | GNU/Linux</a>-] {+Wallpapers</a>+}
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/graphics/wallpapers.html\">wallpapers.html - Wallpapers</a>"
 msgstr ""
@@ -2012,11 +1989,11 @@
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
-"<a href=\"/licenses/autoconf-exception-3.0-body.html\">autoconf-"
-"exception-3.0-body.html</a>"
+"<a href=\"/licenses/autoconf-exception-3.0-body.html\">autoconf-exception-"
+"3.0-body.html</a>"
 msgstr ""
-"<a href=\"/licenses/autoconf-exception-3.0-body.html\">autoconf-"
-"exception-3.0-body.html</a>"
+"<a href=\"/licenses/autoconf-exception-3.0-body.html\">autoconf-exception-"
+"3.0-body.html</a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""

Index: server/po/whatsnew.fr.po
===================================================================
RCS file: /web/www/www/server/po/whatsnew.fr.po,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/po/whatsnew.fr.po    27 Jan 2012 22:40:21 -0000      1.58
+++ server/po/whatsnew.fr.po    28 Jan 2012 01:28:56 -0000      1.59
@@ -10,10 +10,10 @@
 "PO-Revision-Date: 2012-01-26 09:19+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -350,8 +350,8 @@
 "CREDIL organise un concours où vous pouvez gagner un prix en numéraire pour 
"
 "votre travail sur le logiciel libre. Il a commencé il y a déjà deux jours, 
"
 "mais vous avez jusqu'au dimanche 28 mars pour vous inscrire, donc vous avez "
-"encore le temps. <a href=\"http://www.fsf.org/blogs/community/credil-";
-"contest-2009\">Plus d'info.</a>"
+"encore le temps. <a href=\"http://www.fsf.org/blogs/community/credil-contest-";
+"2009\">Plus d'info.</a>"
 
 #. type: Content of: <dl><dt>
 msgid "24 March 2009"

Index: education/edu-faq.fr.html
===================================================================
RCS file: education/edu-faq.fr.html
diff -N education/edu-faq.fr.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ education/edu-faq.fr.html   28 Jan 2012 01:26:43 -0000      1.1
@@ -0,0 +1,213 @@
+
+
+<!-- Parent-Version: 1.57 -->
+<!--#include virtual="/server/header.fr.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Foire Aux Questions sur l'éducation - GNU Project - Free Software 
Foundation</title>
+
+<!--#include virtual="/server/banner.fr.html" -->
+<!--#include virtual="/education/po/edu-faq.translist" -->
+<div id="education-content">
+<h2>Foire Aux Questions sur l'éducation</h2>
+
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Contenu éducation</a></li>
+
+<li>
+<a href="/education/edu-cases.html">Études de cas</a></li>
+
+<li>
+<a href="/education/edu-resources.html">Ressources pédagogiques</a></li>
+
+<li>
+<a href="/education/edu-projects.html">Projets pédagogiques</a></li>
+
+<li class="active">
+<a href="/education/edu-faq.html">FAQ</a></li>
+
+<li>
+<a href="/education/edu-team.html">L'équipe éducation</a></li>
+</ul>
+
+<!-- end edu navigation bar -->
+</div> 
+       
+<!-- id="edu-content" -->
+<p class="edu-breadcrumb"><a href="/education/education.html">Éducation</a> 
&rarr; FAQ</p>
+               
+<p>Beaucoup de défenseurs du logiciel libre rencontrent des difficultés quand
+ils parlent aux administrateurs des établissements d'enseignement à propos
+des avantages à utiliser et à enseigner le logiciel libre. Souvent,
+l'administration de l'établissement n'a jamais entendu parler du logiciel
+libre ou n'a entendu parler que de l'<i>open source</i>, donc ils émettent
+de nombreux doutes. Ici nous rassemblons quelques-unes des questions les
+plus communes et les meilleures réponses possibles susceptibles de balayer
+leurs hésitations.</p>
+
+<dl>
+                <dt>Comme enseignant, je fais de grands efforts pour expliquer 
à
+l'administration de l'école les avantages que les logiciels open source
+peuvent apporter à notre école, mais ils ne semblent pas intéressés.</dt>
+                       
+                       <dd>
+                               <p>« Open source » réfère seulement aux 
avantages techniques du logiciel. Les
+écoles peuvent ne pas être intéressées par cet aspect puisque la plupart 
des
+exigences techniques sont déjà satisfaites par l'utilisation de logiciels
+privateurs<a id="TransNote1-rev" href="#TransNote1"><sup>1</sup></a>. Vous
+devez leur parler en terme de logiciel libre<a id="TransNote2-rev"
+href="#TransNote2"><sup>2</sup></a>, et non d'open source, afin de pouvoir
+leur expliquer les raisons philosophiques et éthiques pour lesquelles les
+établissements d'enseignement devraient rejeter les logiciels privateurs.</p>
+                               <p>Regardez <a 
href="/education/edu-why.html">les raisons</a> pour lesquelles
+les établissements d'enseignement devraient utiliser et enseigner
+exclusivement le logiciel libre.</p>
+                       </dd>
+                       
+                       <dt>J'aimerais voir toutes les écoles migrer vers le 
logiciel libre, mais je
+pense que c'est sans espoir. Les entreprises du logiciel privateur ont trop
+de pouvoir, même sur les écoles. La situation est décourageante.</dt>
+                       
+                       <dd>
+                               <p>Il est vrai que les grandes entreprises du 
logiciel privateur ont réussi à
+imposer leurs produits à la société en utilisant les écoles comme agences 
de
+propagande, néanmoins il est également vrai que de nombreuses écoles à
+travers le monde ont adopté le logiciel libre avec d'excellents
+résultats. Notre section <a href="/education/edu-cases.html">Études de
+cas</a> vous en montre des exemples.</p>
+                               
+                               <p>Quand nous avons commencé le projet GNU en 
1983, la situation était vraiment
+décourageante pour nous également. Nous commencions de zéro, et aujourd'hui
+des millions de gens à travers le monde utilisent le logiciel libre.</p>      
        
+                       </dd>
+                       
+                       <dt>Je suis à la tête d'une institut technique et je 
souhaiterais enseigner à
+nos étudiants l'utilisation et l'administration d'une plateforme libre, mais
+je dois me conformer au programme établi par le Ministère de l'éducation,
+qui exige l'enseignement de plateformes et programmes privateurs.</dt>
+                       
+                       <dd>
+    <p>Si vous êtes littéralement forcé d'enseigner des logiciels non 
libres, vous
+devriez dire aux étudiants que vous considérez ces logiciels comme non
+éthiques, que vous faites cela juste parce que vous êtes obligé de le faire,
+et que vous en ferez aussi peu que possible de sorte que vous puissiez
+passer à des logiciels respectant la liberté.</p>                            
+
+    <p>Nous ne devons pas oublier que les écoles ont une grande influence sur 
la
+société, donc faire prendre conscience à nos étudiants des avantages du
+logiciel libre est un moyen de faire pression sur ceux qui prennent les
+décisions. Vous pouvez commencer par parler avec vos étudiants du logiciel
+libre et de ses valeurs éthiques, dont ils n'ont peut-être jamais entendu
+parler. Avec votre approbation et votre soutien, cela peut conduire à la
+formation d'un « groupe pour le logiciel libre » dans votre école. Alors 
le
+groupe pourra faire entendre sa voix en écrivant une lettre au Ministère, en
+organisant des évènements pour promouvoir le logiciel libre, et d'autres
+activités similaires.</p>
+                               
+                               <p>Quand les utilisateurs d'ordinateur 
commenceront à exiger leurs droits, les
+gouvernements devront en tenir compte pour faire leurs lois. C'est pourquoi,
+s'agissant de logiciel libre, les actions de sensibilisation sociale et
+politique sont des aspects fondamentaux qui ne peuvent être laissés de 
côté.</p>
+                       </dd>
+</dl>
+
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+<b>Notes de traduction</b><ol>
+<li id="TransNote1">Autre traduction de <em>proprietary</em> :
+propriétaire. <a href="#TransNote1-rev">&#8593;</a></li>
+<li id="TransNote2">Il peut y avoir confusion en anglais entre les deux sens
+du mot <em>free</em> : « libre » (comme dans « expression libre ») et
+« gratuit », c'est pourquoi le « logiciel libre » est désigné dans 
le texte
+anglais par l'expression <i>Free Libre Software</i>.<a
+href="#TransNote2-rev">&#8593;</a></li>
+</ol></div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.fr.html" -->
+<div id="footer">
+
+<p>Veuillez envoyer les requêtes concernant la FSF et GNU à <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Il existe aussi <a
+href="/contact/">d'autres moyens de contacter</a> la FSF.<br />
+Veuillez envoyer (en anglais) les liens morts ou d'autres suggestions sur
+cette page web à <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>Veuillez consulter le <a
+href="/server/standards/README.translations.html">README des traductions</a>
+pour des informations sur la coordination et la soumission de traductions de
+cet article.</p>
+
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+
+<p>Cette page peut être utilisée suivant les conditions de la licence <a
+rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States</a>.</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+ Traduction&nbsp;: Arthur Godet.<br /> Révision&nbsp;: <a
+href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
+
+
+ <p><!-- timestamp start -->
+Dernière mise à jour&nbsp;:
+
+$Date: 2012/01/28 01:26:43 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!--  -->
+<!-- Please keep this list alphabetical by language code. -->
+<!--      Comment what the language is for each type, i.e. de is German. -->
+<!--      Write the language name in its own language (Deutsch) in the text. 
-->
+<!--      If you add a new language here, please -->
+<!--      advise address@hidden and add it to -->
+<!--       - /home/www/html/server/standards/README.translations.html -->
+<!--       - one of the lists under the section "Translations Underway" -->
+<!--       - if there is a translation team, you also have to add an alias -->
+<!--       to mail.gnu.org:/com/mailer/aliases -->
+<!--      Please also check you have the language code right; see: -->
+<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!--      If the 2-letter ISO 639-1 code is not available, -->
+<!--      use the 3-letter ISO 639-2. -->
+<!--      Please use W3C normative character entities. -->
+<!--  -->
+<!--      See also '(web-trans)Capitalization': -->
+<!--      
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
+<!--      -->
+<!--  -->
+<!-- <gnun>
+
+<ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/education/edu-faq.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/education/edu-faq.html">English</a>&nbsp;[en]</li> -->
+<!-- </ul>
+</gnun> -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>

Index: education/po/edu-faq.fr-en.html
===================================================================
RCS file: education/po/edu-faq.fr-en.html
diff -N education/po/edu-faq.fr-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ education/po/edu-faq.fr-en.html     28 Jan 2012 01:26:52 -0000      1.1
@@ -0,0 +1,177 @@
+<!-- Parent-Version: 1.57 -->
+
+<!--#include virtual="/server/header.html" -->
+<title>Educational Frequently Asked Questions - GNU Project - Free Software 
Foundation</title>
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/education/po/edu-faq.translist" -->
+
+<div id="education-content">
+<h2>Educational Frequently Asked Questions</h2>
+
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
+
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
+
+<li>
+<a href="/education/edu-resources.html">Educational Resources</a></li>
+
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
+
+<li class="active">
+<a href="/education/edu-faq.html">FAQ</a></li>
+
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
+</ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
+       
+<p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
+FAQ</p>
+               
+<p>Many Free Software advocates encounter difficulties when talking to 
+the administrators of educational institutions about the advantages of 
+using and teaching Free Software. Often school administrators have never 
+heard of Free Software or have heard only about Open Source, so they 
+raise many doubts. Here we put together some of the most common 
+questions and the best possible answers to eliminate uncertainties.</p>
+
+<dl>
+                <dt>As a teacher, I've been trying hard to explain to the 
+                       school's administrators the advantages that Open Source 
software can 
+                       bring to our school, but they don't  seem to be 
interested.</dt>
+                       
+                       <dd>
+                               <p>Open Source refers only to the technical 
advantages of software. 
+                               Schools may not be interested in that aspect 
since most probably 
+                               technical requirements are already satisfied by 
the proprietary 
+                               software in use. You need to talk to them in 
terms of Free Libre 
+                 Software, not Open Source, so that you can explain to them 
the 
+                 philosophical and ethical reasons why educational 
institutions 
+                 should reject proprietary software.</p>
+                               <p>See the <a 
href="/education/edu-why.html">Reasons 
+                               Why</a> educational institutions should use and 
teach 
+                               exclusively Free Software.</p>
+                       </dd>
+                       
+                       <dt>I would love to see all schools migrate to Free 
Software, but I 
+                       think it's hopeless. Proprietary software companies 
have too much 
+                       power, even over schools. The situation is 
discouraging.</dt>
+                       
+                       <dd>
+                               <p>While it is true that proprietary software 
corporations have
+                               managed to impose their products on society by 
using schools as
+                               propaganda agents, it is also true that many 
schools around the
+                               world have adopted Free Software with excellent 
results.  See our
+                               <a href="/education/edu-cases.html">Case 
Studies</a> section 
+                               for some examples.</p>
+                               
+                               <p>When we started the GNU Project back in 
1983, the situation was 
+                               very discouraging for us too. We started from 
zero, and today 
+                               millions of people around the world use Free 
Libre Software.</p>                
+                       </dd>
+                       
+                       <dt>I am the head of a technical institute and I would 
like to teach 
+                       our students the use and administration of a Free Libre 
platform, but 
+                       I have to comply with the curriculum established by the 
Ministry of 
+                       Education, which requires the teaching of proprietary 
platforms and 
+                       programs.</dt>
+                       
+                       <dd>
+    <p>If you are literally forced to teach nonfree software, you should
+    tell the students that you consider this software unethical, that 
+    you are doing this only because you are being forced, and that you 
+    will do as little of it as possible so that you can move on to 
+    freedom-respecting software.</p>                           
+
+    <p>We must not forget that schools have a great influence on 
+                               society, so making our students aware of the 
advantages of Free 
+                               Software is a way of putting pressure on 
decision makers. You can 
+    start by telling your students about Free Software and its ethical 
+    values, as they might never have heard of it. With your endorsement 
+    and support, this may lead to the formation of a Free Software Group 
+    in your school. Then the group can make its voice heard by writing 
+    letters to the Ministry, holding events to promote Free Software, 
+    and other similar activities.</p>
+                               
+                               <p>When computer users will start demanding 
their rights, 
+    Governments will have to issue their laws accordingly. That is why 
+    political and social awareness are fundamental aspects which cannot 
+    be left aside when talking about Free Software.</p>
+                       </dd>
+</dl>
+
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2012/01/28 01:26:52 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!--  -->
+<!-- Please keep this list alphabetical by language code. -->
+<!--      Comment what the language is for each type, i.e. de is German. -->
+<!--      Write the language name in its own language (Deutsch) in the text. 
-->
+<!--      If you add a new language here, please -->
+<!--      advise address@hidden and add it to -->
+<!--       - /home/www/html/server/standards/README.translations.html -->
+<!--       - one of the lists under the section "Translations Underway" -->
+<!--       - if there is a translation team, you also have to add an alias -->
+<!--       to mail.gnu.org:/com/mailer/aliases -->
+<!--      Please also check you have the language code right; see: -->
+<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!--      If the 2-letter ISO 639-1 code is not available, -->
+<!--      use the 3-letter ISO 639-2. -->
+<!--      Please use W3C normative character entities. -->
+<!--  -->
+<!--      See also '(web-trans)Capitalization': -->
+<!--      
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
+<!--      -->
+<!--  -->
+<!-- <ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/education/edu-faq.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/education/edu-faq.html">English</a>&nbsp;[en]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>

Index: graphics/po/fsf-logo.fr-en.html
===================================================================
RCS file: graphics/po/fsf-logo.fr-en.html
diff -N graphics/po/fsf-logo.fr-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ graphics/po/fsf-logo.fr-en.html     28 Jan 2012 01:27:59 -0000      1.1
@@ -0,0 +1,62 @@
+<!--#include virtual="/server/html5-header.html" -->
+<!-- Parent-Version: 1.61 -->
+<title>FSF Logo 
+- GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+ <!--#include virtual="/graphics/po/fsf-logo.translist" -->
+<h2>The Free Software Foundation Logo</h2>
+
+<p><a href="/graphics/logo-fsf.org-tiny.png"><img
+src="/graphics/logo-fsf.org-tiny.png" alt="[The Official FSF Logo]" /></a>
+</p>
+
+<p>The red logo is the new official logo of the Free Software Foundation.
+This great new logo is created by Li Jiang. The use of the older <a
+href="/graphics/fsf-logo-tiny.jpg">black-and-white logo</a> is
+discontinued. <strong>If you want to use this logo to link to a website
+operated by the FSF, feel free. If you wish to use it for any other
+purpose, please contact <a
+href="mailto:address@hidden Logo">address@hidden</a>.</strong>
+</p>
+
+<p>This red logo image is available in the following formats:</p>
+<ul>
+  <li>EPS <a href="/graphics/logo-fsf.org.eps">7.8 MB (Encapsulated
+    PostScript)</a></li>
+  <li>PNG <a href="/graphics/logo-fsf.org-tiny.png">9.1 KB (around 20% of
+    full size and reasonable quality)</a>, <a
+    href="/graphics/logo-fsf.org.png">43.6 KB (full size and quality)</a></li>
+  <li>SVG <a href="/graphics/logo-fsf.org.svg">14.6 KB (Scalable Vector
+    Graphic with a transparent background)</a></li>
+</ul>
+
+<p><a href="/graphics/graphics.html">Other art</a> in the GNU Art Gallery.
+</p>
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<p>Please send FSF &amp; GNU inquiries to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. There are also <a
+href="/contact/">other ways to contact</a> the FSF. <br />
+Please send broken links and other corrections or suggestions to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations README</a>
+for information on coordinating and submitting translations of this
+article.</p>
+
+<p>Copyright &copy; 2001, 2006 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated: 
+<!-- timestamp start -->
+$Date: 2012/01/28 01:27:59 $
+<!-- timestamp end --></p>
+</div>
+</div>
+</body>
+</html>



reply via email to

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