diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | en/appendix/gpl.xml | 28 |
2 files changed, 15 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index edeb03849..e1ea55050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ installation-guide (20190623) UNRELEASED; urgency=medium [ Holger Wansing ] * Remove 'outdated translation' warning for Greek, is now fully translated. * Convert Czech translation from xml to po format. + * Use <quote> </quote> tags for quotes. Closes: #929752 [ Updated translations ] * German by Holger Wansing diff --git a/en/appendix/gpl.xml b/en/appendix/gpl.xml index bff5fe419..53b9e4f5e 100644 --- a/en/appendix/gpl.xml +++ b/en/appendix/gpl.xml @@ -129,13 +129,13 @@ AND MODIFICATION</emphasis> <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" +under the terms of this General Public License. The <quote>Program</quote>, below, +refers to any such program or work, and a <quote>work based on the Program</quote> 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". +the term <quote>modification</quote>.) Each licensee is addressed as <quote>you</quote>. </para><para> @@ -379,8 +379,8 @@ 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 +version number of this License which applies to it and <quote>any later +version</quote>, 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 @@ -408,7 +408,7 @@ generally. 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 +OTHER PARTIES PROVIDE THE PROGRAM <quote>AS IS</quote> 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 @@ -449,7 +449,7 @@ these terms. 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. +the <quote>copyright</quote> 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> @@ -483,28 +483,28 @@ 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' +type <quote>show w</quote>. This is free software, and you are welcome +to redistribute it under certain conditions; type <quote>show c</quote> for details. </screen></informalexample> </para><para> -The hypothetical commands `show w' and `show c' should show the +The hypothetical commands <quote>show w</quote> and <quote>show c</quote> 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 — whatever +commands you use may be called something other than <quote>show w</quote> and +<quote>show c</quote>; they could even be mouse-clicks or menu items — 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 +your school, if any, to sign a <quote>copyright disclaimer</quote> 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 +program <quote>Gnomovision</quote> (which makes passes at compilers) written by James Hacker. <replaceable>signature of Ty Coon</replaceable>, 1 April 1989 |