www-commits
[Top][All Lists]
Advanced

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

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


From: GNUN
Subject: www/licenses/po license-list.cs.po license-list...
Date: Mon, 7 Jan 2019 23:29:09 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     19/01/07 23:29:08

Modified files:
        licenses/po    : license-list.cs.po license-list.de-diff.html 
                         license-list.de.po license-list.es.po 
                         license-list.fr.po license-list.it-diff.html 
                         license-list.it.po license-list.ja-diff.html 
                         license-list.ja.po license-list.pl.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.cs.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.288&r2=1.289
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.269&r2=1.270
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.375&r2=1.376
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.313&r2=1.314
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-diff.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.174&r2=1.175
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pl.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.189&r2=1.190
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.310&r2=1.311

Patches:
Index: license-list.cs.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.cs.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- license-list.cs.po  29 Dec 2018 12:59:30 -0000      1.25
+++ license-list.cs.po  8 Jan 2019 04:29:07 -0000       1.26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -1035,35 +1035,38 @@
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is similar to the Mozilla Public License version 1: a free software "
+#| "license incompatible with the GNU GPL."
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
+"Tato licence je podobná Mozilla Public License, verze&nbsp;1: svobodná "
+"softwarová licence nekompatibilní s GNU GPL."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -4673,7 +4676,8 @@
 #, fuzzy
 #| msgid "Copyright &copy; 1999-2002 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr "Copyright &copy; 1999-2002 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>

Index: license-list.de-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- license-list.de-diff.html   29 Dec 2018 12:59:30 -0000      1.9
+++ license-list.de-diff.html   8 Jan 2019 04:29:07 -0000       1.10
@@ -662,31 +662,21 @@
     ISC License&lt;/a&gt;
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#ISC"&gt;#ISC&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
-&lt;p&gt;This is a lax, permissive free software license, and compatible
-with the GNU GPL.&lt;/p&gt; 
+&lt;p&gt;This <span class="inserted"><ins><em>license is sometimes also known 
as the OpenBSD License. It</em></ins></span> is a <span 
class="removed"><del><strong>lax, permissive</strong></del></span> free 
software license, and compatible with the GNU GPL.&lt;/p&gt;
 
-&lt;p&gt;This license is sometimes also known as the OpenBSD License,
+&lt;p&gt;This license <span class="removed"><del><strong>is sometimes also 
known as the OpenBSD License,
 although there is one minor difference between the two licenses. The
 OpenBSD license was updated to remove the ambiguous term:
-&quot;and/or&quot;. The ISC license provides recipients with
-&quot;Permission to use, copy, modify, and/or distribute this
-software&hellip;&quot;, whereas the OpenBSD license provides
+&quot;and/or&quot;. The ISC license provides</strong></del></span> <span 
class="inserted"><ins><em>had an unfortunate wording choice: it 
provided</em></ins></span> recipients with &quot;Permission to use, copy, 
modify, <span class="removed"><del><strong>and/or</strong></del></span> <span 
class="inserted"><ins><em>and</em></ins></span> distribute this
+<span class="removed"><del><strong>software&hellip;&quot;, whereas the OpenBSD 
license provides
 recipients with &quot;Permission to use, copy, modify, and
 distribute&hellip;&quot;. &lt;/p&gt;
 
-&lt;p&gt;At the time the ISC license was released, the use of
-&quot;and/or&quot; construct was a concern because it is similar
-language used in the license of Pine that the University of Washington
-later claimed prohibited people from distributing modified versions of
-the software. However, ISC has told us they do not share the
-University of Washington's interpretation, and we have every reason to
-believe them.  Thus, there's no reason to avoid software released
-under this license.  However, to help make sure this language cannot
-cause any trouble in the future, we encourage developers to choose a
-different license for their own works.  The &lt;a href="#Expat"&gt;Expat
-License&lt;/a&gt; and &lt;a href="#FreeBSD"&gt;FreeBSD License&lt;/a&gt; are 
similarly
-permissive and brief.&lt;/p&gt;&lt;/dd&gt;
+&lt;p&gt;At the time the ISC license</strong></del></span> <span 
class="inserted"><ins><em>software&hellip;&quot;. This</em></ins></span> was 
<span class="removed"><del><strong>released,</strong></del></span> the <span 
class="removed"><del><strong>use of
+&quot;and/or&quot; construct was a concern because it is 
similar</strong></del></span> <span 
class="inserted"><ins><em>same</em></ins></span> language <span 
class="removed"><del><strong>used in</strong></del></span> <span 
class="inserted"><ins><em>from</em></ins></span> the license of Pine that the 
University of Washington later claimed prohibited people from distributing 
modified versions of the <span class="removed"><del><strong>software. However, 
ISC</strong></del></span> <span class="inserted"><ins><em>software.&lt;/p&gt;
 
+&lt;p&gt;ISC</em></ins></span> has told us they do not share the University of 
Washington's interpretation, and we have every reason to believe them.  <span 
class="removed"><del><strong>Thus,</strong></del></span> <span 
class="inserted"><ins><em>ISC also updated the license to read &quot;Permission 
to use, copy, modify, *and/or* distribute this software&hellip;&quot;. While 
the inclusion of &quot;and/or&quot; doesn't completely solve the 
issue,</em></ins></span> there's no reason to avoid software released under 
this license. However, to help make sure this language cannot cause any trouble 
in the future, we encourage developers to choose a different license for their 
own works. The &lt;a <span class="removed"><del><strong>href="#Expat"&gt;Expat
+License&lt;/a&gt; and &lt;a</strong></del></span> href="#FreeBSD"&gt;FreeBSD 
License&lt;/a&gt; <span class="removed"><del><strong>are</strong></del></span> 
<span class="inserted"><ins><em>is</em></ins></span> similarly permissive and 
<span 
class="removed"><del><strong>brief.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> 
<span class="inserted"><ins><em>brief. However, if you want a lax, weak 
license, we recommend using the Apache-2.0 
license.&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt&gt;&lt;a id="MPL-2.0"
        href="http://directory.fsf.org/wiki/License:MPLv2.0"&gt;Mozilla Public
@@ -2789,7 +2779,7 @@
 information on coordinating and submitting translations of this 
article.&lt;/p&gt;
 &lt;/div&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, <span 
class="removed"><del><strong>2018</strong></del></span> <span 
class="inserted"><ins><em>2018, 2019</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -2799,7 +2789,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/12/29 12:59:30 $
+$Date: 2019/01/08 04:29:07 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- license-list.de.po  29 Dec 2018 12:59:30 -0000      1.288
+++ license-list.de.po  8 Jan 2019 04:29:07 -0000       1.289
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: Licensing & Compliance Lab <address@hidden>\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: 2018-08-12 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1134,58 +1134,86 @@
 "\"#ISC\">#ISC</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, 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 is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
-"Eine nicht strenge, freizügige Freie-Software-Lizenz ohne Copyleft, "
-"vereinbar mit der GNU GPL."
-
-# (OpenBSD) „Redistribution and use […], with or without modification, are 
permitted …“
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
-msgstr ""
-"Diese Lizenz ist auch als OpenBSD-Lizenz bekannt (eine modifizierte Version "
-"der 2-Klausel-BSD-Lizenz), obwohl es einen großen Unterschied zwischen "
-"OpenBSD- und ISC-Lizenz gibt: um den mehrdeutigen <em>‚and/or‘</em> 
Begriff "
-"zu entfernen, wurde die OpenBSD-Lizenz aktualisiert. Die ISC-Lizenz gewährt "
-"<em><q>Permission to use, copy, modify, and/or distribute this software&#160;"
-"…</q></em>, wohingegen die OpenBSD-Lizenz <em><q>Permission to use, copy, "
-"modify, and distribute&#160;…</q></em> gewährt."
+"Diese Lizenz ist manchmal auch als OpenBSD-Lizenz bekannt. Eine mit der GNU "
+"GPL vereinbare freie Softwarelizenz."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+# | This license [-does have-] {+had+} an unfortunate wording choice: it
+# | provide[-s-]{+d+} recipients with &quot;Permission to use, copy, modify,
+# | [-and/or-] {+and+} distribute this software&hellip;&quot;{+.+} This [-is
+# | roughly-] {+was+} the same language from the license of Pine that the
+# | University of Washington later claimed prohibited people from distributing
+# | modified versions of the software.
+#, fuzzy
+#| msgid ""
+#| "This license does have an unfortunate wording choice: it provides "
+#| "recipients with &quot;Permission to use, copy, modify, and/or distribute "
+#| "this software&hellip;&quot; This is roughly the same language from the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software."
+msgid ""
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
+msgstr ""
+"Diese Lizenz hat eine unglückliche Wortwahl: Sie gewährt Empfängern die "
+"„Erlaubnis zur Nutzung, Vervielfältigung, Modifizierung, und/oder Vertrieb 
"
+"der Software&hellip;“. Dies ist ungefähr die gleiche Sprache wie bei der "
+"Pine-Lizenz, bei der die Universität von Washington später die Verbreitung "
+"modifizierter Softwareversionen untersagte."
+
+#. type: Content of: <dl><dd><p>
+# | ISC has told us they do not share the University of Washington's
+# | interpretation, and we have every reason to believe them.  [-Thus,-] {+ISC
+# | also updated the license to read &quot;Permission to use, copy, modify,
+# | *and/or* distribute this software&hellip;&quot;. While the inclusion of
+# | &quot;and/or&quot; doesn't completely solve the issue,+} there's no reason
+# | to avoid software released under this license. However, to help make sure
+# | this language cannot cause any trouble in the future, we encourage
+# | developers to choose a different license for their own works. The <a
+# | [-href=\"#Expat\">Expat License</a> and <a-] href=\"#FreeBSD\">FreeBSD
+# | License</a> [-are-] {+is+} similarly permissive and brief. {+However, if
+# | you want a lax, weak license, we recommend using the Apache-2.0 license.+}
+#, fuzzy
+#| msgid ""
+#| "ISC has told us they do not share the University of Washington's "
+#| "interpretation, and we have every reason to believe them.  Thus, there's "
+#| "no reason to avoid software released under this license.  However, to "
+#| "help make sure this language cannot cause any trouble in the future, we "
+#| "encourage developers to choose a different license for their own works.  "
+#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#| "License</a> are similarly permissive and brief."
+msgid ""
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
-msgstr ""
-"Zum Zeitpunkt der ISC-Lizenz-Freigabe war die Verwendung des 
<em>‚and/or‘</"
-"em>-Konstrukts ein Problem, weil eine die der Pine-Lizenz ähnliche Sprache "
-"Anwendung findet, welche die University of Washington (UW) später "
-"beanspruchte, die Distribution modifizierter Softwareversionen zu "
-"untersagen. ISC teilte uns mit, sie würden die Interpretation der UW nicht "
-"teilen, und wir haben allen Grund, dies zu glauben. Somit gibt es keinen "
-"Grund, unter dieser Lizenz freigegebene Software zu meiden. Um allerdings "
-"sicherzustellen, dass diese Sprache nicht zukünftig irgendwelche "
-"Schwierigkeiten verursachen kann, ermutigen wir Entwickler eine andere "
-"Lizenz für eigene Werke zu wählen. Die <a href=\"#Expat\" xml:lang=\"en\" "
-"lang=\"en\">Expat</a>- und <a href=\"#FreeBSD\" xml:lang=\"en\" lang=\"en"
-"\">FreeBSD</a>-Lizenzen sind in ähnlicher Weise freizügig und kurz."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
+msgstr ""
+"ISC teilte uns mit, sie würden die Interpretation der Universität von "
+"Washington nicht teilen, und wir haben allen Grund, dies zu glauben. Somit "
+"gibt es keinen Grund, unter dieser Lizenz freigegebene Software zu meiden. "
+"Um allerdings sicherzustellen, dass diese Sprache nicht zukünftig "
+"irgendwelche Schwierigkeiten verursachen kann, ermutigen wir Entwickler, "
+"eine andere Lizenz für eigene Werke zu wählen. Die <a href=\"#Expat\" xml:"
+"lang=\"en\" lang=\"en\">Expat</a>- und <a href=\"#FreeBSD\" xml:lang=\"en\" "
+"lang=\"en\">FreeBSD</a>-Lizenzen sind in ähnlicher Weise freizügig und 
kurz."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -5585,8 +5613,15 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr "Copyright &copy; 2011-2018 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -5612,6 +5647,59 @@
 msgstr "Letzte Änderung:"
 
 #~ msgid ""
+#~ "This is a lax, permissive free software license, and compatible with the "
+#~ "GNU GPL."
+#~ msgstr ""
+#~ "Eine nicht strenge, freizügige Freie-Software-Lizenz ohne Copyleft, "
+#~ "vereinbar mit der GNU GPL."
+
+# (OpenBSD) „Redistribution and use […], with or without modification, are 
permitted …“
+#~ msgid ""
+#~ "This license is sometimes also known as the OpenBSD License, although "
+#~ "there is one minor difference between the two licenses. The OpenBSD "
+#~ "license was updated to remove the ambiguous term: &quot;and/or&quot;. The "
+#~ "ISC license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and/or distribute this software&hellip;&quot;, whereas the "
+#~ "OpenBSD license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and distribute&hellip;&quot;."
+#~ msgstr ""
+#~ "Diese Lizenz ist auch als OpenBSD-Lizenz bekannt (eine modifizierte "
+#~ "Version der 2-Klausel-BSD-Lizenz), obwohl es einen großen Unterschied "
+#~ "zwischen OpenBSD- und ISC-Lizenz gibt: um den mehrdeutigen 
<em>‚and/or‘</"
+#~ "em> Begriff zu entfernen, wurde die OpenBSD-Lizenz aktualisiert. Die ISC-"
+#~ "Lizenz gewährt <em><q>Permission to use, copy, modify, and/or distribute "
+#~ "this software&#160;…</q></em>, wohingegen die OpenBSD-Lizenz "
+#~ "<em><q>Permission to use, copy, modify, and distribute&#160;…</q></em> "
+#~ "gewährt."
+
+#~ msgid ""
+#~ "At the time the ISC license was released, the use of &quot;and/or&quot; "
+#~ "construct was a concern because it is similar language used in the "
+#~ "license of Pine that the University of Washington later claimed "
+#~ "prohibited people from distributing modified versions of the software. "
+#~ "However, ISC has told us they do not share the University of Washington's "
+#~ "interpretation, and we have every reason to believe them.  Thus, there's "
+#~ "no reason to avoid software released under this license.  However, to "
+#~ "help make sure this language cannot cause any trouble in the future, we "
+#~ "encourage developers to choose a different license for their own works.  "
+#~ "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#~ "License</a> are similarly permissive and brief."
+#~ msgstr ""
+#~ "Zum Zeitpunkt der ISC-Lizenz-Freigabe war die Verwendung des <em>‚and/"
+#~ "or‘</em>-Konstrukts ein Problem, weil eine die der Pine-Lizenz ähnliche 
"
+#~ "Sprache Anwendung findet, welche die University of Washington (UW) später 
"
+#~ "beanspruchte, die Distribution modifizierter Softwareversionen zu "
+#~ "untersagen. ISC teilte uns mit, sie würden die Interpretation der UW "
+#~ "nicht teilen, und wir haben allen Grund, dies zu glauben. Somit gibt es "
+#~ "keinen Grund, unter dieser Lizenz freigegebene Software zu meiden. Um "
+#~ "allerdings sicherzustellen, dass diese Sprache nicht zukünftig "
+#~ "irgendwelche Schwierigkeiten verursachen kann, ermutigen wir Entwickler "
+#~ "eine andere Lizenz für eigene Werke zu wählen. Die <a href=\"#Expat\" 
xml:"
+#~ "lang=\"en\" lang=\"en\">Expat</a>- und <a href=\"#FreeBSD\" xml:lang=\"en"
+#~ "\" lang=\"en\">FreeBSD</a>-Lizenzen sind in ähnlicher Weise freizügig 
und "
+#~ "kurz."
+
+#~ msgid ""
 #~ "WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
 #~ "\"#Wxwind\">#Wx</a>)</span>"
 #~ msgstr ""
@@ -5728,38 +5816,6 @@
 #~ "der GNU GPL vereinbare nicht strenge, freizügige freie Softwarelizenz."
 
 #~ msgid ""
-#~ "This license does have an unfortunate wording choice: it provides "
-#~ "recipients with &quot;Permission to use, copy, modify, and/or distribute "
-#~ "this software&hellip;&quot; This is roughly the same language from the "
-#~ "license of Pine that the University of Washington later claimed "
-#~ "prohibited people from distributing modified versions of the software."
-#~ msgstr ""
-#~ "Diese Lizenz hat eine unglückliche Wortwahl: Sie gewährt Empfängern die 
"
-#~ "„Erlaubnis zur Nutzung, Vervielfältigung, Modifizierung, und/oder "
-#~ "Vertrieb der Software&hellip;“. Dies ist ungefähr die gleiche Sprache 
wie "
-#~ "bei der Pine-Lizenz, bei der die Universität von Washington später die "
-#~ "Verbreitung modifizierter Softwareversionen untersagte."
-
-#~ msgid ""
-#~ "ISC has told us they do not share the University of Washington's "
-#~ "interpretation, and we have every reason to believe them.  Thus, there's "
-#~ "no reason to avoid software released under this license.  However, to "
-#~ "help make sure this language cannot cause any trouble in the future, we "
-#~ "encourage developers to choose a different license for their own works.  "
-#~ "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
-#~ "License</a> are similarly permissive and brief."
-#~ msgstr ""
-#~ "ISC teilte uns mit, sie würden die Interpretation der Universität von "
-#~ "Washington nicht teilen, und wir haben allen Grund, dies zu glauben. "
-#~ "Somit gibt es keinen Grund, unter dieser Lizenz freigegebene Software zu "
-#~ "meiden. Um allerdings sicherzustellen, dass diese Sprache nicht zukünftig 
"
-#~ "irgendwelche Schwierigkeiten verursachen kann, ermutigen wir Entwickler, "
-#~ "eine andere Lizenz für eigene Werke zu wählen. Die <a href=\"#Expat\" 
xml:"
-#~ "lang=\"en\" lang=\"en\">Expat</a>- und <a href=\"#FreeBSD\" xml:lang=\"en"
-#~ "\" lang=\"en\">FreeBSD</a>-Lizenzen sind in ähnlicher Weise freizügig 
und "
-#~ "kurz."
-
-#~ msgid ""
 #~ "This is a free software license, not a strong copyleft, and incompatible "
 #~ "with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
 #~ "with an added clause that permits Netscape to use your added code "
@@ -7130,13 +7186,6 @@
 #~ "\"><em>ursprüngliche</em> BSD-Lizenz</a> zu verwenden."
 
 #~ msgid ""
-#~ "This license is sometimes also known as the OpenBSD License.  It is a "
-#~ "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."
-
-#~ 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 "

Index: license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -b -r1.269 -r1.270
--- license-list.es.po  3 Jan 2019 10:58:31 -0000       1.269
+++ license-list.es.po  8 Jan 2019 04:29:07 -0000       1.270
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: 2019-01-03 11:19+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2019-01-08 04:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
@@ -1229,44 +1230,69 @@
 
 # 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 is a lax, permissive free software license, and compatible with the "
+#| "GNU GPL."
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
 "Esta es una licencia de software libre laxa, permisiva y compatible con la "
 "GPL de GNU."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
-msgstr ""
-"Esta licencia a veces es también conocida como «<cite>OpenBSD Licence</"
-"cite>», aunque hay una pequeña diferencia entre las dos. La licencia 
OpenBSD "
-"se actualizó para eliminar la expresión ambigua «y/o». La licencia ISC "
-"otorga «Permiso para usar, copiar, modificar y/o distribuir este "
-"software&hellip;», mientras la licencia OpenBSD otorga «Permiso para usar, "
-"copiar, modificar y distribuir&hellip;»."
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
+msgstr ""
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+# | [-At the time the ISC license was released, the use of &quot;and/or&quot;
+# | construct was a concern because it is similar language used in the license
+# | of Pine that the University of Washington later claimed prohibited people
+# | from distributing modified versions of the software. However,-]ISC has
+# | told us they do not share the University of Washington's interpretation,
+# | and we have every reason to believe them.  [-Thus,-] {+ISC also updated
+# | the license to read &quot;Permission to use, copy, modify, *and/or*
+# | distribute this software&hellip;&quot;. While the inclusion of
+# | &quot;and/or&quot; doesn't completely solve the issue,+} there's no reason
+# | to avoid software released under this license. However, to help make sure
+# | this language cannot cause any trouble in the future, we encourage
+# | developers to choose a different license for their own works. The <a
+# | [-href=\"#Expat\">Expat License</a> and <a-] href=\"#FreeBSD\">FreeBSD
+# | License</a> [-are-] {+is+} similarly permissive and brief. {+However, if
+# | you want a lax, weak license, we recommend using the Apache-2.0 license.+}
+#, fuzzy
+#| msgid ""
+#| "At the time the ISC license was released, the use of &quot;and/or&quot; "
+#| "construct was a concern because it is similar language used in the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software. "
+#| "However, ISC has told us they do not share the University of Washington's "
+#| "interpretation, and we have every reason to believe them.  Thus, there's "
+#| "no reason to avoid software released under this license.  However, to "
+#| "help make sure this language cannot cause any trouble in the future, we "
+#| "encourage developers to choose a different license for their own works.  "
+#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#| "License</a> are similarly permissive and brief."
+msgid ""
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
 msgstr ""
 "Cuando se publicó la licencia ISC, el uso de la expresión «y/o» fue 
motivo "
 "de inquietud porque es similar al léxico utilizado en la licencia de Pine,  "
@@ -5855,8 +5881,15 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
@@ -5886,6 +5919,22 @@
 msgstr "Última actualización:"
 
 #~ msgid ""
+#~ "This license is sometimes also known as the OpenBSD License, although "
+#~ "there is one minor difference between the two licenses. The OpenBSD "
+#~ "license was updated to remove the ambiguous term: &quot;and/or&quot;. The "
+#~ "ISC license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and/or distribute this software&hellip;&quot;, whereas the "
+#~ "OpenBSD license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and distribute&hellip;&quot;."
+#~ msgstr ""
+#~ "Esta licencia a veces es también conocida como «<cite>OpenBSD Licence</"
+#~ "cite>», aunque hay una pequeña diferencia entre las dos. La licencia "
+#~ "OpenBSD se actualizó para eliminar la expresión ambigua «y/o». La "
+#~ "licencia ISC otorga «Permiso para usar, copiar, modificar y/o distribuir "
+#~ "este software&hellip;», mientras la licencia OpenBSD otorga «Permiso 
para "
+#~ "usar, copiar, modificar y distribuir&hellip;»."
+
+#~ msgid ""
 #~ "Adding insult to injury, it also twists the words &ldquo;commons&rdquo; "
 #~ "and &ldquo;sell.&rdquo; For further criticism, see <a href=\"https://";
 #~ "sfconservancy.org/blog/2018/aug/22/commons-clause/\"> Bradley Kuhn's "

Index: license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -b -r1.375 -r1.376
--- license-list.fr.po  29 Dec 2018 18:22:09 -0000      1.375
+++ license-list.fr.po  8 Jan 2019 04:29:08 -0000       1.376
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: 2018-12-29 19:21+0100\n"
 "Last-Translator: Thérèse godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2019-01-08 04:26+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.6\n"
 
@@ -1140,43 +1141,68 @@
 "\"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 is a lax, permissive free software license, and compatible with the "
+#| "GNU GPL."
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
 "C'est une licence de logiciel libre permissive (voire laxiste), compatible "
 "avec la GNU GPL."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
-msgstr ""
-"Cette licence est parfois appelée licence OpenBSD, bien qu'il y ait une "
-"différence mineure entre les deux. La licence OpenBSD a été mise à jour 
pour "
-"en éliminer le terme ambigu « et/ou », tandis a licence de l'ISC donne 
aux "
-"destinataires « la permission d'utiliser, modifier et/ou distribuer ce "
-"logiciel <cite>[Permission to use, copy, modify, and/or distribute this "
-"software&hellip;]</cite>."
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
+msgstr ""
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+# | [-At the time the ISC license was released, the use of &quot;and/or&quot;
+# | construct was a concern because it is similar language used in the license
+# | of Pine that the University of Washington later claimed prohibited people
+# | from distributing modified versions of the software. However,-]ISC has
+# | told us they do not share the University of Washington's interpretation,
+# | and we have every reason to believe them.  [-Thus,-] {+ISC also updated
+# | the license to read &quot;Permission to use, copy, modify, *and/or*
+# | distribute this software&hellip;&quot;. While the inclusion of
+# | &quot;and/or&quot; doesn't completely solve the issue,+} there's no reason
+# | to avoid software released under this license. However, to help make sure
+# | this language cannot cause any trouble in the future, we encourage
+# | developers to choose a different license for their own works. The <a
+# | [-href=\"#Expat\">Expat License</a> and <a-] href=\"#FreeBSD\">FreeBSD
+# | License</a> [-are-] {+is+} similarly permissive and brief. {+However, if
+# | you want a lax, weak license, we recommend using the Apache-2.0 license.+}
+#, fuzzy
+#| msgid ""
+#| "At the time the ISC license was released, the use of &quot;and/or&quot; "
+#| "construct was a concern because it is similar language used in the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software. "
+#| "However, ISC has told us they do not share the University of Washington's "
+#| "interpretation, and we have every reason to believe them.  Thus, there's "
+#| "no reason to avoid software released under this license.  However, to "
+#| "help make sure this language cannot cause any trouble in the future, we "
+#| "encourage developers to choose a different license for their own works.  "
+#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#| "License</a> are similarly permissive and brief."
+msgid ""
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
 msgstr ""
 "Au moment où la licence de l'ISC a été publiée, l'emploi de la 
construction "
 "« et/ou » était préoccupante parce qu'elle est semblable à la 
formulation "
@@ -5527,8 +5553,15 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
@@ -5554,3 +5587,19 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "This license is sometimes also known as the OpenBSD License, although "
+#~ "there is one minor difference between the two licenses. The OpenBSD "
+#~ "license was updated to remove the ambiguous term: &quot;and/or&quot;. The "
+#~ "ISC license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and/or distribute this software&hellip;&quot;, whereas the "
+#~ "OpenBSD license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and distribute&hellip;&quot;."
+#~ msgstr ""
+#~ "Cette licence est parfois appelée licence OpenBSD, bien qu'il y ait une "
+#~ "différence mineure entre les deux. La licence OpenBSD a été mise à 
jour "
+#~ "pour en éliminer le terme ambigu « et/ou », tandis a licence de l'ISC 
"
+#~ "donne aux destinataires « la permission d'utiliser, modifier et/ou "
+#~ "distribuer ce logiciel <cite>[Permission to use, copy, modify, and/or "
+#~ "distribute this software&hellip;]</cite>."

Index: license-list.it-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- license-list.it-diff.html   29 Dec 2018 12:59:30 -0000      1.11
+++ license-list.it-diff.html   8 Jan 2019 04:29:08 -0000       1.12
@@ -662,31 +662,21 @@
     ISC License&lt;/a&gt;
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#ISC"&gt;#ISC&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
-&lt;p&gt;This is a lax, permissive free software license, and compatible
-with the GNU GPL.&lt;/p&gt; 
+&lt;p&gt;This <span class="inserted"><ins><em>license is sometimes also known 
as the OpenBSD License. It</em></ins></span> is a <span 
class="removed"><del><strong>lax, permissive</strong></del></span> free 
software license, and compatible with the GNU GPL.&lt;/p&gt;
 
-&lt;p&gt;This license is sometimes also known as the OpenBSD License,
+&lt;p&gt;This license <span class="removed"><del><strong>is sometimes also 
known as the OpenBSD License,
 although there is one minor difference between the two licenses. The
 OpenBSD license was updated to remove the ambiguous term:
-&quot;and/or&quot;. The ISC license provides recipients with
-&quot;Permission to use, copy, modify, and/or distribute this
-software&hellip;&quot;, whereas the OpenBSD license provides
+&quot;and/or&quot;. The ISC license provides</strong></del></span> <span 
class="inserted"><ins><em>had an unfortunate wording choice: it 
provided</em></ins></span> recipients with &quot;Permission to use, copy, 
modify, <span class="removed"><del><strong>and/or</strong></del></span> <span 
class="inserted"><ins><em>and</em></ins></span> distribute this
+<span class="removed"><del><strong>software&hellip;&quot;, whereas the OpenBSD 
license provides
 recipients with &quot;Permission to use, copy, modify, and
 distribute&hellip;&quot;. &lt;/p&gt;
 
-&lt;p&gt;At the time the ISC license was released, the use of
-&quot;and/or&quot; construct was a concern because it is similar
-language used in the license of Pine that the University of Washington
-later claimed prohibited people from distributing modified versions of
-the software. However, ISC has told us they do not share the
-University of Washington's interpretation, and we have every reason to
-believe them.  Thus, there's no reason to avoid software released
-under this license.  However, to help make sure this language cannot
-cause any trouble in the future, we encourage developers to choose a
-different license for their own works.  The &lt;a href="#Expat"&gt;Expat
-License&lt;/a&gt; and &lt;a href="#FreeBSD"&gt;FreeBSD License&lt;/a&gt; are 
similarly
-permissive and brief.&lt;/p&gt;&lt;/dd&gt;
+&lt;p&gt;At the time the ISC license</strong></del></span> <span 
class="inserted"><ins><em>software&hellip;&quot;. This</em></ins></span> was 
<span class="removed"><del><strong>released,</strong></del></span> the <span 
class="removed"><del><strong>use of
+&quot;and/or&quot; construct was a concern because it is 
similar</strong></del></span> <span 
class="inserted"><ins><em>same</em></ins></span> language <span 
class="removed"><del><strong>used in</strong></del></span> <span 
class="inserted"><ins><em>from</em></ins></span> the license of Pine that the 
University of Washington later claimed prohibited people from distributing 
modified versions of the <span class="removed"><del><strong>software. However, 
ISC</strong></del></span> <span class="inserted"><ins><em>software.&lt;/p&gt;
 
+&lt;p&gt;ISC</em></ins></span> has told us they do not share the University of 
Washington's interpretation, and we have every reason to believe them.  <span 
class="removed"><del><strong>Thus,</strong></del></span> <span 
class="inserted"><ins><em>ISC also updated the license to read &quot;Permission 
to use, copy, modify, *and/or* distribute this software&hellip;&quot;. While 
the inclusion of &quot;and/or&quot; doesn't completely solve the 
issue,</em></ins></span> there's no reason to avoid software released under 
this license. However, to help make sure this language cannot cause any trouble 
in the future, we encourage developers to choose a different license for their 
own works. The &lt;a <span class="removed"><del><strong>href="#Expat"&gt;Expat
+License&lt;/a&gt; and &lt;a</strong></del></span> href="#FreeBSD"&gt;FreeBSD 
License&lt;/a&gt; <span class="removed"><del><strong>are</strong></del></span> 
<span class="inserted"><ins><em>is</em></ins></span> similarly permissive and 
<span 
class="removed"><del><strong>brief.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> 
<span class="inserted"><ins><em>brief. However, if you want a lax, weak 
license, we recommend using the Apache-2.0 
license.&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt&gt;&lt;a id="MPL-2.0"
        href="http://directory.fsf.org/wiki/License:MPLv2.0"&gt;Mozilla Public
@@ -2804,7 +2794,7 @@
 information on coordinating and submitting translations of this 
article.&lt;/p&gt;
 &lt;/div&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, <span 
class="removed"><del><strong>2018</strong></del></span> <span 
class="inserted"><ins><em>2018, 2019</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -2814,7 +2804,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/12/29 12:59:30 $
+$Date: 2019/01/08 04:29:08 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -b -r1.313 -r1.314
--- license-list.it.po  29 Dec 2018 12:59:30 -0000      1.313
+++ license-list.it.po  8 Jan 2019 04:29:08 -0000       1.314
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: 2018-02-16 09:15+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -1229,44 +1229,69 @@
 
 # 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 is a lax, permissive free software license, and compatible with the "
+#| "GNU GPL."
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
 "Questa è una licenza di software libero, debole e permissiva, compatibile "
 "con la GNU GPL."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
-msgstr ""
-"Questa licenza è a volte nota anche come licenza di OpenBSD, anche se c'è "
-"una piccola differenza tra le due. La licenza di OpenBSD è stata aggiornata "
-"per rimuovere l'ambiguità del termine &quot;and/or&quot; (\"e/o\") che "
-"conteneva. La licenza ISC dice &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, mentre la licenza OpenBSD dice &quot;"
-"Permission to use, copy, modify, and distribute&hellip;&quot;."
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
+msgstr ""
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+# | [-At the time the ISC license was released, the use of &quot;and/or&quot;
+# | construct was a concern because it is similar language used in the license
+# | of Pine that the University of Washington later claimed prohibited people
+# | from distributing modified versions of the software. However,-]ISC has
+# | told us they do not share the University of Washington's interpretation,
+# | and we have every reason to believe them.  [-Thus,-] {+ISC also updated
+# | the license to read &quot;Permission to use, copy, modify, *and/or*
+# | distribute this software&hellip;&quot;. While the inclusion of
+# | &quot;and/or&quot; doesn't completely solve the issue,+} there's no reason
+# | to avoid software released under this license. However, to help make sure
+# | this language cannot cause any trouble in the future, we encourage
+# | developers to choose a different license for their own works. The <a
+# | [-href=\"#Expat\">Expat License</a> and <a-] href=\"#FreeBSD\">FreeBSD
+# | License</a> [-are-] {+is+} similarly permissive and brief. {+However, if
+# | you want a lax, weak license, we recommend using the Apache-2.0 license.+}
+#, fuzzy
+#| msgid ""
+#| "At the time the ISC license was released, the use of &quot;and/or&quot; "
+#| "construct was a concern because it is similar language used in the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software. "
+#| "However, ISC has told us they do not share the University of Washington's "
+#| "interpretation, and we have every reason to believe them.  Thus, there's "
+#| "no reason to avoid software released under this license.  However, to "
+#| "help make sure this language cannot cause any trouble in the future, we "
+#| "encourage developers to choose a different license for their own works.  "
+#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#| "License</a> are similarly permissive and brief."
+msgid ""
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
 msgstr ""
 "Quando la licenza ISC fu pubblicata, l'uso di &quot;and/or&quot; destava "
 "preoccupazione perché una simile clusola usate nelle licenza di Pine era "
@@ -5905,8 +5930,15 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
@@ -5934,6 +5966,23 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+#~ msgid ""
+#~ "This license is sometimes also known as the OpenBSD License, although "
+#~ "there is one minor difference between the two licenses. The OpenBSD "
+#~ "license was updated to remove the ambiguous term: &quot;and/or&quot;. The "
+#~ "ISC license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and/or distribute this software&hellip;&quot;, whereas the "
+#~ "OpenBSD license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and distribute&hellip;&quot;."
+#~ msgstr ""
+#~ "Questa licenza è a volte nota anche come licenza di OpenBSD, anche se 
c'è "
+#~ "una piccola differenza tra le due. La licenza di OpenBSD è stata "
+#~ "aggiornata per rimuovere l'ambiguità del termine &quot;and/or&quot; 
(\"e/o"
+#~ "\") che conteneva. La licenza ISC dice &quot;Permission to use, copy, "
+#~ "modify, and/or distribute this software&hellip;&quot;, mentre la licenza "
+#~ "OpenBSD dice &quot;Permission to use, copy, modify, and distribute&hellip;"
+#~ "&quot;."
+
 # type: Content of: <dl><dd><p>
 #~ msgid ""
 #~ "The CeCILL-B is a free software license with copyleft.  It is "

Index: license-list.ja-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja-diff.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- license-list.ja-diff.html   29 Dec 2018 12:59:30 -0000      1.25
+++ license-list.ja-diff.html   8 Jan 2019 04:29:08 -0000       1.26
@@ -663,31 +663,21 @@
     ISC License&lt;/a&gt;
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#ISC"&gt;#ISC&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
-&lt;p&gt;This is a lax, permissive free software license, and compatible
-with the GNU GPL.&lt;/p&gt; 
+&lt;p&gt;This <span class="inserted"><ins><em>license is sometimes also known 
as the OpenBSD License. It</em></ins></span> is a <span 
class="removed"><del><strong>lax, permissive</strong></del></span> free 
software license, and compatible with the GNU GPL.&lt;/p&gt;
 
-&lt;p&gt;This license is sometimes also known as the OpenBSD License,
+&lt;p&gt;This license <span class="removed"><del><strong>is sometimes also 
known as the OpenBSD License,
 although there is one minor difference between the two licenses. The
 OpenBSD license was updated to remove the ambiguous term:
-&quot;and/or&quot;. The ISC license provides recipients with
-&quot;Permission to use, copy, modify, and/or distribute this
-software&hellip;&quot;, whereas the OpenBSD license provides
+&quot;and/or&quot;. The ISC license provides</strong></del></span> <span 
class="inserted"><ins><em>had an unfortunate wording choice: it 
provided</em></ins></span> recipients with &quot;Permission to use, copy, 
modify, <span class="removed"><del><strong>and/or</strong></del></span> <span 
class="inserted"><ins><em>and</em></ins></span> distribute this
+<span class="removed"><del><strong>software&hellip;&quot;, whereas the OpenBSD 
license provides
 recipients with &quot;Permission to use, copy, modify, and
 distribute&hellip;&quot;. &lt;/p&gt;
 
-&lt;p&gt;At the time the ISC license was released, the use of
-&quot;and/or&quot; construct was a concern because it is similar
-language used in the license of Pine that the University of Washington
-later claimed prohibited people from distributing modified versions of
-the software. However, ISC has told us they do not share the
-University of Washington's interpretation, and we have every reason to
-believe them.  Thus, there's no reason to avoid software released
-under this license.  However, to help make sure this language cannot
-cause any trouble in the future, we encourage developers to choose a
-different license for their own works.  The &lt;a href="#Expat"&gt;Expat
-License&lt;/a&gt; and &lt;a href="#FreeBSD"&gt;FreeBSD License&lt;/a&gt; are 
similarly
-permissive and brief.&lt;/p&gt;&lt;/dd&gt;
+&lt;p&gt;At the time the ISC license</strong></del></span> <span 
class="inserted"><ins><em>software&hellip;&quot;. This</em></ins></span> was 
<span class="removed"><del><strong>released,</strong></del></span> the <span 
class="removed"><del><strong>use of
+&quot;and/or&quot; construct was a concern because it is 
similar</strong></del></span> <span 
class="inserted"><ins><em>same</em></ins></span> language <span 
class="removed"><del><strong>used in</strong></del></span> <span 
class="inserted"><ins><em>from</em></ins></span> the license of Pine that the 
University of Washington later claimed prohibited people from distributing 
modified versions of the <span class="removed"><del><strong>software. However, 
ISC</strong></del></span> <span class="inserted"><ins><em>software.&lt;/p&gt;
 
+&lt;p&gt;ISC</em></ins></span> has told us they do not share the University of 
Washington's interpretation, and we have every reason to believe them.  <span 
class="removed"><del><strong>Thus,</strong></del></span> <span 
class="inserted"><ins><em>ISC also updated the license to read &quot;Permission 
to use, copy, modify, *and/or* distribute this software&hellip;&quot;. While 
the inclusion of &quot;and/or&quot; doesn't completely solve the 
issue,</em></ins></span> there's no reason to avoid software released under 
this license. However, to help make sure this language cannot cause any trouble 
in the future, we encourage developers to choose a different license for their 
own works. The &lt;a <span class="removed"><del><strong>href="#Expat"&gt;Expat
+License&lt;/a&gt; and &lt;a</strong></del></span> href="#FreeBSD"&gt;FreeBSD 
License&lt;/a&gt; <span class="removed"><del><strong>are</strong></del></span> 
<span class="inserted"><ins><em>is</em></ins></span> similarly permissive and 
<span 
class="removed"><del><strong>brief.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> 
<span class="inserted"><ins><em>brief. However, if you want a lax, weak 
license, we recommend using the Apache-2.0 
license.&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
 
 &lt;dt&gt;&lt;a id="MPL-2.0"
        href="http://directory.fsf.org/wiki/License:MPLv2.0"&gt;Mozilla Public
@@ -1165,17 +1155,26 @@
 &lt;p&gt;However, there is no reason not to use programs that have been 
released
 under the original BSD license.&lt;/p&gt;&lt;/dd&gt;
 
-&lt;dt&gt;&lt;a <span class="inserted"><ins><em>id="CeCILL-B" 
href="https://directory.fsf.org/wiki/License:CeCILL-B"&gt;
-    CeCILL-B version 1&lt;/a&gt;
-    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#CeCILL-B"&gt;#CeCILL-B&lt;/a&gt;)&lt;/span&gt;
-    &lt;/dt&gt;
+&lt;dt&gt;&lt;a <span class="removed"><del><strong>id="CDDL"
+       href="http://directory.fsf.org/wiki/License:CDDLv1.0"&gt;
+    Common Development and Distribution License (CDDL),</strong></del></span> 
<span class="inserted"><ins><em>id="CeCILL-B" 
href="https://directory.fsf.org/wiki/License:CeCILL-B"&gt;
+    CeCILL-B</em></ins></span> version <span 
class="removed"><del><strong>1.0&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>1&lt;/a&gt;</em></ins></span>
+    &lt;span <span 
class="removed"><del><strong>class="anchor-reference-id"&gt; (&lt;a 
href="#CDDL"&gt;#CDDL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;</strong></del></span> 
<span class="inserted"><ins><em>class="anchor-reference-id"&gt;(&lt;a 
href="#CeCILL-B"&gt;#CeCILL-B&lt;/a&gt;)&lt;/span&gt;
+    &lt;/dt&gt;</em></ins></span>
 &lt;dd&gt;
-&lt;p&gt;The CeCILL-B is a free software license. It is incompatible with the
-GPL because it has requirements that are not present in the GPL. The
+<span class="removed"><del><strong>&lt;p&gt;This</strong></del></span>
+<span class="inserted"><ins><em>&lt;p&gt;The CeCILL-B</em></ins></span> is a 
free software license. It <span class="removed"><del><strong>has a weak 
per-file copyleft
+(like version 1 of the Mozilla Public License) which makes 
it</strong></del></span> <span class="inserted"><ins><em>is</em></ins></span> 
incompatible with the <span class="removed"><del><strong>&lt;a 
href="/licenses/gpl.html"&gt;GNU GPL&lt;/a&gt;.  This
+means a module covered by the</strong></del></span>
+GPL <span class="removed"><del><strong>and a module covered 
by</strong></del></span> <span class="inserted"><ins><em>because it has 
requirements that are not present in</em></ins></span> the <span 
class="removed"><del><strong>CDDL
+cannot legally be linked together.  We urge</strong></del></span> <span 
class="inserted"><ins><em>GPL. The
 credit requirements in section 5.3.4 exceed those of the GPL. It also
-has a strange requirement that you use your &ldquo;best efforts&rdquo;
-to get third parties to agree &ldquo;to comply with the obligations set
-forth in this Article.&rdquo;&lt;/p&gt;
+has a strange requirement that</em></ins></span> you <span 
class="removed"><del><strong>not to</strong></del></span> use <span 
class="inserted"><ins><em>your &ldquo;best efforts&rdquo;
+to get third parties to agree &ldquo;to comply with</em></ins></span> the 
<span class="removed"><del><strong>CDDL
+for</strong></del></span> <span class="inserted"><ins><em>obligations set
+forth in</em></ins></span> this <span 
class="removed"><del><strong>reason.&lt;/p&gt;
+
+&lt;p&gt;For an illustrative example of</strong></del></span> <span 
class="inserted"><ins><em>Article.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Please do not release software under this 
license.&lt;/p&gt;&lt;/dd&gt;
 
@@ -1192,7 +1191,7 @@
 
 &lt;p&gt;Please do not release software under this 
license.&lt;/p&gt;&lt;/dd&gt;
 
-&lt;dt&gt;&lt;a</em></ins></span> id="CDDL"
+&lt;dt&gt;&lt;a id="CDDL"
        href="http://directory.fsf.org/wiki/License:CDDLv1.0"&gt;
     Common Development and Distribution License (CDDL), version 1.0&lt;/a&gt;
     &lt;span class="anchor-reference-id"&gt; (&lt;a 
href="#CDDL"&gt;#CDDL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -1204,7 +1203,7 @@
 cannot legally be linked together.  We urge you not to use the CDDL
 for this reason.&lt;/p&gt;
 
-&lt;p&gt;For an illustrative example of why you should not combine
+&lt;p&gt;For an illustrative example of</em></ins></span> why you should not 
combine
 CDDL-licensed works with the GPL-licensed works, see the FSF's
 statement, &lt;a href="https://www.fsf.org/licensing/zfs-and-linux"&gt;
 &lt;em&gt;Interpreting, enforcing and changing the GNU GPL, as applied to
@@ -1264,35 +1263,27 @@
 infringement suits specifically against Contributors to the EPL'd
 program.&lt;/p&gt;&lt;/dd&gt;
 
-&lt;dt&gt;&lt;a <span class="removed"><del><strong>id="EUPL" 
href="http://directory.fsf.org/wiki/License:EUPLv1.1"&gt;
-    European Union</strong></del></span> <span 
class="inserted"><ins><em>id="EPL2" 
href="http://directory.fsf.org/wiki/License:EPLv2.0"&gt;
-    Eclipse</em></ins></span> Public License <span 
class="removed"><del><strong>(EUPL) version 1.1&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>Version 2.0&lt;/a&gt;</em></ins></span>
-    &lt;span class="anchor-reference-id"&gt;(&lt;a <span 
class="removed"><del><strong>href="#EUPL"&gt;#EUPL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="#EPL2"&gt;#EPL2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;</em></ins></span>
-&lt;dd&gt;
-<span class="removed"><del><strong>&lt;p&gt;This</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;In terms of GPL compatibility, the 
Eclipse Public License version
-2.0</em></ins></span> is <span class="removed"><del><strong>a free software 
license.  By itself, it has a copyleft
-comparable</strong></del></span> <span class="inserted"><ins><em>essentially 
equivalent</em></ins></span> to <span class="removed"><del><strong>the GPL's, 
and incompatible with it.  However,</strong></del></span> <span 
class="inserted"><ins><em>version 1.0. The only change is that</em></ins></span>
-it <span class="removed"><del><strong>gives
-recipients ways to relicense</strong></del></span> <span 
class="inserted"><ins><em>explicitly offers</em></ins></span> the <span 
class="removed"><del><strong>work under</strong></del></span> <span 
class="inserted"><ins><em>option of designating</em></ins></span> the <span 
class="removed"><del><strong>terms</strong></del></span> <span 
class="inserted"><ins><em>GNU GPL version 2
-or later as a &ldquo;secondary license&rdquo; for a certain 
piece</em></ins></span> of <span class="removed"><del><strong>other
-selected licenses, and some</strong></del></span>
-<span class="inserted"><ins><em>code.&lt;/p&gt;
-
-&lt;p&gt;If an initial contributor releases a specific piece</em></ins></span> 
of <span class="removed"><del><strong>those&mdash;the &lt;a 
href="#EPL"&gt;Eclipse
-Public License&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>code</em></ins></span> and <span 
class="removed"><del><strong>the &lt;a href="#CommonPublicLicense10"&gt;Common
-Public License&lt;/a&gt; in particular&mdash;only provide</strong></del></span>
-<span class="inserted"><ins><em>designates GNU GPL version 2 or later 
as</em></ins></span> a <span class="removed"><del><strong>weaker copyleft.
-Thus, developers can't</strong></del></span> <span 
class="inserted"><ins><em>secondary license, that
+&lt;dt&gt;&lt;a <span 
class="removed"><del><strong>id="EUPL"</strong></del></span> <span 
class="inserted"><ins><em>id="EPL2" 
href="http://directory.fsf.org/wiki/License:EPLv2.0"&gt;
+    Eclipse Public License Version 2.0&lt;/a&gt;
+    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#EPL2"&gt;#EPL2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dd&gt;
+&lt;p&gt;In terms of GPL compatibility, the Eclipse Public License version
+2.0 is essentially equivalent to version 1.0. The only change is that
+it explicitly offers the option of designating the GNU GPL version 2
+or later as a &ldquo;secondary license&rdquo; for a certain piece of
+code.&lt;/p&gt;
+
+&lt;p&gt;If an initial contributor releases a specific piece of code and
+designates GNU GPL version 2 or later as a secondary license, that
 provides explicit compatibility with those GPL versions for that
 code. (Doing so is roughly equivalent, for users, to releasing that
 piece of code under a dual license, EPL | GPL.) However, the EPL2
 without this designation remains incompatible with the 
GPL.&lt;/p&gt;&lt;/dd&gt;
 
 &lt;dt&gt;&lt;a id="EUPL"&gt;&lt;/a&gt; &lt;!-- old id, leave for 
compatibility --&gt;
-    &lt;a id="EUPL-1.1" 
href="http://directory.fsf.org/wiki/License:EUPLv1.1"&gt;
+    &lt;a id="EUPL-1.1"</em></ins></span> 
href="http://directory.fsf.org/wiki/License:EUPLv1.1"&gt;
     European Union Public License (EUPL) version 1.1&lt;/a&gt;
-    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#EUPL-1.1"&gt;#EUPL-1.1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    &lt;span class="anchor-reference-id"&gt;(&lt;a <span 
class="removed"><del><strong>href="#EUPL"&gt;#EUPL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="#EUPL-1.1"&gt;#EUPL-1.1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;</em></ins></span>
 &lt;dd&gt;
 &lt;p&gt;This is a free software license.  By itself, it has a copyleft
 comparable to the GPL's, and incompatible with it.  However, it gives
@@ -1300,7 +1291,7 @@
 selected licenses, and some of those&mdash;the &lt;a href="#EPL"&gt;Eclipse
 Public License&lt;/a&gt; and the &lt;a href="#CommonPublicLicense10"&gt;Common
 Public License&lt;/a&gt; in particular&mdash;only provide a weaker copyleft.
-Thus, developers can't</em></ins></span> rely on this license to provide a 
strong
+Thus, developers can't rely on this license to provide a strong
 copyleft.&lt;/p&gt;
 
 &lt;p&gt;The EUPL allows relicensing to GPLv2, because that is listed as one
@@ -2815,7 +2806,7 @@
 information on coordinating and submitting translations of this 
article.&lt;/p&gt;
 &lt;/div&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017, 2018, 2019</em></ins></span> Free 
Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -2825,7 +2816,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/12/29 12:59:30 $
+$Date: 2019/01/08 04:29:08 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: license-list.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja.po,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- license-list.ja.po  29 Dec 2018 12:59:31 -0000      1.174
+++ license-list.ja.po  8 Jan 2019 04:29:08 -0000       1.175
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: 2016-10-31 10:00+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -1128,43 +1128,64 @@
 "ス</a> <span class=\"anchor-reference-id\">(<a 
href=\"#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 "
+#| "lax, permissive free software license, and compatible with the GNU GPL."
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
-"これは、ゆるい寛容な自由ソフトウェアライセンスで、GNU
 GPLと両立します。"
+"このライセンスは時にOpenBSDライセンスとしても知られています。これはゆるい寛容"
+"な自由ソフトウェアライセンスで、GNU GPLと両立します。"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
-msgstr ""
-"このライセンスは時にOpenBSDライセンスとしても知られますが、二つのライセンスに"
-"はひとつ小さな差異があります。OpenBSDライセンスは曖昧な用語
 &quot;and/"
-"or&quot; 
を除去するように更新されました。ISCライセンスは受け取った人に対して"
-"&quot;Permission to use, copy, modify, and/or distribute this "
-"software&hellip;&quot;と許可を与えますが、OpenBSDライセンスは受け取った人に対"
-"して&quot;Permission to use, copy, modify, and 
distribute&hellip;&quot;の許可"
-"を与えます。"
+#, fuzzy
+#| msgid ""
+#| "This license does have an unfortunate wording choice: it provides "
+#| "recipients with &quot;Permission to use, copy, modify, and/or distribute "
+#| "this software&hellip;&quot; This is roughly the same language from the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software."
+msgid ""
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
+msgstr ""
+"このライセンスは、不幸な言葉遣いの選択をしています: 
このライセンスは受け取っ"
+"た人に&quot;Permission to use, copy, modify, and/or distribute this "
+"software&hellip;&quot; 
(このソフトウェアを使用、コピー、改変、そして/または、"
+"é…
å¸ƒã™ã‚‹è¨±å¯&hellip;)を提供しています。これはPineのライセンスの言い方とã
 ã„た"
+"い同じものですが、ワシントン大学は、その後、このソフトウェアの改変バージョン"
+"の配布を人々に禁止すると主張しています。"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+#, fuzzy
+#| msgid ""
+#| "At the time the ISC license was released, the use of &quot;and/or&quot; "
+#| "construct was a concern because it is similar language used in the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software. "
+#| "However, ISC has told us they do not share the University of Washington's "
+#| "interpretation, and we have every reason to believe them.  Thus, there's "
+#| "no reason to avoid software released under this license.  However, to "
+#| "help make sure this language cannot cause any trouble in the future, we "
+#| "encourage developers to choose a different license for their own works.  "
+#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#| "License</a> are similarly permissive and brief."
+msgid ""
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
 msgstr ""
 
"ISCライセンスがリリースされた時点で、&quot;and/or&quot;の構成は懸念でした。な"
 
"ぜならPineのライセンスで同様な言葉遣いが使われており、ワシントン大学が後に"
@@ -5412,7 +5433,8 @@
 #| msgid ""
 #| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -5435,6 +5457,29 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid ""
+#~ "This is a lax, permissive free software license, and compatible with the "
+#~ "GNU GPL."
+#~ msgstr ""
+#~ 
"これは、ゆるい寛容な自由ソフトウェアライセンスで、GNU 
GPLと両立します。"
+
+#~ msgid ""
+#~ "This license is sometimes also known as the OpenBSD License, although "
+#~ "there is one minor difference between the two licenses. The OpenBSD "
+#~ "license was updated to remove the ambiguous term: &quot;and/or&quot;. The "
+#~ "ISC license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and/or distribute this software&hellip;&quot;, whereas the "
+#~ "OpenBSD license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and distribute&hellip;&quot;."
+#~ msgstr ""
+#~ 
"このライセンスは時にOpenBSDライセンスとしても知られますが、二つのライセン"
+#~ 
"スにはひとつ小さな差異があります。OpenBSDライセンスは曖昧な用語
 &quot;and/"
+#~ "or&quot; 
を除去するように更新されました。ISCライセンスは受け取った人に対し"
+#~ "て&quot;Permission to use, copy, modify, and/or distribute this "
+#~ 
"software&hellip;&quot;と許可を与えますが、OpenBSDライセンスは受け取った人"
+#~ "に対して&quot;Permission to use, copy, modify, and distribute&hellip;"
+#~ "&quot;の許可を与えます。"
+
 #, fuzzy
 #~| msgid ""
 #~| "This is a free software license, not a strong copyleft, which is "
@@ -5465,27 +5510,6 @@
 #~ "るライセンスです。</strong>"
 
 #~ msgid ""
-#~ "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と両立します。"
-
-#~ msgid ""
-#~ "This license does have an unfortunate wording choice: it provides "
-#~ "recipients with &quot;Permission to use, copy, modify, and/or distribute "
-#~ "this software&hellip;&quot; This is roughly the same language from the "
-#~ "license of Pine that the University of Washington later claimed "
-#~ "prohibited people from distributing modified versions of the software."
-#~ msgstr ""
-#~ 
"このライセンスは、不幸な言葉遣いの選択をしています: 
このライセンスは受け"
-#~ "取った人に&quot;Permission to use, copy, modify, and/or distribute 
this "
-#~ "software&hellip;&quot; 
(このソフトウェアを使用、コピー、改変、そして/また"
-#~ "は、é…
å¸ƒã™ã‚‹è¨±å¯&hellip;)を提供しています。これはPineのライセンスの言い方"
-#~ "とだ
いたい同じものですが、ワシントン大学は、その後、このソフトウェアの改変"
-#~ "バージョンの配布を人々
に禁止すると主張しています。"
-
-#~ msgid ""
 #~ "<a id=\"Yahoo\" href=\"http://www.zimbra.com/license/";
 #~ "yahoo_public_license_1.1.html\"> Yahoo! Public License 1.1</a> <span "
 #~ "class=\"anchor-reference-id\">(<a href=\"#Yahoo\">#Yahoo</a>)</span>"

Index: license-list.pl.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pl.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- license-list.pl.po  29 Dec 2018 12:59:31 -0000      1.24
+++ license-list.pl.po  8 Jan 2019 04:29:08 -0000       1.25
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: 2017-04-24 16:01-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -1186,35 +1186,35 @@
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
+"Podobna do&nbsp;Publicznej Licencji Mozilli w&nbsp;wersji&nbsp;1: licencja "
+"wolnego oprogramowania niezgodna z&nbsp;GNU GPL."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -5440,13 +5440,14 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018+} Free Software
-# | Foundation, Inc.
+# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018, 2019+} Free
+# | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>

Index: license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- license-list.pot    29 Dec 2018 12:59:31 -0000      1.189
+++ license-list.pot    8 Jan 2019 04:29:08 -0000       1.190
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -804,34 +804,32 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and "
-"distribute&hellip;&quot;."
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this "
+"software&hellip;&quot;. This was the same language from the license of Pine "
+"that the University of Washington later claimed prohibited people from "
+"distributing modified versions of the software."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
-"software released under this license.  However, to help make sure this "
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of "
+"&quot;and/or&quot; doesn't completely solve the issue, there's no reason to "
+"avoid software released under this license. However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
 "choose a different license for their own works.  The <a "
-"href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
-"License</a> are similarly permissive and brief."
+"href=\"#FreeBSD\">FreeBSD License</a> is similarly permissive and "
+"brief. However, if you want a lax, weak license, we recommend using the "
+"Apache-2.0 license."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -3762,7 +3760,9 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -b -r1.310 -r1.311
--- license-list.ru.po  29 Dec 2018 13:59:29 -0000      1.310
+++ license-list.ru.po  8 Jan 2019 04:29:08 -0000       1.311
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2018-12-29 12:56+0000\n"
+"POT-Creation-Date: 2019-01-08 04:26+0000\n"
 "PO-Revision-Date: 2018-12-29 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"
+"X-Outdated-Since: 2019-01-08 04:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1134,44 +1135,86 @@
 "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 is a lax, permissive free software license, and compatible with the "
+#| "GNU GPL."
 msgid ""
-"This is a lax, permissive free software license, and compatible with the GNU "
-"GPL."
+"This license is sometimes also known as the OpenBSD License. It is a free "
+"software license, and compatible with the GNU GPL."
 msgstr ""
 "Это безвольная неограничительная 
лицензия свободных программ, она 
совместима "
 "с GNU GPL."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This license is sometimes also known as the OpenBSD License, although there "
-"is one minor difference between the two licenses. The OpenBSD license was "
-"updated to remove the ambiguous term: &quot;and/or&quot;. The ISC license "
-"provides recipients with &quot;Permission to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;, whereas the OpenBSD license provides "
-"recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;."
-msgstr ""
-"Эту лицензию также называют иногда 
лицензией OpenBSD, хотя между этими двумя "
-"лицензиями есть одно небольшое различие. 
Лицензия OpenBSD была изменена, "
-"чтобы устранить неоднозначное выражение: 
&ldquo;и/или&rdquo;. Лицензия ISC "
-"предоставляет получателям &ldquo;разрешение 
применять, копировать, изменять "
-"и/или распространять эти программы...&rdquo;, 
в то время как лицензия "
-"OpenBSD предоставляет получателям 
&ldquo;разрешение применять, копировать, "
-"изменять и распространять...?rdquo;."
-
-#. type: Content of: <dl><dd><p>
-msgid ""
-"At the time the ISC license was released, the use of &quot;and/or&quot; "
-"construct was a concern because it is similar language used in the license "
-"of Pine that the University of Washington later claimed prohibited people "
-"from distributing modified versions of the software. However, ISC has told "
-"us they do not share the University of Washington's interpretation, and we "
-"have every reason to believe them.  Thus, there's no reason to avoid "
+# | This license [-does have-] {+had+} an unfortunate wording choice: it
+# | provide[-s-]{+d+} recipients with &quot;Permission to use, copy, modify,
+# | [-and/or-] {+and+} distribute this software&hellip;&quot;{+.+} This [-is
+# | roughly-] {+was+} the same language from the license of Pine that the
+# | University of Washington later claimed prohibited people from distributing
+# | modified versions of the software.
+#, fuzzy
+#| msgid ""
+#| "This license does have an unfortunate wording choice: it provides "
+#| "recipients with &quot;Permission to use, copy, modify, and/or distribute "
+#| "this software&hellip;&quot; This is roughly the same language from the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software."
+msgid ""
+"This license had an unfortunate wording choice: it provided recipients with "
+"&quot;Permission to use, copy, modify, and distribute this software&hellip;"
+"&quot;. This was the same language from the license of Pine that the "
+"University of Washington later claimed prohibited people from distributing "
+"modified versions of the software."
+msgstr ""
+"В этой лицензии все же есть неудачно 
выбранная формулировка: она "
+"предоставляет получателям &ldquo;Разрешение 
применять, копировать, изменять "
+"и/или распространять эти программы...&rdquo; 
Это примерно те же выражения, "
+"что в лицензии Pine, о которой Вашингтонский 
университет впоследствии "
+"заявил, что они запрещают людям 
распространять измененные версии 
программ."
+
+#. type: Content of: <dl><dd><p>
+# | [-At the time the ISC license was released, the use of &quot;and/or&quot;
+# | construct was a concern because it is similar language used in the license
+# | of Pine that the University of Washington later claimed prohibited people
+# | from distributing modified versions of the software. However,-]ISC has
+# | told us they do not share the University of Washington's interpretation,
+# | and we have every reason to believe them.  [-Thus,-] {+ISC also updated
+# | the license to read &quot;Permission to use, copy, modify, *and/or*
+# | distribute this software&hellip;&quot;. While the inclusion of
+# | &quot;and/or&quot; doesn't completely solve the issue,+} there's no reason
+# | to avoid software released under this license. However, to help make sure
+# | this language cannot cause any trouble in the future, we encourage
+# | developers to choose a different license for their own works. The <a
+# | [-href=\"#Expat\">Expat License</a> and <a-] href=\"#FreeBSD\">FreeBSD
+# | License</a> [-are-] {+is+} similarly permissive and brief. {+However, if
+# | you want a lax, weak license, we recommend using the Apache-2.0 license.+}
+#, fuzzy
+#| msgid ""
+#| "At the time the ISC license was released, the use of &quot;and/or&quot; "
+#| "construct was a concern because it is similar language used in the "
+#| "license of Pine that the University of Washington later claimed "
+#| "prohibited people from distributing modified versions of the software. "
+#| "However, ISC has told us they do not share the University of Washington's "
+#| "interpretation, and we have every reason to believe them.  Thus, there's "
+#| "no reason to avoid software released under this license.  However, to "
+#| "help make sure this language cannot cause any trouble in the future, we "
+#| "encourage developers to choose a different license for their own works.  "
+#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
+#| "License</a> are similarly permissive and brief."
+msgid ""
+"ISC has told us they do not share the University of Washington's "
+"interpretation, and we have every reason to believe them. ISC also updated "
+"the license to read &quot;Permission to use, copy, modify, *and/or* "
+"distribute this software&hellip;&quot;. While the inclusion of &quot;and/"
+"or&quot; doesn't completely solve the issue, there's no reason to avoid "
 "software released under this license.  However, to help make sure this "
 "language cannot cause any trouble in the future, we encourage developers to "
-"choose a different license for their own works.  The <a href=\"#Expat"
-"\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
-"similarly permissive and brief."
+"choose a different license for their own works. The <a href=\"#FreeBSD"
+"\">FreeBSD License</a> is similarly permissive and brief. However, if you "
+"want a lax, weak license, we recommend using the Apache-2.0 license."
 msgstr ""
 "Когда была выпущена лицензия ISC, 
конструкция &ldquo;и/или&rdquo; вызывала "
 "опасения, потому что она сходна с 
формулировкой, применявшейся в лицензии "
@@ -5524,8 +5567,15 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
@@ -5556,6 +5606,23 @@
 msgstr "Обновлено:"
 
 #~ msgid ""
+#~ "This license is sometimes also known as the OpenBSD License, although "
+#~ "there is one minor difference between the two licenses. The OpenBSD "
+#~ "license was updated to remove the ambiguous term: &quot;and/or&quot;. The "
+#~ "ISC license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and/or distribute this software&hellip;&quot;, whereas the "
+#~ "OpenBSD license provides recipients with &quot;Permission to use, copy, "
+#~ "modify, and distribute&hellip;&quot;."
+#~ msgstr ""
+#~ "Эту лицензию также называют иногда 
лицензией OpenBSD, хотя между этими "
+#~ "двумя лицензиями есть одно небольшое 
различие. Лицензия OpenBSD была "
+#~ "изменена, чтобы устранить неоднозначное 
выражение: &ldquo;и/или&rdquo;. "
+#~ "Лицензия ISC предоставляет получателям 
&ldquo;разрешение применять, "
+#~ "копировать, изменять и/или 
распространять эти программы...&rdquo;, в то "
+#~ "время как лицензия OpenBSD предоставляет 
получателям &ldquo;разрешение "
+#~ "применять, копировать, изменять и 
распространять...?rdquo;."
+
+#~ msgid ""
 #~ "Adding insult to injury, it also twists the words &ldquo;commons&rdquo; "
 #~ "and &ldquo;sell.&rdquo; For further criticism, see <a href=\"https://";
 #~ "sfconservancy.org/blog/2018/aug/22/commons-clause/\"> Bradley Kuhn's "
@@ -5596,20 +5663,6 @@
 #~ msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #~ msgid ""
-#~ "This license does have an unfortunate wording choice: it provides "
-#~ "recipients with &quot;Permission to use, copy, modify, and/or distribute "
-#~ "this software&hellip;&quot; This is roughly the same language from the "
-#~ "license of Pine that the University of Washington later claimed "
-#~ "prohibited people from distributing modified versions of the software."
-#~ msgstr ""
-#~ "В этой лицензии все же есть неудачно 
выбранная формулировка: она "
-#~ "предоставляет получателям &ldquo;Р
азрешение применять, копировать, "
-#~ "изменять и/или распространять эти 
программы...&rdquo; Это примерно те же "
-#~ "выражения, что в лицензии Pine, о которой 
Вашингтонский университет "
-#~ "впоследствии заявил, что они запрещают 
людям распространять измененные "
-#~ "версии программ."
-
-#~ msgid ""
 #~ "<a id=\"Yahoo\" href=\"http://www.zimbra.com/license/";
 #~ "yahoo_public_license_1.1.html\"> Yahoo! Public License 1.1</a> <span "
 #~ "class=\"anchor-reference-id\">(<a href=\"#Yahoo\">#Yahoo</a>)</span>"



reply via email to

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