www-commits
[Top][All Lists]
Advanced

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

www/philosophy 15-years-of-free-software.zh-cn....


From: GNUN
Subject: www/philosophy 15-years-of-free-software.zh-cn....
Date: Mon, 19 Jul 2021 04:33:04 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/19 04:33:03

Modified files:
        philosophy     : 15-years-of-free-software.zh-cn.html 
                         applying-free-sw-criteria.zh-cn.html 
                         free-doc.zh-cn.html free-sw.zh-cn.html 
                         javascript-trap.zh-cn.html 
                         open-source-misses-the-point.zh-cn.html 
                         selling.zh-cn.html why-free.zh-cn.html 
        philosophy/po  : 15-years-of-free-software.zh-cn-en.html 
                         15-years-of-free-software.zh-cn.po 
                         applying-free-sw-criteria.zh-cn-en.html 
                         applying-free-sw-criteria.zh-cn.po 
                         free-doc.zh-cn-en.html free-doc.zh-cn.po 
                         free-sw.zh-cn-en.html free-sw.zh-cn.po 
                         javascript-trap.zh-cn-en.html 
                         javascript-trap.zh-cn.po 
                         open-source-misses-the-point.zh-cn-en.html 
                         open-source-misses-the-point.zh-cn.po 
                         selling.zh-cn-en.html selling.zh-cn.po 
                         why-free.zh-cn-en.html why-free.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/15-years-of-free-software.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/applying-free-sw-criteria.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.zh-cn.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/javascript-trap.zh-cn.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.zh-cn.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling.zh-cn.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/why-free.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/15-years-of-free-software.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/15-years-of-free-software.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/applying-free-sw-criteria.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/applying-free-sw-criteria.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-cn-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-cn.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.zh-cn-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.zh-cn.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.zh-cn-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-free.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-free.zh-cn.po?cvsroot=www&r1=1.11&r2=1.12

Patches:
Index: 15-years-of-free-software.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/15-years-of-free-software.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 15-years-of-free-software.zh-cn.html        15 Jul 2020 09:31:55 -0000      
1.2
+++ 15-years-of-free-software.zh-cn.html        19 Jul 2021 08:33:02 -0000      
1.3
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/15-years-of-free-software.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由软件15年 - GNU工程 - 自由软件基金会</title>
@@ -12,12 +15,16 @@
 
 <!--#include virtual="/philosophy/po/15-years-of-free-software.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="reduced-width">
+
 <h2>自由软件15年</h2>
 
-<p>
-  <strong>Richard M. Stallman</strong> 著
-</p>
+<address class="byline">Richard Stallman 著</address>
 
+<div class="article">
 <p>
   
现在距自由软件运动和GNU工程的开始刚好过了15年。我们经历了一个漫长的æ—
…程。
 </p>
@@ -50,6 +57,8 @@
 <p>
   在未来的专æ 
ä¹‹ä¸­ï¼Œæˆ‘会接着撰写自由软件社区面临的特别挑战、影响计算机用户自由的å
…¶ä»–问题以及影响GNU/Linux系统的开发事项。
 </p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -59,7 +68,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会(FSF)&amp;GNU的一般性问题发送到<a
@@ -78,11 +87,13 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
-若您想翻译本文,请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
+我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方面有评论或一般性的建议,请发送至
 <a
+href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -101,7 +112,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2014, 2020 Richard M. Stallman</p>
+<p>Copyright &copy; 1999, 2021 Richard Stallman</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -112,16 +123,17 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译团队</b>:<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018,2020。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018,2020,2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2020/07/15 09:31:55 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: applying-free-sw-criteria.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/applying-free-sw-criteria.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- applying-free-sw-criteria.zh-cn.html        28 Jul 2019 08:58:34 -0000      
1.4
+++ applying-free-sw-criteria.zh-cn.html        19 Jul 2021 08:33:02 -0000      
1.5
@@ -1,17 +1,26 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/applying-free-sw-criteria.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>应用自由软件判断准则 - GNU 工程 - 
自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/applying-free-sw-criteria.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="reduced-width">
+
 <h2>应用自由软件判断准则</h2>
 
-<p>理查德·斯托曼 著</p>
+<address class="byline">理查德·斯托曼 著</address>
 
+<div class="article">
 <p>四项基本自由为判断<a
 href="/philosophy/free-sw.html">某一特定代ç 
ç‰‡æ–­æ˜¯å¦ä¸ºè‡ªç”±çš„</a>(即尊重用户自由)提供了准则。我们应当如何将它们应用于判断一个软件åŒ
…
、一套操作系统、一台计算机、或是一个网页是否适合被推荐使用呢?</p>
 
@@ -48,7 +57,7 @@
 href="https://gcc.gnu.org/ml/gcc/2014-01/msg00247.html";>GCC
 禁止任何非自由插件</a>。当一个程序å…
è®¸éžè‡ªç”±æ‰©å±•çš„时候,它至少不应该引导用户使用它们。例如,我们更倾向于选择
 LibreOffice 而非
 OpenOffice,由于后者提示用户使用非自由扩展,而 LibreOffice 
则避开了它们。我们开发<a
-href="http://directory.fsf.org/wiki/IceCat";>冰猫(IceCat)</a>起初也是为了避å
…å‘用户推广由火狐(FireFox)建议使用的非自由扩展。</p>
+href="https://directory.fsf.org/wiki/IceCat";>冰猫(IceCat)</a>起初也是为了避å
…å‘用户推广由火狐(FireFox)建议使用的非自由扩展。</p>
 
 <p>事实上,如果冰猫解释如何在 MacOS 
上运行冰猫,这将不会引导用户去运行
 
MacOS。但如果它介绍了一些非自由扩展,它将会鼓励冰猫用户安è£
…这些非自由扩展。因此,冰猫软件包及å…
¶æ‰‹å†Œå’Œç½‘站不应该介绍这些东西。</p>
@@ -141,6 +150,8 @@
 
 
<p>将<em>&rdquo;软件应当是自由的&ldquo;</em>这一基本理念应用到不同场合要求不同的实践策略。随着新æƒ
…况的出现,GNU 计划和 FSF
 将会适é…
æˆ‘们的自由准则,不论在实践中还是理论上,都将计算机用户引向自由。通过ä»
…ä»…
推荐尊重用户自由的程序、发行版和硬件产品,并且宣示您的立场,您可以为自由软件运动提供它所急需的支持。</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -150,7 +161,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有关自由软件基金会(FSF) &amp; GNU 的一般性 &amp; 
问题发送到<a
@@ -169,11 +180,13 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
-若您想翻译本文,请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
+我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方面有评论或一般性的建议,请发送至
 <a
+href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -192,7 +205,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2015, 2021 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -205,16 +218,17 @@
 <b>翻译</b>:<a rel="team"
 href="https://savannah.nongnu.org/projects/blug/";>BLUG</a><br></br>
 <b>翻译团队</b>:<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018,2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018,2019,2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/07/28 08:58:34 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: free-doc.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.zh-cn.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- free-doc.zh-cn.html 12 Jul 2021 04:31:22 -0000      1.25
+++ free-doc.zh-cn.html 19 Jul 2021 08:33:02 -0000      1.26
@@ -151,8 +151,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996-2007, 2009, 2015, 2016, 2019, 2021 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1996, 2019, 2021 Free Software Foundation, Inc.</p>
 
 <p>本页面采用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -170,7 +169,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/07/12 04:31:22 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>

Index: free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- free-sw.zh-cn.html  4 Feb 2021 08:32:19 -0000       1.20
+++ free-sw.zh-cn.html  19 Jul 2021 08:33:02 -0000      1.21
@@ -1,10 +1,13 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>什么是自由软件? - GNU工程 - 自由软件基金会</title>
+<title>什么是自由软件? - GNU 工程 - 自由软件基金会</title>
 <style type="text/css" media="print,screen"><!--
 .note { margin-left: 6%; margin-right: 6%; }
 @media (min-width: 48em) {
@@ -18,43 +21,89 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="reduced-width">
 <h2>什么是自由软件?</h2>
+<div class="thin"></div>
 
 <div class="article">
-<h3>自由软件定义</h3>
+<div class="important">
+<p>
+&ldquo;自由软件&rdquo;尊重用户的自由,并且尊重整个社区。粗略来讲,一个软件如果是自由软件,这意味着<b>用户可以自由地运行,拷贝,分发,学ä¹
 ï¼Œä¿®æ”¹å¹¶æ”¹è¿›è¯¥è½¯ä»¶</b>。因此,&ldquo;自由软件&rdquo;是å…
³ä¹Žè‡ªç”±çš„问题,与价格无å…
³ï¼Œè½¯ä»¶å¦‚何定价并不影响它是否被归类为自由软件。英文中,我们使用Free
+Software。由于Free一词既有自由,也有免费的意思。而Free
+Software中的Free是指&ldquo;自由言论&rdquo;中的自由,而非&ldquo;å
…è´¹&rdquo;这一意项。为避å…
æ­§ä¹‰ï¼Œåœ¨ä½¿ç”¨è‹±æ–‡æ—¶ï¼Œæˆ‘们也会借用法语或西班牙语的&ldquo;Libre
+Software&rdquo;来指自由软件。
+</p>
 
-<blockquote class="note" id="fsf-licensing"><p style="font-size: 80%">
-还有关于自由软件授权的其他问题?请参看其他 <a
-href="http://www.fsf.org/licensing";>授权资源</a>,如果必
要,请通过<a
-href="mailto:licensing@fsf.org";>licensing@fsf.org</a>联系 FSF 
合规实验室。</p>
-</blockquote>
+<p>
+你可能花钱购买了自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你如何获得你的拷贝,你
都有自由复制和修改该软件,乃至 <a
+href="/philosophy/selling.html">出售</a> 该软件的拷贝。
+</p>
+</div>
 
-<div class="comment">
 <p>
-此处给出自由软件的定义,用以衡量一款软件是否为自由软件。一直以来,我们不断改进这个定义,以此澄æ¸
…并解决我们遇到的各种问题。参考下方的<a
-href="#History">修改历史</a>,我们详细列出了å…
¨éƒ¨çš„影响自由软件定义的修改记录。
+我们支持软件用户的自由,因
为我们坚信这是每个用户应得的。有了这些自由,软件用户,æ—
 
论是个人还是集体,都可以掌控所运行的软件,并决定这些程序如何为自己服务。如果一个软件令用户失去了这种控制权,我们则称它为&ldquo;非自由&rdquo;的,或&ldquo;专有&rdquo;的程序。与自由软件相反,非自由软件会操控它的用户,而软件的开发è€
…则掌控着软件。这使得非自由软件成为了<a
+href="/philosophy/free-software-even-more-important.html">非正义力量的帮凶</a>。
 </p>
 
 <p>
 
&ldquo;开源&rdquo;是另外一回事:它有基于不同价值观的非常不同的哲学。å
…¶å®žé™…定义也不同,但是几
乎所有的开源程序事实上都是自由软件。我们在<a
 
href="/philosophy/open-source-misses-the-point.html">为什么&ldquo;开源&rdquo;错失了自由软件的重点</a>一文中阐述了这些不同。
 </p>
+
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">目录</h3>
+<ul>
+ <li><a href="#fs-definition">自由软件的定义</a>
+  <ul>
+   <li><a href="#four-freedoms">四项基本自由</a></li>
+   <li><a href="#selling">自由软件 <em>可以</em> 是商业软件</a></li>
+  </ul>
+ </li>
+ <li><a href="#clarifying">澄清自由和非自由的边界</a>
+  <ul>
+   <li><a href="#run-the-program">按ç…
§è‡ªå·±æ„æ„¿è¿è¡Œç¨‹åºçš„自由</a></li>
+   <li><a href="#make-changes">学习源代码并做出修改的自由</a></li>
+   <li><a href="#redistribute">按ç…
§è‡ªå·±æ„æ„¿åˆ†å‘软件的自由:基本要求</a></li>
+   <li><a href="#copyleft">Copyleft</a></li>
+   <li><a href="#packaging">打包和发行的详细规则</a></li>
+   <li><a href="#exportcontrol">出口条列</a></li>
+   <li><a href="#legal-details">法律考虑</a></li>
+   <li><a href="#contracts">基于合同的许可证</a></li>
+  </ul>
+ </li>
+ <li><a href="#in-practice">自由软件定义的实际操作</a>
+  <ul>
+   <li><a href="#interpretation">我们如何诠释这些准则</a></li>
+   <li><a href="#get-help">获取关于自由许可证的帮助</a></li>
+   <li><a 
href="#terminology">请使用正确的词汇讨论自由软件</a></li>
+  </ul>
+ </li>
+ <li><a href="#beyond-software">软件之外</a></li>
+ <li><a href="#History">历史</a></li>
+</ul>
 </div>
 
-<p>
-&ldquo;自由软件&rdquo;尊重用户的自由,并且尊重整个社区。粗略来讲,一个软件如果是自由软件,这意味着<b>用户可以自由地运行,拷贝,分发,学ä¹
 ï¼Œä¿®æ”¹å¹¶æ”¹è¿›è¯¥è½¯ä»¶</b>。因此,&ldquo;自由软件&rdquo;是å…
³ä¹Žè‡ªç”±çš„问题,与价格无å…
³ï¼Œè½¯ä»¶å¦‚何定价并不影响它是否被归类为自由软件。英文中,我们使用Free
-Software。由于Free一词既有自由,也有免费的意思。而Free
-Software中的Free是指&ldquo;自由言论&rdquo;中的自由,而非&ldquo;å
…è´¹&rdquo;这一意项。为避å…
æ­§ä¹‰ï¼Œåœ¨ä½¿ç”¨è‹±æ–‡æ—¶ï¼Œæˆ‘们也会借用法语或西班牙语的&ldquo;Libre
-Software&rdquo;来指自由软件。
-</p>
+<div class="edu-note" id="fsf-licensing">
+<p style="font-size:80%">
+还有关于自由软件授权的其他问题?请参看其他 <a
+href="http://www.fsf.org/licensing";>授权资源</a>,如果必
要,请通过<a
+href="mailto:licensing@fsf.org";>licensing@fsf.org</a>联系 FSF 
合规实验室。</p>
+<hr class="no-display" />
+</div>
+
+
+<h3 id="fs-definition" class="subheader">自由软件定义</h3>
 
 <p>
-我们支持软件用户的自由,因
为我们坚信这是每个用户应得的。有了这些自由,软件用户,æ—
 
论是个人还是集体,都可以掌控所运行的软件,并决定这些程序如何为自己服务。如果一个软件令用户失去了这种控制权,我们则称它为&ldquo;非自由&rdquo;的,或&ldquo;专有&rdquo;的程序。与自由软件相反,非自由软件会操控它的用户,而软件的开发è€
…则掌控着软件。这使得非自由软件成为了<a
-href="/philosophy/free-software-even-more-important.html">非正义力量的帮凶</a>。
+此处给出自由软件的定义,用以衡量一款软件是否为自由软件。一直以来,我们不断改进这个定义,以此澄æ¸
…并解决我们遇到的各种问题。参考下方的<a
+href="#History">修改历史</a>,我们详细列出了å…
¨éƒ¨çš„影响自由软件定义的修改记录。
 </p>
 
-<h4> 四项基本自由</h4>
-
+<h4 id="four-freedoms">四项基本自由</h4>
 <p>
 如果一个软件是自由软件,那么它必
须为用户提供以下四项基本自由:<a href="#f1">[1]</a>
 </p>
@@ -74,6 +123,9 @@
 
 <p>无论在哪种情况下,只有所有用户使用的代ç 
éƒ½æ»¡è¶³äº†è¿™å››é¡¹åŸºæœ¬è‡ªç”±ï¼Œè¯¥ç¨‹åºæ‰èƒ½è¢«è§†ä½œè‡ªç”±è½¯ä»¶ã€‚例如,有两个程序,甲程序运行的时候会自动调用乙程序。发布甲程序意味着用户å¿
…须使用到乙程序,那么必
须甲乙两个程序都是自由的,甲程序才是自由的。如果通过修改甲程序,使å
…¶ä¸å†ä¾èµ–乙程序,那么仅仅
以自由软件的形式发布甲程序即可。</p>
 
+
+<h4 id="selling">自由软件 <em>可以</em> 是商业软件</h4>
+
 <p>
 &ldquo;自由软件&rdquo; 不表示
 &ldquo;非商业化&rdquo;。与之相反,自由软件必
须可以商用、可以商业开发、可以商业发布。这个政策非常重要&mdash;缺乏这æ
 ·çš„政策,自由软件将无法实现自己的目标。
@@ -94,16 +146,12 @@
 假如获得自由软件拷贝的(潜在)用户遵守了å…
ˆå‰å‘布的自由软件的许可证条款,那么该自由软件必
须为获得软件的该(潜在)用户提供自由软件的四项基本自由。在自由方面对用户åŠ
 ä»¥é™åˆ¶æˆ–者
要求付费才能实践这些自由和不赋予用户自由没有什么两æ 
·ï¼Œå› æ­¤è¿™æ ·çš„程序不是自由软件。
 </p>
 
-<p>
-你可能花钱购买了自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你如何获得你的拷贝,你
都有自由复制和修改该软件,乃至 <a
-href="/philosophy/selling.html">出售</a> 该软件的拷贝。
-</p>
 
-<h3>澄清自由和非自由的边界</h3>
+<h3 id="clarifying" class="subheader">澄清自由和非自由的边界</h3>
 
 
<p>在本文的以下部分,我们会进一步准确地解释这些自由针对各种问题会如何扩展才能使软件自由。</p>
 
-<h4>自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿è‡ªç”±åœ°è¿è¡Œè¯¥è½¯ä»¶ã€‚</h4>
+<h4 id="run-the-program">自由度0:无论用户出于何种目的,必
须可以按照用户意愿自由地运行该软件。</h4>
 
 <p>
 
“自由地运行程序”(自由度0)意味着任何人或组织可以在任何(支持的)计算机系统上,出于任何目的去运行该程序,并且没有义务通知软件的开发è€
…
或任何个人或团体。此处,<em>用户</em>的目的是重点,而非<em>开发è€
…</em>的目的。如果你是该程序的用户,那么你
就可以自由地运行该程序。同理,如果你
把程序发布给别人,那么此人也成了软件的用户,他也可以出于自己的任何目的运行该软件。然而,ä½
 ä½œä¸ºè½¯ä»¶çš„发布者,不可将自己的目的强加于你的用户。
@@ -117,7 +165,7 @@
 <p>&ldquo;按照你的意愿&rdquo; 可以包含、可选择地包
含、&ldquo;完全不包含&rdquo;(如果你希望如此)。所以没有必
要再有一个单独的
 &ldquo;不运行程序的自由&rdquo;。</p>
 
-<h4>学习和更改程序源代码的自由</h4>
+<h4 id="make-changes">学习和更改程序源代码的自由</h4>
 
 <p>
 
自由度1和3(自由地修改软件;自由地发布修改后的软件)意味着用户å¿
…须有权访问程序的源代码。由此,访问源代ç 
æ˜¯æˆä¸ºè‡ªç”±è½¯ä»¶çš„å¿…
要条件。混编(Obfuscated)后的&ldquo;源代ç 
&rdquo;不是真正的源代码,不能被算作此处讨论的源代码。
@@ -141,7 +189,7 @@
 &ldquo;删除程序的自由&rdquo;。
 </p>
 
-<h4>自由度2:用户可以自由地分发该软件的拷贝。</h4>
+<h4 
id="redistribute">自由度2:用户可以自由地分发该软件的拷贝。</h4>
 
 <p>自由分发(自由度2和3)意味着你
(即,软件用户)可以把软件原版或修改版再发布给å…
¶ä»–用户。你可以å…
è´¹å‘布,也可以收取费用。软件可以发布给<a
 
href="#exportcontrol">任何地方的任何人</a>。所谓“自由”,意味着ä½
 çš„这些行为(发布软件原版或修改版给其他用户;或å…
¶ä»–自由度中提及的行为)不必事å…
ˆå¾å¾—任何人的许可,也不必为此额外支付任何费用。
@@ -152,19 +200,21 @@
 </p>
 
 <p>
-自由度3å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的修改版。自由软件不一定要求修改版å¿
…
须继续采用自由软件许可证。换句话说,自由软件许可证可以不å¿
…是<a
-href="/copyleft/copyleft.html">copyleft</a>许可证。但是,如果一个软件许可证要求修改后的软件å¿
…
须以非自由软件的形式发布,那么该许可证则不被视为自由软件许可证。
+自由度 3 å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的修改版。自由软件不一定要求修改版å¿
…
须继续采用自由软件许可证。换句话说,自由软件许可证可以不å¿
…是 <a
+href="/licenses/copyleft.html">copyleft</a>
+许可证。但是,如果一个软件许可证要求修改后的软件必
须以非自由软件的形式发布,那么该许可证则不被视为自由软件许可证。
 </p>
 
 <p>
 “自由地分发软件的拷贝”意味着必须å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的原版或用户自己的修改版。无
论那个版本,用户都可以选择发布程序的二进制或可执行文件,也可以发布程序的源代ç
 ã€‚(以可执行文件的形式发布程序可以让人方便安装
,这一点对于推广自由软件也至å…
³é‡è¦ã€‚)对于某些程序,也许无法或者不必
发布二进制或可执行文件(一些编程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…
须有权利以任何方式生成二进制或可执行文件,并且发布这些生成的软件。
 </p>
 
-<h4>Copyleft</h4>
+<h4 id="copyleft">Copyleft</h4>
 
 <p>
 当然,只要不违背这些æ 
¸å¿ƒè‡ªç”±ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯ä¹Ÿå¯ä»¥é¢å¤–添加
一些要求,限制软件的分发步骤。例如,<a
-href="/copyleft/copyleft.html">copyleft</a>就是常见的一种限制。简言之,copyleft要求软件的修改版å¿
…须同样以自由软件的形式发布。这条限制与æ 
¸å¿ƒè‡ªç”±å¹¶ä¸å†²çªï¼Œç›¸åï¼Œcopyleft可以用来很好地保护软件用户的自由。
+href="/licenses/copyleft.html">copyleft</a> 
就是常见的一种限制。简言之,copyleft
+要求软件的修改版必须同æ 
·ä»¥è‡ªç”±è½¯ä»¶çš„形式发布。这条限制与æ 
¸å¿ƒè‡ªç”±å¹¶ä¸å†²çªï¼Œç›¸åï¼Œcopyleft 
可以用来很好地保护软件用户的自由。
 </p>
 
 <p>
@@ -174,7 +224,7 @@
 href="/philosophy/categories.html">自由软件分类</a>来了解更多å…
³äºŽ&ldquo;自由软件&rdquo;、&ldquo;copyleft软件&rdquo;以及å…
¶ä»–分类和它们之间的关系。
 </p>
 
-<h4>打包和发行的详细规则</h4>
+<h4 id="packaging">打包和发行的详细规则</h4>
 
 <p>
 自由软件可以对修改版的打包
或分发方式做一定的限制。这些限制不得与前面提到的四大自由相矛盾,不得直接或间接地限制用户运行,修改或发布软件。例如,某些自由软件可以要求修改版不得使用软件的原有名字发布;不能使用软件的原有商æ
 ‡ï¼›å¿…é¡»æ 
‡æ˜Žè½¯ä»¶æ¥è‡ªè°çš„修改等等。只要这些限制不会明显地限制用户再发布软件的修改版,那么它们就是可以接受的。既然已经对软件修改了,那么ä½
 ä¼°è®¡ä¹Ÿå°±ä¸ä¼šåœ¨ä¹Žé’ˆå¯¹è¿™äº›é¢å¤–的小限制再做一点修改了。
@@ -187,18 +237,17 @@
 <p>
 
有一些特例需要额外讨论:如果某软件许可证要求修改后的软件å¿
…须修改可执行文件的名字,那么必须保证软件运行的环境å…
è®¸ä¿®æ”¹æ–‡ä»¶åæˆ–å…
·å¤‡æŸç§åˆ«åæœºåˆ¶ï¼Œå¦åˆ™è¯¥è¦æ±‚将被视作与自由软件原则相背。å›
 ä¸ºè½¯ä»¶çš„可执行文件可能会被å…
¶ä»–第三方软件调用,而文件名则是这种调用的基础。别名机制可以保证用户在遵守该要求的前提下,顺利将原版软件替换成修改版,并且不会影响依赖该软件的第三方程序。</p>
 
-<h4>出口条例</h4>
+<h4 id="exportcontrol">出口条例</h4>
 
 <p>
-一些政府的<a
-id="exportcontrol">出口限制</a>或贸易制裁可能会影响到软件用户在国é™
…范围内发布软件的自由。软件开发者
也许没有能力去改变这些现实,但是我们可以拒绝自我审查。自由软件的开发è€
…不得在软件许可证中要求用户遵守哪条特定法律,因
为开发者无法保证用户所在国度或地区具备该法律条款。这æ 
·ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯å°±ä¸ä¼šç»™ç”¨æˆ·åœ¨æ³•å¾‹ä¹‹å¤–添加
额外的违反基本自由的限制。
+一些政府的出口限制或贸易制裁可能会影响到软件用户在国é™
…范围内发布软件的自由。软件开发者
也许没有能力去改变这些现实,但是我们可以拒绝自我审查。自由软件的开发è€
…不得在软件许可证中要求用户遵守哪条特定法律,因
为开发者无法保证用户所在国度或地区具备该法律条款。这æ 
·ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯å°±ä¸ä¼šç»™ç”¨æˆ·åœ¨æ³•å¾‹ä¹‹å¤–添加
额外的违反基本自由的限制。
 </p>
 
 <p>
 当然,自由软件可以仅仅
在许可证中提及某条出口条例或相å…
³æ³•å¾‹ï¼Œè€Œä¸å¼ºåˆ¶è¦æ±‚用户遵守。这æ 
·åšåªæ˜¯ä¸ºç”¨æˆ·æä¾›äº†ä¿¡æ¯è€Œæ²¡æœ‰å®žé™…
限制用户。如果某条出口限制法律是普遍存在,å…
¨éƒ¨ç”¨æˆ·æ‰€åœ¨çš„地区都做出该限制的,那么在许可证中要求用户遵守该条例也不会被视为限制用户的自由。然而,这会存在潜在问题:一旦该条出口限制法律在某个用户的所在地区做了修改,那么该许可证也就不被视作自由的。
 </p>
 
-<h4>法律考虑</h4>
+<h4 id="legal-details">法律考虑</h4>
 
 <p>
 
要落实这些自由度,就应该保证:如果用户遵守许可证上的要求,那么这些自由度就å¿
…须是长久的,不可更改的。如果软件的开发者
有权利随意修改已发布软件的许可证,那么该软件也不被视为自由软件。
@@ -212,7 +261,7 @@
 自由软件许可证可以指定与软件相å…
³çš„诉讼需要遵守哪个地区的法律,或需要在哪里提起诉讼。
 </p>
 
-<h4>基于合同的许可证</h4>
+<h4 id="contracts">基于合同的许可证</h4>
 
 <p>
 
绝大部分自由软件许可证是基于版权的。基于版权,能采取的限制往往相对有限。如果一个许可证基于版权并且遵ç
…
§ä¸Šè¿°çš„自由软件原则,那么它很可能被视作是自由软件许可证。当然,我们也见过一些例外,不过这些还很少见。然而有些自由软件许可证是基于合同的。合同可能会有更多的额外要求。这就意味着基于合同的许可证可能会在很多不经意的地方违背自由软件原则,导致软件不被视作自由软件。
@@ -222,21 +271,15 @@
 很遗憾,我们无法列出所有可能的意外情
况。如果一份基于合同的许可证对用户做出了一些额外限制,并且这些限制是不可能åŒ
…
含在一份基于版权的许可证中的,那么我们就需要再三考虑它是否可以被视作自由许可证。很多æƒ
…况下,这些许可证都是非自由的。
 </p>
 
-<h4>在谈论自由软件时使用正确的词汇</h4>
+<h3 id="in-practice" class="subheader">自由软件定义的实际操作</h3>
 
-<p>
-在讨论自由软件的时候,尽量避免使用&ldquo;赠
送&rdquo;或&ldquo;免费&rdquo;一类的词汇。因
为这会让人们联想到价æ 
¼ï¼Œè€Œéžè‡ªç”±ã€‚一些常见的词汇,例如&ldquo;盗版&rdquo;,å…
¶ä¸­åŒ…含了或褒或贬的感情色彩,而这些感情
体现的价值观并不被我们接受。参见<a
-href="/philosophy/words-to-avoid.html">歧义词汇列表</a>,里面列举了我们不推荐使用的词汇以及相å
…³çš„讨论。我们还有一个<a
-href="/philosophy/fs-translations.html">列表</a>,包
含了&ldquo;自由软件&rdquo;一词在不同语言中的推荐翻译。
-</p>
-
-<h4>我们如何诠释这些标准</h4>
+<h4 id="interpretation">我们如何诠释这些标准</h4>
 
 <p>
 最后请注意,在实践中,本文中提及的各种å…
³äºŽè‡ªç”±è½¯ä»¶çš„界定æ 
‡å‡†éƒ½éœ€è¦ä»”细思考后再做出解释。在决定一个软件许可证是否是自由软件的时候,我们会仔细查看该许可证的å†
…
涵和行文是否符合本文中涉及的原则,由此决定许可证是否为自由软件许可证。如果许可证中åŒ
…
含了一些不合理的限制,哪怕这些限制没有在本文中提及,我们也会拒绝承认它是自由的。有时候,某个许可证可能会引起一场大讨论,甚至需要专业律师参与。这时候,我们往往需要仔细定夺之后才能给出结论。遇到这æ
 
·çš„许可证,在做出结论之后,我们很可能会更新本文,把之前没有考虑到的å›
 ç´ æ·»åŠ è¿›æ¥ã€‚
 </p>
 
-<h4>获得关于自由许可证的帮助</h4>
+<h4 id="get-help">获得关于自由许可证的帮助</h4>
 
 <p>
 如果你
想知道哪些许可证是自由软件许可证,可以参见我们的<a
@@ -252,7 +295,21 @@
 如果您真的需要自己创造
一个新许可证,那么我们会尽力帮助您。在我们的帮助下,我们会保证您的许可证是自由的,并且帮助您避å
…ä¸€äº›å¸¸è§çš„问题。
 </p>
 
-<h3 id="beyond-software">软件之外</h3>
+<h4 id="terminology">在谈论自由软件时使用正确的词汇</h4>
+
+<p>
+在讨论自由软件的时候,尽量避免使用&ldquo;赠
送&rdquo;或&ldquo;免费&rdquo;一类的词汇。因
为这会让人们联想到价æ 
¼ï¼Œè€Œéžè‡ªç”±ã€‚一些常见的词汇,例如&ldquo;盗版&rdquo;,å…
¶ä¸­åŒ…含了或褒或贬的感情色彩,而这些感情
体现的价值观并不被我们接受。参见<a
+href="/philosophy/words-to-avoid.html">歧义词汇列表</a>,里面列举了我们不推荐使用的词汇以及相å
…³çš„讨论。我们还有一个<a
+href="/philosophy/fs-translations.html">列表</a>,包
含了&ldquo;自由软件&rdquo;一词在不同语言中的推荐翻译。
+</p>
+
+<p id="open-source">
+现在还有另外一伙人,使用 &ldquo;开源&rdquo; 一词来表达与 
&ldquo;自由软件&rdquo;
+类似,但不完全相同的概念。我们更倾向于使用 
&ldquo;自由软件&rdquo; 这个词。因为一旦你
看到自由二字,就明白了它所要表达的意思。而
+&ldquo;开放&rdquo; 却从来不意味着自由。
+</p>
+
+<h3 id="beyond-software" class="subheader">软件之外</h3>
 
 <p>
 基于同样的原则,<a
@@ -260,21 +317,15 @@
 </p>
 
 <p>
-同理,相同的原则也适用于其他的具有实用功能的作品中 
&mdash; 所谓实用功能的作品,是指作品中包
含实用的知识,例如教育材料或参考材料。<a
-href="http://wikipedia.org";>维基百科</a>就是å…
¶ä¸­ä¸€ä¸ªå¹¿ä¸ºäººçŸ¥çš„例子。
+同理,相同的原则也适用于其他的å…
·æœ‰å®žç”¨åŠŸèƒ½çš„作品中&mdash;&mdash;所谓实用功能的作品,是指作品中åŒ
…含实用的知识,例如教育材料或参考材料。<a
+href="https://wikipedia.org";>维基百科</a> 就是å…
¶ä¸­ä¸€ä¸ªå¹¿ä¸ºäººçŸ¥çš„例子。
 </p>
 
 <p>
 
任何作品都<em>可以</em>是自由的,自由软件的定义也可以延伸到å
…¶ä»–作品上。关于这方面的材料,请参见<a
 href="http://freedomdefined.org/";>自由文化作品</a>。
 </p>
-
-<h3 id="open-source">开源?</h3>
-
-<p>
-现在还有另外一伙人,使用&ldquo;开源&rdquo;一词来表达与&ldquo;自由软件&rdquo;类似,但不完å
…
¨ç›¸åŒçš„概念。我们更倾向于使用&ldquo;自由软件&rdquo;这个词。å›
 ä¸ºä¸€æ—¦ä½ 
看到自由二字,就明白了它所要表达的意思。而&ldquo;开放&rdquo;<a
-href="/philosophy/open-source-misses-the-point.html">却并不意味着自由</a>。
-</p>
+<hr class="column-limit" />
 </div>
 
 <h3 id="History">本文修改历史</h3>
@@ -402,11 +453,13 @@
 
 <p>该列表并非包括全部修改记录,而仅仅是包
含了一些重要修正。比如,本列表不会包
括对拼写错误,错别字等小问题的修改。如果想要看到å…
¨éƒ¨çš„修改里时,请参见<a
 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log";>CVS日志</a>。</p>
+<hr class="column-limit" />
 
-<h3 style="font-size:1em">脚注</h3>
+<h3 class="footnote">脚注</h3>
 <ol>
 <li id="f1">使用0、1、2和3排列这些自由有历史的原因
。在1990年左右,列出来的自由是1、2和3。然后,我们意识到运行软件的自由也应该明确列出来。这个自由显然比另外3个自由更基本,所以应该列在前面。我们没有修改å
…¶ä»–3个自由的序号,而是将运行软件的自由列为&nbsp;0。</li>
 </ol>
+</div>
 
 <div class="translators-notes">
 
@@ -416,7 +469,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有关自由软件基金会与GNU的一般性问题发送到<a
@@ -435,11 +488,13 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
-若您想翻译本文,请参看<a 
href="/server/standards/README.translations.html">翻译手册</a>。</p>
+我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方面有评论或一般性的建议,请发送至
 <a
+href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -458,7 +513,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software
+<p>Copyright &copy; 1996-2002, 2004-2007, 2009-2019, 2021 Free Software
 Foundation, Inc.</p>
 
 <p>本页面采用<a rel="license"
@@ -477,7 +532,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/02/04 08:32:19 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>

Index: javascript-trap.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/javascript-trap.zh-cn.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- javascript-trap.zh-cn.html  1 Jun 2021 04:59:58 -0000       1.14
+++ javascript-trap.zh-cn.html  19 Jul 2021 08:33:02 -0000      1.15
@@ -1,25 +1,34 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/javascript-trap.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>JavaScript的陷阱</title>
 
 <!--#include virtual="/philosophy/po/javascript-trap.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="reduced-width">
 <h2>JavaScript的陷阱</h2>
 
-<p><a href="http://www.stallman.org/";>Richard Stallman</a> 著</p>
+<address class="byline"><a 
href="https://www.stallman.org/";>理查德·斯托曼</a> 著</address>
 
 <p><strong>ä½ 
可能每天都在自己的电脑上运行非自由软件却毫不知情
&mdash;&mdash;通过使用你的浏览器。</strong></p>
 
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>网络管理员:有<a
 href="/software/librejs/free-your-javascript.html">好几
种方法</a>可以指示网站的JavaScript程序的许可证。</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
 <p>在自由软件社区,<a
 
href="/philosophy/free-software-even-more-important.html">非自由软件会侵害å
…
¶ç”¨æˆ·</a>的概念大家都很熟悉。有些人会拒绝在电脑上使用任何专有软件,以此来捍卫自己的自由。还有许多人意识到非自由并拒绝那些程序。</p>
@@ -35,7 +44,7 @@
 href="/philosophy/free-sw.html">自由软件定义</a>的内容包
含着用户可以访问程序的源代码。一个程序的源代ç 
åº”该是有利于修改程序的形式&mdash;包括有利阅读的空æ 
¼å’Œåˆ†è¡Œã€è§£é‡Šæ€§æ³¨é‡Šå’Œæœ‰æ„ä¹‰çš„名称。这种紧密æ 
¼å¼ä¸æ˜¯æºä»£ç ï¼Œè€Œåªæ˜¯æ¯«æ— ç”¨å¤„的源代码替代品;其源代ç 
å¹¶æ²¡æœ‰æä¾›ç»™ç”¨æˆ·ï¼Œå› è€Œç”¨æˆ·æ— 
法了解该程序;该程序是非自由的。</p>
 
 <p>除了是非自由软件,许多这种程序是<em>恶意软件</em>,因
为它们<a
-href="http://github.com/w3c/fingerprinting-guidance/issues/8";>嗅
探用户</a>。更恶劣的是,有些站点使用服务来记录<a
+href="https://github.com/w3c/fingerprinting-guidance/issues/8";>嗅
探用户</a>。更恶劣的是,有些站点使用服务来记录<a
 
href="https://freedom-to-tinker.com/2017/11/15/no-boundaries-exfiltration-of-personal-data-by-session-replay-scripts/";>用户浏览该页面时的所有行为</a>。该服务本来应该&ldquo;修改&rdquo;记录以抹去网站不该获得的一些敏感数据。但是,即使该功能能够可é
 
的实施,该服务的整体目的也是给予该网站它不应该获得的个人数据。</p>
 
 <p>浏览器一般不会告诉你它们什么时候会加
è½½JavaScript程序。有些浏览器提供了完å…
¨ç¦ç”¨JavaScript的方法,可是即使你知道有问题,你
还是需要花很多精力去确认这些非自由软件并拦截它们。然而,就连自由软件社区的大多数用户都不知道这个有问题;而浏览器的沉默也好似在掩盖这个问题。</p>
@@ -109,14 +118,17 @@
 
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>网络管理员:有<a
 href="/software/librejs/free-your-javascript.html">好几
种方法</a>可以指示网站的JavaScript程序的许可证。</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
-<p><strong>致谢:</strong>我感谢<a 
href="/people/people.html#mattlee">Matt Lee</a>和<a
-href="http://ejohn.org";>John 
Resig</a>,他们帮助我们定义了我们提议的标准,还感谢David
-Parunakian提醒我关注此问题。</p>
+<p><strong>致谢:</strong>我感谢 <a 
href="/people/people.html#mattlee">Matt Lee</a> 和
+<a href="https://ejohn.org";>John 
Resig</a>,他们帮助我们定义了我们提议的标准,还感谢 David
+Parunakian 提醒我关注此问题。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -131,7 +143,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会(FSF)&amp;GNU的一般性问题发送到<a
@@ -150,7 +162,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -175,7 +187,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2009-2013, 2016, 2017, 2018, 2019, 2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2009-2013, 2016-2019, 2021 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -191,7 +203,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/06/01 04:59:58 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>

Index: open-source-misses-the-point.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/open-source-misses-the-point.zh-cn.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- open-source-misses-the-point.zh-cn.html     12 Jul 2021 03:00:57 -0000      
1.32
+++ open-source-misses-the-point.zh-cn.html     19 Jul 2021 08:33:02 -0000      
1.33
@@ -218,7 +218,7 @@
 <a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
-<p>Copyright &copy; 2007, 2010, 2012, 2015, 2016, 2019-2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2007, 2010, 2012-2016, 2019-2021 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -236,7 +236,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/07/12 03:00:57 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>

Index: selling.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/selling.zh-cn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- selling.zh-cn.html  12 Jul 2021 04:31:22 -0000      1.8
+++ selling.zh-cn.html  19 Jul 2021 08:33:02 -0000      1.9
@@ -168,8 +168,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996-1998, 2001, 2007, 2015-2018, 2021 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1996-1998, 2001, 2007, 2015, 2021 Free Software Foundation,
+Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -189,7 +189,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/07/12 04:31:22 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>

Index: why-free.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/why-free.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- why-free.zh-cn.html 12 Jul 2021 03:00:57 -0000      1.4
+++ why-free.zh-cn.html 19 Jul 2021 08:33:02 -0000      1.5
@@ -246,7 +246,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1994, 2009, 2020, 2021 Richard Stallman</p>
+<p>Copyright &copy; 1994, 2009, 2021 Richard Stallman</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -262,7 +262,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/07/12 03:00:57 $
+$Date: 2021/07/19 08:33:02 $
 
 <!-- timestamp end -->
 </p>

Index: po/15-years-of-free-software.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/15-years-of-free-software.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/15-years-of-free-software.zh-cn-en.html  15 Jul 2020 09:31:56 -0000      
1.2
+++ po/15-years-of-free-software.zh-cn-en.html  19 Jul 2021 08:33:03 -0000      
1.3
@@ -1,5 +1,8 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>15 Years of Free Software
 - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords"
@@ -9,13 +12,16 @@
 
 <!--#include virtual="/philosophy/po/15-years-of-free-software.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 
 <h2>15 Years of Free Software</h2>
 
-<p>
-  by <strong>Richard M. Stallman</strong>
-</p>
+<address class="byline">by Richard Stallman</address>
 
+<div class="article">
 <p>
   It is now just over 15 years since the beginning of the Free
   Software Movement and the GNU Project. We have come a long way.
@@ -81,10 +87,12 @@
   freedom for computer users, as well as developments affecting the
   GNU/Linux operating system.
 </p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -102,13 +110,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -129,7 +137,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2014, 2020 Richard M. Stallman</p>
+<p>Copyright &copy; 1999, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -139,10 +147,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/07/15 09:31:56 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/15-years-of-free-software.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/15-years-of-free-software.zh-cn.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/15-years-of-free-software.zh-cn.po       19 Jul 2021 08:13:02 -0000      
1.10
+++ po/15-years-of-free-software.zh-cn.po       19 Jul 2021 08:33:03 -0000      
1.11
@@ -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-07-16 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "15 Years of Free Software - GNU Project - Free Software Foundation"

Index: po/applying-free-sw-criteria.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/applying-free-sw-criteria.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/applying-free-sw-criteria.zh-cn-en.html  31 Dec 2018 13:31:00 -0000      
1.1
+++ po/applying-free-sw-criteria.zh-cn-en.html  19 Jul 2021 08:33:03 -0000      
1.2
@@ -1,14 +1,22 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Applying the Free Software Criteria
 - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/philosophy/po/applying-free-sw-criteria.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 
 <h2>Applying the Free Software Criteria</h2>
 
-<p>by Richard Stallman</p>
+<address class="byline">by Richard Stallman</address>
 
+<div class="article">
 <p>The four essential freedoms provide the criteria for <a
 href="/philosophy/free-sw.html">whether a particular piece of code is
 free/libre</a> (i.e., respects its users' freedom).  How should we
@@ -82,7 +90,7 @@
 should at least not steer people towards using them.  For instance, we
 choose LibreOffice over OpenOffice because OpenOffice suggests use of
 nonfree add-ons, while LibreOffice shuns them.  We developed <a
-href="http://directory.fsf.org/wiki/IceCat";>IceCat</a> initially to
+href="https://directory.fsf.org/wiki/IceCat";>IceCat</a> initially to
 avoid proposing the nonfree add-ons suggested by Firefox.</p>
 
 <p>In practice, if the IceCat package explains how to run IceCat on
@@ -269,10 +277,12 @@
 freedom-respecting programs, distros, and hardware products, and
 stating your policy, you can give much-needed support to the free
 software movement.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -290,13 +300,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -317,7 +327,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2015, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -327,10 +337,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/31 13:31:00 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/applying-free-sw-criteria.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/applying-free-sw-criteria.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/applying-free-sw-criteria.zh-cn.po       19 Jul 2021 08:12:18 -0000      
1.8
+++ po/applying-free-sw-criteria.zh-cn.po       19 Jul 2021 08:33:03 -0000      
1.9
@@ -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-07-16 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: po/free-doc.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.zh-cn-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/free-doc.zh-cn-en.html   12 Jul 2021 04:31:22 -0000      1.16
+++ po/free-doc.zh-cn-en.html   19 Jul 2021 08:33:03 -0000      1.17
@@ -206,7 +206,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-2007, 2009, 2015, 2016, 2019, 2021 Free Software
+<p>Copyright &copy; 1996, 2019, 2021 Free Software
 Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -217,7 +217,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/12 04:31:22 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-doc.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.zh-cn.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/free-doc.zh-cn.po        19 Jul 2021 07:55:24 -0000      1.28
+++ po/free-doc.zh-cn.po        19 Jul 2021 08:33:03 -0000      1.29
@@ -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-07-16 13:55+0000\n"
 "Plural-Forms: \n"
 
 # type: Content of: <title>

Index: po/free-sw.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/free-sw.zh-cn-en.html    4 Feb 2021 08:32:19 -0000       1.13
+++ po/free-sw.zh-cn-en.html    19 Jul 2021 08:33:03 -0000      1.14
@@ -1,6 +1,9 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
-<title>What is free software?
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>What is Free Software?
 - GNU Project - Free Software Foundation</title>
 <style type="text/css" media="print,screen"><!--
 .note { margin-left: 6%; margin-right: 6%; }
@@ -10,42 +13,17 @@
 --></style>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
 <meta http-equiv="Description" content="Since 1983, developing the free Unix 
style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." />
-
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
-<h2>What is free software?</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>What is Free Software?</h2>
+<div class="thin"></div>
 
 <div class="article">
-<h3>The Free Software Definition</h3>
-
-<blockquote class="note" id="fsf-licensing"><p style="font-size: 80%">
-Have a question about free software licensing not answered here?
-See our other <a href="http://www.fsf.org/licensing";>licensing resources</a>,
-and if necessary contact the FSF Compliance Lab
-at <a href="mailto:licensing@fsf.org";>licensing@fsf.org</a>.</p>
-</blockquote>
-
-<div class="comment">
-<p>
-The free software definition presents the criteria for whether a
-particular software program qualifies as free software.  From time to
-time we revise this definition, to clarify it or to resolve questions
-about subtle issues.  See the <a href="#History">History section</a>
-below for a list of changes that affect the definition of free
-software.
-</p>
-
-<p>
-&ldquo;Open source&rdquo; is something different: it has a very
-different philosophy based on different values.  Its practical
-definition is different too, but nearly all open source programs are
-in fact free.  We explain the
-difference in <a href="/philosophy/open-source-misses-the-point.html">
-Why &ldquo;Open Source&rdquo; misses the point of Free Software</a>.
-</p>
-</div>
-
+<div class="important">
 <p>
 &ldquo;Free software&rdquo; means software that respects users'
 freedom and community.  Roughly, it means that <b>the users have the
@@ -60,6 +38,14 @@
 </p>
 
 <p>
+You may have paid money to get copies of a free program, or you may
+have obtained copies at no charge.  But regardless of how you got your
+copies, you always have the freedom to copy and change the software,
+even to <a href="/philosophy/selling.html">sell copies</a>.
+</p>
+</div>
+
+<p>
 We campaign for these freedoms because everyone deserves them.  With
 these freedoms, the users (both individually and collectively) control
 the program and what it does for them.  When users don't control the
@@ -70,8 +56,76 @@
 an instrument of unjust power</a>.
 </p>
 
-<h4> The four essential freedoms</h4>
+<p>
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in <a href="/philosophy/open-source-misses-the-point.html">
+Why &ldquo;Open Source&rdquo; misses the point of Free Software</a>.
+</p>
+
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">Table of contents</h3>
+<ul>
+ <li><a href="#fs-definition">The Free Software Definition</a>
+  <ul>
+   <li><a href="#four-freedoms">The four essential freedoms</a></li>
+   <li><a href="#selling">Free software <em>can</em> be commercial</a></li>
+  </ul>
+ </li>
+ <li><a href="#clarifying">Clarifying the Boundary Between Free and Nonfree</a>
+  <ul>
+   <li><a href="#run-the-program">The freedom to run the program as you
+     wish</a></li>
+   <li><a href="#make-changes">The freedom to study the source code and make
+     changes</a></li>
+   <li><a href="#redistribute">The freedom to redistribute if you wish:
+     basic requirements</a></li>
+   <li><a href="#copyleft">Copyleft</a></li>
+   <li><a href="#packaging">Rules about packaging and distribution
+     details</a></li>
+   <li><a href="#exportcontrol">Export regulations</a></li>
+   <li><a href="#legal-details">Legal considerations</a></li>
+   <li><a href="#contracts">Contract-based licenses</a></li>
+  </ul>
+ </li>
+ <li><a href="#in-practice">The Free Software Definition in Practice</a>
+  <ul>
+   <li><a href="#interpretation">How we interpret these criteria</a></li>
+   <li><a href="#get-help">Get help with free licenses</a></li>
+   <li><a href="#terminology">Use the right words when talking about free
+     software</a></li>
+  </ul>
+ </li>
+ <li><a href="#beyond-software">Beyond Software</a></li>
+ <li><a href="#History">History</a></li>
+</ul>
+</div>
+
+<div class="edu-note" id="fsf-licensing">
+<p style="font-size:80%">
+Have a question about free software licensing not answered here?
+See our other <a href="http://www.fsf.org/licensing";>licensing resources</a>,
+and if necessary contact the FSF Compliance Lab
+at <a href="mailto:licensing@fsf.org";>licensing@fsf.org</a>.</p>
+<hr class="no-display" />
+</div>
+
 
+<h3 id="fs-definition" class="subheader">The Free Software Definition</h3>
+
+<p>
+The free software definition presents the criteria for whether a
+particular software program qualifies as free software.  From time to
+time we revise this definition, to clarify it or to resolve questions
+about subtle issues.  See the <a href="#History">History section</a>
+below for a list of changes that affect the definition of free
+software.
+</p>
+
+<h4 id="four-freedoms">The four essential freedoms</h4>
 <p>
 A program is free software if the program's users have the
 four essential freedoms: <a href="#f1">[1]</a>
@@ -108,6 +162,9 @@
 are free.  However, if we plan to modify A so that it doesn't use B,
 only A needs to be free; B is not pertinent to that plan.</p>
 
+
+<h4 id="selling">Free software <em>can</em> be commercial</h4>
+
 <p>
 &ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.
 On the contrary, a free program must be available for commercial use,
@@ -145,20 +202,14 @@
 renders the program nonfree.
 </p>
 
-<p>
-You may have paid money to get copies of a free program, or you may
-have obtained copies at no charge.  But regardless of how you got your
-copies, you always have the freedom to copy and change the software,
-even to <a href="/philosophy/selling.html">sell copies</a>.
-</p>
 
-<h3>Clarifying the boundary between free and nonfree</h3>
+<h3 id="clarifying" class="subheader">Clarifying the Boundary Between Free and 
Nonfree</h3>
 
 <p>In the rest of this article we explain more precisely how far the
 various freedoms need to extend, on various issues, in order for a
 program to be free.</p>
 
-<h4>The freedom to run the program as you wish</h4>
+<h4 id="run-the-program">The freedom to run the program as you wish</h4>
 
 <p>
 The freedom to run the program means the freedom for any kind of person
@@ -191,7 +242,7 @@
 all&rdquo; if that is what you wish.  So there is no need for a
 separate &ldquo;freedom not to run a program.&rdquo;</p>
 
-<h4>The freedom to study the source code and make changes</h4>
+<h4 id="make-changes">The freedom to study the source code and make 
changes</h4>
 
 <p>
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -233,7 +284,8 @@
 Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
 </p>
 
-<h4>The freedom to redistribute if you wish: basic requirements</h4>
+<h4 id="redistribute">The freedom to redistribute if you wish: basic
+requirements</h4>
 
 <p>Freedom to distribute (freedoms 2 and 3) means you are free to
 redistribute copies, either with or without modifications, either
@@ -254,7 +306,7 @@
 Freedom 3 includes the freedom to release your modified versions
 as free software.  A free license may also permit other ways of
 releasing them; in other words, it does not have to be
-a <a href="/copyleft/copyleft.html">copyleft</a> license.  However, a
+a <a href="/licenses/copyleft.html">copyleft</a> license.  However, a
 license that requires modified versions to be nonfree does not qualify
 as a free license.
 </p>
@@ -270,12 +322,12 @@
 make them.
 </p>
 
-<h4>Copyleft</h4>
+<h4 id="copyleft">Copyleft</h4>
 
 <p>
 Certain kinds of rules about the manner of distributing free
 software are acceptable, when they don't conflict with the central
-freedoms.  For example, <a href="/copyleft/copyleft.html">copyleft</a>
+freedoms.  For example, <a href="/licenses/copyleft.html">copyleft</a>
 (very simply stated) is the rule that when redistributing the program,
 you cannot add restrictions to deny other people the central freedoms.
 This rule does not conflict with the central freedoms; rather it
@@ -295,7 +347,7 @@
 relate to each other.
 </p>
 
-<h4>Rules about packaging and distribution details</h4>
+<h4 id="packaging">Rules about packaging and distribution details</h4>
 
 <p>
 Rules about how to package a modified version are acceptable,
@@ -330,10 +382,10 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.</p>
 
-<h4>Export regulations</h4>
+<h4 id="exportcontrol">Export regulations</h4>
 
 <p>
-Sometimes government <a id="exportcontrol">export control regulations</a>
+Sometimes government export control regulations
 and trade sanctions can constrain your freedom to distribute copies of
 programs internationally.  Software developers do not have the power to
 eliminate or override these restrictions, but what they can and must do
@@ -354,7 +406,7 @@
 software nonfree.
 </p>
 
-<h4>Legal considerations</h4>
+<h4 id="legal-details">Legal considerations</h4>
 
 <p>
 In order for these freedoms to be real, they must be permanent and
@@ -378,7 +430,7 @@
 law applies, or where litigation must be done, or both.
 </p>
 
-<h4>Contract-based licenses</h4>
+<h4 id="contracts">Contract-based licenses</h4>
 
 <p>
 Most free software licenses are based on copyright, and there are limits
@@ -399,23 +451,12 @@
 it is nonfree.
 </p>
 
-<h4>Use the right words when talking about free software</h4>
-
-<p>
-When talking about free software, it is best to avoid using terms
-like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
-the issue is about price, not freedom.  Some common terms such
-as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
-<a href="/philosophy/words-to-avoid.html">Confusing Words and Phrases that
-are Worth Avoiding</a> for a discussion of these terms.  We also have
-a list of proper <a href="/philosophy/fs-translations.html">translations of
-&ldquo;free software&rdquo;</a> into various languages.
-</p>
+<h3 id="in-practice" class="subheader">The Free Software Definition in 
Practice</h3>
 
-<h4>How we interpret these criteria</h4>
+<h4 id="interpretation">How we interpret these criteria</h4>
 
 <p>
-Finally, note that criteria such as those stated in this free software
+Note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
 whether a specific software license qualifies as a free software license,
 we judge it based on these criteria to determine whether it fits their
@@ -428,7 +469,7 @@
 it easier to see why certain licenses do or don't qualify.
 </p>
 
-<h4>Get help with free licenses</h4>
+<h4 id="get-help">Get help with free licenses</h4>
 
 <p>
 If you are interested in whether a specific license qualifies as a free
@@ -452,7 +493,28 @@
 and avoid various practical problems.
 </p>
 
-<h3 id="beyond-software">Beyond Software</h3>
+<h4 id="terminology">Use the right words when talking about free software</h4>
+
+<p>
+When talking about free software, it is best to avoid using terms
+like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
+the issue is about price, not freedom.  Some common terms such
+as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
+<a href="/philosophy/words-to-avoid.html">Confusing Words and Phrases that
+are Worth Avoiding</a> for a discussion of these terms.  We also have
+a list of proper <a href="/philosophy/fs-translations.html">translations of
+&ldquo;free software&rdquo;</a> into various languages.
+</p>
+
+<p id="open-source">
+Another group uses the term &ldquo;open source&rdquo; to mean
+something close (but not identical) to &ldquo;free software&rdquo;.  We
+prefer the term &ldquo;free software&rdquo; because, once you have heard that
+it refers to freedom rather than price, it calls to mind freedom.  The
+word &ldquo;open&rdquo; never refers to freedom.
+</p>
+
+<h3 id="beyond-software" class="subheader">Beyond Software</h3>
 
 <p>
 <a href="/philosophy/free-doc.html">Software manuals must be free</a>,
@@ -464,7 +526,7 @@
 The same arguments also make sense for other kinds of works of
 practical use &mdash; that is to say, works that embody useful knowledge,
 such as educational works and reference
-works.  <a href="http://wikipedia.org";>Wikipedia</a> is the best-known
+works.  <a href="https://wikipedia.org";>Wikipedia</a> is the best-known
 example.
 </p>
 
@@ -473,17 +535,7 @@
 has been extended to a definition of <a href="http://freedomdefined.org/";>
 free cultural works</a> applicable to any kind of works.
 </p>
-
-<h3 id="open-source">Open Source?</h3>
-
-<p>
-Another group uses the term &ldquo;open source&rdquo; to mean
-something close (but not identical) to &ldquo;free software&rdquo;.  We
-prefer the term &ldquo;free software&rdquo; because, once you have heard that
-it refers to freedom rather than price, it calls to mind freedom.  The
-word &ldquo;open&rdquo; <a 
href="/philosophy/open-source-misses-the-point.html">
-never refers to freedom</a>.
-</p>
+<hr class="column-limit" />
 </div>
 
 <h3 id="History">History</h3>
@@ -625,8 +677,9 @@
 You can review the complete list of changes to the page through
 the <a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log";>cvsweb
 interface</a>.</p>
+<hr class="column-limit" />
 
-<h3 style="font-size:1em">Footnote</h3>
+<h3 class="footnote">Footnote</h3>
 <ol>
 <li id="f1">The reason they are numbered 0, 1, 2 and 3 is historical. Around
 1990 there were three freedoms, numbered 1, 2 and 3. Then we realized that
@@ -634,10 +687,11 @@
 It was clearly more basic than the other three, so it properly should
 precede them. Rather than renumber the others, we made it freedom&nbsp;0.</li>
 </ol>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -655,13 +709,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -682,7 +736,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021
+<p>Copyright &copy; 1996-2002, 2004-2007, 2009-2019, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -693,7 +747,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/02/04 08:32:19 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- po/free-sw.zh-cn.po 19 Jul 2021 08:11:39 -0000      1.51
+++ po/free-sw.zh-cn.po 19 Jul 2021 08:33:03 -0000      1.52
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-16 09:55+0000\n"
 "X-Generator: Poedit 1.7.5\n"
 
 #. type: Content of: <title>

Index: po/javascript-trap.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.zh-cn-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/javascript-trap.zh-cn-en.html    1 Jun 2021 04:59:58 -0000       1.13
+++ po/javascript-trap.zh-cn-en.html    19 Jul 2021 08:33:03 -0000      1.14
@@ -1,12 +1,19 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The JavaScript Trap</title>
 <!--#include virtual="/philosophy/po/javascript-trap.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The JavaScript Trap</h2>
 
-<p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
 <p><strong>You may be running nonfree programs on your computer every
 day without realizing it&mdash;through your web browser.</strong></p>
@@ -14,11 +21,13 @@
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
 
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>Webmasters: there are
 <a href="/software/librejs/free-your-javascript.html">several ways</a>
 to indicate the license of JavaScript programs in a web site.</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
 <p>In the free software community, the idea that
 <a href="/philosophy/free-software-even-more-important.html">
@@ -61,7 +70,7 @@
 
 <p>In addition to being nonfree, many of these programs
 are <em>malware</em> because
-they <a href="http://github.com/w3c/fingerprinting-guidance/issues/8";>snoop
+they <a href="https://github.com/w3c/fingerprinting-guidance/issues/8";>snoop
 on the user</a>.  Even nastier, some sites use services which record
 <a 
href="https://freedom-to-tinker.com/2017/11/15/no-boundaries-exfiltration-of-personal-data-by-session-replay-scripts/";>all
 the user's actions while looking at the page</a>.  The services
@@ -233,20 +242,23 @@
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
 
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>Webmasters: there are
 <a href="/software/librejs/free-your-javascript.html">several ways</a>
 to indicate the license of JavaScript programs in a web site.</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
 <p><strong>Acknowledgements:</strong> I thank <a 
href="/people/people.html#mattlee">Matt Lee</a>
-and <a href="http://ejohn.org";>John Resig</a> for their help in
+and <a href="https://johnresig.com/";>John Resig</a> for their help in
 defining our proposed criterion, and David Parunakian for
 bringing the problem to my attention.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -264,13 +276,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -291,7 +303,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2009-2013, 2016, 2017, 2018, 2019, 2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2009-2013, 2016-2019, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -301,7 +313,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/06/01 04:59:58 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/javascript-trap.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.zh-cn.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- po/javascript-trap.zh-cn.po 19 Jul 2021 07:54:57 -0000      1.34
+++ po/javascript-trap.zh-cn.po 19 Jul 2021 08:33:03 -0000      1.35
@@ -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-07-18 09:55+0000\n"
 
 #. type: Content of: <div><h2>
 msgid "The JavaScript Trap"
@@ -340,8 +339,8 @@
 "it uses bracket notation for dynamic object property access, which looks "
 "like <b><em>object</em>[<em>property</em>]</b>."
 msgstr ""
-"该程序使用带有方括号形式的动态对象属性访问,就像<b><em>object</"
-"em>[<em>property</em>]</b>这样。"
+"该程序使用带有方括号形式的动态对象属性访问,就像<b><em>object</em>"
+"[<em>property</em>]</b>这样。"
 
 #. type: Content of: <div><ul><li>
 msgid "it alters the DOM."

Index: po/open-source-misses-the-point.zh-cn-en.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/open-source-misses-the-point.zh-cn-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/open-source-misses-the-point.zh-cn-en.html       12 Jul 2021 03:00:57 
-0000      1.22
+++ po/open-source-misses-the-point.zh-cn-en.html       19 Jul 2021 08:33:03 
-0000      1.23
@@ -486,7 +486,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2007, 2010, 2012, 2015, 2016, 2019-2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2007, 2010, 2012-2016, 2019-2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -496,7 +496,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/12 03:00:57 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/open-source-misses-the-point.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.zh-cn.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- po/open-source-misses-the-point.zh-cn.po    19 Jul 2021 07:31:05 -0000      
1.73
+++ po/open-source-misses-the-point.zh-cn.po    19 Jul 2021 08:33:03 -0000      
1.74
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-16 13:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -338,11 +337,11 @@
 "some respects.  Nonetheless, their definition agrees with our definition in "
 "most cases."
 msgstr ""
-"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</"
-"a>(它是由开源促进会发布的,鉴于这个定义过长,就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥"
-"从我们对于自由软件的界定衍生而来。不过二者
也有不同,在某些方面,开源软件的定"
-"义比自由软件更宽松。不过总体而言,开源软件的定义和我们自由软件的定义在很多地"
-"方都是等价的。"
+"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</a>"
+"(它是由开源促进会发布的,鉴于这个定义过长,就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥ä»Ž"
+"我们对于自由软件的界定衍生而来。不过二者
也有不同,在某些方面,开源软件的定义"
+"比自由软件更宽松。不过总体而言,开源软件的定义和我们自由软件的定义在很多地方"
+"都是等价的。"
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: po/selling.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/selling.zh-cn-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/selling.zh-cn-en.html    12 Jul 2021 04:31:24 -0000      1.6
+++ po/selling.zh-cn-en.html    19 Jul 2021 08:33:03 -0000      1.7
@@ -239,7 +239,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-1998, 2001, 2007, 2015-2018, 2021
+<p>Copyright &copy; 1996-1998, 2001, 2007, 2015, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -250,7 +250,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/12 04:31:24 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/selling.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/selling.zh-cn.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/selling.zh-cn.po 19 Jul 2021 07:55:50 -0000      1.10
+++ po/selling.zh-cn.po 19 Jul 2021 08:33:03 -0000      1.11
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-16 13:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Selling Free Software - GNU Project - Free Software Foundation"

Index: po/why-free.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/why-free.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/why-free.zh-cn-en.html   12 Jul 2021 03:00:57 -0000      1.4
+++ po/why-free.zh-cn-en.html   19 Jul 2021 08:33:03 -0000      1.5
@@ -368,7 +368,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1994, 2009, 2020, 2021 Richard Stallman</p>
+<p>Copyright &copy; 1994, 2009, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -378,7 +378,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/12 03:00:57 $
+$Date: 2021/07/19 08:33:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/why-free.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/why-free.zh-cn.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/why-free.zh-cn.po        19 Jul 2021 07:30:35 -0000      1.11
+++ po/why-free.zh-cn.po        19 Jul 2021 08:33:03 -0000      1.12
@@ -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-07-16 13:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""



reply via email to

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