Update of original English docs

1 files changed, 67 insertions, 60 deletions

diff --git a/nl/appendix/gpl.xml b/nl/appendix/gpl.xml
index 51b909c61..232007b59 100644
--- a/nl/appendix/gpl.xml
+++ b/nl/appendix/gpl.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36843 untranslated -->
+<!-- original version: 36879 untranslated -->
 
 <appendix id="appendix-gpl"><title>GNU General Public License</title>
 
@@ -7,19 +7,48 @@
 
 Version 2, June 1991
 
-</para><para>
-
+<informalexample><screen>
 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.
+</screen></informalexample>
 
 </para>
+<note condition="gpl-unofficial"><para>
+
+[[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
+additional information. Its condition is "gpl-unofficial".]]
+[[LEAVE THIS PARAGRAPH IN ENGLISH! Only replace {language} with the English
+name of your language.]]
+
+This is an unofficial translation of the GNU General Public License into
+{language}. It was not published by the Free Software Foundation, and does
+not legally state the distribution terms for software that uses the GNU
+GPL--only the original English text of the GNU GPL does that. However, we
+hope that this translation will help {language} speakers understand the
+GNU GPL better.
+
+</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
+name of your language before translating.]]
+
+This is an unofficial translation of the GNU General Public License into
+{language}. It was not published by the Free Software Foundation, and does
+not legally state the distribution terms for software that uses the GNU
+GPL--only the original English text of the GNU GPL does that. However, we
+hope that this translation will help {language} speakers understand the
+GNU GPL better.
 
- <sect1><title>Preamble</title>
+</para></note>
+
+ <simplesect><title>Preamble</title>
 <para>
 
 The licenses for most software are designed to take away your freedom
@@ -87,9 +116,9 @@ The precise terms and conditions for copying, distribution and
 modification follow.
 
 </para>
- </sect1>
+ </simplesect>
 
- <sect1><title>GNU GENERAL PUBLIC LICENSE</title>
+ <simplesect><title>GNU GENERAL PUBLIC LICENSE</title>
 <para>
 
 <emphasis role="bold">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION
@@ -405,9 +434,9 @@ SUCH DAMAGES.
 <emphasis role="bold">END OF TERMS AND CONDITIONS</emphasis>
 
 </para>
- </sect1>
+ </simplesect>
 
- <sect1><title>How to Apply These Terms to Your New Programs</title>
+ <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
@@ -422,35 +451,24 @@ 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.
+<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>
 
-</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.
+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.
 
-You should have received a copy of the gnu General Public License
+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.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+</screen></informalexample>
 
 </para><para>
 
@@ -462,19 +480,13 @@ mail.
 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.
+<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>
 
@@ -490,19 +502,14 @@ 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>
-
+<informalexample><screen>
 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>
+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>
 
@@ -510,9 +517,9 @@ 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
+to do, use the GNU Lesser General Public License instead of this
 License.
 
 </para>
- </sect1>
+ </simplesect>
 </appendix>