www-commits
[Top][All Lists]
Advanced

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

www licenses/license-list.it.html licenses/po/l...


From: GNUN
Subject: www licenses/license-list.it.html licenses/po/l...
Date: Wed, 21 Nov 2012 09:29:26 +0000

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

Modified files:
        licenses       : license-list.it.html 
        licenses/po    : license-list.it-en.html license-list.it.po 
        philosophy     : words-to-avoid.it.html 
        philosophy/po  : words-to-avoid.it-en.html words-to-avoid.it.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.it.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it-en.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.99&r2=1.100
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.it.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it.po?cvsroot=www&r1=1.49&r2=1.50

Patches:
Index: licenses/license-list.it.html
===================================================================
RCS file: /web/www/www/licenses/license-list.it.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- licenses/license-list.it.html       14 Nov 2012 01:28:58 -0000      1.46
+++ licenses/license-list.it.html       21 Nov 2012 09:29:24 -0000      1.47
@@ -978,7 +978,7 @@
 di rispettare le leggi statunitensi sull'esportazione.</p></dd>
 
 
-<dt><a id="EPL" href="http://www.eclipse.org/legal/epl-v10.html";> Licenza
+<dt><a id="EPL" href="http://directory.fsf.org/wiki/License:EPLv1.0";> Licenza
 pubblica Eclipse, versione 1.0</a> <span class="anchor-reference-id">(<a
 href="#EPL">#EPL</a>)</span></dt>
 <dd>
@@ -990,9 +990,9 @@
 EPL.</p></dd>
 
 
-<dt><a id="EUPL" href="http://www.osor.eu/eupl";> Licenza Pubblica dell'Unione
-Europea (EUPL) versione 1.1</a> <span class="anchor-reference-id">(<a
-href="#EUPL">#EUPL</a>)</span></dt>
+<dt><a id="EUPL" href="http://directory.fsf.org/wiki/License:EUPLv1.1";> Licenza
+Pubblica dell'Unione Europea (EUPL) versione 1.1</a> <span
+class="anchor-reference-id">(<a href="#EUPL">#EUPL</a>)</span></dt>
 <dd>
 <p>Questa è una licenza di software libero. Di per sé, ha un copyleft
 paragonabile a quello della GPL. Tuttavia, permette ai licenziatari di
@@ -1020,9 +1020,8 @@
 condizioni della CeCILL, l'aggunta di quel modulo vi dà la possibilità di
 convertire l'intero programma a GPLv3+.  </p></dd>
 
-<dt><a id="IBMPL"
-href="http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html";>Licenza
-pubblica IBM, versione 1.0</a> <span class="anchor-reference-id">(<a
+<dt><a id="IBMPL" href="http://directory.fsf.org/wiki/License:IBMPLv1.0";> IBM
+Public License, versione 1.0</a> <span class="anchor-reference-id">(<a
 href="#IBMPL">#IBMPL</a>)</span></dt>
 <dd>
 <p>Questa è una licenza per software libero ma è sfortunatamente 
incompatibile
@@ -1030,9 +1029,8 @@
 applica.</p></dd>
 
 
-<dt><a id="josl"
-href="http://code.google.com/p/jabber-net/source/browse/branches/RELEASE_1_0/LICENSE.txt";>
-La Licenza Open Source di Jabber, versione 1.0</a> <span
+<dt><a id="josl" href="http://directory.fsf.org/wiki/License:JabberOSLv1.0";>
+Jabber Open Source License, versione 1.0</a> <span
 class="anchor-reference-id"> (<a href="#josl">#josl</a>)</span></dt>
 <dd>
 <p>La licenza è per software libero, incompatibile con la GPL. Permette il
@@ -1042,7 +1040,7 @@
 re-licenziamento sotto GPL. Perciò non è compatibile.</p></dd>
 
 
-<dt><a id="LPPL-1.3a" href="http://www.latex-project.org/lppl/lppl-1-3a.txt";> 
La
+<dt><a id="LPPL-1.3a" href="http://directory.fsf.org/wiki/License:LPPLv1.3a";> 
La
 licenza pubblica del Progetto LaTeX 1.3a</a> <span
 class="anchor-reference-id"> (<a href="#LPPL-1.3a">#LPPL-1.3a</a>)</span></dt>
 <dd>
@@ -1053,7 +1051,7 @@
 devono includere una copia o un collegamento alla versione originale.</p></dd>
 
 
-<dt><a id="LPPL-1.2" href="http://www.latex-project.org/lppl/lppl-1-2.txt";> La
+<dt><a id="LPPL-1.2" href="http://directory.fsf.org/wiki/License:LPPLv1.2";> La
 licenza pubblica del Progetto LaTeX 1.2</a> <span
 class="anchor-reference-id"> (<a href="#LPPL-1.2">#LPPL-1.2</a>)</span></dt>
 <dd>
@@ -1100,9 +1098,10 @@
 della LPPL.</p></dd>
 
 
-<dt><a id="lucent102" href="http://plan9.bell-labs.com/plan9dist/license.html";>
-Lucent Public License Version 1.02 (Plan 9 license)</a> <span
-class="anchor-reference-id"> (<a href="#lucent102">#lucent102</a>)</span></dt>
+<dt><a id="lucent102"
+href="http://directory.fsf.org/wiki/License:LucentPLv1.02";> Lucent Public
+License Version 1.02 (Plan 9 license)</a> <span class="anchor-reference-id">
+(<a href="#lucent102">#lucent102</a>)</span></dt>
 <dd>
 <p>Questa è una licenza di software libero, ma è incompatibile con la GNU GPL
 per la scelta della legge di riferimento. Non la consigliamo per nuovo
@@ -1110,8 +1109,8 @@
 sotto questa licenza.</p></dd>
 
 
-<dt><a id="ms-pl" 
href="https://www.microsoft.com/en-us/openness/licenses.aspx";>
-Microsoft Public License (Ms-PL)</a> <span class="anchor-reference-id">(<a
+<dt><a id="ms-pl" href="http://directory.fsf.org/wiki/License:MsPL";> Microsoft
+Public License (Ms-PL)</a> <span class="anchor-reference-id">(<a
 href="#ms-pl">#ms-pl</a>)</span></dt>
 <dd>
 <p>Questa è una licenza di software libero; ha un copyleft che non è forte, 
ma
@@ -1119,8 +1118,7 @@
 della Ms-PL.</p></dd>
 
 
-<dt><a id="ms-rl"
-href="http://www.microsoft.com/opensource/licenses.mspx#Ms-RL";> Microsoft
+<dt><a id="ms-rl" href="http://directory.fsf.org/wiki/License:MsRL";> Microsoft
 Reciprocal License (Ms-RL)</a> <span class="anchor-reference-id">(<a
 href="#ms-rl">#ms-rl</a>)</span></dt>
 <dd>
@@ -1130,8 +1128,8 @@
 questo motivo sconsigliamo  l'utilizzo della Ms-RL.</p></dd>
 
 
-<dt><a id="MPL" href="http://www.mozilla.org/MPL/MPL-1.1.html";> La Licenza
-Pubblica Mozilla (MPL) versione 1.1</a> <span
+<dt><a id="MPL" href="http://directory.fsf.org/wiki/License:MPLv1.1";> Licenza
+Pubblica Mozilla (MPL), versione 1.1</a> <span
 class="anchor-reference-id">(<a href="#MPL">#MPL</a>)</span></dt>
 <dd>
 <p>Questa è una licenza per software libero che non ha un forte copyleft;
@@ -1152,7 +1150,7 @@
 href="#MPL-2.0">sezione dedicata</a>.</p></dd>
 
 
-<dt><a id="NOSL" href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";> La
+<dt><a id="NOSL" href="http://directory.fsf.org/wiki/License:NOSLv1.0";> La
 Licenza Open Source di Netizen (NOSL), versione 1.0</a> <span
 class="anchor-reference-id">(<a href="#NOSL">#NOSL</a>)</span></dt>
 <dd>
@@ -1164,8 +1162,8 @@
 motivo.</p></dd>
 
 
-<dt><a id="NPL" href="http://www.mozilla.org/MPL/NPL-1.1.html";> La Licenza
-Pubblica Netscape (NPL)</a>, versioni 1.0 e 1.1 <span
+<dt><a id="NPL" href="http://directory.fsf.org/wiki?title=License:NPLv1.1";> La
+Licenza Pubblica Netscape (NPL)</a>, versioni 1.0 e 1.1 <span
 class="anchor-reference-id">(<a href="#NPL">#NPL</a>)</span></dt>
 <dd>
 <p>Questa è una licenza per software libero, con un debole copyleft,
@@ -1177,16 +1175,17 @@
 invitiamo a non utilizzare la NPL. </p></dd>
 
 
-<dt><a id="Nokia" href="http://sw.nokia.com/tools/LICENSE.txt";> La Licenza 
Nokia
-Open Source</a> <span class="anchor-reference-id">(<a
+<dt><a id="Nokia" href="http://directory.fsf.org/wiki/License:NokOSv1.0a";> La
+Licenza Nokia Open Source</a> <span class="anchor-reference-id">(<a
 href="#Nokia">#Nokia</a>)</span></dt>
 <dd>
 <p>Questa licenza è simile alla Licenza Pubblica Mozilla versione 1: una
 licenza per software libero incompatibile con la GNU GPL. </p></dd>
 
 
-<dt><a id="oldOpenLDAP"> La vecchia licenza di OpenLDAP, versione 2.3</a> <span
-class="anchor-reference-id"> (<a
+<dt><a id="oldOpenLDAP"
+href="http://directory.fsf.org/wiki/License:OpenLDAPv2.3";> Vecchia licenza
+di OpenLDAP, versione 2.3</a> <span class="anchor-reference-id"> (<a
 href="#oldOpenLDAP">#oldOpenLDAP</a>)</span></dt>
 <dd>
 <p>Questa è una licenza per software libero permissiva, senza copyleft che
@@ -1199,7 +1198,7 @@
 programmi rilasciati sotto questa licenza. </p></dd>
 
 <!-- Published primarily by www.opensource.org -->
-<dt><a id="OSL" href="http://www.opensource.org/licenses/osl-3.0.php";> Open
+<dt><a id="OSL" href="http://directory.fsf.org/wiki/License:OSLv3.0";> Open
 Software License, tutte le versioni fino alla 3.0</a> <span
 class="anchor-reference-id">(<a href="#OSL">#OSL</a>)</span></dt>
 <dd>
@@ -1221,8 +1220,9 @@
 utilizzare programmi rilasciati sotto questa licenza. </p></dd>
 
 
-<dt><a id="OpenSSL" href="http://www.sdisw.com/openssl.htm";> OpenSSL 
license</a>
-<span class="anchor-reference-id"> (<a 
href="#OpenSSL">#OpenSSL</a>)</span></dt>
+<dt><a id="OpenSSL" href="http://directory.fsf.org/wiki/License:OpenSSL";>
+OpenSSL license</a> <span class="anchor-reference-id"> (<a
+href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
 <p>La licenza di OpenSSL unisce due licenze, una delle quali è la licenza di
 SSLeay.  Dovete seguirle entrambe. La combinazione è una licenza di software
@@ -1235,8 +1235,8 @@
 e applicazioni che lavorano con OpenSSL.</p></dd>
 
 
-<dt><a id="Phorum" href="http://phorum.org/license.txt";> La licenza Phorum,
-versione 2.0</a> <span class="anchor-reference-id"> (<a
+<dt><a id="Phorum" href="http://directory.fsf.org/wiki/License:Phorum2.0";>
+Phorum License, Version 2.0</a> <span class="anchor-reference-id"> (<a
 href="#Phorum">#Phorum</a>)</span></dt>
 <dd>
 <p>Questa è una licenza per software libero ma è incompatibile con la <a
@@ -1244,8 +1244,8 @@
 la GPL.</p></dd>
 
 
-<dt><a id="PHP-3.01" href="http://www.php.net/license/3_01.txt";> La Licenza 
PHP,
-versione 3.01</a> <span class="anchor-reference-id"> (<a
+<dt><a id="PHP-3.01" href="http://directory.fsf.org/wiki/License:PHPv3.01";>
+Licenza PHP, versione 3.01</a> <span class="anchor-reference-id"> (<a
 href="#PHP-3.01">#PHP-3.01</a>)</span></dt>
 <dd>
 <p>Questa licenza è utilizzata da gran parte di PHP4. E' una licenza per
@@ -1256,10 +1256,9 @@
 estensioni di PHP.</p></dd>
 
 
-<dt><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> <span class="anchor-reference-id">
-(<a href="#PythonOld">#PythonOld</a>)</span></dt>
+<dt><a id="PythonOld" href="http://directory.fsf.org/wiki/License:Python1.6b1";>
+Licenza di Python 1.6b1 fino alla 2.0 e 2.1</a> <span
+class="anchor-reference-id"> (<a href="#PythonOld">#PythonOld</a>)</span></dt>
 <dd>
 <p>Questa è una licenza per software libero ma è incompatibile con la GNU
 GPL. Il problema principale è che questa licenza di Python è regolata alle
@@ -1267,8 +1266,8 @@
 permette.</p></dd>
 
 
-<dt><a id="QPL" href="http://doc.trolltech.com/3.0/license.html";> La Licenza
-Pubblica Q (QPL), versione 1.0</a> <span class="anchor-reference-id">(<a
+<dt><a id="QPL" href="http://directory.fsf.org/wiki/License:QPLv1.0";> Q Public
+License (QPL), versione 1.0</a> <span class="anchor-reference-id">(<a
 href="#QPL">#QPL</a>)</span></dt>
 <dd>
 <p>Questa è una licenza per software libero senza permesso d'autore che è
@@ -1302,8 +1301,8 @@
 programma è rilasciato sotto licenza GNU GPL. </p></dd>
 
 
-<dt><a id="RPSL" href="https://helixcommunity.org/content/rpsl";> RealNetworks
-Public Source License (RPSL), Version 1.0</a> <span
+<dt><a id="RPSL" href="http://directory.fsf.org/wiki/License:RPSLv1.0";>
+RealNetworks Public Source License (RPSL), versione 1.0</a> <span
 class="anchor-reference-id">(<a href="#RPSL">#RPSL</a>)</span></dt>
 <dd>
 <p>La RPSL è una licenza di software libero incompatibile con la GPL per vari
@@ -1925,7 +1924,7 @@
 documentazione, poiché è incompatibile con la GNU GPL e la GNU FDL.</p>
 
 <p id="which-cc">
-<span class="anchor-reference-id">(<a href="#">#which-cc</a>)</span>
+<span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
 Creative Commons pubblica molte licenze, molto diverse tra loro. Quindi,
 dire che un lavoro è sotto &ldquo;licenza Creative Commons&rdquo; non spiega
 la questione fondamentale, cioè quale licenza vi si applica. Quando vedete
@@ -2108,7 +2107,7 @@
  <p><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2012/11/14 01:28:58 $
+$Date: 2012/11/21 09:29:24 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.it-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it-en.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- licenses/po/license-list.it-en.html 14 Nov 2012 01:28:59 -0000      1.29
+++ licenses/po/license-list.it-en.html 21 Nov 2012 09:29:25 -0000      1.30
@@ -1035,7 +1035,7 @@
 a condition that you must comply with United States export laws.</p></dd>
 
 
-<dt><a id="EPL" href="http://www.eclipse.org/legal/epl-v10.html";>
+<dt><a id="EPL" href="http://directory.fsf.org/wiki/License:EPLv1.0";>
     Eclipse Public License Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#EPL">#EPL</a>)</span></dt>
 <dd>
@@ -1047,7 +1047,7 @@
 program.</p></dd>
 
 
-<dt><a id="EUPL" href="http://www.osor.eu/eupl";>
+<dt><a id="EUPL" href="http://directory.fsf.org/wiki/License:EUPLv1.1";>
     European Union Public License (EUPL) version 1.1</a>
     <span class="anchor-reference-id">(<a href="#EUPL">#EUPL</a>)</span></dt>
 <dd>
@@ -1077,7 +1077,7 @@
 relicense it to GPLv3+.</p></dd>
 
 <dt><a id="IBMPL"
-       
href="http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html";>
+       href="http://directory.fsf.org/wiki/License:IBMPLv1.0";>
     IBM Public License, Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#IBMPL">#IBMPL</a>)</span></dt>
 <dd>
@@ -1086,7 +1086,7 @@
 
 
 <dt><a id="josl"
-       
href="http://code.google.com/p/jabber-net/source/browse/branches/RELEASE_1_0/LICENSE.txt";>
+       href="http://directory.fsf.org/wiki/License:JabberOSLv1.0";>
     Jabber Open Source License, Version 1.0</a>
     <span class="anchor-reference-id">
        (<a href="#josl">#josl</a>)</span></dt>
@@ -1098,7 +1098,7 @@
 under the GPL.  Therefore, it is not compatible.</p></dd>
 
 
-<dt><a id="LPPL-1.3a" href="http://www.latex-project.org/lppl/lppl-1-3a.txt";>
+<dt><a id="LPPL-1.3a" href="http://directory.fsf.org/wiki/License:LPPLv1.3a";>
     LaTeX Project Public License 1.3a</a>
     <span class="anchor-reference-id">
        (<a href="#LPPL-1.3a">#LPPL-1.3a</a>)</span></dt>
@@ -1110,7 +1110,7 @@
 unmodified version.</p></dd>
 
 
-<dt><a id="LPPL-1.2" href="http://www.latex-project.org/lppl/lppl-1-2.txt";>
+<dt><a id="LPPL-1.2" href="http://directory.fsf.org/wiki/License:LPPLv1.2";>
     LaTeX Project Public License 1.2</a>
     <span class="anchor-reference-id">
        (<a href="#LPPL-1.2">#LPPL-1.2</a>)</span></dt>
@@ -1157,7 +1157,7 @@
 <p>Note: These comments are for version 1.2 (3 Sep 1999) of the LPPL.</p></dd>
 
 
-<dt><a id="lucent102" href="http://plan9.bell-labs.com/plan9dist/license.html";>
+<dt><a id="lucent102" 
href="http://directory.fsf.org/wiki/License:LucentPLv1.02";>
     Lucent Public License Version 1.02 (Plan 9 license)</a>
     <span class="anchor-reference-id">
        (<a href="#lucent102">#lucent102</a>)</span></dt>
@@ -1169,7 +1169,7 @@
 
 
 <dt><a id="ms-pl"
-       href="https://www.microsoft.com/en-us/openness/licenses.aspx";>
+       href="http://directory.fsf.org/wiki/License:MsPL";>
     Microsoft Public License (Ms-PL)</a>
     <span class="anchor-reference-id">(<a href="#ms-pl">#ms-pl</a>)</span></dt>
 <dd>
@@ -1179,7 +1179,7 @@
 
 
 <dt><a id="ms-rl"
-       href="http://www.microsoft.com/opensource/licenses.mspx#Ms-RL";>
+       href="http://directory.fsf.org/wiki/License:MsRL";>
     Microsoft Reciprocal License (Ms-RL)</a>
     <span class="anchor-reference-id">(<a href="#ms-rl">#ms-rl</a>)</span></dt>
 <dd>
@@ -1190,7 +1190,7 @@
 reason.</p></dd>
 
 
-<dt><a id="MPL" href="http://www.mozilla.org/MPL/MPL-1.1.html";>
+<dt><a id="MPL" href="http://directory.fsf.org/wiki/License:MPLv1.1";>
      Mozilla Public License (MPL) version 1.1</a>
     <span class="anchor-reference-id">(<a href="#MPL">#MPL</a>)</span></dt>
 <dd>
@@ -1213,7 +1213,7 @@
 for details.</p></dd>
 
 
-<dt><a id="NOSL" href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";>
+<dt><a id="NOSL" href="http://directory.fsf.org/wiki/License:NOSLv1.0";>
     Netizen Open Source License (NOSL), Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#NOSL">#NOSL</a>)</span></dt>
 <dd>
@@ -1225,7 +1225,7 @@
 reason.</p></dd>
 
 
-<dt><a id="NPL" href="http://www.mozilla.org/MPL/NPL-1.1.html";>
+<dt><a id="NPL" href="http://directory.fsf.org/wiki?title=License:NPLv1.1";>
     Netscape Public License (NPL)</a>, versions 1.0 and 1.1
     <span class="anchor-reference-id">(<a href="#NPL">#NPL</a>)</span></dt>
 <dd>
@@ -1238,7 +1238,7 @@
 the NPL.</p></dd>
 
 
-<dt><a id="Nokia" href="http://sw.nokia.com/tools/LICENSE.txt";>
+<dt><a id="Nokia" href="http://directory.fsf.org/wiki/License:NokOSv1.0a";>
     Nokia Open Source License</a>
     <span class="anchor-reference-id">(<a href="#Nokia">#Nokia</a>)</span></dt>
 <dd>
@@ -1246,7 +1246,7 @@
 software license incompatible with the GNU GPL.</p></dd>
 
 
-<dt><a id="oldOpenLDAP">
+<dt><a id="oldOpenLDAP" 
href="http://directory.fsf.org/wiki/License:OpenLDAPv2.3";>
     Old OpenLDAP License, Version 2.3</a>
     <span class="anchor-reference-id">
        (<a href="#oldOpenLDAP">#oldOpenLDAP</a>)</span></dt>
@@ -1262,7 +1262,7 @@
 been released under this license.</p></dd>
 
 <!-- Published primarily by www.opensource.org -->
-<dt><a id="OSL" href="http://www.opensource.org/licenses/osl-3.0.php";>
+<dt><a id="OSL" href="http://directory.fsf.org/wiki/License:OSLv3.0";>
     Open Software License, all versions through 3.0</a>
     <span class="anchor-reference-id">(<a href="#OSL">#OSL</a>)</span></dt>
 <dd>
@@ -1285,7 +1285,7 @@
 have been released under this license.</p></dd>
 
 
-<dt><a id="OpenSSL" href="http://www.sdisw.com/openssl.htm";>
+<dt><a id="OpenSSL" href="http://directory.fsf.org/wiki/License:OpenSSL";>
     OpenSSL license</a>
     <span class="anchor-reference-id">
        (<a href="#OpenSSL">#OpenSSL</a>)</span></dt>
@@ -1302,7 +1302,7 @@
 work with OpenSSL.</p></dd>
 
 
-<dt><a id="Phorum" href="http://phorum.org/license.txt";>
+<dt><a id="Phorum" href="http://directory.fsf.org/wiki/License:Phorum2.0";>
     Phorum License, Version 2.0</a>
     <span class="anchor-reference-id">
        (<a href="#Phorum">#Phorum</a>)</span></dt>
@@ -1312,7 +1312,7 @@
 the license incompatible with the GPL.</p></dd>
 
 
-<dt><a id="PHP-3.01" href="http://www.php.net/license/3_01.txt";>
+<dt><a id="PHP-3.01" href="http://directory.fsf.org/wiki/License:PHPv3.01";>
     PHP License, Version 3.01</a>
     <span class="anchor-reference-id">
        (<a href="#PHP-3.01">#PHP-3.01</a>)</span></dt>
@@ -1327,7 +1327,7 @@
 
 
 <dt><a id="PythonOld"
-       href="http://www.handle.net/python_licenses/python1.6_9-5-00.html";>
+       href="http://directory.fsf.org/wiki/License:Python1.6b1";>
     License of Python 1.6b1 through 2.0 and 2.1</a>
     <span class="anchor-reference-id">
        (<a href="#PythonOld">#PythonOld</a>)</span></dt>
@@ -1338,7 +1338,7 @@
 this.</p></dd>
 
 
-<dt><a id="QPL" href="http://doc.trolltech.com/3.0/license.html";>
+<dt><a id="QPL" href="http://directory.fsf.org/wiki/License:QPLv1.0";>
     Q Public License (QPL), Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#QPL">#QPL</a>)</span></dt>
 <dd>
@@ -1372,7 +1372,7 @@
 
 
 <dt><a id="RPSL"
-       href="https://helixcommunity.org/content/rpsl";>
+       href="http://directory.fsf.org/wiki/License:RPSLv1.0";>
        RealNetworks Public Source License (RPSL), Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#RPSL">#RPSL</a>)</span></dt>
 <dd>
@@ -2043,7 +2043,7 @@
 and with the GNU FDL.</p>
 
 <p id="which-cc">
-<span class="anchor-reference-id">(<a href="#">#which-cc</a>)</span>
+<span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
 Creative Commons publishes many licenses which are
 very different.  Therefore, to say that a work &ldquo;uses a Creative
 Commons license&rdquo; is to leave the principal questions about the
@@ -2218,7 +2218,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/11/14 01:28:59 $
+$Date: 2012/11/21 09:29:25 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- licenses/po/license-list.it.po      21 Nov 2012 08:36:03 -0000      1.99
+++ licenses/po/license-list.it.po      21 Nov 2012 09:29:25 -0000      1.100
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-11-20 16:26-0500\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -2217,18 +2216,7 @@
 "di rispettare le leggi statunitensi sull'esportazione."
 
 # type: Content of: <dl><dt>
-# | <a [-id=\"MPL-2.0\"
-# | href=\"http://directory.fsf.org/wiki/License:MPLv2.0\";>Mozilla-]
-# | {+id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>
-# | Eclipse+} Public License [-(MPL) version 2.0</a>-] {+Version 1.0</a>+}
-# | <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#MPL-2.0\">#MPL-2.0</a>)</span>-]
-# | {+href=\"#EPL\">#EPL</a>)</span>+}
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"MPL-2.0\" href=\"http://directory.fsf.org/wiki/License:";
-#| "MPLv2.0\">Mozilla Public License (MPL) version 2.0</a> <span class="
-#| "\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
 "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id\">"
@@ -2255,15 +2243,7 @@
 "EPL."
 
 # type: Content of: <dl><dt>
-# | <a id=\"EUPL\" [-href=\"http://www.osor.eu/eupl\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:EUPLv1.1\";>+} European
-# | Union Public License (EUPL) version 1.1</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#EUPL\">#EUPL</a>)</span>
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"EUPL\" href=\"http://www.osor.eu/eupl\";> European Union Public "
-#| "License (EUPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a "
-#| "href=\"#EUPL\">#EUPL</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EUPL\" href=\"http://directory.fsf.org/wiki/License:EUPLv1.1\";> "
 "European Union Public License (EUPL) version 1.1</a> <span class=\"anchor-"
@@ -2330,18 +2310,7 @@
 "convertire l'intero programma a GPLv3+.  "
 
 # type: Content of: <dl><dt>
-# | <a [-id=\"MPL-2.0\"
-# | href=\"http://directory.fsf.org/wiki/License:MPLv2.0\";>Mozilla-]
-# | {+id=\"IBMPL\" href=\"http://directory.fsf.org/wiki/License:IBMPLv1.0\";>
-# | IBM+} Public [-License (MPL) version 2.0</a>-] {+License, Version
-# | 1.0</a>+} <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#MPL-2.0\">#MPL-2.0</a>)</span>-]
-# | {+href=\"#IBMPL\">#IBMPL</a>)</span>+}
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"MPL-2.0\" href=\"http://directory.fsf.org/wiki/License:";
-#| "MPLv2.0\">Mozilla Public License (MPL) version 2.0</a> <span class="
-#| "\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"IBMPL\" href=\"http://directory.fsf.org/wiki/License:IBMPLv1.0\";> "
 "IBM Public License, Version 1.0</a> <span class=\"anchor-reference-id\">(<a "
@@ -2362,18 +2331,7 @@
 "applica."
 
 # type: Content of: <dl><dt>
-# | <a [-id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";>
-# | Apple Public-] {+id=\"josl\"
-# | href=\"http://directory.fsf.org/wiki/License:JabberOSLv1.0\";> Jabber
-# | Open+} Source [-License (APSL), version 2</a>-] {+License, Version
-# | 1.0</a>+} <span [-class=\"anchor-reference-id\">(<a
-# | href=\"#apsl2\">#apsl2</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
-# | href=\"#josl\">#josl</a>)</span>+}
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"apsl2\" href=\"http://directory.fsf.org/wiki/License:APSLv2.0\";> "
-#| "Apple Public Source License (APSL), version 2</a> <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#apsl2\">#apsl2</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"josl\" href=\"http://directory.fsf.org/wiki/License:JabberOSLv1.0\";> "
 "Jabber Open Source License, Version 1.0</a> <span class=\"anchor-reference-id"
@@ -2399,16 +2357,7 @@
 "licenziamento sotto GPL. Perciò non è compatibile."
 
 # type: Content of: <dl><dt>
-# | <a id=\"LPPL-1.3a\"
-# | [-href=\"http://www.latex-project.org/lppl/lppl-1-3a.txt\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:LPPLv1.3a\";>+} LaTeX
-# | Project Public License 1.3a</a> <span class=\"anchor-reference-id\"> (<a
-# | href=\"#LPPL-1.3a\">#LPPL-1.3a</a>)</span>
-#. 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> <span class=\"anchor-reference-"
-#| "id\"> (<a href=\"#LPPL-1.3a\">#LPPL-1.3a</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"LPPL-1.3a\" href=\"http://directory.fsf.org/wiki/License:LPPLv1.3a";
 "\"> LaTeX Project Public License 1.3a</a> <span class=\"anchor-reference-id"
@@ -2434,16 +2383,7 @@
 "includere una copia o un collegamento alla versione originale."
 
 # type: Content of: <dl><dt>
-# | <a id=\"LPPL-1.2\"
-# | [-href=\"http://www.latex-project.org/lppl/lppl-1-2.txt\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:LPPLv1.2\";>+} LaTeX Project
-# | Public License 1.2</a> <span class=\"anchor-reference-id\"> (<a
-# | href=\"#LPPL-1.2\">#LPPL-1.2</a>)</span>
-#. 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> <span class=\"anchor-reference-id"
-#| "\"> (<a href=\"#LPPL-1.2\">#LPPL-1.2</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"LPPL-1.2\" href=\"http://directory.fsf.org/wiki/License:LPPLv1.2\";> "
 "LaTeX Project Public License 1.2</a> <span class=\"anchor-reference-id\"> "
@@ -2554,18 +2494,7 @@
 "della LPPL."
 
 # type: Content of: <dl><dt>
-# | <a id=\"lucent102\"
-# | [-href=\"http://plan9.bell-labs.com/plan9dist/license.html\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:LucentPLv1.02\";>+} Lucent
-# | Public License Version 1.02 (Plan 9 license)</a> <span
-# | class=\"anchor-reference-id\"> (<a
-# | href=\"#lucent102\">#lucent102</a>)</span>
-#. 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> <span "
-#| "class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</a>)</"
-#| "span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"lucent102\" href=\"http://directory.fsf.org/wiki/License:";
 "LucentPLv1.02\"> Lucent Public License Version 1.02 (Plan 9 license)</a> "
@@ -2591,16 +2520,7 @@
 "sotto questa licenza."
 
 # type: Content of: <dl><dt>
-# | <a id=\"ms-pl\"
-# | [-href=\"https://www.microsoft.com/en-us/openness/licenses.aspx\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:MsPL\";>+} Microsoft Public
-# | License (Ms-PL)</a> <span class=\"anchor-reference-id\">(<a
-# | href=\"#ms-pl\">#ms-pl</a>)</span>
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"ms-pl\" href=\"https://www.microsoft.com/en-us/openness/licenses.";
-#| "aspx\"> Microsoft Public License (Ms-PL)</a> <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#ms-pl\">#ms-pl</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ms-pl\" href=\"http://directory.fsf.org/wiki/License:MsPL\";> "
 "Microsoft Public License (Ms-PL)</a> <span class=\"anchor-reference-id\">(<a "
@@ -2622,16 +2542,7 @@
 "della Ms-PL."
 
 # type: Content of: <dl><dt>
-# | <a id=\"ms-rl\"
-# | [-href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-RL\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:MsRL\";>+} Microsoft
-# | Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id\">(<a
-# | href=\"#ms-rl\">#ms-rl</a>)</span>
-#. 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> <span class="
-#| "\"anchor-reference-id\">(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ms-rl\" href=\"http://directory.fsf.org/wiki/License:MsRL\";> "
 "Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id\">"
@@ -2655,18 +2566,7 @@
 "motivo sconsigliamo  l'utilizzo della Ms-RL."
 
 # type: Content of: <dl><dt>
-# | <a [-id=\"MPL-2.0\"
-# | href=\"http://directory.fsf.org/wiki/License:MPLv2.0\";>Mozilla-]
-# | {+id=\"MPL\" href=\"http://directory.fsf.org/wiki/License:MPLv1.1\";>
-# | Mozilla+} Public License (MPL) version [-2.0</a>-] {+1.1</a>+} <span
-# | class=\"anchor-reference-id\">(<a
-# | [-href=\"#MPL-2.0\">#MPL-2.0</a>)</span>-]
-# | {+href=\"#MPL\">#MPL</a>)</span>+}
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"MPL-2.0\" href=\"http://directory.fsf.org/wiki/License:";
-#| "MPLv2.0\">Mozilla Public License (MPL) version 2.0</a> <span class="
-#| "\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"MPL\" href=\"http://directory.fsf.org/wiki/License:MPLv1.1\";> "
 "Mozilla Public License (MPL) version 1.1</a> <span class=\"anchor-reference-"
@@ -2718,16 +2618,7 @@
 "href=\"#MPL-2.0\">sezione dedicata</a>."
 
 # type: Content of: <dl><dt>
-# | <a id=\"NOSL\"
-# | [-href=\"http://bits.netizen.com.au/licenses/NOSL/nosl.txt\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:NOSLv1.0\";>+} Netizen Open
-# | Source License (NOSL), Version 1.0</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#NOSL\">#NOSL</a>)</span>
-#. 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> <span class="
-#| "\"anchor-reference-id\">(<a href=\"#NOSL\">#NOSL</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"NOSL\" href=\"http://directory.fsf.org/wiki/License:NOSLv1.0\";> "
 "Netizen Open Source License (NOSL), Version 1.0</a> <span class=\"anchor-"
@@ -2753,15 +2644,7 @@
 "legalmente uniti assieme. Vi invitiamo a non usare la NOSL per questo motivo."
 
 # type: Content of: <dl><dt>
-# | <a id=\"NPL\" [-href=\"http://www.mozilla.org/MPL/NPL-1.1.html\";>-]
-# | {+href=\"http://directory.fsf.org/wiki?title=License:NPLv1.1\";>+} Netscape
-# | Public License (NPL)</a>, versions 1.0 and 1.1 <span
-# | class=\"anchor-reference-id\">(<a href=\"#NPL\">#NPL</a>)</span>
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"NPL\" href=\"http://www.mozilla.org/MPL/NPL-1.1.html\";> Netscape "
-#| "Public License (NPL)</a>, versions 1.0 and 1.1 <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#NPL\">#NPL</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"NPL\" href=\"http://directory.fsf.org/wiki?title=License:NPLv1.1\";> "
 "Netscape Public License (NPL)</a>, versions 1.0 and 1.1 <span class=\"anchor-"
@@ -2790,15 +2673,7 @@
 "non utilizzare la NPL. "
 
 # type: Content of: <dl><dt>
-# | <a id=\"Nokia\" [-href=\"http://sw.nokia.com/tools/LICENSE.txt\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";>+} Nokia Open
-# | Source License</a> <span class=\"anchor-reference-id\">(<a
-# | href=\"#Nokia\">#Nokia</a>)</span>
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"Nokia\" href=\"http://sw.nokia.com/tools/LICENSE.txt\";> Nokia "
-#| "Open Source License</a> <span class=\"anchor-reference-id\">(<a href="
-#| "\"#Nokia\">#Nokia</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Nokia\" href=\"http://directory.fsf.org/wiki/License:NokOSv1.0a\";> "
 "Nokia Open Source License</a> <span class=\"anchor-reference-id\">(<a href="
@@ -2818,19 +2693,7 @@
 "licenza per software libero incompatibile con la GNU GPL. "
 
 # type: Content of: <dl><dt>
-# | <a [-id=\"newOpenLDAP\"
-# | href=\"http://directory.fsf.org/wiki/License:OpenLDAPv2.7\";>-]
-# | {+id=\"oldOpenLDAP\"
-# | href=\"http://directory.fsf.org/wiki/License:OpenLDAPv2.3\";> Old+}
-# | OpenLDAP License, Version 2.[-7-]{+3+}</a> <span
-# | class=\"anchor-reference-id\"> (<a
-# | [-href=\"#newOpenLDAP\">#newOpenLDAP</a>)</span>-]
-# | {+href=\"#oldOpenLDAP\">#oldOpenLDAP</a>)</span>+}
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"newOpenLDAP\" href=\"http://directory.fsf.org/wiki/License:";
-#| "OpenLDAPv2.7\"> OpenLDAP License, Version 2.7</a> <span class=\"anchor-"
-#| "reference-id\"> (<a href=\"#newOpenLDAP\">#newOpenLDAP</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"oldOpenLDAP\" href=\"http://directory.fsf.org/wiki/License:";
 "OpenLDAPv2.3\"> Old OpenLDAP License, Version 2.3</a> <span class=\"anchor-"
@@ -2865,15 +2728,7 @@
 "programmi rilasciati sotto questa licenza. "
 
 # type: Content of: <dl><dt>
-# | <a id=\"OSL\" [-href=\"http://www.opensource.org/licenses/osl-3.0.php\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:OSLv3.0\";>+} Open Software
-# | License, all versions through 3.0</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#OSL\">#OSL</a>)</span>
-#. 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> <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#OSL\">#OSL</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"OSL\" href=\"http://directory.fsf.org/wiki/License:OSLv3.0\";> Open "
 "Software License, all versions through 3.0</a> <span class=\"anchor-"
@@ -2928,17 +2783,7 @@
 "utilizzare programmi rilasciati sotto questa licenza. "
 
 # type: Content of: <dl><dt>
-# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC
-# | License</a>-] {+id=\"OpenSSL\"
-# | href=\"http://directory.fsf.org/wiki/License:OpenSSL\";> OpenSSL
-# | license</a>+} <span [-class=\"anchor-reference-id\">(<a
-# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
-# | href=\"#OpenSSL\">#OpenSSL</a>)</span>+}
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\";> ISC "
-#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
-#| "a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"OpenSSL\" href=\"http://directory.fsf.org/wiki/License:OpenSSL\";> "
 "OpenSSL license</a> <span class=\"anchor-reference-id\"> (<a href=\"#OpenSSL"
@@ -2975,15 +2820,7 @@
 "e applicazioni che lavorano con OpenSSL."
 
 # type: Content of: <dl><dt>
-# | <a id=\"Phorum\" [-href=\"http://phorum.org/license.txt\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:Phorum2.0\";>+} Phorum
-# | License, Version 2.0</a> <span class=\"anchor-reference-id\"> (<a
-# | href=\"#Phorum\">#Phorum</a>)</span>
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"Phorum\" href=\"http://phorum.org/license.txt\";> Phorum License, "
-#| "Version 2.0</a> <span class=\"anchor-reference-id\"> (<a href=\"#Phorum"
-#| "\">#Phorum</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Phorum\" href=\"http://directory.fsf.org/wiki/License:Phorum2.0\";> "
 "Phorum License, Version 2.0</a> <span class=\"anchor-reference-id\"> (<a "
@@ -3005,15 +2842,7 @@
 "GPL."
 
 # type: Content of: <dl><dt>
-# | <a id=\"PHP-3.01\" [-href=\"http://www.php.net/license/3_01.txt\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:PHPv3.01\";>+} PHP License,
-# | Version 3.01</a> <span class=\"anchor-reference-id\"> (<a
-# | href=\"#PHP-3.01\">#PHP-3.01</a>)</span>
-#. 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> <span class=\"anchor-reference-id\"> (<a href="
-#| "\"#PHP-3.01\">#PHP-3.01</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"PHP-3.01\" href=\"http://directory.fsf.org/wiki/License:PHPv3.01\";> "
 "PHP License, Version 3.01</a> <span class=\"anchor-reference-id\"> (<a href="
@@ -3043,17 +2872,7 @@
 "estensioni di PHP."
 
 # type: Content of: <dl><dt>
-# | <a id=\"PythonOld\"
-# | [-href=\"http://www.handle.net/python_licenses/python1.6_9-5-00.html\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:Python1.6b1\";>+} License of
-# | Python 1.6b1 through 2.0 and 2.1</a> <span class=\"anchor-reference-id\">
-# | (<a href=\"#PythonOld\">#PythonOld</a>)</span>
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-#| "python1.6_9-5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a> "
-#| "<span class=\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</"
-#| "a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"PythonOld\" href=\"http://directory.fsf.org/wiki/License:";
 "Python1.6b1\"> License of Python 1.6b1 through 2.0 and 2.1</a> <span class="
@@ -3075,18 +2894,7 @@
 "dello Stato della Virginia, negli Stati Uniti, e la GPL non lo permette."
 
 # type: Content of: <dl><dt>
-# | <a [-id=\"MPL-2.0\"
-# | href=\"http://directory.fsf.org/wiki/License:MPLv2.0\";>Mozilla-]
-# | {+id=\"QPL\" href=\"http://directory.fsf.org/wiki/License:QPLv1.0\";> Q+}
-# | Public License [-(MPL) version 2.0</a>-] {+(QPL), Version 1.0</a>+} <span
-# | class=\"anchor-reference-id\">(<a
-# | [-href=\"#MPL-2.0\">#MPL-2.0</a>)</span>-]
-# | {+href=\"#QPL\">#QPL</a>)</span>+}
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"MPL-2.0\" href=\"http://directory.fsf.org/wiki/License:";
-#| "MPLv2.0\">Mozilla Public License (MPL) version 2.0</a> <span class="
-#| "\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"QPL\" href=\"http://directory.fsf.org/wiki/License:QPLv1.0\";> Q "
 "Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id\">"
@@ -3172,15 +2980,7 @@
 "programma è rilasciato sotto licenza GNU GPL. "
 
 # type: Content of: <dl><dt>
-# | <a id=\"RPSL\" [-href=\"https://helixcommunity.org/content/rpsl\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:RPSLv1.0\";>+} RealNetworks
-# | Public Source License (RPSL), Version 1.0</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#RPSL\">#RPSL</a>)</span>
-#. type: Content of: <dl><dt>
-#| msgid ""
-#| "<a id=\"RPSL\" href=\"https://helixcommunity.org/content/rpsl\";> "
-#| "RealNetworks Public Source License (RPSL), Version 1.0</a> <span class="
-#| "\"anchor-reference-id\">(<a href=\"#RPSL\">#RPSL</a>)</span>"
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"RPSL\" href=\"http://directory.fsf.org/wiki/License:RPSLv1.0\";> "
 "RealNetworks Public Source License (RPSL), Version 1.0</a> <span class="
@@ -4640,29 +4440,7 @@
 "documentazione, poiché è incompatibile con la GNU GPL e la GNU FDL."
 
 # type: Content of: <dl><dd><p>
-# | <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#\">#which-cc</a>)</span>-]
-# | {+href=\"#which-cc\">#which-cc</a>)</span>+} Creative Commons publishes
-# | many licenses which are very different.  Therefore, to say that a work
-# | &ldquo;uses a Creative Commons license&rdquo; is to leave the principal
-# | questions about the work's licensing unanswered.  When you see such a
-# | statement in a work, please ask the author to change the work to state
-# | clearly and visibly <em>which</em>of the Creative Commons license it uses.
-# |  And if someone proposes to &ldquo;use a Creative Commons license&rdquo;
-# | for a certain work, it is vital to ask &ldquo;Which Creative Commons
-# | license?&rdquo; before proceeding any further.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "<span class=\"anchor-reference-id\">(<a href=\"#\">#which-cc</a>)</span> "
-#| "Creative Commons publishes many licenses which are very different.  "
-#| "Therefore, to say that a work &ldquo;uses a Creative Commons "
-#| "license&rdquo; is to leave the principal questions about the work's "
-#| "licensing unanswered.  When you see such a statement in a work, please "
-#| "ask the author to change the work to state clearly and visibly <em>which</"
-#| "em>of the Creative Commons license it uses.  And if someone proposes to "
-#| "&ldquo;use a Creative Commons license&rdquo; for a certain work, it is "
-#| "vital to ask &ldquo;Which Creative Commons license?&rdquo; before "
-#| "proceeding any further."
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<span class=\"anchor-reference-id\">(<a href=\"#which-cc\">#which-cc</a>)</"
 "span> Creative Commons publishes many licenses which are very different.  "

Index: philosophy/words-to-avoid.it.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.it.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/words-to-avoid.it.html   24 Oct 2012 00:28:20 -0000      1.27
+++ philosophy/words-to-avoid.it.html   21 Nov 2012 09:29:25 -0000      1.28
@@ -1,6 +1,7 @@
 
 
 <!--#include virtual="/server/header.it.html" -->
+<!-- Parent-Version: 1.70 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/words-to-avoid.en.html" -->
@@ -176,7 +177,7 @@
 scandalosa.
 </p>
 <p>
-&ldquo;compensare i possessori dei diritti&rdquo; aggiunge un ulteriore
+&ldquo;Compensare i possessori dei diritti&rdquo; aggiunge un ulteriore
 raggiro: si cerca di fare pensare che questo significhi pagare gli autori, e
 in certe occasioni è vero, ma il più delle volte è un pagamento verso le
 stesse case editrici che fanno pressione per imporci leggi ingiuste.
@@ -720,30 +721,42 @@
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.it.html" -->
 <div id="footer">
-<p>
-Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a
+
+<p>Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Ci sono anche <a
-href="/contact/">altri modi di contattare</a> la FSF.
-<br />
-Inviate segnalazioni di link non funzionanti e altri suggerimenti relativi
-alle pagine web a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+href="/contact/">altri modi di contattare</a> la FSF. Inviate segnalazioni
+di link non funzionanti e altri suggerimenti relativi alle pagine web a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Per informazioni su come tradurre questa pagina consultate la <a
 href="/server/standards/README.translations.html">Guida alle
 traduzioni</a>. Per segnalare errori di traduzione o collaborare alla
 traduzione italiana delle pagine di questo sito contattate il <a
 href="http://savannah.gnu.org/projects/www-it/";>gruppo dei traduttori
-italiani</a>.
-</p>
+italiani</a>.</p>
 
 <p>
 Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008,
-2009, 2010 Free Software Foundation, Inc.</p>
+2009, 2010, 2011, 2012 Free Software Foundation, Inc.</p>
+
 <p>Questa pagina è distribuita secondo i termini della licenza <a 
rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.it";>Creative
 Commons Attribuzione - Non opere derivate 3.0 Stati Uniti</a> (CC BY-ND
@@ -762,12 +775,11 @@
 <!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2012/10/24 00:28:20 $
+$Date: 2012/11/21 09:29:25 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/po/words-to-avoid.it-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/po/words-to-avoid.it-en.html     24 Oct 2012 00:28:21 -0000      
1.22
+++ philosophy/po/words-to-avoid.it-en.html     21 Nov 2012 09:29:25 -0000      
1.23
@@ -1,4 +1,5 @@
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.70 -->
 
 <title>Words to Avoid (or Use with Care) Because They Are Loaded or Confusing 
- GNU Project
 - Free Software Foundation (FSF)</title>
@@ -98,7 +99,7 @@
 
 <h4 id="Alternative">&ldquo;Alternative&rdquo;</h4>
 <p>
-We don't present free software as an "alternative", because it
+We don't present free software as an &ldquo;alternative&rdquo;, because it
 presents a goal of having free software alongside proprietary
 software.  That presupposes that proprietary software is
 legitimate.</p>
@@ -163,7 +164,7 @@
 </p>
 
 <p>
-One of the many meanings of "cloud computing" is storing your
+One of the many meanings of &ldquo;cloud computing&rdquo; is storing your
 data in online services.  That exposes you to
 <a 
href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream";>surveillance</a>.
 </p>
@@ -217,7 +218,7 @@
 the second is outrageous.
 </p>
 <p>
-&ldquo;compensating the rights-holders&rdquo; adds a further swindle:
+&ldquo;Compensating the rights-holders&rdquo; adds a further swindle:
 you're supposed to imagine that means paying the authors, and
 occasionally it does, but most of the time it means a subsidy for the
 same publishing companies that are pushing unjust laws on us.
@@ -225,10 +226,10 @@
 
 <h4 id="Consume">&ldquo;Consume&rdquo;</h4>
 <p>
-"Consume" refers to what we do with food: we ingest it, and use it in
+&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, and use it 
in
 a way that uses it up.  By analogy, we employ the same word to describe
 using other things in a way that uses them up.  However, it is
-erroneous to speak of "consuming" digital information, music,
+erroneous to speak of &ldquo;consuming&rdquo; digital information, music,
 software, etc., since using them does not consume them.  See also the
 following entry.</p>
 
@@ -762,31 +763,38 @@
 Software, Free Society: The Selected Essays of Richard
 M. Stallman</cite></a>.</h4>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
+
+<p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
 
 <p>
 Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
-2008, 2009, 2010 Free Software Foundation, Inc.</p>
+2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.</p>
+
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
 Commons Attribution-NoDerivs 3.0 United States License</a>.
@@ -795,11 +803,10 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/10/24 00:28:21 $
+$Date: 2012/11/21 09:29:25 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/po/words-to-avoid.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it.po,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- philosophy/po/words-to-avoid.it.po  21 Nov 2012 08:36:02 -0000      1.49
+++ philosophy/po/words-to-avoid.it.po  21 Nov 2012 09:29:25 -0000      1.50
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-11-20 01:26-0500\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -117,15 +116,7 @@
 msgid "&ldquo;Alternative&rdquo;"
 msgstr "&ldquo;Alternativa&rdquo;"
 
-# | We don't present free software as an [-\"alternative\",-]
-# | {+&ldquo;alternative&rdquo;,+} because it presents a goal of having free
-# | software alongside proprietary software.  That presupposes that
-# | proprietary software is legitimate.
-#. type: Content of: <p>
-#| msgid ""
-#| "We don't present free software as an \"alternative\", because it presents "
-#| "a goal of having free software alongside proprietary software.  That "
-#| "presupposes that proprietary software is legitimate."
+#. type: Content of: <p>
 msgid ""
 "We don't present free software as an &ldquo;alternative&rdquo;, because it "
 "presents a goal of having free software alongside proprietary software.  "
@@ -247,17 +238,7 @@
 "essendo uno sviluppatore di software proprietario, non condivide gli ideali "
 "che animano la nostra azione."
 
-# | One of the many meanings of [-\"cloud computing\"-] {+&ldquo;cloud
-# | computing&rdquo;+} is storing your data in online services.  That exposes
-# | you to <a
-# | href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-c
-# | loud-antiauthoritarian-dream\">surveillance</a>.
-#. type: Content of: <p>
-#| msgid ""
-#| "One of the many meanings of \"cloud computing\" is storing your data in "
-#| "online services.  That exposes you to <a href=\"http://www.guardian.co.uk/";
-#| "commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"
-#| "\">surveillance</a>."
+#. type: Content of: <p>
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  That exposes you to <a href=\"http://www.guardian.";
@@ -366,16 +347,7 @@
 "e dovremmo ripagarlo. La prima assunzione è semplicemente <a href=\"/"
 "philosophy/misinterpreting-copyright.html\">falsa</a>, la seconda scandalosa."
 
-# | &ldquo;[-c-]{+C+}ompensating the rights-holders&rdquo; adds a further
-# | swindle: you're supposed to imagine that means paying the authors, and
-# | occasionally it does, but most of the time it means a subsidy for the same
-# | publishing companies that are pushing unjust laws on us.
-#. type: Content of: <p>
-#| msgid ""
-#| "&ldquo;compensating the rights-holders&rdquo; adds a further swindle: "
-#| "you're supposed to imagine that means paying the authors, and "
-#| "occasionally it does, but most of the time it means a subsidy for the "
-#| "same publishing companies that are pushing unjust laws on us."
+#. type: Content of: <p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -391,19 +363,7 @@
 msgid "&ldquo;Consume&rdquo;"
 msgstr "&ldquo;Consumare&rdquo;"
 
-# | [-\"Consume\"-]{+&ldquo;Consume&rdquo;+} refers to what we do with food:
-# | we ingest it, and use it in a way that uses it up.  By analogy, we employ
-# | the same word to describe using other things in a way that uses them up.
-# | However, it is erroneous to speak of [-\"consuming\"-]
-# | {+&ldquo;consuming&rdquo;+} digital information, music, software, etc.,
-# | since using them does not consume them.  See also the following entry.
-#. type: Content of: <p>
-#| msgid ""
-#| "\"Consume\" refers to what we do with food: we ingest it, and use it in a "
-#| "way that uses it up.  By analogy, we employ the same word to describe "
-#| "using other things in a way that uses them up.  However, it is erroneous "
-#| "to speak of \"consuming\" digital information, music, software, etc., "
-#| "since using them does not consume them.  See also the following entry."
+#. type: Content of: <p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, and use "
 "it in a way that uses it up.  By analogy, we employ the same word to "
@@ -1504,14 +1464,7 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
-#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF.  Broken links and other corrections "
-#| "or suggestions can be sent to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
@@ -1548,12 +1501,7 @@
 "pagine di questo sito contattate il <a href=\"http://savannah.gnu.org/";
 "projects/www-it/\">gruppo dei traduttori italiani</a>."
 
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
-# | 2008, 2009, [-2010-] {+2010, 2011, 2012+} Free Software Foundation, Inc.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
-#| "2008, 2009, 2010 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009, 2010, 2011, 2012 Free Software Foundation, Inc."



reply via email to

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