www-commits
[Top][All Lists]
Advanced

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

www/philosophy free-software-for-freedom.zh-cn....


From: GNUN
Subject: www/philosophy free-software-for-freedom.zh-cn....
Date: Sun, 26 Sep 2021 06:02:15 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/26 06:02:15

Modified files:
        philosophy     : free-software-for-freedom.zh-cn.html 
                         lessig-fsfs-intro.zh-cn.html 
        philosophy/po  : free-software-for-freedom.zh-cn-en.html 
                         free-software-for-freedom.zh-cn.po 
                         lessig-fsfs-intro.zh-cn-en.html 
                         lessig-fsfs-intro.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-software-for-freedom.zh-cn.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/lessig-fsfs-intro.zh-cn.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-software-for-freedom.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-software-for-freedom.zh-cn.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/lessig-fsfs-intro.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/lessig-fsfs-intro.zh-cn.po?cvsroot=www&r1=1.11&r2=1.12

Patches:
Index: free-software-for-freedom.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-software-for-freedom.zh-cn.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- free-software-for-freedom.zh-cn.html        28 Oct 2020 06:59:35 -0000      
1.10
+++ free-software-for-freedom.zh-cn.html        26 Sep 2021 10:02:15 -0000      
1.11
@@ -1,19 +1,27 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/free-software-for-freedom.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="essays aboutfs free-open" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>为什么&ldquo;自由软件&rdquo;好于&ldquo;开源&rdquo; - 
GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/free-software-for-freedom.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="article reduced-width">
 <h2>为什么&ldquo;自由软件&rdquo;好于&ldquo;开源&rdquo;</h2>
 
-<div class="announcement">
-<blockquote><p>本文已经被其主要重写版替代,<a
-href="/philosophy/open-source-misses-the-point.html">&ldquo;开源&rdquo;错失了自由软件的重点</a>,重写版要好得多。为了历史原å›
 ï¼Œæˆ‘们还把它放在这里。</p></blockquote>
+<div class="infobox" style="font-style: italic">
+<p>本文已经被其主要重写版替代,<a
+href="/philosophy/open-source-misses-the-point.html">&ldquo;开源&rdquo;错失了自由软件的重点</a>,重写版要好得多。为了历史原å›
 ï¼Œæˆ‘们还把它放在这里。</p>
 </div>
+<hr class="thin" />
 
 <p>
 虽然自由软件不以自由命名,也能给你同æ 
·çš„自由,但是使用其他的名字会造
成重大的不同:不同的词汇<em>传达不同的理念</em>。</p>
@@ -131,11 +139,11 @@
 厂商也曾发布意义不明确的公开声明,以便使人们对å…
¶äº§å“èŒç”Ÿ&ldquo;开源&rdquo;的印象。例如IBM对它的一个不符开源官方定义的产品如此声称:</p>
 
 <blockquote><p>
-一如开源社群,......科技产品的使用者
也能参与IBM的合作......
+一如开源社群......科技产品的使用者也能参与IBM的合作......
 </p></blockquote>
 
 <p>
-此声明并未明确说该程序<em>是</em>&ldquo;开源&rdquo;程序;但是许多读è€
…却不会注意此细节。(我必须告知读者
,后来IBM真诚地试着让它变成自由软件,并引å…
¥ä¸€ä¸ªæ–°è®¸å¯è¯ä½¿å®ƒå˜æˆè‡ªç”±è½¯ä»¶å’Œ&ldquo;开源&rdquo;;只不过,上述的声明发表之初,它哪个都不是。</p>
+此声明并未明确说该程序<em>是</em>&ldquo;开源&rdquo;程序;但是许多读è€
…却不会注意此细节。(我必须告知读者
,后来IBM真诚地试着让它变成自由软件,并引å…
¥ä¸€ä¸ªæ–°è®¸å¯è¯ä½¿å®ƒå˜æˆè‡ªç”±è½¯ä»¶å’Œ&ldquo;开源&rdquo;;只不过,上述的声明发表之初,它哪个都不是。)</p>
 
 <p>
 其次的案例是,Cygnus 
Solutions如何从原来要成为一家自由软件å…
¬å¸ï¼Œè€Œç»“果变成专属软件å…
¬å¸çš„分支,它为专属软件作如此宣传:</p>
@@ -190,8 +198,7 @@
 
 <p>
 散播自由权益的理念是艰巨的事业&mdash;它需要你
的帮助。那也是我们坚持为GNU工程使用&ldquo;自由软件&rdquo;这一措辞的缘æ•
…,它有助于完成这个事业。如果你
感到自由权益与社区本身的重要性&mdash;不只为图它带来的便利&mdash;请åŠ
 å…¥æˆ‘们一起使用&ldquo;自由软件&rdquo;这个措辞。</p>
-
-<hr />
+<div class="column-limit"></div>
 
 <!-- The archived version is truncated.
 <p>
@@ -200,14 +207,16 @@
 <a 
href="http://web.archive.org/web/20080703140137/http://www.itworld.com/LWD010523vcontrol4";>Live
 and
 let license [archived]</a> that gives his perspective on this issue.</p>
 -->
+<h3 class="footnote">注</h3>
 <p>
 Lakhani和Wolf在<a
-href="http://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>å
…³äºŽè‡ªç”±è½¯ä»¶å¼€å‘者
之动机的论文</a>中说,相当一部分开发者
的动机是认为软件应该是自由的。而这个结果还是基于他们的调查是针对在SourceForge上的开发è€
…,而那是一个并不支持自由软件的道德观点的网站。</p>
+href="https://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>å
…³äºŽè‡ªç”±è½¯ä»¶å¼€å‘者
之动机的论文</a>中说,相当一部分开发者
的动机是认为软件应该是自由的。而这个结果还是基于他们的调查是针对在SourceForge上的开发è€
…,而那是一个并不支持自由软件的道德观点的网站。</p>
 
-<hr />
-<blockquote id="fsfs"><p>本文发表于<a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>自由软件,自由社会:Richard
-M. Stallman选集</cite></a>。</p></blockquote>
+<hr class="no-display" />
+<div class="edu-note c"><p id="fsfs">本文发表于<a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>自由软件,自由社会:Richard
+M. Stallman选集</cite></a>。</p></div>
+</div>
 
 <div class="translators-notes">
 
@@ -221,7 +230,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
@@ -240,15 +249,32 @@
 
         &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; 1998, 1999, 2000, 2001, 2007, 2016, 2020 Free Software
-Foundation, Inc.</p>
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 1998-2003, 2007, 2010, 2021 Free Software Foundation, 
Inc.</p>
 
 <p>本页面<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -263,16 +289,17 @@
 <b>审校</b>: 刘昭宏 <a
 href="mailto:chliu@gnu.org";>&lt;chliu@gnu.org&gt;</a><br></br>
 <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/10/28 06:59:35 $
+$Date: 2021/09/26 10:02:15 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: lessig-fsfs-intro.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/lessig-fsfs-intro.zh-cn.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- lessig-fsfs-intro.zh-cn.html        28 Oct 2020 06:59:35 -0000      1.11
+++ lessig-fsfs-intro.zh-cn.html        26 Sep 2021 10:02:15 -0000      1.12
@@ -1,19 +1,25 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/lessig-fsfs-intro.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="thirdparty" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 
<title>《自由软件,自由社会:理查德·马修·斯托曼选集》的引言
 - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/lessig-fsfs-intro.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<h2><a
-href="http://shop.fsf.org/product/free-software-free-society/";><i>《自由软件,自由社会:理查德·马修·斯托曼选集》</i></a>的引言</h2>
-
-<p>
-Lawrence Lessig著,斯坦福大学法学院法学教授
-</p>
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="article reduced-width">
+<h2><cite>《自由软件,自由社会:理查德·马修·斯托曼选集》</cite>的引言</h2>
+
+<address class="byline">
+Lawrence Lessig&nbsp;<a href="#lessig"><sup>[*]</sup></a> 著
+</address>
 
 <p>
 
每代人都有它的哲学家&mdash;一位能够把握时代想象力的作家或艺术家。有时这些哲学家被认为是这æ
 ·çš„;通常要几代人之后,他们的时代å…
³è”才会变成现实。但是无
论是否被人们认识,一个时代由说出其理想的人作为æ 
‡å¿—,不管是通过吟诗还是在政治运动的风暴中。
@@ -54,13 +60,13 @@
 法律的这种状况超
出了立法工作本身。考虑一下美国法院对法律的实施。当事人雇用律师来提升å
…
¶åˆ©ç›Šï¼Œæœ‰æ—¶å€™è¿™ç§åˆ©ç›Šé€šè¿‡è¯‰è®¼å¾—以提升。在诉讼过程中,律师写出案æƒ
…,这些案情
反过来影响法官写下的意见。这些意见决定谁能够在案件中获胜,或è€
…某条法律是否能够和宪法一致。
 </p>
 <p>
-这个过程中的所有材料都是斯托曼所指意义下的自由。诉讼案æƒ
…摘要是å…
¬å¼€çš„,别人可以自由使用。论据是透明的(这不同于说它们是好的),推理可以æ—
 é¡»å¾—到原律师å…
è®¸è€Œè¢«æ‹¿èµ°ã€‚它们产生的观点可以在以后的案情
摘要里面引用,并可以复制或综合进别的案情
摘要或意见中。美国法律的&ldquo;源代ç 
&rdquo;在设计上和原则上,对任何使用它的人都是开放和自由的。拿律师来说,通过重复使用以前发生的案件,一个伟大的案æƒ
…摘要就获得了创造
力,这是衡量摘要的方法。原始资料是自由的;创新和经济秩序在å
…¶ä¸Šå»ºç«‹ã€‚
+这个过程中的所有材料都是斯托曼所指意义下的自由。诉讼案æƒ
…摘要是å…
¬å¼€çš„,别人可以自由使用。论据是透明的(这不同于说它们是好的),推理可以æ—
 é¡»å¾—到原律师å…
è®¸è€Œè¢«æ‹¿èµ°ã€‚它们产生的观点可以在以后的案情
摘要里面引用,并可以复制或综合进别的案情
摘要或意见中。美国法律的&ldquo;源代ç 
&rdquo;在设计上和原则上,对任何使用它的人都是开放和自由的。拿律师来说&mdash;&mdash;通过重复使用以前发生的案件,一个伟大的案æƒ
…摘要就获得了创造
力,这是衡量摘要的方法。原始资料是自由的;创新和经济秩序在å
…¶ä¸Šå»ºç«‹ã€‚
 </p>
 <p>
 自由代码(这里我指自由的法律代ç 
ï¼‰å½¢æˆçš„经济秩序并没有饿死律师。尽管任何人都可以使用和复制他们做成的东西,律师事务所仍然有足够动机来作出好的案æƒ
…摘要。律师是能工巧匠,他/她的产品是å…
¬å¼€çš„。但是这种工艺不是慈善行为。律师得到收入,å…
¬ä¼—并未要求不给这种工作报酬。相反,通过后来的工作补充
以前的工作,这种经济繁荣起来。
 </p>
 <p>
-我们可以想象一种不同的法律实施方法&mdash;保密的案情
和论据;只有结果没有论证的判决。警方持有而不向别人发布的法律。不解释条令而实行的法规。
+我们可以想象一种不同的法律实施方法&mdash;&mdash;保密的案æƒ
…
和论据;只有结果没有论证的判决。警方持有而不向别人发布的法律。不解释条令而实行的法规。
 </p>
 <p>
 我们可以想象这个社会,但是我们无法想象称å…
¶ä¸º&ldquo;自由&rdquo;。不管这样的社会是否能更好地或者
更有效地分é…
èƒ½åŠ¨æ€§ï¼Œè¿™ä¸ªç¤¾ä¼šä¸èƒ½ç§°ä¸ºæ˜¯è‡ªç”±çš„。自由的理想,在自由社会生活的理想,要求的不只是高效的应用。相反,开放和透明是建立自由社会法律体系的限制条件,而不是如果对领导有利就添åŠ
 è¿›æ¥çš„可选项。由软件代ç 
æŽ§åˆ¶çš„生活不应该比这个更不自由。
@@ -81,14 +87,15 @@
 
然而,我们还没有获得自由。我们在保护它的时候很可能失败,但是,不管成败如何,这些文ç«
 
都展示了这个自由。在产生这些演讲和著作的生命里,有着对所有象斯托曼一æ
 ·ä¸ºè‡ªç”±è€Œæˆ˜çš„人的鼓舞。
 </p>
 
-<p>
-<strong>Lawrence Lessig</strong><br />
-<strong>斯坦福大学法学院法学教授</strong>
-</p>
-
+<div class="infobox extra" role="complementary">
 <hr />
-<blockquote id="fsfs"><p>请了解更多<a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>自由软件,自由社会:理查德·马修·斯托曼选集</cite></a>。</p></blockquote>
+<p id="lessig">
+[*] Lawrence Lessig 当时是斯坦福大学法学院法学教授。</p>
+</div>
+
+<div class="edu-note c"><p id="fsfs">请了解更多<a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>自由软件,自由社会:理查德·马修·斯托曼选集</cite></a>。</p></div>
+</div>
 
 <div class="translators-notes">
 
@@ -98,7 +105,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
@@ -117,15 +124,32 @@
 
         &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; 2002, 2013, 2017, 2018, 2020 Free Software Foundation, 
Inc.</p>
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 2002, 2021 Free Software Foundation, Inc.</p>
 
 <p>本页面采用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -137,12 +161,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>:潘永之,2014。<br></br>
 <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/10/28 06:59:35 $
+$Date: 2021/09/26 10:02:15 $
 
 <!-- timestamp end -->
 </p>

Index: po/free-software-for-freedom.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-software-for-freedom.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/free-software-for-freedom.zh-cn-en.html  28 Oct 2020 06:59:36 -0000      
1.2
+++ po/free-software-for-freedom.zh-cn-en.html  26 Sep 2021 10:02:15 -0000      
1.3
@@ -1,17 +1,25 @@
 <!--#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="essays aboutfs free-open" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why &ldquo;Free Software&rdquo; is better than &ldquo;Open Source&rdquo;
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/free-software-for-freedom.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="article reduced-width">
 <h2>Why &ldquo;Free Software&rdquo; is better than &ldquo;Open 
Source&rdquo;</h2>
 
-<div class="announcement">
-<blockquote><p>This article has been superseded by a major rewrite,
+<div class="infobox" style="font-style: italic">
+<p>This article has been superseded by a major rewrite,
 <a href="/philosophy/open-source-misses-the-point.html">&ldquo;Open
 Source&rdquo; misses the point of Free Software</a>, which is much
-better.  We keep this version for historical reasons.</p></blockquote>
+better.  We keep this version for historical reasons.</p>
 </div>
+<hr class="thin" />
 
 <p>
 While free software by any other name would give you the same
@@ -20,7 +28,7 @@
 
 <p>
 In 1998, some of the people in the free software community began using
-the term <a href="https://opensource.org/";>&ldquo;open source
+the term <a href="https://opensource.org";>&ldquo;open source
 software&rdquo;</a> instead of <a href="/philosophy/free-sw.html">&ldquo;free
 software&rdquo;</a> to describe what they do.  The term &ldquo;open 
source&rdquo;
 quickly became associated with a different approach, a different
@@ -36,8 +44,8 @@
 movement, the issue of whether software should be open source is a
 practical question, not an ethical one.  As one person put it, &ldquo;Open
 source is a development methodology; free software is a social
-movement.&rdquo;  For the Open Source movement, non-free software is a
-suboptimal solution.  For the Free Software movement, non-free
+movement.&rdquo;  For the Open Source movement, nonfree software is a
+suboptimal solution.  For the Free Software movement, nonfree
 software is a social problem and free software is the solution.</p>
 
 <h3 id="relationship">Relationship between the Free Software
@@ -72,7 +80,7 @@
 obscured behind a group with different views.  To prevent people from
 thinking we are part of them, we take pains to avoid using the word
 &ldquo;open&rdquo; to describe free software, or its contrary,
-&ldquo;closed&rdquo;, in talking about non-free software.</p>
+&ldquo;closed,&rdquo; in talking about nonfree software.</p>
 
 <p>
 So please mention the Free Software movement when you talk about the
@@ -83,7 +91,7 @@
 
 <p>
 This rest of this article compares the two terms &ldquo;free software&rdquo; 
and
-&ldquo;open source&rdquo;.  It shows why the term &ldquo;open source&rdquo; 
does not solve
+&ldquo;open source.&rdquo;  It shows why the term &ldquo;open source&rdquo; 
does not solve
 any problems, and in fact creates some.</p>
 
 <h3 id="ambiguity">Ambiguity</h3>
@@ -200,7 +208,7 @@
 talk too.</p>
 
 <p>
-At present, we have plenty of &ldquo;keep quiet&rdquo;, but not enough
+At present, we have plenty of &ldquo;keep quiet,&rdquo; but not enough
 freedom talk.  Most people involved with free software say little
 about freedom&mdash;usually because they seek to be &ldquo;more
 acceptable to business.&rdquo; Software distributors especially show
@@ -213,8 +221,8 @@
 <p>
 We are failing to keep up with the influx of free software users,
 failing to teach people about freedom and our community as fast as
-they enter it.  This is why non-free software (which Qt was when it
-first became popular), and partially non-free operating system
+they enter it.  This is why nonfree software (which Qt was when it
+first became popular), and partially nonfree operating system
 distributions, find such fertile ground.  To stop using the word
 &ldquo;free&rdquo; now would be a mistake; we need more, not less, talk about
 freedom.</p>
@@ -250,13 +258,13 @@
 official definition, said this:</p>
 
 <blockquote><p>
-As is common in the open source community, users of the ...
-technology will also be able to collaborate with IBM ...
+As is common in the open source community, users of the &hellip;
+technology will also be able to collaborate with IBM&hellip;
 </p></blockquote>
 
 <p>
 This did not actually say that the program <em>was</em> &ldquo;open
-source&rdquo;, but many readers did not notice that detail.  (I should note
+source,&rdquo; but many readers did not notice that detail.  (I should note
 that IBM was sincerely trying to make this program free software, and
 later adopted a new license which does make it free software and
 &ldquo;open source&rdquo;; but when that announcement was made, the program did
@@ -275,19 +283,19 @@
 <p>
 Unlike IBM, Cygnus was not trying to make these packages free
 software, and the packages did not come close to qualifying.  But
-Cygnus didn't actually say that these are &ldquo;open source software&rdquo;,
+Cygnus didn't actually say that these are &ldquo;open source software,&rdquo;
 they just made use of the term to give careless readers that
 impression.</p>
 
 <p>
 These observations suggest that a trademark would not have truly
-prevented the confusion that comes with the term &ldquo;open source&rdquo;.</p>
+prevented the confusion that comes with the term &ldquo;open source.&rdquo;</p>
 
 <h3 id="newinnovember">Misunderstandings(?) of &ldquo;Open Source&rdquo;</h3>
 
 <p>
 The Open Source Definition is clear enough, and it is quite clear that
-the typical non-free program does not qualify.  So you would think
+the typical nonfree program does not qualify.  So you would think
 that &ldquo;Open Source company&rdquo; would mean one whose products are free
 software (or close to it), right?  Alas, many companies are trying to
 give it a different meaning.</p>
@@ -314,16 +322,16 @@
 
 <p>
 Over the years, many companies have contributed to free software
-development.  Some of these companies primarily developed non-free
+development.  Some of these companies primarily developed nonfree
 software, but the two activities were separate; thus, we could ignore
-their non-free products, and work with them on free software projects.
+their nonfree products, and work with them on free software projects.
 Then we could honestly thank them afterward for their free software
 contributions, without talking about the rest of what they did.</p>
 
 <p>
 We cannot do the same with these new companies, because they won't let
 us.  These companies actively invite the public to lump all their
-activities together; they want us to regard their non-free software as
+activities together; they want us to regard their nonfree software as
 favorably as we would regard a real contribution, although it is not
 one.  They present themselves as &ldquo;open source companies,&rdquo; hoping
 that we will get a warm fuzzy feeling about them, and that we will be
@@ -339,11 +347,11 @@
 <p>
 At a trade show in late 1998, dedicated to the operating system often
 referred to
-as <a href="/gnu/linux-and-gnu.html">&ldquo;Linux&rdquo;</a>, the
+as &ldquo;<a href="/gnu/linux-and-gnu.html">Linux</a>,&rdquo; the
 featured speaker was an executive from a prominent software company.
 He was probably invited on account of his company's decision to
 &ldquo;support&rdquo; that system.  Unfortunately, their form of
-&ldquo;support&rdquo; consists of releasing non-free software that
+&ldquo;support&rdquo; consists of releasing nonfree software that
 works with the system&mdash;in other words, using our community as a
 market but not contributing to it.</p>
 
@@ -378,9 +386,8 @@
 Project, so we can help do that job.  If you feel that freedom and
 community are important for their own sake&mdash;not just for the
 convenience they bring&mdash;please join us in using the term
-&ldquo;free software&rdquo;.</p>
-
-<hr />
+&ldquo;free software.&rdquo;</p>
+<div class="column-limit"></div>
 
 <!-- The archived version is truncated.
 <p>
@@ -388,24 +395,25 @@
 <a 
href="http://web.archive.org/web/20080703140137/http://www.itworld.com/LWD010523vcontrol4";>Live
 and
 let license [archived]</a> that gives his perspective on this issue.</p>
 -->
-
+<h3 class="footnote">Note</h3>
 <p>
 Lakhani and Wolf's
-<a 
href="http://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>paper
 on the
+<a 
href="https://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>paper
 on the
 motivation of free software developers</a> says that a considerable
 fraction are motivated by the view that software should be free.  This
 was despite the fact that they surveyed the developers on SourceForge,
 a site that does not support the view that this is an ethical issue.</p>
 
-<hr />
-<blockquote id="fsfs"><p>This essay is published
-in <a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+<hr class="no-display" />
+<div class="edu-note c"><p id="fsfs">This essay is published in
+<a href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
 Software, Free Society: The Selected Essays of Richard
-M. Stallman</cite></a>.</p></blockquote>
+M. Stallman</cite></a>.</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
@@ -423,16 +431,33 @@
         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; 1998, 1999, 2000, 2001, 2007, 2016, 2020 Free Software 
Foundation,
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 1998-2003, 2007, 2010, 2021 Free Software Foundation,
 Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -443,10 +468,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/10/28 06:59:36 $
+$Date: 2021/09/26 10:02:15 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/free-software-for-freedom.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-software-for-freedom.zh-cn.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/free-software-for-freedom.zh-cn.po       26 Sep 2021 09:53:50 -0000      
1.14
+++ po/free-software-for-freedom.zh-cn.po       26 Sep 2021 10:02:15 -0000      
1.15
@@ -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-08-20 20:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: po/lessig-fsfs-intro.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/lessig-fsfs-intro.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/lessig-fsfs-intro.zh-cn-en.html  28 Oct 2020 06:59:37 -0000      1.4
+++ po/lessig-fsfs-intro.zh-cn-en.html  26 Sep 2021 10:02:15 -0000      1.5
@@ -1,22 +1,26 @@
 <!--#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="thirdparty" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Introduction to Free Software, Free Society
 - GNU Project - Free Software Foundation</title>
-
 <!--#include virtual="/philosophy/po/lessig-fsfs-intro.translist" -->
 <!--#include virtual="/server/banner.html" -->
-   
-<h2>Introduction
-to <a href="http://shop.fsf.org/product/free-software-free-society/";><i>Free
-Software, Free Society: The Selected Essays of Richard
-M. Stallman</i></a></h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width">
+<h2>Introduction to
+<cite>Free Software, Free Society: The Selected Essays of
+Richard M. Stallman</cite></h2>
+
+<address class="byline">
+by Lawrence Lessig&nbsp;<a href="#lessig"><sup>[*]</sup></a>
+</address>
 
 <p>
-by Lawrence Lessig, Professor of Law, Stanford Law School
-</p>
-
-<p>
-Every generation has its philosopher &mdash; a writer or an artist who
+Every generation has its philosopher&mdash;a writer or an artist who
 captures the imagination of a time. Sometimes these philosophers are
 recognized as such; often it takes generations before the connection
 is made real. But recognized or not, a time gets marked by the people
@@ -36,7 +40,7 @@
 &ldquo;Code&rdquo; is the technology that makes computers run. Whether
 inscribed in software or burned in hardware, it is the collection of
 instructions, first written in words, that directs the functionality
-of machines. These machines &mdash; computers &mdash; increasingly
+of machines. These machines&mdash;computers&mdash;increasingly
 define and control our life. They determine how phones connect, and
 what runs on TV. They decide whether video can be streamed across a
 broadband link to a computer. They control what a computer reports
@@ -142,7 +146,7 @@
 briefs. They can be copied and integrated into another brief or
 opinion. The &ldquo;source code&rdquo; for American law is by design,
 and by principle, open and free for anyone to take. And take lawyers
-do &mdash; for it is a measure of a great brief that it achieves its
+do&mdash;for it is a measure of a great brief that it achieves its
 creativity through the reuse of what happened before. The source is
 free; creativity and an economy is built upon it.
 </p>
@@ -156,7 +160,7 @@
 flourishes, with later work added to the earlier.
 </p>
 <p>
-We could imagine a legal practice that was different &mdash; briefs
+We could imagine a legal practice that was different&mdash;briefs
 and arguments that were kept secret; rulings that announced a result
 but not the reasoning.  Laws that were kept by the police but
 published to no one else. Regulation that operated without explaining
@@ -189,7 +193,7 @@
 known, and among these, an especially insightful account of the
 changed circumstances that render copyright in the digital world
 suspect. They will serve as a resource for those who seek to
-understand the thought of this most powerful man &mdash; powerful in
+understand the thought of this most powerful man&mdash;powerful in
 his ideas, his passion, and his integrity, even if powerless in every
 other way. They will inspire others who would take these ideas, and
 build upon them.
@@ -202,8 +206,8 @@
 </p>
 <p>
 Yet when our world finally comes to understand the power and danger of
-code &mdash; when it finally sees that code, like laws, or like
-government, must be transparent to be free &mdash; then we will look
+code&mdash;when it finally sees that code, like laws, or like
+government, must be transparent to be free&mdash;then we will look
 back at this uncompromising and persistent programmer and recognize
 the vision he has fought to make real: the vision of a world where
 freedom and knowledge survives the compiler. And we will come to see
@@ -218,20 +222,22 @@
 fight to create this freedom.
 </p>
 
-<p>
-<strong>Lawrence Lessig</strong><br />
-<strong>Professor of Law, Stanford Law School.</strong>
-</p>
-
+<div class="infobox extra" role="complementary">
 <hr />
-<blockquote id="fsfs"><p>Learn more about
-<a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+<p id="lessig">
+[*] Lawrence Lessig was then Professor of Law at Stanford Law
+School.</p>
+</div>
+
+<div class="edu-note c"><p id="fsfs">Learn more about
+<a href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
 Software, Free Society: The Selected Essays of Richard
-M. Stallman</cite></a>.</p></blockquote>
+M. Stallman</cite></a>.</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
@@ -249,17 +255,34 @@
         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; 2002, 2013, 2017, 2018, 2020 Free Software Foundation, 
Inc.</p>
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2002, 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
@@ -269,7 +292,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/10/28 06:59:37 $
+$Date: 2021/09/26 10:02:15 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/lessig-fsfs-intro.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/lessig-fsfs-intro.zh-cn.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/lessig-fsfs-intro.zh-cn.po       26 Sep 2021 09:37:10 -0000      1.11
+++ po/lessig-fsfs-intro.zh-cn.po       26 Sep 2021 10:02:15 -0000      1.12
@@ -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-08-20 20:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""



reply via email to

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