6 files changed, 615 insertions, 570 deletions

diff --git a/it/appendix/gpl.xml b/it/appendix/gpl.xml
index 036c29ff7..9e5de307a 100644
--- a/it/appendix/gpl.xml
+++ b/it/appendix/gpl.xml
@@ -1,20 +1,15 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 38979 -->
 
-
 <appendix id="appendix-gpl">
-<title>GNU General Public License</title>
-
-<note><para>
-La licenza originale è seguita da una traduzione non ufficiale curata
-da gruppo Pluto, da ILS e dal gruppo italiano di traduzione GNU.
-</para></note>
+<!-- <title>GNU General Public License</title> -->
+<title>Licenza Pubblica Generica GNU</title>
 
 <note condition="gpl-unofficial"><para>
 
-<!-- La compilazione di questa nota, e quindi dei paragrafi che
-     contiene, è disattivata -->
+<!-- La compilazione di questa nota è attivata -->
 
+<!--
 [[This note, consisting of two paragraphs, should only be included in your
 translation if you translate the GPL in this appendix.
 See build/lang-options/README on how to enable this paragraph and for
@@ -28,10 +23,18 @@ not legally state the distribution terms for software that uses the GNU
 GPL &mdash; only the original <ulink url="&url-gnu-copyleft;">English
 text</ulink> of the GNU GPL does that. However, we hope that this translation
 will help {language} speakers to better understand the GNU GPL.
+-->
 
+This is an unofficial translation of the GNU General Public License into
+Italian. It was not published by the Free Software Foundation, and does
+not legally state the distribution terms for software that uses the GNU
+GPL &mdash; only the original <ulink url="&url-gnu-copyleft;">English
+text</ulink> of the GNU GPL does that. However, we hope that this translation
+will help Italian speakers to better understand the GNU GPL.
 
 </para><para>
 
+<!--
 [[See build/lang-options/README on how to enable this paragraph and for
 additional information. Its condition is "gpl-unofficial".]]
 [[THIS PARAGRAPH SHOULD BE TRANSLATED. Replace {language} with the English
@@ -43,15 +46,29 @@ not legally state the distribution terms for software that uses the GNU
 GPL &mdash; only the original <ulink url="&url-gnu-copyleft;">English
 text</ulink> of the GNU GPL does that. However, we hope that this translation
 will help {language} speakers to better understand the GNU GPL.
+-->
 
-</para></note>
+Questa è una traduzione italiana non ufficiale della Licenza Pubblica
+Generica GNU. Non è pubblicata dalla Free Software Foundation e non
+ha valore legale nell'esprimere i termini di distribuzione del software
+che usa la licenza GPL. Solo la versione originale <ulink
+url="&url-gnu-copyleft;">in inglese</ulink> della licenza ha valore
+legale. Ad ogni modo, speriamo che questa traduzione aiuti le persone
+di lingua italiana a capire meglio il significato della licenza GPL.
+
+Traduzione curata da gruppo Pluto, da ILS e dal gruppo italiano di
+traduzione GNU. Ultimo aggiornamento 19 aprile 2000.
 
- <sect1>
- <title>GNU General Public License</title>
+</para></note>
 <para>
 
+<!--
 Version 2, June 1991
+-->
+
+Versione 2, Giugno 1991
 
+<!--
 <informalexample><screen>
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -59,13 +76,24 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 </screen></informalexample>
+-->
+
+<informalexample><screen>
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Chiunque può copiare e distribuire copie letterali di questo documento
+di licenza, ma non ne è permessa la modifica.
+</screen></informalexample>
 
 </para>
 
-  <simplesect>
-  <title>Preamble</title>
+ <simplesect>
+ <!-- <title>Preamble</title> -->
+ <title>Preambolo</title>
 <para>
 
+<!--
 The licenses for most software are designed to take away your freedom
 to share and change it. By contrast, the gnu General Public License
 is intended to guarantee your freedom to share and change free
@@ -75,520 +103,7 @@ Foundation's software and to any other program whose authors commit
 to using it. (Some other Free Software Foundation software is covered
 by the gnu Library General Public License instead.) You can apply it
 to your programs, too.
-
-</para><para>
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge
-for this service if you wish), that you receive source code or can
-get it if you want it, that you can change the software or use pieces
-of it in new free programs; and that you know you can do these
-things.
-
-</para><para>
-
-To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the software, or if you modify it.
-
-</para><para>
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
-</para><para>
-
-We protect your rights with two steps: (1) copyright the software,
-and (2) offer you this license which gives you legal permission to
-copy, distribute and/or modify the software.
-
-</para><para>
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on,
-we want its recipients to know that what they have is not the
-original, so that any problems introduced by others will not reflect
-on the original authors' reputations.
-
-</para><para>
-
-Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making
-the program proprietary. To prevent this, we have made it clear that
-any patent must be licensed for everyone's free use or not licensed
-at all.
-
-</para><para>
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-</para>
-  </simplesect>
-
-  <simplesect>
-  <title>GNU GENERAL PUBLIC LICENSE</title>
-<para>
-
-<emphasis role="bold">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION
-AND MODIFICATION</emphasis>
-
-</para><para>
-
-<emphasis role="bold">0.</emphasis>
-This License applies to any program or other work which contains a
-notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-</para><para>
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the
-Program is covered only if its contents constitute a work based on
-the Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-</para><para>
-
-<emphasis role="bold">1.</emphasis>
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any
-warranty; and give any other recipients of the Program a copy of this
-License along with the Program.
-
-</para><para>
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a
-fee.
-
-</para><para>
-
-<emphasis role="bold">2.</emphasis>
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-</para>
-<orderedlist numeration='loweralpha'><listitem><para>
-
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-</para></listitem>
-<listitem><para>
-
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any part
-thereof, to be licensed as a whole at no charge to all third parties
-under the terms of this License.
-
-</para></listitem>
-<listitem><para>
-
-If the modified program normally reads commands interactively when
-run, you must cause it, when started running for such interactive use
-in the most ordinary way, to print or display an announcement
-including an appropriate copyright notice and a notice that there is
-no warranty (or else, saying that you provide a warranty) and that
-users may redistribute the program under these conditions, and
-telling the user how to view a copy of this License. (Exception: if
-the Program itself is interactive but does not normally print such an
-announcement, your work based on the Program is not required to print
-an announcement.)
-
-</para></listitem></orderedlist>
-<para>
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-</para><para>
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-</para><para>
-
-In addition, mere aggregation of another work not based on the
-Program with the Program (or with a work based on the Program) on a
-volume of a storage or distribution medium does not bring the other
-work under the scope of this License.
-
-</para><para>
-
-<emphasis role="bold">3.</emphasis>
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the
-following:
-
-</para>
-<orderedlist numeration='loweralpha'><listitem><para>
-
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections 1
-and 2 above on a medium customarily used for software interchange;
-or,
-
-</para></listitem>
-<listitem><para>
-
-Accompany it with a written offer, valid for at least three years,
-to give any third party, for a charge no more than your cost of
-physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-
-</para></listitem>
-<listitem><para>
-
-Accompany it with the information you received as to the offer to
-distribute corresponding source code. (This alternative is allowed
-only for noncommercial distribution and only if you received the
-program in object code or executable form with such an offer, in
-accord with Subsection b above.)
-
-</para></listitem></orderedlist>
-<para>
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-</para><para>
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-</para><para>
-
-<emphasis role="bold">4.</emphasis>
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this
-License. However, parties who have received copies, or rights, from
-you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
-
-</para><para>
-
-<emphasis role="bold">5.</emphasis>
-You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-</para><para>
-
-<emphasis role="bold">6.</emphasis>
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject
-to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted
-herein. You are not responsible for enforcing compliance by third
-parties to this License.
-
-</para><para>
-
-<emphasis role="bold">7.</emphasis>
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do
-not excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under
-this License and any other pertinent obligations, then as a
-consequence you may not distribute the Program at all. For example,
-if a patent license would not permit royalty-free redistribution of
-the Program by all those who receive copies directly or indirectly
-through you, then the only way you could satisfy both it and this
-License would be to refrain entirely from distribution of the
-Program.
-
-</para><para>
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended
-to apply and the section as a whole is intended to apply in other
-circumstances.
-
-</para><para>
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is
-willing to distribute software through any other system and a
-licensee cannot impose that choice.
-
-</para><para>
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-</para><para>
-
-<emphasis role="bold">8.</emphasis>
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-</para><para>
-
-<emphasis role="bold">9.</emphasis>
-The Free Software Foundation may publish revised and/or new
-versions of the General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-</para><para>
-
-Each version is
-given a distinguishing version number. If the Program specifies a
-version number of this License which applies to it and "any later
-version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number
-of this License, you may choose any version ever published by the
-Free Software Foundation.
-
-</para><para>
-
-<emphasis role="bold">10.</emphasis>
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the
-author to ask for permission. For software which is copyrighted by
-the Free Software Foundation, write to the Free Software Foundation;
-we sometimes make exceptions for this. Our decision will be guided by
-the two goals of preserving the free status of all derivatives of our
-free software and of promoting the sharing and reuse of software
-generally.
-
-</para><para>
-
-<emphasis role="bold">NO WARRANTY</emphasis>
-
-</para><para>
-
-<emphasis role="bold">11.</emphasis>
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-</para><para>
-
-<emphasis role="bold">12.</emphasis>
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-</para><para>
-
-<emphasis role="bold">END OF TERMS AND CONDITIONS</emphasis>
-
-</para>
-  </simplesect>
-
-  <simplesect>
-  <title>How to Apply These Terms to Your New Programs</title>
-<para>
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make
-it free software which everyone can redistribute and change under
-these terms.
-
-</para><para>
-
-To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-<informalexample><screen>
-<replaceable>one line to give the program's name and a brief idea of what it does.</replaceable>
-Copyright (C) <replaceable>year  name of author</replaceable>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-</screen></informalexample>
-
-</para><para>
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-</para><para>
-
-If the program is interactive, make it output a short notice like
-this when it starts in an interactive mode:
-
-<informalexample><screen>
-Gnomovision version 69, Copyright (C) <replaceable>year name of author</replaceable>
-Gnomovision comes with absolutely no warranty; for details
-type `show w'. This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c'
-for details.
-</screen></informalexample>
-
-</para><para>
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License. Of course, the
-commands you use may be called something other than `show w' and
-`show c'; they could even be mouse-clicks or menu items &mdash; whatever
-suits your program.
-
-</para><para>
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the
-program, if necessary. Here is a sample; alter the names:
-
-<informalexample><screen>
-Yoyodyne, Inc., hereby disclaims all copyright interest in the
-program `Gnomovision' (which makes passes at compilers) written
-by James Hacker.
-
-<replaceable>signature of Ty Coon</replaceable>, 1 April 1989
-Ty Coon, President of Vice
-</screen></informalexample>
-
-</para><para>
-
-This General Public License does not permit incorporating your
-program into proprietary programs. If your program is a subroutine
-library, you may consider it more useful to permit linking
-proprietary applications with the library. If this is what you want
-to do, use the GNU Lesser General Public License instead of this
-License.
-
-</para>
-  </simplesect>
- </sect1>
-
- <sect1>
- <title>Licenza Pubblica Generica GNU</title>
-<para>
-
-This is an unofficial translation of the GNU General Public
-License into Italian. It was not published by the Free
-Software Foundation, and does not legally state the
-distribution terms for software that uses the GNU GPL &mdash;
-only the original <ulink url="&url-gnu-copyleft;">English text</ulink>
-of the GNU GPL does that. However, we hope that this translation will
-help Italian speakers to understand the GNU GPL better.
-
-</para><para>
-
-Questa è una traduzione italiana non ufficiale della Licenza Pubblica
-Generica GNU. Non è pubblicata dalla Free Software Foundation e non
-ha valore legale nell'esprimere i termini di distribuzione del software
-che usa la licenza GPL. Solo la versione originale <ulink
-url="&url-gnu-copyleft;">in inglese</ulink> della licenza ha valore
-legale. Ad ogni modo, speriamo che questa traduzione aiuti le persone
-di lingua italiana a capire meglio il significato della licenza GPL.
-
-</para><para>
-
-Traduzione curata da gruppo Pluto, da ILS e dal gruppo italiano di
-traduzione GNU. Ultimo aggiornamento 19 aprile 2000.
-
-</para><para>
-
-Versione 2, Giugno 1991
-
-<informalexample><screen>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Chiunque può copiare e distribuire copie letterali di questo documento
-di licenza, ma non ne è permessa la modifica.
-</screen></informalexample>
-
-</para>
-
-  <simplesect>
-  <title>Preambolo</title>
-<para>
+-->
 
 Le licenze della maggior parte dei programmi hanno lo scopo di
 togliere all'utente la libertà di condividere e modificare il
@@ -604,6 +119,16 @@ programmi.
 
 </para><para>
 
+<!--
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge
+for this service if you wish), that you receive source code or can
+get it if you want it, that you can change the software or use pieces
+of it in new free programs; and that you know you can do these
+things.
+-->
+
 Quando si parla di software libero (free software), ci si riferisce
 alla libertà, non al prezzo. Le nostre Licenze (la GPL e la LGPL)
 sono progettate per assicurarsi che ciascuno abbia la libertà di
@@ -615,6 +140,13 @@ fare queste cose.
 
 </para><para>
 
+<!--
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the software, or if you modify it.
+-->
+
 Per proteggere i diritti dell'utente, abbiamo bisogno di creare delle
 restrizioni che vietino a chiunque di negare questi diritti o di
 chiedere di rinunciarvi. Queste restrizioni si traducono in certe
@@ -623,6 +155,14 @@ modifica.
 
 </para><para>
 
+<!--
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+-->
+
 Per esempio, chi distribuisce copie di un programma coperto da GPL,
 sia gratis sia in cambio di un compenso, deve concedere ai destinatari
 tutti i diritti che ha ricevuto. Deve anche assicurarsi che i
@@ -632,12 +172,27 @@ i propri diritti.
 
 </para><para>
 
+<!--
+We protect your rights with two steps: (1) copyright the software,
+and (2) offer you this license which gives you legal permission to
+copy, distribute and/or modify the software.
+-->
+
 Proteggiamo i diritti dell'utente in due modi: (1) proteggendo il
 software con un copyright, e (2) offrendo una licenza che dia il
 permesso legale di copiare, distribuire e modificare il Programma.
 
 </para><para>
 
+<!--
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on,
+we want its recipients to know that what they have is not the
+original, so that any problems introduced by others will not reflect
+on the original authors' reputations.
+-->
+
 Inoltre, per proteggere ogni autore e noi stessi, vogliamo assicurarci
 che ognuno capisca che non ci sono garanzie per i programmi coperti da
 GPL. Se il programma viene modificato da qualcun altro e
@@ -647,6 +202,15 @@ si rifletta sulla reputazione degli autori originari.
 
 </para><para>
 
+<!--
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making
+the program proprietary. To prevent this, we have made it clear that
+any patent must be licensed for everyone's free use or not licensed
+at all.
+-->
+
 Infine, ogni programma libero è costantemente minacciato dai brevetti
 sui programmi. Vogliamo evitare il pericolo che chi ridistribuisce un
 programma libero ottenga la proprietà di brevetti, rendendo in pratica
@@ -656,21 +220,45 @@ d'uso a chiunque, o non avere alcuna restrizione di licenza d'uso.
 
 </para><para>
 
+<!--
+The precise terms and conditions for copying, distribution and
+modification follow.
+-->
+
 Seguono i termini e le condizioni precisi per la copia, la
 distribuzione e la modifica.
 
 </para>
-  </simplesect>
+ </simplesect>
 
-  <simplesect>
-  <title>LICENZA PUBBLICA GENERICA GNU</title>
+ <simplesect>
+ <!-- <title>GNU GENERAL PUBLIC LICENSE</title> -->
+ <title>LICENZA PUBBLICA GENERICA GNU</title>
 <para>
 
+<!--
+<emphasis role="bold">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION
+AND MODIFICATION</emphasis>
+-->
+
 <emphasis role="bold">TERMINI E CONDIZIONI PER LA COPIA, LA
 DISTRIBUZIONE E LA MODIFICA</emphasis>
 
 </para><para>
 
+<!--
+<emphasis role="bold">0.</emphasis>
+This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+-->
+
 <emphasis role="bold">0.</emphasis>
 Questa Licenza si applica a ogni programma o altra opera che
 contenga una nota da parte del detentore del copyright che dica che
@@ -687,6 +275,15 @@ diritti dei beneficiari della licenza.
 
 </para><para>
 
+<!--
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the
+Program is covered only if its contents constitute a work based on
+the Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+-->
+
 Attività diverse dalla copiatura, distribuzione e modifica non sono
 coperte da questa Licenza e sono al di fuori della sua influenza.
 L'atto di eseguire il Programma non viene limitato, e l'output del
@@ -697,6 +294,17 @@ Programma il suo output può essere o meno coperto da questa Licenza.
 
 </para><para>
 
+<!--
+<emphasis role="bold">1.</emphasis>
+You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any
+warranty; and give any other recipients of the Program a copy of this
+License along with the Program.
+-->
+
 <emphasis role="bold">1.</emphasis>
 È lecito copiare e distribuire copie letterali del codice
 sorgente del Programma così come viene ricevuto, con qualsiasi mezzo,
@@ -708,12 +316,26 @@ una copia di questa Licenza insieme al Programma.
 
 </para><para>
 
+<!--
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a
+fee.
+-->
+
 È possibile richiedere un pagamento per il trasferimento fisico di una
 copia del Programma, è anche possibile a propria discrezione
 richiedere un pagamento in cambio di una copertura assicurativa.
 
 </para><para>
 
+<!--
+<emphasis role="bold">2.</emphasis>
+You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+-->
+
 <emphasis role="bold">2.</emphasis>
 È lecito modificare la propria copia o copie del Programma, o
 parte di esso, creando perciò un'opera basata sul Programma, e copiare
@@ -724,12 +346,24 @@ che seguono:
 </para>
 <orderedlist numeration='loweralpha'><listitem><para>
 
+<!--
+You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+-->
+
 Bisogna indicare chiaramente nei file che si tratta di copie
 modificate e la data di ogni modifica.
 
 </para></listitem>
 <listitem><para>
 
+<!--
+You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any part
+thereof, to be licensed as a whole at no charge to all third parties
+under the terms of this License.
+-->
+
 Bisogna fare in modo che ogni opera distribuita o pubblicata,
 che in parte o nella sua totalità derivi dal Programma o da parti
 di esso, sia concessa nella sua interezza in licenza gratuita ad
@@ -738,6 +372,19 @@ ogni terza parte, secondo i termini di questa Licenza.
 </para></listitem>
 <listitem><para>
 
+<!--
+If the modified program normally reads commands interactively when
+run, you must cause it, when started running for such interactive use
+in the most ordinary way, to print or display an announcement
+including an appropriate copyright notice and a notice that there is
+no warranty (or else, saying that you provide a warranty) and that
+users may redistribute the program under these conditions, and
+telling the user how to view a copy of this License. (Exception: if
+the Program itself is interactive but does not normally print such an
+announcement, your work based on the Program is not required to print
+an announcement.)
+-->
+
 Se normalmente il programma modificato legge comandi
 interattivamente quando viene eseguito, bisogna fare in modo che
 all'inizio dell'esecuzione interattiva usuale, esso stampi un
@@ -752,6 +399,19 @@ non occorre che un'opera basata sul Programma lo stampi.
 </para></listitem></orderedlist>
 <para>
 
+<!--
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+-->
+
 Questi requisiti si applicano all'opera modificata nel suo complesso.
 Se sussistono parti identificabili dell'opera modificata che non siano
 derivate dal Programma e che possono essere ragionevolmente
@@ -766,6 +426,13 @@ parte, chiunque ne sia l'autore.
 
 </para><para>
 
+<!--
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+-->
+
 Quindi, non è nelle intenzioni di questa sezione accampare diritti, né
 contestare diritti su opere scritte interamente da altri; l'intento è
 piuttosto quello di esercitare il diritto di controllare la
@@ -773,6 +440,13 @@ distribuzione di opere derivati dal Programma o che lo contengano.
 
 </para><para>
 
+<!--
+In addition, mere aggregation of another work not based on the
+Program with the Program (or with a work based on the Program) on a
+volume of a storage or distribution medium does not bring the other
+work under the scope of this License.
+-->
+
 Inoltre, la semplice aggregazione di un'opera non derivata dal
 Programma col Programma o con un'opera da esso derivata su di un mezzo
 di memorizzazione o di distribuzione, non è sufficiente a includere
@@ -780,6 +454,14 @@ l'opera non derivata nell'ambito di questa Licenza.
 
 </para><para>
 
+<!--
+<emphasis role="bold">3.</emphasis>
+You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the
+following:
+-->
+
 <emphasis role="bold">3.</emphasis>
 È lecito copiare e distribuire il Programma (o un'opera basata su
 di esso, come espresso al comma 2) sotto forma di codice oggetto o
@@ -789,6 +471,13 @@ si applichi una delle seguenti condizioni:
 </para>
 <orderedlist numeration='loweralpha'><listitem><para>
 
+<!--
+Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections 1
+and 2 above on a medium customarily used for software interchange;
+or,
+-->
+
 Il Programma sia corredato del codice sorgente completo, in una
 forma leggibile da calcolatore, e tale sorgente sia fornito
 secondo le regole dei precedenti commi 1 e 2 su di un mezzo
@@ -797,6 +486,15 @@ comunemente usato per lo scambio di programmi.
 </para></listitem>
 <listitem><para>
 
+<!--
+Accompany it with a written offer, valid for at least three years,
+to give any third party, for a charge no more than your cost of
+physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+-->
+
 Il Programma sia accompagnato da un'offerta scritta, valida per
 almeno tre anni, di fornire a chiunque ne faccia richiesta una
 copia completa del codice sorgente, in una forma leggibile da
@@ -808,6 +506,14 @@ comunemente usato per lo scambio di programmi.
 </para></listitem>
 <listitem><para>
 
+<!--
+Accompany it with the information you received as to the offer to
+distribute corresponding source code. (This alternative is allowed
+only for noncommercial distribution and only if you received the
+program in object code or executable form with such an offer, in
+accord with Subsection b above.)
+-->
+
 Il Programma sia accompagnato dalle informazioni che sono state
 ricevute riguardo alla possibilità di ottenere il codice sorgente.
 Questa alternativa è permessa solo in caso di distribuzioni non
@@ -817,6 +523,19 @@ codice oggetto o eseguibile in accordo al precedente comma B.
 </para></listitem></orderedlist>
 <para>
 
+<!--
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+-->
+
 Per <quote>codice sorgente completo</quote> di un'opera si intende
 la forma preferenziale usata per modificare un'opera. Per un
 programma eseguibile, <quote>codice sorgente completo</quote>
@@ -832,6 +551,14 @@ accompagnino l'eseguibile.
 
 </para><para>
 
+<!--
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+-->
+
 Se la distribuzione dell'eseguibile o del codice oggetto è effettuata
 indicando un luogo dal quale sia possibile copiarlo, permettere la
 copia del codice sorgente dallo stesso luogo è considerata una valida
@@ -840,6 +567,17 @@ sorgente è facoltativo per l'acquirente.
 
 </para><para>
 
+<!--
+<emphasis role="bold">4.</emphasis>
+You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this
+License. However, parties who have received copies, or rights, from
+you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+-->
+
 <emphasis role="bold">4.</emphasis>
 Non è lecito copiare, modificare, sublicenziare, o distribuire
 il Programma in modi diversi da quelli espressamente previsti da
@@ -853,6 +591,18 @@ conformemente ad essa.
 
 </para><para>
 
+<!--
+<emphasis role="bold">5.</emphasis>
+You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+-->
+
 <emphasis role="bold">5.</emphasis>
 L'acquirente non è tenuto ad accettare questa Licenza,
 poiché non l'ha firmata. D'altra parte nessun altro documento
@@ -866,6 +616,17 @@ Programma o di lavori basati su di esso.
 
 </para><para>
 
+<!--
+<emphasis role="bold">6.</emphasis>
+Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject
+to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted
+herein. You are not responsible for enforcing compliance by third
+parties to this License.
+-->
+
 <emphasis role="bold">6.</emphasis>
 Ogni volta che il Programma o un'opera basata su di esso vengono
 distribuiti, l'acquirente riceve automaticamente una licenza d'uso da
@@ -878,6 +639,23 @@ tenuto a imporre il rispetto di questa Licenza a terzi.
 
 </para><para>
 
+<!--
+<emphasis role="bold">7.</emphasis>
+If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do
+not excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not distribute the Program at all. For example,
+if a patent license would not permit royalty-free redistribution of
+the Program by all those who receive copies directly or indirectly
+through you, then the only way you could satisfy both it and this
+License would be to refrain entirely from distribution of the
+Program.
+-->
+
 <emphasis role="bold">7.</emphasis>
 Se, come conseguenza del giudizio di un tribunale, o di una
 imputazione per la violazione di un brevetto o per ogni altra ragione
@@ -896,6 +674,13 @@ affatto il Programma.
 
 </para><para>
 
+<!--
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended
+to apply and the section as a whole is intended to apply in other
+circumstances.
+-->
+
 Se una qualunque parte di questo comma è ritenuta non valida o non
 applicabile in una qualunque circostanza, deve comunque essere
 applicata l'idea espressa da questo comma; in ogni altra circostanza
@@ -903,6 +688,19 @@ invece deve essere applicato questo comma nel suo complesso.
 
 </para><para>
 
+<!--
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is
+willing to distribute software through any other system and a
+licensee cannot impose that choice.
+-->
+
 Non è nelle finalità di questo comma indurre gli utenti ad infrangere
 alcun brevetto né ogni altra rivendicazione di diritti di proprietà,
 né di contestare la validità di alcuna di queste rivendicazioni; lo
@@ -917,11 +715,27 @@ non può imporre la scelta del sistema di distribuzione.
 
 </para><para>
 
+<!--
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+-->
+
 Questo comma serve a rendere il più chiaro possibile ciò che crediamo
 sia una conseguenza del resto di questa Licenza.
 
 </para><para>
 
+<!--
+<emphasis role="bold">8.</emphasis>
+If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+-->
+
 <emphasis role="bold">8.</emphasis>
 Se in alcuni paesi la distribuzione o l'uso del Programma sono
 limitati da brevetto o dall'uso di interfacce coperte da copyright, il
@@ -934,6 +748,22 @@ questa Licenza e ne fanno parte a tutti gli effetti.
 
 </para><para>
 
+<!--
+
+<emphasis role="bold">9.</emphasis>
+The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns. Each version is
+given a distinguishing version number. If the Program specifies a
+version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number
+of this License, you may choose any version ever published by the
+Free Software Foundation.
+-->
+
 <emphasis role="bold">9.</emphasis>
 All'occorrenza la Free Software Foundation può pubblicare
 revisioni o nuove versioni di questa Licenza Pubblica Generica. Tali
@@ -941,7 +771,6 @@ nuove versioni saranno simili a questa nello spirito, ma potranno
 differire nei dettagli al fine di coprire nuovi problemi e nuove
 situazioni.
 
-</para><para>
 
 Ad ogni versione viene dato un numero identificativo. Se il Programma
 asserisce di essere coperto da una particolare versione di questa
@@ -953,6 +782,18 @@ versione tra quelle pubblicate dalla Free Software Foundation.
 
 </para><para>
 
+<!--
+<emphasis role="bold">10.</emphasis>
+If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by
+the Free Software Foundation, write to the Free Software Foundation;
+we sometimes make exceptions for this. Our decision will be guided by
+the two goals of preserving the free status of all derivatives of our
+free software and of promoting the sharing and reuse of software
+generally.
+-->
+
 <emphasis role="bold">10.</emphasis>
 Se si desidera incorporare parti del Programma in altri
 programmi liberi le cui condizioni di distribuzione differiscano da
@@ -966,10 +807,27 @@ condivisione e il riutilizzo del software in generale.
 
 </para><para>
 
+<!--
+<emphasis role="bold">NO WARRANTY</emphasis>
+-->
+
 <emphasis role="bold">NON C'È GARANZIA</emphasis>
 
 </para><para>
 
+<!--
+<emphasis role="bold">11.</emphasis>
+BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+-->
+
 <emphasis role="bold">11.</emphasis>
 POICHÉ IL PROGRAMMA È CONCESSO IN USO GRATUITAMENTE, NON C'È GARANZIA PER
 IL PROGRAMMA, NEI LIMITI PERMESSI DALLE VIGENTI LEGGI. SE NON INDICATO
@@ -984,6 +842,20 @@ RIPARAZIONE O CORREZIONE NECESSARIA.
 
 </para><para>
 
+<!--
+<emphasis role="bold">12.</emphasis>
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL AND COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+-->
+
 <emphasis role="bold">12.</emphasis>
 NÉ IL DETENTORE DEL COPYRIGHT NÉ ALTRE PARTI CHE POSSONO MODIFICARE O
 RIDISTRIBUIRE IL PROGRAMMA COME PERMESSO IN QUESTA LICENZA SONO RESPONSABILI
@@ -998,15 +870,27 @@ DELLA POSSIBILITÀ DI QUESTI DANNI.
 
 </para><para>
 
+<!--
+<emphasis role="bold">END OF TERMS AND CONDITIONS</emphasis>
+-->
+
 <emphasis role="bold">FINE DEI TERMINI E DELLE CONDIZIONI</emphasis>
 
 </para>
-  </simplesect>
+ </simplesect>
 
-  <simplesect>
-  <title>Come applicare questi termini a nuovi programmi</title>
+ <simplesect>
+ <!-- <title>How to Apply These Terms to Your New Programs</title> -->
+ <title>Come applicare questi termini a nuovi programmi</title>
 <para>
 
+<!--
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make
+it free software which everyone can redistribute and change under
+these terms.
+-->
+
 Se si sviluppa un nuovo programma e lo si vuole rendere della maggiore
 utilità possibile per il pubblico, la cosa migliore da fare è rendere
 tale programma libero, cosicché ciascuno possa ridistribuirlo e
@@ -1014,12 +898,40 @@ modificarlo sotto questi termini.
 
 </para><para>
 
+<!--
+To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+-->
+
 Per fare questo, si inserisca nel programma la seguente nota. La cosa
 migliore da fare è mettere la nota all'inizio di ogni file sorgente,
 per chiarire nel modo più efficiente possibile l'assenza di garanzia;
 ogni file dovrebbe contenere almeno la nota di copyright e
 l'indicazione di dove trovare l'intera nota.
 
+<!--
+<informalexample><screen>
+<replaceable>one line to give the program's name and a brief idea of what it does.</replaceable>
+Copyright (C) <replaceable>year  name of author</replaceable>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+</screen></informalexample>
+-->
+
 <informalexample><screen>
 <replaceable>una riga per dire in breve il nome del programma e cosa fa</replaceable>
 Copyright (C) <replaceable>anno  nome dell'autore</replaceable>
@@ -1042,14 +954,34 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 </para><para>
 
+<!--
+Also add information on how to contact you by electronic and paper
+mail.
+-->
+
 Si aggiungano anche informazioni su come si può essere contattati
 tramite posta elettronica e cartacea.
 
 </para><para>
 
+<!--
+If the program is interactive, make it output a short notice like
+this when it starts in an interactive mode:
+-->
+
 Se il programma è interattivo, si faccia in modo che stampi una breve
 nota simile a questa quando viene usato interattivamente:
 
+<!--
+<informalexample><screen>
+Gnomovision version 69, Copyright (C) <replaceable>year name of author</replaceable>
+Gnomovision comes with absolutely no warranty; for details
+type `show w'. This is free software, and you are welcome
+to redistribute it under certain conditions; type `show c'
+for details.
+</screen></informalexample>
+-->
+
 <informalexample><screen>
 Orcaloca versione 69, Copyright (C) <replaceable>anno  nome dell'autore</replaceable>
 Orcaloca non ha ALCUNA GARANZIA; per dettagli usare il comando <userinput>show g</userinput>.
@@ -1059,6 +991,14 @@ certe condizioni; usare il comando <userinput>show c</userinput> per i dettagli.
 
 </para><para>
 
+<!--
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than `show w' and
+`show c'; they could even be mouse-clicks or menu items &mdash; whatever
+suits your program.
+-->
+
 Gli ipotetici comandi <userinput>show g</userinput> e <userinput>show
 c</userinput> mostreranno le parti appropriate della Licenza Pubblica
 Generica. Chiaramente, i comandi usati possono essere chiamati
@@ -1068,11 +1008,28 @@ attraverso un menu, o comunque sia pertinente al programma.
 
 </para><para>
 
+<!--
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the
+program, if necessary. Here is a sample; alter the names:
+-->
+
 Se necessario, si deve anche far firmare al proprio datore di lavoro
 (per chi lavora come programmatore) o alla propria scuola, per chi è
 studente, una <quote>rinuncia al copyright</quote> per il programma.
 Ecco un esempio con nomi fittizi:
 
+<!--
+<informalexample><screen>
+Yoyodyne, Inc., hereby disclaims all copyright interest in the
+program `Gnomovision' (which makes passes at compilers) written
+by James Hacker.
+
+<replaceable>signature of Ty Coon</replaceable>, 1 April 1989
+Ty Coon, President of Vice
+</screen></informalexample>
+-->
+
 <informalexample><screen>
 Yoyodinamica SPA rinuncia con  questo documento ad ogni diritto sul
 copyright  del  programma  <quote>Orcaloca</quote>  (che  svolge  dei  passi  di
@@ -1084,6 +1041,15 @@ Primo Tizio, Presidente
 
 </para><para>
 
+<!--
+This General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking
+proprietary applications with the library. If this is what you want
+to do, use the GNU Lesser General Public License instead of this
+License.
+-->
+
 I programmi coperti da questa Licenza Pubblica Generica non possono
 essere incorporati all'interno di programmi proprietari. Se il
 proprio programma è una libreria di funzioni, può essere più utile
@@ -1092,6 +1058,5 @@ si ha questa intenzione consigliamo di usare la Licenza Pubblica
 Generica Minore GNU (LGPL) invece di questa Licenza.
 
 </para>
-  </simplesect>
- </sect1>
+ </simplesect>
 </appendix>
diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml
index e72b4e7a1..abc5e8d04 100644
--- a/it/appendix/preseed.xml
+++ b/it/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 65661 -->
+<!-- original version: 65762 -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -1292,6 +1292,16 @@ degli esempi (come la scelta della tastiera e l'installazione del boot loader)
 potrebbero non essere corretti e devono essere sostituiti con le impostazioni
 per debconf adatte alla propria architettura.
 
+</para><para>
+
+<!--
+Details on how the different Debian Installer components actually work can be
+found in <xref linkend="module-details"/>.
+-->
+
+I dettagli su come attualmente funzionano i componenti dell'installatore 
+possono essere trovati in <xref linkend="module-details"/>.
+
 </para>
 
   <sect2 id="preseed-l10n">
diff --git a/it/boot-installer/parameters.xml b/it/boot-installer/parameters.xml
index ac072ac7b..5fb09bc62 100644
--- a/it/boot-installer/parameters.xml
+++ b/it/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 64916 -->
+<!-- original version: 65799 -->
 
  <sect1 id="boot-parms">
  <!-- <title>Boot Parameters </title> -->
@@ -789,7 +789,6 @@ ripristino anziché effettuare una normale installazione. Si consulti
 </varlistentry>
 
 </variablelist>
-
   </sect2>
 
   <sect2 id="preseed-args">
diff --git a/it/using-d-i/components.xml b/it/using-d-i/components.xml
index 2b8ad2c13..164b3f7d9 100644
--- a/it/using-d-i/components.xml
+++ b/it/using-d-i/components.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 65198 -->
+<!-- original version: 65801 -->
 
  <sect1 id="module-details">
  <!-- <title>Using Individual Components</title> -->
@@ -282,8 +282,8 @@ principalmente nel mettere in ordine dopo il &d-i;.
   </sect2>
 
   <sect2 id="di-miscellaneous">
-  <!-- <title>Miscellaneous</title> -->
-  <title>Varie</title>
+  <!-- <title>Troubleshooting</title> -->
+  <title>Risoluzione dei problemi</title>
 <para>
 
 <!--
diff --git a/it/using-d-i/modules/network-console.xml b/it/using-d-i/modules/network-console.xml
index 6d2b86088..d756dc705 100644
--- a/it/using-d-i/modules/network-console.xml
+++ b/it/using-d-i/modules/network-console.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 62714 -->
+<!-- original version: 65801 -->
 
   <sect2 id="network-console">
   <!-- <title>Installation Over the Network</title> -->
diff --git a/it/using-d-i/modules/partman.xml b/it/using-d-i/modules/partman.xml
index 5e4f731dc..dae6e9d8a 100644
--- a/it/using-d-i/modules/partman.xml
+++ b/it/using-d-i/modules/partman.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 64916 -->
+<!-- original version: 65785 -->
 
 <para>
 
@@ -94,7 +94,7 @@ Alcune opzioni possono essere modificate solo quando l'installazione
 avviene con debconf a priorità media o bassa, con le priorità più alte
 saranno usati i valori predefiniti.
 
-</para><para>
+</para><para arch="linux-any">
 
 <!--
 The installer supports various forms of advanced partitioning and use of
@@ -164,7 +164,7 @@ usati in combinazione.
   </para></listitem>
 </itemizedlist>
 
-</para><para arch="linux-any">
+</para><para>
 
 <!--
 The following file systems are supported.
@@ -176,9 +176,9 @@ Sono supportati i seguenti file system.
   <listitem><para>
     <phrase arch="arm;mipsel"><emphasis>ext2r0</emphasis>,</phrase>
     <emphasis>ext2</emphasis>,
-    <emphasis>ext3</emphasis>,
-    <emphasis>ext4</emphasis>
-  </para><para>
+    <phrase arch="linux-any"><emphasis>ext3</emphasis>,</phrase>
+    <phrase arch="linux-any"><emphasis>ext4</emphasis></phrase>
+  </para><para arch="linux-any">
 <!--
     The default file system selected in most cases is ext3; for
     <filename>/boot</filename> partitions ext2 will be selected by default
@@ -188,19 +188,84 @@ Sono supportati i seguenti file system.
     le partizioni <filename>/boot</filename> viene scelto ext2 quando è
     usato il partizionamento guidato.
   </para></listitem>
-  <listitem><para>
+  <listitem arch="linux-any"><para>
 <!--
     <emphasis>jfs</emphasis> (not available on all architectures)
 -->
     <emphasis>jfs</emphasis> (non disponibile su tutte le architetture)
   </para></listitem>
-  <listitem><para>
+  <listitem arch="kfreebsd-any"><para>
+    <emphasis>ufs</emphasis>
+  </para><para>
+<!--
+    The default file system is UFS.
+-->
+    Il file system predefinito è UFS.
+  </para></listitem>
+  <listitem arch="linux-any"><para>
 <!--
     <emphasis>xfs</emphasis> (not available on all architectures)
 -->
     <emphasis>xfs</emphasis> (non disponibile su tutte le architetture)
   </para></listitem>
-  <listitem><para>
+  <listitem arch="kfreebsd-any"><para>
+    <emphasis>zfs</emphasis>
+  </para><para>
+<!--
+    As ZFS support in the installer is still in development, only a basic
+    subset of ZFS features are supported. Some of them can be enabled
+    manually after the initial install, but there are some caveats:
+-->
+    È in fase di sviluppo il supporto per ZFS nell'installatore, solo
+	un sottoinsieme minimo delle funzionalità di ZFS è supportato. È
+	possibile attivare manualmente alcune funzionalità dopo l'installazione
+	ma ci sono avvertimenti:
+    <itemizedlist>
+      <listitem>
+<!--
+        Each ZFS pool will host only one filesystem. After install is finished,
+        more filesystems can be created on this pool by using the
+        <quote>zfs create</quote> command.
+-->
+        Ogni pool ZFS ospiterà solo un file system. Conclusa l'installazione,
+        è possibile creare altri file system sul pool con il comando
+        <quote>zfs create</quote>.
+      </listitem>
+      <listitem>
+<!--
+        Each ZFS pool will be composed of exactly one partition. After install
+        is finished, a single-device ZFS pool can be converted into a multi-device
+        pool by using the <quote>zpool add</quote> command, or into a mirrored
+        pool by using the <quote>zpool attach</quote> command. However, you shouldn't
+        do this on the pool that hosts root filesystem, as it would prevent GRUB
+        from booting your system.
+-->
+         Ogni pool ZFS verrà composto da esattamente una partizione. Conclusa
+		 l'installazione, un pool ZFS a device-singolo può essere convertito in
+		 un pool multi-device con il comando <quote>zpool add</quote> o in un
+		 pool con mirror usando <quote>zpool attach</quote>. Purtroppo questo
+		 pool non può ospitare il file system di root perché impedirebbe a
+		 GRUB di avviare il sistema.		 
+      </listitem>
+      <listitem>
+<!--
+        Compression is not currently supported. After the install is finished,
+        compression can be enabled by setting the <quote>compression</quote> property
+        via the <quote>zfs set</quote> command. However, if a compression algorithm
+        other than the default (lzjb) is used on the pool that hosts your root
+        filesystem, this may prevent GRUB from booting your system.
+-->
+         Attualmente la compressione non è supportata. Una volta completata
+		 l'installazione è possibile attivare la compressione impostando la
+		 proprietà <quote>compression</quote> tramite il comando <quote>zfs
+		 set</quote>. Purtroppo se nel pool che ospita il proprio file
+		 system di root è usato un algoritmo di compressione diverso da
+		 quello predefinito (lzjb), GRUB potrebbe non essere capace di
+		 avviare il sistema.
+      </listitem>
+    </itemizedlist>
+  </para></listitem>
+  <listitem arch="linux-any"><para>
 <!--
     <emphasis>reiserfs</emphasis> (optional; not available on all architectures)
 -->
@@ -264,7 +329,7 @@ Sono supportati i seguenti file system.
    <sect3 id="partman-auto">
    <!-- <title>Guided Partitioning</title> -->
    <title>Partizionamento guidato</title>
-<para>
+<para arch="linux-any">
 
 <!--
 If you choose guided partitioning, you may have three options: to create
@@ -292,7 +357,7 @@ a 256 bit tramite il supporto <quote>dm-crypt</quote> del kernel.
 </footnote>.
 
 </para>
-<note><para>
+<note arch="linux-any"><para>
 
 <!--
 The option to use (encrypted) LVM may not be available on all architectures.
@@ -302,7 +367,7 @@ La possibilità di usare LVM (cifrato o no) potrebbe non essere disponibile
 su tutte le architetture.
 
 </para></note>
-<para>
+<para arch="linux-any">
 
 <!--
 When using LVM or encrypted LVM, the installer will create most
@@ -338,7 +403,7 @@ precedenti installazioni) ma può richiedere molto tempo, a seconda
 della dimensione del disco.
 
 </para>
-<note><para>
+<note arch="linux-any"><para>
 
 <!--
 If you choose guided partitioning using LVM or encrypted LVM, some changes
@@ -359,15 +424,16 @@ conferma di qualsiasi modifica prima di eseguire la scrittura sul disco.
 <para>
 
 <!--
-If you choose guided partitioning (either classic or using (encrypted)
-LVM) for a whole disk, you will first be asked to select the disk you want
+If you choose guided partitioning<phrase arch="linux-any"> (either classic or using (encrypted)
+LVM)</phrase> for a whole disk, you will first be asked to select the disk you want
 to use. Check that all your disks are listed and, if you have several disks,
 make sure you select the correct one. The order they are listed in may
 differ from what you are used to. The size of the disks may help to identify
 them.
 -->
 
-Se si sceglie il partizionamento guidato (classico, LVM o LVM cifrato)
+Se si sceglie il partizionamento guidato
+<phrase arch="linux-any">(classico, LVM o LVM cifrato)</phrase>
 dell'intero disco viene prima chiesto di scegliere il disco che si vuole
 usare, verificare che nell'elenco appaiano tutti i dischi e assicurarsi
 di scegliere quello corretto. L'ordine con cui appaiono i dischi può
@@ -379,16 +445,20 @@ può essere utile per identificare i diversi dischi.
 <!--
 Any data on the disk you select will eventually be lost, but you will always
 be asked to confirm any changes before they are written to the disk.
+<phrase arch="linux-any">
 If you have selected the classic method of partitioning, you will be able to
 undo any changes right until the end; when using (encrypted) LVM this is not
 possible.
+</phrase>
 -->
 
 Tutti i dati sul disco scelto possono andare persi, però viene richiesta la
-conferma di qualsiasi modifica prima di eseguire la scrittura sul disco. Con
+conferma di qualsiasi modifica prima di eseguire la scrittura sul disco.
+<phrase arch="linux-any">Con
 il metodo di partizionamento classico è possibile annullare qualsiasi modifica
 fino alla fine; quando si usa i metodi LVM (cifrato o no) questo non è
 possibile.
+</phrase>
 
 </para><para>
 
@@ -449,7 +519,7 @@ guidato non funziona.
 
 </tbody></tgroup></informaltable>
 
-<para>
+<para arch="linux-any">
 
 <!--
 If you choose guided partitioning using (encrypted) LVM, the installer will also create
@@ -603,14 +673,14 @@ its size, type (primary or logical), and location (beginning or end of
 the free space). After this, you will be presented with a detailed
 overview of your new partition. The main setting is <guimenuitem>Use
 as:</guimenuitem>, which determines if the partition will have a file
-system on it, or be used for swap, software RAID, LVM, an encrypted
-file system, or not be used at all. Other settings include
+system on it, or be used for swap,<phrase arch="linux-any"> software RAID, LVM, an encrypted
+file system,</phrase> or not be used at all. Other settings include
 mountpoint, mount options, and bootable flag; which settings are shown
 depends on how the partition is to be used. If you don't like the
 preselected defaults, feel free to change them to your liking. E.g. by
 selecting the option <guimenuitem>Use as:</guimenuitem>, you can
 choose a different filesystem for this partition, including options
-to use the partition for swap, software RAID, LVM, or not
+to use the partition for swap,<phrase arch="linux-any"> software RAID, LVM,</phrase> or not
 use it at all. Another nice feature is the ability to copy data from
 an existing partition onto this one.
 When you are satisfied with your new partition, select
@@ -624,15 +694,16 @@ dimensione, il tipo (primaria o logica) e la posizione (all'inizio o alla
 fine dello spazio libero). Poi è visualizzato un dettagliato resoconto della
 nuova partizione. L'opzione più importante è <guimenuitem>Usato
 come:</guimenuitem>, infatti determina se la partizione deve avere un file
-system oppure se deve essere usata come swap, in RAID software, con LVM,
-con un file system cifrato oppure se non deve essere utilizzata. Inoltre è
+system oppure se deve essere usata come swap<phrase arch="linux-any">, in RAID software, con LVM,
+con un file system cifrato</phrase> oppure se non deve essere utilizzata. Inoltre è
 possibile specificare altre opzioni come il punto di mount, le opzioni di
 mount e il flag avviabile; queste opzioni sono visualizzate in base all'uso
 che si intende fare della partizione. Se i valori predefiniti non sono di
 proprio gradimento si possono cambiare, per esempio selezionando l'opzione
 <guimenuitem>Usato come:</guimenuitem> si può cambiare il file system per
-la partizione compresa la possibilità di usare la partizione come swap,
-in RAID software, con LVM o non utilizzarla affatto. Un'altra comoda
+la partizione compresa la possibilità di usare la partizione come
+swap<phrase arch="linux-any">, in RAID software, con LVM</phrase>
+o non utilizzarla affatto. Un'altra comoda
 funzionalità è la possibilità di copiare i dati da una partizione
 esistente. Conclusa la configurazione della partizione si può selezionare
 <guimenuitem>Preparazione di questa partizione completata</guimenuitem>
@@ -688,7 +759,7 @@ Se si scorda la scelta o la formattazione una partizione d'avvio EFI,
 <command>partman</command> rileva questo errore e impedisce il proseguimento
 dell'installazione fino a quando non ne viene allocata una.
 
-</para><para>
+</para><para arch="linux-any">
 
 <!--
 Capabilities of <command>partman</command> can be extended with installer