www/licenses/po license-compatibility.pot

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/09/14 08:56:40

Modified files:
        licenses/po    : license-compatibility.pot 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.pot?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: license-compatibility.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- license-compatibility.pot   15 Feb 2016 10:52:50 -0000      1.3
+++ license-compatibility.pot   14 Sep 2018 12:56:40 -0000      1.4
@@ -1,4 +1,4 @@
-# LANGUAGE translation of 
http://www.gnu.org/licenses/license-compatibility.html
+# LANGUAGE translation of 
https://www.gnu.org/licenses/license-compatibility.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <address@hidden>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2016-02-15 10:39+0000\n"
+"POT-Creation-Date: 2018-09-14 12:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -34,14 +34,14 @@
 msgid ""
 "If you want to combine two free programs into one, or merge code from one "
 "into the other, this raises the question of whether their licenses allow "
-"combining them."
+"combining them, or prohibit combining them.<a href=\"#f1\">(*)</a>"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
 "reasonably behaved license, as nearly all free licenses are.<a "
-"href=\"#f1\">(*)</a>"
+"href=\"#f2\">(**)</a>"
 msgstr ""
 
 #. type: Content of: <p>
@@ -84,7 +84,7 @@
 "can't be distinguished any more, that merged code should carry all the "
 "licenses of the merged parts.  Since all the licenses are lax anyway, this "
 "causes no practical problem except that the list of licenses gets long.<a "
-"href=\"#f2\">(**)</a>"
+"href=\"#f3\">(***)</a>"
 msgstr ""
 
 #. type: Content of: <p>
@@ -182,7 +182,7 @@
 msgid ""
 "Since then, I have come to question the wisdom of that decision.  Programs "
 "such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f3\">(***)</a> Perhaps "
+"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> Perhaps "
 "we should include an upgrade clause in GPL version 4, if we ever need a "
 "version 4."
 msgstr ""
@@ -284,11 +284,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"Finally, what about dual licensing?<a href=\"#f4\">(****)</a> A dual license "
-"is a disjunction: it means that the same program carries a choice of two or "
-"more different licenses.  For instance, older versions of Perl carried a "
-"dual license: the disjunction of the Artistic License and the GNU General "
-"Public License.  This meant that each user could choose to use and "
+"Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
+"license is a disjunction: it means that the same program carries a choice of "
+"two or more different licenses.  For instance, older versions of Perl "
+"carried a dual license: the disjunction of the Artistic License and the GNU "
+"General Public License.  This meant that each user could choose to use and "
 "redistribute Perl under one license or the other, or under both in "
 "disjunction like the Perl release itself.  A disjunction is compatible with "
 "a set of other licenses if any one of the license choices in the disjunction "
@@ -305,14 +305,94 @@
 msgstr ""
 
 #. type: Content of: <h3>
+msgid "Combining code"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"When a set of licenses are compatible, that means you can legally combine or "
+"merge a number of programs each licensed under one of those licenses.  How, "
+"then, is the combined program licensed?"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Each free software license says you must keep the license with the code that "
+"is covered by it.  So in a strict sense, the licensing of the combined "
+"program includes the licenses of all its parts.  However, sometimes you want "
+"a <em>summary</em> answer to the question of how the combined program is "
+"licensed.  Which licenses does someone using the combined program <em>need "
+"to pay attention to?</em>"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"To compute that, you start with a list of all the pertinent licenses.  Then "
+"you can delete from the list any license which is subsumed by another in the "
+"list."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"We say that a license A <em>subsumes</em> license B when compliance with "
+"license A implies compliance with license B."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"For instance, the GNU GPL version N and the GNU Affero GPL version N both "
+"subsume the GNU Lesser GPL version N, and all three of those subsume the GNU "
+"Lesser GPL version 2.1."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Any GNU license, version N, subsumes the Apache 2.0 license provided N is at "
+"least 3."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"The GNU GPL, version N, subsumes all versions of the Mozilla Public License "
+"that are compatible with it."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 licenses.  "
+"BSD 3 clause subsumes BSD 2 clause.  The BSD licenses subsume the Expat, X11 "
+"and ISC licenses and CC-0."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"This is not meant to be a complete list, but if we are informed of other "
+"cases worth mentioning, we will add them."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"When some license is subsumed, you still need to include a copy of it with "
+"all distribution of the combined program."
+msgstr ""
+
+#. type: Content of: <h3>
 msgid "Footnotes"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"<b>*</b> The main license in actual use that isn't reasonably behaved is the "
-"license of TeX: if two programs are licensed just the way TeX is, there is "
-"no authorized way to distribute a merged version of them."
+"<b>*</b> It is not inconceivable that other legal issues might arise about a "
+"specific combination of programs, issues not related to the copyright "
+"licenses of the programs to be combined.  We discuss only the implications "
+"of the licenses themselves."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"<b>**</b> The main license in actual use that isn't reasonably behaved is "
+"the license of TeX: if two programs are licensed just the way TeX is, there "
+"is no authorized way to distribute a merged version of them."
 msgstr ""
 
 #. type: Content of: <p>
@@ -333,29 +413,29 @@
 
 #. type: Content of: <p>
 msgid ""
-"<b>**</b> When distributing in source code form, it is usually sufficient to "
-"leave the license notices in the source code as they stand; extra license "
+"<b>***</b> When distributing in source code form, it is usually sufficient "
+"to leave the license notices in the source code as they stand; extra license "
 "notice requirements typically only come up for lax licenses when "
 "distributing binaries without the source code."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"<b>***</b> In addition, GPL version 2 still allows binaries to be made "
+"<b>****</b> In addition, GPL version 2 still allows binaries to be made "
 "nonfree by hardware that rejects all but special signed binaries, and still "
-"does not allow distribution of binaries by torrent, as it did when first "
-"published.  We fixed those things and others in version 3, but we can't "
-"change version 2."
+"does not allow distribution of binaries by torrent.  <a "
+"href=\"/licenses/rms-why-gplv3.html\">We fixed those problems, and others, "
+"in version 3</a>, but we can't change version 2."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"<b>****</b> Some inexplicably use the term &ldquo;dual licensing&rdquo; to "
-"refer to selling exceptions, but that is an abuse of language. See <a "
+"<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; to refer to "
+"selling exceptions, but that is a misnomer.  See <a "
 "href=\"/philosophy/selling-exceptions.html\"> Selling Exceptions</a>.  Note "
-"that if the license sold as an exception includes any code that is not in "
-"the ordinary free release, that's not selling exceptions, that's nonfree "
-"software."
+"that if the program on which the license is sold includes any code that is "
+"not in the free (libre) release, that's not selling exceptions, that's "
+"nonfree software."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -394,7 +474,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2016, 2018 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>