www-commits
[Top][All Lists]
Advanced

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

www/licenses/po license-list.de.po license-list...


From: GNUN
Subject: www/licenses/po license-list.de.po license-list...
Date: Wed, 01 Aug 2012 08:37:44 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/08/01 08:37:44

Modified files:
        licenses/po    : license-list.de.po license-list.es.po 
                         license-list.fr.po license-list.it.po 
                         license-list.pot license-list.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- license-list.de.po  31 Jul 2012 08:35:00 -0000      1.53
+++ license-list.de.po  1 Aug 2012 08:36:11 -0000       1.54
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-07-21 12:25-0300\n"
+"POT-Creation-Date: 2012-08-01 04:33-0300\n"
 "PO-Revision-Date: 2012-07-30 23:30+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-08-01 04:33-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -428,8 +429,14 @@
 "reference-id\">(<a href=\"#GNUAllPermissive\">#GNUAllPermissive</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple permissive free software license, compatible with the "
+#| "GNU GPL, which we recommend GNU packages use for README and other small "
+#| "supporting files.  All developers can feel free to use it in similar "
+#| "situations."
 msgid ""
-"This is a simple permissive free software license, compatible with the GNU "
+"This is a lax, permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
 "supporting files.  All developers can feel free to use it in similar "
 "situations."
@@ -459,14 +466,26 @@
 "reference-id\">(<a href=\"#apache2\">#apache2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, compatible with version 3 of the GPL."
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with version 3 of the GPL."
+msgid ""
+"This is a free software license, compatible with version 3 of the GNU GPL."
 msgstr "Eine freie Softwarelizenz und mit GPLv3 vereinbar."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Please note that this license is not compatible with GPL version 2, "
+#| "because it has some requirements that are not in the older version.  "
+#| "These include certain patent termination and indemnification provisions."
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
-"it has some requirements that are not in the older version.  These include "
-"certain patent termination and indemnification provisions."
+"it has some requirements that are not in the that GPL version.  These "
+"include certain patent termination and indemnification provisions.  The "
+"patent termination provision is a good thing, which is why we recommend the "
+"Apache 2.0 license for substantial programs over other lax permissive "
+"licenses."
 msgstr ""
 "Bitte beachten Sie, dass diese Lizenz unvereinbar mit GPLv2 ist, weil einige "
 "Anforderungen enthalten sind, die nicht in alten Versionen enthalten sind. "
@@ -521,8 +540,12 @@
 "\">(<a href=\"#boost\">#boost</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
 msgstr ""
 "Eine einfache, freizügige freie Softwarelizenz ohne Copyleft, mit der GNU "
@@ -548,9 +571,14 @@
 "em></span> aufgeführt.)"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license, modified by removal of the advertising "
+#| "clause.  It is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
-"clause.  It is a simple, permissive non-copyleft free software license, "
+"clause.  It is a lax, permissive non-copyleft free software license, "
 "compatible with the GNU GPL."
 msgstr ""
 "Dies ist die ursprüngliche BSD-Lizenz, modifiziert durch die Streichung der "
@@ -558,14 +586,27 @@
 "Softwarelizenz ohne Copyleft."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"modified BSD license is a reasonable choice.  However, it is risky to "
-"recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
-"easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
-"\"><em>original</em> BSD license</a>.  To avoid this risk, you can suggest "
-"the X11 license instead.  The X11 license and the revised BSD license are "
-"more or less equivalent."
+msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgstr "Diese Lizenz wird manchmal als 3-Klausel-BSD-Lizenz bezeichnet."
+
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you want a simple, permissive non-copyleft free software license, the "
+#| "modified BSD license is a reasonable choice.  However, it is risky to "
+#| "recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
+#| "easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
+#| "\"><em>original</em> BSD license</a>.  To avoid this risk, you can "
+#| "suggest the X11 license instead.  The X11 license and the revised BSD "
+#| "license are more or less equivalent."
+msgid ""
+"The modified BSD license is not bad, as lax permissive licenses go, though "
+"the Apache 2.0 license is preferable.  However, it is risky to recommend use "
+"of &ldquo;the BSD license&rdquo;, even for special cases such as small "
+"programs, because confusion could easily occur and lead to use of the flawed "
+"<a href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this "
+"risk, you can suggest the X11 license instead.  The X11 license and the "
+"modified revised BSD license are more or less equivalent."
 msgstr ""
 "Wenn Sie eine einfache, freizügige und freie Softwarelizenz ohne Copyleft "
 "wollen, ist die modifizierte BSD-Lizenz eine vernünftige Wahl. Allerdings "
@@ -576,8 +617,10 @@
 "die überarbeitete BSD-Lizenz sind mehr oder weniger Äquivalent."
 
 #. type: Content of: <dl><dd><p>
-msgid "This license is sometimes referred to as the 3-clause BSD license."
-msgstr "Diese Lizenz wird manchmal als 3-Klausel-BSD-Lizenz bezeichnet."
+msgid ""
+"However, the Apache 2.0 license is better for substantial programs, since it "
+"prevents patent treachery."
+msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -591,11 +634,19 @@
 "(<a href=\"#CC0\">#CC0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "CC0 is a public domain dedication from Creative Commons.  A work released "
+#| "under CC0 is dedicated to the public domain to the fullest extent "
+#| "permitted by law.  If that is not possible for any reason, CC0 also "
+#| "provides a simple permissive license as a fallback.  Both public domain "
+#| "works and the simple license provided by CC0 are compatible with the GNU "
+#| "GPL."
 msgid ""
 "CC0 is a public domain dedication from Creative Commons.  A work released "
 "under CC0 is dedicated to the public domain to the fullest extent permitted "
-"by law.  If that is not possible for any reason, CC0 also provides a simple "
-"permissive license as a fallback.  Both public domain works and the simple "
+"by law.  If that is not possible for any reason, CC0 also provides a lax, "
+"permissive license as a fallback.  Both public domain works and the lax "
 "license provided by CC0 are compatible with the GNU GPL."
 msgstr ""
 "CC0 ist ein Public-Domain-Engagement von Creative Commons. Ein unter CC0 "
@@ -673,13 +724,23 @@
 "\"anchor-reference-id\">(<a href=\"#clearbsd\">#clearbsd</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with both GPLv2 and GPLv3.  "
+#| "It is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and "
+#| "adds a term expressly stating it does not grant you any patent licenses.  "
+#| "Because of this, we encourage you to be careful about using software "
+#| "under this license; you should first consider whether the licensor might "
+#| "want to sue you for patent infringement.  If the developer is disclaiming "
+#| "patent licenses to set up a trap for you, it would be wise to avoid the "
+#| "program."
 msgid ""
 "This is a free software license, compatible with both GPLv2 and GPLv3.  It "
 "is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and adds "
 "a term expressly stating it does not grant you any patent licenses.  Because "
 "of this, we encourage you to be careful about using software under this "
 "license; you should first consider whether the licensor might want to sue "
-"you for patent infringement.  If the developer is disclaiming patent "
+"you for patent infringement.  If the developer is refusing users patent "
 "licenses to set up a trap for you, it would be wise to avoid the program."
 msgstr ""
 "Eine freie Softwarelizenz, mit GPLv2 und GPLv3 vereinbar. Sie basiert auf "
@@ -703,8 +764,12 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is very similar to the X11 license."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
 msgstr ""
 "Eine einfache, freizügige freie Softwarelizenz ohne Copyleft, mit der GNU "
@@ -843,14 +908,25 @@
 "href=\"#Expat\">#Expat</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is sometimes ambiguously referred to as "
+#| "the <em>MIT License</em>."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
 "License</em>."
 msgstr ""
 "Eine einfache, freizügige freie Softwarelizenz ohne Copyleft, mit der GNU "
 "GPL vereinbar. Sie wird manchmal mehrdeutig die <em>MIT-Lizenz</em> genannt."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"For substantial programs it is better to use the Apache 2.0 license since it "
+"blocks patent treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FreeBSD\" href=\"http://www.freebsd.org/copyright/freebsd-license.";
@@ -862,10 +938,16 @@
 "reference-id\">(<a href=\"#FreeBSD\">#FreeBSD</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license with the advertising clause and another "
+#| "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
+#| "license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+#| "license, compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
-"license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+"license&rdquo;.)  It is a lax, permissive non-copyleft free software "
 "license, compatible with the GNU GPL."
 msgstr ""
 "Dies ist die ursprüngliche BSD-Lizenz mit der entfernten Werbeklausel und "
@@ -875,17 +957,9 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"FreeBSD license is a reasonable choice.  However, please don't call it a "
-"&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is likely "
-"to cause confusion which could lead to use of the flawed <a href="
-"\"#OriginalBSD\"><em>original</em> BSD license</a>."
-msgstr ""
-"Wenn Sie eine einfache, freizügige freie Softwarelizenz ohne Copyleft "
-"wollen, ist die FreeBSD-Lizenz eine vernünftige Wahl. Bitte nennen Sie sie "
-"nicht <em>BSD</em> oder <em>BSD-artig</em>, weil das wahrscheinlich zu "
-"Verwechselungen führt, die fehlerhafte <a href=\"#OriginalBSD"
-"\"><em>ursprüngliche</em> BSD-Lizenz</a> zu verwenden."
+"Our comments about the <a href=\"#ModifiedBSD\">Modified BSD license</a> "
+"apply to this license too."
+msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -982,9 +1056,13 @@
 "\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license is sometimes also known as the OpenBSD License.  It is a "
+#| "free software license, and compatible with the GNU GPL."
 msgid ""
-"This license is sometimes also known as the OpenBSD License.  It is a free "
-"software license, and compatible with the GNU GPL."
+"This license is sometimes also known as the OpenBSD License.  It is a lax, "
+"permissive free software license, and compatible with the GNU GPL."
 msgstr ""
 "Diese Lizenz ist manchmal auch als OpenBSD-Lizenz bekannt. Eine mit der GNU "
 "GPL vereinbare freie Softwarelizenz."
@@ -1136,10 +1214,16 @@
 "class=\"anchor-reference-id\">(<a href=\"#NCSA\">#NCSA</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This license is based on the terms of the <a href=\"#Expat\">Expat</a> "
+#| "and <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
+#| "permissive non-copyleft free software license, compatible with the GNU "
+#| "GPL."
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
-"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
-"permissive non-copyleft free software license, compatible with the GNU GPL."
+"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a lax, permissive "
+"non-copyleft free software license, compatible with the GNU GPL."
 msgstr ""
 "Diese Lizenz basiert auf Bedingungen der <a href=\"#Expat\" xml:lang=\"en\" "
 "lang=\"en\">Expat</a>- und <a href=\"#ModifiedBSD\">modifizierten BSD</a>-"
@@ -1387,11 +1471,17 @@
 "\">#Unicode</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a license that Unicode, Inc. has applied to the Unicode Character "
+#| "Database&mdash;various data files that developers can use to help "
+#| "implement the Unicode standard in their own programs.  It is a simple "
+#| "permissive license, compatible with all versions of the GPL."
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
-"the Unicode standard in their own programs.  It is a simple permissive "
-"license, compatible with all versions of the GPL."
+"the Unicode standard in their own programs.  It is a lax permissive license, "
+"compatible with all versions of the GPL."
 msgstr ""
 "Dies ist eine Lizenz, die Unicode, Inc. auf die Unicode Character Database "
 "anwendet&#160;&#8209;&#160;verschiedene Datendateien, die Entwickler zur "
@@ -1434,11 +1524,18 @@
 "Lizenzvereinbarung stellt ausführlich dar, welche Dateien abgedeckt sind."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Please do not use this License Agreement for your own software.  If you "
+#| "want to use a simple permissive license for your project, please use the "
+#| "<a href=\"#Expat\">Expat license</a>; it is by far more common, and "
+#| "widely recognized in the free software community."
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
-"to use a simple permissive license for your project, please use the <a href="
-"\"#Expat\">Expat license</a>; it is by far more common, and widely "
-"recognized in the free software community."
+"to use a lax permissive license for your project, please use the <a href="
+"\"#Expat\">Expat license</a> for a small program and the Apache 2.0 license "
+"for a substantial program.  These are far more common, and widely recognized "
+"in the free software community."
 msgstr ""
 "Bitte verwenden Sie diese Lizenzvereinbarung nicht für eigene Software. Wenn 
"
 "Sie eine einfache freizügige Lizenz für Ihr Projekt verwenden wollen, "
@@ -1455,12 +1552,20 @@
 "\">#Unlicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The Unlicense is a public domain dedication.  A work released under the "
+#| "Unlicense is dedicated to the public domain to the fullest extent "
+#| "permitted by law, and also comes with an additional simple license that "
+#| "helps cover any cases where the dedication is inadequate.  Both public "
+#| "domain works and the simple license provided by the Unlicense are "
+#| "compatible with the GNU GPL."
 msgid ""
 "The Unlicense is a public domain dedication.  A work released under the "
 "Unlicense is dedicated to the public domain to the fullest extent permitted "
-"by law, and also comes with an additional simple license that helps cover "
-"any cases where the dedication is inadequate.  Both public domain works and "
-"the simple license provided by the Unlicense are compatible with the GNU GPL."
+"by law, and also comes with an additional lax license that helps cover any "
+"cases where the dedication is inadequate.  Both public domain works and the "
+"lax license provided by the Unlicense are compatible with the GNU GPL."
 msgstr ""
 "Die Unlicense ist der Gemeinfreiheit gewidmet. Ein unter der Unlicense "
 "freigegebenes Werk wird in die Gemeinfreiheit entlassen, soweit dies "
@@ -1550,8 +1655,25 @@
 "a> <span class=\"anchor-reference-id\">(<a href=\"#WTFPL\">#WTFPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, very permissive and GPL-compatible."
-msgstr "Eine freie Softwarelizenz, sehr freizügig und mit der GPL vereinbar."
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
+msgid ""
+"This is lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL."
+msgstr ""
+"Eine einfache, freizügige freie Softwarelizenz ohne Copyleft, mit der GNU "
+"GPL vereinbar."
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"We do not recommend this license.  If you want a lax permissive license for "
+"a small program, we recommend the <a href=\"#X11License\">X11 license</a>.  "
+"A larger program usually ought to be copyleft; but if you are set on using a "
+"lax permissive license for one, we recommend the Apache 2.0 license since it "
+"protects users from patent treachery."
+msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1564,10 +1686,17 @@
 "\">(<a href=\"#X11License\">#X11License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
-"with the GNU GPL.  Older versions of XFree86 used the same license, and some "
-"of the current variants of XFree86 also do.  Later versions of XFree86 are "
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  Older versions of XFree86 used the same "
+#| "license, and some of the current variants of XFree86 also do.  Later "
+#| "versions of XFree86 are distributed under the <a href=\"#XFree861.1License"
+#| "\">XFree86 1.1 license</a>."
+msgid ""
+"This is a lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL.  Older versions of XFree86 used the same license, and some of "
+"the current variants of XFree86 also do.  Later versions of XFree86 are "
 "distributed under the <a href=\"#XFree861.1License\">XFree86 1.1 license</a>."
 msgstr ""
 "Eine einfache, freizügige freie Softwarelizenz mit Copyleft und mit der GNU "
@@ -1584,6 +1713,14 @@
 "Diese Lizenz wird manchmal <em>MIT License</em> genannt, aber dieser Begriff "
 "ist irreführend, da MIT viele Lizenzen für Software benutzt hat."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a fine license for a small program.  A larger program usually ought "
+"to be copyleft; but if you are set on a lax permissive license for one, we "
+"recommend the Apache 2.0 license since it protects users from patent "
+"treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
@@ -1596,8 +1733,12 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with version 3 of the GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
 msgstr ""
 "Dies ist Eine einfache, freizügige freie Softwarelizenz ohne Copyleft, mit "
@@ -1650,8 +1791,12 @@
 "\"#Zope2.0\">#Zope2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license which is "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license which is "
+"This is a lax, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
 msgstr ""
 "Dies ist eine einfache, freizügige freie Softwarelizenz ohne Copyleft, "
@@ -1766,8 +1911,14 @@
 "reference-id\">(<a href=\"#apache1\">#apache1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with an "
+#| "advertising clause.  This creates <a href=\"/philosophy/bsd.html"
+#| "\">practical problems</a> like those of the original BSD license, "
+#| "including incompatibility with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license with an "
+"This is a lax, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
 "problems</a> like those of the original BSD license, including "
 "incompatibility with the GNU GPL."
@@ -1839,11 +1990,18 @@
 "aufgeführt (auch bekannt als <em>4-Klausel-BSD</em>-Lizenz)."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license with a "
-"serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software nonfree.  But it does "
-"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software nonfree.  But "
+#| "it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
+#| "including incompatibility with the GNU GPL."
+msgid ""
+"This is a lax, permissive non-copyleft free software license with a serious "
+"flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw is not "
+"fatal; that is, it does not render the software nonfree.  But it does cause "
+"<a href=\"/philosophy/bsd.html\">practical problems</a>, including "
 "incompatibility with the GNU GPL."
 msgstr ""
 "Eine einfache, freizügige freie Softwarelizenz ohne Copyleft mit einem "
@@ -1853,12 +2011,20 @@
 "a>, einschließlich Unvereinbarkeit mit der GNU GPL."
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the original BSD license for software you write.  "
+#| "If you want to use a simple, permissive non-copyleft free software "
+#| "license, it is much better to use the <a href=\"#ModifiedBSD\">modified "
+#| "BSD license</a> or the X11 license.  However, there is no reason not to "
+#| "use programs that have been released under the original BSD license."
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
-"you want to use a simple, permissive non-copyleft free software license, it "
-"is much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a> "
-"or the X11 license.  However, there is no reason not to use programs that "
-"have been released under the original BSD license."
+"you want to use a lax, permissive non-copyleft free software license, it is "
+"much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a>, "
+"the X11 license or the Expat license.  Even better, for a substantial "
+"program, use the Apache 2.0 license since it takes action against patent "
+"treachery."
 msgstr ""
 "Es wird dringend empfohlen, nicht die ursprünglichen BSD-Lizenz für selbst "
 "geschriebene Software zu verwenden. Möchten Sie eine einfache, permissive "
@@ -1867,6 +2033,21 @@
 "Allerdings gibt es keinen Grund Programme zu meiden, die unter dieser Lizenz "
 "freigegeben wurden."
 
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the Open Software License for software you write.  "
+#| "However, there is no reason to avoid running programs that have been "
+#| "released under this license."
+msgid ""
+"However, there is no reason not to use programs that have been released "
+"under the original BSD license."
+msgstr ""
+"Es wird dringend empfohlen, die Open Software License aus diesen Gründen 
für "
+"selbst geschriebene Software nicht zu verwenden. Allerdings gibt es keinen "
+"Grund Programme nicht auszuführen, die unter dieser Lizenz freigegeben "
+"wurden."
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CDDL\" href=\"http://www.opensolaris.org/os/licensing/cddllicense.txt";
@@ -2861,9 +3042,15 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a simple, fairly permissive non-copyleft free software license "
+#| "with <a href=\"/philosophy/bsd.html\">practical problems</a> like those "
+#| "of the original BSD license, including incompatibility with the <a href="
+#| "\"/licenses/gpl.html\">GNU GPL</a>."
 msgid ""
-"This is a simple, fairly permissive non-copyleft free software license with "
-"<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
+"This is a lax, fairly permissive non-copyleft free software license with <a "
+"href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
 "original BSD license, including incompatibility with the <a href=\"/licenses/"
 "gpl.html\">GNU GPL</a>."
 msgstr ""
@@ -4468,6 +4655,23 @@
 msgstr "Aktualisierung:"
 
 #~ msgid ""
+#~ "If you want a simple, permissive non-copyleft free software license, the "
+#~ "FreeBSD license is a reasonable choice.  However, please don't call it a "
+#~ "&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is "
+#~ "likely to cause confusion which could lead to use of the flawed <a href="
+#~ "\"#OriginalBSD\"><em>original</em> BSD license</a>."
+#~ msgstr ""
+#~ "Wenn Sie eine einfache, freizügige freie Softwarelizenz ohne Copyleft "
+#~ "wollen, ist die FreeBSD-Lizenz eine vernünftige Wahl. Bitte nennen Sie "
+#~ "sie nicht <em>BSD</em> oder <em>BSD-artig</em>, weil das wahrscheinlich "
+#~ "zu Verwechselungen führt, die fehlerhafte <a href=\"#OriginalBSD"
+#~ "\"><em>ursprüngliche</em> BSD-Lizenz</a> zu verwenden."
+
+#~ msgid "This is a free software license, very permissive and GPL-compatible."
+#~ msgstr ""
+#~ "Eine freie Softwarelizenz, sehr freizügig und mit der GPL vereinbar."
+
+#~ msgid ""
 #~ "<a id=\"SystemC-3.0\" href=\"http://www.systemc.org/about/org_docs/";
 #~ "license/\"> SystemC &ldquo;Open Source&rdquo; License, Version 3.0</a> "
 #~ "<span class=\"anchor-reference-id\"> (<a href="

Index: license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- license-list.es.po  21 Jul 2012 16:28:15 -0000      1.25
+++ license-list.es.po  1 Aug 2012 08:36:18 -0000       1.26
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: license-list.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-21 12:25-0300\n"
+"POT-Creation-Date: 2012-08-01 04:33-0300\n"
 "PO-Revision-Date: 2012-07-19 12:52+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -488,8 +488,18 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple-] {+lax,+} permissive free software license, compatible
+# | with the GNU GPL, which we recommend GNU packages use for README and other
+# | small supporting files.  All developers can feel free to use it in similar
+# | situations.
+#, fuzzy
+#| msgid ""
+#| "This is a simple permissive free software license, compatible with the "
+#| "GNU GPL, which we recommend GNU packages use for README and other small "
+#| "supporting files.  All developers can feel free to use it in similar "
+#| "situations."
 msgid ""
-"This is a simple permissive free software license, compatible with the GNU "
+"This is a lax, permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
 "supporting files.  All developers can feel free to use it in similar "
 "situations."
@@ -522,7 +532,13 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, compatible with version 3 of the GPL."
+# | This is a free software license, compatible with version 3 of the {+GNU+}
+# | GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with version 3 of the GPL."
+msgid ""
+"This is a free software license, compatible with version 3 of the GNU GPL."
 msgstr ""
 "Esta es una licencias de software libre compatible con la versión 3 de la "
 "GPL."
@@ -532,10 +548,24 @@
 # No estoy seguro del significado de
 # "termination" en este caso.
 #. type: Content of: <dl><dd><p>
+# | Please note that this license is not compatible with GPL version 2,
+# | because it has some requirements that are not in the [-older-] {+that
+# | GPL+} version.  These include certain patent termination and
+# | indemnification provisions.  {+The patent termination provision is a good
+# | thing, which is why we recommend the Apache 2.0 license for substantial
+# | programs over other lax permissive licenses.+}
+#, fuzzy
+#| msgid ""
+#| "Please note that this license is not compatible with GPL version 2, "
+#| "because it has some requirements that are not in the older version.  "
+#| "These include certain patent termination and indemnification provisions."
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
-"it has some requirements that are not in the older version.  These include "
-"certain patent termination and indemnification provisions."
+"it has some requirements that are not in the that GPL version.  These "
+"include certain patent termination and indemnification provisions.  The "
+"patent termination provision is a good thing, which is why we recommend the "
+"Apache 2.0 license for substantial programs over other lax permissive "
+"licenses."
 msgstr ""
 "Nótese que esta licencia no es compatible con la versión 2 de la GPL, 
porque "
 "tiene algunos requisitos que no estaban en las versiones anteriores. Estos "
@@ -599,8 +629,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
 msgstr ""
 "Esta es una licencia simple y permisiva, sin copyleft, de software libre, "
@@ -628,9 +664,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license, modified by removal of the advertising
+# | clause.  It is a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license, modified by removal of the advertising "
+#| "clause.  It is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
-"clause.  It is a simple, permissive non-copyleft free software license, "
+"clause.  It is a lax, permissive non-copyleft free software license, "
 "compatible with the GNU GPL."
 msgstr ""
 "Esta es la licencia original BSD, con la cláusula de publicidad eliminada. "
@@ -639,14 +683,39 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"modified BSD license is a reasonable choice.  However, it is risky to "
-"recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
-"easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
-"\"><em>original</em> BSD license</a>.  To avoid this risk, you can suggest "
-"the X11 license instead.  The X11 license and the revised BSD license are "
-"more or less equivalent."
+msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgstr ""
+"A esta licencia se la llama algunas veces &quot;licencia BSD de 3 "
+"cláusulas&quot;."
+
+# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+# | [-If you want a simple, permissive non-copyleft free software license,
+# | the-]{+The+} modified BSD license is [-a reasonable choice.-] {+not bad,
+# | as lax permissive licenses go, though the Apache 2.0 license is
+# | preferable.+}  However, it is risky to recommend use of &ldquo;the BSD
+# | license&rdquo;, {+even for special cases such as small programs,+} because
+# | confusion could easily occur and lead to use of the flawed <a
+# | href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this
+# | risk, you can suggest the X11 license instead.  The X11 license and the
+# | {+modified+} revised BSD license are more or less equivalent.
+#, fuzzy
+#| msgid ""
+#| "If you want a simple, permissive non-copyleft free software license, the "
+#| "modified BSD license is a reasonable choice.  However, it is risky to "
+#| "recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
+#| "easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
+#| "\"><em>original</em> BSD license</a>.  To avoid this risk, you can "
+#| "suggest the X11 license instead.  The X11 license and the revised BSD "
+#| "license are more or less equivalent."
+msgid ""
+"The modified BSD license is not bad, as lax permissive licenses go, though "
+"the Apache 2.0 license is preferable.  However, it is risky to recommend use "
+"of &ldquo;the BSD license&rdquo;, even for special cases such as small "
+"programs, because confusion could easily occur and lead to use of the flawed "
+"<a href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this "
+"risk, you can suggest the X11 license instead.  The X11 license and the "
+"modified revised BSD license are more or less equivalent."
 msgstr ""
 "Si quiere una licencia de software libre simple, permisiva, sin copyleft, la "
 "versión modificada de la licencia BSD es una elección razonable. Sin "
@@ -656,12 +725,11 @@
 "evitar riesgos, se sugiere la utilización de la licencia X11 en su lugar. "
 "Ambas (X11 y BSD modificada) son más o menos equivalentes."
 
-# type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgid ""
+"However, the Apache 2.0 license is better for substantial programs, since it "
+"prevents patent treachery."
 msgstr ""
-"A esta licencia se la llama algunas veces &quot;licencia BSD de 3 "
-"cláusulas&quot;."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -674,11 +742,25 @@
 "\"#CC0\">#CC0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | CC0 is a public domain dedication from Creative Commons.  A work released
+# | under CC0 is dedicated to the public domain to the fullest extent
+# | permitted by law.  If that is not possible for any reason, CC0 also
+# | provides a [-simple-] {+lax,+} permissive license as a fallback.  Both
+# | public domain works and the [-simple-] {+lax+} license provided by CC0 are
+# | compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "CC0 is a public domain dedication from Creative Commons.  A work released "
+#| "under CC0 is dedicated to the public domain to the fullest extent "
+#| "permitted by law.  If that is not possible for any reason, CC0 also "
+#| "provides a simple permissive license as a fallback.  Both public domain "
+#| "works and the simple license provided by CC0 are compatible with the GNU "
+#| "GPL."
 msgid ""
 "CC0 is a public domain dedication from Creative Commons.  A work released "
 "under CC0 is dedicated to the public domain to the fullest extent permitted "
-"by law.  If that is not possible for any reason, CC0 also provides a simple "
-"permissive license as a fallback.  Both public domain works and the simple "
+"by law.  If that is not possible for any reason, CC0 also provides a lax, "
+"permissive license as a fallback.  Both public domain works and the lax "
 "license provided by CC0 are compatible with the GNU GPL."
 msgstr ""
 "CC0 es una entrega al dominio público de Creative Commons. Un trabajo "
@@ -762,13 +844,31 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a free software license, compatible with both GPLv2 and GPLv3.  It
+# | is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and
+# | adds a term expressly stating it does not grant you any patent licenses. 
+# | Because of this, we encourage you to be careful about using software under
+# | this license; you should first consider whether the licensor might want to
+# | sue you for patent infringement.  If the developer is [-disclaiming-]
+# | {+refusing users+} patent licenses to set up a trap for you, it would be
+# | wise to avoid the program.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with both GPLv2 and GPLv3.  "
+#| "It is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and "
+#| "adds a term expressly stating it does not grant you any patent licenses.  "
+#| "Because of this, we encourage you to be careful about using software "
+#| "under this license; you should first consider whether the licensor might "
+#| "want to sue you for patent infringement.  If the developer is disclaiming "
+#| "patent licenses to set up a trap for you, it would be wise to avoid the "
+#| "program."
 msgid ""
 "This is a free software license, compatible with both GPLv2 and GPLv3.  It "
 "is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and adds "
 "a term expressly stating it does not grant you any patent licenses.  Because "
 "of this, we encourage you to be careful about using software under this "
 "license; you should first consider whether the licensor might want to sue "
-"you for patent infringement.  If the developer is disclaiming patent "
+"you for patent infringement.  If the developer is refusing users patent "
 "licenses to set up a trap for you, it would be wise to avoid the program."
 msgstr ""
 "Esta es una licencia de software libre, compatible con ambas licencias, "
@@ -793,8 +893,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is very similar to the X11
+# | license.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is very similar to the X11 license."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
 msgstr ""
 "Esta es una licencia simple, permisiva, de software libre, que no incluye "
@@ -959,8 +1066,16 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is sometimes ambiguously
+# | referred to as the <em>MIT License</em>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is sometimes ambiguously referred to as "
+#| "the <em>MIT License</em>."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
 "License</em>."
 msgstr ""
@@ -968,6 +1083,12 @@
 "compatible con la GPL de GNU. Es algunas veces citada como <em>MIT License</"
 "em>, pero esta definición es ambigua."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"For substantial programs it is better to use the Apache 2.0 license since it "
+"blocks patent treachery."
+msgstr ""
+
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
@@ -981,10 +1102,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license with the advertising clause and another
+# | clause removed.  (It is also sometimes called the &ldquo;2-clause BSD
+# | license&rdquo;.)  It is a [-simple,-] {+lax,+} permissive non-copyleft
+# | free software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license with the advertising clause and another "
+#| "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
+#| "license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+#| "license, compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
-"license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+"license&rdquo;.)  It is a lax, permissive non-copyleft free software "
 "license, compatible with the GNU GPL."
 msgstr ""
 "Esta es la licencia original BSD, con la cláusula acerca de la publicidad y "
@@ -992,20 +1123,11 @@
 "license»). Es una licencia simple y permisiva de software libre, sin "
 "copyleft, compatible con la GPL de GNU."
 
-# type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"FreeBSD license is a reasonable choice.  However, please don't call it a "
-"&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is likely "
-"to cause confusion which could lead to use of the flawed <a href="
-"\"#OriginalBSD\"><em>original</em> BSD license</a>."
-msgstr ""
-"Si desea una licencia permisiva y simple de software libre, sin copyleft, la "
-"FreeBSD es una elección razonable. Sin embargo, tenga a bien evitar llamarla 
"
-"«BSD» o «estilo BSD» para evitar una confusión que podría llevar al uso 
"
-"erróneo de la licencia BSD <a href=\"#OriginalBSD\"><em>original</em></a> y "
-"defectuosa."
+"Our comments about the <a href=\"#ModifiedBSD\">Modified BSD license</a> "
+"apply to this license too."
+msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1119,9 +1241,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This license is sometimes also known as the OpenBSD License.  It is a
+# | {+lax, permissive+} free software license, and compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is sometimes also known as the OpenBSD License.  It is a "
+#| "free software license, and compatible with the GNU GPL."
 msgid ""
-"This license is sometimes also known as the OpenBSD License.  It is a free "
-"software license, and compatible with the GNU GPL."
+"This license is sometimes also known as the OpenBSD License.  It is a lax, "
+"permissive free software license, and compatible with the GNU GPL."
 msgstr ""
 "Esta licencia es conocida a veces como OpenBSD Licence. Es una licencia de "
 "software libre compatible con la GPL de GNU."
@@ -1286,10 +1414,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This license is based on the terms of the <a href=\"#Expat\">Expat</a> and
+# | <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a [-simple,-]
+# | {+lax,+} permissive non-copyleft free software license, compatible with
+# | the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is based on the terms of the <a href=\"#Expat\">Expat</a> "
+#| "and <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
+#| "permissive non-copyleft free software license, compatible with the GNU "
+#| "GPL."
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
-"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
-"permissive non-copyleft free software license, compatible with the GNU GPL."
+"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a lax, permissive "
+"non-copyleft free software license, compatible with the GNU GPL."
 msgstr ""
 "Esta licencia está basada en los términos de la <a 
href=\"#Expat\">Expat</a> "
 "y <a href=\"#ModifiedBSD\">BSD modificada</a>. Es una licencia simple y "
@@ -1549,11 +1687,21 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a license that Unicode, Inc. has applied to the Unicode Character
+# | Database&mdash;various data files that developers can use to help
+# | implement the Unicode standard in their own programs.  It is a [-simple-]
+# | {+lax+} permissive license, compatible with all versions of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a license that Unicode, Inc. has applied to the Unicode Character "
+#| "Database&mdash;various data files that developers can use to help "
+#| "implement the Unicode standard in their own programs.  It is a simple "
+#| "permissive license, compatible with all versions of the GPL."
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
-"the Unicode standard in their own programs.  It is a simple permissive "
-"license, compatible with all versions of the GPL."
+"the Unicode standard in their own programs.  It is a lax permissive license, "
+"compatible with all versions of the GPL."
 msgstr ""
 "Esta es una licencia que Unicode Inc. ha aplicado a la Unicode Character "
 "Database, a varios archivos de datos que los desarrolladores pueden utilizar "
@@ -1599,11 +1747,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | Please do not use this License Agreement for your own software.  If you
+# | want to use a [-simple-] {+lax+} permissive license for your project,
+# | please use the <a href=\"#Expat\">Expat [-license</a>; it is by-]
+# | {+license</a> for a small program and the Apache 2.0 license for a
+# | substantial program.  These are+} far more common, and widely recognized
+# | in the free software community.
+#, fuzzy
+#| msgid ""
+#| "Please do not use this License Agreement for your own software.  If you "
+#| "want to use a simple permissive license for your project, please use the "
+#| "<a href=\"#Expat\">Expat license</a>; it is by far more common, and "
+#| "widely recognized in the free software community."
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
-"to use a simple permissive license for your project, please use the <a href="
-"\"#Expat\">Expat license</a>; it is by far more common, and widely "
-"recognized in the free software community."
+"to use a lax permissive license for your project, please use the <a href="
+"\"#Expat\">Expat license</a> for a small program and the Apache 2.0 license "
+"for a substantial program.  These are far more common, and widely recognized "
+"in the free software community."
 msgstr ""
 "Por favor no utilice este acuerdo de licencias para su propio software. Si "
 "desea una licencia simple y permisiva para su proyecto, por favor utilice la "
@@ -1619,12 +1780,26 @@
 "class=\"anchor-reference-id\"> (<a href=\"#Unlicense\">#Unlicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The Unlicense is a public domain dedication.  A work released under the
+# | Unlicense is dedicated to the public domain to the fullest extent
+# | permitted by law, and also comes with an additional [-simple-] {+lax+}
+# | license that helps cover any cases where the dedication is inadequate. 
+# | Both public domain works and the [-simple-] {+lax+} license provided by
+# | the Unlicense are compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "The Unlicense is a public domain dedication.  A work released under the "
+#| "Unlicense is dedicated to the public domain to the fullest extent "
+#| "permitted by law, and also comes with an additional simple license that "
+#| "helps cover any cases where the dedication is inadequate.  Both public "
+#| "domain works and the simple license provided by the Unlicense are "
+#| "compatible with the GNU GPL."
 msgid ""
 "The Unlicense is a public domain dedication.  A work released under the "
 "Unlicense is dedicated to the public domain to the fullest extent permitted "
-"by law, and also comes with an additional simple license that helps cover "
-"any cases where the dedication is inadequate.  Both public domain works and "
-"the simple license provided by the Unlicense are compatible with the GNU GPL."
+"by law, and also comes with an additional lax license that helps cover any "
+"cases where the dedication is inadequate.  Both public domain works and the "
+"lax license provided by the Unlicense are compatible with the GNU GPL."
 msgstr ""
 "La Unlicense es una entrega al dominio público. Un trabajo publicado bajo la 
"
 "Unlicense se entrega al dominio público con la extensión máxima permitida "
@@ -1719,9 +1894,27 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, very permissive and GPL-compatible."
+# | This is [-a simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
+msgid ""
+"This is lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL."
+msgstr ""
+"Esta es una licencia simple y permisiva, sin copyleft, de software libre, "
+"compatible con la GPL de GNU."
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"We do not recommend this license.  If you want a lax permissive license for "
+"a small program, we recommend the <a href=\"#X11License\">X11 license</a>.  "
+"A larger program usually ought to be copyleft; but if you are set on using a "
+"lax permissive license for one, we recommend the Apache 2.0 license since it "
+"protects users from patent treachery."
 msgstr ""
-"Esta es una licencia de software libre muy permisiva y compatible con la GPL."
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
@@ -1736,10 +1929,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
-"with the GNU GPL.  Older versions of XFree86 used the same license, and some "
-"of the current variants of XFree86 also do.  Later versions of XFree86 are "
+# | This is a [-simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  Older versions of XFree86 used the
+# | same license, and some of the current variants of XFree86 also do.  Later
+# | versions of XFree86 are distributed under the <a
+# | href=\"#XFree861.1License\">XFree86 1.1 license</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  Older versions of XFree86 used the same "
+#| "license, and some of the current variants of XFree86 also do.  Later "
+#| "versions of XFree86 are distributed under the <a href=\"#XFree861.1License"
+#| "\">XFree86 1.1 license</a>."
+msgid ""
+"This is a lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL.  Older versions of XFree86 used the same license, and some of "
+"the current variants of XFree86 also do.  Later versions of XFree86 are "
 "distributed under the <a href=\"#XFree861.1License\">XFree86 1.1 license</a>."
 msgstr ""
 "Esta es una licencia simple y permisiva de software libre, sin copyleft, "
@@ -1757,6 +1962,14 @@
 "Esta licencia es a veces llamada <em>MIT license</em>, pero esta forma es "
 "confusa, ya que MIT ha utilizado varias licencias distintas de software."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a fine license for a small program.  A larger program usually ought "
+"to be copyleft; but if you are set on a lax permissive license for one, we "
+"recommend the Apache 2.0 license since it protects users from patent "
+"treachery."
+msgstr ""
+
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1770,8 +1983,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with version 3 of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with version 3 of the GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
 msgstr ""
 "Esta es una licencia simple y permisiva de software libre, sin copyleft, "
@@ -1829,8 +2048,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license which is compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license which is "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license which is "
+"This is a lax, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
 msgstr ""
 "Esta es una licencia de software libre simple y permisiva, sin copyleft, "
@@ -1956,8 +2181,18 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with an advertising clause.  This creates <a
+# | href=\"/philosophy/bsd.html\">practical problems</a> like those of the
+# | original BSD license, including incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with an "
+#| "advertising clause.  This creates <a href=\"/philosophy/bsd.html"
+#| "\">practical problems</a> like those of the original BSD license, "
+#| "including incompatibility with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license with an "
+"This is a lax, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
 "problems</a> like those of the original BSD license, including "
 "incompatibility with the GNU GPL."
@@ -2035,11 +2270,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license with a "
-"serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software nonfree.  But it does "
-"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with a serious flaw: the &ldquo;obnoxious BSD advertising
+# | clause&rdquo;.  The flaw is not fatal; that is, it does not render the
+# | software nonfree.  But it does cause <a
+# | href=\"/philosophy/bsd.html\">practical problems</a>, including
+# | incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software nonfree.  But "
+#| "it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
+#| "including incompatibility with the GNU GPL."
+msgid ""
+"This is a lax, permissive non-copyleft free software license with a serious "
+"flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw is not "
+"fatal; that is, it does not render the software nonfree.  But it does cause "
+"<a href=\"/philosophy/bsd.html\">practical problems</a>, including "
 "incompatibility with the GNU GPL."
 msgstr ""
 "Esta es una licencia simple y permisiva de software libre, sin copyleft, con "
@@ -2050,12 +2298,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | We urge you not to use the original BSD license for software you write. 
+# | If you want to use a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, it is much better to use the <a
+# | href=\"#ModifiedBSD\">modified BSD [-license</a> or-] {+license</a>,+} the
+# | X11 {+license or the Expat+} license.  [-However, there is no reason not
+# | to-]  {+Even better, for a substantial program,+} use [-programs that have
+# | been released under-] the [-original BSD license.-] {+Apache 2.0 license
+# | since it takes action against patent treachery.+}
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the original BSD license for software you write.  "
+#| "If you want to use a simple, permissive non-copyleft free software "
+#| "license, it is much better to use the <a href=\"#ModifiedBSD\">modified "
+#| "BSD license</a> or the X11 license.  However, there is no reason not to "
+#| "use programs that have been released under the original BSD license."
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
-"you want to use a simple, permissive non-copyleft free software license, it "
-"is much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a> "
-"or the X11 license.  However, there is no reason not to use programs that "
-"have been released under the original BSD license."
+"you want to use a lax, permissive non-copyleft free software license, it is "
+"much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a>, "
+"the X11 license or the Expat license.  Even better, for a substantial "
+"program, use the Apache 2.0 license since it takes action against patent "
+"treachery."
 msgstr ""
 "Le instamos a no utilizar la licencia BSD original para el software que "
 "escriba. Si desea utilizar una licencia simple y permisiva de software libre "
@@ -2063,6 +2327,25 @@
 "BSD modificada</a> o la licencia X11. Sin embargo, no existe razón para no "
 "utilizar software lanzado bajo la licencia BSD original."
 
+# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+# | [-We urge you not to use the Open Software License for software you
+# | write.-]However, there is no reason {+not+} to [-avoid running-] {+use+}
+# | programs that have been released under [-this-] {+the original BSD+}
+# | license.
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the Open Software License for software you write.  "
+#| "However, there is no reason to avoid running programs that have been "
+#| "released under this license."
+msgid ""
+"However, there is no reason not to use programs that have been released "
+"under the original BSD license."
+msgstr ""
+"Lo urgimos a que no utilice la Open Software License para el software que "
+"escriba. Sin embargo, no hay razón para no utilizar programas que se "
+"encuentren bajo esta licencia."
+
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
@@ -3152,9 +3435,19 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} fairly permissive non-copyleft free
+# | software license with <a href=\"/philosophy/bsd.html\">practical
+# | problems</a> like those of the original BSD license, including
+# | incompatibility with the <a href=\"/licenses/gpl.html\">GNU GPL</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, fairly permissive non-copyleft free software license "
+#| "with <a href=\"/philosophy/bsd.html\">practical problems</a> like those "
+#| "of the original BSD license, including incompatibility with the <a href="
+#| "\"/licenses/gpl.html\">GNU GPL</a>."
 msgid ""
-"This is a simple, fairly permissive non-copyleft free software license with "
-"<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
+"This is a lax, fairly permissive non-copyleft free software license with <a "
+"href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
 "original BSD license, including incompatibility with the <a href=\"/licenses/"
 "gpl.html\">GNU GPL</a>."
 msgstr ""
@@ -4869,3 +5162,23 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización: "
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "If you want a simple, permissive non-copyleft free software license, the "
+#~ "FreeBSD license is a reasonable choice.  However, please don't call it a "
+#~ "&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is "
+#~ "likely to cause confusion which could lead to use of the flawed <a href="
+#~ "\"#OriginalBSD\"><em>original</em> BSD license</a>."
+#~ msgstr ""
+#~ "Si desea una licencia permisiva y simple de software libre, sin copyleft, "
+#~ "la FreeBSD es una elección razonable. Sin embargo, tenga a bien evitar "
+#~ "llamarla «BSD» o «estilo BSD» para evitar una confusión que podría 
llevar "
+#~ "al uso erróneo de la licencia BSD <a href=\"#OriginalBSD\"><em>original</"
+#~ "em></a> y defectuosa."
+
+# type: Content of: <dl><dd><p>
+#~ msgid "This is a free software license, very permissive and GPL-compatible."
+#~ msgstr ""
+#~ "Esta es una licencia de software libre muy permisiva y compatible con la "
+#~ "GPL."

Index: license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- license-list.fr.po  21 Jul 2012 16:28:15 -0000      1.132
+++ license-list.fr.po  1 Aug 2012 08:36:31 -0000       1.133
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-07-21 12:25-0300\n"
+"POT-Creation-Date: 2012-08-01 04:33-0300\n"
 "PO-Revision-Date: 2012-07-14 22:51+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -440,8 +440,18 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple-] {+lax,+} permissive free software license, compatible
+# | with the GNU GPL, which we recommend GNU packages use for README and other
+# | small supporting files.  All developers can feel free to use it in similar
+# | situations.
+#, fuzzy
+#| msgid ""
+#| "This is a simple permissive free software license, compatible with the "
+#| "GNU GPL, which we recommend GNU packages use for README and other small "
+#| "supporting files.  All developers can feel free to use it in similar "
+#| "situations."
 msgid ""
-"This is a simple permissive free software license, compatible with the GNU "
+"This is a lax, permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
 "supporting files.  All developers can feel free to use it in similar "
 "situations."
@@ -471,16 +481,36 @@
 "\">(<a href=\"#apache2\">#apache2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, compatible with version 3 of the GPL."
+# | This is a free software license, compatible with version 3 of the {+GNU+}
+# | GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with version 3 of the GPL."
+msgid ""
+"This is a free software license, compatible with version 3 of the GNU GPL."
 msgstr ""
 "C'est une licence de logiciel libre, compatible avec la version&nbsp;3 de la "
 "GPL."
 
 #. type: Content of: <dl><dd><p>
+# | Please note that this license is not compatible with GPL version 2,
+# | because it has some requirements that are not in the [-older-] {+that
+# | GPL+} version.  These include certain patent termination and
+# | indemnification provisions.  {+The patent termination provision is a good
+# | thing, which is why we recommend the Apache 2.0 license for substantial
+# | programs over other lax permissive licenses.+}
+#, fuzzy
+#| msgid ""
+#| "Please note that this license is not compatible with GPL version 2, "
+#| "because it has some requirements that are not in the older version.  "
+#| "These include certain patent termination and indemnification provisions."
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
-"it has some requirements that are not in the older version.  These include "
-"certain patent termination and indemnification provisions."
+"it has some requirements that are not in the that GPL version.  These "
+"include certain patent termination and indemnification provisions.  The "
+"patent termination provision is a good thing, which is why we recommend the "
+"Apache 2.0 license for substantial programs over other lax permissive "
+"licenses."
 msgstr ""
 "Veuillez noter que cette licence n'est pas compatible avec la GPL "
 "version&nbsp;2, car certaines de ses conditions ne figurent pas dans "
@@ -535,8 +565,14 @@
 "\">#boost</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
 msgstr ""
 "C'est une licence de logiciel libre simple, permissive, sans copyleft, "
@@ -561,9 +597,17 @@
 "reprend le texte de la licence BSD modifiée.)"
 
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license, modified by removal of the advertising
+# | clause.  It is a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license, modified by removal of the advertising "
+#| "clause.  It is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
-"clause.  It is a simple, permissive non-copyleft free software license, "
+"clause.  It is a lax, permissive non-copyleft free software license, "
 "compatible with the GNU GPL."
 msgstr ""
 "Il s'agit de la licence BSD d'origine, mais privée de sa clause "
@@ -571,14 +615,38 @@
 "copyleft, compatible avec la GNU GPL."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"modified BSD license is a reasonable choice.  However, it is risky to "
-"recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
-"easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
-"\"><em>original</em> BSD license</a>.  To avoid this risk, you can suggest "
-"the X11 license instead.  The X11 license and the revised BSD license are "
-"more or less equivalent."
+msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgstr ""
+"Cette licence est quelquefois appelée «&nbsp;licence BSD à trois "
+"clauses&nbsp;»."
+
+#. type: Content of: <dl><dd><p>
+# | [-If you want a simple, permissive non-copyleft free software license,
+# | the-]{+The+} modified BSD license is [-a reasonable choice.-] {+not bad,
+# | as lax permissive licenses go, though the Apache 2.0 license is
+# | preferable.+}  However, it is risky to recommend use of &ldquo;the BSD
+# | license&rdquo;, {+even for special cases such as small programs,+} because
+# | confusion could easily occur and lead to use of the flawed <a
+# | href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this
+# | risk, you can suggest the X11 license instead.  The X11 license and the
+# | {+modified+} revised BSD license are more or less equivalent.
+#, fuzzy
+#| msgid ""
+#| "If you want a simple, permissive non-copyleft free software license, the "
+#| "modified BSD license is a reasonable choice.  However, it is risky to "
+#| "recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
+#| "easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
+#| "\"><em>original</em> BSD license</a>.  To avoid this risk, you can "
+#| "suggest the X11 license instead.  The X11 license and the revised BSD "
+#| "license are more or less equivalent."
+msgid ""
+"The modified BSD license is not bad, as lax permissive licenses go, though "
+"the Apache 2.0 license is preferable.  However, it is risky to recommend use "
+"of &ldquo;the BSD license&rdquo;, even for special cases such as small "
+"programs, because confusion could easily occur and lead to use of the flawed "
+"<a href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this "
+"risk, you can suggest the X11 license instead.  The X11 license and the "
+"modified revised BSD license are more or less equivalent."
 msgstr ""
 "Si ce que vous souhaitez, c'est une licence permissive sans copyleft, alors "
 "la licence BSD modifiée constitue un bon choix. Cependant, recommander la "
@@ -589,10 +657,10 @@
 "l'une de l'autre."
 
 #. type: Content of: <dl><dd><p>
-msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgid ""
+"However, the Apache 2.0 license is better for substantial programs, since it "
+"prevents patent treachery."
 msgstr ""
-"Cette licence est quelquefois appelée «&nbsp;licence BSD à trois "
-"clauses&nbsp;»."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -605,11 +673,25 @@
 "\"#CC0\">#CC0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | CC0 is a public domain dedication from Creative Commons.  A work released
+# | under CC0 is dedicated to the public domain to the fullest extent
+# | permitted by law.  If that is not possible for any reason, CC0 also
+# | provides a [-simple-] {+lax,+} permissive license as a fallback.  Both
+# | public domain works and the [-simple-] {+lax+} license provided by CC0 are
+# | compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "CC0 is a public domain dedication from Creative Commons.  A work released "
+#| "under CC0 is dedicated to the public domain to the fullest extent "
+#| "permitted by law.  If that is not possible for any reason, CC0 also "
+#| "provides a simple permissive license as a fallback.  Both public domain "
+#| "works and the simple license provided by CC0 are compatible with the GNU "
+#| "GPL."
 msgid ""
 "CC0 is a public domain dedication from Creative Commons.  A work released "
 "under CC0 is dedicated to the public domain to the fullest extent permitted "
-"by law.  If that is not possible for any reason, CC0 also provides a simple "
-"permissive license as a fallback.  Both public domain works and the simple "
+"by law.  If that is not possible for any reason, CC0 also provides a lax, "
+"permissive license as a fallback.  Both public domain works and the lax "
 "license provided by CC0 are compatible with the GNU GPL."
 msgstr ""
 "CC0 est une licence Creative Commons dédiée au domaine public. Un travail "
@@ -688,13 +770,31 @@
 "\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license, compatible with both GPLv2 and GPLv3.  It
+# | is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and
+# | adds a term expressly stating it does not grant you any patent licenses. 
+# | Because of this, we encourage you to be careful about using software under
+# | this license; you should first consider whether the licensor might want to
+# | sue you for patent infringement.  If the developer is [-disclaiming-]
+# | {+refusing users+} patent licenses to set up a trap for you, it would be
+# | wise to avoid the program.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with both GPLv2 and GPLv3.  "
+#| "It is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and "
+#| "adds a term expressly stating it does not grant you any patent licenses.  "
+#| "Because of this, we encourage you to be careful about using software "
+#| "under this license; you should first consider whether the licensor might "
+#| "want to sue you for patent infringement.  If the developer is disclaiming "
+#| "patent licenses to set up a trap for you, it would be wise to avoid the "
+#| "program."
 msgid ""
 "This is a free software license, compatible with both GPLv2 and GPLv3.  It "
 "is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and adds "
 "a term expressly stating it does not grant you any patent licenses.  Because "
 "of this, we encourage you to be careful about using software under this "
 "license; you should first consider whether the licensor might want to sue "
-"you for patent infringement.  If the developer is disclaiming patent "
+"you for patent infringement.  If the developer is refusing users patent "
 "licenses to set up a trap for you, it would be wise to avoid the program."
 msgstr ""
 "C'est une licence de logiciel libre, compatible avec la GPLv2 et la GPLv3. "
@@ -717,8 +817,15 @@
 "href=\"#CryptixGeneralLicense\">#CryptixGeneralLicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is very similar to the X11
+# | license.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is very similar to the X11 license."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
 msgstr ""
 "Il s'agit d'une licence de logiciel libre simple et permissive, sans "
@@ -877,8 +984,16 @@
 "\">#Expat</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is sometimes ambiguously
+# | referred to as the <em>MIT License</em>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is sometimes ambiguously referred to as "
+#| "the <em>MIT License</em>."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
 "License</em>."
 msgstr ""
@@ -886,6 +1001,12 @@
 "compatible avec la GNU GPL. D'une manière ambiguë, on l'appelle parfois "
 "<em>la Licence du MIT</em>."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"For substantial programs it is better to use the Apache 2.0 license since it "
+"blocks patent treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FreeBSD\" href=\"http://www.freebsd.org/copyright/freebsd-license.";
@@ -897,10 +1018,20 @@
 "href=\"#FreeBSD\">#FreeBSD</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license with the advertising clause and another
+# | clause removed.  (It is also sometimes called the &ldquo;2-clause BSD
+# | license&rdquo;.)  It is a [-simple,-] {+lax,+} permissive non-copyleft
+# | free software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license with the advertising clause and another "
+#| "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
+#| "license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+#| "license, compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
-"license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+"license&rdquo;.)  It is a lax, permissive non-copyleft free software "
 "license, compatible with the GNU GPL."
 msgstr ""
 "Il s'agit de la licence BSD d'origine dont la clause publicitaire et une "
@@ -910,17 +1041,9 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"FreeBSD license is a reasonable choice.  However, please don't call it a "
-"&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is likely "
-"to cause confusion which could lead to use of the flawed <a href="
-"\"#OriginalBSD\"><em>original</em> BSD license</a>."
-msgstr ""
-"Si vous voulez une licence de logiciel libre, permissive, simple, sans "
-"copyleft, la licence FreeBSD est un choix raisonnable. Cependant, veuillez "
-"ne pas l'appeler «&nbsp;licence BSD&nbsp;» ou «&nbsp;de style BSD&nbsp;», 
"
-"car cela causera sans doute une confusion qui pourrait amener à utiliser la "
-"<a href=\"#OriginalBSD\">licence BSD <em>originelle</em></a>."
+"Our comments about the <a href=\"#ModifiedBSD\">Modified BSD license</a> "
+"apply to this license too."
+msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1025,9 +1148,15 @@
 "[EN] <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This license is sometimes also known as the OpenBSD License.  It is a
+# | {+lax, permissive+} free software license, and compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is sometimes also known as the OpenBSD License.  It is a "
+#| "free software license, and compatible with the GNU GPL."
 msgid ""
-"This license is sometimes also known as the OpenBSD License.  It is a free "
-"software license, and compatible with the GNU GPL."
+"This license is sometimes also known as the OpenBSD License.  It is a lax, "
+"permissive free software license, and compatible with the GNU GPL."
 msgstr ""
 "Cette licence est parfois aussi connue sous le nom de licence OpenBSD. C'est "
 "une licence de logiciel libre, compatible avec la GNU GPL."
@@ -1190,10 +1319,20 @@
 "\"anchor-reference-id\">(<a href=\"#NCSA\">#NCSA</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This license is based on the terms of the <a href=\"#Expat\">Expat</a> and
+# | <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a [-simple,-]
+# | {+lax,+} permissive non-copyleft free software license, compatible with
+# | the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is based on the terms of the <a href=\"#Expat\">Expat</a> "
+#| "and <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
+#| "permissive non-copyleft free software license, compatible with the GNU "
+#| "GPL."
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
-"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
-"permissive non-copyleft free software license, compatible with the GNU GPL."
+"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a lax, permissive "
+"non-copyleft free software license, compatible with the GNU GPL."
 msgstr ""
 "Cette licence est basée sur les termes des licences <a href=\"#Expat"
 "\">Expat</a> et <a href=\"#ModifiedBSD\">BSD modifiée</a>. C'est une licence 
"
@@ -1437,11 +1576,21 @@
 "class=\"anchor-reference-id\"> (<a href=\"#Unicode\">#Unicode</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a license that Unicode, Inc. has applied to the Unicode Character
+# | Database&mdash;various data files that developers can use to help
+# | implement the Unicode standard in their own programs.  It is a [-simple-]
+# | {+lax+} permissive license, compatible with all versions of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a license that Unicode, Inc. has applied to the Unicode Character "
+#| "Database&mdash;various data files that developers can use to help "
+#| "implement the Unicode standard in their own programs.  It is a simple "
+#| "permissive license, compatible with all versions of the GPL."
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
-"the Unicode standard in their own programs.  It is a simple permissive "
-"license, compatible with all versions of the GPL."
+"the Unicode standard in their own programs.  It is a lax permissive license, "
+"compatible with all versions of the GPL."
 msgstr ""
 "C'est une licence qu'Unicode Inc. a appliquée à la base de données des "
 "caractères Unicode – divers fichiers de données que les développeurs 
peuvent "
@@ -1486,11 +1635,24 @@
 "les fichiers qu'elle couvre."
 
 #. type: Content of: <dl><dd><p>
+# | Please do not use this License Agreement for your own software.  If you
+# | want to use a [-simple-] {+lax+} permissive license for your project,
+# | please use the <a href=\"#Expat\">Expat [-license</a>; it is by-]
+# | {+license</a> for a small program and the Apache 2.0 license for a
+# | substantial program.  These are+} far more common, and widely recognized
+# | in the free software community.
+#, fuzzy
+#| msgid ""
+#| "Please do not use this License Agreement for your own software.  If you "
+#| "want to use a simple permissive license for your project, please use the "
+#| "<a href=\"#Expat\">Expat license</a>; it is by far more common, and "
+#| "widely recognized in the free software community."
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
-"to use a simple permissive license for your project, please use the <a href="
-"\"#Expat\">Expat license</a>; it is by far more common, and widely "
-"recognized in the free software community."
+"to use a lax permissive license for your project, please use the <a href="
+"\"#Expat\">Expat license</a> for a small program and the Apache 2.0 license "
+"for a substantial program.  These are far more common, and widely recognized "
+"in the free software community."
 msgstr ""
 "Veuillez ne pas utiliser cet accord de licence pour vos propres logiciels. "
 "Si vous voulez utiliser une licence permissive simple pour votre projet, "
@@ -1506,12 +1668,26 @@
 "class=\"anchor-reference-id\"> (<a href=\"#Unlicense\">#Unlicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The Unlicense is a public domain dedication.  A work released under the
+# | Unlicense is dedicated to the public domain to the fullest extent
+# | permitted by law, and also comes with an additional [-simple-] {+lax+}
+# | license that helps cover any cases where the dedication is inadequate. 
+# | Both public domain works and the [-simple-] {+lax+} license provided by
+# | the Unlicense are compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "The Unlicense is a public domain dedication.  A work released under the "
+#| "Unlicense is dedicated to the public domain to the fullest extent "
+#| "permitted by law, and also comes with an additional simple license that "
+#| "helps cover any cases where the dedication is inadequate.  Both public "
+#| "domain works and the simple license provided by the Unlicense are "
+#| "compatible with the GNU GPL."
 msgid ""
 "The Unlicense is a public domain dedication.  A work released under the "
 "Unlicense is dedicated to the public domain to the fullest extent permitted "
-"by law, and also comes with an additional simple license that helps cover "
-"any cases where the dedication is inadequate.  Both public domain works and "
-"the simple license provided by the Unlicense are compatible with the GNU GPL."
+"by law, and also comes with an additional lax license that helps cover any "
+"cases where the dedication is inadequate.  Both public domain works and the "
+"lax license provided by the Unlicense are compatible with the GNU GPL."
 msgstr ""
 "L'<cite>Unlicense</cite> est dédiée au domaine public. Un travail 
distribué "
 "sous <cite>Unlicense</cite> est mis dans le domaine public dans les limites "
@@ -1601,10 +1777,27 @@
 "\">#WTFPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, very permissive and GPL-compatible."
+# | This is [-a simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
+msgid ""
+"This is lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL."
+msgstr ""
+"C'est une licence de logiciel libre simple, permissive, sans copyleft, "
+"compatible avec la GNU GPL."
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"We do not recommend this license.  If you want a lax permissive license for "
+"a small program, we recommend the <a href=\"#X11License\">X11 license</a>.  "
+"A larger program usually ought to be copyleft; but if you are set on using a "
+"lax permissive license for one, we recommend the Apache 2.0 license since it "
+"protects users from patent treachery."
 msgstr ""
-"Il s'agit d'une licence de logiciel libre, très permissive et compatible "
-"avec la GPL."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1617,10 +1810,22 @@
 "\"#X11License\">#X11License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
-"with the GNU GPL.  Older versions of XFree86 used the same license, and some "
-"of the current variants of XFree86 also do.  Later versions of XFree86 are "
+# | This is a [-simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  Older versions of XFree86 used the
+# | same license, and some of the current variants of XFree86 also do.  Later
+# | versions of XFree86 are distributed under the <a
+# | href=\"#XFree861.1License\">XFree86 1.1 license</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  Older versions of XFree86 used the same "
+#| "license, and some of the current variants of XFree86 also do.  Later "
+#| "versions of XFree86 are distributed under the <a href=\"#XFree861.1License"
+#| "\">XFree86 1.1 license</a>."
+msgid ""
+"This is a lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL.  Older versions of XFree86 used the same license, and some of "
+"the current variants of XFree86 also do.  Later versions of XFree86 are "
 "distributed under the <a href=\"#XFree861.1License\">XFree86 1.1 license</a>."
 msgstr ""
 "Il s'agit d'une licence de logiciel libre, simple et permissive, sans "
@@ -1637,6 +1842,14 @@
 "Cette licence est parfois appelée «&nbsp;licence du MIT&nbsp;» mais ce 
terme "
 "est trompeur&nbsp;: le MIT a publié ses logiciels sous diverses licences."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a fine license for a small program.  A larger program usually ought "
+"to be copyleft; but if you are set on a lax permissive license for one, we "
+"recommend the Apache 2.0 license since it protects users from patent "
+"treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
@@ -1648,8 +1861,14 @@
 "(<a href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with version 3 of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with version 3 of the GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
 msgstr ""
 "C'est une licence de logiciel libre, simple et permissive, sans copyleft, "
@@ -1701,8 +1920,14 @@
 "class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license which is compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license which is "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license which is "
+"This is a lax, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
 msgstr ""
 "La ZPL est une licence de logiciel libre, simple et permissive, sans "
@@ -1818,8 +2043,18 @@
 "\"> (<a href=\"#apache1\">#apache1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with an advertising clause.  This creates <a
+# | href=\"/philosophy/bsd.html\">practical problems</a> like those of the
+# | original BSD license, including incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with an "
+#| "advertising clause.  This creates <a href=\"/philosophy/bsd.html"
+#| "\">practical problems</a> like those of the original BSD license, "
+#| "including incompatibility with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license with an "
+"This is a lax, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
 "problems</a> like those of the original BSD license, including "
 "incompatibility with the GNU GPL."
@@ -1892,11 +2127,24 @@
 "appelée «&nbsp;Licence BSD à quatre clauses&nbsp;».)"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license with a "
-"serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software nonfree.  But it does "
-"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with a serious flaw: the &ldquo;obnoxious BSD advertising
+# | clause&rdquo;.  The flaw is not fatal; that is, it does not render the
+# | software nonfree.  But it does cause <a
+# | href=\"/philosophy/bsd.html\">practical problems</a>, including
+# | incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software nonfree.  But "
+#| "it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
+#| "including incompatibility with the GNU GPL."
+msgid ""
+"This is a lax, permissive non-copyleft free software license with a serious "
+"flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw is not "
+"fatal; that is, it does not render the software nonfree.  But it does cause "
+"<a href=\"/philosophy/bsd.html\">practical problems</a>, including "
 "incompatibility with the GNU GPL."
 msgstr ""
 "C'est une licence de logiciel libre, simple et permissive, mais ce n'est pas "
@@ -1907,12 +2155,28 @@
 "la GNU GPL."
 
 #. type: Content of: <dl><dd><p>
+# | We urge you not to use the original BSD license for software you write. 
+# | If you want to use a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, it is much better to use the <a
+# | href=\"#ModifiedBSD\">modified BSD [-license</a> or-] {+license</a>,+} the
+# | X11 {+license or the Expat+} license.  [-However, there is no reason not
+# | to-]  {+Even better, for a substantial program,+} use [-programs that have
+# | been released under-] the [-original BSD license.-] {+Apache 2.0 license
+# | since it takes action against patent treachery.+}
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the original BSD license for software you write.  "
+#| "If you want to use a simple, permissive non-copyleft free software "
+#| "license, it is much better to use the <a href=\"#ModifiedBSD\">modified "
+#| "BSD license</a> or the X11 license.  However, there is no reason not to "
+#| "use programs that have been released under the original BSD license."
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
-"you want to use a simple, permissive non-copyleft free software license, it "
-"is much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a> "
-"or the X11 license.  However, there is no reason not to use programs that "
-"have been released under the original BSD license."
+"you want to use a lax, permissive non-copyleft free software license, it is "
+"much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a>, "
+"the X11 license or the Expat license.  Even better, for a substantial "
+"program, use the Apache 2.0 license since it takes action against patent "
+"treachery."
 msgstr ""
 "Nous vous prions instamment de ne pas utiliser la licence BSD d'origine pour "
 "les logiciels que vous écrivez. Si vous souhaitez une licence simple et "
@@ -1921,6 +2185,24 @@
 "n'y a aucune raison de ne pas utiliser les programmes publiés sous la "
 "licence BSD d'origine."
 
+#. type: Content of: <dl><dd><p>
+# | [-We urge you not to use the Open Software License for software you
+# | write.-]However, there is no reason {+not+} to [-avoid running-] {+use+}
+# | programs that have been released under [-this-] {+the original BSD+}
+# | license.
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the Open Software License for software you write.  "
+#| "However, there is no reason to avoid running programs that have been "
+#| "released under this license."
+msgid ""
+"However, there is no reason not to use programs that have been released "
+"under the original BSD license."
+msgstr ""
+"Nous vous demandons instamment de ne pas utiliser la licence OSL pour les "
+"logiciels que vous écrivez. Cependant, il n'y a aucune raison d'éviter "
+"d'utiliser des programmes ayant été publiés sous cette licence."
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CDDL\" href=\"http://www.opensolaris.org/os/licensing/cddllicense.txt";
@@ -2955,9 +3237,19 @@
 "class=\"anchor-reference-id\"> (<a href=\"#Zope\">#Zope</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} fairly permissive non-copyleft free
+# | software license with <a href=\"/philosophy/bsd.html\">practical
+# | problems</a> like those of the original BSD license, including
+# | incompatibility with the <a href=\"/licenses/gpl.html\">GNU GPL</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, fairly permissive non-copyleft free software license "
+#| "with <a href=\"/philosophy/bsd.html\">practical problems</a> like those "
+#| "of the original BSD license, including incompatibility with the <a href="
+#| "\"/licenses/gpl.html\">GNU GPL</a>."
 msgid ""
-"This is a simple, fairly permissive non-copyleft free software license with "
-"<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
+"This is a lax, fairly permissive non-copyleft free software license with <a "
+"href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
 "original BSD license, including incompatibility with the <a href=\"/licenses/"
 "gpl.html\">GNU GPL</a>."
 msgstr ""
@@ -4573,3 +4865,22 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
+
+#~ msgid ""
+#~ "If you want a simple, permissive non-copyleft free software license, the "
+#~ "FreeBSD license is a reasonable choice.  However, please don't call it a "
+#~ "&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is "
+#~ "likely to cause confusion which could lead to use of the flawed <a href="
+#~ "\"#OriginalBSD\"><em>original</em> BSD license</a>."
+#~ msgstr ""
+#~ "Si vous voulez une licence de logiciel libre, permissive, simple, sans "
+#~ "copyleft, la licence FreeBSD est un choix raisonnable. Cependant, "
+#~ "veuillez ne pas l'appeler «&nbsp;licence BSD&nbsp;» ou «&nbsp;de style "
+#~ "BSD&nbsp;», car cela causera sans doute une confusion qui pourrait amener 
"
+#~ "à utiliser la <a href=\"#OriginalBSD\">licence BSD <em>originelle</em></"
+#~ "a>."
+
+#~ msgid "This is a free software license, very permissive and GPL-compatible."
+#~ msgstr ""
+#~ "Il s'agit d'une licence de logiciel libre, très permissive et compatible "
+#~ "avec la GPL."

Index: license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- license-list.it.po  22 Jul 2012 16:27:49 -0000      1.62
+++ license-list.it.po  1 Aug 2012 08:36:35 -0000       1.63
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-07-21 12:25-0300\n"
+"POT-Creation-Date: 2012-08-01 04:33-0300\n"
 "PO-Revision-Date: 2012-07-22 12:44+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-08-01 04:33-0300\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -478,8 +479,18 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple-] {+lax,+} permissive free software license, compatible
+# | with the GNU GPL, which we recommend GNU packages use for README and other
+# | small supporting files.  All developers can feel free to use it in similar
+# | situations.
+#, fuzzy
+#| msgid ""
+#| "This is a simple permissive free software license, compatible with the "
+#| "GNU GPL, which we recommend GNU packages use for README and other small "
+#| "supporting files.  All developers can feel free to use it in similar "
+#| "situations."
 msgid ""
-"This is a simple permissive free software license, compatible with the GNU "
+"This is a lax, permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
 "supporting files.  All developers can feel free to use it in similar "
 "situations."
@@ -512,17 +523,37 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, compatible with version 3 of the GPL."
+# | This is a free software license, compatible with version 3 of the {+GNU+}
+# | GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with version 3 of the GPL."
+msgid ""
+"This is a free software license, compatible with version 3 of the GNU GPL."
 msgstr ""
 "Questa è una licenza di software libero, compatibile con la versione 3 della 
"
 "GPL."
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | Please note that this license is not compatible with GPL version 2,
+# | because it has some requirements that are not in the [-older-] {+that
+# | GPL+} version.  These include certain patent termination and
+# | indemnification provisions.  {+The patent termination provision is a good
+# | thing, which is why we recommend the Apache 2.0 license for substantial
+# | programs over other lax permissive licenses.+}
+#, fuzzy
+#| msgid ""
+#| "Please note that this license is not compatible with GPL version 2, "
+#| "because it has some requirements that are not in the older version.  "
+#| "These include certain patent termination and indemnification provisions."
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
-"it has some requirements that are not in the older version.  These include "
-"certain patent termination and indemnification provisions."
+"it has some requirements that are not in the that GPL version.  These "
+"include certain patent termination and indemnification provisions.  The "
+"patent termination provision is a good thing, which is why we recommend the "
+"Apache 2.0 license for substantial programs over other lax permissive "
+"licenses."
 msgstr ""
 "Notate che questa licenza non è compatibile con la versione 2 della GPL, "
 "perché ha requisiti che mancavano nella versione più vecchia della GPL: ad "
@@ -582,8 +613,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
 msgstr ""
 "Questa è una semplice licenza di software libero, permissiva, senza "
@@ -611,9 +648,17 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license, modified by removal of the advertising
+# | clause.  It is a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license, modified by removal of the advertising "
+#| "clause.  It is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
-"clause.  It is a simple, permissive non-copyleft free software license, "
+"clause.  It is a lax, permissive non-copyleft free software license, "
 "compatible with the GNU GPL."
 msgstr ""
 "Questa è la licenza BSD originale, modificata rimuovendo la clausola "
@@ -622,14 +667,38 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"modified BSD license is a reasonable choice.  However, it is risky to "
-"recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
-"easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
-"\"><em>original</em> BSD license</a>.  To avoid this risk, you can suggest "
-"the X11 license instead.  The X11 license and the revised BSD license are "
-"more or less equivalent."
+msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgstr ""
+"Talvolta questa licenza è denominata \"la licenza BSD con 3 clausole\"."
+
+# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+# | [-If you want a simple, permissive non-copyleft free software license,
+# | the-]{+The+} modified BSD license is [-a reasonable choice.-] {+not bad,
+# | as lax permissive licenses go, though the Apache 2.0 license is
+# | preferable.+}  However, it is risky to recommend use of &ldquo;the BSD
+# | license&rdquo;, {+even for special cases such as small programs,+} because
+# | confusion could easily occur and lead to use of the flawed <a
+# | href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this
+# | risk, you can suggest the X11 license instead.  The X11 license and the
+# | {+modified+} revised BSD license are more or less equivalent.
+#, fuzzy
+#| msgid ""
+#| "If you want a simple, permissive non-copyleft free software license, the "
+#| "modified BSD license is a reasonable choice.  However, it is risky to "
+#| "recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
+#| "easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
+#| "\"><em>original</em> BSD license</a>.  To avoid this risk, you can "
+#| "suggest the X11 license instead.  The X11 license and the revised BSD "
+#| "license are more or less equivalent."
+msgid ""
+"The modified BSD license is not bad, as lax permissive licenses go, though "
+"the Apache 2.0 license is preferable.  However, it is risky to recommend use "
+"of &ldquo;the BSD license&rdquo;, even for special cases such as small "
+"programs, because confusion could easily occur and lead to use of the flawed "
+"<a href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this "
+"risk, you can suggest the X11 license instead.  The X11 license and the "
+"modified revised BSD license are more or less equivalent."
 msgstr ""
 "Se desiderate una licenza per software libero semplice, permissiva e senza "
 "copyleft, allora la licenza BSD modificata è una buona scelta. Ad ogni modo, 
"
@@ -638,11 +707,11 @@
 "BSD <em>originale</em></a>.  Per evitare questo rischio suggerite la licenza "
 "X11. La licenza X11 e la BSD modificata sono più o meno equivalenti."
 
-# type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgid ""
+"However, the Apache 2.0 license is better for substantial programs, since it "
+"prevents patent treachery."
 msgstr ""
-"Talvolta questa licenza è denominata \"la licenza BSD con 3 clausole\"."
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
@@ -656,11 +725,25 @@
 "\"#CC0\">#CC0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | CC0 is a public domain dedication from Creative Commons.  A work released
+# | under CC0 is dedicated to the public domain to the fullest extent
+# | permitted by law.  If that is not possible for any reason, CC0 also
+# | provides a [-simple-] {+lax,+} permissive license as a fallback.  Both
+# | public domain works and the [-simple-] {+lax+} license provided by CC0 are
+# | compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "CC0 is a public domain dedication from Creative Commons.  A work released "
+#| "under CC0 is dedicated to the public domain to the fullest extent "
+#| "permitted by law.  If that is not possible for any reason, CC0 also "
+#| "provides a simple permissive license as a fallback.  Both public domain "
+#| "works and the simple license provided by CC0 are compatible with the GNU "
+#| "GPL."
 msgid ""
 "CC0 is a public domain dedication from Creative Commons.  A work released "
 "under CC0 is dedicated to the public domain to the fullest extent permitted "
-"by law.  If that is not possible for any reason, CC0 also provides a simple "
-"permissive license as a fallback.  Both public domain works and the simple "
+"by law.  If that is not possible for any reason, CC0 also provides a lax, "
+"permissive license as a fallback.  Both public domain works and the lax "
 "license provided by CC0 are compatible with the GNU GPL."
 msgstr ""
 "CC0 è una donazione in pubblico dominio per Creative Commons.  Un'opera "
@@ -745,13 +828,31 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a free software license, compatible with both GPLv2 and GPLv3.  It
+# | is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and
+# | adds a term expressly stating it does not grant you any patent licenses. 
+# | Because of this, we encourage you to be careful about using software under
+# | this license; you should first consider whether the licensor might want to
+# | sue you for patent infringement.  If the developer is [-disclaiming-]
+# | {+refusing users+} patent licenses to set up a trap for you, it would be
+# | wise to avoid the program.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with both GPLv2 and GPLv3.  "
+#| "It is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and "
+#| "adds a term expressly stating it does not grant you any patent licenses.  "
+#| "Because of this, we encourage you to be careful about using software "
+#| "under this license; you should first consider whether the licensor might "
+#| "want to sue you for patent infringement.  If the developer is disclaiming "
+#| "patent licenses to set up a trap for you, it would be wise to avoid the "
+#| "program."
 msgid ""
 "This is a free software license, compatible with both GPLv2 and GPLv3.  It "
 "is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and adds "
 "a term expressly stating it does not grant you any patent licenses.  Because "
 "of this, we encourage you to be careful about using software under this "
 "license; you should first consider whether the licensor might want to sue "
-"you for patent infringement.  If the developer is disclaiming patent "
+"you for patent infringement.  If the developer is refusing users patent "
 "licenses to set up a trap for you, it would be wise to avoid the program."
 msgstr ""
 "Questa è una licenza di software libero, compatibile sia con la GPLv2 sia "
@@ -776,8 +877,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is very similar to the X11
+# | license.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is very similar to the X11 license."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
 msgstr ""
 "Questa è una semplice licenza per software libero permissiva, senza "
@@ -923,8 +1031,16 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is sometimes ambiguously
+# | referred to as the <em>MIT License</em>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is sometimes ambiguously referred to as "
+#| "the <em>MIT License</em>."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
 "License</em>."
 msgstr ""
@@ -932,6 +1048,12 @@
 "copyleft, compatibile con la GNU GPL. A volte viene ambiguamente chiamata "
 "con il nome di <em>Licenza MIT</em>."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"For substantial programs it is better to use the Apache 2.0 license since it "
+"blocks patent treachery."
+msgstr ""
+
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
@@ -945,10 +1067,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license with the advertising clause and another
+# | clause removed.  (It is also sometimes called the &ldquo;2-clause BSD
+# | license&rdquo;.)  It is a [-simple,-] {+lax,+} permissive non-copyleft
+# | free software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license with the advertising clause and another "
+#| "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
+#| "license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+#| "license, compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
-"license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+"license&rdquo;.)  It is a lax, permissive non-copyleft free software "
 "license, compatible with the GNU GPL."
 msgstr ""
 "Questa è la licenza BSD originale, a cui sono state tolte la clausola di "
@@ -956,20 +1088,11 @@
 "clausole&rdquo;. E' una semplice licenza per software libero permissiva, "
 "senza copyleft, compatibile con la GNU GPL. "
 
-# type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"FreeBSD license is a reasonable choice.  However, please don't call it a "
-"&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is likely "
-"to cause confusion which could lead to use of the flawed <a href="
-"\"#OriginalBSD\"><em>original</em> BSD license</a>."
-msgstr ""
-"Se desiderate una semplice licenza per software libero permissiva, senza "
-"copyleft, la licenza di FreeBSD è una scelta ragionevole.  Tuttavia, cercate 
"
-"di non chiamarla &ldquo;BSD&rdquo; o &ldquo;stile BSD&rdquo;, perché "
-"potreste facilmente creare confusione che potrebbe portare all'uso della "
-"inappropriata <a href=\"#OriginalBSD\">licenza BSD <em>originale</em></a>."
+"Our comments about the <a href=\"#ModifiedBSD\">Modified BSD license</a> "
+"apply to this license too."
+msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1074,9 +1197,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This license is sometimes also known as the OpenBSD License.  It is a
+# | {+lax, permissive+} free software license, and compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is sometimes also known as the OpenBSD License.  It is a "
+#| "free software license, and compatible with the GNU GPL."
 msgid ""
-"This license is sometimes also known as the OpenBSD License.  It is a free "
-"software license, and compatible with the GNU GPL."
+"This license is sometimes also known as the OpenBSD License.  It is a lax, "
+"permissive free software license, and compatible with the GNU GPL."
 msgstr ""
 "Questa licenza è anche nota come licenza di OpenBSD. E' una licenza di "
 "software libero, compatibile con la GNU GPL."
@@ -1232,10 +1361,20 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This license is based on the terms of the <a href=\"#Expat\">Expat</a> and
+# | <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a [-simple,-]
+# | {+lax,+} permissive non-copyleft free software license, compatible with
+# | the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is based on the terms of the <a href=\"#Expat\">Expat</a> "
+#| "and <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
+#| "permissive non-copyleft free software license, compatible with the GNU "
+#| "GPL."
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
-"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
-"permissive non-copyleft free software license, compatible with the GNU GPL."
+"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a lax, permissive "
+"non-copyleft free software license, compatible with the GNU GPL."
 msgstr ""
 "Questa licenza è basata sulle condizioni delle licenze <a href=\"#Expat"
 "\">Expat</a> e <a href=\"#ModifiedBSD\">BSD modificata</a>. E' una licenza "
@@ -1493,11 +1632,21 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a license that Unicode, Inc. has applied to the Unicode Character
+# | Database&mdash;various data files that developers can use to help
+# | implement the Unicode standard in their own programs.  It is a [-simple-]
+# | {+lax+} permissive license, compatible with all versions of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a license that Unicode, Inc. has applied to the Unicode Character "
+#| "Database&mdash;various data files that developers can use to help "
+#| "implement the Unicode standard in their own programs.  It is a simple "
+#| "permissive license, compatible with all versions of the GPL."
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
-"the Unicode standard in their own programs.  It is a simple permissive "
-"license, compatible with all versions of the GPL."
+"the Unicode standard in their own programs.  It is a lax permissive license, "
+"compatible with all versions of the GPL."
 msgstr ""
 "Questa è una licenza che Unicode, Inc. ha applicato al suo Unicode Character 
"
 "Database: vari file di dati che gli sviluppatori possono usare per "
@@ -1543,11 +1692,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | Please do not use this License Agreement for your own software.  If you
+# | want to use a [-simple-] {+lax+} permissive license for your project,
+# | please use the <a href=\"#Expat\">Expat [-license</a>; it is by-]
+# | {+license</a> for a small program and the Apache 2.0 license for a
+# | substantial program.  These are+} far more common, and widely recognized
+# | in the free software community.
+#, fuzzy
+#| msgid ""
+#| "Please do not use this License Agreement for your own software.  If you "
+#| "want to use a simple permissive license for your project, please use the "
+#| "<a href=\"#Expat\">Expat license</a>; it is by far more common, and "
+#| "widely recognized in the free software community."
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
-"to use a simple permissive license for your project, please use the <a href="
-"\"#Expat\">Expat license</a>; it is by far more common, and widely "
-"recognized in the free software community."
+"to use a lax permissive license for your project, please use the <a href="
+"\"#Expat\">Expat license</a> for a small program and the Apache 2.0 license "
+"for a substantial program.  These are far more common, and widely recognized "
+"in the free software community."
 msgstr ""
 "Vi sconsigliamo di utilizzare questo accordo di licenza per il software che "
 "scrivete. Se volete usare una semplice licenza permissiva, <a href=\"#Expat"
@@ -1564,12 +1726,26 @@
 "class=\"anchor-reference-id\"> (<a href=\"#Unlicense\">#Unlicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The Unlicense is a public domain dedication.  A work released under the
+# | Unlicense is dedicated to the public domain to the fullest extent
+# | permitted by law, and also comes with an additional [-simple-] {+lax+}
+# | license that helps cover any cases where the dedication is inadequate. 
+# | Both public domain works and the [-simple-] {+lax+} license provided by
+# | the Unlicense are compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "The Unlicense is a public domain dedication.  A work released under the "
+#| "Unlicense is dedicated to the public domain to the fullest extent "
+#| "permitted by law, and also comes with an additional simple license that "
+#| "helps cover any cases where the dedication is inadequate.  Both public "
+#| "domain works and the simple license provided by the Unlicense are "
+#| "compatible with the GNU GPL."
 msgid ""
 "The Unlicense is a public domain dedication.  A work released under the "
 "Unlicense is dedicated to the public domain to the fullest extent permitted "
-"by law, and also comes with an additional simple license that helps cover "
-"any cases where the dedication is inadequate.  Both public domain works and "
-"the simple license provided by the Unlicense are compatible with the GNU GPL."
+"by law, and also comes with an additional lax license that helps cover any "
+"cases where the dedication is inadequate.  Both public domain works and the "
+"lax license provided by the Unlicense are compatible with the GNU GPL."
 msgstr ""
 "La Unlicense è una donazione in pubblico dominio. Un lavoro rilasciato sotto 
"
 "la Unlicense diventa di dominio pubblico nella più ampia accezione del "
@@ -1664,10 +1840,27 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, very permissive and GPL-compatible."
+# | This is [-a simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
+msgid ""
+"This is lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL."
+msgstr ""
+"Questa è una semplice licenza di software libero, permissiva, senza "
+"copyleft, compatibile con la GNU GPL."
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"We do not recommend this license.  If you want a lax permissive license for "
+"a small program, we recommend the <a href=\"#X11License\">X11 license</a>.  "
+"A larger program usually ought to be copyleft; but if you are set on using a "
+"lax permissive license for one, we recommend the Apache 2.0 license since it "
+"protects users from patent treachery."
 msgstr ""
-"Questa è una licenza di software libero, molto permissiva e compatibile con "
-"la GPL."
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
@@ -1682,10 +1875,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
-"with the GNU GPL.  Older versions of XFree86 used the same license, and some "
-"of the current variants of XFree86 also do.  Later versions of XFree86 are "
+# | This is a [-simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  Older versions of XFree86 used the
+# | same license, and some of the current variants of XFree86 also do.  Later
+# | versions of XFree86 are distributed under the <a
+# | href=\"#XFree861.1License\">XFree86 1.1 license</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  Older versions of XFree86 used the same "
+#| "license, and some of the current variants of XFree86 also do.  Later "
+#| "versions of XFree86 are distributed under the <a href=\"#XFree861.1License"
+#| "\">XFree86 1.1 license</a>."
+msgid ""
+"This is a lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL.  Older versions of XFree86 used the same license, and some of "
+"the current variants of XFree86 also do.  Later versions of XFree86 are "
 "distributed under the <a href=\"#XFree861.1License\">XFree86 1.1 license</a>."
 msgstr ""
 "Questa è una semplice licenza per software libero permissiva, senza "
@@ -1704,6 +1909,14 @@
 "improprio, perché il MIT ha usato molte diverse licenze per il proprio "
 "software."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a fine license for a small program.  A larger program usually ought "
+"to be copyleft; but if you are set on a lax permissive license for one, we "
+"recommend the Apache 2.0 license since it protects users from patent "
+"treachery."
+msgstr ""
+
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1717,8 +1930,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with version 3 of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with version 3 of the GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
 msgstr ""
 "Questa è una licenza di software libero semplice, permissiva, senza "
@@ -1777,8 +1996,14 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license which is compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license which is "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license which is "
+"This is a lax, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
 msgstr ""
 "Questa è una licenza di software libero semplice, permissiva, senza "
@@ -1903,8 +2128,18 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with an advertising clause.  This creates <a
+# | href=\"/philosophy/bsd.html\">practical problems</a> like those of the
+# | original BSD license, including incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with an "
+#| "advertising clause.  This creates <a href=\"/philosophy/bsd.html"
+#| "\">practical problems</a> like those of the original BSD license, "
+#| "including incompatibility with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license with an "
+"This is a lax, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
 "problems</a> like those of the original BSD license, including "
 "incompatibility with the GNU GPL."
@@ -1983,11 +2218,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license with a "
-"serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software nonfree.  But it does "
-"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with a serious flaw: the &ldquo;obnoxious BSD advertising
+# | clause&rdquo;.  The flaw is not fatal; that is, it does not render the
+# | software nonfree.  But it does cause <a
+# | href=\"/philosophy/bsd.html\">practical problems</a>, including
+# | incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software nonfree.  But "
+#| "it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
+#| "including incompatibility with the GNU GPL."
+msgid ""
+"This is a lax, permissive non-copyleft free software license with a serious "
+"flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw is not "
+"fatal; that is, it does not render the software nonfree.  But it does cause "
+"<a href=\"/philosophy/bsd.html\">practical problems</a>, including "
 "incompatibility with the GNU GPL."
 msgstr ""
 "Questa è una semplice licenza permissiva per software libero, senza copyleft 
"
@@ -1998,12 +2246,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | We urge you not to use the original BSD license for software you write. 
+# | If you want to use a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, it is much better to use the <a
+# | href=\"#ModifiedBSD\">modified BSD [-license</a> or-] {+license</a>,+} the
+# | X11 {+license or the Expat+} license.  [-However, there is no reason not
+# | to-]  {+Even better, for a substantial program,+} use [-programs that have
+# | been released under-] the [-original BSD license.-] {+Apache 2.0 license
+# | since it takes action against patent treachery.+}
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the original BSD license for software you write.  "
+#| "If you want to use a simple, permissive non-copyleft free software "
+#| "license, it is much better to use the <a href=\"#ModifiedBSD\">modified "
+#| "BSD license</a> or the X11 license.  However, there is no reason not to "
+#| "use programs that have been released under the original BSD license."
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
-"you want to use a simple, permissive non-copyleft free software license, it "
-"is much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a> "
-"or the X11 license.  However, there is no reason not to use programs that "
-"have been released under the original BSD license."
+"you want to use a lax, permissive non-copyleft free software license, it is "
+"much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a>, "
+"the X11 license or the Expat license.  Even better, for a substantial "
+"program, use the Apache 2.0 license since it takes action against patent "
+"treachery."
 msgstr ""
 "Vi chiediamo di non utilizzare la licenza BSD originale per il vostro "
 "software. Se desiderate una licenza per software libero semplice, "
@@ -2012,6 +2276,25 @@
 "sussiste una valida per ragione per non utilizzare programmi rilasciati "
 "sotto la licenza BSD originale."
 
+# type: Content of: <dl><dd><p>
+#. type: Content of: <dl><dd><p>
+# | [-We urge you not to use the Open Software License for software you
+# | write.-]However, there is no reason {+not+} to [-avoid running-] {+use+}
+# | programs that have been released under [-this-] {+the original BSD+}
+# | license.
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the Open Software License for software you write.  "
+#| "However, there is no reason to avoid running programs that have been "
+#| "released under this license."
+msgid ""
+"However, there is no reason not to use programs that have been released "
+"under the original BSD license."
+msgstr ""
+"Vi invitiamo a non utilizzare la Open Software License per il vostro "
+"software. Ad ogni modo, non sussiste una valida ragione per evitare di "
+"utilizzare programmi rilasciati sotto questa licenza. "
+
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
@@ -3072,9 +3355,19 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} fairly permissive non-copyleft free
+# | software license with <a href=\"/philosophy/bsd.html\">practical
+# | problems</a> like those of the original BSD license, including
+# | incompatibility with the <a href=\"/licenses/gpl.html\">GNU GPL</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, fairly permissive non-copyleft free software license "
+#| "with <a href=\"/philosophy/bsd.html\">practical problems</a> like those "
+#| "of the original BSD license, including incompatibility with the <a href="
+#| "\"/licenses/gpl.html\">GNU GPL</a>."
 msgid ""
-"This is a simple, fairly permissive non-copyleft free software license with "
-"<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
+"This is a lax, fairly permissive non-copyleft free software license with <a "
+"href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
 "original BSD license, including incompatibility with the <a href=\"/licenses/"
 "gpl.html\">GNU GPL</a>."
 msgstr ""
@@ -4742,3 +5035,24 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "If you want a simple, permissive non-copyleft free software license, the "
+#~ "FreeBSD license is a reasonable choice.  However, please don't call it a "
+#~ "&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is "
+#~ "likely to cause confusion which could lead to use of the flawed <a href="
+#~ "\"#OriginalBSD\"><em>original</em> BSD license</a>."
+#~ msgstr ""
+#~ "Se desiderate una semplice licenza per software libero permissiva, senza "
+#~ "copyleft, la licenza di FreeBSD è una scelta ragionevole.  Tuttavia, "
+#~ "cercate di non chiamarla &ldquo;BSD&rdquo; o &ldquo;stile BSD&rdquo;, "
+#~ "perché potreste facilmente creare confusione che potrebbe portare all'uso 
"
+#~ "della inappropriata <a href=\"#OriginalBSD\">licenza BSD <em>originale</"
+#~ "em></a>."
+
+# type: Content of: <dl><dd><p>
+#~ msgid "This is a free software license, very permissive and GPL-compatible."
+#~ msgstr ""
+#~ "Questa è una licenza di software libero, molto permissiva e compatibile "
+#~ "con la GPL."

Index: license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- license-list.pot    21 Jul 2012 16:28:15 -0000      1.74
+++ license-list.pot    1 Aug 2012 08:36:35 -0000       1.75
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-07-21 12:25-0300\n"
+"POT-Creation-Date: 2012-08-01 04:33-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -310,7 +310,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple permissive free software license, compatible with the GNU "
+"This is a lax, permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
 "supporting files.  All developers can feel free to use it in similar "
 "situations."
@@ -330,14 +330,17 @@
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, compatible with version 3 of the GPL."
+msgid "This is a free software license, compatible with version 3 of the GNU 
GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
-"it has some requirements that are not in the older version.  These include "
-"certain patent termination and indemnification provisions."
+"it has some requirements that are not in the that GPL version.  These "
+"include certain patent termination and indemnification provisions.  The "
+"patent termination provision is a good thing, which is why we recommend the "
+"Apache 2.0 license for substantial programs over other lax permissive "
+"licenses."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -379,7 +382,7 @@
 #. type: Content of: <dl><dd><p>
 #:   
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
 msgstr ""
 
@@ -400,23 +403,29 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
-"clause.  It is a simple, permissive non-copyleft free software license, "
+"clause.  It is a lax, permissive non-copyleft free software license, "
 "compatible with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"modified BSD license is a reasonable choice.  However, it is risky to "
-"recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
-"easily occur and lead to use of the flawed <a "
-"href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this "
+"The modified BSD license is not bad, as lax permissive licenses go, though "
+"the Apache 2.0 license is preferable.  However, it is risky to recommend use "
+"of &ldquo;the BSD license&rdquo;, even for special cases such as small "
+"programs, because confusion could easily occur and lead to use of the flawed "
+"<a href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this "
 "risk, you can suggest the X11 license instead.  The X11 license and the "
-"revised BSD license are more or less equivalent."
+"modified revised BSD license are more or less equivalent."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
-msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgid ""
+"However, the Apache 2.0 license is better for substantial programs, since it "
+"prevents patent treachery."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -430,8 +439,8 @@
 msgid ""
 "CC0 is a public domain dedication from Creative Commons.  A work released "
 "under CC0 is dedicated to the public domain to the fullest extent permitted "
-"by law.  If that is not possible for any reason, CC0 also provides a simple "
-"permissive license as a fallback.  Both public domain works and the simple "
+"by law.  If that is not possible for any reason, CC0 also provides a lax, "
+"permissive license as a fallback.  Both public domain works and the lax "
 "license provided by CC0 are compatible with the GNU GPL."
 msgstr ""
 
@@ -490,7 +499,7 @@
 "a term expressly stating it does not grant you any patent licenses.  Because "
 "of this, we encourage you to be careful about using software under this "
 "license; you should first consider whether the licensor might want to sue "
-"you for patent infringement.  If the developer is disclaiming patent "
+"you for patent infringement.  If the developer is refusing users patent "
 "licenses to set up a trap for you, it would be wise to avoid the program."
 msgstr ""
 
@@ -503,7 +512,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
 msgstr ""
 
@@ -599,11 +608,17 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
 "License</em>."
 msgstr ""
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"For substantial programs it is better to use the Apache 2.0 license since it "
+"blocks patent treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FreeBSD\" "
@@ -616,17 +631,14 @@
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
-"license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+"license&rdquo;.)  It is a lax, permissive non-copyleft free software "
 "license, compatible with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"FreeBSD license is a reasonable choice.  However, please don't call it a "
-"&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is likely "
-"to cause confusion which could lead to use of the flawed <a "
-"href=\"#OriginalBSD\"><em>original</em> BSD license</a>."
+"Our comments about the <a href=\"#ModifiedBSD\">Modified BSD license</a> "
+"apply to this license too."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -701,8 +713,8 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This license is sometimes also known as the OpenBSD License.  It is a free "
-"software license, and compatible with the GNU GPL."
+"This license is sometimes also known as the OpenBSD License.  It is a lax, "
+"permissive free software license, and compatible with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -795,8 +807,8 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
-"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
-"permissive non-copyleft free software license, compatible with the GNU GPL."
+"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a lax, permissive "
+"non-copyleft free software license, compatible with the GNU GPL."
 msgstr ""
 
 #.  lc `s', leave for compatibility 
@@ -964,8 +976,8 @@
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
-"the Unicode standard in their own programs.  It is a simple permissive "
-"license, compatible with all versions of the GPL."
+"the Unicode standard in their own programs.  It is a lax permissive license, "
+"compatible with all versions of the GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -992,8 +1004,9 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
-"to use a simple permissive license for your project, please use the <a "
-"href=\"#Expat\">Expat license</a>; it is by far more common, and widely "
+"to use a lax permissive license for your project, please use the <a "
+"href=\"#Expat\">Expat license</a> for a small program and the Apache 2.0 "
+"license for a substantial program.  These are far more common, and widely "
 "recognized in the free software community."
 msgstr ""
 
@@ -1008,10 +1021,9 @@
 msgid ""
 "The Unlicense is a public domain dedication.  A work released under the "
 "Unlicense is dedicated to the public domain to the fullest extent permitted "
-"by law, and also comes with an additional simple license that helps cover "
-"any cases where the dedication is inadequate.  Both public domain works and "
-"the simple license provided by the Unlicense are compatible with the GNU "
-"GPL."
+"by law, and also comes with an additional lax license that helps cover any "
+"cases where the dedication is inadequate.  Both public domain works and the "
+"lax license provided by the Unlicense are compatible with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1069,7 +1081,18 @@
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, very permissive and GPL-compatible."
+msgid ""
+"This is lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"We do not recommend this license.  If you want a lax permissive license for "
+"a small program, we recommend the <a href=\"#X11License\">X11 license</a>.  "
+"A larger program usually ought to be copyleft; but if you are set on using a "
+"lax permissive license for one, we recommend the Apache 2.0 license since it "
+"protects users from patent treachery."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1082,9 +1105,9 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
-"with the GNU GPL.  Older versions of XFree86 used the same license, and some "
-"of the current variants of XFree86 also do.  Later versions of XFree86 are "
+"This is a lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL.  Older versions of XFree86 used the same license, and some of "
+"the current variants of XFree86 also do.  Later versions of XFree86 are "
 "distributed under the <a href=\"#XFree861.1License\">XFree86 1.1 "
 "license</a>."
 msgstr ""
@@ -1095,6 +1118,14 @@
 "misleading, since MIT has used many licenses for software."
 msgstr ""
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a fine license for a small program.  A larger program usually ought "
+"to be copyleft; but if you are set on a lax permissive license for one, we "
+"recommend the Apache 2.0 license since it protects users from patent "
+"treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"XFree861.1License\" "
@@ -1105,7 +1136,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
 msgstr ""
 
@@ -1145,7 +1176,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, permissive non-copyleft free software license which is "
+"This is a lax, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
 msgstr ""
 
@@ -1225,7 +1256,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, permissive non-copyleft free software license with an "
+"This is a lax, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
 "problems</a> like those of the original BSD license, including "
 "incompatibility with the GNU GPL."
@@ -1277,20 +1308,27 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, permissive non-copyleft free software license with a "
-"serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software nonfree.  But it does "
-"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+"This is a lax, permissive non-copyleft free software license with a serious "
+"flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw is not "
+"fatal; that is, it does not render the software nonfree.  But it does cause "
+"<a href=\"/philosophy/bsd.html\">practical problems</a>, including "
 "incompatibility with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
-"you want to use a simple, permissive non-copyleft free software license, it "
-"is much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a> "
-"or the X11 license.  However, there is no reason not to use programs that "
-"have been released under the original BSD license."
+"you want to use a lax, permissive non-copyleft free software license, it is "
+"much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a>, "
+"the X11 license or the Expat license.  Even better, for a substantial "
+"program, use the Apache 2.0 license since it takes action against patent "
+"treachery."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"However, there is no reason not to use programs that have been released "
+"under the original BSD license."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1971,8 +2009,8 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a simple, fairly permissive non-copyleft free software license with "
-"<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
+"This is a lax, fairly permissive non-copyleft free software license with <a "
+"href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
 "original BSD license, including incompatibility with the <a "
 "href=\"/licenses/gpl.html\">GNU GPL</a>."
 msgstr ""

Index: license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- license-list.ru.po  22 Jul 2012 00:29:11 -0000      1.14
+++ license-list.ru.po  1 Aug 2012 08:36:36 -0000       1.15
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-07-21 12:25-0300\n"
+"POT-Creation-Date: 2012-08-01 04:33-0300\n"
 "PO-Revision-Date: 2012-07-21 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-08-01 04:33-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -436,8 +437,18 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple-] {+lax,+} permissive free software license, compatible
+# | with the GNU GPL, which we recommend GNU packages use for README and other
+# | small supporting files.  All developers can feel free to use it in similar
+# | situations.
+#, fuzzy
+#| msgid ""
+#| "This is a simple permissive free software license, compatible with the "
+#| "GNU GPL, which we recommend GNU packages use for README and other small "
+#| "supporting files.  All developers can feel free to use it in similar "
+#| "situations."
 msgid ""
-"This is a simple permissive free software license, compatible with the GNU "
+"This is a lax, permissive free software license, compatible with the GNU "
 "GPL, which we recommend GNU packages use for README and other small "
 "supporting files.  All developers can feel free to use it in similar "
 "situations."
@@ -467,14 +478,34 @@
 "\"#apache2\">#apache2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, compatible with version 3 of the GPL."
+# | This is a free software license, compatible with version 3 of the {+GNU+}
+# | GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with version 3 of the GPL."
+msgid ""
+"This is a free software license, compatible with version 3 of the GNU GPL."
 msgstr "Это лицензия свободных программ, 
совместимая с версией&nbsp;3 GPL."
 
 #. type: Content of: <dl><dd><p>
+# | Please note that this license is not compatible with GPL version 2,
+# | because it has some requirements that are not in the [-older-] {+that
+# | GPL+} version.  These include certain patent termination and
+# | indemnification provisions.  {+The patent termination provision is a good
+# | thing, which is why we recommend the Apache 2.0 license for substantial
+# | programs over other lax permissive licenses.+}
+#, fuzzy
+#| msgid ""
+#| "Please note that this license is not compatible with GPL version 2, "
+#| "because it has some requirements that are not in the older version.  "
+#| "These include certain patent termination and indemnification provisions."
 msgid ""
 "Please note that this license is not compatible with GPL version 2, because "
-"it has some requirements that are not in the older version.  These include "
-"certain patent termination and indemnification provisions."
+"it has some requirements that are not in the that GPL version.  These "
+"include certain patent termination and indemnification provisions.  The "
+"patent termination provision is a good thing, which is why we recommend the "
+"Apache 2.0 license for substantial programs over other lax permissive "
+"licenses."
 msgstr ""
 "Обратите внимание, что эта лицензия не 
совместима с GPL версии&nbsp;2, "
 "потому что в ней есть некоторые 
требования, которых нет в более старой "
@@ -531,8 +562,14 @@
 "\">(<a href=\"#boost\">#boost</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL."
 msgstr ""
 "Это простая неограничительная лицензия 
свободных программ без авторского "
@@ -557,9 +594,17 @@
 "расположена в разделе &ldquo;General&rdquo;.)"
 
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license, modified by removal of the advertising
+# | clause.  It is a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license, modified by removal of the advertising "
+#| "clause.  It is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license, modified by removal of the advertising "
-"clause.  It is a simple, permissive non-copyleft free software license, "
+"clause.  It is a lax, permissive non-copyleft free software license, "
 "compatible with the GNU GPL."
 msgstr ""
 "Это первоначальная лицензия BSD, 
модифицированная удалением пункта о "
@@ -567,14 +612,36 @@
 "авторского лева, совместимая с GNU GPL."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"modified BSD license is a reasonable choice.  However, it is risky to "
-"recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
-"easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
-"\"><em>original</em> BSD license</a>.  To avoid this risk, you can suggest "
-"the X11 license instead.  The X11 license and the revised BSD license are "
-"more or less equivalent."
+msgid "This license is sometimes referred to as the 3-clause BSD license."
+msgstr "На эту лицензию иногда ссылаются как 
на трехпунктную лицензию BSD."
+
+#. type: Content of: <dl><dd><p>
+# | [-If you want a simple, permissive non-copyleft free software license,
+# | the-]{+The+} modified BSD license is [-a reasonable choice.-] {+not bad,
+# | as lax permissive licenses go, though the Apache 2.0 license is
+# | preferable.+}  However, it is risky to recommend use of &ldquo;the BSD
+# | license&rdquo;, {+even for special cases such as small programs,+} because
+# | confusion could easily occur and lead to use of the flawed <a
+# | href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this
+# | risk, you can suggest the X11 license instead.  The X11 license and the
+# | {+modified+} revised BSD license are more or less equivalent.
+#, fuzzy
+#| msgid ""
+#| "If you want a simple, permissive non-copyleft free software license, the "
+#| "modified BSD license is a reasonable choice.  However, it is risky to "
+#| "recommend use of &ldquo;the BSD license&rdquo;, because confusion could "
+#| "easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
+#| "\"><em>original</em> BSD license</a>.  To avoid this risk, you can "
+#| "suggest the X11 license instead.  The X11 license and the revised BSD "
+#| "license are more or less equivalent."
+msgid ""
+"The modified BSD license is not bad, as lax permissive licenses go, though "
+"the Apache 2.0 license is preferable.  However, it is risky to recommend use "
+"of &ldquo;the BSD license&rdquo;, even for special cases such as small "
+"programs, because confusion could easily occur and lead to use of the flawed "
+"<a href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To avoid this "
+"risk, you can suggest the X11 license instead.  The X11 license and the "
+"modified revised BSD license are more or less equivalent."
 msgstr ""
 "Если вам нужна простая неограничительная 
лицензия свободных программ без "
 "авторского лева, то измененная лицензия BSD 
вполне подойдет.  Однако "
@@ -586,8 +653,10 @@
 "или менее эквивалентны."
 
 #. type: Content of: <dl><dd><p>
-msgid "This license is sometimes referred to as the 3-clause BSD license."
-msgstr "На эту лицензию иногда ссылаются как 
на трехпунктную лицензию BSD."
+msgid ""
+"However, the Apache 2.0 license is better for substantial programs, since it "
+"prevents patent treachery."
+msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -600,11 +669,25 @@
 "\"#CC0\">#CC0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | CC0 is a public domain dedication from Creative Commons.  A work released
+# | under CC0 is dedicated to the public domain to the fullest extent
+# | permitted by law.  If that is not possible for any reason, CC0 also
+# | provides a [-simple-] {+lax,+} permissive license as a fallback.  Both
+# | public domain works and the [-simple-] {+lax+} license provided by CC0 are
+# | compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "CC0 is a public domain dedication from Creative Commons.  A work released "
+#| "under CC0 is dedicated to the public domain to the fullest extent "
+#| "permitted by law.  If that is not possible for any reason, CC0 also "
+#| "provides a simple permissive license as a fallback.  Both public domain "
+#| "works and the simple license provided by CC0 are compatible with the GNU "
+#| "GPL."
 msgid ""
 "CC0 is a public domain dedication from Creative Commons.  A work released "
 "under CC0 is dedicated to the public domain to the fullest extent permitted "
-"by law.  If that is not possible for any reason, CC0 also provides a simple "
-"permissive license as a fallback.  Both public domain works and the simple "
+"by law.  If that is not possible for any reason, CC0 also provides a lax, "
+"permissive license as a fallback.  Both public domain works and the lax "
 "license provided by CC0 are compatible with the GNU GPL."
 msgstr ""
 "CC0&nbsp;&mdash; формула передачи в общественное 
достояние, составленная "
@@ -684,13 +767,31 @@
 "\"anchor-reference-id\"> (<a href=\"#clearbsd\">#clearbsd</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license, compatible with both GPLv2 and GPLv3.  It
+# | is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and
+# | adds a term expressly stating it does not grant you any patent licenses. 
+# | Because of this, we encourage you to be careful about using software under
+# | this license; you should first consider whether the licensor might want to
+# | sue you for patent infringement.  If the developer is [-disclaiming-]
+# | {+refusing users+} patent licenses to set up a trap for you, it would be
+# | wise to avoid the program.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, compatible with both GPLv2 and GPLv3.  "
+#| "It is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and "
+#| "adds a term expressly stating it does not grant you any patent licenses.  "
+#| "Because of this, we encourage you to be careful about using software "
+#| "under this license; you should first consider whether the licensor might "
+#| "want to sue you for patent infringement.  If the developer is disclaiming "
+#| "patent licenses to set up a trap for you, it would be wise to avoid the "
+#| "program."
 msgid ""
 "This is a free software license, compatible with both GPLv2 and GPLv3.  It "
 "is based on the <a href=\"#ModifiedBSD\">modified BSD license</a>, and adds "
 "a term expressly stating it does not grant you any patent licenses.  Because "
 "of this, we encourage you to be careful about using software under this "
 "license; you should first consider whether the licensor might want to sue "
-"you for patent infringement.  If the developer is disclaiming patent "
+"you for patent infringement.  If the developer is refusing users patent "
 "licenses to set up a trap for you, it would be wise to avoid the program."
 msgstr ""
 "Это лицензия свободных программ, 
совместимая с GPLv2 и GPLv3. Она основана "
@@ -714,8 +815,15 @@
 "\">#CryptixGeneralLicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is very similar to the X11
+# | license.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is very similar to the X11 license."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is very similar to the X11 license."
 msgstr ""
 "Это простая неограничительная лицензия 
свободных программ без авторского "
@@ -854,8 +962,16 @@
 "</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  It is sometimes ambiguously
+# | referred to as the <em>MIT License</em>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  It is sometimes ambiguously referred to as "
+#| "the <em>MIT License</em>."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with the GNU GPL.  It is sometimes ambiguously referred to as the <em>MIT "
 "License</em>."
 msgstr ""
@@ -863,6 +979,12 @@
 "лева, совместимая с GNU GPL. Иногда на нее 
неоднозначно ссылаются как на "
 "&ldquo;Лицензию MIT&rdquo;."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"For substantial programs it is better to use the Apache 2.0 license since it "
+"blocks patent treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"FreeBSD\" href=\"http://www.freebsd.org/copyright/freebsd-license.";
@@ -874,10 +996,20 @@
 "\"#FreeBSD\">#FreeBSD</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is the original BSD license with the advertising clause and another
+# | clause removed.  (It is also sometimes called the &ldquo;2-clause BSD
+# | license&rdquo;.)  It is a [-simple,-] {+lax,+} permissive non-copyleft
+# | free software license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is the original BSD license with the advertising clause and another "
+#| "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
+#| "license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+#| "license, compatible with the GNU GPL."
 msgid ""
 "This is the original BSD license with the advertising clause and another "
 "clause removed.  (It is also sometimes called the &ldquo;2-clause BSD "
-"license&rdquo;.)  It is a simple, permissive non-copyleft free software "
+"license&rdquo;.)  It is a lax, permissive non-copyleft free software "
 "license, compatible with the GNU GPL."
 msgstr ""
 "Это первоначальная лицензия BSD, из которой 
удален пункт о рекламе и еще "
@@ -887,18 +1019,9 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If you want a simple, permissive non-copyleft free software license, the "
-"FreeBSD license is a reasonable choice.  However, please don't call it a "
-"&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is likely "
-"to cause confusion which could lead to use of the flawed <a href="
-"\"#OriginalBSD\"><em>original</em> BSD license</a>."
+"Our comments about the <a href=\"#ModifiedBSD\">Modified BSD license</a> "
+"apply to this license too."
 msgstr ""
-"Если вам нужна простая неограничительная 
лицензия свободных программ без "
-"авторского лева, то Лицензия FreeBSD вполне 
подойдет. Однако не называйте "
-"ее, пожалуйста, лицензией &ldquo;BSD&rdquo; или 
&ldquo;типа BSD&rdquo;, "
-"потому что это легко может вызвать 
заблуждение, которое приведет к "
-"использованию <a 
href=\"#OriginalBSD\"><em>первоначальной</em> лицензии 
BSD</"
-"a>, а она не лишена недостатков."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -994,9 +1117,15 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This license is sometimes also known as the OpenBSD License.  It is a
+# | {+lax, permissive+} free software license, and compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is sometimes also known as the OpenBSD License.  It is a "
+#| "free software license, and compatible with the GNU GPL."
 msgid ""
-"This license is sometimes also known as the OpenBSD License.  It is a free "
-"software license, and compatible with the GNU GPL."
+"This license is sometimes also known as the OpenBSD License.  It is a lax, "
+"permissive free software license, and compatible with the GNU GPL."
 msgstr ""
 "Эта лицензия также называется иногда 
лицензией OpenBSD. Это лицензия "
 "свободных программ, совместимая с GNU GPL."
@@ -1148,10 +1277,20 @@
 "href=\"#NCSA\">#NCSA</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This license is based on the terms of the <a href=\"#Expat\">Expat</a> and
+# | <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a [-simple,-]
+# | {+lax,+} permissive non-copyleft free software license, compatible with
+# | the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This license is based on the terms of the <a href=\"#Expat\">Expat</a> "
+#| "and <a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
+#| "permissive non-copyleft free software license, compatible with the GNU "
+#| "GPL."
 msgid ""
 "This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
-"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a simple, "
-"permissive non-copyleft free software license, compatible with the GNU GPL."
+"<a href=\"#ModifiedBSD\">modified BSD</a> licenses.  It is a lax, permissive "
+"non-copyleft free software license, compatible with the GNU GPL."
 msgstr ""
 "Эта лицензия основана на условиях <a 
href=\"#Expat\">Лицензии Expat</a> и <a "
 "href=\"#ModifiedBSD\">Модифицированной лицензии 
BSD</a>. Это простая "
@@ -1398,11 +1537,21 @@
 "reference-id\"> (<a href=\"#Unicode\">#Unicode</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a license that Unicode, Inc. has applied to the Unicode Character
+# | Database&mdash;various data files that developers can use to help
+# | implement the Unicode standard in their own programs.  It is a [-simple-]
+# | {+lax+} permissive license, compatible with all versions of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a license that Unicode, Inc. has applied to the Unicode Character "
+#| "Database&mdash;various data files that developers can use to help "
+#| "implement the Unicode standard in their own programs.  It is a simple "
+#| "permissive license, compatible with all versions of the GPL."
 msgid ""
 "This is a license that Unicode, Inc. has applied to the Unicode Character "
 "Database&mdash;various data files that developers can use to help implement "
-"the Unicode standard in their own programs.  It is a simple permissive "
-"license, compatible with all versions of the GPL."
+"the Unicode standard in their own programs.  It is a lax permissive license, "
+"compatible with all versions of the GPL."
 msgstr ""
 "Это лицензия, которую организация Unicode 
применила для Базы данных символов "
 "Unicode&nbsp;&mdash; различных файлов данных, 
которые разработчики могут "
@@ -1449,11 +1598,24 @@
 "оно относится."
 
 #. type: Content of: <dl><dd><p>
+# | Please do not use this License Agreement for your own software.  If you
+# | want to use a [-simple-] {+lax+} permissive license for your project,
+# | please use the <a href=\"#Expat\">Expat [-license</a>; it is by-]
+# | {+license</a> for a small program and the Apache 2.0 license for a
+# | substantial program.  These are+} far more common, and widely recognized
+# | in the free software community.
+#, fuzzy
+#| msgid ""
+#| "Please do not use this License Agreement for your own software.  If you "
+#| "want to use a simple permissive license for your project, please use the "
+#| "<a href=\"#Expat\">Expat license</a>; it is by far more common, and "
+#| "widely recognized in the free software community."
 msgid ""
 "Please do not use this License Agreement for your own software.  If you want "
-"to use a simple permissive license for your project, please use the <a href="
-"\"#Expat\">Expat license</a>; it is by far more common, and widely "
-"recognized in the free software community."
+"to use a lax permissive license for your project, please use the <a href="
+"\"#Expat\">Expat license</a> for a small program and the Apache 2.0 license "
+"for a substantial program.  These are far more common, and widely recognized "
+"in the free software community."
 msgstr ""
 "Пожалуйста, не пользуйтесь этим 
лицензионным соглашением для своих "
 "собственных программ. Если вы хотите 
применять для своего проекта простую "
@@ -1470,12 +1632,26 @@
 "class=\"anchor-reference-id\"> (<a href=\"#Unlicense\">#Unlicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | The Unlicense is a public domain dedication.  A work released under the
+# | Unlicense is dedicated to the public domain to the fullest extent
+# | permitted by law, and also comes with an additional [-simple-] {+lax+}
+# | license that helps cover any cases where the dedication is inadequate. 
+# | Both public domain works and the [-simple-] {+lax+} license provided by
+# | the Unlicense are compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "The Unlicense is a public domain dedication.  A work released under the "
+#| "Unlicense is dedicated to the public domain to the fullest extent "
+#| "permitted by law, and also comes with an additional simple license that "
+#| "helps cover any cases where the dedication is inadequate.  Both public "
+#| "domain works and the simple license provided by the Unlicense are "
+#| "compatible with the GNU GPL."
 msgid ""
 "The Unlicense is a public domain dedication.  A work released under the "
 "Unlicense is dedicated to the public domain to the fullest extent permitted "
-"by law, and also comes with an additional simple license that helps cover "
-"any cases where the dedication is inadequate.  Both public domain works and "
-"the simple license provided by the Unlicense are compatible with the GNU GPL."
+"by law, and also comes with an additional lax license that helps cover any "
+"cases where the dedication is inadequate.  Both public domain works and the "
+"lax license provided by the Unlicense are compatible with the GNU GPL."
 msgstr ""
 "Разлицензия&nbsp;&mdash; это формула передачи в 
общественное достояние. "
 "Работа, выпускаемая под Разлицензией, 
передается в общественное достояние в "
@@ -1563,9 +1739,27 @@
 "a> <span class=\"anchor-reference-id\">(<a href=\"#WTFPL\">#WTFPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid "This is a free software license, very permissive and GPL-compatible."
+# | This is [-a simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL."
+msgid ""
+"This is lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL."
+msgstr ""
+"Это простая неограничительная лицензия 
свободных программ без авторского "
+"лева, совместимая с GNU GPL."
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"We do not recommend this license.  If you want a lax permissive license for "
+"a small program, we recommend the <a href=\"#X11License\">X11 license</a>.  "
+"A larger program usually ought to be copyleft; but if you are set on using a "
+"lax permissive license for one, we recommend the Apache 2.0 license since it "
+"protects users from patent treachery."
 msgstr ""
-"Это лицензия свободных программ, очень 
либеральная и совместимая с GNU GPL."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1578,10 +1772,22 @@
 "\"#X11License\">#X11License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
-"with the GNU GPL.  Older versions of XFree86 used the same license, and some "
-"of the current variants of XFree86 also do.  Later versions of XFree86 are "
+# | This is a [-simple,-] {+lax+} permissive non-copyleft free software
+# | license, compatible with the GNU GPL.  Older versions of XFree86 used the
+# | same license, and some of the current variants of XFree86 also do.  Later
+# | versions of XFree86 are distributed under the <a
+# | href=\"#XFree861.1License\">XFree86 1.1 license</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with the GNU GPL.  Older versions of XFree86 used the same "
+#| "license, and some of the current variants of XFree86 also do.  Later "
+#| "versions of XFree86 are distributed under the <a href=\"#XFree861.1License"
+#| "\">XFree86 1.1 license</a>."
+msgid ""
+"This is a lax permissive non-copyleft free software license, compatible with "
+"the GNU GPL.  Older versions of XFree86 used the same license, and some of "
+"the current variants of XFree86 also do.  Later versions of XFree86 are "
 "distributed under the <a href=\"#XFree861.1License\">XFree86 1.1 license</a>."
 msgstr ""
 "Это простая неограничительная лицензия 
свободных программ без авторского "
@@ -1598,6 +1804,14 @@
 "Это лицензию называют иногда 
&ldquo;Лицензией MIT&rdquo;, но этот термин "
 "вводит в заблуждение, поскольку в MIT 
применяли для программ много лицензий."
 
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a fine license for a small program.  A larger program usually ought "
+"to be copyleft; but if you are set on a lax permissive license for one, we "
+"recommend the Apache 2.0 license since it protects users from patent "
+"treachery."
+msgstr ""
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"XFree861.1License\" href=\"http://www.xfree86.org/current/LICENSE4.";
@@ -1609,8 +1823,14 @@
 "href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license, compatible with version 3 of the GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license, "
+#| "compatible with version 3 of the GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license, compatible "
+"This is a lax, permissive non-copyleft free software license, compatible "
 "with version 3 of the GPL."
 msgstr ""
 "Это простая неограничительная лицензия 
свободных программ без авторского "
@@ -1663,8 +1883,14 @@
 "\"#Zope2.0\">#Zope2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license which is compatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license which is "
+#| "compatible with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license which is "
+"This is a lax, permissive non-copyleft free software license which is "
 "compatible with the GNU GPL."
 msgstr ""
 "Это простая неограничительная лицензия 
свободных программ без авторского "
@@ -1781,8 +2007,18 @@
 "(<a href=\"#apache1\">#apache1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with an advertising clause.  This creates <a
+# | href=\"/philosophy/bsd.html\">practical problems</a> like those of the
+# | original BSD license, including incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with an "
+#| "advertising clause.  This creates <a href=\"/philosophy/bsd.html"
+#| "\">practical problems</a> like those of the original BSD license, "
+#| "including incompatibility with the GNU GPL."
 msgid ""
-"This is a simple, permissive non-copyleft free software license with an "
+"This is a lax, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/philosophy/bsd.html\">practical "
 "problems</a> like those of the original BSD license, including "
 "incompatibility with the GNU GPL."
@@ -1856,11 +2092,24 @@
 "также &ldquo;4-пунктной лицензией BSD&rdquo;.)"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is a simple, permissive non-copyleft free software license with a "
-"serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw "
-"is not fatal; that is, it does not render the software nonfree.  But it does "
-"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
+# | license with a serious flaw: the &ldquo;obnoxious BSD advertising
+# | clause&rdquo;.  The flaw is not fatal; that is, it does not render the
+# | software nonfree.  But it does cause <a
+# | href=\"/philosophy/bsd.html\">practical problems</a>, including
+# | incompatibility with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, permissive non-copyleft free software license with a "
+#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
+#| "flaw is not fatal; that is, it does not render the software nonfree.  But "
+#| "it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
+#| "including incompatibility with the GNU GPL."
+msgid ""
+"This is a lax, permissive non-copyleft free software license with a serious "
+"flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw is not "
+"fatal; that is, it does not render the software nonfree.  But it does cause "
+"<a href=\"/philosophy/bsd.html\">practical problems</a>, including "
 "incompatibility with the GNU GPL."
 msgstr ""
 "Это простая неограничительная лицензия 
свободных программ без авторского "
@@ -1870,12 +2119,28 @@
 "a>, включая несовместимость с GNU GPL, он 
приводит."
 
 #. type: Content of: <dl><dd><p>
+# | We urge you not to use the original BSD license for software you write. 
+# | If you want to use a [-simple,-] {+lax,+} permissive non-copyleft free
+# | software license, it is much better to use the <a
+# | href=\"#ModifiedBSD\">modified BSD [-license</a> or-] {+license</a>,+} the
+# | X11 {+license or the Expat+} license.  [-However, there is no reason not
+# | to-]  {+Even better, for a substantial program,+} use [-programs that have
+# | been released under-] the [-original BSD license.-] {+Apache 2.0 license
+# | since it takes action against patent treachery.+}
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the original BSD license for software you write.  "
+#| "If you want to use a simple, permissive non-copyleft free software "
+#| "license, it is much better to use the <a href=\"#ModifiedBSD\">modified "
+#| "BSD license</a> or the X11 license.  However, there is no reason not to "
+#| "use programs that have been released under the original BSD license."
 msgid ""
 "We urge you not to use the original BSD license for software you write.  If "
-"you want to use a simple, permissive non-copyleft free software license, it "
-"is much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a> "
-"or the X11 license.  However, there is no reason not to use programs that "
-"have been released under the original BSD license."
+"you want to use a lax, permissive non-copyleft free software license, it is "
+"much better to use the <a href=\"#ModifiedBSD\">modified BSD license</a>, "
+"the X11 license or the Expat license.  Even better, for a substantial "
+"program, use the Apache 2.0 license since it takes action against patent "
+"treachery."
 msgstr ""
 "Мы настоятельно рекомендуем вам не 
применять первоначальную лицензию BSD для "
 "программ, которые вы пишете. Если вы х
отите воспользоваться простой "
@@ -1884,6 +2149,24 @@
 "или Лицензию X11. Однако нет причин не 
пользоваться программами, которые "
 "выпущены под первоначальной лицензией BSD."
 
+#. type: Content of: <dl><dd><p>
+# | [-We urge you not to use the Open Software License for software you
+# | write.-]However, there is no reason {+not+} to [-avoid running-] {+use+}
+# | programs that have been released under [-this-] {+the original BSD+}
+# | license.
+#, fuzzy
+#| msgid ""
+#| "We urge you not to use the Open Software License for software you write.  "
+#| "However, there is no reason to avoid running programs that have been "
+#| "released under this license."
+msgid ""
+"However, there is no reason not to use programs that have been released "
+"under the original BSD license."
+msgstr ""
+"Мы настоятельно рекомендуем вам не 
применять Лицензию открытых программ для "
+"программ, которые вы пишете. Однако нет 
причин избегать применения программ, "
+"которые были выпущены под этой лицензией."
+
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CDDL\" href=\"http://www.opensolaris.org/os/licensing/cddllicense.txt";
@@ -2882,9 +3165,19 @@
 "\"#Zope \">#Zope</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-simple,-] {+lax,+} fairly permissive non-copyleft free
+# | software license with <a href=\"/philosophy/bsd.html\">practical
+# | problems</a> like those of the original BSD license, including
+# | incompatibility with the <a href=\"/licenses/gpl.html\">GNU GPL</a>.
+#, fuzzy
+#| msgid ""
+#| "This is a simple, fairly permissive non-copyleft free software license "
+#| "with <a href=\"/philosophy/bsd.html\">practical problems</a> like those "
+#| "of the original BSD license, including incompatibility with the <a href="
+#| "\"/licenses/gpl.html\">GNU GPL</a>."
 msgid ""
-"This is a simple, fairly permissive non-copyleft free software license with "
-"<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
+"This is a lax, fairly permissive non-copyleft free software license with <a "
+"href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
 "original BSD license, including incompatibility with the <a href=\"/licenses/"
 "gpl.html\">GNU GPL</a>."
 msgstr ""
@@ -4485,3 +4778,22 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "If you want a simple, permissive non-copyleft free software license, the "
+#~ "FreeBSD license is a reasonable choice.  However, please don't call it a "
+#~ "&ldquo;BSD&rdquo; or &ldquo;BSD-style&rdquo; license, because that is "
+#~ "likely to cause confusion which could lead to use of the flawed <a href="
+#~ "\"#OriginalBSD\"><em>original</em> BSD license</a>."
+#~ msgstr ""
+#~ "Если вам нужна простая 
неограничительная лицензия свободных 
программ без "
+#~ "авторского лева, то Лицензия FreeBSD вполне 
подойдет. Однако не называйте "
+#~ "ее, пожалуйста, лицензией &ldquo;BSD&rdquo; или 
&ldquo;типа BSD&rdquo;, "
+#~ "потому что это легко может вызвать 
заблуждение, которое приведет к "
+#~ "использованию <a 
href=\"#OriginalBSD\"><em>первоначальной</em> лицензии "
+#~ "BSD</a>, а она не лишена недостатков."
+
+#~ msgid "This is a free software license, very permissive and GPL-compatible."
+#~ msgstr ""
+#~ "Это лицензия свободных программ, очень 
либеральная и совместимая с GNU "
+#~ "GPL."



reply via email to

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