www-commits
[Top][All Lists]
Advanced

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

www home.ru.html planetfeeds.ru.html licenses/l...


From: GNUN
Subject: www home.ru.html planetfeeds.ru.html licenses/l...
Date: Thu, 25 Nov 2021 05:06:13 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/11/25 05:06:13

Modified files:
        .              : home.ru.html planetfeeds.ru.html 
        licenses       : license-list.zh-cn.html 
        licenses/po    : license-list.zh-cn-en.html 
                         license-list.zh-cn.po 
        po             : home.ru-en.html home.ru.po planetfeeds.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.ru.html?cvsroot=www&r1=1.427&r2=1.428
http://web.cvs.savannah.gnu.org/viewcvs/www/planetfeeds.ru.html?cvsroot=www&r1=1.1308&r2=1.1309
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.zh-cn-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.zh-cn.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru-en.html?cvsroot=www&r1=1.222&r2=1.223
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru.po?cvsroot=www&r1=1.685&r2=1.686
http://web.cvs.savannah.gnu.org/viewcvs/www/po/planetfeeds.ru.po?cvsroot=www&r1=1.1938&r2=1.1939

Patches:
Index: home.ru.html
===================================================================
RCS file: /web/www/www/home.ru.html,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -b -r1.427 -r1.428
--- home.ru.html        25 Nov 2021 09:10:11 -0000      1.427
+++ home.ru.html        25 Nov 2021 10:06:08 -0000      1.428
@@ -459,9 +459,9 @@
 <div class="second-column" role="complementary">
 
 <div id="giving-guide" class="emph-box color2">
-<p>This year, choose Freedom as a gift.  Here's an <strong><a
+<p>В этом выбери году в качестве подарка 
свободу. Вот <a
 
href="https://www.fsf.org/blogs/community/fsf-giving-guide-freedom-is-the-greatest-gift-of-all";>
-Ethical Tech Giving Guide</a></strong></p>
+руководство по этичным техническим 
подаркам</a>.</p>
 </div>
 
 <div id="schools" class="emph-box color1">
@@ -673,7 +673,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/11/25 09:10:11 $
+$Date: 2021/11/25 10:06:08 $
 
 <!-- timestamp end -->
 </p>

Index: planetfeeds.ru.html
===================================================================
RCS file: /web/www/www/planetfeeds.ru.html,v
retrieving revision 1.1308
retrieving revision 1.1309
diff -u -b -r1.1308 -r1.1309
--- planetfeeds.ru.html 25 Nov 2021 06:13:58 -0000      1.1308
+++ planetfeeds.ru.html 25 Nov 2021 10:06:08 -0000      1.1309
@@ -6,12 +6,12 @@
 value="<a href='http://savannah.gnu.org/forum/forum.php?forum_id=10075'>" -->
 <!--#echo
 encoding="none" var="link" -->
-GNU Parallel 20211122 (&#39;Peng Shuai&#39;) released [stable]<!--#echo 
encoding="none"
+Выпущен GNU Parallel 20211122 ('Peng Shuai') 
[стабильный]<!--#echo encoding="none"
 var="a_close" -->
 <!-- TRANSLATORS: 
 http://savannah.gnu.org/forum/forum.php?forum_id=10075 -->
-: GNU Parallel 20211122 (&#39;Peng Shuai&#39;) [stable] has been
-released. It is available for download at: lbry://@GnuParallel:4...
+: Выпущен GNU Parallel 20211122 ('Peng Shuai') [стабильный]. 
Он доступен
+на...
 </p>
 <p>
 <!--#set var="link"

Index: licenses/license-list.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-list.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- licenses/license-list.zh-cn.html    12 Oct 2021 04:01:25 -0000      1.7
+++ licenses/license-list.zh-cn.html    25 Nov 2021 10:06:09 -0000      1.8
@@ -21,7 +21,6 @@
 }
 .toc a { display: block; }
 #fsf-licensing { margin: 1em auto; }
-.short-lines { width: 47em; max-width: 100%; }
 
 /* Definitions for color-coded border */
 dl.green, dl.orange, dl.red, dl.blue, dl.purple {
@@ -153,7 +152,7 @@
 <ul>
 <li>许可证是否为合格的 <a 
href="/philosophy/free-sw.html">自由软件</a> 许可证。</li>
 
-<li>许可证是否是一个 <a href="/copyleft/copyleft.html">copyleft</a> 
许可证。</li>
+<li>许可证是否是一个 <a href="/licenses/copyleft.html">copyleft</a> 
许可证。</li>
 
 <li>许可证是否 <a href="/licenses/gpl-faq.html#WhatDoesCompatMean">兼容 
GNU
 GPL</a>。除非特别说明,此处兼容是指同时兼容 GPLv2 和 
GPLv3。</li>
@@ -173,7 +172,7 @@
 <p>如果你对自由软件许可证有问题,请发邮件到 <a
 
href="mailto:licensing@fsf.org";>&lt;licensing@fsf.org&gt;</a>。由于资源有限,我们不会回答è¾
…助专有软件开发或发布的问题。如果你的问题比较å…
·ä½“而且没有列在本页或
 <a href="/licenses/gpl-faq.html">GNU许可证常见问题</a>,那么对你
的回答就会快些。我们 <a
-href="http://www.fsf.org/volunteer";>欢迎有能力的志愿者</a> 
帮助我们回答许可证相关的问题。</p>
+href="https://www.fsf.org/volunteer";>欢迎有能力的志愿者</a> 
帮助我们回答许可证相关的问题。</p>
 
 <p>如果你正在考虑撰写一个新的许可证,请也联系我们 <a
 
href="mailto:licensing@fsf.org";>&lt;licensing@fsf.org&gt;</a>。不同自由软件许可证数目的增长今天已经成为自由软件社区的重要问题,æ—
 è®ºæ˜¯å¯¹ç”¨æˆ·ï¼Œè¿˜æ˜¯å¯¹å¼€å‘者。我们会尽最大努力按你
所需找到一个现有的自由软件许可证。</p>
@@ -191,7 +190,6 @@
 <dl class="blue"><dt></dt><dd></dd></dl>
 </div>
 
-<div class="short-lines">
 <div class="big-section">
 <h3 id="SoftwareLicenses">
      软件许可证</h3>
@@ -281,8 +279,9 @@
 
 
 <dt><a id="apache2"
-href="http://directory.fsf.org/wiki/License:Apache2.0";>Apache 
许可证,版本 2.0</a>
-<span class="anchor-reference-id">(<a href="#apache2">#apache2</a>)</span>
+href="https://directory.fsf.org/wiki/License:Apache2.0";>Apache 
许可证,版本
+2.0</a> <span class="anchor-reference-id">(<a
+href="#apache2">#apache2</a>)</span>
     </dt>
 <dd>
 <p>这是一个自由软件许可证,它兼容 GNU GPL v3。</p>
@@ -291,8 +290,8 @@
 中。这包括某些专利中止和侵害保护条款。å…
¶ä¸­çš„专利中止条款是不错的,因
此我们推荐大型的软件可以使用 Apache 2.0 许可证而不是å…
¶ä»–松散型许可证。</p></dd>
 
 <dt><a id="ArtisticLicense2"
-href="http://directory.fsf.org/wiki/License:ArtisticLicense2.0";>Artistic 
许可证
-2.0</a> <span class="anchor-reference-id"> (<a
+href="https://directory.fsf.org/wiki/License:ArtisticLicense2.0";>Artistic
+许可证 2.0</a> <span class="anchor-reference-id"> (<a
 href="#ArtisticLicense2">#ArtisticLicense2</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,感谢其第 4 
节(c)(ii)中的再次授权选项,它兼容 GPL。</p></dd>
@@ -308,14 +307,14 @@
 
 <dt><!-- misspelled id, leave for compatibility -->
 <a id="BerkleyDB"></a> <a id="BerkeleyDB"
-href="http://directory.fsf.org/wiki/License:Sleepycat";>Berkeley
+href="https://directory.fsf.org/wiki/License:Sleepycat";>Berkeley
 数据库许可证</a>(又称为 Sleepycat 软件产品许可证)<span 
class="anchor-reference-id"> (<a
 href="#BerkeleyDB">#BerkeleyDB</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,它兼容 GNU GPL。</p></dd>
 
 
-<dt><a id="boost" href="http://directory.fsf.org/wiki/License:Boost1.0";>Boost
+<dt><a id="boost" href="https://directory.fsf.org/wiki/License:Boost1.0";>Boost
 软件许可证</a> <span class="anchor-reference-id">(<a
 href="#boost">#boost</a>)</span></dt>
 <dd>
@@ -323,7 +322,7 @@
 
 
 <dt><a id="ModifiedBSD"
-href="http://directory.fsf.org/wiki/License:BSD_3Clause";>修改版 BSD 
许可证</a>
+href="https://directory.fsf.org/wiki/License:BSD_3Clause";>修改版 BSD 
许可证</a>
 <span class="anchor-reference-id"> (<a
 href="#ModifiedBSD">#ModifiedBSD</a>)</span></dt>
 <dd>
@@ -356,8 +355,9 @@
 节承诺了程序开发者和用户之间的某些合作。你
可以把它看成是给开发者带来的问题;但是,如果你
确定自己将和用户进行相应的合作,那么这就不是问题。</p></dd>
 
 
-<dt><a id="clearbsd" 
href="http://directory.fsf.org/wiki/License:ClearBSD";>Clear
-BSD 许可证</a> <span class="anchor-reference-id"> (<a
+<dt><a id="clearbsd"
+href="https://directory.fsf.org/wiki/License:ClearBSD";>Clear BSD 许可证</a>
+<span class="anchor-reference-id"> (<a
 href="#clearbsd">#clearbsd</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,它兼容 GPLv2 和 GPLv3。它根据 
<a href="#ModifiedBSD">修改版 BSD 许可证</a>
@@ -365,7 +365,7 @@
 
 
 <dt><a id="CryptixGeneralLicense"
-href="http://directory.fsf.org/wiki/License:CryptixGL";>Cryptix 
通用许可证</a>
+href="https://directory.fsf.org/wiki/License:CryptixGL";>Cryptix 
通用许可证</a>
 <span class="anchor-reference-id"> (<a
 href="#CryptixGeneralLicense">#CryptixGeneralLicense</a>)</span></dt>
 <dd>
@@ -376,14 +376,14 @@
 
 <dt><!-- without decimal, leave for compatibility -->
 <a id="eCos20"></a> <a id="eCos2.0"
-href="http://directory.fsf.org/wiki/License:ECos2.0";>eCos 许可证 2.0 版</a>
+href="https://directory.fsf.org/wiki/License:ECos2.0";>eCos 许可证 2.0 
版</a>
 <span class="anchor-reference-id"> (<a href="#eCos20">#eCos2.0</a>)</span></dt>
 <dd>
 <p>eCos 许可证 2.0 版是一个兼容 GPL 的自由软件许可证。它由 
GPL 加上允许连接非 GPL 
软件的例外条款构成。此许可证有着和 LGPL
 一样的 <a href="/philosophy/why-not-lgpl.html">不足</a>。</p></dd>
 
 
-<dt><a id="ECL2.0" 
href="http://directory.fsf.org/wiki/License:ECL2.0";>教育社区许可证
+<dt><a id="ECL2.0" 
href="https://directory.fsf.org/wiki/License:ECL2.0";>教育社区许可证
 2.0 版</a> <span class="anchor-reference-id"> (<a
 href="#ECL2.0">#ECL2.0</a>)</span></dt>
 <dd>
@@ -392,7 +392,7 @@
 节的专利许可证和保护条款导致该许可证不兼容 
GPLv2。</p></dd>
 
 
-<dt><a id="Eiffel" href="http://directory.fsf.org/wiki/License:EFLv2";>Eiffel
+<dt><a id="Eiffel" href="https://directory.fsf.org/wiki/License:EFLv2";>Eiffel
 论坛许可证,版本 2</a> <span class="anchor-reference-id"> (<a
 href="#Eiffel">#Eiffel</a>)</span></dt>
 <dd>
@@ -401,14 +401,14 @@
 
 
 <dt><a id="EUDataGrid"
-href="http://directory.fsf.org/wiki/License:EUDataGrid";>EU DataGrid
+href="https://directory.fsf.org/wiki/License:EUDataGrid";>EU DataGrid
 软件许可证</a> <span class="anchor-reference-id"> (<a
 href="#EUDataGrid">#EUDataGrid</a>)</span></dt>
 <dd>
 <p>这是一个松散的、纵容型、非 copyleft 
的自由软件许可证,它兼容 GNU GPL。</p></dd>
 
 
-<dt><a id="Expat" href="http://directory.fsf.org/wiki/License:Expat";>Expat
+<dt><a id="Expat" href="https://directory.fsf.org/wiki/License:Expat";>Expat
 许可证</a> <span class="anchor-reference-id">(<a
 href="#Expat">#Expat</a>)</span></dt>
 <dd>
@@ -424,7 +424,7 @@
 <p>由于 Apache 2.0 许可证避å…
äº†ä¸“利背叛,所以我们建议大型程序使用 Apache 2.0 
许可证。</p></dd>
 
 <dt><a id="FreeBSD"
-href="http://directory.fsf.org/wiki?title=License:FreeBSD";>FreeBSD 
许可证</a>
+href="https://directory.fsf.org/wiki?title=License:FreeBSD";>FreeBSD 
许可证</a>
 <span class="anchor-reference-id"> (<a 
href="#FreeBSD">#FreeBSD</a>)</span></dt>
 <dd>
 <p>这是把原始 BSD 许可证的广告条款和另一项条款删
除之后的版本。(它有时也被称为 &ldquo;2-clause BSD
@@ -434,35 +434,35 @@
 
 
 <dt><a id="freetype"
-href="http://directory.fsf.org/wiki/License:FreeType";>Freetype 
项目许可证</a>
+href="https://directory.fsf.org/wiki/License:FreeType";>Freetype 
项目许可证</a>
 <span class="anchor-reference-id"> (<a
 href="#freetype">#freetype</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,它兼容 
GPLv3。它的一些归属要求使之不兼容 GPLv2。</p></dd>
 
 <dt><a id="HPND"
-href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>历史授权å
…¬å‘Šå’Œå…è´£å£°æ˜Ž</a>
+href="https://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>历史授权å
…¬å‘Šå’Œå…è´£å£°æ˜Ž</a>
 <span class="anchor-reference-id"> (<a href="#HPND">#HPND</a>)</span></dt>
 <dd>
 
<p>这是一个松散的、纵容型而且软弱的自由软件许可证,它å…
¼å®¹ GPL。它和 <a href="#Python1.6a2">Python 1.6a2
 许可证及其更早版本</a> 类似。</p></dd>
 
     
-<dt><a id="iMatix" 
href="http://directory.fsf.org/wiki?title=License:SFL";>iMatix
-标准函数库许可证</a> <span class="anchor-reference-id"> (<a
-href="#iMatix">#iMatix</a>)</span></dt>
+<dt><a id="iMatix"
+href="https://directory.fsf.org/wiki?title=License:SFL";>iMatix æ 
‡å‡†å‡½æ•°åº“许可证</a>
+<span class="anchor-reference-id"> (<a href="#iMatix">#iMatix</a>)</span></dt>
 <dd>
 <p>这是一个兼容 GPL 的自由软件许可证。</p></dd>
 
 
-<dt><a id="imlib" href="http://directory.fsf.org/wiki/License:Imlib2";>imlib2
+<dt><a id="imlib" href="https://directory.fsf.org/wiki/License:Imlib2";>imlib2
 的许可证</a> <span class="anchor-reference-id">(<a
 href="#imlib">#imlib</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,兼容 GPL。其作者向我们解释 
GPL 提供源代码的选项在这个许可证里就是 &ldquo;源代码å…
¬å¼€å¯å¾—&rdquo;。</p></dd>
 
 
-<dt><a id="ijg" href="http://directory.fsf.org/wiki?title=License:JPEG";>独立 
JPEG
+<dt><a id="ijg" 
href="https://directory.fsf.org/wiki?title=License:JPEG";>独立 JPEG
 群组许可证</a> <span class="anchor-reference-id">(<a 
href="#ijg">#ijg</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,兼容 GNU GPL。其作者
让我们确信 GPL 要求的开发者
需注明修改也和他们的许可证一致。</p></dd>
@@ -483,14 +483,14 @@
 href="/licenses/license-recommendations.html">建议</a> 供你
参考。</p></dd>
 
 
-<dt><a id="intel" href="http://directory.fsf.org/wiki/License:IntelACPI";>Intel
+<dt><a id="intel" href="https://directory.fsf.org/wiki/License:IntelACPI";>Intel
 开源许可证</a> <span class="anchor-reference-id">(<a
 href="#intel">#intel</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,它兼容 GNU GPL。</p></dd>
 
 
-<dt><a id="ISC" href="http://directory.fsf.org/wiki/License:ISC";>ISC 
许可证</a>
+<dt><a id="ISC" href="https://directory.fsf.org/wiki/License:ISC";>ISC 
许可证</a>
 <span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
 <dd>
 <p>该许可证有时也被称为 OpenBSD 
许可证。它是一个自由软件许可证,兼容 GNU GPL。</p>
@@ -505,8 +505,9 @@
 href="#FreeBSD">FreeBSD 许可证</a> 也是一æ 
·çºµå®¹è€Œç®€æ´ã€‚但是,如果你
要的是松散、弱势的许可证,我们推荐 Apache 2.0
 许可证。</p></dd>
 
-<dt><a id="MPL-2.0" 
href="http://directory.fsf.org/wiki/License:MPLv2.0";>Mozilla
-公共许可证(MPL)版本 2.0</a> <span class="anchor-reference-id">(<a
+<dt><a id="MPL-2.0"
+href="https://directory.fsf.org/wiki/License:MPLv2.0";>Mozilla 公å…
±è®¸å¯è¯ï¼ˆMPL)版本
+2.0</a> <span class="anchor-reference-id">(<a
 href="#MPL-2.0">#MPL-2.0</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证。它在第 3.3 节提供了间接兼容 
GNU GPL v2.0、GNU LGPL v 2.1、GNU AGPL v 3
@@ -530,7 +531,7 @@
 </dd>
 
 <dt><a id="NCSA"
-href="http://directory.fsf.org/wiki/License:IllinoisNCSA";>NCSA/伊利诺伊斯大学开源许可证</a>
+href="https://directory.fsf.org/wiki/License:IllinoisNCSA";>NCSA/伊利诺伊斯大学开源许可证</a>
 <span class="anchor-reference-id">(<a href="#NCSA">#NCSA</a>)</span></dt>
 <dd>
 <p>该许可证基于 <a href="#Expat">Expat</a> and <a 
href="#ModifiedBSD">修改版 BSD</a>
@@ -547,7 +548,7 @@
 
 
 <dt><a id="newOpenLDAP"
-href="http://directory.fsf.org/wiki/License:OpenLDAPv2.7";>OpenLDAP 
许可证,版本
+href="https://directory.fsf.org/wiki/License:OpenLDAPv2.7";>OpenLDAP 
许可证,版本
 2.7</a> <span class="anchor-reference-id"> (<a
 href="#newOpenLDAP">#newOpenLDAP</a>)</span></dt>
 <dd>
@@ -567,7 +568,7 @@
 
 
 <dt><a id="PublicDomain"
-href="http://directory.fsf.org/wiki/License:PublicDomain";>公有领域</a> 
<span
+href="https://directory.fsf.org/wiki/License:PublicDomain";>公有领域</a> 
<span
 class="anchor-reference-id"> (<a
 href="#PublicDomain">#PublicDomain</a>)</span></dt>
 <dd>
@@ -579,7 +580,7 @@
 是一个人人可用的好工具。它正式确认你的作品属于å…
¬æœ‰é¢†åŸŸï¼Œå¹¶ä¸ºæ³•å¾‹ä¸å…è®¸çš„情
况提供一份保底的许可证。</p></dd>
 
 <dt><a id="Python"
-href="http://directory.fsf.org/wiki?title=License:Python2.0.1";>Python
+href="https://directory.fsf.org/wiki?title=License:Python2.0.1";>Python
 2.0.1、2.1.1 及更高版本的许可证</a> <span 
class="anchor-reference-id"> (<a
 href="#Python">#Python</a>)</span></dt>
 <dd>
@@ -588,21 +589,23 @@
 
 
 <dt><a id="Python1.6a2"
-href="http://directory.fsf.org/wiki?title=License:Python1.6a2";>Python 1.6a2
+href="https://directory.fsf.org/wiki?title=License:Python1.6a2";>Python 1.6a2
 以及更早版本的许可证</a> <span class="anchor-reference-id"> (<a
 href="#Python1.6a2">#Python1.6a2</a>)</span></dt>
 <dd>
 <p>这是一个兼容 GNU GPL 
的自由软件许可证。不过,请注意,Python 
的更高版本使用另外的许可证(请参看上节及下节)。</p></dd>
 
 
-<dt><a id="Ruby" href="http://directory.fsf.org/wiki/License:Ruby";>Ruby 
的许可证</a>
-<span class="anchor-reference-id">(<a href="#Ruby">#Ruby</a>)</span></dt>
+<dt><a id="Ruby" href="https://directory.fsf.org/wiki/License:Ruby";>Ruby
+的许可证</a> <span class="anchor-reference-id">(<a
+href="#Ruby">#Ruby</a>)</span></dt>
 <dd>
 
<p>这是一个自由软件许可证,它通过一个明确的双重许可证条款å
…¼å®¹ GPL。</p></dd>
 
 
-<dt><a id="SGIFreeB" 
href="http://directory.fsf.org/wiki/License:SGIFreeBv2";>SGI
-自由软件许可证 B,版本 2.0</a> <span class="anchor-reference-id"> (<a
+<dt><a id="SGIFreeB"
+href="https://directory.fsf.org/wiki/License:SGIFreeBv2";>SGI 
自由软件许可证 B,版本
+2.0</a> <span class="anchor-reference-id"> (<a
 href="#SGIFreeB">#SGIFreeB</a>)</span></dt>
 <dd>
 <p>SGI 自由软件许可证 B 版本 2.0 
是一个自由软件许可证。它基本上等同于 <a href="#X11License">X11
@@ -614,7 +617,7 @@
 
 
 <dt><a id="StandardMLofNJ"
-href="http://directory.fsf.org/wiki/License:StandardMLofNJ";>新泽西版权许可证的æ
 ‡å‡†
+href="https://directory.fsf.org/wiki/License:StandardMLofNJ";>新泽西版权许可证的æ
 ‡å‡†
 ML</a> <span class="anchor-reference-id"> (<a
 href="#StandardMLofNJ">#StandardMLofNJ</a>)</span></dt>
 <dd>
@@ -622,7 +625,7 @@
 
 
 <dt><a id="Unicode"
-href="http://directory.fsf.org/wiki/License:Unicode";>Unicode,
+href="https://directory.fsf.org/wiki/License:Unicode";>Unicode,
 Inc. 的数据文件和软件许可证协议</a> <span 
class="anchor-reference-id"> (<a
 href="#Unicode">#Unicode</a>)</span></dt>
 <dd>
@@ -639,7 +642,7 @@
 
 
 <dt><a id="UPL"
-href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>通用纵容许可证(UPL)</a>
+href="https://directory.fsf.org/wiki/License:Universal_Permissive_License";>通用纵容许可证(UPL)</a>
 <span class="anchor-reference-id"> (<a href="#UPL">#UPL</a>)</span></dt>
 <dd>
 <p>这是一个松散的、纵容型非 copyleft 
的自由软件许可证,它兼容 GNU
@@ -647,7 +650,7 @@
 </p></dd>    
 
 <dt><a id="Unlicense"
-href="http://directory.fsf.org/wiki/License:TheUnlicense";>Unlicense</a>
+href="https://directory.fsf.org/wiki/License:TheUnlicense";>Unlicense</a>
 <span class="anchor-reference-id"> (<a
 href="#Unlicense">#Unlicense</a>)</span></dt>
 <dd>
@@ -658,22 +661,23 @@
 <p>如果你想把自己的作品奉献给公有领域,那么我们建议你
使用 <a href="#CC0">CC0</a>。CC0
 也是对公有领域的献礼,也带有一个保底许可证,不过它比 
Unlicense 更全面和更成熟。</p></dd>
 
-<dt><a id="Vim" href="http://directory.fsf.org/wiki/License:Vim7.2";>Vim 
许可证,版本
+<dt><a id="Vim" href="https://directory.fsf.org/wiki/License:Vim7.2";>Vim 
许可证,版本
 6.1 及以后版</a> <span class="anchor-reference-id">(<a
 href="#Vim">#Vim</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,不是真正意义的 copyleft 
许可证。它使用一个明确的转换条款兼容 GPL。</p></dd>
 
 
-<dt><a id="W3C" href="http://directory.fsf.org/wiki/License:W3C_31Dec2002";>W3C
+<dt><a id="W3C" href="https://directory.fsf.org/wiki/License:W3C_31Dec2002";>W3C
 软件声明和许可证</a> <span class="anchor-reference-id">(<a
 href="#W3C">#W3C</a>)</span></dt>
 <dd>
 <p>这是一个兼容 GPL 的自由软件许可证。</p></dd>
 
 
-<dt><a id="WebM" href="http://directory.fsf.org/wiki/License:WebM";>WebM 
的许可证</a>
-<span class="anchor-reference-id">(<a href="#WebM">#WebM</a>)</span></dt>
+<dt><a id="WebM" href="https://directory.fsf.org/wiki/License:WebM";>WebM
+的许可证</a> <span class="anchor-reference-id">(<a
+href="#WebM">#WebM</a>)</span></dt>
 <dd>
 <p>Google 的 WebM 实现使用 <a href="#ModifiedBSD">修改版 BSD 
许可证</a>。Google
 也为å…
¶æ‹¥æœ‰æˆ–控制的专利提供了单独的专利许可证(令人困惑地称之为
 &ldquo;附加 IP 授权&rdquo;),这些专利涉及其 WebM 的实现。GPL
@@ -705,7 +709,7 @@
 <p><a href="#Wx">WxWidgets 库许可证的</a> 老名字。</p>
 </dd>
 
-<dt><a id="X11License" href="http://directory.fsf.org/wiki/License:X11";>X11
+<dt><a id="X11License" href="https://directory.fsf.org/wiki/License:X11";>X11
 许可证</a> <span class="anchor-reference-id"> (<a
 href="#X11License">#X11License</a>)</span></dt>
 <dd>
@@ -725,8 +729,8 @@
 
 
 <dt><a id="XFree861.1License"
-href="http://directory.fsf.org/wiki/License:XFree86_1.1";>XFree86 1.1 
许可证</a>
-<span class="anchor-reference-id"> (<a
+href="https://directory.fsf.org/wiki/License:XFree86_1.1";>XFree86 1.1
+许可证</a> <span class="anchor-reference-id"> (<a
 href="#XFree861.1License">#XFree861.1License</a>)</span></dt>
 <dd>
 <p>这是一个松散的、纵容型非 copyleft 
的自由软件许可证,它兼容 GPL v3。</p>
@@ -736,15 +740,16 @@
 <p>目前有好几个 XFree86 的变种,只有å…
¶ä¸­ä¸€éƒ¨åˆ†ä½¿ç”¨è¯¥è®¸å¯è¯ã€‚还有些继续使用 <a 
href="#X11License">X11 许可证</a>。</p></dd>
 
 
-<dt><a id="ZLib" href="http://directory.fsf.org/wiki/License:Zlib";>ZLib 
的许可证</a>
-<span class="anchor-reference-id">(<a href="#ZLib">#ZLib</a>)</span></dt>
+<dt><a id="ZLib" href="https://directory.fsf.org/wiki/License:Zlib";>ZLib
+的许可证</a> <span class="anchor-reference-id">(<a
+href="#ZLib">#ZLib</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,它兼容 GPL。</p></dd>
 
 
 <dt><!-- without decimal, leave for compatibility -->
 <a id="Zope20"></a> <a id="Zope2.0"
-href="http://directory.fsf.org/wiki?title=License:ZopePLv2.1";>Zope 公å…
±è®¸å¯è¯ï¼Œç‰ˆæœ¬
+href="https://directory.fsf.org/wiki?title=License:ZopePLv2.1";>Zope 公å…
±è®¸å¯è¯ï¼Œç‰ˆæœ¬
 2.0 和 2.1</a> <span class="anchor-reference-id"> (<a
 href="#Zope2.0">#Zope2.0</a>)</span></dt>
 <dd>
@@ -768,7 +773,7 @@
 
 <dl class="orange">
 
-<dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1";>Affero
+<dt><a id="AGPLv1.0" 
href="https://directory.fsf.org/wiki/License:AGPLv1";>Affero
 通用公共许可证版本 1</a> <span class="anchor-reference-id"> (<a
 href="#AGPLv1.0">#AGPLv1.0</a>)</span></dt>
 <dd>
@@ -779,7 +784,7 @@
 
 <!-- Published primarily by www.opensource.org -->
 <dt><a id="AcademicFreeLicense"
-href="http://directory.fsf.org/wiki/License:AFLv3";>Academic 
自由许可证,一直到 3.0
+href="https://directory.fsf.org/wiki/License:AFLv3";>Academic 
自由许可证,一直到 3.0
 的所有版本</a> <span class="anchor-reference-id"> (<a
 href="#AcademicFreeLicense">#AcademicFreeLicense</a>)</span></dt>
 <dd>
@@ -788,22 +793,23 @@
 
 
 <dt><a id="apache1.1"
-href="http://directory.fsf.org/wiki/License:Apache1.1";>Apache 
许可证,版本 1.1</a>
-<span class="anchor-reference-id"> (<a
+href="https://directory.fsf.org/wiki/License:Apache1.1";>Apache 
许可证,版本
+1.1</a> <span class="anchor-reference-id"> (<a
 href="#apache1.1">#apache1.1</a>)</span></dt>
 <dd>
 <p>这是一个纵容型非 copyleft 
的自由软件许可证。它带有一些条款使之不兼容 GNU 
GPL,比如它强烈禁止使用和 Apache 相关的名称。</p></dd>
 
 
 <dt><a id="apache1"
-href="http://directory.fsf.org/wiki/License:Apache1.0";>Apache 
许可证,版本 1.0</a>
-<span class="anchor-reference-id"> (<a 
href="#apache1">#apache1</a>)</span></dt>
+href="https://directory.fsf.org/wiki/License:Apache1.0";>Apache 
许可证,版本
+1.0</a> <span class="anchor-reference-id"> (<a
+href="#apache1">#apache1</a>)</span></dt>
 <dd>
 <p>这是一个松散的、纵容型非 copyleft 
的自由软件许可证,带有一个广告条款。该条款造
成了和原始 BSD 类似的 <a
 href="/licenses/bsd.html">实际问题</a>,这也造成它不兼容 GNU 
GPL。</p></dd>
 
 
-<dt><a id="apsl2" href="http://directory.fsf.org/wiki/License:APSLv2.0";>Apple
+<dt><a id="apsl2" href="https://directory.fsf.org/wiki/License:APSLv2.0";>Apple
 公共源代码许可证(APSL),版本 2</a> <span 
class="anchor-reference-id">(<a
 href="#apsl2">#apsl2</a>)</span></dt>
 <dd>
@@ -812,7 +818,7 @@
 
 
 <dt><a id="bittorrent"
-href="http://directory.fsf.org/wiki/License:BitTorrentOSL1.1";>BitTorrent
+href="https://directory.fsf.org/wiki/License:BitTorrentOSL1.1";>BitTorrent
 开放源代码许可证</a> <span class="anchor-reference-id"> (<a
 href="#bittorrent">#bittorrent</a>)</span></dt>
 
@@ -820,7 +826,7 @@
 
 
 <dt><a id="OriginalBSD"
-href="http://directory.fsf.org/wiki/License:BSD_4Clause";>原始 BSD 
许可证</a>
+href="https://directory.fsf.org/wiki/License:BSD_4Clause";>原始 BSD 
许可证</a>
 <span class="anchor-reference-id"> (<a
 href="#OriginalBSD">#OriginalBSD</a>)</span></dt>
 <dd>
@@ -859,7 +865,7 @@
 <p>请不要使用该许可证发布软件。</p></dd>
 
 <dt><a id="CDDL"
-href="http://directory.fsf.org/wiki/License:CDDLv1.0";>å…
±åŒå¼€å‘和发布许可证(CDDL),版本
+href="https://directory.fsf.org/wiki/License:CDDLv1.0";>å…
±åŒå¼€å‘和发布许可证(CDDL),版本
 1.0</a> <span class="anchor-reference-id"> (<a
 href="#CDDL">#CDDL</a>)</span></dt>
 <dd>
@@ -885,15 +891,15 @@
 
 
 <dt><a id="CommonPublicLicense10"
-href="http://directory.fsf.org/wiki/License:CPLv1.0";>普通公å…
±è®¸å¯è¯ç‰ˆæœ¬ 1.0</a> <span
-class="anchor-reference-id"> (<a
+href="https://directory.fsf.org/wiki/License:CPLv1.0";>普通公å…
±è®¸å¯è¯ç‰ˆæœ¬ 1.0</a>
+<span class="anchor-reference-id"> (<a
 href="#CommonPublicLicense10">#CommonPublicLicense10</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证。不幸的是,它的弱 copyleft 
属性和选择使用法律条款使之不兼容 GNU GPL。</p></dd>
 
 
 <dt><a id="Condor"
-href="http://directory.fsf.org/wiki?title=License:Condor1.1";>Condor
+href="https://directory.fsf.org/wiki?title=License:Condor1.1";>Condor
 公共许可证</a> <span class="anchor-reference-id"> (<a
 href="#Condor">#Condor</a>)</span></dt>
 <dd>
@@ -903,7 +909,7 @@
 <p>Condor 公共许可证是一个自由软件许可证。它有几
个要求使之不兼容 GNU GPL,其中包括严格限制使用 Condor 相å…
³çš„名称,并要求再发布者
 &ldquo;正式声明并承诺&rdquo; 
遵守美国出口法律。(如果真的这æ 
·è¦æ±‚的话,它就不是一个自由软件许可证。)</p></dd>
 
-<dt><a id="EPL" href="http://directory.fsf.org/wiki/License:EPLv1.0";>Eclipse
+<dt><a id="EPL" href="https://directory.fsf.org/wiki/License:EPLv1.0";>Eclipse
 公共许可证版本 1.0</a> <span class="anchor-reference-id">(<a
 href="#EPL">#EPL</a>)</span></dt>
 <dd>
@@ -922,7 +928,7 @@
 
 <dt><!-- old id, leave for compatibility -->
 <a id="EUPL"></a> <a id="EUPL-1.1"
-href="http://directory.fsf.org/wiki/License:EUPLv1.1";>欧盟公å…
±è®¸å¯è¯ï¼ˆEUPL)版本
+href="https://directory.fsf.org/wiki/License:EUPLv1.1";>欧盟公å…
±è®¸å¯è¯ï¼ˆEUPL)版本
 1.1</a> <span class="anchor-reference-id">(<a
 href="#EUPL-1.1">#EUPL-1.1</a>)</span></dt>
 <dd>
@@ -939,7 +945,7 @@
 GPLv3+ 的基础。</p></dd>
 
 <dt><a id="EUPL-1.2"
-href="http://directory.fsf.org/wiki/License:EUPLv1.2";>欧盟公å…
±è®¸å¯è¯ï¼ˆEUPL)版本
+href="https://directory.fsf.org/wiki/License:EUPLv1.2";>欧盟公å…
±è®¸å¯è¯ï¼ˆEUPL)版本
 1.2</a> <span class="anchor-reference-id">(<a
 href="#EUPL-1.2">#EUPL-1.2</a>)</span></dt>
 <dd>
@@ -954,7 +960,7 @@
 的准备。然后,然后你再找到或撰写按照 GPLv3+ 
许可证授权的代码,并添加到程序中。这样,最后使用 CeCILL 
许可证的程序就有了再授权到
 GPLv3+ 的基础。</p></dd>
 
-<dt><a id="fdk" href="http://directory.fsf.org/wiki/License:fdk";>Fraunhofer FDK
+<dt><a id="fdk" href="https://directory.fsf.org/wiki/License:fdk";>Fraunhofer 
FDK
 AAC 许可证</a> <span class="anchor-reference-id">(<a
 href="#fdk">#fdk</a>)</span></dt>
 <dd><p>这是一个自由软件许可证。它不兼容任何版本的 GNU 
GPL。</p>
@@ -966,12 +972,12 @@
 href="/philosophy/limit-patent-effect.html">对软件是安å…
¨çš„专利法</a>。)</p>
 </dd>
 
-<dt><a id="gnuplot" 
href="http://directory.fsf.org/wiki/License:Gnuplot";>Gnuplot
-许可证</a> <span class="anchor-reference-id">(<a
-href="#gnuplot">#gnuplot</a>)</span></dt>
+<dt><a id="gnuplot"
+href="https://directory.fsf.org/wiki/License:Gnuplot";>Gnuplot 许可证</a> 
<span
+class="anchor-reference-id">(<a href="#gnuplot">#gnuplot</a>)</span></dt>
 <dd><p>这是一个自由软件许可证,它不兼容 GNU GPL。</p></dd>
 
-<dt><a id="IBMPL" href="http://directory.fsf.org/wiki/License:IBMPLv1.0";>IBM
+<dt><a id="IBMPL" href="https://directory.fsf.org/wiki/License:IBMPLv1.0";>IBM
 公共许可证,版本 1.0</a> <span class="anchor-reference-id">(<a
 href="#IBMPL">#IBMPL</a>)</span></dt>
 <dd>
@@ -979,7 +985,7 @@
 
 
 <dt><a id="josl"
-href="http://directory.fsf.org/wiki/License:JabberOSLv1.0";>Jabber 
开源许可证,版本
+href="https://directory.fsf.org/wiki/License:JabberOSLv1.0";>Jabber 
开源许可证,版本
 1.0</a> <span class="anchor-reference-id"> (<a
 href="#josl">#josl</a>)</span></dt>
 <dd>
@@ -988,7 +994,7 @@
 
 
 <dt><a id="LPPL-1.3a"
-href="http://directory.fsf.org/wiki/License:LPPLv1.3a";>LaTeX 项目公å…
±è®¸å¯è¯
+href="https://directory.fsf.org/wiki/License:LPPLv1.3a";>LaTeX 项目公å…
±è®¸å¯è¯
 1.3a</a> <span class="anchor-reference-id"> (<a
 href="#LPPL-1.3a">#LPPL-1.3a</a>)</span></dt>
 <dd>
@@ -996,8 +1002,9 @@
 LPPL&nbsp;1.2(按照描述语言)严格。由于修改版必须包
含原始版或者包含原始版的出处,所以它不兼容 GPL。</p></dd>
 
 
-<dt><a id="LPPL-1.2" 
href="http://directory.fsf.org/wiki/License:LPPLv1.2";>LaTeX
-项目公共许可证 1.2</a> <span class="anchor-reference-id"> (<a
+<dt><a id="LPPL-1.2"
+href="https://directory.fsf.org/wiki/License:LPPLv1.2";>LaTeX 项目公å…
±è®¸å¯è¯ 1.2</a>
+<span class="anchor-reference-id"> (<a
 href="#LPPL-1.2">#LPPL-1.2</a>)</span></dt>
 <dd>
 <p>这是 LaTeX 发布条款的不完å…
¨è¡¨è¿°ã€‚它是一个自由软件许可证,由于它带有多个 GPL 
没有的要求,所以它不兼容 <a
@@ -1022,7 +1029,7 @@
 
 
 <dt><a id="lucent102"
-href="http://directory.fsf.org/wiki/License:LucentPLv1.02";>Lucent 公å…
±è®¸å¯è¯
+href="https://directory.fsf.org/wiki/License:LucentPLv1.02";>Lucent 公å…
±è®¸å¯è¯
 1.02(Plan 9 许可证)</a> <span class="anchor-reference-id"> (<a
 href="#lucent102">#lucent102</a>)</span></dt>
 <dd>
@@ -1031,21 +1038,21 @@
 
 
 <dt><a id="ms-pl"
-href="http://directory.fsf.org/wiki/License:MsPL";>微软公å…
±è®¸å¯è¯ï¼ˆMs-PL)</a> <span
+href="https://directory.fsf.org/wiki/License:MsPL";>微软公å…
±è®¸å¯è¯ï¼ˆMs-PL)</a> <span
 class="anchor-reference-id">(<a href="#ms-pl">#ms-pl</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证;它不是强 copyleft,也不兼容 
GNU GPL。因此,我们强烈建议你不要使用 Ms-PL 许可证。</p></dd>
 
 
 <dt><a id="ms-rl"
-href="http://directory.fsf.org/wiki/License:MsRL";>微软互惠
许可证(Ms-RL)</a> <span
+href="https://directory.fsf.org/wiki/License:MsRL";>微软互惠
许可证(Ms-RL)</a> <span
 class="anchor-reference-id">(<a href="#ms-rl">#ms-rl</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证。它以 <a href="#ms-pl">微软公å…
±è®¸å¯è¯</a> 为基础,添加了一些略微增强 copyleft 
的条款。它也不兼容
 GNU GPL,因此我们强烈建议你不要使用 Ms-RL 许可证。</p></dd>
 
 
-<dt><a id="MPL" href="http://directory.fsf.org/wiki/License:MPLv1.1";>Mozilla
+<dt><a id="MPL" href="https://directory.fsf.org/wiki/License:MPLv1.1";>Mozilla
 公共许可证(MPL)版本 1.1</a> <span class="anchor-reference-id">(<a
 href="#MPL">#MPL</a>)</span></dt>
 <dd>
@@ -1059,7 +1066,7 @@
 <p>MPL 版本 2.0 有一些改进,包括默认兼容 GPL。<a 
href="#MPL-2.0">请参看该条目</a> 了解详情。</p></dd>
 
 
-<dt><a id="NOSL" href="http://directory.fsf.org/wiki/License:NOSLv1.0";>Netizen
+<dt><a id="NOSL" href="https://directory.fsf.org/wiki/License:NOSLv1.0";>Netizen
 开源许可证(NOSL),版本 1.0</a> <span 
class="anchor-reference-id">(<a
 href="#NOSL">#NOSL</a>)</span></dt>
 <dd>
@@ -1068,7 +1075,7 @@
 
 
 <dt><a id="NPL"
-href="http://directory.fsf.org/wiki?title=License:NPLv1.1";>Netscape
+href="https://directory.fsf.org/wiki?title=License:NPLv1.1";>Netscape
 公共许可证(NPL)</a>,版本 1.0 和 1.1<span 
class="anchor-reference-id">(<a
 href="#NPL">#NPL</a>)</span></dt>
 <dd>
@@ -1077,7 +1084,7 @@
 <em>他们的</em> 代码。<a 
href="/philosophy/netscape-npl">我们强烈建议你不要使用 NPL。</a> 
</p></dd>
 
 
-<dt><a id="Nokia" href="http://directory.fsf.org/wiki/License:NokOSv1.0a";>Nokia
+<dt><a id="Nokia" 
href="https://directory.fsf.org/wiki/License:NokOSv1.0a";>Nokia
 开源许可证</a> <span class="anchor-reference-id">(<a
 href="#Nokia">#Nokia</a>)</span></dt>
 <dd>
@@ -1085,8 +1092,8 @@
 
 
 <dt><a id="oldOpenLDAP"
-href="http://directory.fsf.org/wiki/License:OpenLDAPv2.3";>旧版 OpenLDAP 
许可证,版本
-2.3</a> <span class="anchor-reference-id"> (<a
+href="https://directory.fsf.org/wiki/License:OpenLDAPv2.3";>旧版 OpenLDAP
+许可证,版本 2.3</a> <span class="anchor-reference-id"> (<a
 href="#oldOpenLDAP">#oldOpenLDAP</a>)</span></dt>
 <dd>
 <p>这是一个纵容型、非 copyleft 
的自由软件许可证,它有一些要求(在第 4 和第 5 
节)使之不兼容 GNU GPL。请注意最新版的
@@ -1095,9 +1102,9 @@
 <p>我们强烈建议你不要为自己的软件使用老版的 OpenLDAP 
许可证。不过,运行已经使用该许可证的程序没什么问题。</p></dd>
 
 <!-- Published primarily by www.opensource.org -->
-<dt><a id="OSL" 
href="http://directory.fsf.org/wiki/License:OSLv3.0";>开放软件许可证,一直到
-3.0 的所有版本</a> <span class="anchor-reference-id">(<a
-href="#OSL">#OSL</a>)</span></dt>
+<dt><a id="OSL"
+href="https://directory.fsf.org/wiki/License:OSLv3.0";>开放软件许可证,一直到
 3.0
+的所有版本</a> <span class="anchor-reference-id">(<a 
href="#OSL">#OSL</a>)</span></dt>
 <dd>
 <p>开放软件许可证是一个自由软件许可证。它从好几
个方面不兼容 GNU GPL。</p>
 
@@ -1108,9 +1115,9 @@
 <p>我们强烈建议你
不要在自己写的软件里使用开放软件许可证。不过,没有理由避å
…è¿è¡Œå·²ç»ä½¿ç”¨æ­¤è®¸å¯è¯å‘布的软件。</p></dd>
 
 
-<dt><a id="OpenSSL" 
href="http://directory.fsf.org/wiki/License:OpenSSL";>OpenSSL
-许可证</a> <span class="anchor-reference-id"> (<a
-href="#OpenSSL">#OpenSSL</a>)</span></dt>
+<dt><a id="OpenSSL"
+href="https://directory.fsf.org/wiki/License:OpenSSL";>OpenSSL 许可证</a> 
<span
+class="anchor-reference-id"> (<a href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
 <p>OpenSSL 许可证是两个许可证的联合,一个是 &ldquo;OpenSSL 
许可证&rdquo;,另一个是 SSLeay
 的许可证。你必
须遵守这两个许可证。这两个许可证联合的结果是该许可证是一个
 copyleft 的自由软件许可证,它不兼容 GNU
@@ -1119,14 +1126,15 @@
 
 <p>我们建议你在软件中使用 GNUTLS 代替 
OpenSSL。不过,没有理由不使用 OpenSSL 和已经使用 OpenSSL 
的应用。</p></dd>
 
-<dt><a id="Phorum" 
href="http://directory.fsf.org/wiki/License:Phorum2.0";>Phorum
-许可证,版本 2.0</a> <span class="anchor-reference-id"> (<a
+<dt><a id="Phorum"
+href="https://directory.fsf.org/wiki/License:Phorum2.0";>Phorum 
许可证,版本
+2.0</a> <span class="anchor-reference-id"> (<a
 href="#Phorum">#Phorum</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,但是不兼容 <a 
href="/licenses/gpl.html">GPL</a>。其第 5 节使之不兼容 GPL。</p></dd>
 
 
-<dt><a id="PHP-3.01" href="http://directory.fsf.org/wiki/License:PHPv3.01";>PHP
+<dt><a id="PHP-3.01" href="https://directory.fsf.org/wiki/License:PHPv3.01";>PHP
 许可证,版本 3.01</a> <span class="anchor-reference-id"> (<a
 href="#PHP-3.01">#PHP-3.01</a>)</span></dt>
 <dd>
@@ -1137,14 +1145,14 @@
 
 
 <dt><a id="PythonOld"
-href="http://directory.fsf.org/wiki/License:Python1.6b1";>Python 1.6b1 到 2.0
+href="https://directory.fsf.org/wiki/License:Python1.6b1";>Python 1.6b1 到 2.0
 和 2.1 的许可证</a> <span class="anchor-reference-id"> (<a
 href="#PythonOld">#PythonOld</a>)</span></dt>
 <dd>
 <p>这是一个自由软件许可证,它不兼容 GNU GPL。主要的不å…
¼å®¹æ€§åœ¨äºŽæ­¤ Python 许可证受美国弗吉尼亚州法律管辖,而 GPL 
不允许这样。</p></dd>
 
 
-<dt><a id="QPL" href="http://directory.fsf.org/wiki/License:QPLv1.0";>Q
+<dt><a id="QPL" href="https://directory.fsf.org/wiki/License:QPLv1.0";>Q
 公共许可证(QPL),版本 1.0</a> <span class="anchor-reference-id">(<a
 href="#QPL">#QPL</a>)</span></dt>
 <dd>
@@ -1167,7 +1175,7 @@
 
 
 <dt><a id="RPSL"
-href="http://directory.fsf.org/wiki/License:RPSLv1.0";>RealNetworks
+href="https://directory.fsf.org/wiki/License:RPSLv1.0";>RealNetworks
 公共源代码许可证(RPSL),版本 1.0</a> <span 
class="anchor-reference-id">(<a
 href="#RPSL">#RPSL</a>)</span></dt>
 <dd>
@@ -1181,14 +1189,14 @@
 <p>这是一个自由软件许可证,不是强 copyleft,它不兼容 GNU 
GPL,只是因为细节而不是因为主要政策。</p></dd>
 
 
-<dt><a id="SPL" href="http://directory.fsf.org/wiki/License:SPLv1.0";>Sun
+<dt><a id="SPL" href="https://directory.fsf.org/wiki/License:SPLv1.0";>Sun
 公共许可证</a> <span class="anchor-reference-id">(<a 
href="#SPL">#SPL</a>)</span></dt>
 <dd>
 <p>它基本和 Mozilla 公共许可证版本 1 一样:是一个不兼容 
GNU GPL 的自由软件许可证。请不要把它和 <a
 href="#SunCommunitySourceLicense">Sun 社区源代码许可证</a> 
混淆,后者不是自由软件许可证。</p></dd>
 
 
-<dt><a id="xinetd" href="http://directory.fsf.org/wiki/License:Xinetd";>xinetd
+<dt><a id="xinetd" href="https://directory.fsf.org/wiki/License:Xinetd";>xinetd
 的许可证</a> <span class="anchor-reference-id"> (<a
 href="#xinetd">#xinetd</a>)</span></dt>
 <dd>
@@ -1196,7 +1204,7 @@
 GPL。.</p></dd>
 
 
-<dt><a id="Yahoo" href="http://directory.fsf.org/wiki/License:YPLv1.1";>Yahoo!
+<dt><a id="Yahoo" href="https://directory.fsf.org/wiki/License:YPLv1.1";>Yahoo!
 公共许可证 1.1</a> <span class="anchor-reference-id">(<a
 href="#Yahoo">#Yahoo</a>)</span></dt>
 <dd>
@@ -1205,7 +1213,7 @@
 这个术语。</p></dd>
 
 
-<dt><a id="Zend" href="http://directory.fsf.org/wiki/License:ZELv2.0";>Zend
+<dt><a id="Zend" href="https://directory.fsf.org/wiki/License:ZELv2.0";>Zend
 许可证,版本 2.0</a> <span class="anchor-reference-id">(<a
 href="#Zend">#Zend</a>)</span></dt>
 <dd>
@@ -1305,7 +1313,7 @@
 
href="https://www.fsf.org/bulletin/2019/fall/building-ethical-software-based-on-the-four-freedoms";>太多的压力给用户</a>。请不要使用此许可证,而且我们要敦促ä½
 é¿å…ä½¿ç”¨æŒ‰ç…§æ­¤è®¸å¯è¯æŽˆæƒçš„软件。</p>
 </dd>
 
-<dt><a id="apsl1" href= "http://directory.fsf.org/wiki/License:APSLv1.x";>Apple
+<dt><a id="apsl1" href= "https://directory.fsf.org/wiki/License:APSLv1.x";>Apple
 公共源代码许可证(APSL),版本 1.x</a> <span 
class="anchor-reference-id">(<a
 href="#apsl1">#apsl1</a>)</span></dt>
 <dd>
@@ -1315,7 +1323,7 @@
 
 
 <dt><a id="ArtisticLicense"
-href="http://directory.fsf.org/wiki/License:Artistic_v1.0";>Artistic 许可证
+href="https://directory.fsf.org/wiki/License:Artistic_v1.0";>Artistic 许可证
 1.0</a> <span class="anchor-reference-id"> (<a
 href="#ArtisticLicense">#ArtisticLicense</a>)</span></dt>
 <dd>
@@ -1371,7 +1379,7 @@
 <p>这是一个非自由的许可证,因为其第 3 条有争议地包
含了不许违背 <em>任何</em>
 
被运行程序的许可证的要求&mdash;&mdash;即使是专有软件的许可证。</p></dd>
 
-<dt><a id="eCos11" href="http://directory.fsf.org/wiki/License:ECosPLv1.1";>eCos
+<dt><a id="eCos11" 
href="https://directory.fsf.org/wiki/License:ECosPLv1.1";>eCos
 公共许可证,波拿巴 1.1</a> <span class="anchor-reference-id"> (<a
 href="#eCos11">#eCos11</a>)</span></dt>
 <dd>
@@ -1390,8 +1398,8 @@
 First Do No Harm 许可证列出来的。</p></dd>
 
 <dt><a id="GPL-PA"
-href="http://directory.fsf.org/wiki/License:GPL-PA";>公å…
±ç®¡ç†è®¡ç®—机软件的 GPL</a> <span
-class="anchor-reference-id"> (<a href="#GPL-PA">#GPL-PA</a>)</span></dt>
+href="https://directory.fsf.org/wiki/License:GPL-PA";>公å…
±ç®¡ç†è®¡ç®—机软件的 GPL</a>
+<span class="anchor-reference-id"> (<a href="#GPL-PA">#GPL-PA</a>)</span></dt>
 <dd>
 <p>GPL-PA(其原始名称是葡萄牙语 &ldquo;Licen&ccedil;a 
P&uacute;blica Geral para
 Administra&ccedil;&atilde;o P&uacute;blica&rdquo;)由于以下原因
不是自由软件许可证:</p>
@@ -1419,7 +1427,7 @@
 <p>Jahia 社区源代码许可证不是一个自由软件许可证。å…
¶æºä»£ç ä»…限于研究使用。</p></dd>
 
 
-<dt><a id="JSON" href="http://directory.fsf.org/wiki/License:JSON";>JSON 
许可证</a>
+<dt><a id="JSON" href="https://directory.fsf.org/wiki/License:JSON";>JSON 
许可证</a>
 <span class="anchor-reference-id">(<a href="#JSON">#JSON</a>)</span></dt>
 <dd>
 <p>这是 JSON 数据交换格式最初实现时使用的许可证。它使用 
Expat
@@ -1433,13 +1441,13 @@
 <p>ksh93 常常是按照其老的许可证来传
播的,这不是一个自由软件许可证。其中一个原因
是它要求所有的改动都要发给其开发者。</p></dd>
 
 
-<dt><a id="Lha" href= "http://directory.fsf.org/wiki/License:Lha";>Lha 
的许可证</a>
+<dt><a id="Lha" href= "https://directory.fsf.org/wiki/License:Lha";>Lha 
的许可证</a>
 <span class="anchor-reference-id">(<a href="#Lha">#Lha</a>)</span></dt>
 <dd>
 <p>lha 许可证因为太过模糊以至于你
都不知道自己有什么权利,所以必
须当作是一个非自由软件许可证。</p></dd>
 
 
-<dt><a id="Ms-SS" href= "http://directory.fsf.org/wiki/License:Ms-SS";>微软å…
±äº«æºä»£ç 
+<dt><a id="Ms-SS" href= "https://directory.fsf.org/wiki/License:Ms-SS";>微软å…
±äº«æºä»£ç 
 CLI、C# 和 Jscript 许可证</a> <span class="anchor-reference-id">(<a
 href="#Ms-SS">#Ms-SS</a>)</span></dt>
 <dd>
@@ -1448,9 +1456,9 @@
 <p>微软还有一些描述 &ldquo;共享源代码&rdquo; 的许可证,å…
¶ä¸­ä¸€äº›è¿˜æœ‰ä¸åŒçš„限制。</p></dd>
 
 
-<dt><a id="NASA" 
href="http://directory.fsf.org/wiki/License:NASA-OSA_v1.3";>NASA
-开源协议</a> <span class="anchor-reference-id">(<a
-href="#NASA">#NASA</a>)</span></dt>
+<dt><a id="NASA"
+href="https://directory.fsf.org/wiki/License:NASA-OSA_v1.3";>NASA 
开源协议</a>
+<span class="anchor-reference-id">(<a href="#NASA">#NASA</a>)</span></dt>
 <dd>
 <p>NASA 开源协议,版本 1.3,不是一个自由软件许可证,因
为它的一个要求是你的修改是
 &ldquo;原创&rdquo;。自由软件的开发依赖合并第三方代码,而 
NASA 许可证不允许。</p>
@@ -1460,7 +1468,7 @@
 
 <dt><!-- old id, leave for compatibility -->
 <a id="OculusRift"></a> <a id="OculusRiftSDK"
-href="http://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License";>
+href="https://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License";>
 Oculus Rift SDK License</a> <span class="anchor-reference-id"> (<a
 href="#OculusRiftSDK">#OculusRiftSDK</a>)</span></dt>
 <dd>
@@ -1481,15 +1489,16 @@
 
 <dt><!-- old id, leave for compatibility -->
 <a id="OPL"></a> <a id="OpenPublicL"
-href="http://directory.fsf.org/wiki/License:OpenPLv1.0";>开放公å…
±è®¸å¯è¯</a> <span
+href="https://directory.fsf.org/wiki/License:OpenPLv1.0";>开放公å…
±è®¸å¯è¯</a> <span
 class="anchor-reference-id"> (<a
 href="#OpenPublicL">#OpenPublicL</a>)</span></dt>
 <dd>
 <p>这不是一个自由软件许可证,因
为它要求把每个已发布的修改版发送给特定的初始开发者
。该许可证里还有许多我们不清
楚含义的词语,它们可能也有问题。</p></dd>
 
 
-<dt><a id="PPL" 
href="http://directory.fsf.org/wiki/License:PPL";>Peer-Production
-许可证</a> <span class="anchor-reference-id">(<a 
href="#PPL">#PPL</a>)</span></dt>
+<dt><a id="PPL"
+href="https://directory.fsf.org/wiki/License:PPL";>Peer-Production 许可证</a>
+<span class="anchor-reference-id">(<a href="#PPL">#PPL</a>)</span></dt>
 <dd>
 <p>Peer-Production 许可证不是一个自由软件许可证,因
为它限制谁可以发布程序以及为什么目的发布。它也没有给予人们可以运行程序的权利。</p>
 
@@ -1501,8 +1510,9 @@
 <dd>
 <p>个人公共许可证版本 3a 不是一个自由软件许可证,因
为它剥夺某些用户(组织、政府、商业)的四项基本自由。</p></dd>
 
-<dt><a id="PINE" href="http://directory.fsf.org/wiki/License:PINE";>PINE 
的许可证</a>
-<span class="anchor-reference-id">(<a href="#PINE">#PINE</a>)</span></dt>
+<dt><a id="PINE" href="https://directory.fsf.org/wiki/License:PINE";>PINE
+的许可证</a> <span class="anchor-reference-id">(<a
+href="#PINE">#PINE</a>)</span></dt>
 <dd>
 <p>PINE 的许可证不是自由软件许可证,因
为它大体是禁止发布修改版软件的。它还限制可以用来 <a
 href="/philosophy/selling.html">销售拷贝</a> 的载体。</p>
@@ -1522,31 +1532,32 @@
 
 
 <dt><a id="RPL"
-href="http://directory.fsf.org/wiki/License:ReciprocalPLv1.3";>互惠公å…
±è®¸å¯è¯</a>
+href="https://directory.fsf.org/wiki/License:ReciprocalPLv1.3";>互惠公å…
±è®¸å¯è¯</a>
 <span class="anchor-reference-id">(<a href="#RPL">#RPL</a>)</span></dt>
 <dd>
 <p>互惠公å…
±è®¸å¯è¯ä¸æ˜¯ä¸€ä¸ªè‡ªç”±è½¯ä»¶è®¸å¯è¯ã€‚它有三个问题。1.&nbsp;它限制了初始拷贝的价æ
 ¼ã€‚2.&nbsp;它要求修改版的发布要通知初始开发者
。3.&nbsp;它要求å…
¬å¼€æœºæž„使用的任何修改版,即使是自用的。</p></dd>
 
 
 <dt><a id="Scilab"
-href="http://directory.fsf.org/wiki/License:Scilab-old";>Scilab 许可证</a> 
<span
-class="anchor-reference-id"> (<a href="#Scilab">#Scilab</a>)</span></dt>
+href="https://directory.fsf.org/wiki/License:Scilab-old";>Scilab 许可证</a>
+<span class="anchor-reference-id"> (<a href="#Scilab">#Scilab</a>)</span></dt>
 <dd>
 <p>这不是一个自由软件许可证,因为它不å…
è®¸å•†ä¸šå‘布修改版。该感谢的是,从版本 5.0.0 起,Scilab 
软件按照 CeCILL 版本&nbsp;2
 发布,变成了自由软件。</p></dd>
 
 
-<dt><a id="Scratch" 
href="http://directory.fsf.org/wiki/License:Scratch";>Scratch
-1.4 许可证</a> <span class="anchor-reference-id"> (<a
-href="#Scratch">#Scratch</a>)</span></dt>
+<dt><a id="Scratch"
+href="https://directory.fsf.org/wiki/License:Scratch";>Scratch 1.4 许可证</a>
+<span class="anchor-reference-id"> (<a 
href="#Scratch">#Scratch</a>)</span></dt>
 <dd>
 <p>这不是一个自由软件许可证,因为它不å…
è®¸å•†ä¸šå†å‘布。另外,其条件 4 
很大程度上限制了修改版的功能。</p>
 
 <p>较新版的 Scratch 软件按照 GNU GPL 发布,但是我们不建议å…
¶ä¸­ä¸€äº›æ–°ç‰ˆæœ¬ï¼Œå› ä¸ºå®ƒä»¬ä¾èµ–于专有软件,Adobe Air。 </p></dd>
 
 
-<dt><a id="SML" 
href="http://directory.fsf.org/wiki/License:SimpleM";>简单机器许可证</a>
-<span class="anchor-reference-id">(<a href="#SML">#SML</a>)</span></dt>
+<dt><a id="SML"
+href="https://directory.fsf.org/wiki/License:SimpleM";>简单机器许可证</a>
 <span
+class="anchor-reference-id">(<a href="#SML">#SML</a>)</span></dt>
 <dd><p>尽管名字里有机器字æ 
·ï¼Œè¿™è¿˜æ˜¯ä¸€ä¸ªè½¯ä»¶è®¸å¯è¯ï¼Œå®ƒä¸æ˜¯è‡ªç”±è½¯ä»¶è®¸å¯è¯ï¼Œå› 
为以下几个原因:</p>
 <ul><li>在发布软件之前,你必
须要获得许可证授权方的许可。</li>
 <li>ä½  <a 
href="/philosophy/selling.html">不能销售该软件的拷贝</a>。</li>
@@ -1554,7 +1565,7 @@
 </ul><p></p></dd>
 
 
-<dt><a id="Squeak" 
href="http://directory.fsf.org/wiki/License:Squeak-old";>旧版
+<dt><a id="Squeak" 
href="https://directory.fsf.org/wiki/License:Squeak-old";>旧版
 Squeak 许可证</a> <span class="anchor-reference-id"> (<a
 href="#Squeak">#Squeak</a>)</span></dt>
 <dd>
@@ -1567,7 +1578,7 @@
 
 
 <dt><a id="SunCommunitySourceLicense"
-href="http://directory.fsf.org/wiki/License:SunCSLv2.8";>Sun 社区源代ç 
è®¸å¯è¯</a>
+href="https://directory.fsf.org/wiki/License:SunCSLv2.8";>Sun 社区源代ç 
è®¸å¯è¯</a>
 <span class="anchor-reference-id"> (<a
 href="#SunCommunitySourceLicense">#SunCommunitySourceLicense</a>)  </span></dt>
 <dd>
@@ -1603,8 +1614,8 @@
 
 
 <dt><a id="Truecrypt-3.0"
-href="http://directory.fsf.org/wiki/License:TrueCrypt";>Truecrypt 许可证 
3.0</a>
-<span class="anchor-reference-id"> (<a
+href="https://directory.fsf.org/wiki/License:TrueCrypt";>Truecrypt 许可证
+3.0</a> <span class="anchor-reference-id"> (<a
 href="#Truecrypt-3.0">#Truecrypt-3.0</a>)</span></dt>
 <dd>
 <p>这不是一个自由软件许可证。因为几个原因,它说如果你
不理解该许可证,你就不能使用该程序。这让其他人运行你
的软件拷贝有了条件。它给其他
@@ -1612,7 +1623,7 @@
 </p>
 
<p>该许可证还有一些看似不可接受的条款,但是在确定之前我们没有发表评论。现在我们把评论说出来,用来解释为什么我们不为
 Truecrypt
 的消亡而悲伤。已经有了 <a
-href="http://directory.fsf.org/wiki?search=disk+encryption";>完成同æ 
·å·¥ä½œçš„自由软件</a>。</p></dd>
+href="https://directory.fsf.org/wiki?search=disk+encryption";>完成同æ 
·å·¥ä½œçš„自由软件</a>。</p></dd>
 
 
 <dt><a id="UtahPublicLicense"
@@ -1670,8 +1681,8 @@
 
 
 <dt><a id="FreeBSDDL"
-href="http://directory.fsf.org/wiki?title=License:FreeBSD";>FreeBSD 
文档许可证</a>
-<span class="anchor-reference-id"> (<a
+href="https://directory.fsf.org/wiki?title=License:FreeBSD";>FreeBSD
+文档许可证</a> <span class="anchor-reference-id"> (<a
 href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
 <dd>
 <p>这是一个纵容型、非 copyleft 的自由文档许可证,它兼容 
GNU FDL。</p></dd>
@@ -1792,7 +1803,7 @@
 <!-- end class="purple" -->
 <dl  class="green">
 
-<dt><a id="CC0" href="http://directory.fsf.org/wiki/License:CC0";>CC0</a> <span
+<dt><a id="CC0" href="https://directory.fsf.org/wiki/License:CC0";>CC0</a> <span
 class="anchor-reference-id">(<a href="#CC0">#CC0</a>)</span></dt>
 <dd>
 <p>CC0 是来自 Creative Commons 的对公有领域的奉献。按照 CC0
@@ -1866,7 +1877,7 @@
 许可证,因为任何包含其作品的较大作品或者
使用此许可证发布,或者必须使用符合已知æ 
‡å‡†çš„类似许可证发布。请不要用于软件或文档,因为它不å…
¼å®¹ GNU GPL
 和 GNU FDL。</p></dd>
 
-<dt><a id="ODbl" 
href="http://directory.fsf.org/wiki/License:ODbl";>开放数据库许可证</a>
+<dt><a id="ODbl" 
href="https://directory.fsf.org/wiki/License:ODbl";>开放数据库许可证</a>
 <span class="anchor-reference-id"> (<a href="#ODbl">#ODbl</a>)</span></dt>
 
 <dd><p>这是一个针对数据的自由和 copyleft 许可证。它不兼容 
GNU GPL。请不要用于软件或文档,因为它不兼容 GNU GPL 和 GNU
@@ -1891,7 +1902,7 @@
 <dd>
 <p>GNU GPL <strong>能</strong> 用于字体。不过,请注意它不å…
è®¸å°†å­—体嵌入到文档中,除非文档也是 GPL 的。如果你想这æ 
·åšï¼Œè¯·ä½¿ç”¨
 <a 
href="/licenses/gpl-faq.html#FontException">字体例外</a>。请同时参看 
<a
-href="http://www.fsf.org/blogs/licensing/20050425novalis";>关于 GPL
+href="https://www.fsf.org/blogs/licensing/20050425novalis";>关于 GPL
 字体例外的解释文章</a>。</p></dd>
 
 </dl> 
@@ -1906,7 +1917,7 @@
 <p>这是一个自由和 copyleft 许可证,不兼容 
GPL。它正常用于字体,在这种情况下,不兼容不造
成问题。</p></dd>
 
 <dt><a id="ecfonts"
-href="http://directory.fsf.org/wiki/License:LaTeX_ecfonts";>LaTex ec
+href="https://directory.fsf.org/wiki/License:LaTeX_ecfonts";>LaTex ec
 字体的许可证</a> <span class="anchor-reference-id">(<a
 href="#ecfonts">#ecfonts</a>)</span></dt>
 <dd>
@@ -1919,7 +1930,7 @@
 
 
 <dt><a id="IPAFONT"
-href="http://directory.fsf.org/wiki/License:IPA_Font_License";>IPA 
字体许可证</a>
+href="https://directory.fsf.org/wiki/License:IPA_Font_License";>IPA 
字体许可证</a>
 <span class="anchor-reference-id"> (<a 
href="#IPAFONT">#IPAFONT</a>)</span></dt>
 <dd>
 <p>这是一个自由和 copyleft 许可证,不兼容
@@ -1927,7 +1938,7 @@
 
 
 <dt><a id="SILOFL"
-href="http://directory.fsf.org/wiki/SIL_Open_Font_License_1.1";>SIL 
开放字体许可证
+href="https://directory.fsf.org/wiki/SIL_Open_Font_License_1.1";>SIL 
开放字体许可证
 1.1</a> <span class="anchor-reference-id"> (<a
 href="#SILOFL">#SILOFL</a>)</span></dt>
 <dd>
@@ -1985,7 +1996,6 @@
 许可证:CC-BY、CC-BY-SA 或 CC0。</p>
 
 <p>装饰性 3D 打印设计是艺术作品;它们可以使用任一个 
Creative Commons 许可证。</p>
-</div>
 
 <div class="translators-notes">
 
@@ -2041,7 +2051,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/10/12 04:01:25 $
+$Date: 2021/11/25 10:06:09 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.zh-cn-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- licenses/po/license-list.zh-cn-en.html      12 Oct 2021 04:01:27 -0000      
1.6
+++ licenses/po/license-list.zh-cn-en.html      25 Nov 2021 10:06:09 -0000      
1.7
@@ -17,7 +17,6 @@
 }
 .toc a { display: block; }
 #fsf-licensing { margin: 1em auto; }
-.short-lines { width: 47em; max-width: 100%; }
 
 /* Definitions for color-coded border */
 dl.green, dl.orange, dl.red, dl.blue, dl.purple {
@@ -151,7 +150,7 @@
 <li>Whether it qualifies as a
 <a href="/philosophy/free-sw.html">free software</a> license.</li>
 
-<li>Whether it is a <a href="/copyleft/copyleft.html">copyleft</a>
+<li>Whether it is a <a href="/licenses/copyleft.html">copyleft</a>
 license.</li>
 
 <li>Whether it is
@@ -186,7 +185,7 @@
 you'll likely get an answer faster if you ask a specific question that
 isn't already covered here or in <a href="/licenses/gpl-faq.html">our
 FAQ</a>.  We
-<a href="http://www.fsf.org/volunteer";>welcome knowledgeable
+<a href="https://www.fsf.org/volunteer";>welcome knowledgeable
 volunteers</a> who want to help answer licensing questions.</p>
 
 <p>If you are contemplating writing a new license, please also contact
@@ -212,7 +211,6 @@
 <dl class="blue"><dt></dt><dd></dd></dl>
 </div>
 
-<div class="short-lines">
 <div class="big-section">
 <h3 id="SoftwareLicenses">
      Software Licenses</h3>
@@ -350,7 +348,7 @@
 versions.</p></dd>
 
 
-<dt><a id="apache2" href="http://directory.fsf.org/wiki/License:Apache2.0";>
+<dt><a id="apache2" href="https://directory.fsf.org/wiki/License:Apache2.0";>
     Apache License, Version 2.0</a>
     <span class="anchor-reference-id">(<a href="#apache2">#apache2</a>)</span>
     </dt>
@@ -366,7 +364,7 @@
 over other lax permissive licenses.</p></dd>
 
 <dt><a id="ArtisticLicense2"
-       href="http://directory.fsf.org/wiki/License:ArtisticLicense2.0";>
+       href="https://directory.fsf.org/wiki/License:ArtisticLicense2.0";>
     Artistic License 2.0</a>
     <span class="anchor-reference-id">
        (<a href="#ArtisticLicense2">#ArtisticLicense2</a>)</span></dt>
@@ -387,7 +385,7 @@
 
 <dt><a id="BerkleyDB"></a> <!-- misspelled id, leave for compatibility -->
     <a id="BerkeleyDB"
-       href="http://directory.fsf.org/wiki/License:Sleepycat";>
+       href="https://directory.fsf.org/wiki/License:Sleepycat";>
     Berkeley Database License</a>
     (a.k.a. the Sleepycat Software Product License)
     <span class="anchor-reference-id">
@@ -396,7 +394,7 @@
 <p>This is a free software license, compatible with the GNU GPL.</p></dd>
 
 
-<dt><a id="boost" href="http://directory.fsf.org/wiki/License:Boost1.0";>
+<dt><a id="boost" href="https://directory.fsf.org/wiki/License:Boost1.0";>
     Boost Software License</a>
     <span class="anchor-reference-id">(<a href="#boost">#boost</a>)</span></dt>
 <dd>
@@ -404,7 +402,7 @@
 compatible with the GNU GPL.</p></dd>
 
 
-<dt><a id="ModifiedBSD" 
href="http://directory.fsf.org/wiki/License:BSD_3Clause";>
+<dt><a id="ModifiedBSD" 
href="https://directory.fsf.org/wiki/License:BSD_3Clause";>
     Modified BSD license</a>
     <span class="anchor-reference-id">
       (<a href="#ModifiedBSD">#ModifiedBSD</a>)</span></dt>
@@ -453,7 +451,7 @@
 
 
 <dt><a id="clearbsd"
-       href="http://directory.fsf.org/wiki/License:ClearBSD";>
+       href="https://directory.fsf.org/wiki/License:ClearBSD";>
        The Clear BSD License</a>
     <span class="anchor-reference-id">
        (<a href="#clearbsd">#clearbsd</a>)</span></dt>
@@ -468,7 +466,7 @@
 for you, it would be wise to avoid the program.</p></dd>
 
 
-<dt><a id="CryptixGeneralLicense" 
href="http://directory.fsf.org/wiki/License:CryptixGL";>
+<dt><a id="CryptixGeneralLicense" 
href="https://directory.fsf.org/wiki/License:CryptixGL";>
     Cryptix General License</a>
     <span class="anchor-reference-id">
       (<a href="#CryptixGeneralLicense">#CryptixGeneralLicense</a>)</span></dt>
@@ -480,7 +478,7 @@
 
 
 <dt><a id="eCos20"></a>  <!-- without decimal, leave for compatibility -->
-    <a id="eCos2.0" href="http://directory.fsf.org/wiki/License:ECos2.0";>
+    <a id="eCos2.0" href="https://directory.fsf.org/wiki/License:ECos2.0";>
     eCos license version 2.0</a>
     <span class="anchor-reference-id">
        (<a href="#eCos20">#eCos2.0</a>)</span></dt>
@@ -493,7 +491,7 @@
 
 
 <dt><a id="ECL2.0"
-       href="http://directory.fsf.org/wiki/License:ECL2.0";>
+       href="https://directory.fsf.org/wiki/License:ECL2.0";>
     Educational Community License 2.0</a>
     <span class="anchor-reference-id">
        (<a href="#ECL2.0">#ECL2.0</a>)</span></dt>
@@ -507,7 +505,7 @@
 this license incompatible with GPLv2.</p></dd>
 
 
-<dt><a id="Eiffel" href="http://directory.fsf.org/wiki/License:EFLv2";>
+<dt><a id="Eiffel" href="https://directory.fsf.org/wiki/License:EFLv2";>
     Eiffel Forum License, version 2</a>
     <span class="anchor-reference-id">
        (<a href="#Eiffel">#Eiffel</a>)</span></dt>
@@ -519,7 +517,7 @@
 
 
 <dt><a id="EUDataGrid"
-       href="http://directory.fsf.org/wiki/License:EUDataGrid";>
+       href="https://directory.fsf.org/wiki/License:EUDataGrid";>
     EU DataGrid Software License</a>
     <span class="anchor-reference-id">
        (<a href="#EUDataGrid">#EUDataGrid</a>)</span></dt>
@@ -528,7 +526,7 @@
 compatible with the GNU GPL.</p></dd>
 
 
-<dt><a id="Expat" href="http://directory.fsf.org/wiki/License:Expat";>
+<dt><a id="Expat" href="https://directory.fsf.org/wiki/License:Expat";>
     Expat License</a>
     <span class="anchor-reference-id">(<a href="#Expat">#Expat</a>)</span></dt>
 <dd>
@@ -551,7 +549,7 @@
 since it blocks patent treachery.</p></dd>
 
 <dt><a id="FreeBSD"
-       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
+       href="https://directory.fsf.org/wiki?title=License:FreeBSD";>
     FreeBSD license</a>
     <span class="anchor-reference-id">
        (<a href="#FreeBSD">#FreeBSD</a>)</span></dt>
@@ -565,7 +563,7 @@
 apply to this license too.</p></dd>
 
 
-<dt><a id="freetype" href="http://directory.fsf.org/wiki/License:FreeType";>
+<dt><a id="freetype" href="https://directory.fsf.org/wiki/License:FreeType";>
     Freetype Project License</a>
     <span class="anchor-reference-id">
        (<a href="#freetype">#freetype</a>)</span></dt>
@@ -574,7 +572,7 @@
 some attribution requirements which make it incompatible with
 GPLv2.</p></dd>
 
-<dt><a id="HPND" 
href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>
+<dt><a id="HPND" 
href="https://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>
        Historical Permission Notice and Disclaimer </a>
     <span class="anchor-reference-id">
        (<a href="#HPND">#HPND</a>)</span></dt>
@@ -584,7 +582,7 @@
 href="#Python1.6a2">Python 1.6a2 and earlier versions</a>.</p></dd>
 
     
-<dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL";>
+<dt><a id="iMatix" href="https://directory.fsf.org/wiki?title=License:SFL";>
        License of the iMatix Standard Function Library</a>
     <span class="anchor-reference-id">
        (<a href="#iMatix">#iMatix</a>)</span></dt>
@@ -593,7 +591,7 @@
 
 
 <dt><a id="imlib"
-       href="http://directory.fsf.org/wiki/License:Imlib2";>
+       href="https://directory.fsf.org/wiki/License:Imlib2";>
     License of imlib2</a>
     <span class="anchor-reference-id">(<a href="#imlib">#imlib</a>)</span></dt>
 <dd>
@@ -604,7 +602,7 @@
 
 
 <dt><a id="ijg"
-       href="http://directory.fsf.org/wiki?title=License:JPEG";>
+       href="https://directory.fsf.org/wiki?title=License:JPEG";>
     Independent JPEG Group License</a>
     <span class="anchor-reference-id">(<a href="#ijg">#ijg</a>)</span></dt>
 <dd>
@@ -640,14 +638,14 @@
 
 
 <dt><a id="intel"
-      href="http://directory.fsf.org/wiki/License:IntelACPI";>
+      href="https://directory.fsf.org/wiki/License:IntelACPI";>
     Intel Open Source License</a>
     <span class="anchor-reference-id">(<a href="#intel">#intel</a>)</span></dt>
 <dd>
 <p>This is a free software license, compatible with the GNU GPL.</p></dd>
 
 
-<dt><a id="ISC" href="http://directory.fsf.org/wiki/License:ISC";>
+<dt><a id="ISC" href="https://directory.fsf.org/wiki/License:ISC";>
     ISC License</a>
     <span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
 <dd>
@@ -658,7 +656,7 @@
 <p>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 &ldquo;Permission to use, copy, modify, <strong>and/or</strong> 
distribute this software&hellip;&rdquo; While the inclusion of 
&ldquo;and/or&rdquo; 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="#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.</p></dd>
 
 <dt><a id="MPL-2.0"
-       href="http://directory.fsf.org/wiki/License:MPLv2.0";>Mozilla Public
+       href="https://directory.fsf.org/wiki/License:MPLv2.0";>Mozilla Public
        License (MPL) version 2.0</a>
     <span class="anchor-reference-id">(<a 
href="#MPL-2.0">#MPL-2.0</a>)</span></dt>
 <dd>
@@ -705,7 +703,7 @@
 previous versions of the MPL is still incompatible with the GPL and AGPL.</p>
 </dd>
 
-<dt><a id="NCSA" href="http://directory.fsf.org/wiki/License:IllinoisNCSA";>
+<dt><a id="NCSA" href="https://directory.fsf.org/wiki/License:IllinoisNCSA";>
     NCSA/University of Illinois Open Source License</a>
     <span class="anchor-reference-id">(<a href="#NCSA">#NCSA</a>)</span></dt>
 <dd>
@@ -728,7 +726,7 @@
 
 
 <dt><a id="newOpenLDAP"
-       href="http://directory.fsf.org/wiki/License:OpenLDAPv2.7";>
+       href="https://directory.fsf.org/wiki/License:OpenLDAPv2.7";>
     OpenLDAP License, Version 2.7</a>
     <span class="anchor-reference-id">
        (<a href="#newOpenLDAP">#newOpenLDAP</a>)</span></dt>
@@ -756,7 +754,7 @@
 
 
 <dt><a id="PublicDomain"
-       href="http://directory.fsf.org/wiki/License:PublicDomain";>
+       href="https://directory.fsf.org/wiki/License:PublicDomain";>
     Public Domain</a>       
     <span class="anchor-reference-id">
        (<a href="#PublicDomain">#PublicDomain</a>)</span></dt>
@@ -776,7 +774,7 @@
 provides a fallback license for cases where that is not legally
 possible.</p></dd>
 
-<dt><a id="Python" 
href="http://directory.fsf.org/wiki?title=License:Python2.0.1";>
+<dt><a id="Python" 
href="https://directory.fsf.org/wiki?title=License:Python2.0.1";>
     License of Python 2.0.1, 2.1.1, and newer versions</a>
     <span class="anchor-reference-id">
        (<a href="#Python">#Python</a>)</span></dt>
@@ -788,7 +786,7 @@
 
 
 <dt><a id="Python1.6a2"
-    href="http://directory.fsf.org/wiki?title=License:Python1.6a2";>
+    href="https://directory.fsf.org/wiki?title=License:Python1.6a2";>
     License of Python 1.6a2 and earlier versions</a>
     <span class="anchor-reference-id">
        (<a href="#Python1.6a2">#Python1.6a2</a>)</span></dt>
@@ -798,7 +796,7 @@
 licenses (see above and below).</p></dd>
 
 
-<dt><a id="Ruby" href="http://directory.fsf.org/wiki/License:Ruby";>
+<dt><a id="Ruby" href="https://directory.fsf.org/wiki/License:Ruby";>
     License of Ruby</a>
     <span class="anchor-reference-id">(<a href="#Ruby">#Ruby</a>)</span></dt>
 <dd>
@@ -806,7 +804,7 @@
 explicit dual-licensing clause.</p></dd>
 
 
-<dt><a id="SGIFreeB" href="http://directory.fsf.org/wiki/License:SGIFreeBv2";>
+<dt><a id="SGIFreeB" href="https://directory.fsf.org/wiki/License:SGIFreeBv2";>
     SGI Free Software License B, version 2.0</a>
     <span class="anchor-reference-id">
        (<a href="#SGIFreeB">#SGIFreeB</a>)</span></dt>
@@ -825,7 +823,7 @@
 
 
 <dt><a id="StandardMLofNJ"
-       href="http://directory.fsf.org/wiki/License:StandardMLofNJ";>
+       href="https://directory.fsf.org/wiki/License:StandardMLofNJ";>
     Standard ML of New Jersey Copyright License</a>
     <span class="anchor-reference-id">
        (<a href="#StandardMLofNJ">#StandardMLofNJ</a>)</span></dt>
@@ -834,7 +832,7 @@
 compatible with the GNU GPL.</p></dd>
 
 
-<dt><a id="Unicode" href="http://directory.fsf.org/wiki/License:Unicode";>
+<dt><a id="Unicode" href="https://directory.fsf.org/wiki/License:Unicode";>
        Unicode, Inc. License Agreement for Data Files and Software</a>
     <span class="anchor-reference-id">
        (<a href="#Unicode">#Unicode</a>)</span></dt>
@@ -868,7 +866,7 @@
 common, and widely recognized in the free software community.</p></dd>
 
 
-<dt><a id="UPL" 
href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>
+<dt><a id="UPL" 
href="https://directory.fsf.org/wiki/License:Universal_Permissive_License";>
     Universal Permissive License (UPL)</a>
     <span class="anchor-reference-id">
        (<a href="#UPL">#UPL</a>)</span></dt>
@@ -880,7 +878,7 @@
 your work under a lax license.
 </p></dd>    
 
-<dt><a id="Unlicense" 
href="http://directory.fsf.org/wiki/License:TheUnlicense";>
+<dt><a id="Unlicense" 
href="https://directory.fsf.org/wiki/License:TheUnlicense";>
     The Unlicense</a>
     <span class="anchor-reference-id">
        (<a href="#Unlicense">#Unlicense</a>)</span></dt>
@@ -897,7 +895,7 @@
 dedication with a fallback license, and is more thorough and
 mature than the Unlicense.</p></dd>
 
-<dt><a id="Vim" href="http://directory.fsf.org/wiki/License:Vim7.2";>
+<dt><a id="Vim" href="https://directory.fsf.org/wiki/License:Vim7.2";>
     License of Vim, Version 6.1 or later</a>
     <span class="anchor-reference-id">(<a href="#Vim">#Vim</a>)</span></dt>
 <dd>
@@ -907,14 +905,14 @@
 
 
 <dt><a id="W3C"
-    href="http://directory.fsf.org/wiki/License:W3C_31Dec2002";>
+    href="https://directory.fsf.org/wiki/License:W3C_31Dec2002";>
     W3C Software Notice and License</a>
     <span class="anchor-reference-id">(<a href="#W3C">#W3C</a>)</span></dt>
 <dd>
 <p>This is a free software license and is GPL compatible.</p></dd>
 
 
-<dt><a id="WebM" href="http://directory.fsf.org/wiki/License:WebM";>
+<dt><a id="WebM" href="https://directory.fsf.org/wiki/License:WebM";>
     License of WebM</a>
     <span class="anchor-reference-id">(<a href="#WebM">#WebM</a>)</span></dt>
 <dd>
@@ -964,7 +962,7 @@
 <p>An older name for the <a href="#Wx">WxWidgets Library license</a>.</p>
 </dd>
 
-<dt><a id="X11License" href="http://directory.fsf.org/wiki/License:X11";>
+<dt><a id="X11License" href="https://directory.fsf.org/wiki/License:X11";>
     X11 License</a>
     <span class="anchor-reference-id">
        (<a href="#X11License">#X11License</a>)</span></dt>
@@ -994,7 +992,7 @@
 
 
 <dt><a id="XFree861.1License"
-       href="http://directory.fsf.org/wiki/License:XFree86_1.1";>
+       href="https://directory.fsf.org/wiki/License:XFree86_1.1";>
        XFree86 1.1 License</a>
     <span class="anchor-reference-id">
        (<a href="#XFree861.1License">#XFree861.1License</a>)</span></dt>
@@ -1011,7 +1009,7 @@
 href="#X11License">X11 license</a>.</p></dd>
 
 
-<dt><a id="ZLib" href="http://directory.fsf.org/wiki/License:Zlib";>
+<dt><a id="ZLib" href="https://directory.fsf.org/wiki/License:Zlib";>
     License of ZLib</a>
     <span class="anchor-reference-id">(<a href="#ZLib">#ZLib</a>)</span></dt>
 <dd>
@@ -1019,7 +1017,7 @@
 
 
 <dt><a id="Zope20"></a>  <!-- without decimal, leave for compatibility -->
-    <a id="Zope2.0" 
href="http://directory.fsf.org/wiki?title=License:ZopePLv2.1";>
+    <a id="Zope2.0" 
href="https://directory.fsf.org/wiki?title=License:ZopePLv2.1";>
     Zope Public License, versions 2.0 and 2.1</a>
     <span class="anchor-reference-id">
        (<a href="#Zope2.0">#Zope2.0</a>)</span></dt>
@@ -1045,7 +1043,7 @@
 
 <dl class="orange">
 
-<dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1";>
+<dt><a id="AGPLv1.0" href="https://directory.fsf.org/wiki/License:AGPLv1";>
     Affero General Public License version 1</a>
     <span class="anchor-reference-id">
        (<a href="#AGPLv1.0">#AGPLv1.0</a>)</span></dt>
@@ -1061,7 +1059,7 @@
 
 <!-- Published primarily by www.opensource.org -->
 <dt><a id="AcademicFreeLicense"
-       href="http://directory.fsf.org/wiki/License:AFLv3";>
+       href="https://directory.fsf.org/wiki/License:AFLv3";>
     Academic Free License, all versions through 3.0</a>
     <span class="anchor-reference-id">
        (<a href="#AcademicFreeLicense">#AcademicFreeLicense</a>)</span></dt>
@@ -1072,7 +1070,7 @@
 avoided for the same reasons.</p></dd>
 
 
-<dt><a id="apache1.1" href="http://directory.fsf.org/wiki/License:Apache1.1";>
+<dt><a id="apache1.1" href="https://directory.fsf.org/wiki/License:Apache1.1";>
     Apache License, Version 1.1</a>
     <span class="anchor-reference-id">
        (<a href="#apache1.1">#apache1.1</a>)</span></dt>
@@ -1082,7 +1080,7 @@
 prohibitions on the use of Apache-related names.</p></dd>
 
 
-<dt><a id="apache1" href="http://directory.fsf.org/wiki/License:Apache1.0";>
+<dt><a id="apache1" href="https://directory.fsf.org/wiki/License:Apache1.0";>
     Apache License, Version 1.0</a>
     <span class="anchor-reference-id">
        (<a href="#apache1">#apache1</a>)</span></dt>
@@ -1094,7 +1092,7 @@
 GPL.</p></dd>
 
 
-<dt><a id="apsl2" href="http://directory.fsf.org/wiki/License:APSLv2.0";>
+<dt><a id="apsl2" href="https://directory.fsf.org/wiki/License:APSLv2.0";>
     Apple Public Source License (APSL), version 2</a>
     <span class="anchor-reference-id">(<a href="#apsl2">#apsl2</a>)</span></dt>
 <dd>
@@ -1106,7 +1104,7 @@
 
 
 <dt><a id="bittorrent"
-       href="http://directory.fsf.org/wiki/License:BitTorrentOSL1.1";>
+       href="https://directory.fsf.org/wiki/License:BitTorrentOSL1.1";>
     BitTorrent Open Source License</a>
     <span class="anchor-reference-id">
        (<a href="#bittorrent">#bittorrent</a>)</span></dt>
@@ -1116,7 +1114,7 @@
 License</a>.</p></dd>
 
 
-<dt><a id="OriginalBSD" 
href="http://directory.fsf.org/wiki/License:BSD_4Clause";>
+<dt><a id="OriginalBSD" 
href="https://directory.fsf.org/wiki/License:BSD_4Clause";>
     Original BSD license</a>
     <span class="anchor-reference-id">
        (<a href="#OriginalBSD">#OriginalBSD</a>)</span></dt>
@@ -1169,7 +1167,7 @@
 <p>Please do not release software under this license.</p></dd>
 
 <dt><a id="CDDL"
-       href="http://directory.fsf.org/wiki/License:CDDLv1.0";>
+       href="https://directory.fsf.org/wiki/License:CDDLv1.0";>
     Common Development and Distribution License (CDDL), version 1.0</a>
     <span class="anchor-reference-id"> (<a href="#CDDL">#CDDL</a>)</span></dt>
 <dd>
@@ -1203,7 +1201,7 @@
 
 
 <dt><a id="CommonPublicLicense10"
-       href="http://directory.fsf.org/wiki/License:CPLv1.0";>
+       href="https://directory.fsf.org/wiki/License:CPLv1.0";>
     Common Public License Version 1.0</a>
     <span class="anchor-reference-id">
       (<a href="#CommonPublicLicense10">#CommonPublicLicense10</a>)</span></dt>
@@ -1213,7 +1211,7 @@
 
 
 <dt><a id="Condor"
-       href="http://directory.fsf.org/wiki?title=License:Condor1.1";>
+       href="https://directory.fsf.org/wiki?title=License:Condor1.1";>
     Condor Public License</a>
     <span class="anchor-reference-id">
        (<a href="#Condor">#Condor</a>)</span></dt>
@@ -1230,7 +1228,7 @@
 compliance an actual condition of the license, it would not be a free
 software license.)</p></dd>
 
-<dt><a id="EPL" href="http://directory.fsf.org/wiki/License:EPLv1.0";>
+<dt><a id="EPL" href="https://directory.fsf.org/wiki/License:EPLv1.0";>
     Eclipse Public License Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#EPL">#EPL</a>)</span></dt>
 <dd>
@@ -1259,7 +1257,7 @@
 without this designation remains incompatible with the GPL.</p></dd>
 
 <dt><a id="EUPL"></a> <!-- old id, leave for compatibility -->
-    <a id="EUPL-1.1" href="http://directory.fsf.org/wiki/License:EUPLv1.1";>
+    <a id="EUPL-1.1" href="https://directory.fsf.org/wiki/License:EUPLv1.1";>
     European Union Public License (EUPL) version 1.1</a>
     <span class="anchor-reference-id">(<a 
href="#EUPL-1.1">#EUPL-1.1</a>)</span></dt>
 <dd>
@@ -1288,7 +1286,7 @@
 Adding that code to the CeCILL-covered program provides grounds to
 relicense it to GPLv3+.</p></dd>
 
-<dt><a id="EUPL-1.2" href="http://directory.fsf.org/wiki/License:EUPLv1.2";>
+<dt><a id="EUPL-1.2" href="https://directory.fsf.org/wiki/License:EUPLv1.2";>
     European Union Public License (EUPL) version 1.2</a>
     <span class="anchor-reference-id">(<a 
href="#EUPL-1.2">#EUPL-1.2</a>)</span></dt>
 <dd>
@@ -1316,7 +1314,7 @@
 program provides grounds to relicense it to GPLv3+.</p></dd>
 
 <dt><a id="fdk"
-       href="http://directory.fsf.org/wiki/License:fdk";>
+       href="https://directory.fsf.org/wiki/License:fdk";>
     Fraunhofer FDK AAC license</a>
     <span class="anchor-reference-id">(<a href="#fdk">#fdk</a>)</span></dt>
 <dd><p>This is a free software license as far as it goes. It is
@@ -1340,13 +1338,13 @@
 </dd>
 
 <dt><a id="gnuplot"
-       href="http://directory.fsf.org/wiki/License:Gnuplot";>
+       href="https://directory.fsf.org/wiki/License:Gnuplot";>
     Gnuplot license</a>
     <span class="anchor-reference-id">(<a 
href="#gnuplot">#gnuplot</a>)</span></dt>
 <dd><p>This is a free software license, incompatible with the GNU GPL.</p></dd>
 
 <dt><a id="IBMPL"
-       href="http://directory.fsf.org/wiki/License:IBMPLv1.0";>
+       href="https://directory.fsf.org/wiki/License:IBMPLv1.0";>
     IBM Public License, Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#IBMPL">#IBMPL</a>)</span></dt>
 <dd>
@@ -1355,7 +1353,7 @@
 
 
 <dt><a id="josl"
-       href="http://directory.fsf.org/wiki/License:JabberOSLv1.0";>
+       href="https://directory.fsf.org/wiki/License:JabberOSLv1.0";>
     Jabber Open Source License, Version 1.0</a>
     <span class="anchor-reference-id">
        (<a href="#josl">#josl</a>)</span></dt>
@@ -1367,7 +1365,7 @@
 under the GPL.  Therefore, it is not compatible.</p></dd>
 
 
-<dt><a id="LPPL-1.3a" href="http://directory.fsf.org/wiki/License:LPPLv1.3a";>
+<dt><a id="LPPL-1.3a" href="https://directory.fsf.org/wiki/License:LPPLv1.3a";>
     LaTeX Project Public License 1.3a</a>
     <span class="anchor-reference-id">
        (<a href="#LPPL-1.3a">#LPPL-1.3a</a>)</span></dt>
@@ -1379,7 +1377,7 @@
 unmodified version.</p></dd>
 
 
-<dt><a id="LPPL-1.2" href="http://directory.fsf.org/wiki/License:LPPLv1.2";>
+<dt><a id="LPPL-1.2" href="https://directory.fsf.org/wiki/License:LPPLv1.2";>
     LaTeX Project Public License 1.2</a>
     <span class="anchor-reference-id">
        (<a href="#LPPL-1.2">#LPPL-1.2</a>)</span></dt>
@@ -1426,7 +1424,7 @@
 <p>Note: These comments are for version 1.2 (3 Sep 1999) of the LPPL.</p></dd>
 
 
-<dt><a id="lucent102" 
href="http://directory.fsf.org/wiki/License:LucentPLv1.02";>
+<dt><a id="lucent102" 
href="https://directory.fsf.org/wiki/License:LucentPLv1.02";>
     Lucent Public License Version 1.02 (Plan 9 license)</a>
     <span class="anchor-reference-id">
        (<a href="#lucent102">#lucent102</a>)</span></dt>
@@ -1438,7 +1436,7 @@
 
 
 <dt><a id="ms-pl"
-       href="http://directory.fsf.org/wiki/License:MsPL";>
+       href="https://directory.fsf.org/wiki/License:MsPL";>
     Microsoft Public License (Ms-PL)</a>
     <span class="anchor-reference-id">(<a href="#ms-pl">#ms-pl</a>)</span></dt>
 <dd>
@@ -1448,7 +1446,7 @@
 
 
 <dt><a id="ms-rl"
-       href="http://directory.fsf.org/wiki/License:MsRL";>
+       href="https://directory.fsf.org/wiki/License:MsRL";>
     Microsoft Reciprocal License (Ms-RL)</a>
     <span class="anchor-reference-id">(<a href="#ms-rl">#ms-rl</a>)</span></dt>
 <dd>
@@ -1459,7 +1457,7 @@
 reason.</p></dd>
 
 
-<dt><a id="MPL" href="http://directory.fsf.org/wiki/License:MPLv1.1";>
+<dt><a id="MPL" href="https://directory.fsf.org/wiki/License:MPLv1.1";>
      Mozilla Public License (MPL) version 1.1</a>
     <span class="anchor-reference-id">(<a href="#MPL">#MPL</a>)</span></dt>
 <dd>
@@ -1482,7 +1480,7 @@
 for details.</p></dd>
 
 
-<dt><a id="NOSL" href="http://directory.fsf.org/wiki/License:NOSLv1.0";>
+<dt><a id="NOSL" href="https://directory.fsf.org/wiki/License:NOSLv1.0";>
     Netizen Open Source License (NOSL), Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#NOSL">#NOSL</a>)</span></dt>
 <dd>
@@ -1494,7 +1492,7 @@
 reason.</p></dd>
 
 
-<dt><a id="NPL" href="http://directory.fsf.org/wiki?title=License:NPLv1.1";>
+<dt><a id="NPL" href="https://directory.fsf.org/wiki?title=License:NPLv1.1";>
     Netscape Public License (NPL)</a>, versions 1.0 and 1.1
     <span class="anchor-reference-id">(<a href="#NPL">#NPL</a>)</span></dt>
 <dd>
@@ -1508,7 +1506,7 @@
 the NPL.</a> </p></dd>
 
 
-<dt><a id="Nokia" href="http://directory.fsf.org/wiki/License:NokOSv1.0a";>
+<dt><a id="Nokia" href="https://directory.fsf.org/wiki/License:NokOSv1.0a";>
     Nokia Open Source License</a>
     <span class="anchor-reference-id">(<a href="#Nokia">#Nokia</a>)</span></dt>
 <dd>
@@ -1516,7 +1514,7 @@
 software license incompatible with the GNU GPL.</p></dd>
 
 
-<dt><a id="oldOpenLDAP" 
href="http://directory.fsf.org/wiki/License:OpenLDAPv2.3";>
+<dt><a id="oldOpenLDAP" 
href="https://directory.fsf.org/wiki/License:OpenLDAPv2.3";>
     Old OpenLDAP License, Version 2.3</a>
     <span class="anchor-reference-id">
        (<a href="#oldOpenLDAP">#oldOpenLDAP</a>)</span></dt>
@@ -1532,7 +1530,7 @@
 been released under this license.</p></dd>
 
 <!-- Published primarily by www.opensource.org -->
-<dt><a id="OSL" href="http://directory.fsf.org/wiki/License:OSLv3.0";>
+<dt><a id="OSL" href="https://directory.fsf.org/wiki/License:OSLv3.0";>
     Open Software License, all versions through 3.0</a>
     <span class="anchor-reference-id">(<a href="#OSL">#OSL</a>)</span></dt>
 <dd>
@@ -1555,7 +1553,7 @@
 have been released under this license.</p></dd>
 
 
-<dt><a id="OpenSSL" href="http://directory.fsf.org/wiki/License:OpenSSL";>
+<dt><a id="OpenSSL" href="https://directory.fsf.org/wiki/License:OpenSSL";>
     OpenSSL license</a>
     <span class="anchor-reference-id">
        (<a href="#OpenSSL">#OpenSSL</a>)</span></dt>
@@ -1571,7 +1569,7 @@
 However, there is no reason not to use OpenSSL and applications that
 work with OpenSSL.</p></dd>
 
-<dt><a id="Phorum" href="http://directory.fsf.org/wiki/License:Phorum2.0";>
+<dt><a id="Phorum" href="https://directory.fsf.org/wiki/License:Phorum2.0";>
     Phorum License, Version 2.0</a>
     <span class="anchor-reference-id">
        (<a href="#Phorum">#Phorum</a>)</span></dt>
@@ -1581,7 +1579,7 @@
 the license incompatible with the GPL.</p></dd>
 
 
-<dt><a id="PHP-3.01" href="http://directory.fsf.org/wiki/License:PHPv3.01";>
+<dt><a id="PHP-3.01" href="https://directory.fsf.org/wiki/License:PHPv3.01";>
     PHP License, Version 3.01</a>
     <span class="anchor-reference-id">
        (<a href="#PHP-3.01">#PHP-3.01</a>)</span></dt>
@@ -1596,7 +1594,7 @@
 
 
 <dt><a id="PythonOld"
-       href="http://directory.fsf.org/wiki/License:Python1.6b1";>
+       href="https://directory.fsf.org/wiki/License:Python1.6b1";>
     License of Python 1.6b1 through 2.0 and 2.1</a>
     <span class="anchor-reference-id">
        (<a href="#PythonOld">#PythonOld</a>)</span></dt>
@@ -1607,7 +1605,7 @@
 this.</p></dd>
 
 
-<dt><a id="QPL" href="http://directory.fsf.org/wiki/License:QPLv1.0";>
+<dt><a id="QPL" href="https://directory.fsf.org/wiki/License:QPLv1.0";>
     Q Public License (QPL), Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#QPL">#QPL</a>)</span></dt>
 <dd>
@@ -1641,7 +1639,7 @@
 
 
 <dt><a id="RPSL"
-       href="http://directory.fsf.org/wiki/License:RPSLv1.0";>
+       href="https://directory.fsf.org/wiki/License:RPSLv1.0";>
        RealNetworks Public Source License (RPSL), Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#RPSL">#RPSL</a>)</span></dt>
 <dd>
@@ -1661,7 +1659,7 @@
 major policy.</p></dd>
 
 
-<dt><a id="SPL" href="http://directory.fsf.org/wiki/License:SPLv1.0";>
+<dt><a id="SPL" href="https://directory.fsf.org/wiki/License:SPLv1.0";>
     Sun Public License</a>
     <span class="anchor-reference-id">(<a href="#SPL">#SPL</a>)</span></dt>
 <dd>
@@ -1672,7 +1670,7 @@
 
 
 <dt><a id="xinetd"
-       href="http://directory.fsf.org/wiki/License:Xinetd";>
+       href="https://directory.fsf.org/wiki/License:Xinetd";>
     License of xinetd</a>
     <span class="anchor-reference-id">
        (<a href="#xinetd">#xinetd</a>)</span></dt>
@@ -1684,7 +1682,7 @@
 
 
 <dt><a id="Yahoo"
-       href="http://directory.fsf.org/wiki/License:YPLv1.1";>
+       href="https://directory.fsf.org/wiki/License:YPLv1.1";>
     Yahoo! Public License 1.1</a>
     <span class="anchor-reference-id">(<a href="#Yahoo">#Yahoo</a>)</span></dt>
 <dd>
@@ -1696,7 +1694,7 @@
 property</a>&rdquo;.</p></dd>
 
 
-<dt><a id="Zend" href="http://directory.fsf.org/wiki/License:ZELv2.0";>
+<dt><a id="Zend" href="https://directory.fsf.org/wiki/License:ZELv2.0";>
     Zend License, Version 2.0</a>
     <span class="anchor-reference-id">(<a href="#Zend">#Zend</a>)</span></dt>
 <dd>
@@ -1850,7 +1848,7 @@
 </dd>
 
 <dt><a id="apsl1" href=
-    "http://directory.fsf.org/wiki/License:APSLv1.x";>
+    "https://directory.fsf.org/wiki/License:APSLv1.x";>
     Apple Public Source License (APSL), version 1.x</a>
     <span class="anchor-reference-id">(<a href="#apsl1">#apsl1</a>)</span></dt>
 <dd>
@@ -1862,7 +1860,7 @@
 is a free software license.</p></dd>
 
 
-<dt><a id="ArtisticLicense" 
href="http://directory.fsf.org/wiki/License:Artistic_v1.0";>Artistic License 
1.0</a>
+<dt><a id="ArtisticLicense" 
href="https://directory.fsf.org/wiki/License:Artistic_v1.0";>Artistic License 
1.0</a>
     <span class="anchor-reference-id">
        (<a href="#ArtisticLicense">#ArtisticLicense</a>)</span></dt>
 <dd>
@@ -1939,7 +1937,7 @@
 includes a requirement not to violate the license of <em>any</em>
 program that the user runs&mdash;even proprietary programs.</p></dd>
 
-<dt><a id="eCos11" 
href="http://directory.fsf.org/wiki/License:ECosPLv1.1";>eCos Public License, 
version 1.1</a>
+<dt><a id="eCos11" 
href="https://directory.fsf.org/wiki/License:ECosPLv1.1";>eCos Public License, 
version 1.1</a>
     <span class="anchor-reference-id">
        (<a href="#eCos11">#eCos11</a>)</span></dt>
 <dd>
@@ -1964,7 +1962,7 @@
 This entry was previously listed as the First Do No Harm license.</p></dd>
 
 <dt><a id="GPL-PA"
- href="http://directory.fsf.org/wiki/License:GPL-PA";>
+ href="https://directory.fsf.org/wiki/License:GPL-PA";>
    GPL for Computer Programs of the Public Administration</a>
     <span class="anchor-reference-id">
        (<a href="#GPL-PA">#GPL-PA</a>)</span></dt>
@@ -2000,7 +1998,7 @@
 of the source code is limited to research purposes.</p></dd>
 
 
-<dt><a id="JSON" href="http://directory.fsf.org/wiki/License:JSON";>
+<dt><a id="JSON" href="https://directory.fsf.org/wiki/License:JSON";>
     The JSON License</a>
     <span class="anchor-reference-id">(<a href="#JSON">#JSON</a>)</span></dt>
 <dd>
@@ -2022,7 +2020,7 @@
 
 
 <dt><a id="Lha" href=
- "http://directory.fsf.org/wiki/License:Lha";>
+ "https://directory.fsf.org/wiki/License:Lha";>
     License of Lha</a>
     <span class="anchor-reference-id">(<a href="#Lha">#Lha</a>)</span></dt>
 <dd>
@@ -2031,7 +2029,7 @@
 
 
 <dt><a id="Ms-SS" href=
-     "http://directory.fsf.org/wiki/License:Ms-SS";>
+     "https://directory.fsf.org/wiki/License:Ms-SS";>
     Microsoft's Shared Source CLI, C#, and Jscript License</a>
     <span class="anchor-reference-id">(<a href="#Ms-SS">#Ms-SS</a>)</span></dt>
 <dd>
@@ -2042,7 +2040,7 @@
 Source&rdquo;, some of which have different restrictions.</p></dd>
 
 
-<dt><a id="NASA" href="http://directory.fsf.org/wiki/License:NASA-OSA_v1.3";>
+<dt><a id="NASA" href="https://directory.fsf.org/wiki/License:NASA-OSA_v1.3";>
     NASA Open Source Agreement</a>
     <span class="anchor-reference-id">(<a href="#NASA">#NASA</a>)</span></dt>
 <dd>
@@ -2058,7 +2056,7 @@
 
 
 <dt><a id="OculusRift"></a> <!-- old id, leave for compatibility -->
-    <a id="OculusRiftSDK" 
href="http://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License";>
+    <a id="OculusRiftSDK" 
href="https://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License";>
     Oculus Rift SDK License</a>
     <span class="anchor-reference-id">
        (<a href="#OculusRiftSDK">#OculusRiftSDK</a>)</span></dt>
@@ -2082,7 +2080,7 @@
 
 
 <dt><a id="OPL"></a> <!-- old id, leave for compatibility -->
-    <a id="OpenPublicL" 
href="http://directory.fsf.org/wiki/License:OpenPLv1.0";>
+    <a id="OpenPublicL" 
href="https://directory.fsf.org/wiki/License:OpenPLv1.0";>
     Open Public License</a>
     <span class="anchor-reference-id">
        (<a href="#OpenPublicL">#OpenPublicL</a>)</span></dt>
@@ -2093,7 +2091,7 @@
 not sure of that might also be problematic.</p></dd>
 
 
-<dt><a id="PPL" 
href="http://directory.fsf.org/wiki/License:PPL";>Peer-Production License</a>
+<dt><a id="PPL" 
href="https://directory.fsf.org/wiki/License:PPL";>Peer-Production License</a>
     <span class="anchor-reference-id">(<a href="#PPL">#PPL</a>)</span></dt>
 <dd>
 <p>The Peer-Production License is not a free software license because
@@ -2115,7 +2113,7 @@
 denies some users (organizations, governments, businesses) the four
 freedoms.</p></dd>
 
-<dt><a id="PINE" href="http://directory.fsf.org/wiki/License:PINE";>License of 
PINE</a>
+<dt><a id="PINE" href="https://directory.fsf.org/wiki/License:PINE";>License of 
PINE</a>
     <span class="anchor-reference-id">(<a href="#PINE">#PINE</a>)</span></dt>
 <dd>
 <p>The license of PINE is not a free software license because it mostly
@@ -2146,7 +2144,7 @@
 
 
 <dt><a id="RPL"
-    href="http://directory.fsf.org/wiki/License:ReciprocalPLv1.3";>
+    href="https://directory.fsf.org/wiki/License:ReciprocalPLv1.3";>
     Reciprocal Public License</a>
     <span class="anchor-reference-id">(<a href="#RPL">#RPL</a>)</span></dt>
 <dd>
@@ -2157,7 +2155,7 @@
 any modified version that an organization uses, even privately.</p></dd>
 
 
-<dt><a id="Scilab" 
href="http://directory.fsf.org/wiki/License:Scilab-old";>Scilab license</a>
+<dt><a id="Scilab" 
href="https://directory.fsf.org/wiki/License:Scilab-old";>Scilab license</a>
     <span class="anchor-reference-id">
        (<a href="#Scilab">#Scilab</a>)</span></dt>
 <dd>
@@ -2167,7 +2165,7 @@
 under CeCILL version&nbsp;2.</p></dd>
 
 
-<dt><a id="Scratch" 
href="http://directory.fsf.org/wiki/License:Scratch";>Scratch 1.4 license</a>
+<dt><a id="Scratch" 
href="https://directory.fsf.org/wiki/License:Scratch";>Scratch 1.4 license</a>
     <span class="anchor-reference-id">
        (<a href="#Scratch">#Scratch</a>)</span></dt>
 <dd>
@@ -2180,7 +2178,7 @@
 depend on the proprietary software, Adobe Air. </p></dd>
 
 
-<dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM";>
+<dt><a id="SML" href="https://directory.fsf.org/wiki/License:SimpleM";>
     Simple Machines License</a>
     <span class="anchor-reference-id">(<a href="#SML">#SML</a>)</span></dt>
 <dd><p>Despite the name, this is a software license, and it's nonfree
@@ -2194,7 +2192,7 @@
 </ul><p></p></dd>
 
 
-<dt><a id="Squeak" href="http://directory.fsf.org/wiki/License:Squeak-old";>Old 
Squeak license</a>
+<dt><a id="Squeak" 
href="https://directory.fsf.org/wiki/License:Squeak-old";>Old Squeak license</a>
     <span class="anchor-reference-id">
        (<a href="#Squeak">#Squeak</a>)</span></dt>
 <dd>
@@ -2212,7 +2210,7 @@
 under the <a href="#apache2">Apache License&nbsp;2.0</a>.</p></dd>
 
 
-<dt><a id="SunCommunitySourceLicense" 
href="http://directory.fsf.org/wiki/License:SunCSLv2.8";>Sun Community Source 
License</a>
+<dt><a id="SunCommunitySourceLicense" 
href="https://directory.fsf.org/wiki/License:SunCSLv2.8";>Sun Community Source 
License</a>
     <span class="anchor-reference-id">
        (<a href="#SunCommunitySourceLicense">#SunCommunitySourceLicense</a>)
     </span></dt>
@@ -2265,7 +2263,7 @@
 
 
 <dt><a id="Truecrypt-3.0"
-    href="http://directory.fsf.org/wiki/License:TrueCrypt";>
+    href="https://directory.fsf.org/wiki/License:TrueCrypt";>
     Truecrypt license 3.0</a>
     <span class="anchor-reference-id">
        (<a href="#Truecrypt-3.0">#Truecrypt-3.0</a>)</span></dt>
@@ -2280,7 +2278,7 @@
 unacceptable, and in our uncertainty about them we delayed in posting
 our evaluation.  We have posted it now to explain why we do not mourn
 the demise of Truecrypt.  There
-are <a href="http://directory.fsf.org/wiki?search=disk+encryption";>free
+are <a href="https://directory.fsf.org/wiki?search=disk+encryption";>free
 programs that do the same job</a>.</p></dd>
 
 
@@ -2363,7 +2361,7 @@
 
 
 <dt><a id="FreeBSDDL"
-       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
+       href="https://directory.fsf.org/wiki?title=License:FreeBSD-DL";>
     FreeBSD Documentation License</a>
     <span class="anchor-reference-id">
        (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
@@ -2526,7 +2524,7 @@
 <dl  class="green">
 
 <dt><a id="CC0"
-       href="http://directory.fsf.org/wiki/License:CC0";>
+       href="https://directory.fsf.org/wiki/License:CC0";>
     CC0</a>
     <span class="anchor-reference-id">(<a href="#CC0">#CC0</a>)</span></dt>
 <dd>
@@ -2635,7 +2633,7 @@
 don't use it for software or documentation, since it is incompatible
 with the GNU GPL and with the GNU FDL.</p></dd>
 
-<dt><a id="ODbl" href="http://directory.fsf.org/wiki/License:ODbl";>
+<dt><a id="ODbl" href="https://directory.fsf.org/wiki/License:ODbl";>
     Open Database license</a>
     <span class="anchor-reference-id">
        (<a href="#ODbl">#ODbl</a>)</span></dt>
@@ -2675,7 +2673,7 @@
 the <a
 href="/licenses/gpl-faq.html#FontException">font
 exception</a>.  See also this <a
-href="http://www.fsf.org/blogs/licensing/20050425novalis";>explanatory
+href="https://www.fsf.org/blogs/licensing/20050425novalis";>explanatory
 essay about the GPL Font Exception</a>.</p></dd>
 
 </dl> <!-- end class="green" -->
@@ -2692,7 +2690,7 @@
 incompatibility does not cause a problem.</p></dd>
 
 <dt><a id="ecfonts"
-       href="http://directory.fsf.org/wiki/License:LaTeX_ecfonts";>License
+       href="https://directory.fsf.org/wiki/License:LaTeX_ecfonts";>License
        of the ec fonts for LaTeX</a>
     <span class="anchor-reference-id">(<a 
href="#ecfonts">#ecfonts</a>)</span></dt>
 <dd>
@@ -2713,7 +2711,7 @@
 
 
 <dt><a id="IPAFONT"
-    href="http://directory.fsf.org/wiki/License:IPA_Font_License";> IPA
+    href="https://directory.fsf.org/wiki/License:IPA_Font_License";> IPA
     Font License</a>
     <span class="anchor-reference-id">
        (<a href="#IPAFONT">#IPAFONT</a>)</span></dt>
@@ -2726,7 +2724,7 @@
 and could be overly burdensome in other contexts.</p></dd>
 
 
-<dt><a id="SILOFL" 
href="http://directory.fsf.org/wiki/SIL_Open_Font_License_1.1";>
+<dt><a id="SILOFL" 
href="https://directory.fsf.org/wiki/SIL_Open_Font_License_1.1";>
     SIL Open Font License 1.1</a>
     <span class="anchor-reference-id">
        (<a href="#SILOFL">#SILOFL</a>)</span></dt>
@@ -2810,7 +2808,6 @@
 
 <p>3D-printer plans for decorative objects are artistic works; any of the
 Creative Commons licenses is ok for them.</p>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -2851,7 +2848,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/10/12 04:01:27 $
+$Date: 2021/11/25 10:06:09 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.zh-cn.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- licenses/po/license-list.zh-cn.po   25 Nov 2021 09:14:24 -0000      1.29
+++ licenses/po/license-list.zh-cn.po   25 Nov 2021 10:06:09 -0000      1.30
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-11-18 15:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -482,8 +481,8 @@
 "\"#apache2\">#apache2</a>)</span>"
 msgstr ""
 "<a id=\"apache2\" href=\"https://directory.fsf.org/wiki/License:";
-"Apache2.0\">Apache 许可证,版本 2.0</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#apache2\">#apache2</a>)</span>"
+"Apache2.0\">Apache 许可证,版本 2.0</a> <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#apache2\">#apache2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -943,8 +942,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#informal\">#informal</a>)</span>"
+"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#informal\">#informal</a>)</span>"
 msgstr ""
 "<a id=\"informal\">非正式许可证</a> <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#informal\">#informal</a>)</span>"
@@ -1306,8 +1305,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Ruby\" href=\"https://directory.fsf.org/wiki/License:Ruby\";> License "
-"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</"
-"a>)</span>"
+"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
 msgstr ""
 "<a id=\"Ruby\" href=\"https://directory.fsf.org/wiki/License:Ruby\";>Ruby 
的许"
 "可证</a> <span class=\"anchor-reference-id\">(<a 
href=\"#Ruby\">#Ruby</a>)</"
@@ -1481,8 +1480,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Vim\" href=\"https://directory.fsf.org/wiki/License:Vim7.2\";> "
-"License of Vim, Version 6.1 or later</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#Vim\">#Vim</a>)</span>"
+"License of Vim, Version 6.1 or later</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#Vim\">#Vim</a>)</span>"
 msgstr ""
 "<a id=\"Vim\" href=\"https://directory.fsf.org/wiki/License:Vim7.2\";>Vim 
许可"
 "证,版本 6.1 及以后版</a> <span class=\"anchor-reference-id\">(<a 
href=\"#Vim"
@@ -1503,14 +1502,14 @@
 "href=\"#W3C\">#W3C</a>)</span>"
 msgstr ""
 "<a id=\"W3C\" href=\"https://directory.fsf.org/wiki/License:";
-"W3C_31Dec2002\">W3C 软件声明和许可证</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#W3C\">#W3C</a>)</span>"
+"W3C_31Dec2002\">W3C 软件声明和许可证</a> <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#W3C\">#W3C</a>)</span>"
 
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"WebM\" href=\"https://directory.fsf.org/wiki/License:WebM\";> License "
-"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</"
-"a>)</span>"
+"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</a>)"
+"</span>"
 msgstr ""
 "<a id=\"WebM\" href=\"https://directory.fsf.org/wiki/License:WebM\";>WebM 
的许"
 "可证</a> <span class=\"anchor-reference-id\">(<a 
href=\"#WebM\">#WebM</a>)</"
@@ -1681,8 +1680,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ZLib\" href=\"https://directory.fsf.org/wiki/License:Zlib\";> License "
-"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</"
-"a>)</span>"
+"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
+"</span>"
 msgstr ""
 "<a id=\"ZLib\" href=\"https://directory.fsf.org/wiki/License:Zlib\";>ZLib 
的许"
 "可证</a> <span class=\"anchor-reference-id\">(<a 
href=\"#ZLib\">#ZLib</a>)</"
@@ -2011,9 +2010,9 @@
 "\">#CPAL</a>)</span>"
 msgstr ""
 "<a id=\"CPAL\" href=\"https://directory.fsf.org/wiki/License:";
-"Common_Public_Attribution_License_Version_1.0\">普通公共属性许可证 
1.0 "
-"(CPAL)</a> <span class=\"anchor-reference-id\"> (<a href=\"#CPAL\">#CPAL</"
-"a>)</span>"
+"Common_Public_Attribution_License_Version_1.0\">普通公共属性许可证 
1.0 (CPAL)"
+"</a> <span class=\"anchor-reference-id\"> (<a href=\"#CPAL\">#CPAL</a>)</"
+"span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2082,12 +2081,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EPL\" href=\"https://directory.fsf.org/wiki/License:EPLv1.0\";> "
-"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"https://directory.fsf.org/wiki/License:";
-"EPLv1.0\">Eclipse 公共许可证版本 1.0</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"EPLv1.0\">Eclipse 公共许可证版本 1.0</a> <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2104,12 +2103,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EPL2\" href=\"https://directory.fsf.org/wiki/License:EPL-2.0\";> "
-"Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#EPL2\">#EPL2</a>)</span>"
+"Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"EPL2\" href=\"https://directory.fsf.org/wiki/License:";
-"EPL-2.0\">Eclipse 公共许可证版本 2.0</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#EPL2\">#EPL2</a>)</span>"
+"EPL-2.0\">Eclipse 公共许可证版本 2.0</a> <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2309,8 +2308,8 @@
 "href=\"#IBMPL\">#IBMPL</a>)</span>"
 msgstr ""
 "<a id=\"IBMPL\" href=\"https://directory.fsf.org/wiki/License:";
-"IBMPLv1.0\">IBM 公共许可证,版本 1.0</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#IBMPL\">#IBMPL</a>)</span>"
+"IBMPLv1.0\">IBM 公共许可证,版本 1.0</a> <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#IBMPL\">#IBMPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2455,8 +2454,8 @@
 msgid ""
 "<a id=\"lucent102\" href=\"https://directory.fsf.org/wiki/License:";
 "LucentPLv1.02\"> Lucent Public License Version 1.02 (Plan 9 license)</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</"
-"a>)</span>"
+"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</a>)"
+"</span>"
 msgstr ""
 "<a id=\"lucent102\" href=\"https://directory.fsf.org/wiki/License:";
 "LucentPLv1.02\">Lucent 公共许可证 1.02(Plan 9 许可证)</a> <span 
class="
@@ -2494,8 +2493,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ms-rl\" href=\"https://directory.fsf.org/wiki/License:MsRL\";> "
-"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
+"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
 msgstr ""
 "<a id=\"ms-rl\" 
href=\"https://directory.fsf.org/wiki/License:MsRL\";>微软互惠"
 "许可证(Ms-RL)</a> <span class=\"anchor-reference-id\">(<a 
href=\"#ms-rl"
@@ -2795,8 +2794,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"QPL\" href=\"https://directory.fsf.org/wiki/License:QPLv1.0\";> Q "
-"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#QPL\">#QPL</a>)</span>"
+"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#QPL\">#QPL</a>)</span>"
 msgstr ""
 "<a id=\"QPL\" href=\"https://directory.fsf.org/wiki/License:QPLv1.0\";>Q 公å…
±"
 "许可证(QPL),版本 1.0</a> <span class=\"anchor-reference-id\">(<a 
href="
@@ -2906,8 +2905,8 @@
 "\">#SPL</a>)</span>"
 msgstr ""
 "<a id=\"SPL\" href=\"https://directory.fsf.org/wiki/License:SPLv1.0\";>Sun 公"
-"共许可证</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</"
-"a>)</span>"
+"共许可证</a> <span class=\"anchor-reference-id\">(<a 
href=\"#SPL\">#SPL</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3616,8 +3615,8 @@
 "\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>"
 msgstr ""
 "<a id=\"Ms-SS\" href= 
\"https://directory.fsf.org/wiki/License:Ms-SS\";>微软共"
-"享源代码 CLI、C# 和 Jscript 许可证</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>"
+"享源代码 CLI、C# 和 Jscript 许可证</a> <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3780,8 +3779,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"PINE\" href=\"https://directory.fsf.org/wiki/License:PINE\";>License "
-"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</"
-"a>)</span>"
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
 "<a id=\"PINE\" href=\"https://directory.fsf.org/wiki/License:PINE\";>PINE 
的许"
 "可证</a> <span class=\"anchor-reference-id\">(<a 
href=\"#PINE\">#PINE</a>)</"
@@ -3846,8 +3845,8 @@
 "reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
 msgstr ""
 "<a id=\"RPL\" href=\"https://directory.fsf.org/wiki/License:";
-"ReciprocalPLv1.3\">互惠公共许可证</a> <span 
class=\"anchor-reference-id"
-"\">(<a href=\"#RPL\">#RPL</a>)</span>"
+"ReciprocalPLv1.3\">互惠公共许可证</a> <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#RPL\">#RPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3916,8 +3915,8 @@
 "\"#SML\">#SML</a>)</span>"
 msgstr ""
 "<a id=\"SML\" 
href=\"https://directory.fsf.org/wiki/License:SimpleM\";>简单机"
-"器许可证</a> <span class=\"anchor-reference-id\">(<a href=\"#SML\">#SML</"
-"a>)</span>"
+"器许可证</a> <span class=\"anchor-reference-id\">(<a 
href=\"#SML\">#SML</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -4467,8 +4466,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GPLOther\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)"
+"</span>"
 msgstr ""
 "<a id=\"GPLOther\" href=\"/licenses/gpl.html\">GNU 通用公共许可证</a> 
<span "
 "class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)</span>"
@@ -4751,8 +4750,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GPLFonts\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)"
+"</span>"
 msgstr ""
 "<a id=\"GPLFonts\" href=\"/licenses/gpl.html\">GNU 通用公共许可证</a> 
<span "
 "class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)</span>"
@@ -4793,8 +4792,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ecfonts\" href=\"https://directory.fsf.org/wiki/License:LaTeX_ecfonts";
-"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
+"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
 msgstr ""
 "<a id=\"ecfonts\" href=\"https://directory.fsf.org/wiki/License:LaTeX_ecfonts";
 "\">LaTex ec 字体的许可证</a> <span class=\"anchor-reference-id\">(<a 
href="
@@ -5054,8 +5053,8 @@
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
-"<b>审校</b>:<a href=\"mailto:shankangke@gmail.com\";>&lt;Shankang Ke 
(柯善"
-"康)&gt;</a>,2020。<br></br>\n"
+"<b>审校</b>:<a href=\"mailto:shankangke@gmail.com\";>&lt;Shankang Ke 
(柯善康)"
+"&gt;</a>,2020。<br></br>\n"
 "<b>翻译团队</b>:<a rel=\"team\" 
href=\"https://savannah.gnu.org/projects/";
 "www-zh-cn/\">&lt;CTT&gt;</a>,2021。"
 

Index: po/home.ru-en.html
===================================================================
RCS file: /web/www/www/po/home.ru-en.html,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- po/home.ru-en.html  21 Jul 2021 20:34:06 -0000      1.222
+++ po/home.ru-en.html  25 Nov 2021 10:06:09 -0000      1.223
@@ -429,6 +429,12 @@
 
 <div class="second-column" role="complementary">
 
+<div id="giving-guide" class="emph-box color2">
+<p>This year, choose Freedom as a gift.  Here's an  <strong><a 
+href="https://www.fsf.org/blogs/community/fsf-giving-guide-freedom-is-the-greatest-gift-of-all";>
+Ethical Tech Giving Guide</a></strong></p>
+</div>
+
 <div id="schools" class="emph-box color1">
 <p><strong>UK universities find that <a 
href="https://www.theguardian.com/education/2021/jul/13/covid-has-been-a-big-catalyst-universities-plan-for-post-pandemic-life";>many
 students are fed up with virtual courses
 and want to attend class physically</a>. Others feel the opposite.</strong></p>
@@ -619,7 +625,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/21 20:34:06 $
+$Date: 2021/11/25 10:06:09 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/home.ru.po
===================================================================
RCS file: /web/www/www/po/home.ru.po,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -b -r1.685 -r1.686
--- po/home.ru.po       25 Nov 2021 09:24:52 -0000      1.685
+++ po/home.ru.po       25 Nov 2021 10:06:09 -0000      1.686
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-11-25 08:57+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -507,9 +506,9 @@
 "www.fsf.org/blogs/community/fsf-giving-guide-freedom-is-the-greatest-gift-of-"
 "all\"> Ethical Tech Giving Guide</a></strong>"
 msgstr ""
-"В этом выбери году в качестве подарка 
свободу. Вот <a href=\"https://";
-"www.fsf.org/blogs/community/fsf-giving-guide-freedom-is-the-greatest-gift-of-"
-"all\"> руководство по этичным техническим 
подаркам</a>."
+"В этом выбери году в качестве подарка 
свободу. Вот <a href=\"https://www.fsf.";
+"org/blogs/community/fsf-giving-guide-freedom-is-the-greatest-gift-of-all\"> "
+"руководство по этичным техническим 
подаркам</a>."
 
 #. type: Content of: <div><div><div><p>
 msgid ""

Index: po/planetfeeds.ru.po
===================================================================
RCS file: /web/www/www/po/planetfeeds.ru.po,v
retrieving revision 1.1938
retrieving revision 1.1939
diff -u -b -r1.1938 -r1.1939
--- po/planetfeeds.ru.po        25 Nov 2021 09:24:52 -0000      1.1938
+++ po/planetfeeds.ru.po        25 Nov 2021 10:06:09 -0000      1.1939
@@ -14,29 +14,20 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-11-25 06:05+0000\n"
 
 #. type: Content of: <p>
-# | GNU Parallel [-20210922 (&#39;Vindelev&#39;)-] {+20211122 (&#39;Peng
-# | Shuai&#39;)+} released [stable]
-#| msgid "GNU Parallel 20210922 (&#39;Vindelev&#39;) released [stable]"
 msgid "GNU Parallel 20211122 (&#39;Peng Shuai&#39;) released [stable]"
 msgstr "Выпущен GNU Parallel 20211122 ('Peng Shuai') 
[стабильный]"
 
 #.  TRANSLATORS: 
 #. http://savannah.gnu.org/forum/forum.php?forum_id=10075 
 #. type: Content of: <p>
-# | : GNU Parallel [-20210922 (&#39;Vindelev&#39;)-] {+20211122 (&#39;Peng
-# | Shuai&#39;)+} [stable] has been released. It is available for download at:
-# | [-lbry://@GnuParallel:4 No...-] {+lbry://@GnuParallel:4...+}
-#| msgid ""
-#| ": GNU Parallel 20210922 (&#39;Vindelev&#39;) [stable] has been released. "
-#| "It is available for download at: lbry://@GnuParallel:4 No..."
 msgid ""
 ": GNU Parallel 20211122 (&#39;Peng Shuai&#39;) [stable] has been released. "
 "It is available for download at: lbry://@GnuParallel:4..."
 msgstr ""
-": Выпущен GNU Parallel 20211122 ('Peng Shuai') [стабильный]. 
Он доступен на..."
+": Выпущен GNU Parallel 20211122 ('Peng Shuai') [стабильный]. 
Он доступен "
+"на..."
 
 #. type: Content of: <p>
 msgid "FSF Giving Guide: Freedom is the greatest gift of all"



reply via email to

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