www-commits
[Top][All Lists]
Advanced

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

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


From: GNUN
Subject: www licenses/po/license-list.de.po licenses/po/...
Date: Wed, 19 Dec 2012 20:28:26 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/12/19 20:28:25

Modified files:
        licenses/po    : license-list.de.po license-list.es.po 
                         license-list.fr.po license-list.it.po 
                         license-list.pot license-list.ru.po 
        philosophy     : android-and-users-freedom.de.html 
        philosophy/po  : android-and-users-freedom.de-en.html 
                         not-ipr.nl.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.166&r2=1.167
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.103&r2=1.104
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/android-and-users-freedom.de.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.de-en.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/not-ipr.nl.po?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: licenses/po/license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- licenses/po/license-list.de.po      3 Dec 2012 20:43:16 -0000       1.86
+++ licenses/po/license-list.de.po      19 Dec 2012 20:27:18 -0000      1.87
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-11-29 16:56-0500\n"
+"POT-Creation-Date: 2012-12-19 15:25-0500\n"
 "PO-Revision-Date: 2012-12-03 21:00+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-12-19 15:25-0500\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -701,10 +702,15 @@
 "auf diese Weise zusammenarbeiten würden, dann ist CeCILL kein Problem."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
-"html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-id"
-"\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
+#| "html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-"
+#| "id\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+msgid ""
+"<a id=\"clearbsd\" href=\"http://directory.fsf.org/wiki/License:ClearBSD\";> "
+"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\" xml:lang=\"en\" lang=\"en\">Clear BSD License</a> <span class="
@@ -1661,15 +1667,19 @@
 "empfohlen, da sie Nutzer vor Patentverrat schützt."
 
 #. type: Content of: <dl><dt>
-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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
-"html\" xml:lang=\"en\" lang=\"en\">XFree86 1.1 License</a> <span class="
-"\"anchor-reference-id\">(<a href=\"#XFree861.1License\">#XFree861.1License</"
-"a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+#| "X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#X11License\">#X11License</a>)</span>"
+msgid ""
+"<a id=\"XFree861.1License\" href=\"http://directory.fsf.org/wiki/License:";
+"XFree86_1.1\"> XFree86 1.1 License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+msgstr ""
+"<a id=\"X11License\" href=\"/directory/wiki/License:X11\" xml:lang=\"en\" "
+"lang=\"en\">X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#X11License\">#X11License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1700,14 +1710,19 @@
 "\" lang=\"en\">X Window System License (X11)</a>."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+#| "License of imlib2</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#imlib\">#imlib</a>)</span>"
 msgid ""
-"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
+"<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
 "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\"; xml:lang="
-"\"en\" lang=\"en\">ZLib License</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#ZLib\">#ZLib</a>)</span>"
+"<a href=\"/directory/wiki/License:Imlib2\" id=\"imlib\" xml:lang=\"en\" lang="
+"\"en\">imlib2 License</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#imlib\">#imlib</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid "This is a free software license, and compatible with the GPL."
@@ -1715,10 +1730,17 @@
 
 #.  without decimal, leave for compatibility 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
-"legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> <span class="
-"\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/";
+#| "about_us/legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://directory.fsf.org/wiki?";
+"title=License:ZopePLv2.1\"> 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\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
 "legal/zpl.html\" xml:lang=\"en\" lang=\"en\">Zope Public License, Versions "
@@ -2817,13 +2839,19 @@
 "Details als jeder wichtigen Richtlinie mit der GNU GPL unvereinbar ist."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
-"<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\"; xml:lang=\"en\" lang=\"en"
-"\">Sun Public License</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL"
+"<a id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> Sun "
+"Public License</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL"
 "\">#SPL</a>)</span>"
+msgstr ""
+"<a id=\"EPL\" href=\"/directory/wiki/License:EPLv1.0\" xml:lang=\"en\" lang="
+"\"en\"> Eclipse Public License Version 1.0</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2838,10 +2866,15 @@
 "Source License</a> verwechseln, welche keine freie Softwarelizenz ist!"
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
-"Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#xinetd\">#xinetd</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id"
+#| "\"> (<a href=\"#xinetd\">#xinetd</a>)</span>"
+msgid ""
+"<a id=\"xinetd\" href=\"http://directory.fsf.org/wiki/License:Xinetd\";> "
+"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\" xml:lang=\"en\" lang=\"en\">Xinetd License</a> <span class="
@@ -3055,16 +3088,19 @@
 "Gebühr erhoben werden kann, verbietet."
 
 #. type: Content of: <dl><dt>
-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>"
-msgstr ""
-"<a id=\"apsl1\" href=\"https://fedoraproject.org/wiki/Licensing/";
-"Apple_Public_Source_License_1.2\" xml:lang=\"en\" lang=\"en\">Apple Public "
-"Source License (APSL), Version 1.x</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#apsl1\">#apsl1</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
+#| "Apple Public Source License (APSL), version 2</a> <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
+msgid ""
+"<a id=\"apsl1\" href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";> "
+"Apple Public Source License (APSL), version 1.x</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#apsl1\">#apsl1</a>)</span>"
+msgstr ""
+"<a id=\"apsl2\" href=\"/directory/wiki/License:APSLv2.0\" xml:lang=\"en\" "
+"lang=\"en\">Apple Public Source License (APSL), Version 2</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3079,13 +3115,21 @@
 "\"#apsl2\">Version 2.0 der APSL</a> ist eine freie Softwarelizenz."
 
 #. 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>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+#| "ArtisticLicense2.0\"> Artistic License 2.0</a> <span class=\"anchor-"
+#| "reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"ArtisticLicense\" href=\"http://directory.fsf.org/wiki/License:";
+"Artistic_v1.0\">Artistic License 1.0</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
 msgstr ""
-"<a id=\"ArtisticLicense\" xml:lang=\"en\" lang=\"en\">Artistic License 1.0</"
-"a> <span class=\"anchor-reference-id\">(<a href=\"#ArtisticLicense"
-"\">#ArtisticLicense</a>)</span>"
+"<a id=\"ArtisticLicense2\" href=\"/directory/wiki/License:"
+"ArtisticLicense2.0\" xml:lang=\"en\" lang=\"en\">Artistic License 2.0</a> "
+"<span class=\"anchor-reference-id\">(<a href="
+"\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3216,13 +3260,19 @@
 "vertreiben."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
-"<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class=\"anchor-"
+"<a id=\"eCos11\" href=\"http://directory.fsf.org/wiki/License:";
+"ECosPLv1.1\">eCos Public License, version 1.1</a> <span class=\"anchor-"
 "reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
 msgstr ""
-"<a id=\"eCos11\" xml:lang=\"en\" lang=\"en\">eCos Public License, Version "
-"1.1</a> <span class=\"anchor-reference-id\">(<a href=\"#eCos11\">#eCos11</a>)"
-"</span>"
+"<a id=\"EPL\" href=\"/directory/wiki/License:EPLv1.0\" xml:lang=\"en\" lang="
+"\"en\"> Eclipse Public License Version 1.0</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3248,11 +3298,16 @@
 
 # Version 1.1
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
-"\">#GPL-PA</a>)</span>"
+#, 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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
+#| "\">#GPL-PA</a>)</span>"
+msgid ""
+"<a id=\"GPL-PA\" href=\"http://directory.fsf.org/wiki/License:GPL-PA\";> GPL "
+"for Computer Programs of the Public 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\" xml:lang=\"en\" lang=\"en\">GPL for Computer "
@@ -3323,13 +3378,19 @@
 "Nutzung des Quellcodes ist auf Forschungszwecke beschränkt."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<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>"
+"<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> 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\"; xml:lang=\"en\" "
-"lang=\"en\">JSON License</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#JSON\">#JSON</a>)</span>"
+"<a id=\"ISC\" href=\"/directory/wiki/License:ISC\" xml:lang=\"en\" lang=\"en"
+"\">ISC License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC"
+"\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3375,14 +3436,19 @@
 "\"en\">Common Public License</a> freigegeben."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> "
+#| "License of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby"
+#| "\">#Ruby</a>)</span>"
 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/l/";
-"lha/current/copyright\" xml:lang=\"en\" lang=\"en\">License of Lha</a> <span "
-"class=\"anchor-reference-id\">(<a href=\"#Lha\">#Lha</a>)</span>"
+"<a id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";> License "
+"of Lha</a> <span class=\"anchor-reference-id\">(<a href=\"#Lha\">#Lha</a>)</"
+"span>"
+msgstr ""
+"<a id=\"Ruby\" href=\"/directory/wiki/License:Ruby\" xml:lang=\"en\" lang="
+"\"en\">License of Ruby</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#Ruby\">#Ruby</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3393,11 +3459,16 @@
 "man sich nicht sicher ist, welche Berechtigungen man hat."
 
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
-"\">#Ms-SS</a>)</span>"
+#, 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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
+#| "\">#Ms-SS</a>)</span>"
+msgid ""
+"<a id=\"Ms-SS\" href= \"http://directory.fsf.org/wiki/License:Ms-SS\";> "
+"Microsoft's Shared Source CLI, C#, and 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\" xml:lang=\"en\" lang=\"en\">Microsoft "
@@ -3422,14 +3493,19 @@
 "unterschiedliche Beschränkungen haben."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a href=\"#NASA"
-"\">#NASA</a>)</span>"
-msgstr ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\"; xml:lang=\"en"
-"\" lang=\"en\">NASA Open Source Agreement</a> <span class=\"anchor-reference-"
-"id\">(<a href=\"#NASA\">#NASA</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a";
+#| "\"> Nokia Open Source License</a> <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#Nokia\">#Nokia</a>)</span>"
+msgid ""
+"<a id=\"NASA\" href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> "
+"NASA Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#NASA\">#NASA</a>)</span>"
+msgstr ""
+"<a id=\"Nokia\" href=\"/directory/wiki/License:NokOSv1.0a\" xml:lang=\"en\" "
+"lang=\"en\">Nokia Open Source License</a> <span class=\"anchor-reference-id"
+"\">(<a href=\"#Nokia\">#Nokia</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3456,11 +3532,17 @@
 
 #.  old id, leave for compatibility 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| 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>"
 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>"
+"Fedora Project wiki\" href=\"http://directory.fsf.org/wiki/License:";
+"OpenPLv1.0\"> Open Public License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#OpenPublicL\">#OpenPublicL</a>)</span>"
 msgstr ""
 "<a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License im "
 "Fedora-Projekt-wiki\" href=\"https://fedoraproject.org/wiki/Licensing/";
@@ -3481,12 +3563,19 @@
 "wir nicht sicher sind, was ebenfalls problematisch sein könnte."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
-"<a id=\"PINE\" xml:lang=\"en\" lang=\"en\">License of PINE</a> <span class="
-"\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"ISC\" href=\"/directory/wiki/License:ISC\" xml:lang=\"en\" lang=\"en"
+"\">ISC License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC"
+"\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3544,15 +3633,19 @@
 "Jahr 2003 Plan&nbsp;9 zu <em>freie</em> software</a>."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
-msgstr ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\" xml:lang=\"en\" lang=\"en"
-"\">Reciprocal Public License</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#RPL\">#RPL</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"RPL\" href=\"http://directory.fsf.org/wiki/License:";
+"ReciprocalPLv1.3\"> Reciprocal Public License</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+msgstr ""
+"<a id=\"EPL\" href=\"/directory/wiki/License:EPLv1.0\" xml:lang=\"en\" lang="
+"\"en\"> Eclipse Public License Version 1.0</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3571,18 +3664,31 @@
 "private Nutzung."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#Scilab\">#Scilab</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Scilab\" href=\"http://directory.fsf.org/wiki/License:Scilab-old";
+"\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a href=\"#Scilab"
+"\">#Scilab</a>)</span>"
 msgstr ""
-"<a id=\"Scilab\" xml:lang=\"en\" lang=\"en\">Scilab License</a> <span class="
-"\"anchor-reference-id\">(<a href=\"#Scilab\">#Scilab</a>)</span>"
+"<a id=\"ISC\" href=\"/directory/wiki/License:ISC\" xml:lang=\"en\" lang=\"en"
+"\">ISC License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC"
+"\">#ISC</a>)</span>"
 
 #. 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&nbsp;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&nbsp;2."
+"distribution of a modified version.  Thankfully, starting from version "
+"5.0.0, the Scilab software is free software, released under CeCILL "
+"version&nbsp;2."
 msgstr ""
 "Dies ist keine freie Softwarelizenz, weil der kommerzielle Vertrieb einer "
 "modifizierten Version nicht erlaubt ist. Glücklicherweise sind neuere "
@@ -3590,14 +3696,19 @@
 "CeCILLv2."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
-"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\"; xml:"
-"lang=\"en\" lang=\"en\">Simple Machines License</a> <span class=\"anchor-"
-"reference-id\">(<a href=\"#SML\">#SML</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";> Simple "
+"Machines License</a> <span class=\"anchor-reference-id\">(<a href=\"#SML"
+"\">#SML</a>)</span>"
+msgstr ""
+"<a id=\"ISC\" href=\"/directory/wiki/License:ISC\" xml:lang=\"en\" lang=\"en"
+"\">ISC License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC"
+"\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3629,12 +3740,19 @@
 "von jemandem, der nicht die Lizenzbedingungen befolgte, erhielten."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#Squeak\">#Squeak</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Squeak\" href=\"http://directory.fsf.org/wiki/License:Squeak-old";
+"\">Old Squeak license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#Squeak\">#Squeak</a>)</span>"
 msgstr ""
-"<a id=\"Squeak\" xml:lang=\"en\" lang=\"en\">Old Squeak License</a> <span "
-"class=\"anchor-reference-id\">(<a href=\"#Squeak\">#Squeak</a>)</span>"
+"<a id=\"ISC\" href=\"/directory/wiki/License:ISC\" xml:lang=\"en\" lang=\"en"
+"\">ISC License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC"
+"\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3667,9 +3785,15 @@
 "unter der <a href=\"#apache2\">Apache-Lizenz&nbsp;2.0</a> freigegeben sind."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
-"class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+#| "\">#SunCommunitySourceLicense</a>)  </span>"
+msgid ""
+"<a id=\"SunCommunitySourceLicense\" href=\"http://directory.fsf.org/wiki/";
+"License:SunCSLv2.8\">Sun Community Source License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#SunCommunitySourceLicense"
 "\">#SunCommunitySourceLicense</a>)  </span>"
 msgstr ""
 "<a id=\"SunCommunitySourceLicense\" xml:lang=\"en\" lang=\"en\">Sun "
@@ -4552,6 +4676,127 @@
 msgstr "Aktualisierung:"
 
 #~ 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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/";
+#~ "LICENSE4.html\" xml:lang=\"en\" lang=\"en\">XFree86 1.1 License</a> <span "
+#~ "class=\"anchor-reference-id\">(<a href=\"#XFree861.1License"
+#~ "\">#XFree861.1License</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#~ "License 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\"; xml:"
+#~ "lang=\"en\" lang=\"en\">ZLib License</a> <span class=\"anchor-reference-id"
+#~ "\">(<a href=\"#ZLib\">#ZLib</a>)</span>"
+
+#~ msgid ""
+#~ "<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\"; xml:lang=\"en\" lang="
+#~ "\"en\">Sun Public License</a> <span class=\"anchor-reference-id\">(<a "
+#~ "href=\"#SPL\">#SPL</a>)</span>"
+
+#~ 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>"
+#~ msgstr ""
+#~ "<a id=\"apsl1\" href=\"https://fedoraproject.org/wiki/Licensing/";
+#~ "Apple_Public_Source_License_1.2\" xml:lang=\"en\" lang=\"en\">Apple "
+#~ "Public Source License (APSL), Version 1.x</a> <span class=\"anchor-"
+#~ "reference-id\">(<a href=\"#apsl1\">#apsl1</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"ArtisticLicense\" xml:lang=\"en\" lang=\"en\">Artistic License "
+#~ "1.0</a> <span class=\"anchor-reference-id\">(<a href=\"#ArtisticLicense"
+#~ "\">#ArtisticLicense</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"eCos11\" xml:lang=\"en\" lang=\"en\">eCos Public License, Version "
+#~ "1.1</a> <span class=\"anchor-reference-id\">(<a href=\"#eCos11\">#eCos11</"
+#~ "a>)</span>"
+
+#~ msgid ""
+#~ "<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\"; xml:lang=\"en\" "
+#~ "lang=\"en\">JSON License</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#JSON\">#JSON</a>)</span>"
+
+#~ 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/";
+#~ "l/lha/current/copyright\" xml:lang=\"en\" lang=\"en\">License of Lha</a> "
+#~ "<span class=\"anchor-reference-id\">(<a href=\"#Lha\">#Lha</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA "
+#~ "Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#NASA\">#NASA</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\"; xml:lang="
+#~ "\"en\" lang=\"en\">NASA Open Source Agreement</a> <span class=\"anchor-"
+#~ "reference-id\">(<a href=\"#NASA\">#NASA</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">"
+#~ "(<a href=\"#PINE\">#PINE</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"PINE\" xml:lang=\"en\" lang=\"en\">License of PINE</a> <span "
+#~ "class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\" xml:lang=\"en\" lang=\"en"
+#~ "\">Reciprocal Public License</a> <span class=\"anchor-reference-id\">(<a "
+#~ "href=\"#RPL\">#RPL</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Scilab\" xml:lang=\"en\" lang=\"en\">Scilab License</a> <span "
+#~ "class=\"anchor-reference-id\">(<a href=\"#Scilab\">#Scilab</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
+#~ "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\"; "
+#~ "xml:lang=\"en\" lang=\"en\">Simple Machines License</a> <span class="
+#~ "\"anchor-reference-id\">(<a href=\"#SML\">#SML</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id"
+#~ "\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Squeak\" xml:lang=\"en\" lang=\"en\">Old Squeak License</a> <span "
+#~ "class=\"anchor-reference-id\">(<a href=\"#Squeak\">#Squeak</a>)</span>"
+
+#~ msgid ""
 #~ "<a id=\"EPL\" href=\"http://www.eclipse.org/legal/epl-v10.html\";> Eclipse "
 #~ "Public License Version 1.0</a> <span class=\"anchor-reference-id\">(<a "
 #~ "href=\"#EPL\">#EPL</a>)</span>"

Index: licenses/po/license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- licenses/po/license-list.es.po      1 Dec 2012 01:02:30 -0000       1.52
+++ licenses/po/license-list.es.po      19 Dec 2012 20:27:19 -0000      1.53
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: license-list.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-01 01:40+0100\n"
+"POT-Creation-Date: 2012-12-19 15:25-0500\n"
 "PO-Revision-Date: 2012-12-01 01:52+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-12-19 15:25-0500\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -779,10 +780,20 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
-"html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-id"
-"\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+# | <a id=\"clearbsd\"
+# | [-href=\"http://labs.metacarta.com/license-explanation.html#license\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:ClearBSD\";>+} The Clear BSD
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#clearbsd\">#clearbsd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
+#| "html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-"
+#| "id\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+msgid ""
+"<a id=\"clearbsd\" href=\"http://directory.fsf.org/wiki/License:ClearBSD\";> "
+"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\"> <cite>The Clear BSD License</cite></a> <span class=\"anchor-"
@@ -1793,16 +1804,26 @@
 "use la Apache 2.0 pues tal licencia protege a los usuarios contra la trampa "
 "de las patentes."
 
-# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
-"html\"> <cite>XFree86 1.1 License</cite></a> <span class=\"anchor-reference-"
-"id\"> (<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+# | <a [-id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";>
+# | X11-] {+id=\"XFree861.1License\"
+# | href=\"http://directory.fsf.org/wiki/License:XFree86_1.1\";> XFree86 1.1+}
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#X11License\">#X11License</a>)</span>-]
+# | {+href=\"#XFree861.1License\">#XFree861.1License</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+#| "X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#X11License\">#X11License</a>)</span>"
+msgid ""
+"<a id=\"XFree861.1License\" href=\"http://directory.fsf.org/wiki/License:";
+"XFree86_1.1\"> XFree86 1.1 License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+msgstr ""
+"<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+"Licencia X11</a> <span class=\"anchor-reference-id\"> (<a href=\"#X11License"
+"\">#X11License</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1837,14 +1858,24 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";>-]
+# | {+id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";>+}
+# | License of [-imlib2</a>-] {+ZLib</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#imlib\">#imlib</a>)</span>-]
+# | {+href=\"#ZLib\">#ZLib</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+#| "License of imlib2</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#imlib\">#imlib</a>)</span>"
 msgid ""
-"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
+"<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
 "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\";> Licencia "
-"de ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
-"</span>"
+"<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+"Licencia de imlib2</a> <span class=\"anchor-reference-id\">(<a href=\"#imlib"
+"\">#imlib</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1854,10 +1885,22 @@
 # type: Content of: <dl><dt>
 #.  without decimal, leave for compatibility 
 #. type: Content of: <dl><dt>
+# | <a id=\"Zope20\"></a> <a id=\"Zope2.0\"
+# | [-href=\"http://www.zope.com/about_us/legal/zpl.html\";>-]
+# | {+href=\"http://directory.fsf.org/wiki?title=License:ZopePLv2.1\";>+} Zope
+# | Public License, versions 2.0 and 2.1</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/";
+#| "about_us/legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</"
+#| "span>"
 msgid ""
-"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
-"legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> <span class="
-"\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
+"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://directory.fsf.org/wiki?";
+"title=License:ZopePLv2.1\"> 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\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
 "legal/zpl.html\"> <cite>Zope Public License</cite>, versiones 2.0 y 2.1</a> "
@@ -3047,13 +3090,25 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<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>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"SPL\"
+# | href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> Sun+} Public
+# | [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#SPL\">#SPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> 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\";> Licencia Pública de "
-"Sun</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</"
-"span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:";
+"EPLv1.0\"><cite>Eclipse Public License</cite>, versión  1.0</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3070,10 +3125,20 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
-"Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#xinetd\">#xinetd</a>)</span>"
+# | <a id=\"xinetd\"
+# | [-href=\"http://fedoraproject.org/wiki/Licensing/Xinetd_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:Xinetd\";>+} License of
+# | xinetd</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#xinetd\">#xinetd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id"
+#| "\"> (<a href=\"#xinetd\">#xinetd</a>)</span>"
+msgid ""
+"<a id=\"xinetd\" href=\"http://directory.fsf.org/wiki/License:Xinetd\";> "
+"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\"> Licencia de xinetd</a> <span class=\"anchor-reference-id"
@@ -3297,17 +3362,27 @@
 "permite cobrar las distribuciones y prohíbe empaquetar software bajo ella "
 "con cualquier otro tipo de software por el cual se cobre un precio."
 
+# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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>"
-msgstr ""
-"<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
-"Apple_Public_Source_License_1.2\"> <cite>Apple Public Source License</cite>  "
-"(APSL), versión 1.x</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#apsl1\">#apsl1</a>)</span>"
+# | <a [-id=\"apsl2\"
+# | href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";>-] {+id=\"apsl1\"
+# | href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";>+} Apple Public
+# | Source License (APSL), version [-2</a>-] {+1.x</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#apsl2\">#apsl2</a>)</span>-]
+# | {+href=\"#apsl1\">#apsl1</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
+#| "Apple Public Source License (APSL), version 2</a> <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
+msgid ""
+"<a id=\"apsl1\" href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";> "
+"Apple Public Source License (APSL), version 1.x</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#apsl1\">#apsl1</a>)</span>"
+msgstr ""
+"<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:";
+"APSLv2.0\"><cite>Apple Public Source License (APSL)</cite>, versión 2</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3322,13 +3397,29 @@
 "ni software que esté bajo las mismas  La <a href=\"#apsl2\">versión 2.0 de "
 "la APSL</a> sí es de software libre."
 
+# type: Content of: <dl><dt>
 #. 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>"
+# | <a [-id=\"ArtisticLicense2\"
+# | href=\"http://directory.fsf.org/wiki/License:ArtisticLicense2.0\";>
+# | Artistic-] {+id=\"ArtisticLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:Artistic_v1.0\";>Artistic+}
+# | License [-2-]{+1+}.0</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>-]
+# | {+href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+#| "ArtisticLicense2.0\"> Artistic License 2.0</a> <span class=\"anchor-"
+#| "reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"ArtisticLicense\" href=\"http://directory.fsf.org/wiki/License:";
+"Artistic_v1.0\">Artistic License 1.0</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
 msgstr ""
-"<a id=\"ArtisticLicense\">Licencia Artística 1.0</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+"<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+"ArtisticLicense2.0\">Licencia Artística 2.0</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3468,13 +3559,27 @@
 "se interprete la sección 3.4, puede que tampoco tenga permiso para "
 "distribuir el software de ningún modo."
 
+# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"eCos11\"
+# | href=\"http://directory.fsf.org/wiki/License:ECosPLv1.1\";>eCos+} Public
+# | [-License Version 1.0</a>-] {+License, version 1.1</a>+} <span
+# | [-class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>-]
+# | {+class=\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
-"<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class=\"anchor-"
+"<a id=\"eCos11\" href=\"http://directory.fsf.org/wiki/License:";
+"ECosPLv1.1\">eCos Public License, version 1.1</a> <span class=\"anchor-"
 "reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
 msgstr ""
-"<a id=\"eCos11\">Licencia Pública de eCos, versión 1.1</a> <span class="
-"\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:";
+"EPLv1.0\"><cite>Eclipse Public License</cite>, versión  1.0</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3500,11 +3605,21 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
-"\">#GPL-PA</a>)</span>"
+# | <a id=\"GPL-PA\"
+# | 
[-href=\"http://www.celepar.pr.gov.br/modules/conteudo/conteudo.php?conteudo=69\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:GPL-PA\";>+} GPL for
+# | Computer Programs of the Public Administration</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#GPL-PA\">#GPL-PA</a>)</span>
+#, 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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
+#| "\">#GPL-PA</a>)</span>"
+msgid ""
+"<a id=\"GPL-PA\" href=\"http://directory.fsf.org/wiki/License:GPL-PA\";> GPL "
+"for Computer Programs of the Public 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 para Programas de Computación de la "
@@ -3581,14 +3696,24 @@
 "La <cite>Jahia Community Source License</cite> no es de software libre. El "
 "uso del código fuente está limitado a fines de investigación."
 
-# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> The
+# | JSON+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#JSON\">#JSON</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<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>"
+"<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> 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\";> Licencia JSON</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licencia "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3638,14 +3763,24 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";>-]
+# | {+id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";>+}
+# | License of [-Ruby</a>-] {+Lha</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Ruby\">#Ruby</a>)</span>-]
+# | {+href=\"#Lha\">#Lha</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> "
+#| "License of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby"
+#| "\">#Ruby</a>)</span>"
 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/l/";
-"lha/current/copyright\"> Licencia de Lha</a> <span class=\"anchor-reference-"
-"id\">(<a href=\"#Lha\">#Lha</a>)</span>"
+"<a id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";> License "
+"of Lha</a> <span class=\"anchor-reference-id\">(<a href=\"#Lha\">#Lha</a>)</"
+"span>"
+msgstr ""
+"<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> Licencia "
+"de Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3658,11 +3793,21 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
-"\">#Ms-SS</a>)</span>"
+# | <a id=\"Ms-SS\" href=
+# | 
[-\"http://fedoraproject.org/wiki/Licensing/Microsoft_Shared_Source_License\";>-]
+# | {+\"http://directory.fsf.org/wiki/License:Ms-SS\";>+} Microsoft's Shared
+# | Source CLI, C#, and Jscript License</a> <span
+# | class=\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>
+#, 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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
+#| "\">#Ms-SS</a>)</span>"
+msgid ""
+"<a id=\"Ms-SS\" href= \"http://directory.fsf.org/wiki/License:Ms-SS\";> "
+"Microsoft's Shared Source CLI, C#, and 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\"> <cite>Microsoft's Shared Source CLI</"
@@ -3687,15 +3832,28 @@
 "Microsoft posee otras licencias que describe como «<cite>Shared Source</"
 "cite>», algunas de las cuales poseen diferentes restricciones."
 
+# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a href=\"#NASA"
-"\">#NASA</a>)</span>"
-msgstr ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> <cite>NASA "
-"Open Source Agreement</cite></a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#NASA\">#NASA</a>)</span>"
+# | <a [-id=\"Nokia\"
+# | href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> Nokia-]
+# | {+id=\"NASA\"
+# | href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> NASA+} Open
+# | Source [-License</a>-] {+Agreement</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Nokia\">#Nokia</a>)</span>-]
+# | {+href=\"#NASA\">#NASA</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a";
+#| "\"> Nokia Open Source License</a> <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#Nokia\">#Nokia</a>)</span>"
+msgid ""
+"<a id=\"NASA\" href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> "
+"NASA Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#NASA\">#NASA</a>)</span>"
+msgstr ""
+"<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a";
+"\"><cite>Nokia Open Source License</cite></a> <span class=\"anchor-reference-"
+"id\">(<a href=\"#Nokia\">#Nokia</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3724,11 +3882,23 @@
 # type: Content of: <dl><dt>
 #.  old id, leave for compatibility 
 #. type: Content of: <dl><dt>
+# | <a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at
+# | Fedora Project wiki\"
+# | [-href=\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:OpenPLv1.0\";>+} Open Public
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#OpenPublicL\">#OpenPublicL</a>)</span>
+#, fuzzy
+#| 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>"
 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>"
+"Fedora Project wiki\" href=\"http://directory.fsf.org/wiki/License:";
+"OpenPLv1.0\"> Open Public License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#OpenPublicL\">#OpenPublicL</a>)</span>"
 msgstr ""
 "<a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at "
 "Fedora Project wiki\" href=\"https://fedoraproject.org/wiki/Licensing/";
@@ -3749,12 +3919,24 @@
 "seguros y que podrían ser problemáticos."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"PINE\"
+# | href=\"http://directory.fsf.org/wiki/License:PINE\";>License of PINE</a>+}
+# | <span class=\"anchor-reference-id\">(<a [-href=\"#ISC\">#ISC</a>)</span>-]
+# | {+href=\"#PINE\">#PINE</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
-"<a id=\"PINE\">Licencia de PINE</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licencia "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3816,14 +3998,25 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
-msgstr ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Licencia Pública 
Recíproca</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"RPL\"
+# | href=\"http://directory.fsf.org/wiki/License:ReciprocalPLv1.3\";>
+# | Reciprocal+} Public [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#RPL\">#RPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"RPL\" href=\"http://directory.fsf.org/wiki/License:";
+"ReciprocalPLv1.3\"> Reciprocal Public License</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+msgstr ""
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:";
+"EPLv1.0\"><cite>Eclipse Public License</cite>, versión  1.0</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3842,34 +4035,65 @@
 "usa en forma privada."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#Scilab\">#Scilab</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Scilab\"
+# | href=\"http://directory.fsf.org/wiki/License:Scilab-old\";>Scilab
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Scilab\">#Scilab</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Scilab\" href=\"http://directory.fsf.org/wiki/License:Scilab-old";
+"\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a href=\"#Scilab"
+"\">#Scilab</a>)</span>"
 msgstr ""
-"<a id=\"Scilab\">Licencia Scilab</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#Scilab\">#Scilab</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licencia "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is not a free software license because it does not allow commercial
+# | distribution of a modified version.  Thankfully, [-recent versions of-]
+# | {+starting from version 5.0.0,+} the Scilab software [-are-] {+is+} free
+# | software, released under CeCILL version&nbsp;2.
+#, 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&nbsp;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&nbsp;2."
+"distribution of a modified version.  Thankfully, starting from version "
+"5.0.0, the Scilab software is 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. Por suerte, las versiones recientes del software "
 "de Scilab son software libre, publicadas bajo la licencia CeCILL versión 2."
 
-# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
-"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\";> "
-"<cite>Simple Machines License</cite></a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#SML\">#SML</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";>
+# | Simple Machines+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#SML\">#SML</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";> Simple "
+"Machines License</a> <span class=\"anchor-reference-id\">(<a href=\"#SML"
+"\">#SML</a>)</span>"
+msgstr ""
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licencia "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3907,12 +4131,25 @@
 "la licencia."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#Squeak\">#Squeak</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Squeak\"
+# | href=\"http://directory.fsf.org/wiki/License:Squeak-old\";>Old Squeak
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Squeak\">#Squeak</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Squeak\" href=\"http://directory.fsf.org/wiki/License:Squeak-old";
+"\">Old Squeak license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#Squeak\">#Squeak</a>)</span>"
 msgstr ""
-"<a id=\"Squeak\">La antigua licencia de Squeak</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licencia "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3949,9 +4186,21 @@
 "<a href=\"#apache2\">Licencia Apache 2.0</a>."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
-"class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+# | <a [-id=\"SunCommunitySourceLicense\">Sun-]
+# | {+id=\"SunCommunitySourceLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:SunCSLv2.8\";>Sun+} Community
+# | Source License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#SunCommunitySourceLicense\">#SunCommunitySourceLicense</a>) 
+# | </span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+#| "\">#SunCommunitySourceLicense</a>)  </span>"
+msgid ""
+"<a id=\"SunCommunitySourceLicense\" href=\"http://directory.fsf.org/wiki/";
+"License:SunCSLv2.8\">Sun Community Source License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#SunCommunitySourceLicense"
 "\">#SunCommunitySourceLicense</a>)  </span>"
 msgstr ""
 "<a id=\"SunCommunitySourceLicense\"><cite>Sun Community Source License</"
@@ -4879,3 +5128,128 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización: "
+
+# type: Content of: <dl><dt>
+#~ 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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/";
+#~ "LICENSE4.html\"> <cite>XFree86 1.1 License</cite></a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#XFree861.1License"
+#~ "\">#XFree861.1License</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#~ "License 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\";> "
+#~ "Licencia de ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib"
+#~ "\">#ZLib</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<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\";> Licencia Pública de "
+#~ "Sun</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</"
+#~ "span>"
+
+#~ 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>"
+#~ msgstr ""
+#~ "<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
+#~ "Apple_Public_Source_License_1.2\"> <cite>Apple Public Source License</"
+#~ "cite>  (APSL), versión 1.x</a> <span class=\"anchor-reference-id\">(<a "
+#~ "href=\"#apsl1\">#apsl1</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"ArtisticLicense\">Licencia Artística 1.0</a> <span 
class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"eCos11\">Licencia Pública de eCos, versión 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<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\";> Licencia JSON</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</"
+#~ "span>"
+
+# type: Content of: <dl><dt>
+#~ 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/";
+#~ "l/lha/current/copyright\"> Licencia de Lha</a> <span class=\"anchor-"
+#~ "reference-id\">(<a href=\"#Lha\">#Lha</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA "
+#~ "Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#NASA\">#NASA</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> "
+#~ "<cite>NASA Open Source Agreement</cite></a> <span class=\"anchor-"
+#~ "reference-id\">(<a href=\"#NASA\">#NASA</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">"
+#~ "(<a href=\"#PINE\">#PINE</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"PINE\">Licencia de PINE</a> <span class=\"anchor-reference-id\">"
+#~ "(<a href=\"#PINE\">#PINE</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Licencia Pública 
Recíproca</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Scilab\">Licencia Scilab</a> <span class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
+#~ "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\";> "
+#~ "<cite>Simple Machines License</cite></a> <span class=\"anchor-reference-id"
+#~ "\">(<a href=\"#SML\">#SML</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id"
+#~ "\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Squeak\">La antigua licencia de Squeak</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- licenses/po/license-list.fr.po      1 Dec 2012 18:03:47 -0000       1.166
+++ licenses/po/license-list.fr.po      19 Dec 2012 20:27:19 -0000      1.167
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-11-29 16:56-0500\n"
+"POT-Creation-Date: 2012-12-19 15:25-0500\n"
 "PO-Revision-Date: 2012-11-30 19:56+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-12-19 15:25-0500\n"
 "Plural-Forms:  \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -715,10 +716,20 @@
 "ce sens avec les utilisateurs, alors ce n'est pas un problème pour vous."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
-"html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-id"
-"\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+# | <a id=\"clearbsd\"
+# | [-href=\"http://labs.metacarta.com/license-explanation.html#license\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:ClearBSD\";>+} The Clear BSD
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#clearbsd\">#clearbsd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
+#| "html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-"
+#| "id\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+msgid ""
+"<a id=\"clearbsd\" href=\"http://directory.fsf.org/wiki/License:ClearBSD\";> "
+"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\">Licence BSD clarifiée</a> <span 
class=\"anchor-reference-id\">"
@@ -1682,14 +1693,25 @@
 "aux brevets."
 
 #. type: Content of: <dl><dt>
-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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
-"html\"> Licence XFree86 1.1</a> <span class=\"anchor-reference-id\">(<a 
href="
-"\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+# | <a [-id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";>
+# | X11-] {+id=\"XFree861.1License\"
+# | href=\"http://directory.fsf.org/wiki/License:XFree86_1.1\";> XFree86 1.1+}
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#X11License\">#X11License</a>)</span>-]
+# | {+href=\"#XFree861.1License\">#XFree861.1License</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+#| "X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#X11License\">#X11License</a>)</span>"
+msgid ""
+"<a id=\"XFree861.1License\" href=\"http://directory.fsf.org/wiki/License:";
+"XFree86_1.1\"> XFree86 1.1 License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+msgstr ""
+"<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:";
+"X11\">License X11</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#X11License\">#X11License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1720,14 +1742,24 @@
 "\"#X11License\">X11</a>."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";>-]
+# | {+id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";>+}
+# | License of [-imlib2</a>-] {+ZLib</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#imlib\">#imlib</a>)</span>-]
+# | {+href=\"#ZLib\">#ZLib</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+#| "License of imlib2</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#imlib\">#imlib</a>)</span>"
 msgid ""
-"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
+"<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
 "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\";> Licence "
-"de ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
-"</span>"
+"<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+"Licence de imlib2</a> <span class=\"anchor-reference-id\">(<a href=\"#imlib"
+"\">#imlib</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid "This is a free software license, and compatible with the GPL."
@@ -1735,10 +1767,22 @@
 
 #.  without decimal, leave for compatibility 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
-"legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> <span class="
-"\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
+# | <a id=\"Zope20\"></a> <a id=\"Zope2.0\"
+# | [-href=\"http://www.zope.com/about_us/legal/zpl.html\";>-]
+# | {+href=\"http://directory.fsf.org/wiki?title=License:ZopePLv2.1\";>+} Zope
+# | Public License, versions 2.0 and 2.1</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/";
+#| "about_us/legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://directory.fsf.org/wiki?";
+"title=License:ZopePLv2.1\"> 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\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
 "legal/zpl.html\">Zope Public License, versions 2.0 et 2.1</a> <span class="
@@ -2846,12 +2890,25 @@
 "la GNU GPL mais seulement à cause de certains détails, pas dans son esprit."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<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>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"SPL\"
+# | href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> Sun+} Public
+# | [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#SPL\">#SPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> 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> "
-"<span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Eclipse Public License, version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2866,10 +2923,20 @@
 "Source License</a> qui, elle, n'est pas une licence de logiciel libre."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
-"Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#xinetd\">#xinetd</a>)</span>"
+# | <a id=\"xinetd\"
+# | [-href=\"http://fedoraproject.org/wiki/Licensing/Xinetd_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:Xinetd\";>+} License of
+# | xinetd</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#xinetd\">#xinetd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id"
+#| "\"> (<a href=\"#xinetd\">#xinetd</a>)</span>"
+msgid ""
+"<a id=\"xinetd\" href=\"http://directory.fsf.org/wiki/License:Xinetd\";> "
+"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\">Licence de xinetd</a> <span class=\"anchor-reference-id\"> "
@@ -3081,16 +3148,25 @@
 "de logiciels couverts par cette licence avec quoi que ce soit de payant."
 
 #. type: Content of: <dl><dt>
-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>"
-msgstr ""
-"<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>"
+# | <a [-id=\"apsl2\"
+# | href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";>-] {+id=\"apsl1\"
+# | href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";>+} Apple Public
+# | Source License (APSL), version [-2</a>-] {+1.x</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#apsl2\">#apsl2</a>)</span>-]
+# | {+href=\"#apsl1\">#apsl1</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
+#| "Apple Public Source License (APSL), version 2</a> <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
+msgid ""
+"<a id=\"apsl1\" href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";> "
+"Apple Public Source License (APSL), version 1.x</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#apsl1\">#apsl1</a>)</span>"
+msgstr ""
+"<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
+"Apple Public Source License (APSL), version 2</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3106,12 +3182,27 @@
 "est une licence de logiciel libre."
 
 #. 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>"
+# | <a [-id=\"ArtisticLicense2\"
+# | href=\"http://directory.fsf.org/wiki/License:ArtisticLicense2.0\";>
+# | Artistic-] {+id=\"ArtisticLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:Artistic_v1.0\";>Artistic+}
+# | License [-2-]{+1+}.0</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>-]
+# | {+href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+#| "ArtisticLicense2.0\"> Artistic License 2.0</a> <span class=\"anchor-"
+#| "reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"ArtisticLicense\" href=\"http://directory.fsf.org/wiki/License:";
+"Artistic_v1.0\">Artistic License 1.0</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
 msgstr ""
-"<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+"<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+"ArtisticLicense2.0\"> Artistic License 2.0</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3240,12 +3331,25 @@
 "le faire."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"eCos11\"
+# | href=\"http://directory.fsf.org/wiki/License:ECosPLv1.1\";>eCos+} Public
+# | [-License Version 1.0</a>-] {+License, version 1.1</a>+} <span
+# | [-class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>-]
+# | {+class=\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
-"<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class=\"anchor-"
+"<a id=\"eCos11\" href=\"http://directory.fsf.org/wiki/License:";
+"ECosPLv1.1\">eCos Public License, version 1.1</a> <span class=\"anchor-"
 "reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
 msgstr ""
-"<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Eclipse Public License, version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3270,11 +3374,21 @@
 "libres."
 
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
-"\">#GPL-PA</a>)</span>"
+# | <a id=\"GPL-PA\"
+# | 
[-href=\"http://www.celepar.pr.gov.br/modules/conteudo/conteudo.php?conteudo=69\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:GPL-PA\";>+} GPL for
+# | Computer Programs of the Public Administration</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#GPL-PA\">#GPL-PA</a>)</span>
+#, 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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
+#| "\">#GPL-PA</a>)</span>"
+msgid ""
+"<a id=\"GPL-PA\" href=\"http://directory.fsf.org/wiki/License:GPL-PA\";> GPL "
+"for Computer Programs of the Public 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 pour les programmes informatiques de "
@@ -3344,13 +3458,23 @@
 "développement."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> The
+# | JSON+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#JSON\">#JSON</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<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>"
+"<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> 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\";> <acronym title="
-"\"JavaScript Object Notation\">JSON</acronym> License</a> <span class="
-"\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licence de "
+"l'<acronym title=\"Internet Systems Consortium\">ISC</acronym></a> <span "
+"class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3395,14 +3519,24 @@
 "\"#CommonPublicLicense10\">Common Public License</a>."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";>-]
+# | {+id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";>+}
+# | License of [-Ruby</a>-] {+Lha</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Ruby\">#Ruby</a>)</span>-]
+# | {+href=\"#Lha\">#Lha</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> "
+#| "License of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby"
+#| "\">#Ruby</a>)</span>"
 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\"> Licence de Lha</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#Lha\">#Lha</a>)</span>"
+"<a id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";> License "
+"of Lha</a> <span class=\"anchor-reference-id\">(<a href=\"#Lha\">#Lha</a>)</"
+"span>"
+msgstr ""
+"<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> Licence "
+"de Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3413,11 +3547,21 @@
 "imprécise pour donner des permissions claires."
 
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
-"\">#Ms-SS</a>)</span>"
+# | <a id=\"Ms-SS\" href=
+# | 
[-\"http://fedoraproject.org/wiki/Licensing/Microsoft_Shared_Source_License\";>-]
+# | {+\"http://directory.fsf.org/wiki/License:Ms-SS\";>+} Microsoft's Shared
+# | Source CLI, C#, and Jscript License</a> <span
+# | class=\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>
+#, 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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
+#| "\">#Ms-SS</a>)</span>"
+msgid ""
+"<a id=\"Ms-SS\" href= \"http://directory.fsf.org/wiki/License:Ms-SS\";> "
+"Microsoft's Shared Source CLI, C#, and 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 "
@@ -3441,14 +3585,26 @@
 "parmi lesquelles certaines ont diverses restrictions."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a href=\"#NASA"
-"\">#NASA</a>)</span>"
-msgstr ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a href=\"#NASA"
-"\">#NASA</a>)</span>"
+# | <a [-id=\"Nokia\"
+# | href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> Nokia-]
+# | {+id=\"NASA\"
+# | href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> NASA+} Open
+# | Source [-License</a>-] {+Agreement</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Nokia\">#Nokia</a>)</span>-]
+# | {+href=\"#NASA\">#NASA</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a";
+#| "\"> Nokia Open Source License</a> <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#Nokia\">#Nokia</a>)</span>"
+msgid ""
+"<a id=\"NASA\" href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> "
+"NASA Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#NASA\">#NASA</a>)</span>"
+msgstr ""
+"<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> "
+"Nokia Open Source License</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#Nokia\">#Nokia</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3475,11 +3631,23 @@
 
 #.  old id, leave for compatibility 
 #. type: Content of: <dl><dt>
+# | <a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at
+# | Fedora Project wiki\"
+# | [-href=\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:OpenPLv1.0\";>+} Open Public
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#OpenPublicL\">#OpenPublicL</a>)</span>
+#, fuzzy
+#| 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>"
 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>"
+"Fedora Project wiki\" href=\"http://directory.fsf.org/wiki/License:";
+"OpenPLv1.0\"> Open Public License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#OpenPublicL\">#OpenPublicL</a>)</span>"
 msgstr ""
 "<a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at "
 "Fedora Project wiki\" href=\"https://fedoraproject.org/wiki/Licensing/";
@@ -3499,13 +3667,24 @@
 "nous ne savons pas au juste si nous avons bien tout compris."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"PINE\"
+# | href=\"http://directory.fsf.org/wiki/License:PINE\";>License of PINE</a>+}
+# | <span class=\"anchor-reference-id\">(<a [-href=\"#ISC\">#ISC</a>)</span>-]
+# | {+href=\"#PINE\">#PINE</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
-"<a id=\"PINE\">Licence de <acronym title=\"Program for Internet News and E-"
-"mail\">Pine</acronym></a> <span class=\"anchor-reference-id\">(<a href="
-"\"#PINE\">#PINE</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licence de "
+"l'<acronym title=\"Internet Systems Consortium\">ISC</acronym></a> <span "
+"class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3563,14 +3742,25 @@
 "licence en 2003 fait de Plan 9 un logiciel libre."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
-msgstr ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"RPL\"
+# | href=\"http://directory.fsf.org/wiki/License:ReciprocalPLv1.3\";>
+# | Reciprocal+} Public [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#RPL\">#RPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"RPL\" href=\"http://directory.fsf.org/wiki/License:";
+"ReciprocalPLv1.3\"> Reciprocal Public License</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+msgstr ""
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Eclipse Public License, version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3588,18 +3778,41 @@
 "organisation, même si elle l'utilise de façon privée."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#Scilab\">#Scilab</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Scilab\"
+# | href=\"http://directory.fsf.org/wiki/License:Scilab-old\";>Scilab
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Scilab\">#Scilab</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Scilab\" href=\"http://directory.fsf.org/wiki/License:Scilab-old";
+"\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a href=\"#Scilab"
+"\">#Scilab</a>)</span>"
 msgstr ""
-"<a id=\"Scilab\">Licence Scilab</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#Scilab\">#Scilab</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licence de "
+"l'<acronym title=\"Internet Systems Consortium\">ISC</acronym></a> <span "
+"class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is not a free software license because it does not allow commercial
+# | distribution of a modified version.  Thankfully, [-recent versions of-]
+# | {+starting from version 5.0.0,+} the Scilab software [-are-] {+is+} free
+# | software, released under CeCILL version&nbsp;2.
+#, 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&nbsp;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&nbsp;2."
+"distribution of a modified version.  Thankfully, starting from version "
+"5.0.0, the Scilab software is free software, released under CeCILL "
+"version&nbsp;2."
 msgstr ""
 "Ce n'est pas une licence de logiciel libre car elle n'autorise pas la "
 "distribution commerciale d'une version modifiée. Heureusement, les versions "
@@ -3607,14 +3820,23 @@
 "termes de la licence CeCILL version 2."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
-"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> <span class=\"anchor-reference-id\">(<a href="
-"\"#SML\">#SML</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";>
+# | Simple Machines+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#SML\">#SML</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";> Simple "
+"Machines License</a> <span class=\"anchor-reference-id\">(<a href=\"#SML"
+"\">#SML</a>)</span>"
+msgstr ""
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licence de "
+"l'<acronym title=\"Internet Systems Consortium\">ISC</acronym></a> <span "
+"class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3648,12 +3870,25 @@
 "logiciel de quelqu'un qui n'obéit pas aux termes de la licence."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#Squeak\">#Squeak</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Squeak\"
+# | href=\"http://directory.fsf.org/wiki/License:Squeak-old\";>Old Squeak
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Squeak\">#Squeak</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Squeak\" href=\"http://directory.fsf.org/wiki/License:Squeak-old";
+"\">Old Squeak license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#Squeak\">#Squeak</a>)</span>"
 msgstr ""
-"<a id=\"Squeak\">Ancienne licence de Squeak</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licence de "
+"l'<acronym title=\"Internet Systems Consortium\">ISC</acronym></a> <span "
+"class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3687,9 +3922,21 @@
 "href=\"#apache2\">licence Apache 2.0</a>."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
-"class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+# | <a [-id=\"SunCommunitySourceLicense\">Sun-]
+# | {+id=\"SunCommunitySourceLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:SunCSLv2.8\";>Sun+} Community
+# | Source License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#SunCommunitySourceLicense\">#SunCommunitySourceLicense</a>) 
+# | </span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+#| "\">#SunCommunitySourceLicense</a>)  </span>"
+msgid ""
+"<a id=\"SunCommunitySourceLicense\" href=\"http://directory.fsf.org/wiki/";
+"License:SunCSLv2.8\">Sun Community Source License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#SunCommunitySourceLicense"
 "\">#SunCommunitySourceLicense</a>)  </span>"
 msgstr ""
 "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
@@ -4572,6 +4819,123 @@
 msgstr "Dernière mise à jour :"
 
 #~ 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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/";
+#~ "LICENSE4.html\"> Licence XFree86 1.1</a> <span 
class=\"anchor-reference-id"
+#~ "\">(<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#~ "License 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\";> "
+#~ "Licence de ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib"
+#~ "\">#ZLib</a>)</span>"
+
+#~ msgid ""
+#~ "<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> <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</span>"
+
+#~ 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>"
+#~ msgstr ""
+#~ "<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>"
+
+#~ msgid ""
+#~ "<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+
+#~ msgid ""
+#~ "<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\";> <acronym title="
+#~ "\"JavaScript Object Notation\">JSON</acronym> License</a> <span class="
+#~ "\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</span>"
+
+#~ 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\"> Licence de Lha</a> <span class=\"anchor-reference-id"
+#~ "\">(<a href=\"#Lha\">#Lha</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA "
+#~ "Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#NASA\">#NASA</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA "
+#~ "Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#NASA\">#NASA</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">"
+#~ "(<a href=\"#PINE\">#PINE</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"PINE\">Licence de <acronym title=\"Program for Internet News and "
+#~ "E-mail\">Pine</acronym></a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#PINE\">#PINE</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Scilab\">Licence Scilab</a> <span class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
+#~ "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> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#SML\">#SML</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id"
+#~ "\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Squeak\">Ancienne licence de Squeak</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+
+#~ msgid ""
 #~ "<a id=\"EPL\" href=\"http://www.eclipse.org/legal/epl-v10.html\";> Eclipse "
 #~ "Public License Version 1.0</a> <span class=\"anchor-reference-id\">(<a "
 #~ "href=\"#EPL\">#EPL</a>)</span>"

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- licenses/po/license-list.it.po      2 Dec 2012 14:34:23 -0000       1.103
+++ licenses/po/license-list.it.po      19 Dec 2012 20:27:20 -0000      1.104
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-11-29 16:56-0500\n"
+"POT-Creation-Date: 2012-12-19 15:25-0500\n"
 "PO-Revision-Date: 2012-12-01 21:16+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-12-19 15:25-0500\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -769,10 +770,20 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
-"html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-id"
-"\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+# | <a id=\"clearbsd\"
+# | [-href=\"http://labs.metacarta.com/license-explanation.html#license\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:ClearBSD\";>+} The Clear BSD
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#clearbsd\">#clearbsd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
+#| "html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-"
+#| "id\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+msgid ""
+"<a id=\"clearbsd\" href=\"http://directory.fsf.org/wiki/License:ClearBSD\";> "
+"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\"> La licenza BSD Chiara (Clear BSD)</a> <span class=\"anchor-"
@@ -1781,14 +1792,25 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
-"html\"> Licenza XFree86 1.1</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+# | <a [-id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";>
+# | X11-] {+id=\"XFree861.1License\"
+# | href=\"http://directory.fsf.org/wiki/License:XFree86_1.1\";> XFree86 1.1+}
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#X11License\">#X11License</a>)</span>-]
+# | {+href=\"#XFree861.1License\">#XFree861.1License</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+#| "X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#X11License\">#X11License</a>)</span>"
+msgid ""
+"<a id=\"XFree861.1License\" href=\"http://directory.fsf.org/wiki/License:";
+"XFree86_1.1\"> XFree86 1.1 License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+msgstr ""
+"<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+"Licenza di X11</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#X11License\">#X11License</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1823,14 +1845,24 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";>-]
+# | {+id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";>+}
+# | License of [-imlib2</a>-] {+ZLib</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#imlib\">#imlib</a>)</span>-]
+# | {+href=\"#ZLib\">#ZLib</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+#| "License of imlib2</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#imlib\">#imlib</a>)</span>"
 msgid ""
-"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
+"<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
 "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\";> La "
-"licenza di ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib"
-"\">#ZLib</a>)</span>"
+"<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+"Licenza di imlib2</a> <span class=\"anchor-reference-id\">(<a href=\"#imlib"
+"\">#imlib</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1841,10 +1873,22 @@
 # type: Content of: <dl><dt>
 #.  without decimal, leave for compatibility 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
-"legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> <span class="
-"\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
+# | <a id=\"Zope20\"></a> <a id=\"Zope2.0\"
+# | [-href=\"http://www.zope.com/about_us/legal/zpl.html\";>-]
+# | {+href=\"http://directory.fsf.org/wiki?title=License:ZopePLv2.1\";>+} Zope
+# | Public License, versions 2.0 and 2.1</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/";
+#| "about_us/legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://directory.fsf.org/wiki?";
+"title=License:ZopePLv2.1\"> 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\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
 "legal/zpl.html\"> La licenza pubblica Zope, versione 2.0 e 2.1</a> <span "
@@ -3026,13 +3070,25 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<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>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"SPL\"
+# | href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> Sun+} Public
+# | [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#SPL\">#SPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> 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\";> La Licenza Pubblica "
-"Sun</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</"
-"span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Licenza pubblica Eclipse, versione 1.0</a> <span class=\"anchor-reference-id"
+"\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3049,10 +3105,20 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
-"Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#xinetd\">#xinetd</a>)</span>"
+# | <a id=\"xinetd\"
+# | [-href=\"http://fedoraproject.org/wiki/Licensing/Xinetd_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:Xinetd\";>+} License of
+# | xinetd</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#xinetd\">#xinetd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id"
+#| "\"> (<a href=\"#xinetd\">#xinetd</a>)</span>"
+msgid ""
+"<a id=\"xinetd\" href=\"http://directory.fsf.org/wiki/License:Xinetd\";> "
+"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\"> La licenza di xinetd</a> <span class=\"anchor-reference-id"
@@ -3278,16 +3344,25 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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>"
-msgstr ""
-"<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
-"Apple_Public_Source_License_1.2\"> Apple Public Source License (APSL), "
-"versione 1.x</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#apsl1\">#apsl1</a>)</span>"
+# | <a [-id=\"apsl2\"
+# | href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";>-] {+id=\"apsl1\"
+# | href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";>+} Apple Public
+# | Source License (APSL), version [-2</a>-] {+1.x</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#apsl2\">#apsl2</a>)</span>-]
+# | {+href=\"#apsl1\">#apsl1</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
+#| "Apple Public Source License (APSL), version 2</a> <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
+msgid ""
+"<a id=\"apsl1\" href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";> "
+"Apple Public Source License (APSL), version 1.x</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#apsl1\">#apsl1</a>)</span>"
+msgstr ""
+"<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> La "
+"Licenza Apple Public Source (APSL), versione 2</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3303,13 +3378,29 @@
 "software distribuito sotto queste condizioni. La <a href=\"#apsl2\">versione "
 "2.0 della APSL</a> è una licenza di software libero."
 
+# type: Content of: <dl><dt>
 #. 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>"
+# | <a [-id=\"ArtisticLicense2\"
+# | href=\"http://directory.fsf.org/wiki/License:ArtisticLicense2.0\";>
+# | Artistic-] {+id=\"ArtisticLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:Artistic_v1.0\";>Artistic+}
+# | License [-2-]{+1+}.0</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>-]
+# | {+href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+#| "ArtisticLicense2.0\"> Artistic License 2.0</a> <span class=\"anchor-"
+#| "reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"ArtisticLicense\" href=\"http://directory.fsf.org/wiki/License:";
+"Artistic_v1.0\">Artistic License 1.0</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
 msgstr ""
-"<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+"<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+"ArtisticLicense2.0\"> Licenza Artistica 2.0</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3441,13 +3532,27 @@
 "come si interpreta la sezione 3.4, sembra anche che non ci sia proprio la "
 "possibilità di distribuire il software da solo, con qualsiasi modalità."
 
+# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"eCos11\"
+# | href=\"http://directory.fsf.org/wiki/License:ECosPLv1.1\";>eCos+} Public
+# | [-License Version 1.0</a>-] {+License, version 1.1</a>+} <span
+# | [-class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>-]
+# | {+class=\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
-"<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class=\"anchor-"
+"<a id=\"eCos11\" href=\"http://directory.fsf.org/wiki/License:";
+"ECosPLv1.1\">eCos Public License, version 1.1</a> <span class=\"anchor-"
 "reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
 msgstr ""
-"<a id=\"eCos11\">eCos Public License, versione 1.1</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Licenza pubblica Eclipse, versione 1.0</a> <span class=\"anchor-reference-id"
+"\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3473,11 +3578,21 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
-"\">#GPL-PA</a>)</span>"
+# | <a id=\"GPL-PA\"
+# | 
[-href=\"http://www.celepar.pr.gov.br/modules/conteudo/conteudo.php?conteudo=69\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:GPL-PA\";>+} GPL for
+# | Computer Programs of the Public Administration</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#GPL-PA\">#GPL-PA</a>)</span>
+#, 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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
+#| "\">#GPL-PA</a>)</span>"
+msgid ""
+"<a id=\"GPL-PA\" href=\"http://directory.fsf.org/wiki/License:GPL-PA\";> GPL "
+"for Computer Programs of the Public 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 "
@@ -3555,12 +3670,23 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> The
+# | JSON+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#JSON\">#JSON</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<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>"
+"<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> 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\";> Licenza di JSON</"
-"a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licenza "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3608,14 +3734,24 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";>-]
+# | {+id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";>+}
+# | License of [-Ruby</a>-] {+Lha</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Ruby\">#Ruby</a>)</span>-]
+# | {+href=\"#Lha\">#Lha</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> "
+#| "License of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby"
+#| "\">#Ruby</a>)</span>"
 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/l/";
-"lha/current/copyright\"> Licenza di Lha</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#Lha\">#Lha</a>)</span>"
+"<a id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";> License "
+"of Lha</a> <span class=\"anchor-reference-id\">(<a href=\"#Lha\">#Lha</a>)</"
+"span>"
+msgstr ""
+"<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> La "
+"licenza di Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby"
+"\">#Ruby</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3628,11 +3764,21 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
-"\">#Ms-SS</a>)</span>"
+# | <a id=\"Ms-SS\" href=
+# | 
[-\"http://fedoraproject.org/wiki/Licensing/Microsoft_Shared_Source_License\";>-]
+# | {+\"http://directory.fsf.org/wiki/License:Ms-SS\";>+} Microsoft's Shared
+# | Source CLI, C#, and Jscript License</a> <span
+# | class=\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>
+#, 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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
+#| "\">#Ms-SS</a>)</span>"
+msgid ""
+"<a id=\"Ms-SS\" href= \"http://directory.fsf.org/wiki/License:Ms-SS\";> "
+"Microsoft's Shared Source CLI, C#, and 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 "
@@ -3659,14 +3805,26 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a href=\"#NASA"
-"\">#NASA</a>)</span>"
-msgstr ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a href=\"#NASA"
-"\">#NASA</a>)</span>"
+# | <a [-id=\"Nokia\"
+# | href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> Nokia-]
+# | {+id=\"NASA\"
+# | href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> NASA+} Open
+# | Source [-License</a>-] {+Agreement</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Nokia\">#Nokia</a>)</span>-]
+# | {+href=\"#NASA\">#NASA</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a";
+#| "\"> Nokia Open Source License</a> <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#Nokia\">#Nokia</a>)</span>"
+msgid ""
+"<a id=\"NASA\" href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> "
+"NASA Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#NASA\">#NASA</a>)</span>"
+msgstr ""
+"<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> "
+"La Licenza Nokia Open Source</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#Nokia\">#Nokia</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3694,11 +3852,23 @@
 # type: Content of: <dl><dt>
 #.  old id, leave for compatibility 
 #. type: Content of: <dl><dt>
+# | <a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at
+# | Fedora Project wiki\"
+# | [-href=\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:OpenPLv1.0\";>+} Open Public
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#OpenPublicL\">#OpenPublicL</a>)</span>
+#, fuzzy
+#| 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>"
 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>"
+"Fedora Project wiki\" href=\"http://directory.fsf.org/wiki/License:";
+"OpenPLv1.0\"> Open Public License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#OpenPublicL\">#OpenPublicL</a>)</span>"
 msgstr ""
 "<a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at "
 "Fedora Project wiki\" href=\"https://fedoraproject.org/wiki/Licensing/";
@@ -3718,13 +3888,26 @@
 "iniziale. Sono presenti inoltre in questa licenza alcuni paragrafi ambigui: "
 "non siamo sicuri che non possano creare problemi. "
 
+# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"PINE\"
+# | href=\"http://directory.fsf.org/wiki/License:PINE\";>License of PINE</a>+}
+# | <span class=\"anchor-reference-id\">(<a [-href=\"#ISC\">#ISC</a>)</span>-]
+# | {+href=\"#PINE\">#PINE</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
-"<a id=\"PINE\">Licenza di PINE</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licenza "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3785,14 +3968,25 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
-msgstr ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"RPL\"
+# | href=\"http://directory.fsf.org/wiki/License:ReciprocalPLv1.3\";>
+# | Reciprocal+} Public [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#RPL\">#RPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"RPL\" href=\"http://directory.fsf.org/wiki/License:";
+"ReciprocalPLv1.3\"> Reciprocal Public License</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+msgstr ""
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Licenza pubblica Eclipse, versione 1.0</a> <span class=\"anchor-reference-id"
+"\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3808,20 +4002,44 @@
 "originale se si pubblica una versione modificata.  3.&nbsp;Richiede la "
 "pubblicazione di qualsiasi versione modificata in uso, anche privato."
 
+# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#Scilab\">#Scilab</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Scilab\"
+# | href=\"http://directory.fsf.org/wiki/License:Scilab-old\";>Scilab
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Scilab\">#Scilab</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Scilab\" href=\"http://directory.fsf.org/wiki/License:Scilab-old";
+"\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a href=\"#Scilab"
+"\">#Scilab</a>)</span>"
 msgstr ""
-"<a id=\"Scilab\">La licenza di Scilab</a> <span class=\"anchor-reference-id"
-"\"> (<a href=\"#Scilab\">#Scilab</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licenza "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is not a free software license because it does not allow commercial
+# | distribution of a modified version.  Thankfully, [-recent versions of-]
+# | {+starting from version 5.0.0,+} the Scilab software [-are-] {+is+} free
+# | software, released under CeCILL version&nbsp;2.
+#, 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&nbsp;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&nbsp;2."
+"distribution of a modified version.  Thankfully, starting from version "
+"5.0.0, the Scilab software is free software, released under CeCILL "
+"version&nbsp;2."
 msgstr ""
 "This is not a free software license because it does not allow commercial "
 "distribution of a modified version.  Thankfully, recent versions of the "
@@ -3829,14 +4047,23 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
-"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> <span class=\"anchor-reference-id\">(<a href="
-"\"#SML\">#SML</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";>
+# | Simple Machines+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#SML\">#SML</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";> Simple "
+"Machines License</a> <span class=\"anchor-reference-id\">(<a href=\"#SML"
+"\">#SML</a>)</span>"
+msgstr ""
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licenza "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3869,13 +4096,27 @@
 "La vostra licenza può essere terminata se avete ricevuto il software da "
 "qualcuno che non ha rispettato la licenza."
 
+# type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#Squeak\">#Squeak</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Squeak\"
+# | href=\"http://directory.fsf.org/wiki/License:Squeak-old\";>Old Squeak
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Squeak\">#Squeak</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Squeak\" href=\"http://directory.fsf.org/wiki/License:Squeak-old";
+"\">Old Squeak license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#Squeak\">#Squeak</a>)</span>"
 msgstr ""
-"<a id=\"Squeak\">Vecchia licenza di Squeak</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> Licenza "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3909,9 +4150,21 @@
 "\"#apache2\">Apache License 2.0</a>."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
-"class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+# | <a [-id=\"SunCommunitySourceLicense\">Sun-]
+# | {+id=\"SunCommunitySourceLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:SunCSLv2.8\";>Sun+} Community
+# | Source License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#SunCommunitySourceLicense\">#SunCommunitySourceLicense</a>) 
+# | </span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+#| "\">#SunCommunitySourceLicense</a>)  </span>"
+msgid ""
+"<a id=\"SunCommunitySourceLicense\" href=\"http://directory.fsf.org/wiki/";
+"License:SunCSLv2.8\">Sun Community Source License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#SunCommunitySourceLicense"
 "\">#SunCommunitySourceLicense</a>)  </span>"
 msgstr ""
 "<a id=\"SunCommunitySourceLicense\">La Licenza Sun Community Source</a> "
@@ -4832,3 +5085,129 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+# type: Content of: <dl><dt>
+#~ 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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/";
+#~ "LICENSE4.html\"> Licenza XFree86 1.1</a> <span class=\"anchor-reference-id"
+#~ "\"> (<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#~ "License 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\";> La "
+#~ "licenza di ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib"
+#~ "\">#ZLib</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<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\";> La Licenza Pubblica "
+#~ "Sun</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</"
+#~ "span>"
+
+# type: Content of: <dl><dt>
+#~ 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>"
+#~ msgstr ""
+#~ "<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
+#~ "Apple_Public_Source_License_1.2\"> Apple Public Source License (APSL), "
+#~ "versione 1.x</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#apsl1\">#apsl1</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"eCos11\">eCos Public License, versione 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<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\";> Licenza di "
+#~ "JSON</a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)"
+#~ "</span>"
+
+# type: Content of: <dl><dt>
+#~ 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/";
+#~ "l/lha/current/copyright\"> Licenza di Lha</a> <span class=\"anchor-"
+#~ "reference-id\">(<a href=\"#Lha\">#Lha</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA "
+#~ "Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#NASA\">#NASA</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA "
+#~ "Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#NASA\">#NASA</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">"
+#~ "(<a href=\"#PINE\">#PINE</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"PINE\">Licenza di PINE</a> <span class=\"anchor-reference-id\">"
+#~ "(<a href=\"#PINE\">#PINE</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Scilab\">La licenza di Scilab</a> <span class=\"anchor-reference-"
+#~ "id\"> (<a href=\"#Scilab\">#Scilab</a>)</span>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
+#~ "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> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#SML\">#SML</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id"
+#~ "\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Squeak\">Vecchia licenza di Squeak</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"

Index: licenses/po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- licenses/po/license-list.pot        29 Nov 2012 21:58:44 -0000      1.92
+++ licenses/po/license-list.pot        19 Dec 2012 20:27:20 -0000      1.93
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-11-29 16:56-0500\n"
+"POT-Creation-Date: 2012-12-19 15:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -501,9 +501,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"clearbsd\" "
-"href=\"http://labs.metacarta.com/license-explanation.html#license\";> The "
-"Clear BSD License</a> <span class=\"anchor-reference-id\"> (<a "
+"<a id=\"clearbsd\" href=\"http://directory.fsf.org/wiki/License:ClearBSD\";> "
+"The Clear BSD License</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#clearbsd\">#clearbsd</a>)</span>"
 msgstr ""
 
@@ -1146,7 +1145,7 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"XFree861.1License\" "
-"href=\"http://www.xfree86.org/current/LICENSE4.html\";> XFree86 1.1 "
+"href=\"http://directory.fsf.org/wiki/License:XFree86_1.1\";> XFree86 1.1 "
 "License</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
 msgstr ""
@@ -1173,7 +1172,7 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
+"<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
 "of ZLib</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#ZLib\">#ZLib</a>)</span>"
 msgstr ""
@@ -1186,8 +1185,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Zope20\"></a> <a id=\"Zope2.0\" "
-"href=\"http://www.zope.com/about_us/legal/zpl.html\";> Zope Public License, "
-"versions 2.0 and 2.1</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"http://directory.fsf.org/wiki?title=License:ZopePLv2.1\";> Zope Public "
+"License, versions 2.0 and 2.1</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#Zope2.0\">#Zope2.0</a>)</span>"
 msgstr ""
 
@@ -1932,8 +1931,9 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<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>"
+"<a id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> Sun "
+"Public License</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#SPL\">#SPL</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1946,9 +1946,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"xinetd\" "
-"href=\"http://fedoraproject.org/wiki/Licensing/Xinetd_License\";> License of "
-"xinetd</a> <span class=\"anchor-reference-id\"> (<a "
+"<a id=\"xinetd\" href=\"http://directory.fsf.org/wiki/License:Xinetd\";> "
+"License of xinetd</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#xinetd\">#xinetd</a>)</span>"
 msgstr ""
 
@@ -2096,8 +2095,7 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"apsl1\" href= "
-"\"https://fedoraproject.org/wiki/Licensing/Apple_Public_Source_License_1.2\";> 
"
+"<a id=\"apsl1\" href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";> "
 "Apple Public Source License (APSL), version 1.x</a> <span "
 "class=\"anchor-reference-id\">(<a href=\"#apsl1\">#apsl1</a>)</span>"
 msgstr ""
@@ -2113,8 +2111,9 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span "
-"class=\"anchor-reference-id\"> (<a "
+"<a id=\"ArtisticLicense\" "
+"href=\"http://directory.fsf.org/wiki/License:Artistic_v1.0\";>Artistic "
+"License 1.0</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
 msgstr ""
 
@@ -2209,8 +2208,10 @@
 
 #. 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>"
+"<a id=\"eCos11\" "
+"href=\"http://directory.fsf.org/wiki/License:ECosPLv1.1\";>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>
@@ -2229,9 +2230,8 @@
 
 #. type: Content of: <dl><dt>
 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> <span "
+"<a id=\"GPL-PA\" href=\"http://directory.fsf.org/wiki/License:GPL-PA\";> GPL "
+"for Computer Programs of the Public Administration</a> <span "
 "class=\"anchor-reference-id\"> (<a href=\"#GPL-PA\">#GPL-PA</a>)</span>"
 msgstr ""
 
@@ -2285,7 +2285,7 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"JSON\" href=\"http://www.json.org/license.html\";> The JSON "
+"<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> The JSON "
 "License</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#JSON\">#JSON</a>)</span>"
 msgstr ""
@@ -2321,9 +2321,8 @@
 
 #. type: Content of: <dl><dt>
 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 "
+"<a id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";> License "
+"of Lha</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#Lha\">#Lha</a>)</span>"
 msgstr ""
 
@@ -2335,8 +2334,7 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Ms-SS\" href= "
-"\"http://fedoraproject.org/wiki/Licensing/Microsoft_Shared_Source_License\";> "
+"<a id=\"Ms-SS\" href= \"http://directory.fsf.org/wiki/License:Ms-SS\";> "
 "Microsoft's Shared Source CLI, C#, and Jscript License</a> <span "
 "class=\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>"
 msgstr ""
@@ -2355,8 +2353,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a "
+"<a id=\"NASA\" href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> "
+"NASA Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#NASA\">#NASA</a>)</span>"
 msgstr ""
 
@@ -2380,8 +2378,8 @@
 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=\"http://directory.fsf.org/wiki/License:OpenPLv1.0\";> Open Public "
+"License</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#OpenPublicL\">#OpenPublicL</a>)</span>"
 msgstr ""
 
@@ -2395,7 +2393,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">(<a "
+"<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
+"of PINE</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#PINE\">#PINE</a>)</span>"
 msgstr ""
 
@@ -2439,8 +2438,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"RPL\" "
-"href=\"http://web.archive.org/web/20080828191234/http://www.technicalpursuit.com/licenses/RPL_1.3.html\";>
 "
-"Reciprocal Public License</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"http://directory.fsf.org/wiki/License:ReciprocalPLv1.3\";> Reciprocal "
+"Public License</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#RPL\">#RPL</a>)</span>"
 msgstr ""
 
@@ -2455,21 +2454,24 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a "
+"<a id=\"Scilab\" "
+"href=\"http://directory.fsf.org/wiki/License:Scilab-old\";>Scilab license</a> "
+"<span class=\"anchor-reference-id\"> (<a "
 "href=\"#Scilab\">#Scilab</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 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&nbsp;2."
+"distribution of a modified version.  Thankfully, starting from version "
+"5.0.0, the Scilab software is free software, released under CeCILL "
+"version&nbsp;2."
 msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
-"Simple Machines License</a> <span class=\"anchor-reference-id\">(<a "
+"<a id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";> Simple "
+"Machines License</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#SML\">#SML</a>)</span>"
 msgstr ""
 
@@ -2497,8 +2499,10 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#Squeak\">#Squeak</a>)</span>"
+"<a id=\"Squeak\" "
+"href=\"http://directory.fsf.org/wiki/License:Squeak-old\";>Old Squeak "
+"license</a> <span class=\"anchor-reference-id\"> (<a "
+"href=\"#Squeak\">#Squeak</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2523,8 +2527,9 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
-"class=\"anchor-reference-id\"> (<a "
+"<a id=\"SunCommunitySourceLicense\" "
+"href=\"http://directory.fsf.org/wiki/License:SunCSLv2.8\";>Sun Community "
+"Source License</a> <span class=\"anchor-reference-id\"> (<a "
 "href=\"#SunCommunitySourceLicense\">#SunCommunitySourceLicense</a>)  </span>"
 msgstr ""
 

Index: licenses/po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- licenses/po/license-list.ru.po      30 Nov 2012 07:58:46 -0000      1.55
+++ licenses/po/license-list.ru.po      19 Dec 2012 20:27:20 -0000      1.56
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-11-29 16:56-0500\n"
+"POT-Creation-Date: 2012-12-19 15:25-0500\n"
 "PO-Revision-Date: 2012-11-30 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-12-19 15:25-0500\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -709,10 +710,20 @@
 "пользователями, то для вас это не 
проблема."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
-"html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-id"
-"\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+# | <a id=\"clearbsd\"
+# | [-href=\"http://labs.metacarta.com/license-explanation.html#license\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:ClearBSD\";>+} The Clear BSD
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#clearbsd\">#clearbsd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"clearbsd\" href=\"http://labs.metacarta.com/license-explanation.";
+#| "html#license\"> The Clear BSD License</a> <span class=\"anchor-reference-"
+#| "id\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
+msgid ""
+"<a id=\"clearbsd\" href=\"http://directory.fsf.org/wiki/License:ClearBSD\";> "
+"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\"> Чистая лицензия BSD (Clear BSD License)</a> 
<span class="
@@ -1676,14 +1687,25 @@
 "предательства."
 
 #. type: Content of: <dl><dt>
-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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
-"html\"> Лицензия XFree86 1.1</a> <span class=\"anchor-reference-id\"> 
(<a "
-"href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+# | <a [-id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";>
+# | X11-] {+id=\"XFree861.1License\"
+# | href=\"http://directory.fsf.org/wiki/License:XFree86_1.1\";> XFree86 1.1+}
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#X11License\">#X11License</a>)</span>-]
+# | {+href=\"#XFree861.1License\">#XFree861.1License</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+#| "X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+#| "\"#X11License\">#X11License</a>)</span>"
+msgid ""
+"<a id=\"XFree861.1License\" href=\"http://directory.fsf.org/wiki/License:";
+"XFree86_1.1\"> XFree86 1.1 License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+msgstr ""
+"<a id=\"X11License\" href=\"http://directory.fsf.org/wiki/License:X11\";> "
+"Лицензия X11</a> <span class=\"anchor-reference-id\"> (<a 
href=\"#X11License"
+"\">#X11License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1714,14 +1736,24 @@
 "\"#X11License\"> Лицензией X11</a>."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";>-]
+# | {+id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";>+}
+# | License of [-imlib2</a>-] {+ZLib</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#imlib\">#imlib</a>)</span>-]
+# | {+href=\"#ZLib\">#ZLib</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+#| "License of imlib2</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#imlib\">#imlib</a>)</span>"
 msgid ""
-"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
+"<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
 "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\";> 
Лицензия "
-"ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)</"
-"span>"
+"<a id=\"imlib\" href=\"http://directory.fsf.org/wiki/License:Imlib2\";> "
+"Лицензия imlib2</a> <span class=\"anchor-reference-id\">(<a 
href=\"#imlib"
+"\">#imlib</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid "This is a free software license, and compatible with the GPL."
@@ -1729,10 +1761,22 @@
 
 #.  without decimal, leave for compatibility 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
-"legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> <span class="
-"\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
+# | <a id=\"Zope20\"></a> <a id=\"Zope2.0\"
+# | [-href=\"http://www.zope.com/about_us/legal/zpl.html\";>-]
+# | {+href=\"http://directory.fsf.org/wiki?title=License:ZopePLv2.1\";>+} Zope
+# | Public License, versions 2.0 and 2.1</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/";
+#| "about_us/legal/zpl.html\"> Zope Public License, versions 2.0 and 2.1</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"Zope20\"></a> <a id=\"Zope2.0\" href=\"http://directory.fsf.org/wiki?";
+"title=License:ZopePLv2.1\"> 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\"></a> <a id=\"Zope2.0\" href=\"http://www.zope.com/about_us/";
 "legal/zpl.html\"> Общественная лицензия Zope (Zope Public 
License), "
@@ -2842,13 +2886,25 @@
 "с GNU GPL из-за деталей, а не каких-то 
серьезных расхождений."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<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>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"SPL\"
+# | href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> Sun+} Public
+# | [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#SPL\">#SPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> 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 (Sun Public License)</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#SPL\">#SPL</a>)</span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Общественная лицензия Eclipse (Eclipse Public License), 
версия&nbsp;1.0</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2863,10 +2919,20 @@
 "текста сообщества Sun</a>, которая не 
является лицензией свободных программ."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
-"Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#xinetd\">#xinetd</a>)</span>"
+# | <a id=\"xinetd\"
+# | [-href=\"http://fedoraproject.org/wiki/Licensing/Xinetd_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:Xinetd\";>+} License of
+# | xinetd</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#xinetd\">#xinetd</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Xinetd_License\"> License of xinetd</a> <span class=\"anchor-reference-id"
+#| "\"> (<a href=\"#xinetd\">#xinetd</a>)</span>"
+msgid ""
+"<a id=\"xinetd\" href=\"http://directory.fsf.org/wiki/License:Xinetd\";> "
+"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\"> Лицензия xinetd</a> <span 
class=\"anchor-reference-id\"> "
@@ -3085,16 +3151,26 @@
 "что взимается плата."
 
 #. type: Content of: <dl><dt>
-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>"
-msgstr ""
-"<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
-"Apple_Public_Source_License_1.2\"> Общественная лицензия 
исходного текста "
-"Apple (Apple Public Source License, APSL), версия&nbsp;1.x</a> <span 
class="
-"\"anchor-reference-id\">(<a href=\"#apsl1 \">#apsl1</a>)</span>"
+# | <a [-id=\"apsl2\"
+# | href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";>-] {+id=\"apsl1\"
+# | href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";>+} Apple Public
+# | Source License (APSL), version [-2</a>-] {+1.x</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#apsl2\">#apsl2</a>)</span>-]
+# | {+href=\"#apsl1\">#apsl1</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
+#| "Apple Public Source License (APSL), version 2</a> <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
+msgid ""
+"<a id=\"apsl1\" href= \"http://directory.fsf.org/wiki/License:APSLv1.x\";> "
+"Apple Public Source License (APSL), version 1.x</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#apsl1\">#apsl1</a>)</span>"
+msgstr ""
+"<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
+"Общественная лицензия исходных текстов 
Apple (Apple Public Source License, "
+"APSL), версия 2</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#apsl2\">#apsl2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3110,13 +3186,28 @@
 "является лицензией свободных программ."
 
 #. 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>"
+# | <a [-id=\"ArtisticLicense2\"
+# | href=\"http://directory.fsf.org/wiki/License:ArtisticLicense2.0\";>
+# | Artistic-] {+id=\"ArtisticLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:Artistic_v1.0\";>Artistic+}
+# | License [-2-]{+1+}.0</a> <span class=\"anchor-reference-id\"> (<a
+# | [-href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>-]
+# | {+href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+#| "ArtisticLicense2.0\"> Artistic License 2.0</a> <span class=\"anchor-"
+#| "reference-id\"> (<a href=\"#ArtisticLicense2\">#ArtisticLicense2</a>)</"
+#| "span>"
+msgid ""
+"<a id=\"ArtisticLicense\" href=\"http://directory.fsf.org/wiki/License:";
+"Artistic_v1.0\">Artistic License 1.0</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
 msgstr ""
-"<a id=\"ArtisticLicense\">Художественная лицензия 
(Artistic License)"
-"&nbsp;1.0</a> <span class=\"anchor-reference-id\"> (<a href="
-"\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+"<a id=\"ArtisticLicense2\" href=\"http://directory.fsf.org/wiki/License:";
+"ArtisticLicense2.0\"> Художественная лицензия (Artistic 
License) 2.0</a> "
+"<span class=\"anchor-reference-id\"> (<a href="
+"\"#ArtisticLicense2\">#ArtisticLicense2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3245,13 +3336,25 @@
 "программу саму по себе."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"eCos11\"
+# | href=\"http://directory.fsf.org/wiki/License:ECosPLv1.1\";>eCos+} Public
+# | [-License Version 1.0</a>-] {+License, version 1.1</a>+} <span
+# | [-class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>-]
+# | {+class=\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
-"<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class=\"anchor-"
+"<a id=\"eCos11\" href=\"http://directory.fsf.org/wiki/License:";
+"ECosPLv1.1\">eCos Public License, version 1.1</a> <span class=\"anchor-"
 "reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
 msgstr ""
-"<a id=\"eCos11\">Общественная лицензия eCos (eCos Public 
License), "
-"версия&nbsp;1.1</a> <span class=\"anchor-reference-id\"> (<a href="
-"\"#eCos11\">#eCos11</a>)</span>"
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Общественная лицензия Eclipse (Eclipse Public License), 
версия&nbsp;1.0</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3275,11 +3378,21 @@
 "дополнительным разрешением компоновать с 
несвободными программами."
 
 #. type: Content of: <dl><dt>
+# | <a id=\"GPL-PA\"
+# | 
[-href=\"http://www.celepar.pr.gov.br/modules/conteudo/conteudo.php?conteudo=69\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:GPL-PA\";>+} GPL for
+# | Computer Programs of the Public Administration</a> <span
+# | class=\"anchor-reference-id\"> (<a href=\"#GPL-PA\">#GPL-PA</a>)</span>
+#, 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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
+#| "\">#GPL-PA</a>)</span>"
 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> <span class=\"anchor-reference-id\"> (<a href=\"#GPL-PA"
-"\">#GPL-PA</a>)</span>"
+"<a id=\"GPL-PA\" href=\"http://directory.fsf.org/wiki/License:GPL-PA\";> GPL "
+"for Computer Programs of the Public 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\"> Стандартная общественная 
лицензия для "
@@ -3351,12 +3464,23 @@
 "программ. Применение исходного текста 
ограничено исследовательскими целями."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> The
+# | JSON+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#JSON\">#JSON</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<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>"
+"<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> 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\";> Лицензия 
JSON</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> 
Лицензия "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3401,14 +3525,24 @@
 "Общепубличной лицензией</a>."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";>-]
+# | {+id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";>+}
+# | License of [-Ruby</a>-] {+Lha</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Ruby\">#Ruby</a>)</span>-]
+# | {+href=\"#Lha\">#Lha</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> "
+#| "License of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby"
+#| "\">#Ruby</a>)</span>"
 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/l/";
-"lha/current/copyright\"> Лицензия Lha</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#Lha\">#Lha</a>)</span>"
+"<a id=\"Lha\" href= \"http://directory.fsf.org/wiki/License:Lha\";> License "
+"of Lha</a> <span class=\"anchor-reference-id\">(<a href=\"#Lha\">#Lha</a>)</"
+"span>"
+msgstr ""
+"<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> 
Лицензия "
+"Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3419,11 +3553,21 @@
 "туманна, что нельзя понять, что вам 
разрешается."
 
 #. type: Content of: <dl><dt>
-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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
-"\">#Ms-SS</a>)</span>"
+# | <a id=\"Ms-SS\" href=
+# | 
[-\"http://fedoraproject.org/wiki/Licensing/Microsoft_Shared_Source_License\";>-]
+# | {+\"http://directory.fsf.org/wiki/License:Ms-SS\";>+} Microsoft's Shared
+# | Source CLI, C#, and Jscript License</a> <span
+# | class=\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>
+#, 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> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS"
+#| "\">#Ms-SS</a>)</span>"
+msgid ""
+"<a id=\"Ms-SS\" href= \"http://directory.fsf.org/wiki/License:Ms-SS\";> "
+"Microsoft's Shared Source CLI, C#, and 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 на 
разделяемый "
@@ -3448,14 +3592,26 @@
 "разделяемого исходного текста&rdquo;; в 
некоторых из них ограничения другие."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA Open "
-"Source Agreement</a> <span class=\"anchor-reference-id\">(<a href=\"#NASA"
-"\">#NASA</a>)</span>"
-msgstr ""
-"<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> 
Соглашение "
-"открытого исходного текста NASA (NASA Open Source 
Agreement)</a> <span class="
-"\"anchor-reference-id\">(<a href=\"#NASA\">#NASA</a>)</span>"
+# | <a [-id=\"Nokia\"
+# | href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> Nokia-]
+# | {+id=\"NASA\"
+# | href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> NASA+} Open
+# | Source [-License</a>-] {+Agreement</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Nokia\">#Nokia</a>)</span>-]
+# | {+href=\"#NASA\">#NASA</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a";
+#| "\"> Nokia Open Source License</a> <span class=\"anchor-reference-id\">(<a "
+#| "href=\"#Nokia\">#Nokia</a>)</span>"
+msgid ""
+"<a id=\"NASA\" href=\"http://directory.fsf.org/wiki/License:NASA-OSA_v1.3\";> "
+"NASA Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#NASA\">#NASA</a>)</span>"
+msgstr ""
+"<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> "
+"Лицензия открытого исходного текста Nokia 
(Nokia Open Source License)</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#Nokia\">#Nokia</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3482,11 +3638,23 @@
 
 #.  old id, leave for compatibility 
 #. type: Content of: <dl><dt>
+# | <a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Open Public License at
+# | Fedora Project wiki\"
+# | [-href=\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";>-]
+# | {+href=\"http://directory.fsf.org/wiki/License:OpenPLv1.0\";>+} Open Public
+# | License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#OpenPublicL\">#OpenPublicL</a>)</span>
+#, fuzzy
+#| 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>"
 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>"
+"Fedora Project wiki\" href=\"http://directory.fsf.org/wiki/License:";
+"OpenPLv1.0\"> Open Public License</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#OpenPublicL\">#OpenPublicL</a>)</span>"
 msgstr ""
 "<a id=\"OPL\"></a> <a id=\"OpenPublicL\" title=\"Открытая 
общественная "
 "лицензия в вики проекта Fedora\" 
href=\"https://fedoraproject.org/wiki/";
@@ -3507,12 +3675,24 @@
 "и которые тоже могут быть проблематичны."
 
 #. type: Content of: <dl><dt>
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"PINE\"
+# | href=\"http://directory.fsf.org/wiki/License:PINE\";>License of PINE</a>+}
+# | <span class=\"anchor-reference-id\">(<a [-href=\"#ISC\">#ISC</a>)</span>-]
+# | {+href=\"#PINE\">#PINE</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
 msgid ""
-"<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
-"<a id=\"PINE\">Лицензия PINE</a> <span 
class=\"anchor-reference-id\">(<a "
-"href=\"#PINE\">#PINE</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> 
Лицензия "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3570,15 +3750,25 @@
 "изменение в лицензии сделало Plan&nbsp;9 
пакетом свободных программ</a>."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</a> "
-"<span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
-msgstr ""
-"<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
-"technicalpursuit.com/licenses/RPL_1.3.html\"> Взаимная 
общественная лицензия "
-"(Reciprocal Public License)</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#RPL\">#RPL</a>)</span>"
+# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
+# | Eclipse-] {+id=\"RPL\"
+# | href=\"http://directory.fsf.org/wiki/License:ReciprocalPLv1.3\";>
+# | Reciprocal+} Public [-License Version 1.0</a>-] {+License</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#RPL\">#RPL</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
+msgid ""
+"<a id=\"RPL\" href=\"http://directory.fsf.org/wiki/License:";
+"ReciprocalPLv1.3\"> Reciprocal Public License</a> <span class=\"anchor-"
+"reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+msgstr ""
+"<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
+"Общественная лицензия Eclipse (Eclipse Public License), 
версия&nbsp;1.0</a> "
+"<span class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3595,32 +3785,64 @@
 "организации, даже когда она используется 
частным порядком."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#Scilab\">#Scilab</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Scilab\"
+# | href=\"http://directory.fsf.org/wiki/License:Scilab-old\";>Scilab
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Scilab\">#Scilab</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Scilab\" href=\"http://directory.fsf.org/wiki/License:Scilab-old";
+"\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a href=\"#Scilab"
+"\">#Scilab</a>)</span>"
 msgstr ""
-"<a id=\"Scilab\">Лицензия Scilab</a> <span 
class=\"anchor-reference-id\"> "
-"(<a href=\"#Scilab\">#Scilab</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> 
Лицензия "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is not a free software license because it does not allow commercial
+# | distribution of a modified version.  Thankfully, [-recent versions of-]
+# | {+starting from version 5.0.0,+} the Scilab software [-are-] {+is+} free
+# | software, released under CeCILL version&nbsp;2.
+#, 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&nbsp;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&nbsp;2."
+"distribution of a modified version.  Thankfully, starting from version "
+"5.0.0, the Scilab software is free software, released under CeCILL "
+"version&nbsp;2."
 msgstr ""
 "Это не лицензия свободных программ, 
потому что она не допускает "
 "коммерческого распространения 
измененной версии. К счастью, последние 
версии "
 "программ Scilab свободны и выпускаются под 
CeCILL версии&nbsp;2."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
-"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\";> "
-"Лицензия &ldquo;Простых машин&rdquo; (Simple Machines 
License)</a> <span "
-"class=\"anchor-reference-id\">(<a href=\"#SML\">#SML</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC-]
+# | {+id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";>
+# | Simple Machines+} License</a> <span class=\"anchor-reference-id\">(<a
+# | [-href=\"#ISC\">#ISC</a>)</span>-] {+href=\"#SML\">#SML</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"SML\" href=\"http://directory.fsf.org/wiki/License:SimpleM\";> Simple "
+"Machines License</a> <span class=\"anchor-reference-id\">(<a href=\"#SML"
+"\">#SML</a>)</span>"
+msgstr ""
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> 
Лицензия "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3653,12 +3875,25 @@
 "программы от кого-то, кто не выполнил 
условий лицензии."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#Squeak\">#Squeak</a>)</span>"
+# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
+# | License</a>-] {+id=\"Squeak\"
+# | href=\"http://directory.fsf.org/wiki/License:Squeak-old\";>Old Squeak
+# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
+# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
+# | href=\"#Squeak\">#Squeak</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
+#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
+#| "a>)</span>"
+msgid ""
+"<a id=\"Squeak\" href=\"http://directory.fsf.org/wiki/License:Squeak-old";
+"\">Old Squeak license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#Squeak\">#Squeak</a>)</span>"
 msgstr ""
-"<a id=\"Squeak\">Старая лицензия Squeak</a> <span 
class=\"anchor-reference-id"
-"\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+"<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> 
Лицензия "
+"ISC</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3692,9 +3927,21 @@
 "&mdash; под <a href=\"#apache2\">Лицензией Apache&nbsp;2.0</a>."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> <span "
-"class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+# | <a [-id=\"SunCommunitySourceLicense\">Sun-]
+# | {+id=\"SunCommunitySourceLicense\"
+# | href=\"http://directory.fsf.org/wiki/License:SunCSLv2.8\";>Sun+} Community
+# | Source License</a> <span class=\"anchor-reference-id\"> (<a
+# | href=\"#SunCommunitySourceLicense\">#SunCommunitySourceLicense</a>) 
+# | </span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SunCommunitySourceLicense\">Sun Community Source License</a> "
+#| "<span class=\"anchor-reference-id\"> (<a href=\"#SunCommunitySourceLicense"
+#| "\">#SunCommunitySourceLicense</a>)  </span>"
+msgid ""
+"<a id=\"SunCommunitySourceLicense\" href=\"http://directory.fsf.org/wiki/";
+"License:SunCSLv2.8\">Sun Community Source License</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#SunCommunitySourceLicense"
 "\">#SunCommunitySourceLicense</a>)  </span>"
 msgstr ""
 "<a id=\"SunCommunitySourceLicense\">Лицензия исходного 
текста сообщества Sun "
@@ -4580,6 +4827,127 @@
 msgstr "Обновлено:"
 
 #~ 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 id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/";
+#~ "LICENSE4.html\"> Лицензия XFree86 1.1</a> <span 
class=\"anchor-reference-"
+#~ "id\"> (<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#~ "License 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\";> "
+#~ "Лицензия ZLib</a> <span class=\"anchor-reference-id\">(<a 
href=\"#ZLib"
+#~ "\">#ZLib</a>)</span>"
+
+#~ msgid ""
+#~ "<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 (Sun Public License)</a> <span 
class=\"anchor-reference-id\">"
+#~ "(<a href=\"#SPL\">#SPL</a>)</span>"
+
+#~ 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>"
+#~ msgstr ""
+#~ "<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
+#~ "Apple_Public_Source_License_1.2\"> Общественная 
лицензия исходного текста "
+#~ "Apple (Apple Public Source License, APSL), версия&nbsp;1.x</a> <span 
"
+#~ "class=\"anchor-reference-id\">(<a href=\"#apsl1 \">#apsl1</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"ArtisticLicense\">Artistic License 1.0</a> <span class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"ArtisticLicense\">Художественная лицензия 
(Artistic License)"
+#~ "&nbsp;1.0</a> <span class=\"anchor-reference-id\"> (<a href="
+#~ "\"#ArtisticLicense\">#ArtisticLicense</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"eCos11\">eCos Public License, version 1.1</a> <span class="
+#~ "\"anchor-reference-id\"> (<a href=\"#eCos11\">#eCos11</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"eCos11\">Общественная лицензия eCos (eCos 
Public License), "
+#~ "версия&nbsp;1.1</a> <span class=\"anchor-reference-id\"> (<a href="
+#~ "\"#eCos11\">#eCos11</a>)</span>"
+
+#~ msgid ""
+#~ "<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\";> Лицензия 
JSON</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)</"
+#~ "span>"
+
+#~ 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 id=\"Lha\" href= \"http://packages.debian.org/changelogs/pool/non-free/";
+#~ "l/lha/current/copyright\"> Лицензия Lha</a> <span class=\"anchor-"
+#~ "reference-id\">(<a href=\"#Lha\">#Lha</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> NASA "
+#~ "Open Source Agreement</a> <span class=\"anchor-reference-id\">(<a href="
+#~ "\"#NASA\">#NASA</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"NASA\" href=\"http://ti.arc.nasa.gov/opensource/nosa/\";> "
+#~ "Соглашение открытого исходного текста 
NASA (NASA Open Source Agreement)</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#NASA\">#NASA</a>)</"
+#~ "span>"
+
+#~ msgid ""
+#~ "<a id=\"PINE\">License of PINE</a> <span class=\"anchor-reference-id\">"
+#~ "(<a href=\"#PINE\">#PINE</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"PINE\">Лицензия PINE</a> <span 
class=\"anchor-reference-id\">(<a "
+#~ "href=\"#PINE\">#PINE</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Reciprocal Public License</"
+#~ "a> <span class=\"anchor-reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"RPL\" href=\"http://web.archive.org/web/20080828191234/http://www.";
+#~ "technicalpursuit.com/licenses/RPL_1.3.html\"> Взаимная 
общественная "
+#~ "лицензия (Reciprocal Public License)</a> <span 
class=\"anchor-reference-id"
+#~ "\">(<a href=\"#RPL\">#RPL</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Scilab\">Scilab license</a> <span class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Scilab\">Лицензия Scilab</a> <span 
class=\"anchor-reference-id\"> "
+#~ "(<a href=\"#Scilab\">#Scilab</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"SML\" href=\"http://www.simplemachines.org/about/license.php\";> "
+#~ "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\";> "
+#~ "Лицензия &ldquo;Простых машин&rdquo; (Simple Machines 
License)</a> <span "
+#~ "class=\"anchor-reference-id\">(<a href=\"#SML\">#SML</a>)</span>"
+
+#~ msgid ""
+#~ "<a id=\"Squeak\">Old Squeak license</a> <span class=\"anchor-reference-id"
+#~ "\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+#~ msgstr ""
+#~ "<a id=\"Squeak\">Старая лицензия Squeak</a> <span 
class=\"anchor-"
+#~ "reference-id\"> (<a href=\"#Squeak\">#Squeak</a>)</span>"
+
+#~ msgid ""
 #~ "<a id=\"EPL\" href=\"http://www.eclipse.org/legal/epl-v10.html\";> Eclipse "
 #~ "Public License Version 1.0</a> <span class=\"anchor-reference-id\">(<a "
 #~ "href=\"#EPL\">#EPL</a>)</span>"

Index: philosophy/android-and-users-freedom.de.html
===================================================================
RCS file: /web/www/www/philosophy/android-and-users-freedom.de.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/android-and-users-freedom.de.html        27 Sep 2012 16:53:40 
-0000      1.23
+++ philosophy/android-and-users-freedom.de.html        19 Dec 2012 20:27:51 
-0000      1.24
@@ -74,12 +74,12 @@
 zusammengeführt und mit der Kombination unter GPLv3 freigegeben werden. Aber
 Linux wurde so nicht freigegeben.</p>
 
-<p>Google hat die Anforderungen der GNU General Public License für Linux
-erfüllt, die Apache-Lizenz erfordert für den Rest von Android jedoch keinen
-Quellcode. Google teilte mit, sie würden den Quellcode von Android 3.0
-niemals veröffentlichen (abgesehen von Linux). Der Quellcode von Android 3.1
-wird ebenfalls zurückgehalten, somit ist Android 3.x, abgesehen von Linux,
-schlicht und einfach unfreie Software.</p>
+<p>Google hat die Anforderungen der GNU <span xml:lang="en">General Public
+License</span> für Linux erfüllt, die Apache-Lizenz erfordert für den Rest
+von Android jedoch keinen Quellcode. Google teilte mit, sie würden den
+Quellcode von Android 3.0 niemals veröffentlichen (abgesehen von Linux). Der
+Quellcode von Android 3.1 wird ebenfalls zurückgehalten, somit ist Android
+3.x, abgesehen von Linux, schlicht und einfach unfreie Software.</p>
 
 <p>Google verweigerte dies mit der Begründung, der 3.0-Quellcode sei 
fehlerhaft
 und Nutzer sollten auf die nächste Freigabe warten. Das mag ein guter Rat
@@ -89,10 +89,10 @@
 in ihren eigenen Versionen einfügen wollen, um diesen Quellcode
 <em>schön</em> werden zu lassen.</p>
 
-<p>Glücklicherweise gab Google den Quellcode für Version 3.* später frei, 
als
+<p>Glücklicherweise gab Google den Quellcode für Android 3.* später frei, 
als
 Version 4 (auch mit Quellcode) freigegeben wurde. Das oben erwähnte Problem
-erwies sich eher als eine vorübergehende Anomalie, anstatt einer
-Politikänderung. Was allerdings einmal geschehen ist, kann wieder 
geschehen.</p>
+erwies sich eher als eine vorübergehende Anomalie, anstatt einem
+Kurswechsel. Was allerdings einmal geschehen ist, kann wieder geschehen.</p>
 
 <p>Auf alle Fälle wurde der Großteil des Quellcodes von verschiedenen
 Android-Versionen als Freie Software freigegeben. Heißt das, dass Produkte
@@ -116,22 +116,23 @@
 Android-Installation, da verschiedene Android-Funktionen von ihnen 
abhängen.</p>
 
 <p>Sogar die Programme, die offiziell Teil von Android sind, entsprechen
-möglicherweise nicht dem von Google freigegebenen Quellcode. Hersteller
-können diesen Quellcode ändern, und häufig wird der Quellcode ihrer
-Versionen nicht freigegeben. Die GNU GPL verlangt den Quellcode ihrer
-Linux-Versionen zu vertreiben, unter der Annahme, dass zugestimmt wird. Der
-restliche Quellcode unter der laxen Apache-Lizenz verlangt nicht die
-Freigabe der tatsächlich verwendeten Version des Quellcodes.</p>
+möglicherweise nicht dem von Google freigegebenen Quellcode. Die Hersteller
+können diesen Quellcode ändern und geben häufig den Quellcode ihrer
+Versionen nicht frei. Die GNU GPL verlangt den Quellcode ihrer
+Linux-Versionen zu vertreiben, unter der Annahme, dass sie befolgt wird. Der
+restliche Quellcode, unter laxer Apache-Lizenz, verlangt nicht die Freigabe
+der tatsächlich genutzten Version des Quellcodes.</p>
 
 <p>Eine Änderung, die einige Hersteller in Android vornehmen, ist das
 Hinzufügen eines <a
 
href="http://androidsecuritytest.com/features/logs-and-services/loggers/carrieriq/";>versteckten
-allgemeinen Überwachungspakets</a> wie Carrier IQ.</p>
+allgemeinen Überwachungspakets</a> wie <span xml:lang="en">Carrier
+IQ</span>.</p>
 
-<p>In <a href="http://replicant.us";>Replicant</a>, eine freie Version von
-Android, das nur wenige Handymodelle unterstützt, wurden viele dieser
-Bibliotheken ersetzt und können ohne die unfreien Erweiterungen genutzt
-werden. Aber es gibt andere Probleme.</p>
+<p>In <a href="http://replicant.us"; xml:lang="en">Replicant</a>, eine freie
+Version von Android, das nur wenige Handymodelle unterstützt, wurden viele
+dieser Bibliotheken ersetzt und können ohne die unfreien Erweiterungen
+genutzt werden. Aber es gibt andere Probleme.</p>
 
 <p>Einige Gerätemodelle sind so konzipiert, Nutzer von der Installation und
 Nutzung modifizierter Software abzuhalten. In einem solchen Fall sind die
@@ -188,6 +189,15 @@
 darf. Es steht dem nichts im Wege, ein Android-Telefon mit diesen Merkmalen
 herzustellen, es ist aber keins bekannt.</p>
 
+<p>Android ist kein Self-Hosting-System<a href="#tn1" id="tn1-ref"
+class="transnote">*</a>; die Entwicklung für Android muss auf irgendeinem
+anderen System erfolgen. Googles &#8222;<span xml:lang="en">Software
+Development Kit</span>&#8220; (SDK) ist frei, aber die Definitionsdateien
+für bestimmte Google-APIs sind unfrei. Die Installation des SDKs fordert den
+Nutzer auf, diese unfreien Dateien zu installieren. Es ist möglich
+abzulehnen&#160;&#8209;&#160;aber diese Netzwerkdienst-APIs können so oder
+so nicht ohne unfreie Software genutzt werden.</p>
+
 <p>Aktuelle Presseberichte über Android konzentrieren sich auf die
 Patentkriege. In den 20 Jahren der Bekämpfung und Abschaffung von
 Softwarepatenten warnten wir vor solchen Kriegen. Softwarepatente könnten
@@ -203,11 +213,11 @@
 
 <p>Android ist ein wichtiger Schritt in Richtung eines ethischen,
 benutzerkontrollierten, freie Software Mobiltelefons, aber es ist noch ein
-langer Weg. Hacker arbeiten zwar an <a
-href="http://replicant.us";>Replicant</a>, aber ein neues Telefonmodell zu
-unterstützen ist eine große Aufgabe, und das Problem mit der Firmware bleibt
-nach wie vor. Obwohl heutige Android-Telefone erheblich weniger schlecht als
-Apple- oder Windows-Smartphones sind, kann nicht gesagt werden, dass sie die
+langer Weg. Hacker arbeiten zwar an <a href="http://replicant.us";
+xml:lang="en">Replicant</a>, aber ein neues Telefonmodell zu unterstützen
+ist eine große Aufgabe, und das Problem mit der Firmware bleibt nach wie
+vor. Obwohl heutige Android-Telefone erheblich weniger schlecht als Apple-
+oder Windows-Smartphones sind, kann nicht gesagt werden, dass sie die
 Freiheit der Nutzer respektieren.</p>
 
 <!-- If needed, change the copyright block at the bottom. In general,
@@ -219,7 +229,11 @@
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
- </div>
+<p><strong>Anmerkungen der ÜbersetzerInnen</strong>:</p>
+<ol id="transnote">
+<li id="tn1"><a href="#tn1-ref">*</a> Kein <em>komplettes System, das im
+Wesentlichen alle zum Betrieb notwendigen Komponenten umfasst</em>.</li>
+</ol></div>
 </div>
 
 <!-- for id="content", starts in the include above -->
@@ -259,7 +273,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:53:40 $
+$Date: 2012/12/19 20:27:51 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/android-and-users-freedom.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.de-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/android-and-users-freedom.de-en.html  27 Sep 2012 16:54:47 
-0000      1.20
+++ philosophy/po/android-and-users-freedom.de-en.html  19 Dec 2012 20:28:21 
-0000      1.21
@@ -177,6 +177,13 @@
 not be malicious. There is no obstacle to building an Android phone
 which has these characteristics, but we don't know of any.</p>
 
+<p>Android is not a self-hosting system; development for Android needs
+to be done on some other system.  Google's &ldquo;software development
+kit&rdquo; (SDK) is free, but the definition files for certain Google
+APIs are nonfree.  Installing the SDK invites the user to install
+these nonfree files.  It is possible to refuse &mdash; but either way,
+you can't use these network service APIs without nonfree software.</p>
+
 <p>Recent press coverage of Android focuses on the patent wars. During
 20 years of campaigning for the abolition of software patents, we have
 warned such wars could happen. Software patents could force
@@ -227,7 +234,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:54:47 $
+$Date: 2012/12/19 20:28:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/not-ipr.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/not-ipr.nl.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/not-ipr.nl.po 19 Dec 2012 19:05:58 -0000      1.1
+++ philosophy/po/not-ipr.nl.po 19 Dec 2012 20:28:24 -0000      1.2
@@ -6,394 +6,369 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"POT-Creation-Date: 2012-06-10 04:29-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <address@hidden>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-# | Did You Say [-\"Intellectual Property\"?-] {+&ldquo;Intellectual
-# | Property&rdquo;?+} It's a Seductive Mirage {+- GNU Project - Free Software
-# | Foundation (FSF)+}
 #. type: Content of: <title>
-#| msgid "Did You Say \"Intellectual Property\"? It's a Seductive Mirage"
-msgid "Did You Say &ldquo;Intellectual Property&rdquo;? It's a Seductive 
Mirage - GNU Project - Free Software Foundation (FSF)"
-msgstr "Zei U: &ldquo;Intellectueel Eigendom&rdquo? Dat Is Een Verleidelijke 
Luchtspiegeling - GNU Project - Free Software Foundation (FSF)"
+msgid ""
+"Did You Say &ldquo;Intellectual Property&rdquo;? It's a Seductive Mirage - "
+"GNU Project - Free Software Foundation (FSF)"
+msgstr ""
+"Zei U: &ldquo;Intellectueel Eigendom&rdquo? Dat Is Een Verleidelijke "
+"Luchtspiegeling - GNU Project - Free Software Foundation (FSF)"
 
-# | Did You Say [-\"Intellectual Property\"?-] {+&ldquo;Intellectual
-# | Property&rdquo;?+} It's a Seductive Mirage
 #. type: Content of: <h2>
-#| msgid "Did You Say \"Intellectual Property\"? It's a Seductive Mirage"
-msgid "Did You Say &ldquo;Intellectual Property&rdquo;? It's a Seductive 
Mirage"
-msgstr "Zei U: &ldquo;Intellectueel Eigendom&rdquo;? Dat Is Een Verleidelijke 
Luchtspiegeling"
+msgid ""
+"Did You Say &ldquo;Intellectual Property&rdquo;? It's a Seductive Mirage"
+msgstr ""
+"Zei U: &ldquo;Intellectueel Eigendom&rdquo;? Dat Is Een Verleidelijke "
+"Luchtspiegeling"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
-#| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
 msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
 msgstr "door <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
 
-# | It has become fashionable to toss copyright, patents, and [-trademarks -
-# | three-] {+trademarks&mdash;three+} separate and different entities
-# | involving three separate and different sets of {+laws&mdash;plus a dozen
-# | other+} laws [----] into one pot and call it [-\"intellectual
-# | property\".-] {+&ldquo;intellectual property&rdquo;.+}  The distorting and
-# | confusing term did not [-arise-] {+become common+} by accident.  Companies
-# | that gain from the confusion promoted it.  The clearest way out of the
-# | confusion is to reject the term entirely.
-#. type: Content of: <p>
-#| msgid ""
-#| "It has become fashionable to toss copyright, patents, and trademarks - "
-#| "three separate and different entities involving three separate and "
-#| "different sets of laws -- into one pot and call it \"intellectual property"
-#| "\". The distorting and confusing term did not arise by accident. "
-#| "Companies that gain from the confusion promoted it. The clearest way out "
-#| "of the confusion is to reject the term entirely."
-msgid "It has become fashionable to toss copyright, patents, and 
trademarks&mdash;three separate and different entities involving three separate 
and different sets of laws&mdash;plus a dozen other laws into one pot and call 
it &ldquo;intellectual property&rdquo;.  The distorting and confusing term did 
not become common by accident.  Companies that gain from the confusion promoted 
it.  The clearest way out of the confusion is to reject the term entirely."
-msgstr "Het is tegenwoordig modieus om de begrippen auteursrecht, patentrecht 
en handelsmerken &mdash; drie verschillende begrippen met daarbijbehorende 
verschillende wetgeving &mdash; op &eacute;&eacute;n hoop te gooien onder de 
noemer &ldquo;intellectueel eigendom&rdquo; Deze verwarrende en misleidende 
term is niet toevallig ontstaan. Bedrijven die baat hebben bij deze verwarring 
bevorderen het gebruik ervan. De eenvoudigste manier om dit tegen te gaan is om 
de term volledig af te wijzen."
-
-# | According to Professor Mark Lemley, now of the Stanford Law School, the
-# | widespread use of the term [-\"intellectual property\"-]
-# | {+&ldquo;intellectual property&rdquo;+} is a [-fad-] {+fashion+} that
-# | followed the 1967 founding of the World [-\"Intellectual Property\"
-# | Organization,-] {+&ldquo;Intellectual Property&rdquo; Organization
-# | (WIPO),+} and only became really common in recent years. (WIPO is formally
-# | a UN organization, but in fact represents the interests of the holders of
-# | copyrights, patents, and trademarks.) {+Wide use dates from <a
-# | 
href=\"http://ngrams.googlelabs.com/graph?content=intellectual+property&amp;year_start=1800&amp;year_end=2008&amp;corpus=0&amp;smoothing=1\";>around
-# | 1990</a>. (<a href=\"/graphics/seductivemirage.png\">Local image
-# | copy</a>)+}
-#. type: Content of: <p>
-#| msgid ""
-#| "According to Professor Mark Lemley, now of the Stanford Law School, the "
-#| "widespread use of the term \"intellectual property\" is a fad that "
-#| "followed the 1967 founding of the World \"Intellectual Property\" "
-#| "Organization, and only became really common in recent years. (WIPO is "
-#| "formally a UN organization, but in fact represents the interests of the "
-#| "holders of copyrights, patents, and trademarks.)"
-msgid "According to Professor Mark Lemley, now of the Stanford Law School, the 
widespread use of the term &ldquo;intellectual property&rdquo; is a fashion 
that followed the 1967 founding of the World &ldquo;Intellectual 
Property&rdquo; Organization (WIPO), and only became really common in recent 
years. (WIPO is formally a UN organization, but in fact represents the 
interests of the holders of copyrights, patents, and trademarks.) Wide use 
dates from <a 
href=\"http://ngrams.googlelabs.com/graph?content=intellectual+property&amp;year_start=1800&amp;year_end=2008&amp;corpus=0&amp;smoothing=1\";>around
 1990</a>. (<a href=\"/graphics/seductivemirage.png\">Local image copy</a>)"
-msgstr "Volgens professor Mark Lemley, tegenwoordig van de Stanford Law 
School, begon de term in de mode te komen na de stichting in 1967 van de World 
&ldquo;Intellectual Property&rdquo; Organization en werd pas recent echt 
gemeengoed (WIPO is formeel een organisatie van de VN maar vertegenwoordigd 
feitelijk de belangen van houders van patenten, auteursrechten en 
handelsmerken). Algemeen gebruik van de term begon <a 
href=\"http://ngrams.googlelabs.com/graph?content=intellectual+property&amp;year_start=1800&amp;year_end=2008&amp;corpus=0&amp;smoothing=1\";>rond
 1990</a>. (<a href=\"/graphics/seductivemirage.png\">Local image copy</a>)"
-
-# | The term carries a bias that is not hard to see: it suggests thinking
-# | about copyright, patents and trademarks by analogy with property rights
-# | for physical objects. (This analogy is at odds with the legal philosophies
-# | of copyright law, of patent law, and of trademark law, but only
-# | specialists know that.) These laws are in fact not much like physical
-# | property law, but use of this term leads legislators to change them to be
-# | more so.  Since that is the change desired by the companies that exercise
-# | copyright, patent and trademark powers, the bias [-of \"intellectual
-# | property\"-] {+introduced by the term &ldquo;intellectual
-# | property&rdquo;+} suits them.
-#. type: Content of: <p>
-#| msgid ""
-#| "The term carries a bias that is not hard to see: it suggests thinking "
-#| "about copyright, patents and trademarks by analogy with property rights "
-#| "for physical objects. (This analogy is at odds with the legal "
-#| "philosophies of copyright law, of patent law, and of trademark law, but "
-#| "only specialists know that.) These laws are in fact not much like "
-#| "physical property law, but use of this term leads legislators to change "
-#| "them to be more so. Since that is the change desired by the companies "
-#| "that exercise copyright, patent and trademark powers, the bias of "
-#| "\"intellectual property\" suits them."
-msgid "The term carries a bias that is not hard to see: it suggests thinking 
about copyright, patents and trademarks by analogy with property rights for 
physical objects. (This analogy is at odds with the legal philosophies of 
copyright law, of patent law, and of trademark law, but only specialists know 
that.) These laws are in fact not much like physical property law, but use of 
this term leads legislators to change them to be more so.  Since that is the 
change desired by the companies that exercise copyright, patent and trademark 
powers, the bias introduced by the term &ldquo;intellectual property&rdquo; 
suits them."
-msgstr "De uitdrukking bevat een duidelijk vooroordeel: het suggereert dat 
auteursrecht, patentrecht en handelsmerken bijna hetzelfde is als 
eigendomsrechten op vaste objecten (Deze analogie is in tegenspraak met het 
juridische denken over auteursrechten, patenten en handelsmerken, maar alleen 
specialisten weten dat).  Deze wetten lijken helemaal niet op eigendomsrecht 
maar het gebruik van deze uitdrukking verleid wetgevers om er w&eacute;l zo 
over te denken en wetten dus navenant aan te passen. Aangezien bedrijven die 
auteursrechten, patenten en handelsmerken hebben dit juist willen, komt het 
ingebakken vooroordeel in de uitdrukking &ldquo;intellectueel eigendom&rdquo; 
hen goed van pas."
-
-# | The bias is [-enough-] reason {+enough+} to reject the term, and people
-# | have often asked me to propose some other name for the overall [-category
-# | -- or-] {+category&mdash;or+} have proposed their own alternatives (often
-# | humorous).  Suggestions include IMPs, for Imposed Monopoly Privileges, and
-# | GOLEMs, for Government-Originated Legally Enforced Monopolies.  Some speak
-# | of [-\"exclusive-] {+&ldquo;exclusive+} rights [-regimes\",-]
-# | {+regimes&rdquo;,+} but referring to restrictions as [-\"rights\"-]
-# | {+&ldquo;rights&rdquo;+} is doublethink too.
-#. type: Content of: <p>
-#| msgid ""
-#| "The bias is enough reason to reject the term, and people have often asked "
-#| "me to propose some other name for the overall category -- or have "
-#| "proposed their own alternatives (often humorous). Suggestions include "
-#| "IMPs, for Imposed Monopoly Privileges, and GOLEMs, for Government-"
-#| "Originated Legally Enforced Monopolies. Some speak of \"exclusive rights "
-#| "regimes\", but referring to restrictions as \"rights\" is doublethink too."
-msgid "The bias is reason enough to reject the term, and people have often 
asked me to propose some other name for the overall category&mdash;or have 
proposed their own alternatives (often humorous).  Suggestions include IMPs, 
for Imposed Monopoly Privileges, and GOLEMs, for Government-Originated Legally 
Enforced Monopolies.  Some speak of &ldquo;exclusive rights regimes&rdquo;, but 
referring to restrictions as &ldquo;rights&rdquo; is doublethink too."
-msgstr "Dit vooroordeel is voldoende om de uitdrukking af te keuren en mensen 
hebben me vaak gevraagd een andere naam te bedenken voor de hele categorie 
-&mdash; of kwamen zelfs met eigen (vaak geestige) suggesties. Zoals IMPs voor 
Imposed Monopoly Privileges (opgedrongen monopolie voorrechten) en GOLEMs voor 
Government-Originated Legally Enforced Monopolies (van overheidswege 
gelegaliseerde monopolies). Sommigen hebben het over &ldquo;exclusieve rechten 
regimes&rdquo; maar verwijzen naar beperkingen als zijnde &ldquo;rechten&rdquo; 
klopt ook niet."
-
-# | Some of these alternative names would be an improvement, but it is a
-# | mistake to replace [-\"intellectual property\"-] {+&ldquo;intellectual
-# | property&rdquo;+} with any other term.  A different name will not address
-# | the term's deeper problem: overgeneralization.  There is no such unified
-# | thing as [-\"intellectual property\"--it-] {+&ldquo;intellectual
-# | property&rdquo;&mdash;it+} is a mirage.  The only reason people think it
-# | makes sense as a coherent category is that widespread use of the term
-# | [-gives that impression.-] {+has misled them.+}
-#. type: Content of: <p>
-#| msgid ""
-#| "Some of these alternative names would be an improvement, but it is a "
-#| "mistake to replace \"intellectual property\" with any other term. A "
-#| "different name will not address the term's deeper problem: "
-#| "overgeneralization. There is no such unified thing as \"intellectual "
-#| "property\"--it is a mirage. The only reason people think it makes sense "
-#| "as a coherent category is that widespread use of the term gives that "
-#| "impression."
-msgid "Some of these alternative names would be an improvement, but it is a 
mistake to replace &ldquo;intellectual property&rdquo; with any other term.  A 
different name will not address the term's deeper problem: overgeneralization.  
There is no such unified thing as &ldquo;intellectual property&rdquo;&mdash;it 
is a mirage.  The only reason people think it makes sense as a coherent 
category is that widespread use of the term has misled them."
-msgstr "Sommige van de alternatieve uitdrukkingen zouden zeker een verbetering 
zijn maar het is een vergissing om de term &ldquo;intellectueel eigendom&rdquo; 
te willen vervangen. Een andere uitdrukking is geen oplossing voor het dieper 
liggende probleem, dat van een teveel aan generaliseren. Er bestaat geen 
universeel iets als &ldquo;intellectueel eigendom&rdquo;&mdash;het is een 
luchtspiegeling. De enige reden waarom mensen denken dat het een samenhangend 
geheel is is het wijd verbreidde gebruik van de uitdrukking die tot deze indruk 
leidt."
-
-# | The term [-\"intellectual property\"-] {+&ldquo;intellectual
-# | property&rdquo;+} is at best a catch-all to lump together disparate laws.
-# | Non[---]lawyers who hear one term applied to these various laws tend to
-# | assume they are based on a common principle[-,-] and function similarly.
-#. type: Content of: <p>
-#| msgid ""
-#| "The term \"intellectual property\" is at best a catch-all to lump "
-#| "together disparate laws. Non-lawyers who hear one term applied to these "
-#| "various laws tend to assume they are based on a common principle, and "
-#| "function similarly."
-msgid "The term &ldquo;intellectual property&rdquo; is at best a catch-all to 
lump together disparate laws.  Nonlawyers who hear one term applied to these 
various laws tend to assume they are based on a common principle and function 
similarly."
-msgstr "De term &ldquo;intellectueel eigendom&rdquo; is op zijn best een 
omsluiting van meerdere wetten die niets met elkaar te maken hebben. 
Niet-juristen die de uitdrukking toegepast zien op deze diverse wetten hebben 
de neiging aan te nemen dat ze gebaseerd zijn op hetzelfde principe en 
hetzelfde werken."
-
-# || No change detected.  The change might only be in amounts of spaces.
-#. type: Content of: <p>
-#| msgid ""
-#| "Nothing could be further from the case.  These laws originated "
-#| "separately, evolved differently, cover different activities, have "
-#| "different rules, and raise different public policy issues."
-msgid "Nothing could be further from the case.  These laws originated 
separately, evolved differently, cover different activities, have different 
rules, and raise different public policy issues."
-msgstr "Niets is minder waar.  Deze wetten hebben een eigen 
ontstaansgeschiedenis, zijn langs aparte wegen ge&euml;volueerd, gaan over 
verschillende aktiviteiten, hebben andere regels en hebben betrekking op 
verschillend openbaar beleid."
-
-# | Copyright law was designed to promote authorship and art, and covers the
-# | details of expression of a work.  Patent law was intended to promote the
-# | publication of useful ideas, at the price of giving the one who publishes
-# | an idea a temporary monopoly over [-it--a-] {+it&mdash;a+} price that may
-# | be worth paying in some fields and not in others.
-#. type: Content of: <p>
-#| msgid ""
-#| "Copyright law was designed to promote authorship and art, and covers the "
-#| "details of expression of a work. Patent law was intended to promote the "
-#| "publication of useful ideas, at the price of giving the one who publishes "
-#| "an idea a temporary monopoly over it--a price that may be worth paying in "
-#| "some fields and not in others."
-msgid "Copyright law was designed to promote authorship and art, and covers 
the details of expression of a work.  Patent law was intended to promote the 
publication of useful ideas, at the price of giving the one who publishes an 
idea a temporary monopoly over it&mdash;a price that may be worth paying in 
some fields and not in others."
-msgstr "Het auteursrecht was in het leven geroepen om het schrijven en de 
kunsten te bevorderen en regelt de verschijningsvorm van een werk. Het 
patentrecht had tot doel het publiceren van nuttige idee&euml;n te bevorderen, 
met als tegenprestatie een tijdelijk monopolie op het idee voor de bedenker 
&mdash; een prijs die het waard is betaald te worden op sommige gebieden maar 
bij anderen weer niet."
-
-# | Trademark law, by contrast, was not intended to promote any particular way
-# | of acting, but simply to enable buyers to know what they are buying.
-# | Legislators under the influence of [-\"intellectual property\",-] {+the
-# | term &ldquo;intellectual property&rdquo;,+} however, have turned it into a
-# | scheme that provides incentives for advertising.
-#. type: Content of: <p>
-#| msgid ""
-#| "Trademark law, by contrast, was not intended to promote any particular "
-#| "way of acting, but simply to enable buyers to know what they are buying. "
-#| "Legislators under the influence of \"intellectual property\", however, "
-#| "have turned it into a scheme that provides incentives for advertising."
-msgid "Trademark law, by contrast, was not intended to promote any particular 
way of acting, but simply to enable buyers to know what they are buying.  
Legislators under the influence of the term &ldquo;intellectual 
property&rdquo;, however, have turned it into a scheme that provides incentives 
for advertising."
-msgstr "In tegestelling hiermee was het handelsmerk nooit bedoeld om bepaalde 
akties te bevorderen maar gewoon om kopers te laten weten wat ze eigenlijk 
kochten.  Wetgevers, onder invloed van het begrip &ldquo;intellectueel 
eigendom&rdquo;, hebben dit echter verdraaid naar een aanmoediging voor het 
maken van reclame."
-
-# || No change detected.  The change might only be in amounts of spaces.
-#. type: Content of: <p>
-#| msgid ""
-#| "Since these laws developed independently, they are different in every "
-#| "detail, as well as in their basic purposes and methods. Thus, if you "
-#| "learn some fact about copyright law, you'd be wise to assume that patent "
-#| "law is different. You'll rarely go wrong!"
-msgid "Since these laws developed independently, they are different in every 
detail, as well as in their basic purposes and methods.  Thus, if you learn 
some fact about copyright law, you'd be wise to assume that patent law is 
different.  You'll rarely go wrong!"
-msgstr "Aangezien deze wetten onafhankelijk van elkaar zijn ontstaan, 
verschillen ze op allerlei punten, zo ook op hun uitgangspunten. Als je dus 
iets weet over auteursrecht kun je maar beter aannemen dat dit ni&eacute;t in 
patentrecht voorkomt. Je zult het zelden verkeerd hebben!"
-
-# | People often say [-\"intellectual property\"-] {+&ldquo;intellectual
-# | property&rdquo;+} when they really mean some larger or smaller category.
-# | For instance, rich countries often impose unjust laws on poor countries to
-# | squeeze money out of them.  Some of these laws are [-\"intellectual
-# | property\"-] {+&ldquo;intellectual property&rdquo;+} laws, and others are
-# | not; nonetheless, critics of the practice often grab for that label
-# | because it has become familiar to them.  By using it, they misrepresent
-# | the nature of the issue.  It would be better to use an accurate term, such
-# | as [-\"legislative colonization\",-] {+&ldquo;legislative
-# | colonization&rdquo;,+} that gets to the heart of the matter.
-#. type: Content of: <p>
-#| msgid ""
-#| "People often say \"intellectual property\" when they really mean some "
-#| "larger or smaller category. For instance, rich countries often impose "
-#| "unjust laws on poor countries to squeeze money out of them. Some of these "
-#| "laws are \"intellectual property\" laws, and others are not; nonetheless, "
-#| "critics of the practice often grab for that label because it has become "
-#| "familiar to them. By using it, they misrepresent the nature of the issue. "
-#| "It would be better to use an accurate term, such as \"legislative "
-#| "colonization\", that gets to the heart of the matter."
-msgid "People often say &ldquo;intellectual property&rdquo; when they really 
mean some larger or smaller category.  For instance, rich countries often 
impose unjust laws on poor countries to squeeze money out of them.  Some of 
these laws are &ldquo;intellectual property&rdquo; laws, and others are not; 
nonetheless, critics of the practice often grab for that label because it has 
become familiar to them.  By using it, they misrepresent the nature of the 
issue.  It would be better to use an accurate term, such as &ldquo;legislative 
colonization&rdquo;, that gets to the heart of the matter."
-msgstr "Mensen misbruiken vaak de uitdrukking &ldquo;intellectueel 
eigendom&rdquo; voor een veel breder begrip, of iets veel specifiekers. Rijke 
landen bijvoorbeeld leggen vaak oneerlijke wetten op aan arme landen om daar 
geld aan te kunnen verdienen. Sommige van deze wetten gaan over 
&ldquo;intellectueel eigendom&rdquo;, en anderen niet; niettemin grijpen 
critici van deze praktijken vaak naar dit begrip omdat het bekend is. Deze term 
dekt echter niet de lading en het zou beter zijn om iets passenders te 
gebruiken zoals &ldquo;koloniserende wetgeving&rdquo;, wat precies zegt waar 
het op staat."
-
-# | Laymen are not alone in being confused by this term.  Even law professors
-# | who teach these laws are lured [-by,-] and distracted by[-,-] the
-# | seductiveness of the term [-\"intellectual property\",-]
-# | {+&ldquo;intellectual property&rdquo;,+} and make general statements that
-# | conflict with facts they know.  For example, one professor wrote in 2006:
-#. type: Content of: <p>
-#| msgid ""
-#| "Laymen are not alone in being confused by this term. Even law professors "
-#| "who teach these laws are lured by, and distracted by, the seductiveness "
-#| "of the term \"intellectual property\", and make general statements that "
-#| "conflict with facts they know. For example, one professor wrote in 2006:"
-msgid "Laymen are not alone in being confused by this term.  Even law 
professors who teach these laws are lured and distracted by the seductiveness 
of the term &ldquo;intellectual property&rdquo;, and make general statements 
that conflict with facts they know.  For example, one professor wrote in 2006:"
-msgstr "Het zijn niet alleen leken die dit verwarren. Zelfs professoren in de 
rechten, die deze wetten onderwijzen, worden door de uitdrukking 
&ldquo;intellectueel eigendom&rdquo; verleid en afgeleid en doen daardoor 
uitspraken die tegen de feiten in gaan, hoewel ze die feiten dus kennen. 
Bijvoorbeeld in 2006 schreef een professor:"
-
-# | [-\"Unlike-]{+Unlike+} their descendants who now work the floor at WIPO,
-# | the framers of the US constitution had a principled, pro[---]competitive
-# | attitude to intellectual property.  They knew rights might be necessary,
-# | [-but...they-] {+but&hellip;they+} tied congress's hands, restricting its
-# | power in multiple [-ways\".-] {+ways.+}
+#. type: Content of: <p>
+msgid ""
+"It has become fashionable to toss copyright, patents, and trademarks&mdash;"
+"three separate and different entities involving three separate and different "
+"sets of laws&mdash;plus a dozen other laws into one pot and call it &ldquo;"
+"intellectual property&rdquo;.  The distorting and confusing term did not "
+"become common by accident.  Companies that gain from the confusion promoted "
+"it.  The clearest way out of the confusion is to reject the term entirely."
+msgstr ""
+"Het is tegenwoordig modieus om de begrippen auteursrecht, patentrecht en "
+"handelsmerken &mdash; drie verschillende begrippen met daarbijbehorende "
+"verschillende wetgeving &mdash; op &eacute;&eacute;n hoop te gooien onder de "
+"noemer &ldquo;intellectueel eigendom&rdquo; Deze verwarrende en misleidende "
+"term is niet toevallig ontstaan. Bedrijven die baat hebben bij deze "
+"verwarring bevorderen het gebruik ervan. De eenvoudigste manier om dit tegen "
+"te gaan is om de term volledig af te wijzen."
+
+#. type: Content of: <p>
+msgid ""
+"According to Professor Mark Lemley, now of the Stanford Law School, the "
+"widespread use of the term &ldquo;intellectual property&rdquo; is a fashion "
+"that followed the 1967 founding of the World &ldquo;Intellectual "
+"Property&rdquo; Organization (WIPO), and only became really common in recent "
+"years. (WIPO is formally a UN organization, but in fact represents the "
+"interests of the holders of copyrights, patents, and trademarks.) Wide use "
+"dates from <a href=\"http://ngrams.googlelabs.com/graph?content=intellectual";
+"+property&amp;year_start=1800&amp;year_end=2008&amp;corpus=0&amp;"
+"smoothing=1\">around 1990</a>. (<a href=\"/graphics/seductivemirage.png"
+"\">Local image copy</a>)"
+msgstr ""
+"Volgens professor Mark Lemley, tegenwoordig van de Stanford Law School, "
+"begon de term in de mode te komen na de stichting in 1967 van de World "
+"&ldquo;Intellectual Property&rdquo; Organization en werd pas recent echt "
+"gemeengoed (WIPO is formeel een organisatie van de VN maar vertegenwoordigd "
+"feitelijk de belangen van houders van patenten, auteursrechten en "
+"handelsmerken). Algemeen gebruik van de term begon <a href=\"http://ngrams.";
+"googlelabs.com/graph?content=intellectual+property&amp;year_start=1800&amp;"
+"year_end=2008&amp;corpus=0&amp;smoothing=1\">rond 1990</a>. (<a href=\"/"
+"graphics/seductivemirage.png\">Local image copy</a>)"
+
+#. type: Content of: <p>
+msgid ""
+"The term carries a bias that is not hard to see: it suggests thinking about "
+"copyright, patents and trademarks by analogy with property rights for "
+"physical objects. (This analogy is at odds with the legal philosophies of "
+"copyright law, of patent law, and of trademark law, but only specialists "
+"know that.) These laws are in fact not much like physical property law, but "
+"use of this term leads legislators to change them to be more so.  Since that "
+"is the change desired by the companies that exercise copyright, patent and "
+"trademark powers, the bias introduced by the term &ldquo;intellectual "
+"property&rdquo; suits them."
+msgstr ""
+"De uitdrukking bevat een duidelijk vooroordeel: het suggereert dat "
+"auteursrecht, patentrecht en handelsmerken bijna hetzelfde is als "
+"eigendomsrechten op vaste objecten (Deze analogie is in tegenspraak met het "
+"juridische denken over auteursrechten, patenten en handelsmerken, maar "
+"alleen specialisten weten dat).  Deze wetten lijken helemaal niet op "
+"eigendomsrecht maar het gebruik van deze uitdrukking verleid wetgevers om er "
+"w&eacute;l zo over te denken en wetten dus navenant aan te passen. Aangezien "
+"bedrijven die auteursrechten, patenten en handelsmerken hebben dit juist "
+"willen, komt het ingebakken vooroordeel in de uitdrukking &ldquo;"
+"intellectueel eigendom&rdquo; hen goed van pas."
+
+#. type: Content of: <p>
+msgid ""
+"The bias is reason enough to reject the term, and people have often asked me "
+"to propose some other name for the overall category&mdash;or have proposed "
+"their own alternatives (often humorous).  Suggestions include IMPs, for "
+"Imposed Monopoly Privileges, and GOLEMs, for Government-Originated Legally "
+"Enforced Monopolies.  Some speak of &ldquo;exclusive rights regimes&rdquo;, "
+"but referring to restrictions as &ldquo;rights&rdquo; is doublethink too."
+msgstr ""
+"Dit vooroordeel is voldoende om de uitdrukking af te keuren en mensen hebben "
+"me vaak gevraagd een andere naam te bedenken voor de hele categorie -&mdash; "
+"of kwamen zelfs met eigen (vaak geestige) suggesties. Zoals IMPs voor "
+"Imposed Monopoly Privileges (opgedrongen monopolie voorrechten) en GOLEMs "
+"voor Government-Originated Legally Enforced Monopolies (van overheidswege "
+"gelegaliseerde monopolies). Sommigen hebben het over &ldquo;exclusieve "
+"rechten regimes&rdquo; maar verwijzen naar beperkingen als zijnde &ldquo;"
+"rechten&rdquo; klopt ook niet."
+
+#. type: Content of: <p>
+msgid ""
+"Some of these alternative names would be an improvement, but it is a mistake "
+"to replace &ldquo;intellectual property&rdquo; with any other term.  A "
+"different name will not address the term's deeper problem: "
+"overgeneralization.  There is no such unified thing as &ldquo;intellectual "
+"property&rdquo;&mdash;it is a mirage.  The only reason people think it makes "
+"sense as a coherent category is that widespread use of the term has misled "
+"them."
+msgstr ""
+"Sommige van de alternatieve uitdrukkingen zouden zeker een verbetering zijn "
+"maar het is een vergissing om de term &ldquo;intellectueel eigendom&rdquo; "
+"te willen vervangen. Een andere uitdrukking is geen oplossing voor het "
+"dieper liggende probleem, dat van een teveel aan generaliseren. Er bestaat "
+"geen universeel iets als &ldquo;intellectueel eigendom&rdquo;&mdash;het is "
+"een luchtspiegeling. De enige reden waarom mensen denken dat het een "
+"samenhangend geheel is is het wijd verbreidde gebruik van de uitdrukking die "
+"tot deze indruk leidt."
+
+#. type: Content of: <p>
+msgid ""
+"The term &ldquo;intellectual property&rdquo; is at best a catch-all to lump "
+"together disparate laws.  Nonlawyers who hear one term applied to these "
+"various laws tend to assume they are based on a common principle and "
+"function similarly."
+msgstr ""
+"De term &ldquo;intellectueel eigendom&rdquo; is op zijn best een omsluiting "
+"van meerdere wetten die niets met elkaar te maken hebben. Niet-juristen die "
+"de uitdrukking toegepast zien op deze diverse wetten hebben de neiging aan "
+"te nemen dat ze gebaseerd zijn op hetzelfde principe en hetzelfde werken."
+
+#. type: Content of: <p>
+msgid ""
+"Nothing could be further from the case.  These laws originated separately, "
+"evolved differently, cover different activities, have different rules, and "
+"raise different public policy issues."
+msgstr ""
+"Niets is minder waar.  Deze wetten hebben een eigen ontstaansgeschiedenis, "
+"zijn langs aparte wegen ge&euml;volueerd, gaan over verschillende "
+"aktiviteiten, hebben andere regels en hebben betrekking op verschillend "
+"openbaar beleid."
+
+#. type: Content of: <p>
+msgid ""
+"Copyright law was designed to promote authorship and art, and covers the "
+"details of expression of a work.  Patent law was intended to promote the "
+"publication of useful ideas, at the price of giving the one who publishes an "
+"idea a temporary monopoly over it&mdash;a price that may be worth paying in "
+"some fields and not in others."
+msgstr ""
+"Het auteursrecht was in het leven geroepen om het schrijven en de kunsten te "
+"bevorderen en regelt de verschijningsvorm van een werk. Het patentrecht had "
+"tot doel het publiceren van nuttige idee&euml;n te bevorderen, met als "
+"tegenprestatie een tijdelijk monopolie op het idee voor de bedenker &mdash; "
+"een prijs die het waard is betaald te worden op sommige gebieden maar bij "
+"anderen weer niet."
+
+#. type: Content of: <p>
+msgid ""
+"Trademark law, by contrast, was not intended to promote any particular way "
+"of acting, but simply to enable buyers to know what they are buying.  "
+"Legislators under the influence of the term &ldquo;intellectual "
+"property&rdquo;, however, have turned it into a scheme that provides "
+"incentives for advertising."
+msgstr ""
+"In tegestelling hiermee was het handelsmerk nooit bedoeld om bepaalde akties "
+"te bevorderen maar gewoon om kopers te laten weten wat ze eigenlijk "
+"kochten.  Wetgevers, onder invloed van het begrip &ldquo;intellectueel "
+"eigendom&rdquo;, hebben dit echter verdraaid naar een aanmoediging voor het "
+"maken van reclame."
+
+#. type: Content of: <p>
+msgid ""
+"Since these laws developed independently, they are different in every "
+"detail, as well as in their basic purposes and methods.  Thus, if you learn "
+"some fact about copyright law, you'd be wise to assume that patent law is "
+"different.  You'll rarely go wrong!"
+msgstr ""
+"Aangezien deze wetten onafhankelijk van elkaar zijn ontstaan, verschillen ze "
+"op allerlei punten, zo ook op hun uitgangspunten. Als je dus iets weet over "
+"auteursrecht kun je maar beter aannemen dat dit ni&eacute;t in patentrecht "
+"voorkomt. Je zult het zelden verkeerd hebben!"
+
+#. type: Content of: <p>
+msgid ""
+"People often say &ldquo;intellectual property&rdquo; when they really mean "
+"some larger or smaller category.  For instance, rich countries often impose "
+"unjust laws on poor countries to squeeze money out of them.  Some of these "
+"laws are &ldquo;intellectual property&rdquo; laws, and others are not; "
+"nonetheless, critics of the practice often grab for that label because it "
+"has become familiar to them.  By using it, they misrepresent the nature of "
+"the issue.  It would be better to use an accurate term, such as &ldquo;"
+"legislative colonization&rdquo;, that gets to the heart of the matter."
+msgstr ""
+"Mensen misbruiken vaak de uitdrukking &ldquo;intellectueel eigendom&rdquo; "
+"voor een veel breder begrip, of iets veel specifiekers. Rijke landen "
+"bijvoorbeeld leggen vaak oneerlijke wetten op aan arme landen om daar geld "
+"aan te kunnen verdienen. Sommige van deze wetten gaan over &ldquo;"
+"intellectueel eigendom&rdquo;, en anderen niet; niettemin grijpen critici "
+"van deze praktijken vaak naar dit begrip omdat het bekend is. Deze term dekt "
+"echter niet de lading en het zou beter zijn om iets passenders te gebruiken "
+"zoals &ldquo;koloniserende wetgeving&rdquo;, wat precies zegt waar het op "
+"staat."
+
+#. type: Content of: <p>
+msgid ""
+"Laymen are not alone in being confused by this term.  Even law professors "
+"who teach these laws are lured and distracted by the seductiveness of the "
+"term &ldquo;intellectual property&rdquo;, and make general statements that "
+"conflict with facts they know.  For example, one professor wrote in 2006:"
+msgstr ""
+"Het zijn niet alleen leken die dit verwarren. Zelfs professoren in de "
+"rechten, die deze wetten onderwijzen, worden door de uitdrukking &ldquo;"
+"intellectueel eigendom&rdquo; verleid en afgeleid en doen daardoor "
+"uitspraken die tegen de feiten in gaan, hoewel ze die feiten dus kennen. "
+"Bijvoorbeeld in 2006 schreef een professor:"
+
 #. type: Content of: <blockquote><p>
-#| msgid ""
-#| "\"Unlike their descendants who now work the floor at WIPO, the framers of "
-#| "the US constitution had a principled, pro-competitive attitude to "
-#| "intellectual property. They knew rights might be necessary, but...they "
-#| "tied congress's hands, restricting its power in multiple ways\"."
-msgid "Unlike their descendants who now work the floor at WIPO, the framers of 
the US constitution had a principled, procompetitive attitude to intellectual 
property.  They knew rights might be necessary, but&hellip;they tied congress's 
hands, restricting its power in multiple ways."
-msgstr "&ldquo;In tegenstelling tot hun nazaten, die nu de WIPO bevolken, 
hadden de grondleggers van de amerikaanse grondwet een principi&euml;le en 
concurrentie&mdash;gezinde houding ten opzichte van intellectueel eigendom. Ze 
wisten dat er wellicht rechten nodig waren maar&hellip;ze beperkten het congres 
en dus zijn macht op meerdere wijzen&rdquo;."
-
-# | That statement refers to [-the article 1 section-] {+Article 1, Section+}
-# | 8, [-c-]{+C+}lause 8 [-in-] {+of+} the US Constitution, which authorizes
-# | copyright law and patent law.  That clause, though, has nothing to do with
-# | trademark [-law.-] {+law or various others.+}  The term [-\"intellectual
-# | property\"-] {+&ldquo;intellectual property&rdquo;+} led that professor
-# | [-into a-] {+to make+} false generalization.
-#. type: Content of: <p>
-#| msgid ""
-#| "That statement refers to the article 1 section 8, clause 8 in the US "
-#| "Constitution, which authorizes copyright law and patent law. That clause, "
-#| "though, has nothing to do with trademark law. The term \"intellectual "
-#| "property\" led that professor into a false generalization."
-msgid "That statement refers to Article 1, Section 8, Clause 8 of the US 
Constitution, which authorizes copyright law and patent law.  That clause, 
though, has nothing to do with trademark law or various others.  The term 
&ldquo;intellectual property&rdquo; led that professor to make false 
generalization."
-msgstr "Deze uitspraak slaat op artikel 1, sectie 8, sub 8 van de amerikaanse 
grondwet, die auteursrecht en patentrecht toestaat. Deze clausule heeft echter 
niets te maken met handelsmerken. De uitdrukking &ldquo;intellectueel 
eigendom&rdquo; leidde tot deze foute veralgemenisering van de professor."
-
-# | The term [-\"intellectual property\"-] {+&ldquo;intellectual
-# | property&rdquo;+} also leads to simplistic thinking.  It leads people to
-# | focus on the meager commonality in form that these disparate laws
-# | [-have--that-] {+have&mdash;that+} they create artificial privileges for
-# | certain [-parties--and-] {+parties&mdash;and+} to disregard the details
-# | which form their substance: the specific restrictions each law places on
-# | the public, and the consequences that result.  This simplistic focus on
-# | the form encourages an [-\"economistic\"-] {+&ldquo;economistic&rdquo;+}
-# | approach to all these issues.
-#. type: Content of: <p>
-#| msgid ""
-#| "The term \"intellectual property\" also leads to simplistic thinking. It "
-#| "leads people to focus on the meager commonality in form that these "
-#| "disparate laws have--that they create artificial privileges for certain "
-#| "parties--and to disregard the details which form their substance: the "
-#| "specific restrictions each law places on the public, and the consequences "
-#| "that result. This simplistic focus on the form encourages an \"economistic"
-#| "\" approach to all these issues."
-msgid "The term &ldquo;intellectual property&rdquo; also leads to simplistic 
thinking.  It leads people to focus on the meager commonality in form that 
these disparate laws have&mdash;that they create artificial privileges for 
certain parties&mdash;and to disregard the details which form their substance: 
the specific restrictions each law places on the public, and the consequences 
that result.  This simplistic focus on the form encourages an 
&ldquo;economistic&rdquo; approach to all these issues."
-msgstr "De uitdrukking &ldquo;intellectueel eigendom&rdquo; leid ook tot 
t&eacute; simpel denken. Het legt de nadruk op die ene kleine eigenschap die de 
wetten gemeen hebben &mdash; dat ze kunstmatige rechten verlenen aan bepaalde 
partijen &mdash; en negeert de verdere details waaruit die wetten bestaan: de 
precieze beperkingen die iedere wet oplegt aan de gemeenschap en de gevolgen 
hiervan. Dit simplistische blindstaren werkt een &ldquo;economische&rdquo; kijk 
op dit alles in de hand."
-
-# | Economics operates here, as it often does, as a vehicle for unexamined
-# | assumptions.  These include assumptions about values, such as that amount
-# | of production matters[-,-] while freedom and way of life do not, and
-# | factual assumptions which are mostly false, such as that copyrights on
-# | music supports musicians, or that patents on drugs support life-saving
-# | research.
-#. type: Content of: <p>
-#| msgid ""
-#| "Economics operates here, as it often does, as a vehicle for unexamined "
-#| "assumptions.  These include assumptions about values, such as that amount "
-#| "of production matters, while freedom and way of life do not, and factual "
-#| "assumptions which are mostly false, such as that copyrights on music "
-#| "supports musicians, or that patents on drugs support life-saving research."
-msgid "Economics operates here, as it often does, as a vehicle for unexamined 
assumptions.  These include assumptions about values, such as that amount of 
production matters while freedom and way of life do not, and factual 
assumptions which are mostly false, such as that copyrights on music supports 
musicians, or that patents on drugs support life-saving research."
-msgstr "Deze economische kijk werkt, zoals zo vaak, ondoordachte aannames in 
de hand.  Onder ander aannames over normen en waarden zoals de aanname dat 
alleen de hoeveelheid productie van belang is en vrijheid of levensovertuiging 
niet, en feitelijke aannames die niet kloppen zoals dat het auteursrecht bij 
muziek er is voor de muzikanten of de aanname dat patenten op geneesmiddelen 
onontbeerlijk zijn voor de voortgang van levensreddend onderzoek op dit gebied."
-
-# | Another problem is that, at the broad scale [-of \"intellectual
-# | property\",-] {+implicit in the term &ldquo;intellectual
-# | property&rdquo;,+} the specific issues raised by the various laws become
-# | nearly invisible.  These issues arise from the specifics of each
-# | [-law--precisely-] {+law&mdash;precisely+} what the term [-\"intellectual
-# | property\"-] {+&ldquo;intellectual property&rdquo;+} encourages people to
-# | ignore.  For instance, one issue relating to copyright law is whether
-# | music sharing should be [-allowed. Patent-] {+allowed; patent+} law has
-# | nothing to do with this.  Patent law raises issues such as whether poor
-# | countries should be allowed to produce life-saving drugs and sell them
-# | cheaply to save [-lives. Copyright-] {+lives; copyright+} law has nothing
-# | to do with such matters.
-#. type: Content of: <p>
-#| msgid ""
-#| "Another problem is that, at the broad scale of \"intellectual property\", "
-#| "the specific issues raised by the various laws become nearly invisible.  "
-#| "These issues arise from the specifics of each law--precisely what the "
-#| "term \"intellectual property\" encourages people to ignore. For instance, "
-#| "one issue relating to copyright law is whether music sharing should be "
-#| "allowed. Patent law has nothing to do with this.  Patent law raises "
-#| "issues such as whether poor countries should be allowed to produce life-"
-#| "saving drugs and sell them cheaply to save lives. Copyright law has "
-#| "nothing to do with such matters."
-msgid "Another problem is that, at the broad scale implicit in the term 
&ldquo;intellectual property&rdquo;, the specific issues raised by the various 
laws become nearly invisible.  These issues arise from the specifics of each 
law&mdash;precisely what the term &ldquo;intellectual property&rdquo; 
encourages people to ignore.  For instance, one issue relating to copyright law 
is whether music sharing should be allowed; patent law has nothing to do with 
this.  Patent law raises issues such as whether poor countries should be 
allowed to produce life-saving drugs and sell them cheaply to save lives; 
copyright law has nothing to do with such matters."
-msgstr "De term &ldquo;intellectueel eigendom&rdquo; is dusdanig algemeen dat 
het als het ware specifieke eigenschappen van de diverse wetten ondersneeuwd. 
Dit soort eigenschappen volgen uit de details van iedere wet &mdash; exact 
datgene wat met het gebruik van de term &ldquo;intellectueel eigendom&rdquo; 
mensen aanzet tot het negeren daarvan. Een discussiepunt dat te maken heeft met 
het auteursrecht bijvoorbeeld is of het delen van muziek verboden zou moeten 
worden of niet. Het patentrecht heeft daar niets mee te maken. Binnen het 
patentrecht wordt gediscusieerd over of arme landen zelf vitale medicijnen 
goedkoop zouden mogen produceren om zo levens te redden. Het auteursrecht heeft 
daar niets mee te maken."
-
-# | Neither of these issues is solely economic in nature, [-but they are not
-# | similar,-] and [-anyone looking at them in-] {+their noneconomic aspects
-# | are very different; using+} the shallow economic [-perspectives of-]
-# | overgeneralization [-cannot grasp-] {+as the basis for considering them
-# | means ignoring+} the differences.  [-If you put both-]  {+Putting the
-# | two+} laws in the [-general \"intellectual property\" pot, you will find
-# | that-] {+&ldquo;intellectual property&rdquo; pot+} obstructs [-your
-# | ability to think clearly-] {+clear thinking+} about each one.
-#. type: Content of: <p>
-#| msgid ""
-#| "Neither of these issues is solely economic in nature, but they are not "
-#| "similar, and anyone looking at them in the shallow economic perspectives "
-#| "of overgeneralization cannot grasp the differences.  If you put both laws "
-#| "in the general \"intellectual property\" pot, you will find that "
-#| "obstructs your ability to think clearly about each one."
-msgid "Neither of these issues is solely economic in nature, and their 
noneconomic aspects are very different; using the shallow economic 
overgeneralization as the basis for considering them means ignoring the 
differences.  Putting the two laws in the &ldquo;intellectual property&rdquo; 
pot obstructs clear thinking about each one."
-msgstr "Geen van deze geschilpunten heeft alleen een economische invalshoek, 
maar ze hebben ook weinig gemeenschappelijk. Maar iedereen die er met een 
oppervlakkige economische blik naar kijkt zal het verschil ontgaan. Wanneer je 
dit vervolgens rangschikt onder &eacute;&eacute;n noemer, &ldquo;intellectueel 
eigendom&rdquo;, dan zul je merken dat je daardoor moeilijker over ieder 
probleem apart kunt nadenken."
-
-# | [-As a result,-]{+Thus,+} any opinions about [-\"the-] {+&ldquo;the+}
-# | issue of intellectual [-property\"-] {+property&rdquo;+} and any
-# | generalizations about this supposed category are almost surely foolish.
-# | If you think all those laws are one issue, you will tend to choose your
-# | opinions from a selection of sweeping overgeneralizations, none of which
-# | is any good.
-#. type: Content of: <p>
-#| msgid ""
-#| "As a result, any opinions about \"the issue of intellectual property\" "
-#| "and any generalizations about this supposed category are almost surely "
-#| "foolish. If you think all those laws are one issue, you will tend to "
-#| "choose your opinions from a selection of sweeping overgeneralizations, "
-#| "none of which is any good."
-msgid "Thus, any opinions about &ldquo;the issue of intellectual 
property&rdquo; and any generalizations about this supposed category are almost 
surely foolish.  If you think all those laws are one issue, you will tend to 
choose your opinions from a selection of sweeping overgeneralizations, none of 
which is any good."
-msgstr "En dus is ieder standpunt over &ldquo;het probleem intellectueel 
eigendom&rdquo; en iedere generalisatie bij voorbaat al niet goed doordacht. 
Wanneer je ervan uit gaat dat al deze wetten hetzelfde probleemgebied 
behandelen zul je je mening dus baseren op een veel te vereenvoudigd standpunt 
en dat is nooit goed."
-
-# | If you want to think clearly about the issues raised by patents, or
-# | copyrights, or trademarks, {+or various other different laws,+} the first
-# | step is to forget the idea of lumping them together, and treat them as
-# | separate topics.  The second step is to reject the narrow perspectives and
-# | simplistic picture the term [-\"intellectual property\"-]
-# | {+&ldquo;intellectual property&rdquo;+} suggests.  Consider each of these
-# | issues separately, in its fullness, and you have a chance of considering
-# | them well.
-#. type: Content of: <p>
-#| msgid ""
-#| "If you want to think clearly about the issues raised by patents, or "
-#| "copyrights, or trademarks, the first step is to forget the idea of "
-#| "lumping them together, and treat them as separate topics. The second step "
-#| "is to reject the narrow perspectives and simplistic picture the term "
-#| "\"intellectual property\" suggests. Consider each of these issues "
-#| "separately, in its fullness, and you have a chance of considering them "
-#| "well."
-msgid "If you want to think clearly about the issues raised by patents, or 
copyrights, or trademarks, or various other different laws, the first step is 
to forget the idea of lumping them together, and treat them as separate topics. 
 The second step is to reject the narrow perspectives and simplistic picture 
the term &ldquo;intellectual property&rdquo; suggests.  Consider each of these 
issues separately, in its fullness, and you have a chance of considering them 
well."
-msgstr "Als je je een gefundeerde mening wilt vormen bij discussies over 
patenten, auteursrecht of merkenrecht dan moet je om te beginnen de drie niet 
op &eacute;&eacute;n hoop gooien. Ten tweede moet je het starre denkbeeld wat 
&ldquo;intellectueel eigendom&rdquo; oproept vergeten. Behandel de diverse 
gebieden apart en je hebt een kans dat je de juiste afwegingen maakt."
-
-# | And when it comes to reforming WIPO, [-among other things-] {+here is+} <a
-# | [-href=\"http://www.fsfeurope.org/documents/wiwo.html\";>let's call-]
-# | {+href=\"http://fsfe.org/projects/wipo/wiwo.en.html\";>one proposal+} for
-# | changing [-its name</a>.-] {+the name and substance of WIPO</a>.+}
-#. type: Content of: <p>
-#| msgid ""
-#| "And when it comes to reforming WIPO, among other things <a href=\"http://";
-#| "www.fsfeurope.org/documents/wiwo.html\">let's call for changing its name</"
-#| "a>."
-msgid "And when it comes to reforming WIPO, here is <a 
href=\"http://fsfe.org/projects/wipo/wiwo.en.html\";>one proposal for changing 
the name and substance of WIPO</a>."
-msgstr "En wat het veranderen van het WIPO betreft, hier een <a 
href=\"http://fsfe.org/projects/wipo/wiwo.en.html\";>voorstel tot naamswijziging 
en invulling van het instituut</a>."
+msgid ""
+"Unlike their descendants who now work the floor at WIPO, the framers of the "
+"US constitution had a principled, procompetitive attitude to intellectual "
+"property.  They knew rights might be necessary, but&hellip;they tied "
+"congress's hands, restricting its power in multiple ways."
+msgstr ""
+"&ldquo;In tegenstelling tot hun nazaten, die nu de WIPO bevolken, hadden de "
+"grondleggers van de amerikaanse grondwet een principi&euml;le en "
+"concurrentie&mdash;gezinde houding ten opzichte van intellectueel eigendom. "
+"Ze wisten dat er wellicht rechten nodig waren maar&hellip;ze beperkten het "
+"congres en dus zijn macht op meerdere wijzen&rdquo;."
+
+#. type: Content of: <p>
+msgid ""
+"That statement refers to Article 1, Section 8, Clause 8 of the US "
+"Constitution, which authorizes copyright law and patent law.  That clause, "
+"though, has nothing to do with trademark law or various others.  The term "
+"&ldquo;intellectual property&rdquo; led that professor to make false "
+"generalization."
+msgstr ""
+"Deze uitspraak slaat op artikel 1, sectie 8, sub 8 van de amerikaanse "
+"grondwet, die auteursrecht en patentrecht toestaat. Deze clausule heeft "
+"echter niets te maken met handelsmerken. De uitdrukking &ldquo;intellectueel "
+"eigendom&rdquo; leidde tot deze foute veralgemenisering van de professor."
+
+#. type: Content of: <p>
+msgid ""
+"The term &ldquo;intellectual property&rdquo; also leads to simplistic "
+"thinking.  It leads people to focus on the meager commonality in form that "
+"these disparate laws have&mdash;that they create artificial privileges for "
+"certain parties&mdash;and to disregard the details which form their "
+"substance: the specific restrictions each law places on the public, and the "
+"consequences that result.  This simplistic focus on the form encourages an "
+"&ldquo;economistic&rdquo; approach to all these issues."
+msgstr ""
+"De uitdrukking &ldquo;intellectueel eigendom&rdquo; leid ook tot t&eacute; "
+"simpel denken. Het legt de nadruk op die ene kleine eigenschap die de wetten "
+"gemeen hebben &mdash; dat ze kunstmatige rechten verlenen aan bepaalde "
+"partijen &mdash; en negeert de verdere details waaruit die wetten bestaan: "
+"de precieze beperkingen die iedere wet oplegt aan de gemeenschap en de "
+"gevolgen hiervan. Dit simplistische blindstaren werkt een &ldquo;"
+"economische&rdquo; kijk op dit alles in de hand."
+
+#. type: Content of: <p>
+msgid ""
+"Economics operates here, as it often does, as a vehicle for unexamined "
+"assumptions.  These include assumptions about values, such as that amount of "
+"production matters while freedom and way of life do not, and factual "
+"assumptions which are mostly false, such as that copyrights on music "
+"supports musicians, or that patents on drugs support life-saving research."
+msgstr ""
+"Deze economische kijk werkt, zoals zo vaak, ondoordachte aannames in de "
+"hand.  Onder ander aannames over normen en waarden zoals de aanname dat "
+"alleen de hoeveelheid productie van belang is en vrijheid of "
+"levensovertuiging niet, en feitelijke aannames die niet kloppen zoals dat "
+"het auteursrecht bij muziek er is voor de muzikanten of de aanname dat "
+"patenten op geneesmiddelen onontbeerlijk zijn voor de voortgang van "
+"levensreddend onderzoek op dit gebied."
+
+#. type: Content of: <p>
+msgid ""
+"Another problem is that, at the broad scale implicit in the term &ldquo;"
+"intellectual property&rdquo;, the specific issues raised by the various laws "
+"become nearly invisible.  These issues arise from the specifics of each "
+"law&mdash;precisely what the term &ldquo;intellectual property&rdquo; "
+"encourages people to ignore.  For instance, one issue relating to copyright "
+"law is whether music sharing should be allowed; patent law has nothing to do "
+"with this.  Patent law raises issues such as whether poor countries should "
+"be allowed to produce life-saving drugs and sell them cheaply to save lives; "
+"copyright law has nothing to do with such matters."
+msgstr ""
+"De term &ldquo;intellectueel eigendom&rdquo; is dusdanig algemeen dat het "
+"als het ware specifieke eigenschappen van de diverse wetten ondersneeuwd. "
+"Dit soort eigenschappen volgen uit de details van iedere wet &mdash; exact "
+"datgene wat met het gebruik van de term &ldquo;intellectueel eigendom&rdquo; "
+"mensen aanzet tot het negeren daarvan. Een discussiepunt dat te maken heeft "
+"met het auteursrecht bijvoorbeeld is of het delen van muziek verboden zou "
+"moeten worden of niet. Het patentrecht heeft daar niets mee te maken. Binnen "
+"het patentrecht wordt gediscusieerd over of arme landen zelf vitale "
+"medicijnen goedkoop zouden mogen produceren om zo levens te redden. Het "
+"auteursrecht heeft daar niets mee te maken."
+
+#. type: Content of: <p>
+msgid ""
+"Neither of these issues is solely economic in nature, and their noneconomic "
+"aspects are very different; using the shallow economic overgeneralization as "
+"the basis for considering them means ignoring the differences.  Putting the "
+"two laws in the &ldquo;intellectual property&rdquo; pot obstructs clear "
+"thinking about each one."
+msgstr ""
+"Geen van deze geschilpunten heeft alleen een economische invalshoek, maar ze "
+"hebben ook weinig gemeenschappelijk. Maar iedereen die er met een "
+"oppervlakkige economische blik naar kijkt zal het verschil ontgaan. Wanneer "
+"je dit vervolgens rangschikt onder &eacute;&eacute;n noemer, &ldquo;"
+"intellectueel eigendom&rdquo;, dan zul je merken dat je daardoor moeilijker "
+"over ieder probleem apart kunt nadenken."
+
+#. type: Content of: <p>
+msgid ""
+"Thus, any opinions about &ldquo;the issue of intellectual property&rdquo; "
+"and any generalizations about this supposed category are almost surely "
+"foolish.  If you think all those laws are one issue, you will tend to choose "
+"your opinions from a selection of sweeping overgeneralizations, none of "
+"which is any good."
+msgstr ""
+"En dus is ieder standpunt over &ldquo;het probleem intellectueel "
+"eigendom&rdquo; en iedere generalisatie bij voorbaat al niet goed doordacht. "
+"Wanneer je ervan uit gaat dat al deze wetten hetzelfde probleemgebied "
+"behandelen zul je je mening dus baseren op een veel te vereenvoudigd "
+"standpunt en dat is nooit goed."
+
+#. type: Content of: <p>
+msgid ""
+"If you want to think clearly about the issues raised by patents, or "
+"copyrights, or trademarks, or various other different laws, the first step "
+"is to forget the idea of lumping them together, and treat them as separate "
+"topics.  The second step is to reject the narrow perspectives and simplistic "
+"picture the term &ldquo;intellectual property&rdquo; suggests.  Consider "
+"each of these issues separately, in its fullness, and you have a chance of "
+"considering them well."
+msgstr ""
+"Als je je een gefundeerde mening wilt vormen bij discussies over patenten, "
+"auteursrecht of merkenrecht dan moet je om te beginnen de drie niet op "
+"&eacute;&eacute;n hoop gooien. Ten tweede moet je het starre denkbeeld wat "
+"&ldquo;intellectueel eigendom&rdquo; oproept vergeten. Behandel de diverse "
+"gebieden apart en je hebt een kans dat je de juiste afwegingen maakt."
+
+#. type: Content of: <p>
+msgid ""
+"And when it comes to reforming WIPO, here is <a href=\"http://fsfe.org/";
+"projects/wipo/wiwo.en.html\">one proposal for changing the name and "
+"substance of WIPO</a>."
+msgstr ""
+"En wat het veranderen van het WIPO betreft, hier een <a href=\"http://fsfe.";
+"org/projects/wipo/wiwo.en.html\">voorstel tot naamswijziging en invulling "
+"van het instituut</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -402,32 +377,48 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr "Gelieve vragen over FSF &amp; GNU te sturen naar <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>. Er zijn ook nog <a 
href=\"/contact/\">andere manieren om in contact te komen</a> met de FSF."
+msgid ""
+"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF."
+msgstr ""
+"Gelieve vragen over FSF &amp; GNU te sturen naar <a 
href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>. Er zijn ook nog <a href=\"/contact/\">andere "
+"manieren om in contact te komen</a> met de FSF."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Please send broken links and other corrections or suggestions to <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-msgstr "Gelieve meldingen van verkeerde links en andere verbeteringen (of 
suggesties) te sturen aan: <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+msgid ""
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
+msgstr ""
+"Gelieve meldingen van verkeerde links en andere verbeteringen (of "
+"suggesties) te sturen aan: <a href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and submitting "
-#| "translations of this article."
-msgid "Please see the <a 
href=\"/server/standards/README.translations.html\">Translations README</a> for 
information on coordinating and submitting translations of this article."
-msgstr "Zie <a 
href=\"/server/standards/README.translations.html\">Translations README</a> 
voor nadere informatie over het eventueel vertalen van dit artikel."
+msgid ""
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
+"translations of this article."
+msgstr ""
+"Zie <a href=\"/server/standards/README.translations.html\">Translations "
+"README</a> voor nadere informatie over het eventueel vertalen van dit "
+"artikel."
 
-# | Copyright &copy; 2004, [-2006-] {+2006, 2010+} Richard M. Stallman
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2004, 2006 Richard M. Stallman"
 msgid "Copyright &copy; 2004, 2006, 2010 Richard M. Stallman"
 msgstr "Copyright &copy; 2004, 2006, 2010 Richard M. Stallman"
 
 #. type: Content of: <div><p>
-msgid "This page is licensed under a <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons 
Attribution-NoDerivs 3.0 United States License</a>."
-msgstr "Deze pagina valt onder de <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons 
Attribution-NoDerivs 3.0 United States Licentie</a>."
+msgid ""
+"This page is licensed under a <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a>."
+msgstr ""
+"Deze pagina valt onder de <a rel=\"license\" href=\"http://creativecommons.";
+"org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 "
+"United States Licentie</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -439,4 +430,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Bijgewerkt:"
-



reply via email to

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