www-commits
[Top][All Lists]
Advanced

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

www licenses/po/license-list.it.po philosophy/c...


From: Yavor Doganov
Subject: www licenses/po/license-list.it.po philosophy/c...
Date: Sun, 24 Jul 2011 16:36:15 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/07/24 16:36:14

Modified files:
        licenses/po    : license-list.it.po 
        philosophy     : can-you-trust.es.html censoring-emacs.es.html 
        philosophy/po  : can-you-trust.es.po censoring-emacs.es.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/can-you-trust.es.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/censoring-emacs.es.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/can-you-trust.es.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/censoring-emacs.es.po?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/license-list.it.po      24 Jul 2011 10:25:22 -0000      1.1
+++ licenses/po/license-list.it.po      24 Jul 2011 16:35:50 -0000      1.2
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2009-11-20 04:26-0500\n"
+"POT-Creation-Date: 2011-07-14 04:26-0300\n"
 "PO-Revision-Date: 2011-07-24 12:24+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -14,6 +14,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
+#. type: Content of: <title>
 msgid ""
 "Various Licenses and Comments about Them - GNU Project - Free Software "
 "Foundation (FSF)"
@@ -22,22 +23,27 @@
 "(FSF)"
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "Various Licenses and Comments about Them"
 msgstr "Licenze varie e commenti relativi"
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "<a id=\"TableOfContents\">Table of Contents</a>"
 msgstr "<a id=\"TableOfContents\">Sommario</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "<a href=\"#Introduction\">Introduction</a>"
 msgstr "<a href=\"#Introduction\">Introduzione</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "<a href=\"#SoftwareLicenses\">Software Licenses</a>"
 msgstr "<a href=\"#SoftwareLicenses\">Licenze per il software</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid ""
 "<a href=\"#GPLCompatibleLicenses\">GPL-Compatible Free Software Licenses</a>"
 msgstr ""
@@ -45,6 +51,7 @@
 "con la GPL</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid ""
 "<a href=\"#GPLIncompatibleLicenses\">GPL-Incompatible Free Software "
 "Licenses</a>"
@@ -53,19 +60,23 @@
 "incompatibili con la GPL</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid "<a href=\"#NonFreeSoftwareLicense\">Non-Free Software Licenses</a>"
 msgstr "<a href=\"#NonFreeSoftwareLicense\">Licenze di software non libero</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "<a href=\"#DocumentationLicenses\">Licenses For Documentation</a>"
 msgstr "<a href=\"#DocumentationLicenses\">Licenze per la documentazione</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid "<a href=\"#FreeDocumentationLicenses\">Free Documentation Licenses</a>"
 msgstr ""
 "<a href=\"#FreeDocumentationLicenses\">Licenze di documentazione libera</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid ""
 "<a href=\"#NonFreeDocumentationLicenses\">Non-Free Documentation Licenses</a>"
 msgstr ""
@@ -73,6 +84,7 @@
 "libera</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#OtherLicenses\">Licenses for Works of Practical Use Besides "
 "Software and Documentation</a>"
@@ -81,23 +93,28 @@
 "documentazione</a>"
 
 # type: Content of: <ul><li><ul><li>
+#. type: Content of: <ul><li><ul><li>
 msgid "<a href=\"#Fonts\">Licenses for Fonts</a>"
 msgstr "<a href=\"#Fonts\">Licenze per i tipi di carattere</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#OpinionLicenses\">Licenses for Works of Opinion and Judgment</a>"
 msgstr "<a href=\"#OpinionLicenses\">Licenze per opere di saggistica</a>"
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "<a id=\"Introduction\">Introduction</a>"
 msgstr "<a id=\"Introduction\">Introduzione</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid "We classify a license according to certain key criteria:"
 msgstr "Noi classifichiamo le licenze in base ad alcuni requisiti chiave:"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Whether it qualifies as a <a href=\"/philosophy/free-sw.html\">free "
 "software</a> license."
@@ -106,6 +123,7 @@
 "\">software libero</a>."
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Whether it is a <a href=\"/copyleft/copyleft.html\">copyleft</a> license."
 msgstr ""
@@ -113,6 +131,7 @@
 "noto, impropriamente, come permesso d'autore)</a>."
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Whether it is <a href=\"/licenses/gpl-faq.html#WhatDoesCompatMean"
 "\">compatible with the GNU GPL</a>.  Unless otherwise specified, compatible "
@@ -124,10 +143,12 @@
 "3."
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "Whether it causes any particular practical problems."
 msgstr "Se può causare un qualunque problema di tipo pratico."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "We try to list the most commonly encountered free software license on this "
 "page, but cannot list them all; we'll try our best to answer questions about "
@@ -141,6 +162,7 @@
 "all'interno di ciascuna sezione."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If you believe you have found a violation of one of our licenses, please "
 "refer to our <a href=\"/licenses/gpl-violation.html\">license violation "
@@ -150,19 +172,40 @@
 "favore fate riferimento alla nostra <a href=\"/licenses/gpl-violation.html"
 "\">pagina sulla violazione delle licenze</a>."
 
+#. type: Content of: <p>
+msgid ""
+"If you've started a new project and you're not sure what license to use, <a "
+"href=\"/licenses/license-recommendations.html\">&ldquo;How to choose a "
+"license for your own work&rdquo;</a> details our recommendations in an easy-"
+"to-follow guide."
+msgstr ""
+
 # type: Content of: outside any tag (error?)
+#. type: Content of: outside any tag (error?)
 msgid "<a id=\"LicensingMailingList\"></a>"
 msgstr "<a id=\"LicensingMailingList\"></a>"
 
 # type: Content of: <p>
-msgid ""
-"If you want help choosing a license, evaluating a license, or have other "
-"questions about licenses, you can email us at <a href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  We have a very large backlog of "
-"requests, so please read our web pages here first, you'll get an answer "
-"sooner.  Also, the more specific your question is, the more likely we'll be "
-"able to answer it quickly.  (We also <a href=\"http://www.fsf.org/volunteer";
-"\">welcome knowledgeable volunteers</a> to help answer licensing questions.)"
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you want help choosing a license, evaluating a license, or have other "
+#| "questions about licenses, you can email us at <a href=\"mailto:";
+#| "address@hidden">&lt;address@hidden&gt;</a>.  We have a very large "
+#| "backlog of requests, so please read our web pages here first, you'll get "
+#| "an answer sooner.  Also, the more specific your question is, the more "
+#| "likely we'll be able to answer it quickly.  (We also <a href=\"http://www.";
+#| "fsf.org/volunteer\">welcome knowledgeable volunteers</a> to help answer "
+#| "licensing questions.)"
+msgid ""
+"If you have questions about free software licenses, you can email us at <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  Because "
+"our resources are limited, we do not answer questions that are meant to "
+"assist proprietary software development or distribution, and you'll likely "
+"get an answer faster if you ask a specific question that isn't already "
+"covered here or in <a href=\"/licenses/gpl-faq.html\">our FAQ</a>.  We <a "
+"href=\"http://www.fsf.org/volunteer\";>welcome knowledgeable volunteers</a> "
+"who want to help answer licensing questions."
 msgstr ""
 "Se avete bisogno di aiuto per scegliere una licenza, valutarla oppure avete "
 "una qualsiasi altra domanda relativa alla licenze, scriveteci all'indirizzo "
@@ -174,6 +217,7 @@
 "volontari esperti</a> ad aiutarci a rispondere alle domande sulle licenze."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If you are contemplating writing a new license, please also contact us at <a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. The "
@@ -190,10 +234,12 @@
 "licenza esistente che abbia i requisiti che cercate."
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "<a id=\"SoftwareLicenses\">Software Licenses</a>"
 msgstr "<a id=\"SoftwareLicenses\">Licenze per il software</a>"
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid ""
 "<a id=\"GPLCompatibleLicenses\"> GPL-Compatible Free Software Licenses</a>"
 msgstr ""
@@ -201,6 +247,7 @@
 "la GPL</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses qualify as <a href=\"/philosophy/free-sw.html"
 "\">free software</a> licenses, and are compatible with the <a href=\"#GNUGPL"
@@ -211,6 +258,7 @@
 "licenza <a href=\"#GNUGPL\">GNU GPL</a>.</strong>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GNUGPL\" href=\"/licenses/gpl.html\"> GNU General Public License "
 "(GPL) version 3</a>"
@@ -219,6 +267,7 @@
 "GNU (GNU General Public License, GNU GPL) versione 3</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the latest version of the GNU GPL: a free software license, and a "
 "copyleft license.  We recommend it for most software packages."
@@ -228,6 +277,7 @@
 "pacchetti software."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that GPLv3 is not compatible with GPLv2 by itself.  However, "
 "most software released under GPLv2 allows you to use the terms of later "
@@ -245,6 +295,7 @@
 "gpl-faq.it.html#AllCompatibility\">le domande frequenti</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GPLv2\" href=\"/licenses/old-licenses/gpl-2.0.html\"> GNU General "
 "Public License (GPL) version 2</a>"
@@ -253,6 +304,7 @@
 "Pubblica Generica GNU (GNU General Public License, GNU GPL) versione 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the previous version of the GNU GPL: a free software license, and a "
 "copyleft license.  We recommend <a href=\"#GNUGPL\">the latest version</a> "
@@ -263,6 +315,7 @@
 "versione</a> per la maggior parte dei pacchetti software."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that GPLv2 is, by itself, not compatible with GPLv3.  However, "
 "most software released under GPLv2 allows you to use the terms of later "
@@ -280,6 +333,7 @@
 "gpl-faq.it.html#AllCompatibility\">le domande frequenti</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"LGPL\" href=\"/licenses/lgpl.html\"> GNU Lesser General Public "
 "License (LGPL) version 3</a>"
@@ -288,6 +342,7 @@
 "Attenuata (GNU Lesser General Public License, GNU LGPL) versione 3</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the latest version of the LGPL: a free software license, but not a "
 "strong copyleft license, because it permits linking with non-free modules.  "
@@ -300,6 +355,7 @@
 "in <a href=\"/philosophy/why-not-lgpl.html\">circostanze particolari</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that LGPLv3 is not compatible with GPLv2 by itself.  However, "
 "most software released under GPLv2 allows you to use the terms of later "
@@ -317,6 +373,7 @@
 "\">le domande frequenti</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"LGPLv2.1\" href=\"/licenses/old-licenses/lgpl-2.1.html\"> GNU Lesser "
 "General Public License (LGPL) version 2.1</a>"
@@ -326,6 +383,7 @@
 "LGPL) versione 2.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the previous version of the LGPL: a free software license, but not a "
 "strong copyleft license, because it permits linking with non-free modules.  "
@@ -345,6 +403,7 @@
 "html#AllCompatibility\">le domande frequenti</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\">GNU Affero General Public "
 "License (AGPL) version 3</a>"
@@ -353,6 +412,7 @@
 "GNU Affero (GNU Affero General Public License, AGPL) versione 3</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software, copyleft license.  Its terms effectively consist of "
 "the terms of GPLv3, with an additional paragraph in section 13 to allow "
@@ -369,6 +429,7 @@
 "rete."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that the GNU AGPL is not compatible with GPLv2.  It is also "
 "technically not compatible with GPLv3 in a strict sense: you cannot take "
@@ -389,6 +450,7 @@
 "ulteriori dettagli."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"/prep/maintain/html_node/License-Notices-for-Other-Files.html\" id="
 "\"GNUAllPermissive\">GNU All-Permissive License</a>"
@@ -398,6 +460,7 @@
 "</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
@@ -410,6 +473,7 @@
 "sviluppatori possono sentirsi liberi di utilizzarla in situazioni simili."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Older versions of this license did not have the second sentence with the "
 "express warranty disclaimer.  This same analysis applies to both versions."
@@ -419,6 +483,7 @@
 "le varianti."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"apache2\" href=\"http://www.apache.org/licenses/LICENSE-2.0\";> "
 "Apache License, Version 2.0</a>"
@@ -427,12 +492,14 @@
 "licenza Apache, versione 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, compatible with version 3 of the GPL."
 msgstr ""
 "Questa è una licenza di software libero, compatibile con la versione 3 della 
"
 "GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
 "it has some requirements that are not in the older version.  These include "
@@ -443,6 +510,7 @@
 "esempio, terminazioni deibrevetti e compensazioni."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ArtisticLicense2\" href=\"http://www.perlfoundation.org/";
 "artistic_license_2_0\">Artistic License 2.0</a>"
@@ -451,6 +519,7 @@
 "artistic_license_2_0\">Licenza Artistica 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is a free software license, compatible with the GPL thanks to "
 "the relicensing option in section 4(c)(ii)."
@@ -459,20 +528,28 @@
 "clausola nella sezione 4(c)(ii)."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"BerkleyDB\" href=\"http://www.oracle.com/technology/software/";
-"products/berkeley-db/htdocs/oslicense.html\"> Berkeley Database License</a> "
-"(aka the Sleepycat Software Product License)"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"BerkleyDB\" href=\"http://www.oracle.com/technology/software/";
+#| "products/berkeley-db/htdocs/oslicense.html\"> Berkeley Database License</"
+#| "a> (aka the Sleepycat Software Product License)"
+msgid ""
+"<a id=\"BerkleyDB\" href=\"http://www.oracle.com/technetwork/database/";
+"berkeleydb/downloads/oslicense-093458.html\">Berkeley Database License</a> "
+"(a.k.a. the Sleepycat Software Product License)"
 msgstr ""
 "<a id=\"BerkleyDB\" href=\"http://www.oracle.com/technology/software/";
 "products/berkeley-db/htdocs/oslicense.html\"> La licenza del Berkeley "
 "Database</a> (nota anche come Licenza di Sleepycat Software)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, compatible with the GNU GPL."
 msgstr "Questa è una licenza di software libero, compatibile con la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"boost\" href=\"http://www.boost.org/LICENSE_1_0.txt\";> Boost "
 "Software License</a>"
@@ -481,6 +558,7 @@
 "Software Boost</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
@@ -489,14 +567,16 @@
 "copyleft, compatibile con la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\"> Modified BSD license</a>"
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\"> Modified BSD license</a>"
 msgstr ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\"> Licenza BSD modificata</a>"
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\"> Licenza BSD modificata</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "(Note: on the preceding link, the modified BSD license is listed in the "
 "<em>General</em> section.)"
@@ -505,6 +585,7 @@
 "<em>General</em>)."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
 "clause.  It is a simple, permissive non-copyleft free software license, "
@@ -515,6 +596,7 @@
 "copyleft, compatibile con la GNU GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If you want a simple, permissive non-copyleft free software license, the "
 "modified BSD license is a reasonable choice.  However, it is risky to "
@@ -532,11 +614,41 @@
 "X11. La licenza X11 e la BSD modificata sono più o meno equivalenti."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This license is sometimes referred to as the 3-clause BSD license."
 msgstr ""
 "Talvolta questa licenza è denominata \"la licenza BSD con 3 clausole\"."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
+#| "\"> Creative Commons Attribution 2.0 license</a> (a.k.a. CC-BY)"
+msgid ""
+"<a id=\"CC0\" href=\"http://creativecommons.org/publicdomain/zero/1.0/";
+"legalcode\">CC0</a>"
+msgstr ""
+"<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
+"\"> Creative Commons Attribution 2.0 license</a> (CC-BY)"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"CC0 is a public domain dedication from Creative Commons.  A work released "
+"under CC0 is dedicated to the public domain to the fullest extent permitted "
+"by law.  If that is not possible for any reason, CC0 also provides a simple "
+"permissive license as a fallback.  Both public domain works and the simple "
+"license provided by CC0 are compatible with the GNU GPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"If you want to release your work to the public domain, we recommend you use "
+"CC0."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CeCILL\" href=\"http://www.cecill.info/licences.en.html\";> CeCILL "
 "version 2</a>"
@@ -545,6 +657,7 @@
 "versione 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The CeCILL is a free software license, explicitly compatible with the GNU "
 "GPL."
@@ -553,6 +666,7 @@
 "la GNU GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The text of the CeCILL uses a couple of biased terms that ought to be "
 "avoided: &ldquo;intellectual property&rdquo; (see <a href=\"/philosophy/not-"
@@ -572,6 +686,7 @@
 "rilasciati sotto licenza CeCILL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Section 9.4 of the CeCILL commits the program's developers to certain forms "
 "of cooperation with the users, if someone attacks the program with a "
@@ -586,6 +701,7 @@
 "questo per voi non è un problema."
 
 # 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>"
@@ -594,6 +710,7 @@
 "html#license\">La licenza BSD Chiara (Clear BSD)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, compatible with both GPLv2 and GPLv3.  It "
 "is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and adds "
@@ -613,6 +730,7 @@
 "prepararvi una trappola, sarebbe bene evitare il programma."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CryptixGeneralLicense\" href=\"http://www.cryptix.org/LICENSE.TXT\";> "
 "Cryptix General License</a>"
@@ -621,6 +739,7 @@
 "La licenza generica Cryptix</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
@@ -629,6 +748,7 @@
 "copyleft, compatibile con la GNU GPL. È molto simile alla licenza X11."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"eCos20\" href=\"/licenses/ecos-license.html\"> eCos license version "
 "2.0</a>"
@@ -637,6 +757,7 @@
 "versione 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The eCos license version 2.0 is a GPL-compatible free software license.  It "
 "consists of the GPL, plus an exception allowing linking to software not "
@@ -649,14 +770,20 @@
 "philosophy/why-not-lgpl.html\">svantaggi</a> della LGPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"RPL\" href=\"http://www.opensource.org/licenses/rpl.php\";> "
+#| "Reciprocal Public License</a>"
 msgid ""
-"<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0\">Educational "
-"Community License 2.0</a>"
+"<a id=\"ECL2.0\" href=\"http://www.opensource.org/licenses/ecl2.php\";> "
+"Educational Community License 2.0</a>"
 msgstr ""
-"<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0\">Educational "
-"Community License 2.0</a>"
+"<a id=\"RPL\" href=\"http://www.opensource.org/licenses/rpl.php\";> "
+"Reciprocal Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, and it is compatible with GPLv3.  It is "
 "based on the <a href=\"#apache2\">Apache License 2.0</a>; the scope of the "
@@ -674,6 +801,7 @@
 "della sezione 9 rendono questa licenza incompatibile con la GPLv2."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Eiffel\" href=\"/licenses/eiffel-forum-license-2.html\"> Eiffel "
 "Forum License, version 2</a>"
@@ -682,6 +810,7 @@
 "Eiffel Forum, versione 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, compatible with the GNU GPL.  <a href="
 "\"http://www.eiffel-nice.org/license/forum.txt\";>Previous releases</a> of "
@@ -692,6 +821,7 @@
 "della licenza Eiffel non sono compatibili con la GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EUDataGrid\" href=\"http://www.opensource.org/licenses/eudatagrid.php";
 "\"> EU DataGrid Software License</a>"
@@ -700,6 +830,7 @@
 "\"> Licenza software EU DataGrid</a>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Expat\" href=\"http://www.jclark.com/xml/copying.txt\";> Expat "
 "License</a>"
@@ -708,6 +839,7 @@
 "di Expat</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
@@ -718,6 +850,7 @@
 "con il nome di <em>Licenza MIT</em>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FreeBSD\" href=\"http://www.freebsd.org/copyright/freebsd-license.";
 "html\"> FreeBSD license</a>"
@@ -726,6 +859,7 @@
 "html\"> Licenza di FreeBSD</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
@@ -738,6 +872,7 @@
 "senza copyleft, compatibile con la GNU GPL. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If you want a simple, permissive non-copyleft free software license, the "
 "FreeBSD license is a reasonable choice.  However, please don't call it a "
@@ -752,6 +887,7 @@
 "inappropriata <a href=\"#OriginalBSD\">licenza BSD <em>originale</em></a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://freetype.fis.uniroma2.it/FTL.TXT\"; id=\"freetype\">Freetype "
 "Project License</a>"
@@ -760,6 +896,7 @@
 "Licenza FreeType</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, and compatible with GPLv3.  It has some "
 "attribution requirements which make it incompatible with GPLv2."
@@ -768,6 +905,7 @@
 "di imposizioni sul riconoscimento degli autori è incompatibile con la GPLv2."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"iMatix\" href=\"http://legacy.imatix.com/html/sfl/sfl4.htm#license";
 "\"> License of the iMatix Standard Function Library</a>"
@@ -776,11 +914,13 @@
 "\"> La licenza della iMatix Standard Function Library</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license and is GPL compatible."
 msgstr ""
 "Questa è una licenza per software libero ed è compatibile con la licenza 
GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://dev.w3.org/cvsweb/Amaya/libjpeg/Attic/README?rev=1.2\"; id="
 "\"ijg\">Independent JPEG Group License</a>"
@@ -789,6 +929,7 @@
 "\"ijg\">Licenza di Independent JPEG Group</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, and compatible with the GNU GPL.  The "
 "authors have assured us that developers who document changes as required by "
@@ -800,6 +941,7 @@
 "simile, previsto da questa licenza."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://trac.enlightenment.org/e/browser/trunk/imlib2/COPYING\"; id="
 "\"imlib\">License of imlib2</a>"
@@ -808,6 +950,7 @@
 "\"imlib\">Licenza di imlib2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, and GPL-compatible.  The author has "
 "explained to us that the GPL's options for providing source all mean the "
@@ -819,6 +962,7 @@
 "pubblicamente&quot; usata in questa licenza."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"intel\" href=\"http://www.opensource.org/licenses/intel-open-source-";
 "license.html\"> Intel Open Source License</a>"
@@ -827,16 +971,19 @@
 "license.html\"> Licenza Intel Open Source</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a Free Software license, compatible with the GNU GPL."
 msgstr "Questa è una licenza di software libero, compatibile con la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://www.isc.org/software/license\"; id=\"ISC\">ISC License</a>"
 msgstr ""
 "<a href=\"http://www.isc.org/software/license\"; id=\"ISC\">Licenza ISC</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is sometimes also known as the OpenBSD License.  It is a free "
 "software license, and compatible with the GNU GPL."
@@ -845,6 +992,7 @@
 "software libero, compatibile con la GNU GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license does have an unfortunate wording choice: it provides recipients "
 "with &quot;Permission to use, copy, modify, and/or distribute this "
@@ -860,14 +1008,24 @@
 "distribuzione delle versioni modificate."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "ISC has told us they do not share the University of Washington's "
+#| "interpretation, and we have every reason to believe them.  Thus, there's "
+#| "no reason to avoid software released under this license.  However, to "
+#| "help make sure this language cannot cause any trouble in the future, we "
+#| "encourage developers to choose a different license for their own works.  "
+#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#| "License</a> is similarly permissive and brief."
 msgid ""
 "ISC has told us they do not share the University of Washington's "
 "interpretation, and we have every reason to believe them.  Thus, there's no "
 "reason to avoid software released under this license.  However, to help make "
 "sure this language cannot cause any trouble in the future, we encourage "
 "developers to choose a different license for their own works.  The <a href="
-"\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> is "
-"similarly permissive and brief."
+"\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> "
+"are similarly permissive and brief."
 msgstr ""
 "ISC ci ha detto che non condivide l'interpretazione dell'Università di "
 "Washington, e abbiamo tutti i motivi di fidarci. Quindi non c'è ragione di "
@@ -878,14 +1036,20 @@
 "FreeBSD</a> sono brevi e garantiscono permessi molto simili."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"NCSA\" href=\"http://www.otm.uiuc.edu/faculty/forms/opensource.asp";
+#| "\"> NCSA/University of Illinois Open Source License</a>"
 msgid ""
-"<a id=\"NCSA\" href=\"http://www.otm.uiuc.edu/faculty/forms/opensource.asp";
-"\"> NCSA/University of Illinois Open Source License</a>"
+"<a id=\"NCSA\" href=\"http://www.opensource.org/licenses/UoI-NCSA.php\";> "
+"NCSA/University of Illinois Open Source License</a>"
 msgstr ""
 "<a id=\"NCSA\" href=\"http://www.otm.uiuc.edu/faculty/forms/opensource.asp";
 "\"> Licenza Open Source di NCSA/University of Illinois</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
 "<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
@@ -896,10 +1060,12 @@
 "di software libero semplice, senza copyleft, compatibile con la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "License of Netscape Javascript"
 msgstr "La licenza di Netscape Javascript"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is the disjunction of the <a href=\"#NPL\">Netscape Public License</a> "
 "and the <a href=\"/licenses/gpl.html\">GNU GPL</a>.  Because of that, it is "
@@ -912,6 +1078,7 @@
 "senza un forte copyleft."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This disjunctive license is a good choice if you want to make your package "
 "GPL-compatible and MPL-compatible.  However, you can also accomplish that by "
@@ -923,6 +1090,7 @@
 "di Guile."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Such a disjunctive license might be a good choice if you have been using the "
 "MPL, and want to change to a GPL-compatible license without subtracting any "
@@ -933,6 +1101,7 @@
 "nessun permesso attribuito per le versioni precedenti."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"newOpenLDAP\" href=\"http://www.openldap.org/software/release/";
 "license.html\"> OpenLDAP License, Version 2.7</a>"
@@ -941,6 +1110,7 @@
 "license.html\"> Licenza di OpenLDAP, versione 2.7</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free software license that is compatible "
 "with the GNU GPL."
@@ -949,10 +1119,12 @@
 "compatibile con la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "<a id=\"PerlLicense\">License of Perl 5 and below</a>"
 msgstr "<a id=\"PerlLicense\">La licenza di Perl 5 e precedenti</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is the disjunction of the <a href=\"#ArtisticLicense\">Artistic "
 "License 1.0</a> and the <a href=\"/licenses/gpl.html\">GNU GPL</a>&mdash;in "
@@ -969,6 +1141,7 @@
 "poichè la GNU GPL è una delle possibili alternative."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend you use this license for any Perl 4 or Perl 5 package you "
 "write, to promote coherence and uniformity in Perl programming.  Outside of "
@@ -981,10 +1154,12 @@
 "utilizzare questa licenza; è meglio utilizzare solo la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "<a id=\"PublicDomain\">Public Domain</a>"
 msgstr "<a id=\"PublicDomain\">Pubblico Dominio (Public Domain)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Being in the public domain is not a license; rather, it means the material "
 "is not copyrighted and no license is needed.  Practically speaking, though, "
@@ -998,7 +1173,19 @@
 "una licenza come software libero del tutto permissiva senza copyleft.  Lo "
 "stato di dominio pubblico è compatibile con la GNU GPL."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"If you want to release your work to the public domain, we encourage you to "
+"use formal tools to do so.  We ask people who make small contributions to "
+"GNU to sign a disclaimer form; that's one solution.  If you're working on a "
+"project that doesn't have formal contribution policies like that, <a href="
+"\"#CC0\">CC0</a> is a good tool that anyone can use.  It formally dedicates "
+"your work to the public domain, and provides a fallback license for cases "
+"where that is not legally possible."
+msgstr ""
+
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Python\" href=\"http://www.python.org/2.0.1/license.html\";> License "
 "of Python 2.0.1, 2.1.1, and newer versions</a>"
@@ -1007,6 +1194,7 @@
 "licenza di Python 2.0.1, 2.1.1 e versioni successive</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license and is compatible with the GNU GPL.  Please "
 "note, however, that intermediate versions of Python (1.6b1, through 2.0 and "
@@ -1018,10 +1206,12 @@
 "a>)"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "License of Python 1.6a2 and earlier versions"
 msgstr "La licenza di Python 1.6a2 e versioni precedenti"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license and is compatible with the GNU GPL.  Please "
 "note, however, that newer versions of Python are under other licenses (see "
@@ -1032,6 +1222,7 @@
 "licenze (si veda sopra e sotto)."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Ruby\" href=\"http://www.ruby-lang.org/en/LICENSE.txt\";> License of "
 "Ruby</a>"
@@ -1040,6 +1231,7 @@
 "Ruby</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, compatible with the GPL via an explicit "
 "dual-licensing clause."
@@ -1048,6 +1240,7 @@
 "un'esplicita clausola di doppia licenza."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://oss.sgi.com/projects/FreeB/\"; id=\"SGIFreeB\"> SGI Free "
 "Software License B, version 2.0</a>"
@@ -1056,6 +1249,7 @@
 "Software License B, versione 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The SGI Free Software License B version 2.0 is a free software license.  It "
 "is essentially identical to the <a href=\"#X11License\">X11 License</a>, "
@@ -1066,6 +1260,7 @@
 "a>, con una possibilità alternativa di fornire il testo della licenza."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Previous versions of the SGI Free Software License B were not free software "
 "licenses, despite their name.  However, they all included clauses that allow "
@@ -1081,6 +1276,7 @@
 "termini di questa versione libera."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"StandardMLofNJ\" href=\"http://cm.bell-labs.com/cm/cs/what/smlnj/";
 "license.html\">Standard ML of New Jersey Copyright License</a>"
@@ -1089,15 +1285,16 @@
 "license.html\">Standard ML of New Jersey Copyright License</a>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.";
-"html#Exhibit1\">Unicode, Inc. License Agreement for Data Files and Software</"
-"a>"
+"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.html#Exhibit1";
+"\">Unicode, Inc. License Agreement for Data Files and Software</a>"
 msgstr ""
-"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.";
-"html#Exhibit1\">Accordo di licenza per dati e software di Unicode, Inc.</a>"
+"<a id=\"Unicode\" href=\"http://www.unicode.org/copyright.html#Exhibit1";
+"\">Accordo di licenza per dati e software di Unicode, Inc.</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
@@ -1111,6 +1308,7 @@
 "GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If you want to use files covered by this License Agreement in your own "
 "software, that shouldn't be any problem, but we recommend that you also "
@@ -1131,6 +1329,7 @@
 "distribuirete i file, ma si tratta di condizioni molto semplici."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please take care to ensure that the files you are using are covered by this "
 "License Agreement.  Other files published by Unicode, Inc. are covered by "
@@ -1145,6 +1344,7 @@
 "dell'accordo di licenza spiega a quali file esso si applica."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
 "to use a simple permissive license for your project, please use the <a href="
@@ -1157,14 +1357,47 @@
 "nella comunità."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";> Squeak "
+#| "license</a>"
+msgid "<a id=\"Unlicense\" href=\"http://unlicense.org/\";>The Unlicense</a>"
+msgstr ""
+"<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";> Squeak license</"
+"a>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"The Unlicense is a public domain dedication.  A work released under the "
+"Unlicense is dedicated to the public domain to the fullest extent permitted "
+"by law, and also comes with an additional simple license that helps cover "
+"any cases where the dedication is inadequate.  Both public domain works and "
+"the simple license provided by the Unlicense are compatible with the GNU GPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"If you want to release your work to the public domain, we recommend you use "
+"<a href=\"#CC0\">CC0</a>.  CC0 also provides a public domain dedication with "
+"a fallback license, and is more thorough and mature than the Unlicense."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Vim\" href=\"http://www.vim.org/htmldoc/uganda.html\";> License of "
+#| "Vim, Version 6.1 or later</a>"
 msgid ""
-"<a id=\"Vim\" href=\"http://www.vim.org/htmldoc/uganda.html\";> License of "
-"Vim, Version 6.1 or later</a>"
+"<a id=\"Vim\" href=\"http://www.gnu.org/licenses/vim-license.txt\";> License "
+"of Vim, Version 6.1 or later</a>"
 msgstr ""
 "<a id=\"Vim\" href=\"http://www.vim.org/htmldoc/uganda.html\";> Licenza di "
 "Vim, versione 6.1 o successive</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, partially copyleft but not really. It is "
 "compatible with the GPL, by an explicit conversion clause."
@@ -1174,6 +1407,7 @@
 "conversione."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"W3C\" href=\"http://www.w3.org/Consortium/Legal/2002/copyright-";
 "software-20021231\"> W3C Software Notice and License</a>"
@@ -1182,6 +1416,32 @@
 "software-20021231\"> La licenza e le note per il Software del W3C</a>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#| "License of ZLib</a>"
+msgid ""
+"<a id=\"WebM\" href=\"http://www.webmproject.org/license/\";>License of WebM</"
+"a>"
+msgstr ""
+"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> La "
+"licenza di ZLib</a>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Google's WebM implementation is covered by the <a href=\"#ModifiedBSD"
+"\">Modified BSD License</a>.  Google also provides a separate patent license "
+"(confusingly called an &ldquo;Additional IP Rights Grant&rdquo;) for patents "
+"that Google owns or controls that are necessarily infringed by their "
+"implementation of WebM.  GPL-covered software can be distributed in "
+"compliance with this license's terms: it allows distributors to exercise all "
+"of the rights granted by the GPL, while fulfilling all its conditions.  "
+"Thus, all of WebM's license is free and GPL-compatible."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"WTFPL\" href=\"http://sam.zoy.org/wtfpl/COPYING\";>WTFPL, Version 2</"
 "a>"
@@ -1190,20 +1450,23 @@
 "a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, very permissive and GPL-compatible."
 msgstr ""
 "Questa è una licenza di software libero, molto permissiva e compatibile con "
 "la GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\"> X11 License</a>"
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\"> X11 License</a>"
 msgstr ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\"> La licenza di X11</a>"
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\"> La licenza di X11</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  Older versions of XFree86 used the same license, and some "
@@ -1217,6 +1480,7 @@
 "la <a href=\"#XFree861.1License\">licenza XFree86 1.1</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is sometimes called the <em>MIT license</em>, but that term is "
 "misleading, since MIT has used many licenses for software."
@@ -1226,6 +1490,7 @@
 "software."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://www.xfree86.org/current/LICENSE4.html\"; id="
 "\"XFree861.1License\">XFree86 1.1 License</a>"
@@ -1234,6 +1499,7 @@
 "\"XFree861.1License\">Licenza XFree86 1.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
@@ -1242,6 +1508,7 @@
 "copyleft, compatibile con la versione 3 della GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is incompatible with version 2 of the GPL, "
 "because of its requirements that apply to all documentation in the "
@@ -1252,6 +1519,7 @@
 "contenga crediti."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "There are currently several variants of XFree86, and only some of them use "
 "this license.  Some continue to use the <a href=\"#X11License\">X11 license</"
@@ -1262,6 +1530,7 @@
 "\">licenza di X11</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> License "
 "of ZLib</a>"
@@ -1270,11 +1539,13 @@
 "licenza di ZLib</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "This is a free software license, and compatible with the GPL."
 msgstr ""
 "Questa è una licenza per software libero ed è compatibile con la licenza 
GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Zope20\" href=\"http://www.zope.org/Resources/ZPL\";> Zope Public "
 "License, versions 2.0 and 2.1</a>"
@@ -1283,6 +1554,7 @@
 "pubblica Zope, versione 2.0 e 2.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
@@ -1291,6 +1563,7 @@
 "copyleft, compatibile con la GNU GPL."
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid ""
 "<a id=\"GPLIncompatibleLicenses\"> GPL-Incompatible Free Software Licenses</"
 "a>"
@@ -1299,6 +1572,7 @@
 "con la GPL</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses are <a href=\"/philosophy/free-sw.html\">free "
 "software</a> licenses, but are <a href=\"/licenses/gpl-faq."
@@ -1311,6 +1585,7 @@
 "\"#GNUGPL\">GNU GPL</a>.</strong>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"AGPLv1.0\" href=\"http://www.affero.org/oagpl.html\";> Affero General "
 "Public License version 1</a>"
@@ -1319,6 +1594,7 @@
 "Generica Pubblica Affero, versione 1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Affero General Public License is a free software license, copyleft, and "
 "incompatible with the GNU GPL.  It consists of the GNU GPL version 2, with "
@@ -1333,6 +1609,7 @@
 "che operano tramite servizi web o reti di computer."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license has been succeeded by the <a href=\"#AGPLv3.0\">GNU Affero "
 "General Public License version 3</a>; please use that instead."
@@ -1341,6 +1618,7 @@
 "Generica GNU Affero, versione 3</a>; vi consigliamo di usare quest'ultima."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"AcademicFreeLicense\" href=\"http://opensource.org/licenses/academic.";
 "php\"> Academic Free License, all versions through 3.0</a>"
@@ -1349,6 +1627,7 @@
 "php\"> Academic Free License, tutte le versioni fino alla 3.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Academic Free License is a free software license, not copyleft, and "
 "incompatible with the GNU GPL.  Recent versions contain contract clauses "
@@ -1361,6 +1640,7 @@
 "dovrebbero essere evitate per le stesse ragioni."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"apache1.1\" href=\"http://www.apache.org/licenses/LICENSE-1.1\";> "
 "Apache License, Version 1.1</a>"
@@ -1369,6 +1649,7 @@
 "licenza Apache, versione 1.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free software license.  It has a few "
 "requirements that render it incompatible with the GNU GPL, such as strong "
@@ -1379,6 +1660,7 @@
 "restrizioni all'uso di nomi legati ad Apache."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"apache1\" href=\"http://www.apache.org/licenses/LICENSE-1.0\";> "
 "Apache License, Version 1.0</a>"
@@ -1387,6 +1669,7 @@
 "licenza Apache, versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
@@ -1399,14 +1682,20 @@
 "compresa l'incomaptibilità con la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl/2.0.txt\";> "
+#| "Apple Public Source License (APSL), version 2</a>"
 msgid ""
-"<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl/2.0.txt\";> Apple "
-"Public Source License (APSL), version 2</a>"
+"<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl\";> Apple Public "
+"Source License (APSL), version 2</a>"
 msgstr ""
 "<a id=\"apsl2\" href=\"http://www.opensource.apple.com/apsl/2.0.txt\";> La "
 "Licenza Apple Public Source (APSL), versione 2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, incompatible with the GNU GPL.  We "
 "recommend that you not use this license for new software that you write, but "
@@ -1419,6 +1708,7 @@
 "licenza. <a href=\"/philosophy/apsl.html\">Ulteriori dettagli.</a>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://www.bittorrent.com/bittorrent-open-source-license\"; id="
 "\"bittorrent\">BitTorrent Open Source License</a>"
@@ -1427,6 +1717,7 @@
 "\"bittorrent\">Licenza Open Source di BitTorrent</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, but incompatible with the GPL, for the same "
 "reasons as the <a href=\"#josl\">Jabber Open Source License</a>."
@@ -1436,14 +1727,16 @@
 "Jabber</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\"> Original BSD license</a>"
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\"> Original BSD license</a>"
 msgstr ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\"> licenza BSD originale</a>"
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\"> licenza BSD originale</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "(Note: on the preceding link, the original BSD license is listed in the "
 "<em>UCB/LBL</em> section.  This license is also sometimes called the "
@@ -1454,6 +1747,7 @@
 "BSD a 4 clausole&rdquo;.)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, permissive non-copyleft free software license with a "
 "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
@@ -1468,6 +1762,7 @@
 "la GNU GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
 "you want to use a simple, permissive non-copyleft free software license, it "
@@ -1483,6 +1778,7 @@
 "sotto la licenza BSD originale."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CDDL\" href=\"http://www.opensolaris.org/os/licensing/cddllicense.txt";
 "\"> Common Development and Distribution License (CDDL), version 1.0</a>"
@@ -1491,6 +1787,7 @@
 "\"> Common Development and Distribution License (CDDL), versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It has a copyleft with a scope that's "
 "similar to the one in the Mozilla Public License, which makes it "
@@ -1505,6 +1802,7 @@
 "Per questo motivo vi chiediamo di non usare la CDDL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Also unfortunate in the CDDL is its use of the term &ldquo;<a href=\"/"
 "philosophy/not-ipr.html\">intellectual property</a>&rdquo;."
@@ -1514,6 +1812,7 @@
 "a>&rdquo;."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CPAL\" href=\"http://opensource.org/licenses/cpal_1.0\";>Common "
 "Public Attribution License 1.0 (CPAL)</a>"
@@ -1522,6 +1821,7 @@
 "Public Attribution License 1.0 (CPAL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It is based on the <a href=\"#MPL"
 "\">Mozilla Public License</a>, and is incompatible with the GPL for the same "
@@ -1536,6 +1836,7 @@
 "permettete ad altri di usarlo."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CommonPublicLicense10\" href=\"http://www.eclipse.org/legal/cpl-v10.";
 "html\"> Common Public License Version 1.0</a>"
@@ -1544,6 +1845,7 @@
 "html\"> Licenza pubblica comune versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  Unfortunately, its weak copyleft and "
 "choice of law clause make it incompatible with the GNU GPL."
@@ -1552,6 +1854,7 @@
 "la scelta della legge applicabile la rendono incompatibile con la GNU GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Condor\" href=\"http://www.cs.wisc.edu/condor/condor-public-license.";
 "html#condor\"> Condor Public License</a>"
@@ -1559,12 +1862,26 @@
 "<a id=\"Condor\" href=\"http://www.cs.wisc.edu/condor/condor-public-license.";
 "html#condor\"> Licenza Pubblica Condor</a>"
 
-# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"This is a free software license.  It has a couple of requirements that make "
-"it incompatible with the GNU GPL, including strong restrictions on the use "
-"of Condor-related names, and a condition that you must comply with United "
-"States export laws."
+"Recent versions of Condor (from 6.9.5 on) are released under the <a href="
+"\"#Apache2\">Apache License 2.0</a>.  Only older versions of Condor use this "
+"license."
+msgstr ""
+
+# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  It has a couple of requirements that "
+#| "make it incompatible with the GNU GPL, including strong restrictions on "
+#| "the use of Condor-related names, and a condition that you must comply "
+#| "with United States export laws."
+msgid ""
+"The Condor Public License is a free software license.  It has a couple of "
+"requirements that make it incompatible with the GNU GPL, including strong "
+"restrictions on the use of Condor-related names, and a condition that you "
+"must comply with United States export laws."
 msgstr ""
 "Questa è una licenza di software libero. Ha un paio di requisiti che la "
 "rendono incompatibile con la GNU GPL, tra cui forti restrizioni all'utilizzo "
@@ -1572,6 +1889,7 @@
 "statunitensi sull'esportazione."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EPL\" href=\"http://www.eclipse.org/legal/epl-v10.html\";> Eclipse "
 "Public License Version 1.0</a>"
@@ -1580,37 +1898,52 @@
 "pubblica Eclipse, versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"The Eclipse Public License is similar to the <a href="
-"\"#CommonPublicLicense10\">Common Public License</a>, and our comments on "
-"the CPL apply equally to the EPL.  The only change is that the EPL removes "
-"the broader patent retaliation language regarding patent infringement suits "
-"specifically against Contributors to the EPL'd program."
-msgstr ""
-"La Licenza Pubblica Eclipse è simile alla <a href="
-"\"#CommonPublicLicense10\">Licenza pubblica comune</a> e i nostri commenti "
-"sulla CPL si applicano nella stessa misura in questo caso. L'unica "
-"differenza è che la EPL elimina le frasi sulle azioni legali per violazioni "
-"di brevetti nei confronti di chi contribuisce al programma rilasciato sotto "
-"EPL."
-
-# type: Content of: <dl><dt>
+"The Eclipse Public License is similar to the <a href=\"#CommonPublicLicense10"
+"\">Common Public License</a>, and our comments on the CPL apply equally to "
+"the EPL.  The only change is that the EPL removes the broader patent "
+"retaliation language regarding patent infringement suits specifically "
+"against Contributors to the EPL'd program."
+msgstr ""
+"La Licenza Pubblica Eclipse è simile alla <a href=\"#CommonPublicLicense10"
+"\">Licenza pubblica comune</a> e i nostri commenti sulla CPL si applicano "
+"nella stessa misura in questo caso. L'unica differenza è che la EPL elimina "
+"le frasi sulle azioni legali per violazioni di brevetti nei confronti di chi "
+"contribuisce al programma rilasciato sotto EPL."
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://ec.europa.eu/idabc/eupl\"; id=\"EUPL\">European Union "
+#| "Public License (EUPL) version 1.1</a>"
 msgid ""
-"<a href=\"http://ec.europa.eu/idabc/eupl\"; id=\"EUPL\">European Union Public "
+"<a href=\"http://www.osor.eu/eupl\"; id=\"EUPL\">European Union Public "
 "License (EUPL) version 1.1</a>"
 msgstr ""
 "<a href=\"http://ec.europa.eu/idabc/eupl\"; id=\"EUPL\">Licenza Pubblica "
 "dell'Unione Europea (EUPL) versione 1.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  By itself, it has a copyleft comparable "
+#| "to the GPL's.  However, it allows recipients to distribute the work under "
+#| "the terms of other selected licenses, and some of those&mdash;the <a href="
+#| "\"#MPL\">Mozilla Public License</a> and the <a href="
+#| "\"#CommonPublicLicense10\">Common Public License</a> in particular&mdash;"
+#| "only provide a weaker copyleft.  Thus, developers can't rely on this "
+#| "license to provide a strong copyleft."
 msgid ""
 "This is a free software license.  By itself, it has a copyleft comparable to "
 "the GPL's.  However, it allows recipients to distribute the work under the "
-"terms of other selected licenses, and some of those&mdash;the <a href=\"#MPL"
-"\">Mozilla Public License</a> and the <a href="
-"\"#CommonPublicLicense10\">Common Public License</a> in particular&mdash;"
-"only provide a weaker copyleft.  Thus, developers can't rely on this license "
-"to provide a strong copyleft."
+"terms of other selected licenses, and some of those&mdash;the <a href=\"#EPL"
+"\">Eclipse Public License</a> and the <a href=\"#CommonPublicLicense10"
+"\">Common Public License</a> in particular&mdash;only provide a weaker "
+"copyleft.  Thus, developers can't rely on this license to provide a strong "
+"copyleft."
 msgstr ""
 "Questa è una licenza di software libero. Di per sé, ha un copyleft "
 "paragonabile a quello della GPL. Tuttavia, permette ai licenziatari di "
@@ -1621,6 +1954,7 @@
 "questa licenza se desiderano un copyleft forte."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The EUPL is compatible with GPLv2, because that is listed as one of the "
 "alternative licenses that recipients may use.  However, it is incompatible "
@@ -1635,6 +1969,7 @@
 "chiediamo di non usare la EUPL per il software che scrivete."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"IBMPL\" href=\"http://www.opensource.org/licenses/ibmpl.php\";> IBM "
 "Public License, Version 1.0</a>"
@@ -1643,6 +1978,7 @@
 "Licenza pubblica IBM, versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  Unfortunately, it has a choice of law "
 "clause which makes it incompatible with the GNU GPL."
@@ -1652,28 +1988,7 @@
 "applica."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/opensource/";
-"IPL.html\"> Interbase Public License, Version 1.0</a>"
-msgstr ""
-"<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/opensource/";
-"IPL.html\"> La Licenza Pubblica Interbase, versione 1.0</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the IPL has some complex "
-"restrictions that make it incompatible with the GNU GPL.  That is, a module "
-"covered by the GPL and a module covered by the IPL cannot legally be linked "
-"together.  We urge you not to use the IPL for this reason."
-msgstr ""
-"Questa è una licenza per software libero che è essenzialmente uguale alla "
-"Licenza Pubblica Mozilla, versione 1.1. Come la MPL, la IPL ha alcune "
-"restrizioni complesse che la rendono incompatibile con la GNU GPL. Quindi un "
-"modulo rilasciato con licenza GPL e uno con licenza IPL non possono essere "
-"legalmente uniti assieme. Vi invitiamo a non usare la IPL per questo motivo."
-
-# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"josl\" href=\"http://code.google.com/p/jabber-net/source/browse/";
 "branches/RELEASE_1_0/LICENSE.txt\"> Jabber Open Source License, Version 1.0</"
@@ -1684,6 +1999,7 @@
 "versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The license is a free software license, incompatible with the GPL.  It "
 "permits relicensing under a certain class of licenses, those which include "
@@ -1698,6 +2014,7 @@
 "licenziamento sotto GPL. Perciò non è compatibile."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"LPPL-1.3a\" href=\"http://www.latex-project.org/lppl/lppl-1-3a.txt";
 "\"> LaTeX Project Public License 1.3a</a>"
@@ -1706,6 +2023,7 @@
 "\"> La licenza pubblica del Progetto LaTeX 1.3a</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We have not written a full analysis of this license, but it is a free "
 "software license, with less stringent requirements on distribution than "
@@ -1720,6 +2038,7 @@
 "includere una copia o un collegamento alla versione originale."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"LPPL-1.2\" href=\"http://www.latex-project.org/lppl/lppl-1-2.txt\";> "
 "LaTeX Project Public License 1.2</a>"
@@ -1728,6 +2047,7 @@
 "\">La licenza pubblica del Progetto LaTeX 1.2</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is an incomplete statement of the distribution terms for "
 "LaTeX.  As far as it goes, it is a free software license, but incompatible "
@@ -1740,6 +2060,7 @@
 "trovano nella GPL. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license contains complex and annoying restrictions on how to publish a "
 "modified version, including one requirement that falls just barely on the "
@@ -1752,6 +2073,7 @@
 "nuovo nome. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The reason this requirement is acceptable for LaTeX is that TeX has a "
 "facility to allow you to map file names, to specify &ldquo;use file bar when "
@@ -1766,7 +2088,19 @@
 "stessa richiesta diventerebbe un ostacolo molto serio, e quindi siamo "
 "arrivati alla conclusione che questa licenza rende il programma non libero. "
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This condition may cause trouble with some major modifications.  For "
+"example, if you wanted to port an LPPL-covered work to another system that "
+"lacked a similar remapping facility, but still required users to request "
+"this file by name, you would need to implement a remapping facility too to "
+"keep this software free.  That would be a nuisance, but the fact that a "
+"license would make code nonfree if transplanted into a very different "
+"context does not make it nonfree in the original context."
+msgstr ""
+
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The LPPL says that some files, in certain versions of LaTeX, may have "
 "additional restrictions, which could render them non-free.  For this reason, "
@@ -1779,6 +2113,7 @@
 "LaTeX. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The LPPL makes the controversial claim that simply having files on a machine "
 "where a few other people could log in and access them in itself constitutes "
@@ -1792,16 +2127,19 @@
 "inizi a farla."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "Please do not use this license for any other project."
 msgstr "Per favore non utilizzate questa licenza per nessun altro progetto. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "Note: These comments are for version 1.2 (3 Sep 1999) of the LPPL."
 msgstr ""
 "Nota: Questi commenti si riferiscono alla versione 1.2 (3 settembre 1999) "
 "della LPPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"lucent102\" href=\"http://plan9.bell-labs.com/plan9dist/license.html";
 "\"> Lucent Public License Version 1.02 (Plan 9 license)</a>"
@@ -1810,6 +2148,7 @@
 "\"> Lucent Public License Version 1.02 (Plan 9 license)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, but it is incompatible with the GNU GPL "
 "because of its choice of law clause.  We recommend that you not use this "
@@ -1822,6 +2161,7 @@
 "sotto questa licenza."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ms-pl\" href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-";
 "PL\">Microsoft Public License (Ms-PL)</a>"
@@ -1830,6 +2170,7 @@
 "PL\">Microsoft Public License (Ms-PL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license; it has a copyleft that is not strong, but "
 "incompatible with the GNU GPL.  We urge you not to use the Ms-PL for this "
@@ -1840,6 +2181,7 @@
 "della Ms-PL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ms-rl\" href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-";
 "RL\">Microsoft Reciprocal License (Ms-RL)</a>"
@@ -1848,6 +2190,7 @@
 "RL\">Microsoft Reciprocal License (Ms-RL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It's based on the <a href=\"#ms-pl"
 "\">Microsoft Public License</a>, and has an additional clause to make the "
@@ -1860,6 +2203,7 @@
 "motivo sconsigliamo  l'utilizzo della Ms-RL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
 "Public License (MPL)</a>"
@@ -1868,6 +2212,7 @@
 "Pubblica Mozilla (MPL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license which is not a strong copyleft; unlike the "
 "<a href=\"#X11License\">X11 license</a>, it has some complex restrictions "
@@ -1884,6 +2229,7 @@
 "assieme. Vi invitiamo a non utilizzare la MPL per questo motivo. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "However, MPL 1.1 has a provision (section 13) that allows a program (or "
 "parts of it) to offer a choice of another license as well.  If part of a "
@@ -1898,6 +2244,7 @@
 "parte di programma ha una licenza compatibile con la GPL. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"NOSL\" href=\"http://bits.netizen.com.au/licenses/NOSL/nosl.txt\";> "
 "Netizen Open Source License (NOSL), Version 1.0</a>"
@@ -1906,6 +2253,7 @@
 "La Licenza Open Source di Netizen (NOSL), versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license that is essentially the same as the Mozilla "
 "Public License, Version 1.1.  Like the MPL, the NOSL has some complex "
@@ -1920,6 +2268,7 @@
 "legalmente uniti assieme. Vi invitiamo a non usare la NOSL per questo motivo."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"NPL\" href=\"http://www.mozilla.org/NPL/NPL-1.1.html\";> Netscape "
 "Public License (NPL)</a>, versions 1.0 and 1.1"
@@ -1928,6 +2277,7 @@
 "Pubblica Netscape (NPL)</a>, versioni 1.0 and 1.1"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
 "with the GNU GPL.  It consists of the Mozilla Public License with an added "
@@ -1944,6 +2294,7 @@
 "<em>loro</em> codice in modo analogo. Vi invitiamo a non utilizzare la NPL. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Nokia\" href=\"http://opensource.org/licenses/nokia.html\";> Nokia "
 "Open Source License</a>"
@@ -1952,6 +2303,7 @@
 "Licenza Nokia Open Source</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is similar to the Mozilla Public License: a free software license "
 "incompatible with the GNU GPL."
@@ -1960,10 +2312,12 @@
 "software libero incompatibile con la GNU GPL. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "Old OpenLDAP License, Version 2.3"
 msgstr "La vecchia licenza di OpenLDAP, versione 2.3."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free software license with a few "
 "requirements (in sections 4 and 5) that render it incompatible with the GNU "
@@ -1976,6 +2330,7 @@
 "\"#newOpenLDAP\">nuova licenza</a> compatibile con la GNU GPL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the older OpenLDAP license for software you write.  "
 "However, there is no reason to avoid running programs that have been "
@@ -1986,6 +2341,7 @@
 "programmi rilasciati sotto questa licenza. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"OSL\" href=\"http://www.opensource.org/licenses/osl-3.0.php\";> Open "
 "Software License, all versions through 3.0</a>"
@@ -1994,6 +2350,7 @@
 "Software License, tutte le versioni fino alla 3.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Open Software License is a free software license.  It is incompatible "
 "with the GNU GPL in several ways."
@@ -2002,6 +2359,7 @@
 "con la GNU GPL in vari modi."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<a id=\"OSLRant\"></a>Recent versions of the Open Software License have a "
 "term which requires distributors to try to obtain explicit assent to the "
@@ -2025,6 +2383,7 @@
 "OSL per qualsiasi programma."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the Open Software License for software you write.  "
 "However, there is no reason to avoid running programs that have been "
@@ -2035,6 +2394,7 @@
 "utilizzare programmi rilasciati sotto questa licenza. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"OpenSSL\" href=\"http://www.sdisw.com/openssl.htm\";> OpenSSL "
 "license</a>"
@@ -2043,6 +2403,7 @@
 "license</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The license of OpenSSL is a conjunction of two licenses, one of them being "
 "the license of SSLeay.  You must follow both.  The combination results in a "
@@ -2056,6 +2417,7 @@
 "pubblicità come la licenza BSD originale e la licenza Apache."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend using GNUTLS instead of OpenSSL in software you write.  "
 "However, there is no reason not to use OpenSSL and applications that work "
@@ -2066,6 +2428,7 @@
 "e applicazioni che lavorano con OpenSSL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Phorum\" href=\"http://phorum.org/license.txt\";> Phorum License, "
 "Version 2.0</a>"
@@ -2074,6 +2437,7 @@
 "versione 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license but it is incompatible with the <a href=\"/"
 "licenses/gpl.html\">GPL</a>.  Section 5 makes the license incompatible with "
@@ -2084,6 +2448,7 @@
 "GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"PHP-3.01\" href=\"http://www.php.net/license/3_01.txt\";> PHP "
 "License, Version 3.01</a>"
@@ -2092,6 +2457,7 @@
 "PHP, versione 3.01</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is used by most of PHP4.  It is a non-copyleft free software "
 "license.  It is incompatible with the GNU GPL because it includes strong "
@@ -2102,6 +2468,7 @@
 "forti restrizioni sull'uso del termine \"PHP\" nei nomi di prodotti derivati."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend that you not use this license for anything except PHP add-ons."
 msgstr ""
@@ -2109,14 +2476,16 @@
 "estensioni di PHP."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-"python1.6_9-5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a>"
+"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/python1.6_9-";
+"5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a>"
 msgstr ""
-"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-"python1.6_9-5-00.html\"> Licenza di Python 1.6b1 fino alla 2.0 e 2.1</a>"
+"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/python1.6_9-";
+"5-00.html\"> Licenza di Python 1.6b1 fino alla 2.0 e 2.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license but is incompatible with the GNU GPL.  The "
 "primary incompatibility is that this Python license is governed by the laws "
@@ -2127,6 +2496,7 @@
 "dello Stato della Virginia, negli Stati Uniti, e la GPL non lo permette."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"QPL\" href=\"http://doc.trolltech.com/3.0/license.html\";> Q Public "
 "License (QPL), Version 1.0</a>"
@@ -2135,6 +2505,7 @@
 "Pubblica Q (QPL), versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a non-copyleft free software license which is incompatible with the "
 "GNU GPL.  It also causes major practical inconvenience, because modified "
@@ -2146,6 +2517,7 @@
 "forma di patch. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We recommend that you avoid using the QPL for anything that you write, and "
 "use QPL-covered software packages only when absolutely necessary.  However, "
@@ -2158,6 +2530,7 @@
 "rilasciato anche sotto licenza GNU GPL. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Since the QPL is incompatible with the GNU GPL, you cannot take a GPL-"
 "covered program and QPL-covered program and link them together, no matter "
@@ -2168,6 +2541,7 @@
 "assieme, non importa come. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "However, if you have written a program that uses QPL-covered library (called "
 "FOO), and you want to release your program under the GNU GPL, you can easily "
@@ -2181,9 +2555,15 @@
 "aggiungendo una nota come questa: "
 
 # type: Content of: <dl><dd><pre>
-#, no-wrap
+#. type: Content of: <dl><dd><pre>
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\n"
+#| "  As a special exception, you have permission to link this program\n"
+#| "  with the FOO library and distribute executables, as long as you\n"
+#| "  follow the requirements of the GNU GPL in regard to all of the\n"
+#| "  software in the executable aside from FOO.\n"
 msgid ""
-"\n"
 "  As a special exception, you have permission to link this program\n"
 "  with the FOO library and distribute executables, as long as you\n"
 "  follow the requirements of the GNU GPL in regard to all of the\n"
@@ -2196,6 +2576,7 @@
 "  software nell'eseguibile eccetto la parte XYZ.\n"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "You can do this, legally, if you are the copyright holder for the program.  "
 "Add it in the source files, after the notice that says the program is "
@@ -2206,6 +2587,7 @@
 "programma è rilasciato sotto licenza GNU GPL. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"RPSL\" href=\"http://www.opensource.org/licenses/real.php";
 "\">RealNetworks Public Source License (RPSL), Version 1.0</a>"
@@ -2214,6 +2596,7 @@
 "\">RealNetworks Public Source License (RPSL), Version 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The RPSL is a free software license that is GPL-incompatible for a number of "
 "reasons: it requires that derivative works be licensed under the terms of "
@@ -2225,14 +2608,20 @@
 "Seattle, Washington."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"SISSL\" href=\"http://www.openoffice.org/licenses/sissl_license.";
+#| "html\"> Sun Industry Standards Source License 1.0</a>"
 msgid ""
 "<a id=\"SISSL\" href=\"http://www.openoffice.org/licenses/sissl_license.html";
-"\"> Sun Industry Standards Source License 1.0</a>"
+"\">Sun Industry Standards Source License 1.0</a>"
 msgstr ""
 "<a id=\"SISSL\" href=\"http://www.openoffice.org/licenses/sissl_license.html";
 "\"> Sun Industry Standards Source License 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, not a strong copyleft, which is "
 "incompatible with the GNU GPL because of details rather than any major "
@@ -2243,6 +2632,7 @@
 "generale. "
 
 # 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>"
 msgstr ""
@@ -2250,6 +2640,7 @@
 "a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is essentially the same as the Mozilla Public License: a free software "
 "license incompatible with the GNU GPL.  Please do not confuse this with the "
@@ -2262,14 +2653,20 @@
 "a> che non è una licenza per software libero."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
+#| "Xinetd_License\"> License of xinetd</a>"
 msgid ""
 "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
-"Xinetd_License\"> License of xinetd</a>"
+"Xinetd_License\">License of xinetd</a>"
 msgstr ""
 "<a id=\"xinetd\" href=\"http://fedoraproject.org/wiki/Licensing/";
 "Xinetd_License\"> La licenza di xinetd</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a copyleft free software license, incompatible with the GPL.  It is "
 "incompatible because it places extra restrictions on redistribution of "
@@ -2280,14 +2677,20 @@
 "versioni modificate che vanno contro i requisiti di distribuzione della GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
+#| "publiclicense-1813.html\"> Yahoo! Public License 1.0</a>"
 msgid ""
-"<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
-"publiclicense-1813.html\"> Yahoo! Public License 1.0</a>"
+"<a id=\"Yahoo\" href=\"http://www.zimbra.com/license/";
+"yahoo_public_license_1.1.html\">Yahoo! Public License 1.1</a>"
 msgstr ""
 "<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
 "publiclicense-1813.html\"> Yahoo! Public License 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It has a copyleft similar to the one found "
 "in the Mozilla Public License.  It also has a choice of law clause in "
@@ -2302,14 +2705,20 @@
 "philosophy/not-ipr.html\">proprietà intellettuale</a>&rdquo;."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zend\" href=\"http://www.zend.com/license/2_00.txt\";> Zend "
+#| "License, Version 2.0</a>"
 msgid ""
-"<a id=\"Zend\" href=\"http://www.zend.com/license/2_00.txt\";> Zend License, "
+"<a id=\"Zend\" href=\"http://www.zend.com/license/2_00.txt\";>Zend License, "
 "Version 2.0</a>"
 msgstr ""
 "<a id=\"Zend\" href=\"http://www.zend.com/license/2_00.txt\";> Zend License, "
 "Versione 2.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license is used by one part of PHP4.  It is a non-copyleft free "
 "software license which is incompatible with the GNU GPL, and has <a href=\"/"
@@ -2322,18 +2731,46 @@
 "originale."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "We recommend that you not use this license for anything you write."
 msgstr "Sconsigliamo l'utilizzo di questa licenza per il vostro software."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
+#| "publiclicense-1813.html\"> Yahoo! Public License 1.0</a>"
+msgid ""
+"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-license-";
+"1-3.html\">Zimbra Public License 1.3</a>"
+msgstr ""
+"<a id=\"Yahoo\" href=\"http://info.yahoo.com/legal/us/yahoo/publiclicense/";
+"publiclicense-1813.html\"> Yahoo! Public License 1.0</a>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This license is identical to the <a href=\"#Yahoo\">Yahoo! Public License "
+"1.1</a>, except that the license is provided by VMWare instead of Yahoo!.  "
+"Our comments there apply here as well; this is a GPL-incompatible, partial "
+"copyleft free software license."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Zope\" href=\"http://www.zope.org/Resources/ZPL\";> Zope Public "
+#| "License version 1</a>"
 msgid ""
-"<a id=\"Zope\" href=\"http://www.zope.org/Resources/ZPL\";> Zope Public "
+"<a id=\"Zope\" href=\"http://www.zope.org/Resources/ZPL\";>Zope Public "
 "License version 1</a>"
 msgstr ""
 "<a id=\"Zope\" href=\"http://www.zope.org/Resources/ZPL\";> La licenza "
 "pubblica Zope versione 1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a simple, fairly permissive non-copyleft free software license with "
 "<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
@@ -2346,6 +2783,7 @@
 "l'incompatibilità con la <a href=\"/licenses/gpl.html\">GNU GPL</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the ZPL version 1 for software you write.  However, "
 "there is no reason to avoid running programs that have been released under "
@@ -2356,6 +2794,7 @@
 "rilasciati sotto questa licenza, come le precedenti versioni di Zope. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<a href=\"#Zope20\">Version 2.0 of the Zope Public License</a> is GPL-"
 "compatible."
@@ -2364,10 +2803,12 @@
 "compatibile con la GPL."
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "<a id=\"NonFreeSoftwareLicense\">Non-Free Software Licenses</a>"
 msgstr "<a id=\"NonFreeSoftwareLicense\">Licenze di software non libero</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as <a href=\"/"
 "philosophy/free-sw.html\">free software</a> licenses.  A non-free license is "
@@ -2379,6 +2820,7 @@
 "a>."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Of course, we urge you to avoid using non-free software licenses, and to "
 "avoid non-free software in general."
@@ -2387,6 +2829,7 @@
 "libero, ed evitare il software non libero in generale. "
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "There is no way we could list all the known non-free software licenses here; "
 "after all, every proprietary software company has its own.  We focus here on "
@@ -2400,6 +2843,7 @@
 "<strong>non</strong> libero. "
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "We have provided links to these licenses when we can do so without violating "
 "our general policy: that we do not make links to sites that promote, "
@@ -2419,10 +2863,12 @@
 "motivi particolari questo non sia controproducente. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "Aladdin Free Public License"
 msgstr "Aladdin Free Public License"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Despite its name, this is not a free software license because it does not "
 "allow charging for distribution, and largely prohibits simply packaging "
@@ -2434,14 +2880,21 @@
 "pagamento."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"apsl1\" href=\"http://www.opensource.apple.com/apsl/1.2.txt\";> Apple "
-"Public Source License (APSL), version 1.x</a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"apsl1\" href=\"http://www.opensource.apple.com/apsl/1.2.txt\";> "
+#| "Apple Public Source License (APSL), version 1.x</a>"
+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>"
 msgstr ""
 "<a id=\"apsl1\" href=\"http://www.opensource.apple.com/apsl/1.2.txt\";> Apple "
 "Public Source License (APSL), versione 1.x</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Versions 1.0, 1.1 and 1.2 are <a href=\"/philosophy/historical-apsl.html"
 "\">not free software licenses (follow the link for more explanation)</a>.  "
@@ -2456,10 +2909,12 @@
 "di software libero."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "<a id=\"ArtisticLicense\">Artistic License 1.0</a>"
 msgstr "<a id=\"ArtisticLicense\">Artistic License 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We cannot say that this is a free software license because it is too vague; "
 "some passages are too clever for their own good, and their meaning is not "
@@ -2473,10 +2928,12 @@
 "di Perl</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "AT&amp;T Public License"
 msgstr "AT&amp;T Public License"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The AT&amp;T Public License is a non-free license.  It has several serious "
 "problems:"
@@ -2484,6 +2941,7 @@
 "La AT&amp;T Public License è una licenza non libera.  Ha vari problemi seri:"
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "The patent license is voided by any modification, no matter how small, of "
 "the pertinent code."
@@ -2492,32 +2950,38 @@
 "relativo."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "You must demand a written agreement when you distribute the sources or "
 "patches."
 msgstr "Dovete fare richiesta scritta per distribuire sorgenti o patch."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid "It requires notifying AT&amp;T if you distribute a patch."
 msgstr "Richiede di notificare AT&amp;T se distribuite una patch."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "Your license can be terminated through no fault of yours, under section 8/3."
 msgstr ""
 "La licenza può essere terminata senza vostre colpe, come da sezione 8/3."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "It makes compliance with export control laws a condition of the license."
 msgstr ""
 "Mette come condizione della licenza il rispetto di leggi sull'esportazione."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid "Some versions of the license require you to provide support."
 msgstr "Alcune versioni della licenza vi obbligano a fornire supporto."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "Some versions of the license say you cannot sell a copy of the software for "
 "more than the expense of distribution."
@@ -2526,10 +2990,12 @@
 "software a un costo superiore alle spese di distribuzione."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "The license has two other obnoxious features:"
 msgstr "Ha inoltre altre due caratteristiche particolarmente fastidiose:"
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "It has a very broad reverse license to AT&amp;T, which goes far beyond the "
 "use of your code, even your code modified."
@@ -2538,6 +3004,7 @@
 "del vostro codice, anche modificato."
 
 # type: Content of: <dl><dd><ol><li>
+#. type: Content of: <dl><dd><ol><li>
 msgid ""
 "It asserts one needs a license from AT&amp;T to make a link to their web "
 "site.  This is not an immediate practical problem, since the license says it "
@@ -2552,10 +3019,12 @@
 "genere non dovrebbe essere pubblicizzato o diffuso."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "eCos Public License, version 1.1"
 msgstr "eCos Public License, versione 1.1"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This was the old license of eCos.  It is not a free software license, "
 "because it requires sending every published modified version to a specific "
@@ -2568,6 +3037,7 @@
 "licenza."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
 "additional permission for linking with non-free programs."
@@ -2576,6 +3046,7 @@
 "permesso aggiuntivo di collegamento con programmi non liberi."
 
 # 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 "
@@ -2586,6 +3057,7 @@
 "Administration</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The GPL-PA (whose original name in Portuguese is &ldquo;Licen&ccedil;a "
 "P&uacute;blica Geral para Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) "
@@ -2596,18 +3068,22 @@
 "per vari motivi:"
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid "It permits use only in &ldquo;normal circumstances&rdquo;."
 msgstr "Permette solo l'uso in \"circostanze normali\"."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid "It does not allow distribution of source code without binaries."
 msgstr "Non permette la distribuzione di codice sorgente senza binari."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid "Its permissions lapse after 50 years."
 msgstr "Scade dopo 50 anni."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"HESSLA\" href=\"http://www.hacktivismo.com/about/hessla.php\";> "
 "Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)"
@@ -2616,6 +3092,7 @@
 "Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license, because it <a href=\"/licenses/hessla."
 "html\">restricts what jobs people can use the software for, and restricts in "
@@ -2627,6 +3104,7 @@
 "programma."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Jahia\" href=\"http://www.jahia.org/jahia/Jahia/pid/145\";> Jahia "
 "Community Source License</a>"
@@ -2635,6 +3113,7 @@
 "Community Source License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Jahia Community Source License is not a free software license.  Use of "
 "the source code is limited to research purposes."
@@ -2643,10 +3122,34 @@
 "sorgente è limitato a scopi di ricerca."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> "
+#| "License of ZLib</a>"
+msgid ""
+"<a id=\"JSON\" href=\"http://www.json.org/license.html\";>The JSON License</a>"
+msgstr ""
+"<a id=\"ZLib\" href=\"http://www.gzip.org/zlib/zlib_license.html\";> La "
+"licenza di ZLib</a>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is the license of the original implementation of the JSON data "
+"interchange format.  This license uses the Expat license as a base, but adds "
+"a clause mandating: &ldquo;The Software shall be used for Good, not Evil."
+"&rdquo; This is a restriction on usage and thus conflicts with freedom 0.  "
+"The restriction might be unenforcible, but we cannot presume that.  Thus, "
+"the license is nonfree."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "Old license of ksh93"
 msgstr "Vecchia licenza di ksh93"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "ksh93 used to be shipped with an original license that was not a free "
 "software license.  One reason for this is that it required that all changes "
@@ -2656,6 +3159,7 @@
 "esempio richiedeva di inviare tutte le modifiche allo sviluppatore."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "ksh93 is now released under the <a href=\"#CommonPublicLicense10\">Common "
 "Public License</a>."
@@ -2664,6 +3168,7 @@
 "Public License</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://packages.debian.org/changelogs/pool/non-free/l/lha/current/";
 "copyright\"> License of Lha</a>"
@@ -2672,6 +3177,7 @@
 "copyright\"> Licenza di Lha</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The lha license must be considered non-free because it is so vague that you "
 "cannot be sure what permissions you have."
@@ -2680,65 +3186,7 @@
 "permette di capire quali permessi ha l'utente."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public License "
-"(Ms-LPL)</a>"
-msgstr ""
-"<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public License "
-"(Ms-LPL)</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This license is non-free because of section 3(F), which requires that any "
-"modified software you make from the original code must run on Windows.  The "
-"<a href=\"#ms-pl\">Microsoft Public License</a> does not have this "
-"restriction."
-msgstr ""
-"Questa licenza non è libera a causa della sezione 3(F), che richiede che "
-"qualsiasi versione modificata debba essere eseguibile sotto Windows. La <a "
-"href=\"#ms-pl\">Microsoft Public License</a> non ha questa restrizione."
-
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited Reciprocal "
-"License (Ms-LRL)</a>"
-msgstr ""
-"<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited Reciprocal "
-"License (Ms-LRL)</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This license is non-free because of section 3(G), which requires that any "
-"modified software you make from the original code must run on Windows.  The "
-"<a href=\"#ms-rl\">Microsoft Reciprocal License</a> does not have this "
-"restriction."
-msgstr ""
-"Questa licenza non è libera a causa della sezione 3(G), che richiede che "
-"qualsiasi versione modificata debba essere eseguibile sotto Windows. La <a "
-"href=\"#ms-rl\">Microsoft Reciprocal License</a> non ha questa restrizione."
-
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
-msgstr ""
-"<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
-"licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This is a non-free license: you are not allowed to modify the software at "
-"all, and you are only allowed to share it under very particular "
-"circumstances."
-msgstr ""
-"Questa è una licenza non libera: non è possibile modificare il programma, e 
"
-"lo si può condividere solo in casi molto particolari."
-
-# 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 "
@@ -2749,6 +3197,7 @@
 "Jscript License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license does not permit commercial distribution, and only allows "
 "commercial use under certain circumstances."
@@ -2757,6 +3206,7 @@
 "commerciale solo a certe condizioni."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Microsoft has other licenses which it describes as &ldquo;Shared "
 "Source&rdquo;, some of which have different restrictions."
@@ -2765,32 +3215,20 @@
 "quali hanno restrizioni diverse."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Nokia\" href=\"http://opensource.org/licenses/nokia.html\";> Nokia "
+#| "Open Source License</a>"
 msgid ""
-"<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
-"bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</a>"
-msgstr ""
-"<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
-"bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</a>"
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This license is non-free because it places various limitations on the kinds "
-"of modifications you can make.  For example, your modified software must run "
-"on Wince, and you are required to provide end user support for your software."
-msgstr ""
-"Questa licenza è non libera perché limita le modifiche che si possono "
-"apportare. Ad esempio, il software modificato deve essere eseguibile su "
-"Wince, e si è obbligati a fornire supporto agli utenti del proprio software."
-
-# type: Content of: <dl><dt>
-msgid ""
-"<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/site/";
-"docs/NASA_Open_Source_Agreement_1.3.txt\"> NASA Open Source Agreement</a>"
+"<a id=\"NASA\" href=\"http://www.opensource.org/licenses/nasa1.3\";> NASA "
+"Open Source Agreement</a>"
 msgstr ""
-"<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/site/";
-"docs/NASA_Open_Source_Agreement_1.3.txt\"> NASA Open Source Agreement</a>"
+"<a id=\"Nokia\" href=\"http://opensource.org/licenses/nokia.html\";> La "
+"Licenza Nokia Open Source</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The NASA Open Source Agreement, version 1.3, is not a free software license "
 "because it includes a provision requiring changes to be your &ldquo;original "
@@ -2803,6 +3241,7 @@
 "software altrui, e questa licenza lo vieta."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use this license.  In addition, if you are a United "
 "States citizen, please write to NASA and call for the use of a truly free "
@@ -2812,6 +3251,7 @@
 "scrivere alla NASA e chiedere l'utilizzo di una vera licenza libera."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"OPL\" title=\"Open Public License at Fedora Project wiki\" href="
 "\"https://fedoraproject.org/wiki/Licensing/Open_Public_License\";> Open "
@@ -2822,6 +3262,7 @@
 "Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license, because it requires sending every "
 "published modified version to a specific initial developer.  There are also "
@@ -2834,10 +3275,12 @@
 "non siamo sicuri che non possano creare problemi. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "License of PINE"
 msgstr "Licenza di PINE"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The license of PINE is not a free software license because it mostly "
 "prohibits the distribution of modified versions.  It also restricts the "
@@ -2849,18 +3292,21 @@
 "utilizzabili per  <a href=\"/philosophy/selling.html\">vendere copie</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that a successor to Pine, Alpine, is released under the <a href="
 "\"#apache2\">Apache License, version 2.0</a>."
 msgstr ""
-"Alpine, un successore di PINE, è rilasciato sotto la <a href="
-"\"#apache2\">Apache License, versione 2.0</a>."
+"Alpine, un successore di PINE, è rilasciato sotto la <a href=\"#apache2"
+"\">Apache License, versione 2.0</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "Old Plan 9 license"
 msgstr "Vecchia licenza di Plan 9"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license; it lacks essential freedoms such as the "
 "right to make and use private changes.  Of course you should not use this "
@@ -2875,6 +3321,7 @@
 "philosophy/plan-nine.html\">dettagliata discussione su questa licenza</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "In September 2002 it was observed that the published license for Plan&nbsp;9 "
 "had been modified, adding more restrictions to it, although its date still "
@@ -2887,6 +3334,7 @@
 "modifiche nel 2003</a> hanno reso  Plan&nbsp;9 software libero."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"RPL\" href=\"http://www.opensource.org/licenses/rpl.php\";> "
 "Reciprocal Public License</a>"
@@ -2895,6 +3343,7 @@
 "Reciprocal Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Reciprocal Public License is a non-free license because of three "
 "problems.  1.&nbsp;It puts limits on prices charged for an initial copy.  2."
@@ -2908,10 +3357,12 @@
 "pubblicazione di qualsiasi versione modificata in uso, anche privato."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "Scilab license"
 msgstr "La licenza di Scilab "
 
 # type: Content of: <dl><dd><p>
+#. 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 "
@@ -2922,6 +3373,7 @@
 "recenti di Scilab sono software libero, con licenza CeCILL versione 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>"
@@ -2930,17 +3382,20 @@
 "Simple Machines License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Despite the name, this is a software license, and it's non-free for several "
 "reasons:"
 msgstr "Nonostante il nome è una licenza software, non libera per vari 
motivi:"
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid ""
 "You must get the licensor's permission before distributing the software."
 msgstr "Serve il permesso dell'autore originale per distribuire il software."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid ""
 "You <a href=\"/philosophy/selling.html\">cannot sell copies of the software</"
 "a>."
@@ -2949,6 +3404,7 @@
 "programma."
 
 # type: Content of: <dl><dd><ul><li>
+#. type: Content of: <dl><dd><ul><li>
 msgid ""
 "It's possible that your license can be terminated if you received the "
 "software from someone who did not obey the license's terms."
@@ -2957,24 +3413,30 @@
 "qualcuno che non ha rispettato la licenza."
 
 # type: Content of: <dl><dt>
-msgid ""
-"<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";> Squeak license</"
-"a>"
-msgstr ""
-"<a id=\"Squeak\" href=\"http://squeak.org/SqueakLicense/\";> Squeak license</"
-"a>"
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid "Old Plan 9 license"
+msgid "Old Squeak license"
+msgstr "Vecchia licenza di Plan 9"
 
 # type: Content of: <dl><dd><p>
-msgid ""
-"As applied to software, this is not a free software license because it "
-"requires all users in whatever country to obey US export control laws.  As "
-"applied to fonts, it also does not permit modification."
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "As applied to software, this is not a free software license because it "
+#| "requires all users in whatever country to obey US export control laws.  "
+#| "As applied to fonts, it also does not permit modification."
+msgid ""
+"The original Squeak license, as applied to software, is not a free software "
+"license because it requires all users in whatever country to obey US export "
+"control laws.  As applied to fonts, it also does not permit modification."
 msgstr ""
 "Applicata al software, non è una licenza libera perché richiede agli 
utenti, "
 "ovunque si trovino, di applicare le leggi statunitensi sull'esportazione. "
 "Applicata ai font, non ne permette nemmeno la modifica."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "In addition, it has a requirement for users to indemnify the developer, "
 "which is enough to make many users think twice about using it at all."
@@ -2982,12 +3444,21 @@
 "In aggiunta chiede agli utenti di non dare responsabilità all'autore, il che 
"
 "potrebbe bastare a molti utenti per riflettere prima di usare il software."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Recent versions of Squeak (from 4.0 on) are released under an <a href="
+"\"#Expat\">Expat-style License</a> with some portions of the code under the "
+"<a href=\"#apache2\">Apache License 2.0</a>."
+msgstr ""
+
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "<a id=\"SunCommunitySourceLicense\"> Sun Community Source License</a>"
 msgstr ""
 "<a id=\"SunCommunitySourceLicense\"> La Licenza Sun Community Source</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license; it lacks essential freedoms such as "
 "publication of modified versions.  Please don't use this license, and we "
@@ -2999,10 +3470,12 @@
 "di essa. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "Sun Solaris Source Code (Foundation Release) License, Version 1.1"
 msgstr "La Licenza Sun Solaris Source Code (Foundation Release), versione 1.1"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license.  The license prohibits redistribution, "
 "prohibits commercial use of the software, and can be revoked."
@@ -3012,6 +3485,7 @@
 "revocata. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/license/";
 "\"> SystemC &quot;Open Source&quot; License, Version 3.0</a>"
@@ -3020,6 +3494,7 @@
 "\"> SystemC &quot;Open Source&quot; License, versione 3.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license requires all recipients to proactively help the licensor "
 "enforce its trademarks.  This is an unreasonable condition to place on "
@@ -3034,6 +3509,7 @@
 "ipr.xhtml\">&ldquo;proprietà intellettuale&rdquo;</a>."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Despite the name, this license has not been approved as an open source "
 "license as of this writing."
@@ -3042,6 +3518,7 @@
 "corrente revisione, come licenza open source."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"UtahPublicLicense\" href=\"http://www.cs.utah.edu/~gk/teem/txt/";
 "LICENSE.txt\"> University of Utah Public License</a>"
@@ -3050,6 +3527,7 @@
 "LICENSE.txt\"> University of Utah Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The University of Utah Public License is a non-free license because it does "
 "not allow commercial redistribution.  It also purports to restrict "
@@ -3065,6 +3543,7 @@
 "alcuni paesi; è eccessivo anche il solo menzionarle."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The use of this license by the University of Utah exemplifies a <a href="
 "\"http://www.colorado.edu/Sociology/gimenez/papers/keptu.html\";>dangerous "
@@ -3077,6 +3556,7 @@
 "conoscenza</a> invece che renderla pubblica."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "If a university tries to impose a license like this on the software you are "
 "writing, don't give up hope.  <a href=\"/philosophy/university.html\">With "
@@ -3089,14 +3569,17 @@
 "università</a> troppo interessati al guadagno."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid "The earlier you raise the issue, the better."
 msgstr "Sollevate il problema il prima possibile."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "YaST License"
 msgstr "La Licenza di YaST"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free software license.  The license prohibits distribution for "
 "a fee, and that makes it impossible for the software to be included in the "
@@ -3109,6 +3592,7 @@
 "organizzazioni come la FSF. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "There may be another problem in section 2a, but a word seems to be missing "
 "there, so it is hard to be sure what meaning is really intended."
@@ -3118,6 +3602,7 @@
 "veramente dire. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "(The YaST software itself no longer uses this non-free YaST license; "
 "happily, it is now free software, released under the GNU GPL.)"
@@ -3126,15 +3611,18 @@
 "libero sotto licenza GNU GPL)."
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "<a id=\"DocumentationLicenses\">Licenses For Documentation</a>"
 msgstr "<a id=\"DocumentationLicenses\">Licenze per la documentazione</a>"
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "<a id=\"FreeDocumentationLicenses\">Free Documentation Licenses</a>"
 msgstr ""
 "<a id=\"FreeDocumentationLicenses\">Licenze per documentazione libera</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses qualify as <a href=\"/philosophy/free-doc.html"
 "\">free documentation</a> licenses.</strong>"
@@ -3143,12 +3631,14 @@
 "doc.html\">licenze per documentazione libera</a>.</strong>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FDL\" href=\"/licenses/fdl.html\"> GNU Free Documentation License</a>"
 msgstr ""
 "<a id=\"FDL\" href=\"/licenses/fdl.html\"> GNU Free Documentation License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a license intended for use on copylefted free documentation.  We "
 "plan to adopt it for all GNU manuals.  It is also suitable for other kinds "
@@ -3161,6 +3651,7 @@
 "solo a lavori testuali  (&ldquo;libri&rdquo;)."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ACDL\" href=\"http://fedoraproject.org/wiki/Licensing/";
 "Common_Documentation_License\"> Apple's Common Documentation License, "
@@ -3171,6 +3662,7 @@
 "versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a Free Documentation license that is incompatible with the GNU FDL.  "
 "It is incompatible because Section&nbsp;(2c) says &ldquo;You add no other "
@@ -3184,6 +3676,7 @@
 "Documentation."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FreeBSDDL\" href=\"http://www.freebsd.org/copyright/freebsd-doc-";
 "license.html\"> FreeBSD Documentation License</a>"
@@ -3192,6 +3685,7 @@
 "license.html\">La Licenza FreeBSD Documentation</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a permissive non-copyleft free documentation license that is "
 "compatible with the GNU FDL."
@@ -3200,6 +3694,7 @@
 "compatibile con la GNU FDL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"RealOPL\" href=\"http://opencontent.org/openpub/\";> Open Publication "
 "License, Version 1.0</a>"
@@ -3208,6 +3703,7 @@
 "Publication, versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license <strong>can</strong> be used as a free documentation license.  "
 "It is a copyleft free documentation license <strong>provided</strong> the "
@@ -3224,6 +3720,7 @@
 "ogni caso, è incompatibile con la GNU FDL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This creates a practical pitfall in using or recommending this license: if "
 "you recommend &ldquo;Use the Open Publication License, Version 1.0 but don't "
@@ -3240,6 +3737,7 @@
 "seguire lo stesso il vostro consiglio. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Likewise, if you use this license without either of the options to make your "
 "manual free, someone else might decide to imitate you, then change his or "
@@ -3252,6 +3750,7 @@
 "di un dettaglio. Il risultato è che renderebbe il suo manuale non libero. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Thus, while manuals published under this license do qualify as free "
 "documentation if neither license option was used, it is better to use the "
@@ -3264,6 +3763,7 @@
 "qualcun altro all'errore. "
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is not the same as the <a href=\"#OCL\">Open "
 "Content License</a>.  These two licenses are frequently confused, as the "
@@ -3280,6 +3780,7 @@
 "che si comprenda quello che state dicendo. "
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid ""
 "<a id=\"NonFreeDocumentationLicenses\">Non-Free Documentation Licenses</a>"
 msgstr ""
@@ -3287,6 +3788,7 @@
 "libera</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<strong>The following licenses <em>do not qualify</em> as free documentation "
 "licenses:</strong>"
@@ -3295,6 +3797,7 @@
 "documentazione libera:</strong>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"OCL\" href=\"http://opencontent.org/opl.shtml\";> Open Content "
 "License, Version 1.0</a>"
@@ -3303,6 +3806,7 @@
 "Content, versione 1.0</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This license does not qualify as free, because there are restrictions on "
 "charging money for copies.  We recommend you do not use this license."
@@ -3312,6 +3816,7 @@
 "licenza."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is not the same as the <a href=\"#RealOPL"
 "\">Open Publication License</a>.  The practice of abbreviating &ldquo;Open "
@@ -3328,6 +3833,7 @@
 "completo per essere sicuri che si comprenda quello che state dicendo. "
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"OpenDirectory\" href=\"http://dmoz.org/license.html\";> Open "
 "Directory License (aka dmoz.org License)</a>"
@@ -3336,6 +3842,7 @@
 "Open Directory (nota anche come Licenza dmoz.org)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is not a free documentation license.  The primary problems are that "
 "your right to redistribute any given version is not permanent and that it "
@@ -3348,6 +3855,7 @@
 "controllare, pratica troppo restrittiva per la libertà dell'utente stesso. "
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid ""
 "<a id=\"OtherLicenses\">Licenses for Works of Practical Use Besides Software "
 "and Documentation</a>"
@@ -3356,10 +3864,12 @@
 "documentazione</a>"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"/licenses/gpl.html\"> GNU General Public License</a>"
 msgstr "<a href=\"/licenses/gpl.html\"> GNU General Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The GNU GPL <strong>can</strong> be used for general data which is not "
 "software, as long as one can determine what the definition of &ldquo;source "
@@ -3374,10 +3884,12 @@
 "criteri analoghi alla GPL."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"/licenses/fdl.html\"> GNU Free Documentation License</a>"
 msgstr "<a href=\"/licenses/fdl.html\"> GNU Free Documentation License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The GNU FDL is recommended for textbooks and teaching materials for all "
 "topics.  (&ldquo;Documentation&rdquo; simply means textbooks and other "
@@ -3392,14 +3904,20 @@
 "fonriscono informazioni di uso pratico."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
+#| "\"> Creative Commons Attribution 2.0 license</a> (a.k.a. CC-BY)"
 msgid ""
 "<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
-"\"> Creative Commons Attribution 2.0 license</a> (a.k.a. CC-BY)"
+"\"> Creative Commons Attribution 2.0 license</a> (a.k.a. CC&nbsp;BY)"
 msgstr ""
 "<a id=\"ccby\" href=\"http://creativecommons.org/licenses/by/2.0/legalcode";
 "\"> Creative Commons Attribution 2.0 license</a> (CC-BY)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  Please don't use it for software or "
@@ -3411,6 +3929,7 @@
 "documentazione, poiché è incompatibile con la GNU GPL e la GNU FDL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Creative Commons publishes many licenses which are very different.  "
 "Therefore, to say that a work &ldquo;uses a Creative Commons license&rdquo; "
@@ -3428,16 +3947,23 @@
 "Commons&rdquo; per un certo lavoro, chiedete immediatamente quale."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccbysa\" href=\"http://creativecommons.org/licenses/by-sa/2.0/";
+#| "legalcode\"> Creative Commons Attribution-Sharealike 2.0 license</a> (a.k."
+#| "a. CC-BY-SA)"
 msgid ""
 "<a id=\"ccbysa\" href=\"http://creativecommons.org/licenses/by-sa/2.0/";
 "legalcode\"> Creative Commons Attribution-Sharealike 2.0 license</a> (a.k.a. "
-"CC-BY-SA)"
+"CC&nbsp;BY-SA)"
 msgstr ""
 "<a id=\"ccbysa\" href=\"http://creativecommons.org/licenses/by-sa/2.0/";
 "legalcode\"> Creative Commons Attribution-Sharealike 2.0 license</a> (CC-BY-"
 "SA)"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
 "works, and educational works.  Please don't use it for software or "
@@ -3449,6 +3975,7 @@
 "documentazione, poiché è incompatibile con la GNU GPL e la GNU FDL."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Please <a href=\"#which-cc\">be specific about which Creative Commons "
 "license is being used</a>."
@@ -3457,12 +3984,14 @@
 "a> state discutendo."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"dsl\" href=\"/licenses/dsl.html\"> Design Science License (DSL)</a>"
 msgstr ""
 "<a id=\"dsl\" href=\"/licenses/dsl.html\"> Design Science License (DSL)</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free and copyleft license meant for general data.  Please don't "
 "use it for software or documentation, since it is incompatible with the GNU "
@@ -3473,6 +4002,7 @@
 "GNU GPL e la GNU FDL; ma è accettabile usarla per altri tipi di dati."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FreeArt\" href=\"http://artlibre.org/licence/lalgb.html\";> Free Art "
 "License</a>"
@@ -3481,6 +4011,7 @@
 "License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free and copyleft license meant for artistic works.  It permits "
 "commercial distribution, but any larger work including the copylefted work "
@@ -3493,10 +4024,12 @@
 "documentazione, poiché è incompatibile con la GNU GPL e la GNU FDL."
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "<a id=\"Fonts\">Licenses for Fonts</a>"
 msgstr "<a id=\"Fonts\">Licenze per caratteri</a> (font)"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "The licenses below apply to an instantation of a design in a computer file, "
 "not the artistic design.  As far as we know, an implementation of a design "
@@ -3510,6 +4043,7 @@
 "della giurisdizione."
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The GNU GPL <strong>can</strong> be used for fonts.  However, note that it "
 "does not permit embedding the font in a document unless that document is "
@@ -3526,6 +4060,7 @@
 "\">articolo esplicativo</a>."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Arphic\" href=\"http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-";
 "truetype/LICENSE\"> Arphic Public License</a>"
@@ -3534,6 +4069,7 @@
 "truetype/LICENSE\"> Arphic Public License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a copyleft free software license, incompatible with the GPL. Its "
 "normal use is for fonts, and in that use, the incompatibility does not cause "
@@ -3544,6 +4080,7 @@
 "problemi."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"SILOFL\" href=\"http://scripts.sil.org/OFL_web\";> SIL Open Font "
 "License 1.1</a>"
@@ -3552,6 +4089,7 @@
 "License 1.1</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The Open Font License (including its original release, version 1.0)  is a "
 "free copyleft license for fonts.  Its only unusual requirement is that fonts "
@@ -3568,12 +4106,14 @@
 "dell'ambito dei caratteri."
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid ""
 "<a id=\"OpinionLicenses\">Licenses for Works of Opinion and Judgment</a>"
 msgstr ""
 "<a id=\"OpinionLicenses\">Licenze per lavori di opinione e commenti</a>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Works that express someone's opinion&mdash;memoirs, editorials, and so "
 "on&mdash;serve a fundamentally different purpose than works for practical "
@@ -3594,6 +4134,7 @@
 "interventi pubblici."
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Because so many licenses meet these criteria, we cannot list them all.  If "
 "you are looking for one to use yourself, however, there are two that we "
@@ -3604,6 +4145,7 @@
 "suggerimenti:"
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GNUVerbatim\" href=\"/licenses/licenses.html#VerbatimCopying\">GNU "
 "Verbatim Copying License</a>"
@@ -3612,28 +4154,47 @@
 "Verbatim Copying License</a>"
 
 # type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the license used throughout the GNU and FSF web sites.  It is "
+#| "very simple, and especially well-suited to written works."
 msgid ""
-"This is the license used throughout the GNU and FSF web sites.  It is very "
-"simple, and especially well-suited to written works."
+"This is the license used throughout the GNU web site.  It is very simple, "
+"and especially well-suited to written works."
 msgstr ""
 "Questa licenza è usata nei siti di GNU e FSF. E' molto semplice, e "
 "particolarmente adatta a lavori scritti."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
+#| "legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-"
+#| "BY-ND)</a>"
 msgid ""
 "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
-"legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-BY-"
-"ND)</a>"
+"legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. "
+"CC&nbsp;BY-ND)</a>"
 msgstr ""
 "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
 "legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (CC-BY-ND)</a>"
 
 # type: Content of: <dl><dd><p>
-msgid ""
-"This license provides much the same permissions as our verbatim copying "
-"license, but it's much more detailed.  We particularly recommend it for "
-"audio and/or video works of opinion.  Please <a href=\"#which-cc\">be "
-"specific about which Creative Commons license is being used</a>."
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license provides much the same permissions as our verbatim copying "
+#| "license, but it's much more detailed.  We particularly recommend it for "
+#| "audio and/or video works of opinion.  Please <a href=\"#which-cc\">be "
+#| "specific about which Creative Commons license is being used</a>."
+msgid ""
+"This is the license used throughout the FSF web site.  This license provides "
+"much the same permissions as our verbatim copying license, but it's much "
+"more detailed.  We particularly recommend it for audio and/or video works of "
+"opinion.  Please <a href=\"#which-cc\">be specific about which Creative "
+"Commons license is being used</a>."
 msgstr ""
 "Questa licenza dà circa gli stessi permessi della nostra licenza di copia "
 "letterale, ma è molto più dettagliata. La consigliamo per lavori di 
opinione "
@@ -3641,6 +4202,7 @@
 "Creative Commons</a> state discutendo."
 
 # type: Content of: outside any tag (error?)
+#. type: Content of: outside any tag (error?)
 msgid ""
 "<strong><a href=\"/licenses/licenses.html\">More about licenses.</a></strong>"
 msgstr ""
@@ -3649,16 +4211,43 @@
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
+#. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
+#| "contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF.  <br /> Please send broken links and other corrections "
-"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
+"contact</a> the FSF."
+msgstr ""
+"Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a "
+"href=\"mailto:address@hidden";>address@hidden</a>. Ci sono anche <a href=\"/"
+"contact/\">altri modi di contattare</a> la FSF.  <br /> Inviate segnalazioni "
+"di link non funzionanti e altre correzioni o suggerimenti relativi alle "
+"pagine web a <a href=\"mailto:address@hidden";>address@hidden</a>. "
+"Grazie."
+
+# type: Content of: <div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
+#| "contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>."
+msgid ""
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 "Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a "
 "href=\"mailto:address@hidden";>address@hidden</a>. Ci sono anche <a href=\"/"
@@ -3668,6 +4257,7 @@
 "Grazie."
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and submitting "
@@ -3679,18 +4269,28 @@
 "pagine di questo sito contattate il <a href=\"http://savannah.gnu.org/";
 "projects/www-it/\">gruppo dei traduttori italiani</a>."
 
-# type: Content of: <div><p>
+#. type: Content of: <div><p>
+msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
+#| "legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (a.k.a. CC-"
+#| "BY-ND)</a>"
 msgid ""
-"Copyright &copy; 2008 Free Software Foundation, Inc.  <br /> Verbatim "
-"copying and distribution of this entire article is permitted in any medium "
-"without royalty provided this notice is preserved."
-msgstr ""
-"Copyright &copy; 2008 Free Software Foundation, Inc.  <br /> La copia "
-"letterale e la distribuzione di questa pagina nella sua integrità sono "
-"permesse con qualsiasi mezzo, a condizione che questa nota sia riprodotta."
+"This page is licensed under a <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a>."
+msgstr ""
+"<a id=\"ccbynd\" href=\"http://creativecommons.org/licenses/by-nd/3.0/";
+"legalcode\">Creative Commons Attribution-NoDerivs 3.0 license (CC-BY-ND)</a>"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 "Tradotto  originariamente da Christopher R. Gabriel. Modifiche successive di "
@@ -3698,9 +4298,145 @@
 
 # type: Content of: <div><p>
 #. timestamp start
+#. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
 # type: Content of: <div><h4>
+#. type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "Traduzioni di questa pagina"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0"
+#~ "\">Educational Community License 2.0</a>"
+#~ msgstr ""
+#~ "<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0"
+#~ "\">Educational Community License 2.0</a>"
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/";
+#~ "opensource/IPL.html\"> Interbase Public License, Version 1.0</a>"
+#~ msgstr ""
+#~ "<a id=\"IPL\" href=\"http://www.borland.com/devsupport/interbase/";
+#~ "opensource/IPL.html\"> La Licenza Pubblica Interbase, versione 1.0</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This is a free software license that is essentially the same as the "
+#~ "Mozilla Public License, Version 1.1.  Like the MPL, the IPL has some "
+#~ "complex restrictions that make it incompatible with the GNU GPL.  That "
+#~ "is, a module covered by the GPL and a module covered by the IPL cannot "
+#~ "legally be linked together.  We urge you not to use the IPL for this "
+#~ "reason."
+#~ msgstr ""
+#~ "Questa è una licenza per software libero che è essenzialmente uguale 
alla "
+#~ "Licenza Pubblica Mozilla, versione 1.1. Come la MPL, la IPL ha alcune "
+#~ "restrizioni complesse che la rendono incompatibile con la GNU GPL. Quindi "
+#~ "un modulo rilasciato con licenza GPL e uno con licenza IPL non possono "
+#~ "essere legalmente uniti assieme. Vi invitiamo a non usare la IPL per "
+#~ "questo motivo."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public "
+#~ "License (Ms-LPL)</a>"
+#~ msgstr ""
+#~ "<a id=\"Ms-LPL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedpubliclicense.mspx\">Microsoft Limited Public "
+#~ "License (Ms-LPL)</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This license is non-free because of section 3(F), which requires that any "
+#~ "modified software you make from the original code must run on Windows.  "
+#~ "The <a href=\"#ms-pl\">Microsoft Public License</a> does not have this "
+#~ "restriction."
+#~ msgstr ""
+#~ "Questa licenza non è libera a causa della sezione 3(F), che richiede che "
+#~ "qualsiasi versione modificata debba essere eseguibile sotto Windows. La "
+#~ "<a href=\"#ms-pl\">Microsoft Public License</a> non ha questa restrizione."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited "
+#~ "Reciprocal License (Ms-LRL)</a>"
+#~ msgstr ""
+#~ "<a id=\"Ms-LRL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/limitedreciprocallicense.mspx\">Microsoft Limited "
+#~ "Reciprocal License (Ms-LRL)</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This license is non-free because of section 3(G), which requires that any "
+#~ "modified software you make from the original code must run on Windows.  "
+#~ "The <a href=\"#ms-rl\">Microsoft Reciprocal License</a> does not have "
+#~ "this restriction."
+#~ msgstr ""
+#~ "Questa licenza non è libera a causa della sezione 3(G), che richiede che "
+#~ "qualsiasi versione modificata debba essere eseguibile sotto Windows. La "
+#~ "<a href=\"#ms-rl\">Microsoft Reciprocal License</a> non ha questa "
+#~ "restrizione."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
+#~ msgstr ""
+#~ "<a id=\"Ms-RL\" href=\"http://www.microsoft.com/resources/sharedsource/";
+#~ "licensingbasics/referencelicense.mspx\">Microsoft Reference License</a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This is a non-free license: you are not allowed to modify the software at "
+#~ "all, and you are only allowed to share it under very particular "
+#~ "circumstances."
+#~ msgstr ""
+#~ "Questa è una licenza non libera: non è possibile modificare il 
programma, "
+#~ "e lo si può condividere solo in casi molto particolari."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
+#~ "bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</"
+#~ "a>"
+#~ msgstr ""
+#~ "<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
+#~ "bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</"
+#~ "a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This license is non-free because it places various limitations on the "
+#~ "kinds of modifications you can make.  For example, your modified software "
+#~ "must run on Wince, and you are required to provide end user support for "
+#~ "your software."
+#~ msgstr ""
+#~ "Questa licenza è non libera perché limita le modifiche che si possono "
+#~ "apportare. Ad esempio, il software modificato deve essere eseguibile su "
+#~ "Wince, e si è obbligati a fornire supporto agli utenti del proprio "
+#~ "software."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
+#~ "<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/";
+#~ "site/docs/NASA_Open_Source_Agreement_1.3.txt\"> NASA Open Source "
+#~ "Agreement</a>"
+#~ msgstr ""
+#~ "<a id=\"NASA\" href=\"http://opensource.arc.nasa.gov/static/opensource/";
+#~ "site/docs/NASA_Open_Source_Agreement_1.3.txt\"> NASA Open Source "
+#~ "Agreement</a>"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2008 Free Software Foundation, Inc.  <br /> Verbatim "
+#~ "copying and distribution of this entire article is permitted in any "
+#~ "medium without royalty provided this notice is preserved."
+#~ msgstr ""
+#~ "Copyright &copy; 2008 Free Software Foundation, Inc.  <br /> La copia "
+#~ "letterale e la distribuzione di questa pagina nella sua integrità sono "
+#~ "permesse con qualsiasi mezzo, a condizione che questa nota sia riprodotta."

Index: philosophy/can-you-trust.es.html
===================================================================
RCS file: /web/www/www/philosophy/can-you-trust.es.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/can-you-trust.es.html    14 Nov 2010 01:27:48 -0000      1.19
+++ philosophy/can-you-trust.es.html    24 Jul 2011 16:35:59 -0000      1.20
@@ -267,11 +267,11 @@
 <div id="footer">
 
 <p>
-Por favor, envíe sus comentarios y preguntas sobre la <acronym title="Free
-Software Foundation">FSF</acronym> y el proyecto GNU a <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. También puede <a
-href="/contact/">contactar con la FSF por otros medios</a>.<br />Por favor,
-envíe enlaces rotos y otras correcciones o sugerencias a <a
+Por favor, envíe sus preguntas sobre la FSF y GNU a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. También dispone <a
+href="/contact/">de otros medios para contactar</a> con la FSF.
+<br />
+Por favor, envíe enlaces rotos y otras correcciones o sugerencias a <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 </p>
 
@@ -286,9 +286,9 @@
 <p>
 Copyright &copy; 2002, 2007 Richard Stallman
 </p>
-<p>Verbatim copying and distribution of this entire article are permitted
-worldwide, without royalty, in any medium, provided this notice, and the
-copyright notice, are preserved.
+<p>Está página está bajo una <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
+Creative Commons Atribución-SinDerivadas 3.0 Estados Unidos de América</a>.
 </p>
 
 
@@ -307,7 +307,7 @@
 <!-- timestamp start -->
 Última actualización: 
 
-$Date: 2010/11/14 01:27:48 $
+$Date: 2011/07/24 16:35:59 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/censoring-emacs.es.html
===================================================================
RCS file: /web/www/www/philosophy/censoring-emacs.es.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/censoring-emacs.es.html  29 Jul 2010 16:27:24 -0000      1.4
+++ philosophy/censoring-emacs.es.html  24 Jul 2011 16:35:59 -0000      1.5
@@ -8,8 +8,9 @@
 <h2>Censurando mi software</h2>
 
 <p>
-por <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a>
-<br /> [De Datamation, 1 de marzo de 1996]</p>
+Por <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a>
+<br />
+[Para Datamation, 1 de marzo de 1996]</p>
 
 <p>
 El verano pasado, unos inteligentes legisladores propusieron un proyecto de
@@ -104,12 +105,12 @@
 <div id="footer">
 
 <p>
-Por favor, envíe sus comentarios y preguntas sobre la <acronym title="Free
-Software Foundation">FSF</acronym> y el proyecto GNU a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>. También puede <a
-href="/contact/">contactar con la FSF por otros medios</a>. <br /> Por
-favor, envíe enlaces rotos y otras correcciones o sugerencias a<a
-href="mailto:address@hidden";><em>address@hidden</em></a>.
+Por favor, envíe sus preguntas sobre la FSF y GNU a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. También dispone <a
+href="/contact/">de otros medios para contactar</a> con la FSF.
+<br />
+Por favor, envíe enlaces rotos y otras correcciones o sugerencias a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 </p>
 
 <p>
@@ -121,9 +122,11 @@
 </p>
 
 <p>
-Copyright &copy; 1996 Richard Stallman <br /> Verbatim copying and
-distribution of this entire article is permitted in any medium without
-royalty provided this notice is preserved.
+Copyright &copy; 1996 Richard Stallman
+<br />
+Está página está bajo una <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
+Creative Commons Atribución-SinDerivadas 3.0 Estados Unidos de América</a>.
 </p>
 
 
@@ -141,7 +144,7 @@
 <!-- timestamp start -->
 Última actualizacion: 
 
-$Date: 2010/07/29 16:27:24 $
+$Date: 2011/07/24 16:35:59 $
 
 <!-- timestamp end -->
 </p>
@@ -160,7 +163,8 @@
 <!--  - if there is a translation team, you also have to add an alias -->
 <!--  to mail.gnu.org:/com/mailer/aliases -->
 <!-- Please also check you have the 2 letter language code right versus -->
-<!-- <URL:http://www.w3.org/WAI/ER/IG/ert/iso639.htm> -->
+<!-- <URL:http://www.w3.org/WAI/ER/IG/ert/iso639.htm>
+ -->
 <!-- Please use W3C normative character entities -->
 <ul class="translations-list">
 <!-- English -->

Index: philosophy/po/can-you-trust.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/can-you-trust.es.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/po/can-you-trust.es.po   24 Jul 2011 12:33:05 -0000      1.25
+++ philosophy/po/can-you-trust.es.po   24 Jul 2011 16:36:06 -0000      1.26
@@ -563,9 +563,9 @@
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
 "contact</a> the FSF."
 msgstr ""
-"Por favor, envíe sus preguntas sobre la FSF y GNU a <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. También dispone "
-"<a href=\"/contact/\">de otros medios para contactar</a> con la FSF."
+"Por favor, envíe sus preguntas sobre la FSF y GNU a <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a>. También dispone <a href=\"/contact/\">de "
+"otros medios para contactar</a> con la FSF."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -599,9 +599,8 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
-"Está página está bajo una <a rel=\"license\" href=\"http://creative";
-"commons.org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons "
-"Atribución-"
+"Está página está bajo una <a rel=\"license\" 
href=\"http://creativecommons.";
+"org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons Atribución-"
 "SinDerivadas 3.0 Estados Unidos de América</a>."
 
 # type: Content of: <div><div>

Index: philosophy/po/censoring-emacs.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/censoring-emacs.es.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/censoring-emacs.es.po 24 Jul 2011 12:33:05 -0000      1.4
+++ philosophy/po/censoring-emacs.es.po 24 Jul 2011 16:36:06 -0000      1.5
@@ -31,7 +31,8 @@
 msgid ""
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
-"Por <a href=\"http://www.stallman.org/\";><strong>Richard 
Stallman</strong></a>"
+"Por <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></"
+"a>"
 
 #. type: Content of: <p>
 msgid "[From Datamation, March 1 1996]"
@@ -243,9 +244,9 @@
 "\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
 "ways to contact</a> the FSF."
 msgstr ""
-"Por favor, envíe sus preguntas sobre la FSF y GNU a <a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>. También dispone <a href=\""
-"/contact/\">de otros medios para contactar</a> con la FSF."
+"Por favor, envíe sus preguntas sobre la FSF y GNU a <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a>. También dispone <a href=\"/contact/\">de "
+"otros medios para contactar</a> con la FSF."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -253,9 +254,8 @@
 "Please send broken links and other corrections (or suggestions) to <a href="
 "\"mailto:address@hidden";><em>address@hidden</em></a>."
 msgstr ""
-"Por favor, envíe enlaces rotos y otras correcciones o sugerencias a "
-"<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
-"a>."
+"Por favor, envíe enlaces rotos y otras correcciones o sugerencias a <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -271,7 +271,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <div><p>
-#| msgid "Censoring My Software, by Richard Stallman"
 msgid "Copyright &copy; 1996 Richard Stallman"
 msgstr "Copyright &copy; 1996 Richard Stallman"
 
@@ -281,9 +280,8 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
-"Está página está bajo una <a rel=\"license\" href=\"http://creative";
-"commons.org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons "
-"Atribución-"
+"Está página está bajo una <a rel=\"license\" 
href=\"http://creativecommons.";
+"org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons Atribución-"
 "SinDerivadas 3.0 Estados Unidos de América</a>."
 
 # type: Content of: <div><div>



reply via email to

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