www/philosophy apsl.zh-cn.html fs-motives.zh-cn...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/19 05:02:06

Modified files:
        philosophy     : apsl.zh-cn.html fs-motives.zh-cn.html 
                         gnutella.zh-cn.html java-trap.zh-cn.html 
                         linux-gnu-freedom.zh-cn.html 
                         shouldbefree.zh-cn.html 
        philosophy/po  : apsl.zh-cn-en.html apsl.zh-cn.po 
                         fs-motives.zh-cn-en.html fs-motives.zh-cn.po 
                         gnutella.zh-cn-en.html gnutella.zh-cn.po 
                         java-trap.zh-cn-en.html java-trap.zh-cn.po 
                         linux-gnu-freedom.zh-cn-en.html 
                         linux-gnu-freedom.zh-cn.po 
                         shouldbefree.zh-cn-en.html 
                         shouldbefree.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/apsl.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-motives.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/gnutella.zh-cn.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/java-trap.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/linux-gnu-freedom.zh-cn.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/shouldbefree.zh-cn.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-motives.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-motives.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gnutella.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gnutella.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.zh-cn.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.zh-cn-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.zh-cn.po?cvsroot=www&r1=1.13&r2=1.14

Patches:
Index: apsl.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/apsl.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- apsl.zh-cn.html     23 Jun 2020 07:29:31 -0000      1.1
+++ apsl.zh-cn.html     19 Jul 2021 09:02:01 -0000      1.2
@@ -1,15 +1,24 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/apsl.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="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由软件基金会对 Apple 公共源代ç 
è®¸å¯è¯ï¼ˆAPSL）的看法  - GNU 工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/apsl.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>自由软件基金会对 Apple å…¬å…±æºä»£ç è®¸å¯è¯ï¼ˆAPSL）2.0 
的看法</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>Apple å…¬å…±æºä»£ç è®¸å¯è¯ï¼ˆAPSL）版本 2.0 是合æ 
¼çš„自由软件许可证。Apple 的律师和 FSF 
为了这个目的在一起工作。<a
 href="/philosophy/historical-apsl.html">本页以前描述的问题</a> 对å…
¶ä»–许可证可能还会是问题，但是对 APSL
 2.0 已经不适用了。我们鼓励使用 Apple APSL 
软件的人使用版本 2.0 
的条款，而不要再使用更早的版本。</p>
@@ -34,6 +43,8 @@
 
 <p><a href="http://gnu-darwin.sourceforge.net/index.php";>GNU-Darwin</a> 是 
GNU 和
 Darwin 的一种组合，它应该只包含自由软件。</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -43,7 +54,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
@@ -62,13 +73,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="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
-<a href="/server/standards/README.translators.html">《译者
指南》</a>。</p>
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -87,9 +98,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2014, 2017, 2018 Free Software
-Foundation, Inc.</p>
-
+<p>Copyright &copy; 2003, 2021 Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -100,12 +109,12 @@
 
 <!--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>，2020。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2020，2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2020/06/23 07:29:31 $
+$Date: 2021/07/19 09:02:01 $
 
 <!-- timestamp end -->
 </p>

Index: fs-motives.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/fs-motives.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fs-motives.zh-cn.html       25 Feb 2019 14:30:46 -0000      1.1
+++ fs-motives.zh-cn.html       19 Jul 2021 09:02:01 -0000      1.2
@@ -1,15 +1,23 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/fs-motives.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>编写自由软件的动机 - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/fs-motives.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="article">
 <p>è¯·ä¸è¦é”™è¯¯åœ°å‡è®¾ä¸€åˆ‡è½¯ä»¶å¼€å‘éƒ½æœ‰å•ä¸€çš„ç®€å•åŽŸå› 
。我们就知道一些影响着许多人编写软件的不同动机。
 </p>
 
@@ -53,7 +61,7 @@
 <a
 
href="/philosophy/microsoft.html">把我们的批评狭隘地聚焦在Microsoft方面</a>并不正确。确实，Microsoft在作恶，å›
 
为它在做非自由软件。而更糟糕的是，它的软件经常是各种各æ
 ·çš„<a
 href="/philosophy/proprietary/malware-microsoft.html">恶意软件</a>，包
括<a
-href="http://DefectiveByDesign.org";>DRM</a>。然而，许多其他å…
¬å¸åœ¨åšåŒæ ·çš„事，而现在自由社区最恶劣的敌人是<a
+href="https://DefectiveByDesign.org";>DRM</a>。然而，许多其他å…
¬å¸åœ¨åšåŒæ ·çš„事，而现在自由社区最恶劣的敌人是<a
 href="/philosophy/proprietary/malware-apple.html">Apple</a>。<br />
 
 
尽管如此，很多人非常蔑视Microsoft也是事实，而有些人正是å›
 此为自由软件做贡献。
@@ -75,6 +83,8 @@
 
 <p>äººå„æœ‰å¿—ï¼Œæˆ‘ä»¬çš„åˆ—ä¸¾å¯èƒ½ä¼šé—æ¼ä¸€äº›åŠ¨æœºã€‚å¦‚æžœä½ 
知道其他的动机，请写邮件到<a
 
href="mailto:campaigns@gnu.org";>&lt;campaigns@gnu.org&gt;</a>。如果我们觉得这些动机可能影响了许多开发è€
…ï¼Œé‚£ä¹ˆæˆ‘ä»¬ä¼šæŠŠå®ƒä»¬åŠ 进来。</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -84,7 +94,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
@@ -103,19 +113,18 @@
 
         &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="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p>
-<p>关于进行协调与提交翻译的更多信息，请参见<a
-href="/server/standards/README.translations.html">《译者指南》</a>。</p>
+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
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -129,27 +138,28 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2009 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2009, 2021 Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a>授权。</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a> 授权。</p>
 
 <!--#include virtual="/server/bottom-notes.zh-cn.html" -->
 <div class="translators-credits">
 
 <!--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>，2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2019，2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/02/25 14:30:46 $
+$Date: 2021/07/19 09:02:01 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnutella.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/gnutella.zh-cn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnutella.zh-cn.html 10 Mar 2019 10:30:12 -0000      1.8
+++ gnutella.zh-cn.html 19 Jul 2021 09:02:01 -0000      1.9
@@ -1,15 +1,23 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/gnutella.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>关于Gnutella - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/gnutella.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>关于Gnutella</h2>
 
+<div class="article">
 <p>
 &ldquo;Gnutella&rdquo;目前是一个分布式文件å…
±äº«åè®®çš„名称，主要用于分享音乐文件。此名称有时也用来指该网络本身以及原始的Gnutella软件。这是一个相当混乱的æƒ
…况。更多关于Gnutella的渊源和历史，请参考该条目的<a
 href="http://en.wikipedia.org/wiki/Gnutella";>Wikipediaæ–‡ç« </a>。</p>
@@ -36,6 +44,9 @@
 <p>
 æ— è®ºåˆ†äº«ä»€ä¹ˆæ ·çš„å…¬å¼€ä¿¡æ¯ï¼Œæˆ‘ä»¬é¼“åŠ±äººä»¬åå¯¹è¿™æ 
·çš„假设&mdash;某些个人或公司拥有禁止分享和强行规定å…
¬ä¼—如何使用该信息的自然权力。即使美国法律在名义上也<a
 
href="/philosophy/reevaluating-copyright.html">拒绝</a>这种反社会的想法。</p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -44,7 +55,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
@@ -63,15 +74,16 @@
 
         &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>
 
-<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018, 2019 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 2000, 2001, 2004, 2021 Free Software Foundation, Inc.</p>
 
 <p>本文使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -82,12 +94,12 @@
 
 <!--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，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/03/10 10:30:12 $
+$Date: 2021/07/19 09:02:01 $
 
 <!-- timestamp end -->
 </p>

Index: java-trap.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/java-trap.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- java-trap.zh-cn.html        17 Aug 2020 10:00:28 -0000      1.2
+++ java-trap.zh-cn.html        19 Jul 2021 09:02:01 -0000      1.3
@@ -1,22 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/java-trap.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="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>戴镣铐的自由 - Java 陷阱 - GNU 工程 - 
自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/java-trap.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<h2>戴镣铐的自由 - Java 陷阱</h2>
+<!--#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">
 
-<p><a href="http://www.stallman.org/";>Richard Stallman</a> 著</p>
+<h2>戴镣铐的自由 - Java 陷阱</h2>
 
+<address class="byline"><a 
href="https://www.stallman.org/";>理查德·斯托曼</a> 著</address>
 
-<div class="announcement"><blockquote><h3>前言</h3>
+<h3 class="footnote">前言</h3>
 <p>è‡ªè¿™ç¯‡æ–‡ç« é¦–æ¬¡å‘å¸ƒä»¥æ¥ï¼ŒSun（现在是 Oracle 
çš„ä¸€éƒ¨åˆ†ï¼‰å·²ç»æ ¹æ® GNU 通用公共许可证<a
-href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>重新授权了</a>å…
¶å¤§éƒ¨åˆ† Java
-平台参考实现，且现在有一个自由的 Java å¼€å‘çŽ¯å¢ƒã€‚å› 
此，Java 语言本身不再是陷阱。</p>
+href="https://www.fsf.org/news/fsf-welcomes-gpl-java.html";>重新授权了</a>å
…¶å¤§éƒ¨åˆ†
+Java 平台参考实现，且现在有一个自由的 Java å¼€å‘çŽ¯å¢ƒã€‚å› 
此，Java 语言本身不再是陷阱。</p>
 
 <p>ä½†æ˜¯ï¼Œæ‚¨å¿…é¡»å°å¿ƒï¼Œå› ä¸ºå¹¶éžæ¯ä¸ª Java 
平台都是自由的。Sun 继续分发非自由的可执行 Java 平台，å…
¶ä»–å…¬å¸ä¹Ÿè¿™æ ·åšã€‚</p>
 
@@ -35,10 +42,10 @@
 的历史中吸取教训，以便将来避免其他陷阱。</p>
 
 <p>另请参见：<a href="/philosophy/javascript-trap.html"> JavaScript 
陷阱</a>。</p>
-</blockquote>
-</div>
+<hr class="column-limit" />
 
-<p>2004 年 4 月 12 日</p>
+<div class="article">
+<p><em>2004 年 4 月 12 日</em></p>
 
 <p>
   å¦‚æžœä½ 
的程序是自由软件，这基本上是道德的&mdash;&mdash;但有一个陷阱，您å¿
…须警惕。您的程序虽然本身是自由的，但可能受å…
¶ä¾èµ–的非自由软件的限制。由于问题对于
@@ -47,8 +54,7 @@
 
 <p>
   如果程序的用户拥有一些å…
³é”®çš„自由，则该程序为自由软件。粗略地说，它们是：运行程序的自由，学ä¹
 å’Œæ›´æ”¹æºä»£ç çš„è‡ªç”±ï¼Œé‡æ–°åˆ†å‘æºä»£ç 
å’ŒäºŒè¿›åˆ¶æ–‡ä»¶çš„自由以及发布改进版本的自由。（请参阅
-<a
-href="/philosophy/free-sw.html">http://www.gnu.org/philosophy/free-sw.html</a>。）一个有源代ç
 çš„程序是不是自由软件，只依赖于其许可证的含义。
+<a 
href="/philosophy/free-sw.html">自由软件定义</a>。）一个有源代ç 
çš„程序是不是自由软件，只依赖于其许可证的含义。
 </p>
 
 <p>
@@ -69,8 +75,9 @@
 
 <p>
   Sun 的 Java å®žçŽ°ä¸æ˜¯è‡ªç”±çš„ã€‚æ ‡å‡† Java 
库也是非自由的。我们确实有 Java 的自由实现，例如 <a
-href="http://gcc.gnu.org/java/";>GNU Java编译器</a>（GCJ）和 <a
-href="/software/classpath">GNU 
Classpath</a>，但它们尚不支持所有功能。我们仍在追赶。
+href="https://objectcomputing.com/resources/publications/sett/january-2003-gcj-the-gnu-compiler-for-java";>GNU
+Java编译器</a>（GCJ）和 <a href="/software/classpath">GNU
+Classpath</a>，但它们尚不支持所有功能。我们仍在追赶。
 </p>
 
 <p>
@@ -87,9 +94,9 @@
 <p>
   Sun ç»§ç»­å¼€å‘å…¶ä»–æ ‡å‡† Java åº“ï¼Œå¹¶ä¸”å‡ 
乎所有的库都是非自由的。在许多情
况下，即使是库的&ldquo;规范&rdquo;也是商业秘密，并且 Sun
 
针对这些规范的最新许可证禁止发布除规范的完整实现之外的任何å†
…容。（请参看 <a
-href="http://jcp.org/aboutJava/communityprocess/JSPA2.pdf";>http://jcp.org/aboutJava/communityprocess/JSPA2.pdf</a>
+href="https://jcp.org/aboutJava/communityprocess/JSPA2.pdf";>https://jcp.org/aboutJava/communityprocess/JSPA2.pdf</a>
 和 <a
-href="http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html";>http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html</a>
+href="https://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html";>https://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html</a>
 等示例。）
 </p>
 
@@ -113,8 +120,8 @@
 <p>
   为了使 Java ä»£ç å…å— Java 陷阱的影响，请安装自由的 Java
 å¼€å‘çŽ¯å¢ƒå¹¶ä½¿ç”¨å®ƒã€‚ä¸€èˆ¬æ¥è¯´ï¼Œæ— 
论使用哪种语言，请睁大眼睛，检查代ç 
æ‰€ä¾èµ–的程序的自由状态。验证程序是否自由的最简单方法是在“自由软件目录”（<a
-href="http://www.fsf.org/directory";>http://www.fsf.org/directory</a>）查找。如果程序不在目录中，则可以对ç
…§è‡ªç”±è½¯ä»¶è®¸å¯è¯åˆ—表（<a
-href="/licenses/license-list.html">http://www.gnu.org/licenses/license-list.html</a>）审查å
…¶è®¸å¯è¯ã€‚
+href="https://www.fsf.org/directory";>自由软件目录</a>）查找。如果程序不在目录中，则可以对ç
…§ <a
+href="/licenses/license-list.html">自由软件许可证列表</a> 审查å…
¶è®¸å¯è¯ã€‚
 </p>
 
 <p>
@@ -122,10 +129,12 @@
 Classpath éªŒè¯ä½ 
的程序，并报告在已实现的类中遇到的任何问题也很有用。然而，完成
 GNU Classpath
 éœ€è¦èŠ±è´¹æ—¶é—´ï¼›å¦‚æžœéžè‡ªç”±åº“çš„è¿˜åœ¨æŒç»­å¢žåŠ 
ï¼Œæˆ‘ä»¬å¯èƒ½æ°¸è¿œä¸ä¼šæœ‰æ‰€æœ‰æœ€æ–°çš„åº“ã€‚å› 
此，请不要给您的自由软件套上枷锁。今天，当您编写应用程序时，请一开始就按ç
…§åœ¨è‡ªç”±å·¥å…·ä¸Šè¿è¡Œçš„ç›®æ ‡æ¥ç¼–å†™ã€‚
 </p>
+</div>
 
-<h3>请同时参看：</h3>
+<h3 class="footnote">请同时参看：</h3>
 <p><a href="/philosophy/sun-in-night-time.html">The Curious Incident of Sun in
 the Night-Time</a></p>
+</div>
 
 <div class="translators-notes">
 
@@ -135,7 +144,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
@@ -154,16 +163,16 @@
 
         &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="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
-<a href="/server/standards/README.translators.html">《译者
指南》</a>。</p>
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
-<p>Copyright &copy; 2004, 2010, 2015 Richard Stallman</p>
+<p>Copyright &copy; 2004, 2010, 2015, 2021 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -175,16 +184,17 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>:<a rel="team" 
href="mailto:nios34@disroot.org";>Nios34</a><br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2020。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2020，2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2020/08/17 10:00:28 $
+$Date: 2021/07/19 09:02:01 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: linux-gnu-freedom.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/linux-gnu-freedom.zh-cn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- linux-gnu-freedom.zh-cn.html        12 Jul 2021 06:30:45 -0000      1.8
+++ linux-gnu-freedom.zh-cn.html        19 Jul 2021 09:02:01 -0000      1.9
@@ -133,7 +133,7 @@
 <a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
-<p>Copyright &copy; 2002, 2017, 2019, 2021 Richard M. Stallman</p>
+<p>Copyright &copy; 2002, 2021 Richard M. Stallman</p>
 
 <p>本页面采用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -150,7 +150,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/07/12 06:30:45 $
+$Date: 2021/07/19 09:02:01 $
 
 <!-- timestamp end -->
 </p>

Index: shouldbefree.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/shouldbefree.zh-cn.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- shouldbefree.zh-cn.html     12 Jul 2021 06:30:45 -0000      1.10
+++ shouldbefree.zh-cn.html     19 Jul 2021 09:02:01 -0000      1.11
@@ -391,8 +391,8 @@
 <a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
-<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 2018,
-2020, 2021 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2021 Free
+Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -410,7 +410,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/07/12 06:30:45 $
+$Date: 2021/07/19 09:02:01 $
 
 <!-- timestamp end -->
 </p>

Index: po/apsl.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/apsl.zh-cn-en.html       23 Jun 2020 07:29:32 -0000      1.1
+++ po/apsl.zh-cn-en.html       19 Jul 2021 09:02:06 -0000      1.2
@@ -1,11 +1,20 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- 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>FSF's Opinion on the Apple Public Source License (APSL)
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/apsl.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>FSF's Opinion of the Apple Public Source License (APSL) 2.0</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>The Apple Public Source License (APSL) version 2.0 qualifies as a free
 software license.  Apple's lawyers worked with the FSF to produce a
 license that would qualify.
@@ -50,10 +59,12 @@
 
 <p><a href="http://gnu-darwin.sourceforge.net/index.php";>GNU-Darwin</a> is a 
combination
 of GNU and Darwin that is supposed to include only free software.</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
@@ -71,13 +82,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>
 
@@ -98,9 +109,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2014, 2017, 2018 Free Software 
Foundation, Inc.</p>
-
+<p>Copyright &copy; 2003, 2021 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -110,7 +119,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/06/23 07:29:32 $
+$Date: 2021/07/19 09:02:06 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/apsl.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/apsl.zh-cn.po    19 Jul 2021 08:38:18 -0000      1.4
+++ po/apsl.zh-cn.po    19 Jul 2021 09:02:06 -0000      1.5
@@ -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: <title>
 msgid ""

Index: po/fs-motives.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-motives.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/fs-motives.zh-cn-en.html 25 Feb 2019 14:30:46 -0000      1.1
+++ po/fs-motives.zh-cn-en.html 19 Jul 2021 09:02:06 -0000      1.2
@@ -1,11 +1,19 @@
  <!--#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>Motives For Writing Free Software
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/fs-motives.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>Motives For Writing Free Software</h2>
 
+<div class="article">
 <p>Don't make the mistake of supposing that all software development
 has one simple motive.  Here are some of the motives we know influence
 many people to write free software.
@@ -70,7 +78,7 @@
 it makes nonfree software.  Even worse, it is
 often <a href="/philosophy/proprietary/malware-microsoft.html">
 malware</a> in various ways including
-<a href="http://DefectiveByDesign.org";>DRM</a>.  However, many other
+<a href="https://DefectiveByDesign.org";>DRM</a>.  However, many other
 companies do these things, and the nastiest enemy of our freedom
 nowadays is 
 <a href="/philosophy/proprietary/malware-apple.html">Apple</a>.<br />
@@ -103,10 +111,12 @@
 <a href="mailto:campaigns@gnu.org";>&lt;campaigns@gnu.org&gt;</a>.  If
 we think the other motives are likely to influence many developers, we
 will add them to the list.</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
@@ -124,19 +134,19 @@
         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>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -151,20 +161,20 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2009 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2009, 2021 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/02/25 14:30:46 $
+$Date: 2021/07/19 09:02:06 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/fs-motives.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-motives.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/fs-motives.zh-cn.po      19 Jul 2021 08:38:41 -0000      1.6
+++ po/fs-motives.zh-cn.po      19 Jul 2021 09:02:06 -0000      1.7
@@ -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 ""

Index: po/gnutella.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/gnutella.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gnutella.zh-cn-en.html   10 Mar 2019 10:30:12 -0000      1.4
+++ po/gnutella.zh-cn-en.html   19 Jul 2021 09:02:06 -0000      1.5
@@ -1,11 +1,19 @@
 <!--#include virtual="/server/header.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" -->
 <title>Regarding Gnutella
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/gnutella.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>Regarding Gnutella</h2>
 
+<div class="article">
 <p>
 &ldquo;Gnutella&rdquo; is, at present, the name for a protocol for distributed
 file sharing, mostly used for music files.  The name also sometimes
@@ -57,9 +65,12 @@
 can use it.  Even the US legal system nominally
 <a href="/philosophy/reevaluating-copyright.html">rejects</a> that
 anti-social idea.</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 <a
@@ -77,16 +88,16 @@
         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 of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018, 2019 Free Software 
Foundation, Inc.</p>
+<p>Copyright &copy; 2000, 2001, 2004, 2021 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -96,7 +107,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/03/10 10:30:12 $
+$Date: 2021/07/19 09:02:06 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/gnutella.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/gnutella.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/gnutella.zh-cn.po        19 Jul 2021 08:39:08 -0000      1.8
+++ po/gnutella.zh-cn.po        19 Jul 2021 09:02:06 -0000      1.9
@@ -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 "Regarding Gnutella - GNU Project - Free Software Foundation"

Index: po/java-trap.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/java-trap.zh-cn-en.html  5 Jun 2020 03:59:21 -0000       1.1
+++ po/java-trap.zh-cn-en.html  19 Jul 2021 09:02:06 -0000      1.2
@@ -1,18 +1,25 @@
 <!--#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="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Free but Shackled - The Java Trap
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/java-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>Free but Shackled - The Java 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>
 
-
-<div class="announcement"><blockquote><h3>Headnote</h3>
+<h3 class="footnote">Headnote</h3>
 <p>Since this article was first published, Sun (now part of Oracle)
-has <a href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>relicensed</a>
+has <a 
href="https://www.fsf.org/news/fsf-welcomes-gpl-java.html";>relicensed</a>
 most of its Java platform reference implementation under the GNU
 General Public License, and there is now a free development
 environment for Java.  Thus, the Java language as such is no longer a
@@ -47,10 +54,10 @@
 
 <p>Please also see: <a href="/philosophy/javascript-trap.html">
 The JavaScript Trap</a>.</p>
-</blockquote>
-</div>
+<hr class="column-limit" />
 
-<p>April 12, 2004</p>
+<div class="article">
+<p><em>April 12, 2004</em></p>
 
 <p>
   If your program is free software, it is basically ethical&mdash;but
@@ -65,8 +72,8 @@
   freedoms. Roughly speaking, they are: the freedom to run the
   program, the freedom to study and change the source, the freedom to
   redistribute the source and binaries, and the freedom to publish
-  improved versions. (See
-  <a 
href="/philosophy/free-sw.html">http://www.gnu.org/philosophy/free-sw.html</a>.)
+  improved versions. (See the
+  <a href="/philosophy/free-sw.html">Free Software Definition</a>.)
   Whether any given program in source form is free software depends
   solely on the meaning of its license.
 </p>
@@ -110,7 +117,8 @@
 <p>
   Sun's implementation of Java is nonfree. The standard Java libraries are
   nonfree also. We do have free implementations of Java, such as the <a
-  href="http://gcc.gnu.org/java/";>GNU Compiler for Java</a> (GCJ) and <a
+  
href="https://objectcomputing.com/resources/publications/sett/january-2003-gcj-the-gnu-compiler-for-java";>
+  GNU Compiler for Java</a> (GCJ) and <a
   href="/software/classpath">GNU Classpath</a>, but they don't support all the
   features yet. We are still catching up.
 </p>
@@ -136,9 +144,11 @@
   libraries, and nearly all of them are nonfree; in many cases, even
   a library's specification is a trade secret, and Sun's latest
   license for these specifications prohibits release of anything less
-  than a full implementation of the specification. (See
-  <a 
href="http://jcp.org/aboutJava/communityprocess/JSPA2.pdf";>http://jcp.org/aboutJava/communityprocess/JSPA2.pdf</a>
 and
-  <a 
href="http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html";>http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html</a>
+  than a full implementation of the specification. (See the
+  <a href="https://jcp.org/aboutJava/communityprocess/JSPA2.pdf";>
+  Java Specification Participation Agreement</a> and the
+  <a 
href="https://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html";>
+  J2ME&trade; Personal Basis Profile Specification</a>
   for examples.)
 </p>
 
@@ -181,11 +191,11 @@
   development environment and use it. More generally, whatever
   language you use, keep your eyes open, and check the free status of
   programs your code depends on. The easiest way to verify that a
-  program is free is by looking for it in the Free Software Directory
-  (<a href="http://www.fsf.org/directory";>http://www.fsf.org/directory</a>).
+  program is free is by looking for it in the <a
+  href="https://www.fsf.org/directory";>Free Software Directory</a>.
   If a program is not in the directory, you can check its license(s)
-  against the list of free software licenses
-  (<a 
href="/licenses/license-list.html">http://www.gnu.org/licenses/license-list.html</a>).
+  against the <a href="/licenses/license-list.html">list of free software
+  licenses</a>.
 </p>
 
 <p>
@@ -198,14 +208,16 @@
   put your free software in shackles. When you write an application program
   today, write it to run on free facilities from the start.
 </p>
+</div>
 
-<h3>See also:</h3>
+<h3 class="footnote">See also:</h3>
 <p><a href="/philosophy/sun-in-night-time.html">The Curious Incident
 of Sun in the Night-Time</a></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
@@ -223,17 +235,17 @@
         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>
 
-<p>Copyright &copy; 2004, 2010, 2015 Richard Stallman</p>
+<p>Copyright &copy; 2004, 2010, 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
@@ -243,10 +255,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/06/05 03:59:21 $
+$Date: 2021/07/19 09:02:06 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/java-trap.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/java-trap.zh-cn.po       19 Jul 2021 08:39:34 -0000      1.8
+++ po/java-trap.zh-cn.po       19 Jul 2021 09:02:06 -0000      1.9
@@ -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"
 "X-Generator: Poedit 1.8.7.1\n"
 
 #. type: Content of: <title>

Index: po/linux-gnu-freedom.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/linux-gnu-freedom.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/linux-gnu-freedom.zh-cn-en.html  12 Jul 2021 06:30:46 -0000      1.4
+++ po/linux-gnu-freedom.zh-cn-en.html  19 Jul 2021 09:02:06 -0000      1.5
@@ -269,7 +269,7 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2002, 2017, 2019, 2021 Richard M. Stallman</p>
+<p>Copyright &copy; 2002, 2021 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -279,7 +279,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/12 06:30:46 $
+$Date: 2021/07/19 09:02:06 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/linux-gnu-freedom.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/linux-gnu-freedom.zh-cn.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/linux-gnu-freedom.zh-cn.po       19 Jul 2021 08:40:00 -0000      1.13
+++ po/linux-gnu-freedom.zh-cn.po       19 Jul 2021 09:02:06 -0000      1.14
@@ -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 "Linux, GNU, and Freedom - GNU Project - Free Software Foundation"

Index: po/shouldbefree.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.zh-cn-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/shouldbefree.zh-cn-en.html       12 Jul 2021 06:30:46 -0000      1.6
+++ po/shouldbefree.zh-cn-en.html       19 Jul 2021 09:02:06 -0000      1.7
@@ -878,7 +878,7 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 
2018, 2020, 2021 Free
+<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2021 Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -889,7 +889,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/12 06:30:46 $
+$Date: 2021/07/19 09:02:06 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/shouldbefree.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.zh-cn.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/shouldbefree.zh-cn.po    19 Jul 2021 08:40:25 -0000      1.13
+++ po/shouldbefree.zh-cn.po    19 Jul 2021 09:02:06 -0000      1.14
@@ -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 "Why Software Should Be Free - GNU Project - Free Software Foundation"