www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www education/education.es.html education/po/ed...


From: GNUN
Subject: www education/education.es.html education/po/ed...
Date: Fri, 24 Feb 2012 02:04:44 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/02/24 02:04:44

Modified files:
        education      : education.es.html 
        education/po   : education.es-en.html education.es.po 
        fun            : humor.de.html humor.ja.html 
        fun/po         : humor.de-en.html humor.de.po humor.ja-en.html 
                         humor.ja.po humor.pot 
        licenses       : license-list.es.html license-list.it.html 
        licenses/po    : license-list.es-en.html license-list.it-en.html 
                         license-list.it.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.es.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.es-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.es.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.de.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.ja.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.de-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.de.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.ja-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.ja.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.pot?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.es.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.it.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.44&r2=1.45

Patches:
Index: education/education.es.html
===================================================================
RCS file: /web/www/www/education/education.es.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- education/education.es.html 16 Feb 2012 17:30:58 -0000      1.17
+++ education/education.es.html 24 Feb 2012 02:01:28 -0000      1.18
@@ -4,7 +4,7 @@
 <!-- Parent-Version: 1.57 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>Software libre  y educación - Proyecto GNU - Free Sofware 
Foundation</title>
+<title>Software libre  y educación - Proyecto GNU - Free Software 
Foundation</title>
 
 <!--#include virtual="/server/banner.es.html" -->
 <!--#include virtual="/education/po/education.translist" -->
@@ -164,7 +164,7 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-$Date: 2012/02/16 17:30:58 $
+$Date: 2012/02/24 02:01:28 $
 
 <!-- timestamp end -->
 </p>

Index: education/po/education.es-en.html
===================================================================
RCS file: /web/www/www/education/po/education.es-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- education/po/education.es-en.html   16 Feb 2012 17:32:19 -0000      1.5
+++ education/po/education.es-en.html   24 Feb 2012 02:02:03 -0000      1.6
@@ -147,7 +147,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/16 17:32:19 $
+$Date: 2012/02/24 02:02:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education/po/education.es.po
===================================================================
RCS file: /web/www/www/education/po/education.es.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- education/po/education.es.po        23 Feb 2012 18:21:56 -0000      1.25
+++ education/po/education.es.po        24 Feb 2012 02:02:04 -0000      1.26
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2012-02-23 19:20+0100\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Content of: <title>

Index: fun/humor.de.html
===================================================================
RCS file: /web/www/www/fun/humor.de.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/humor.de.html   19 Feb 2012 09:29:47 -0000      1.4
+++ fun/humor.de.html   24 Feb 2012 02:02:39 -0000      1.5
@@ -18,9 +18,6 @@
 
 <h3 id="CreateMoreLaughs">Erstell&#8217; mehr Lacher</h3>
 
-<p>Hier sind noch einige <a href="/server/tasks.html#fun">weitere Lacher</a>,
-die hinzugefügt werden könnten&#8230;</p>
-
 <p>Humorvolle Einsendungen sind willkommen und erwünscht. Weitere 
Informationen
 unter <a href="#guidelines">Leitfaden für humorvolle Einsendungen</a>.</p>
 
@@ -375,7 +372,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/02/19 09:29:47 $
+$Date: 2012/02/24 02:02:39 $
 
 <!-- timestamp end -->
 </p>

Index: fun/humor.ja.html
===================================================================
RCS file: /web/www/www/fun/humor.ja.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/humor.ja.html   22 Feb 2012 09:31:11 -0000      1.6
+++ fun/humor.ja.html   24 Feb 2012 02:02:40 -0000      1.7
@@ -17,8 +17,6 @@
 
 <h3 id="CreateMoreLaughs">もっと笑いを</h3>
 
-<p>まだこのページに追加されていない<a 
href="/server/tasks.html#fun">その他のおもしろ</a>がいくつかここにあります。</p>
-
 
<p>ユーモアの投稿は歓迎かつ推奨されます。ユーモアセクションへの投稿について詳しくは、<a
 
href="#Guidelines">ユーモアの投稿ガイドライン</a>をお読みくだ
さい。</p>
 
@@ -320,7 +318,7 @@
  <p><!-- timestamp start -->
 最終更新:
 
-$Date: 2012/02/22 09:31:11 $
+$Date: 2012/02/24 02:02:40 $
 
 <!-- timestamp end -->
 </p>

Index: fun/po/humor.de-en.html
===================================================================
RCS file: /web/www/www/fun/po/humor.de-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/po/humor.de-en.html     19 Feb 2012 09:30:46 -0000      1.2
+++ fun/po/humor.de-en.html     24 Feb 2012 02:03:36 -0000      1.3
@@ -15,9 +15,6 @@
 
 <h3 id="CreateMoreLaughs">Create More Laughs</h3>
 
-<p>Here are some <a href="/server/tasks.html#fun">more laughs</a> that
-could be added here.</p>
-
 <p>Humor submissions are welcome and encouraged.  Please read
 <a href="#Guidelines">Humor Submission Guidelines</a> for details
 about submitting content for the humor section.</p>
@@ -343,7 +340,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/19 09:30:46 $
+$Date: 2012/02/24 02:03:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: fun/po/humor.de.po
===================================================================
RCS file: /web/www/www/fun/po/humor.de.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fun/po/humor.de.po  19 Feb 2012 09:30:46 -0000      1.5
+++ fun/po/humor.de.po  24 Feb 2012 02:03:36 -0000      1.6
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2011-09-20 12:26-0300\n"
+"POT-Creation-Date: 2012-02-23 20:25-0500\n"
 "PO-Revision-Date: 2011-08-10 18:12+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online (PUNKT) de>\n"
 "Language-Team: German <address@hidden>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 #. type: Content of: <title>
 msgid "Laugh along with GNU - GNU Project - Free Software Foundation (FSF)"
@@ -50,14 +50,6 @@
 
 #. type: Content of: <p>
 msgid ""
-"Here are some <a href=\"/server/tasks.html#fun\">more laughs</a> that could "
-"be added here."
-msgstr ""
-"Hier sind noch einige <a href=\"/server/tasks.html#fun\">weitere Lacher</a>, "
-"die hinzugefügt werden könnten&#8230;"
-
-#. type: Content of: <p>
-msgid ""
 "Humor submissions are welcome and encouraged.  Please read <a href="
 "\"#Guidelines\">Humor Submission Guidelines</a> for details about submitting "
 "content for the humor section."
@@ -739,5 +731,12 @@
 msgid "Updated:"
 msgstr "Aktualisierung:"
 
+#~ msgid ""
+#~ "Here are some <a href=\"/server/tasks.html#fun\">more laughs</a> that "
+#~ "could be added here."
+#~ msgstr ""
+#~ "Hier sind noch einige <a href=\"/server/tasks.html#fun\">weitere Lacher</"
+#~ "a>, die hinzugefügt werden könnten&#8230;"
+
 #~ msgid "Translations of this page"
 #~ msgstr "Übersetzungen dieser Seite"

Index: fun/po/humor.ja-en.html
===================================================================
RCS file: /web/www/www/fun/po/humor.ja-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/po/humor.ja-en.html     22 Feb 2012 09:31:13 -0000      1.2
+++ fun/po/humor.ja-en.html     24 Feb 2012 02:03:37 -0000      1.3
@@ -15,9 +15,6 @@
 
 <h3 id="CreateMoreLaughs">Create More Laughs</h3>
 
-<p>Here are some <a href="/server/tasks.html#fun">more laughs</a> that
-could be added here.</p>
-
 <p>Humor submissions are welcome and encouraged.  Please read
 <a href="#Guidelines">Humor Submission Guidelines</a> for details
 about submitting content for the humor section.</p>
@@ -343,7 +340,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/22 09:31:13 $
+$Date: 2012/02/24 02:03:37 $
 <!-- timestamp end -->
 </p>
 </div>

Index: fun/po/humor.ja.po
===================================================================
RCS file: /web/www/www/fun/po/humor.ja.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- fun/po/humor.ja.po  22 Feb 2012 09:31:15 -0000      1.3
+++ fun/po/humor.ja.po  24 Feb 2012 02:03:37 -0000      1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: humor.html\n"
-"POT-Creation-Date: 2011-09-20 12:26-0300\n"
+"POT-Creation-Date: 2012-02-23 20:25-0500\n"
 "PO-Revision-Date: 2012-02-16 22:01+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -54,14 +54,6 @@
 
 #. type: Content of: <p>
 msgid ""
-"Here are some <a href=\"/server/tasks.html#fun\">more laughs</a> that could "
-"be added here."
-msgstr ""
-"まだこのページに追加されていない<a 
href=\"/server/tasks.html#fun\">その他のお"
-"もしろ</a>がいくつかここにあります。"
-
-#. type: Content of: <p>
-msgid ""
 "Humor submissions are welcome and encouraged.  Please read <a href="
 "\"#Guidelines\">Humor Submission Guidelines</a> for details about submitting "
 "content for the humor section."
@@ -664,3 +656,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最終更新:"
+
+#~ msgid ""
+#~ "Here are some <a href=\"/server/tasks.html#fun\">more laughs</a> that "
+#~ "could be added here."
+#~ msgstr ""
+#~ "まだこのページに追加されていない<a 
href=\"/server/tasks.html#fun\">その他"
+#~ "のおもしろ</a>がいくつかここにあります。"

Index: fun/po/humor.pot
===================================================================
RCS file: /web/www/www/fun/po/humor.pot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/po/humor.pot    20 Sep 2011 17:11:42 -0000      1.6
+++ fun/po/humor.pot    24 Feb 2012 02:03:37 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-20 12:26-0300\n"
+"POT-Creation-Date: 2012-02-23 20: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"
@@ -45,12 +45,6 @@
 
 #. type: Content of: <p>
 msgid ""
-"Here are some <a href=\"/server/tasks.html#fun\">more laughs</a> that could "
-"be added here."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
 "Humor submissions are welcome and encouraged.  Please read <a "
 "href=\"#Guidelines\">Humor Submission Guidelines</a> for details about "
 "submitting content for the humor section."

Index: licenses/license-list.es.html
===================================================================
RCS file: /web/www/www/licenses/license-list.es.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- licenses/license-list.es.html       6 Feb 2012 01:28:57 -0000       1.20
+++ licenses/license-list.es.html       24 Feb 2012 02:04:20 -0000      1.21
@@ -1111,15 +1111,19 @@
 <p>Esta es una licencia de software libre que no posee un copyleft fuerte. A
 diferencia de la <a href="#X11License">X11 license</a>, posee algunas
 restricciones complejas que la hacen incompatible con la <a
-href="/licenses/gpl.html">GPL de GNU</a>. Esto significa que un módulo
-cubierto por la GPL y otro por la MPL no pueden ser legalmente
-enlazados. Por esta razón le instamos a no utilizar esta licencia.</p>
+href="/licenses/gpl.html">GPL de GNU</a>. En concreto, un módulo cubierto
+por la GPL y otro por la MPL no pueden ser legalmente enlazados. Por esta
+razón le instamos a no utilizar la MPL 1.1.</p>
 
 <p>Sin embargo, la MPL 1.1 posee una previsión (sección 13) que permite a un
 programa (o a una de sus partes) ofrecer la elección de otra licencia
 simultánea. Si parte de un programa incluye a la GPL de GNU como
 alternativa, o alguna otra licencia compatible con élla, dicha parte del
-programa está bajo una licencia compatible con la GPL.</p></dd>
+programa está bajo una licencia compatible con la GPL.</p>
+
+<p>La versión 2.0 de la MPL tiene un buen número de mejoras, incluyendo la
+compatibilidad por defecto con la GPL.  <a href="#MPL-2.0">Vea ese
+elemento</a> para información más detallada.</p></dd>
 
 
 <dt><a id="NOSL" href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";>
@@ -2112,7 +2116,7 @@
  <p><!-- timestamp start -->
 Última actualización:
 
-$Date: 2012/02/06 01:28:57 $
+$Date: 2012/02/24 02:04:20 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/license-list.it.html
===================================================================
RCS file: /web/www/www/licenses/license-list.it.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses/license-list.it.html       2 Feb 2012 02:09:55 -0000       1.24
+++ licenses/license-list.it.html       24 Feb 2012 02:04:21 -0000      1.25
@@ -1117,13 +1117,17 @@
 restrizioni complesse che la rendono incompatibile con la <a
 href="/licenses/gpl.html">GNU GPL</a>. Per questo, un modulo rilasciato
 sotto licenza GPL ed uno rilasciato sotto MPL non possono essere legalmente
-uniti assieme. Vi invitiamo a non utilizzare la MPL per questo motivo. </p>
+uniti assieme. Vi invitiamo a non utilizzare la MPL 1.1 per questo motivo. </p>
 
 <p>Ad ogni modo, la MPL versione 1.1 ha una clausola (sezione 13) che permette
 ad un programma (o ad una sua parte) di offrire la possibilità di scegliere
 anche un'altra licenza. Se parte di un programma permette la GNU GPL come
 scelta alternativa, o qualunque altra licenza compatibile con la GPL, quella
-parte di programma ha una licenza compatibile con la GPL. </p></dd>
+parte di programma ha una licenza compatibile con la GPL. </p>
+
+<p>La versione 2.0 della MPL presenta numerosi miglioramenti, tra cui la
+compatibilità con la GPL nell'utilizzo standard. Per dettagli, vedere la <a
+href="#MPL-2.0">sezione dedicata</a>.</p></dd>
 
 
 <dt><a id="NOSL" href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";> La
@@ -2090,7 +2094,7 @@
  <p><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2012/02/02 02:09:55 $
+$Date: 2012/02/24 02:04:21 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.es-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- licenses/po/license-list.es-en.html 6 Feb 2012 01:29:03 -0000       1.7
+++ licenses/po/license-list.es-en.html 24 Feb 2012 02:04:30 -0000      1.8
@@ -1175,16 +1175,21 @@
 <dd>
 <p>This is a free software license which is not a strong copyleft;
 unlike the <a href="#X11License">X11 license</a>, it has some complex
-restrictions that make it incompatible with the <a
-href="/licenses/gpl.html">GNU GPL</a>.  That is, a
-module covered by the GPL and a module covered by the MPL cannot legally
-be linked together.  We urge you not to use the MPL for this reason.</p>
+restrictions that make it incompatible with
+the <a href="/licenses/gpl.html">GNU GPL</a>.  That is, a module
+covered by the GPL and a module covered by the MPL cannot legally be
+linked together.  We urge you not to use the MPL 1.1 for this
+reason.</p>
 
 <p>However, MPL 1.1 has a provision (section 13) that allows a program
 (or parts of it) to offer a choice of another license as well.  If part
 of a program allows the GNU GPL as an alternate choice, or any other
 GPL-compatible license as an alternate choice, that part of the program
-has a GPL-compatible license.</p></dd>
+has a GPL-compatible license.</p>
+
+<p>MPL version 2.0 has a number of improvements, including
+GPL-compatibility by default.  <a href="#MPL-2.0">See that entry</a>
+for details.</p></dd>
 
 
 <dt><a id="NOSL" href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";>
@@ -2210,7 +2215,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/06 01:29:03 $
+$Date: 2012/02/24 02:04:30 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.it-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- licenses/po/license-list.it-en.html 2 Feb 2012 02:10:34 -0000       1.7
+++ licenses/po/license-list.it-en.html 24 Feb 2012 02:04:32 -0000      1.8
@@ -1175,16 +1175,21 @@
 <dd>
 <p>This is a free software license which is not a strong copyleft;
 unlike the <a href="#X11License">X11 license</a>, it has some complex
-restrictions that make it incompatible with the <a
-href="/licenses/gpl.html">GNU GPL</a>.  That is, a
-module covered by the GPL and a module covered by the MPL cannot legally
-be linked together.  We urge you not to use the MPL for this reason.</p>
+restrictions that make it incompatible with
+the <a href="/licenses/gpl.html">GNU GPL</a>.  That is, a module
+covered by the GPL and a module covered by the MPL cannot legally be
+linked together.  We urge you not to use the MPL 1.1 for this
+reason.</p>
 
 <p>However, MPL 1.1 has a provision (section 13) that allows a program
 (or parts of it) to offer a choice of another license as well.  If part
 of a program allows the GNU GPL as an alternate choice, or any other
 GPL-compatible license as an alternate choice, that part of the program
-has a GPL-compatible license.</p></dd>
+has a GPL-compatible license.</p>
+
+<p>MPL version 2.0 has a number of improvements, including
+GPL-compatibility by default.  <a href="#MPL-2.0">See that entry</a>
+for details.</p></dd>
 
 
 <dt><a id="NOSL" href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";>
@@ -2210,7 +2215,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/02 02:10:34 $
+$Date: 2012/02/24 02:04:32 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- licenses/po/license-list.it.po      23 Feb 2012 22:11:57 -0000      1.44
+++ licenses/po/license-list.it.po      24 Feb 2012 02:04:33 -0000      1.45
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-02-22 20:27-0500\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -2492,20 +2491,7 @@
 "(<a href=\"#MPL\">#MPL</a>)</span>"
 
 # type: Content of: <dl><dd><p>
-# | This is a free software license which is not a strong copyleft; unlike the
-# | <a href=\"#X11License\">X11 license</a>, it has some complex restrictions
-# | that make it incompatible with the <a href=\"/licenses/gpl.html\">GNU
-# | GPL</a>.  That is, a module covered by the GPL and a module covered by the
-# | MPL cannot legally be linked together.  We urge you not to use the MPL
-# | {+1.1+} for this reason.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a free software license which is not a strong copyleft; unlike "
-#| "the <a href=\"#X11License\">X11 license</a>, it has some complex "
-#| "restrictions that make it incompatible with the <a href=\"/licenses/gpl."
-#| "html\">GNU GPL</a>.  That is, a module covered by the GPL and a module "
-#| "covered by the MPL cannot legally be linked together.  We urge you not to "
-#| "use the MPL for this reason."
+#. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license which is not a strong copyleft; unlike the "
 "<a href=\"#X11License\">X11 license</a>, it has some complex restrictions "



reply via email to

[Prev in Thread] Current Thread [Next in Thread]