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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/02/11 19:27:03

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

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.22&r2=1.23

Patches:
Index: license-list.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/po/license-list.pot,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- license-list.pot    22 Jan 2009 19:26:54 -0000      1.22
+++ license-list.pot    11 Feb 2009 19:27:03 -0000      1.23
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-01-22 14:25-0500\n"
+"POT-Creation-Date: 2009-02-11 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"
@@ -605,29 +605,6 @@
 
 # type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ms-pl\" "
-"href=\"http://www.microsoft.com/opensource/licenses.mspx\";>Microsoft Public "
-"License (Ms-PL)</a>"
-msgstr ""
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"This is a free software license, compatible with version 3 of the GNU GPL.  "
-"It is incompatible with version 2 of the GNU GPL because of the conditions "
-"in sections 3(B) and 3(C)."
-msgstr ""
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"Please do not use this license for anything you write; there are already "
-"well-known free software licenses that serve the same purpose, such as the "
-"<a href=\"#apache2\">Apache License version 2.0</a>, and we must all stand "
-"together to combat license proliferation.  However, there is no reason to "
-"avoid using software released under this license."
-msgstr ""
-
-# type: Content of: <dl><dt>
-msgid ""
 "<a id=\"NCSA\" "
 "href=\"http://www.otm.uiuc.edu/faculty/forms/opensource.asp\";> "
 "NCSA/University of Illinois Open Source License</a>"
@@ -1095,10 +1072,9 @@
 msgstr ""
 
 # type: Content of: <dl><dd><p>
-#:  
 msgid ""
-"This is a free software license.  Unfortunately, it has a choice of law "
-"clause which makes it incompatible with the GNU GPL."
+"This is a free software license.  Unfortunately, its weak copyleft and "
+"choice of law clause make it incompatible with the GNU GPL."
 msgstr ""
 
 # type: Content of: <dl><dt>
@@ -1136,6 +1112,12 @@
 "License, Version 1.0</a>"
 msgstr ""
 
+# type: Content of: <dl><dd><p>
+msgid ""
+"This is a free software license.  Unfortunately, it has a choice of law "
+"clause which makes it incompatible with the GNU GPL."
+msgstr ""
+
 # type: Content of: <dl><dt>
 msgid ""
 "<a href=\"http://www.borland.com/devsupport/interbase/opensource/IPL.html\";> "
@@ -1253,20 +1235,35 @@
 
 # type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ms-rl\" "
-"href=\"http://www.microsoft.com/resources/sharedsource/licensingbasics/reciprocallicense.mspx\";>Microsoft
 "
-"Reciprocal License (Ms-RL)</a>"
+"<a id=\"ms-pl\" "
+"href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-PL\";>Microsoft "
+"Public License (Ms-PL)</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license; it has a copyleft that is not strong, but "
-"incompatible with the GNU GPL.  We urge you not to use the Ms-RL for this "
+"incompatible with the GNU GPL.  We urge you not to use the Ms-PL for this "
 "reason."
 msgstr ""
 
 # type: Content of: <dl><dt>
 msgid ""
+"<a id=\"ms-rl\" "
+"href=\"http://www.microsoft.com/opensource/licenses.mspx#Ms-RL\";>Microsoft "
+"Reciprocal License (Ms-RL)</a>"
+msgstr ""
+
+# type: Content of: <dl><dd><p>
+msgid ""
+"This is a free software license.  It's based on the <a "
+"href=\"#ms-pl\">Microsoft Public License</a>, and has an additional clause "
+"to make the copyleft just a little bit stronger.  It's also incompatible "
+"with the GNU GPL, and we urge you not to use the Ms-RL for this reason."
+msgstr ""
+
+# type: Content of: <dl><dt>
+msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
 "Public License (MPL)</a>"
 msgstr ""