trans-coord/gnun/licenses/po license-list.pot l...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   12/01/03 19:25:09

Modified files:
        gnun/licenses/po: license-list.pot license-list.translist 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/po/license-list.pot?cvsroot=trans-coord&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/po/license-list.translist?cvsroot=trans-coord&r1=1.1&r2=1.2

Patches:
Index: license-list.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/po/license-list.pot,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- license-list.pot    24 Dec 2011 19:26:05 -0000      1.64
+++ license-list.pot    3 Jan 2012 19:25:09 -0000       1.65
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-24 14:25-0500\n"
+"POT-Creation-Date: 2012-01-03 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -699,6 +699,67 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
+"<a id=\"MPL-2.0\" href=\"http://www.mozilla.org/MPL/2.0/\";>Mozilla Public "
+"License (MPL) version 2.0</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a free software license.  Section 3.3 provides indirect "
+"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
+"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"licenses.  When you receive work under the MPL version 2.0, you may make a "
+"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
+"those GNU licenses.  When you do, section 3.3 gives you permission to "
+"distribute the MPL-covered work under the terms of that same GNU license, "
+"with one condition: you must make sure that the files that were originally "
+"under the MPL are still available under the MPL's terms as well.  In other "
+"words, when you make a combination this way, the files that were originally "
+"under the MPL will be dual licensed under the MPL and the GNU license.  The "
+"end result is that the Larger Work, as a whole, will be covered under the "
+"GNU license.  People who receive that combination from you will have the "
+"option to use any files that were originally covered by the MPL under that "
+"license's terms, or distribute the Larger Work in whole or in part under the "
+"terms of the GNU license with no further restrictions."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It's important to understand that the condition to distribute files under "
+"the MPL's terms only applies to the party that first creates and distributes "
+"the Larger Work.  If it applied to their recipients as well, it would be a "
+"further restriction and incompatible with the GNU licenses.  That said, when "
+"you make contributions to an existing project, we usually <a "
+"href=\"/licenses/license-recommendations.html#contributing\">recommend that "
+"you keep your changes under the same license</a>, even when you're not "
+"required to do so.  If you receive a work under a GNU license where some "
+"files are also under the MPL, you should only remove the MPL from those "
+"files when there's a strong reason to justify it."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Check the license notices on the MPL-covered software before you make a "
+"Larger Work this way.  Parties who release original work under the MPL "
+"version 2.0 may choose to opt out of this compatibility by including a "
+"sentence in the license notices that says that the work is "
+"&ldquo;Incompatible With Secondary Licenses.&rdquo; Any software that "
+"includes this notice is <strong>not</strong> compatible with the GPL or "
+"AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Software under previous versions of the MPL can be upgraded to version 2.0, "
+"but any software that isn't already available under one of the listed GNU "
+"licenses <strong>must</strong> be marked as Incompatible With Secondary "
+"Licenses.  This means that software that's only available under previous "
+"versions of the MPL is still incompatible with the GPL and AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid ""
 "<a id=\"NCSA\" href=\"http://www.opensource.org/licenses/UoI-NCSA.php\";> "
 "NCSA/University of Illinois Open Source License</a> <span "
 "class=\"anchor-reference-id\">(<a href=\"#NCSA\">#NCSA</a>)</span>"
@@ -727,20 +788,6 @@
 "copyleft."
 msgstr ""
 
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This disjunctive license is a good choice if you want to make your package "
-"GPL-compatible and MPL-compatible.  However, you can also accomplish that by "
-"using the LGPL or the Guile license."
-msgstr ""
-
-#. type: Content of: <dl><dd><p>
-msgid ""
-"Such a disjunctive license might be a good choice if you have been using the "
-"MPL, and want to change to a GPL-compatible license without subtracting any "
-"permission you have given for previous versions."
-msgstr ""
-
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"newOpenLDAP\" "
@@ -1253,10 +1300,10 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It is based on the <a "
-"href=\"#MPL\">Mozilla Public License</a>, and is incompatible with the GPL "
-"for the same reasons: it has several requirements for modified versions that "
-"do not exist in the GPL.  It also requires you to publish the source of the "
-"program if you allow others to use it."
+"href=\"#MPL\">Mozilla Public License</a> version 1, and is incompatible with "
+"the GPL for the same reasons: it has several requirements for modified "
+"versions that do not exist in the GPL.  It also requires you to publish the "
+"source of the program if you allow others to use it."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1516,7 +1563,7 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
-"Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a "
+"Public License (MPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#MPL\">#MPL</a>)</span>"
 msgstr ""
 
@@ -1549,7 +1596,7 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the NOSL has some complex "
+"Public License version 1.1.  Like the MPL, the NOSL has some complex "
 "restrictions that make it incompatible with the GNU GPL.  That is, a module "
 "covered by the GPL and a module covered by the NOSL cannot legally be linked "
 "together.  We urge you not to use the NOSL for this reason."
@@ -1565,11 +1612,11 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
-"with the GNU GPL.  It consists of the Mozilla Public License with an added "
-"clause that permits Netscape to use your added code <em>even in their "
-"proprietary versions of the program</em>.  Of course, they do not give "
-"<em>you</em> permission to use <em>their</em> code in the analogous way.  We "
-"urge you not to use the NPL."
+"with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
+"with an added clause that permits Netscape to use your added code <em>even "
+"in their proprietary versions of the program</em>.  Of course, they do not "
+"give <em>you</em> permission to use <em>their</em> code in the analogous "
+"way.  We urge you not to use the NPL."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1581,8 +1628,8 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is similar to the Mozilla Public License: a free software license "
-"incompatible with the GNU GPL."
+"This is similar to the Mozilla Public License version 1: a free software "
+"license incompatible with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1805,10 +1852,10 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is essentially the same as the Mozilla Public License: a free software "
-"license incompatible with the GNU GPL.  Please do not confuse this with the "
-"<a href=\"#SunCommunitySourceLicense\">Sun Community Source License</a>, "
-"which is not a free software license."
+"This is essentially the same as the Mozilla Public License version 1: a free "
+"software license incompatible with the GNU GPL.  Please do not confuse this "
+"with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+"License</a>, which is not a free software license."
 msgstr ""
 
 #. type: Content of: <dl><dt>

Index: license-list.translist
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/licenses/po/license-list.translist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- license-list.translist      20 Sep 2011 18:27:46 -0000      1.1
+++ license-list.translist      3 Jan 2012 19:25:09 -0000       1.2
@@ -2,7 +2,7 @@
 <div id="translations">
 <ul class="translations-list">
 <!-- English -->
-<li><a href="/licenses/license-list.html">English</a>&nbsp;[en]</li>
+<li><a href="/licenses/license-list.en.html">English</a>&nbsp;[en]</li>
 </ul>
 </div> <!-- id="translations" -->
 <!-- end translinks file -->