Remove the english translation and use new option, adapt some paragraphs of the GPL (but not all) to the XML formatting in the english text

1 files changed, 56 insertions, 564 deletions

diff --git a/es/appendix/gpl.xml b/es/appendix/gpl.xml
index d48470526..8ab5642de 100644
--- a/es/appendix/gpl.xml
+++ b/es/appendix/gpl.xml
@@ -1,526 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 29618 -->
+<!-- original version: 38979 -->
 <!-- revisado por jfs, 21 noviembre 2004-->
 
 <appendix id="appendix-gpl"><title>Licencia pública general GNU</title>
 
-
-<para>
-Nota: A continuación se muestra la licencia original seguida de una traducción
-no oficial realizada por Jesús González Barahona y  Pedro de las Heras Quirós.
-</para>
-
-<sect1><title>Licencia original (en inglés)</title>
-
-<para>
-Version 2, June 1991.
-</para><para>
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-&mdash;
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-</para><para>
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-</para>
-
- <sect2><title>Preamble</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
-software &mdash; to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-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>
- </sect2>
-
- <sect2><title>GNU GENERAL PUBLIC LICENSE</title>
-<para>
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-</para>
-
-<itemizedlist><listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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><para>
-
-a) You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-</para><para>
-
-b) 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><para>
-
-c) 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><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></listitem>
-<listitem><para>
-
-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><para>
-
-a) 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><para>
-
-b) 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><para>
-
-c) 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><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></listitem>
-<listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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.
-
-</para></listitem>
-<listitem><para>
-
-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>
-
-NO WARRANTY
-
-</para></listitem>
-<listitem><para>
-
-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></listitem>
-<listitem><para>
-
-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></listitem>
-</itemizedlist>
-<para>
-
-END OF TERMS AND CONDITIONS
-
-</para>
- </sect2>
-
- <sect2><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.
-
-</para><para>
-
-one line to give the program's name and a brief idea of what it
-does.
-
-</para><para>
-
-Copyright (C) year name of author
-
-</para><para>
-
-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.
-
-</para><para>
-
-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.
-
-</para><para>
-
-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 St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-</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:
-
-</para><para>
-
-Gnomovision version 69, Copyright (C) year name of author
-
-</para><para>
-
-Gnomovision comes with absolutely no warranty; for details type `show
-w'.
-
-</para><para>
-
-This is free software, and you are welcome to redistribute it under
-certain conditions; type `show c' for details.
-
-</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:
-
-</para><para>
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in the
-program `Gnomovision' (which makes passes at compilers) written by
-James Hacker.
-
-</para><para>
-
-signature of Ty Coon, 1 April 1989
-
-</para><para>
-
-Ty Coon, President of Vice
-
-</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 Library General Public License instead of this
-License.
-
-</para>
-</sect2>
-</sect1>
-
-<sect1><title>Licencia traducida</title>
-
-<para>
+<note condition="gpl-unofficial"><para>
 
 This is an unofficial translation of the GNU General Public License into
 Spanish. It was not published by the Free Software Foundation, and does
@@ -531,29 +15,31 @@ will help Spanish speakers to better understand the GNU GPL.
 
 </para><para>
 
-NOTA IMPORTANTE (de los traductores de la licencia): Esta es una
-     traducción no oficial al español de la GNU General Public
-     License. No ha sido publicada por la Free Software Foundation, y
-     no establece legalmente las condiciones de distribución para el
-     software que usa la GNU GPL. Estas condiciones se establecen
-     solamente por el <ulink url="&url-gnu-copyleft;">texto
-     original</ulink>, en inglés, de la GNU GPL. Sin
-     embargo, esperamos que esta traducción ayude a los
-     hispanohablantes a entender mejor la GNU GPL.
-</para>
+Esta es una traducción no oficial al español de la GNU General Public
+License realizada por Jesús González Barahona y Pedro de las Heras
+Quirós. No ha sido publicada por la Free Software Foundation, y no
+establece legalmente las condiciones de distribución para el software
+que usa la GNU GPL. Estas condiciones se establecen solamente por el
+<ulink url="&url-gnu-copyleft;">texto original</ulink>, en inglés, de
+la GNU GPL. Sin embargo, esperamos que esta traducción ayude a los
+hispanohablantes a entender mejor la GNU GPL.
 
+</para></note>
 <para>
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-&mdash;
-59 Temple Place &mdash; Suite 330, Boston, MA 02111-1307, USA.
-</para><para>
 
-   Se permite la copia y distribución de copias literales de este
-   documento, pero no se permite su modificación.
+Versión 2, June 1991
+
+<informalexample><screen>
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Se permite la copia y distribución de copias literales de este
+documento, pero no se permite su modificación.
+</screen></informalexample>
 
 </para>
 
-<sect2><title>Preámbulo</title>
+<simplesect><title>Preámbulo</title>
 <para>
 
    Las licencias que cubren la mayor parte del software están diseñadas
@@ -618,12 +104,14 @@ NOTA IMPORTANTE (de los traductores de la licencia): Esta es una
    Los términos exactos y las condiciones para la copia, distribución y
    modificación se exponen a continuación.
 </para>
-</sect2>
+</simplesect>
 
- <sect2><title>LICENCIA PÚBLICA GENERAL GNU</title>
+ <simplesect><title>LICENCIA PÚBLICA GENERAL GNU</title>
 <para>
 
-Términos y condiciones para la copia, distribución y modificación
+<emphasis role="bold">Términos y condiciones para la copia, distribución y modificación
+</emphasis>
+
 </para>
 
 <itemizedlist><listitem><para>
@@ -874,7 +362,8 @@ Usted puede copiar y distribuir copias literales del código fuente
 
 </para><para>
 
-AUSENCIA DE GARANTÍA
+<emphasis role="bold">AUSENCIA DE GARANTÍA</emphasis>
+
 </para></listitem>
 <listitem><para>
        Como el programa se licencia libre de cargas, no se ofrece ninguna
@@ -905,11 +394,13 @@ AUSENCIA DE GARANTÍA
 </para></listitem>
 </itemizedlist>
 <para>
-   FIN DE TÉRMINOS Y CONDICIONES
+
+<emphasis role="bold">FIN DE TÉRMINOS Y CONDICIONES</emphasis>
+
 </para>
- </sect2>
+ </simplesect>
 
-<sect2><title>Cómo aplicar estos términos a sus nuevos programas</title>
+<simplesect><title>Cómo aplicar estos términos a sus nuevos programas</title>
 <para>
 
    Si usted desarrolla un nuevo Programa, y quiere que sea del mayor uso
@@ -924,11 +415,9 @@ AUSENCIA DE GARANTÍA
    debería tener al menos la línea de «copyright» y un indicador a dónde
    puede encontrarse el anuncio completo.
 </para><para>
-   «una línea para indicar el nombre del programa y una rápida idea de
-   qué hace.»
-</para><para>
-
-   Copyright (C) 19aa «nombre del autor»
+<informalexample><screen>
+<replaceable>una línea para indicar el nombre del programa y una rápida idea de qué hace.</replaceable>
+Copyright (C) <replaceable>año  nombre del autor</replaceable>
 </para><para>
 
    Este programa es software libre. Puede redistribuirlo y/o modificarlo
@@ -954,14 +443,15 @@ AUSENCIA DE GARANTÍA
 </para><para>
    Si el programa es interactivo, haga que muestre un pequeño anuncio
    como el siguiente, cuando comienza a funcionar en modo interactivo:
-</para><para>
-   Gnomovision versión 69, Copyright (C) 19aa nombre del autor
-</para><para>
-   Gnomovision no ofrece ABSOLUTAMENTE NINGUNA GARANTÍA. Para más
-   detalles escriba «show w».
-</para><para>
-   Esto es software libre, y vd. es libre de redistribuirlo bajo ciertas
-   condiciones. Para más detalles escriba «show c».
+
+<informalexample><screen>
+Gnomovision versión 69, Copyright (C)  <replaceable>año nombre del autor</replaceable>
+Gnomovision no ofrece ABSOLUTAMENTE NINGUNA GARANTÍA. Para más
+detalles escriba «show w».
+Esto es software libre, y vd. es libre de redistribuirlo bajo ciertas
+condiciones. Para más detalles escriba «show c».
+</screen></informalexample>
+
 </para><para>
    Los comandos hipotéticos «show w» y «show c» deberían mostrar las
    partes adecuadas de la Licencia Pública General. Por supuesto, los
@@ -973,14 +463,16 @@ AUSENCIA DE GARANTÍA
    programador) o tu Universidad (si es el caso) firme un «renuncia de
    copyright» para el programa, si es necesario. A continuación se ofrece
    un ejemplo, altere los nombres según sea conveniente:
-</para><para>
-       Yoyodyne, Inc. mediante este documento renuncia a cualquier interés de
-       derechos de copyright con respecto al programa Gnomovision (que
-       hace pasadas a compiladores) escrito por Pepe Programador.
-</para><para>
-       «firma de Pepito Grillo», 20 de diciembre de 1996
-</para><para>
-       Pepito Grillo, Presidente de Asuntillos Varios.
+
+<informalexample><screen>
+Yoyodyne, Inc. mediante este documento renuncia a cualquier interés de
+derechos de copyright con respecto al programa Gnomovision (que
+hace pasadas a compiladores) escrito por Pepe Programador.
+
+<replaceable>firma de Pepito Grillo</replaceable>, 20 de diciembre de 1996
+ Pepito Grillo, Presidente de Asuntillos Varios.
+</screen></informalexample>
+
 </para><para>
    Esta Licencia Pública General no permite que incluya sus programas en
    programas propietarios. Si su programa es una biblioteca de
@@ -990,6 +482,6 @@ AUSENCIA DE GARANTÍA
    Licencia.
 
 </para>
-</sect2>
+</simplesect>
 </sect1>
 </appendix>