www/philosophy ebooks-must-increase-freedom.zh-...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/24 00:02:03

Modified files:
        philosophy     : ebooks-must-increase-freedom.zh-cn.html 
                         ebooks.zh-cn.html linux-gnu-freedom.zh-cn.html 
        philosophy/po  : ebooks-must-increase-freedom.zh-cn-en.html 
                         ebooks-must-increase-freedom.zh-cn.po 
                         ebooks.zh-cn-en.html ebooks.zh-cn.po 
                         linux-gnu-freedom.zh-cn-en.html 
                         linux-gnu-freedom.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/ebooks-must-increase-freedom.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/ebooks.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/linux-gnu-freedom.zh-cn.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/ebooks-must-increase-freedom.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/ebooks-must-increase-freedom.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/ebooks.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/ebooks.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.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.zh-cn.po?cvsroot=www&r1=1.16&r2=1.17

Patches:
Index: ebooks-must-increase-freedom.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/ebooks-must-increase-freedom.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ebooks-must-increase-freedom.zh-cn.html     8 Jan 2021 13:31:55 -0000       
1.1
+++ ebooks-must-increase-freedom.zh-cn.html     24 Sep 2021 04:02:01 -0000      
1.2
@@ -1,24 +1,23 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/ebooks-must-increase-freedom.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays cultural access" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>电子书必须增进我们的自由，而不是损害它 - GNU 工程 
- 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/ebooks-must-increase-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>电子书必须增进我们的自由，而不是损害它</h2>
-<p><a href="http://www.stallman.org/";><strong>Richard 
Stallman</strong></a>著</p>
 
-
-<p><em>è¿™ç¯‡æ–‡ç« åŽŸè½½äºŽ<cite>卫报</cite>, 于2012å¹´4月17日发表, 
原题为 &ldquo;<a
-href="//www.theguardian.com/technology/2012/apr/17/sharing-ebooks-richard-stallman">技术应该帮助我们分享，而不是限制我们</a>&rdquo;，并带有一些意料之外的修订。这个版本整合了部分修订，同时恢复了部分原文。</em></p>
-
-<div class="announcement">
-<p>也可以考虑阅读 <a 
href="/philosophy/ebooks.html">电子书：自由或版权</a>。</p>
-</div>
-<hr />
+<address class="byline"><a 
href="https://www.stallman.org/";>理查德·斯托曼</a> 著</address>
 
 <p>我爱《耶和华的契约》，我也乐于见到其他人和我一æ 
·å–œæ¬¢å®ƒã€‚这些年来我把它借出过至少å…
­æ¬¡ã€‚印刷版的书可以让我们反复出借。</p>
 
@@ -29,7 +28,7 @@
 href="/philosophy/why-call-it-the-swindle.html">&ldquo;Swindle&rdquo;</a>
 
是个更合适的名字）为例，用户不能使用现金匿名地购买一本书。&ldquo;Kindle&ldquo;
 书籍通常只由亚马逊提供，同时亚马逊让用户æ 
‡æ˜Žä»–们自己的身份。这æ 
·ï¼Œäºšé©¬é€Šå°±çŸ¥é“了每位用户读过哪本书。在诸如英国这æ 
·çš„å›½å®¶ï¼Œä½ 可能 <a
-href="http://www.stallman.org/archives/2012-mar-jun.html#07_April_2012_%28Wrong_book%29";>å›
 
为拥有一本禁书而被起诉</a>，这可比设想的奥威尔现象要可怕得多。</p>
+href="https://www.stallman.org/archives/2012-mar-jun.html#07_April_2012_%28Wrong_book%29";>å›
 
为拥有一本禁书而被起诉</a>，这可比设想的奥威尔现象要可怕得多。</p>
 
 <p>æ›´è¿›ä¸€æ­¥ï¼Œåœ¨ä½ è¯»è¿‡ä¸€æœ¬ç”µå­ä¹¦åŽä½ 
不能出售它（如果亚马逊大行å…
¶é“，那些我一个下午能逛许多家的旧书店就将成为历史）。ä½
 ä¹Ÿä¸å¯ä»¥æŠŠå®ƒé€ç»™ä½ çš„æœ‹å‹ï¼Œå› ä¸ºæŒ‰äºšé©¬é€Šæ‰€è¯´ï¼Œä½ 
从来不曾真正拥有一本书。亚马逊要求用户签署的最终用户许可证协议（&ldquo;EULA&rdquo;）里就是这么规定的。</p>
 
@@ -48,6 +47,13 @@
 
 <p>ä»»ä½•åƒè¿™æ ·å¯¹äºŽæˆ‘ä»¬è‡ªç”±çš„ä¾µå¤ºéƒ½æ˜¯æˆ‘ä»¬è¯´ä¸çš„ä¸€ä¸ªå……
分的理由。如果这些政策只限于亚马逊，我们还可以绕过它，但是å
…¶ä»–电子书出版商的政策都大同小异。</p>
 
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p><a
+href="https://www.defectivebydesign.org/ebooks.html";>åŠ å…¥æˆ‘ä»¬å…
³äºŽç”µå­ä¹¦å±å®³çš„邮件列表</a>。</p>
+<hr class="no-display" />
+</div>
+
 <p>最让我感到担忧的是失去纸质书这个选项。卫报已经宣称
 &ldquo;只能数字阅读&rdquo;ï¼šæ¢å¥è¯è¯´ï¼Œä¹¦ç±åªèƒ½é 
牺牲自由去获取。我不会阅
读任何以这种代价换来的书。从现在开始五年后，对于大多数书籍来说，未经许可的副本是不是唯一在道德上可以接受的副本呢？</p>
 
@@ -68,9 +74,18 @@
 
 
<p>分享是好事，在数字技术的支持下，分享是便易的。（我是指对于精准拷贝的非商业再分发）所以，分享理应合法，而且阻止分享不能成为让电子书禁锢读è€
…的借口。如果电子书意味着读者的自由必
须在增进和损减中二选一，我们必须要求增进。</p>
 
-<blockquote class="announcement"><p>
-<a href="http://defectivebydesign.org/ebooks.html";>åŠ å…¥æˆ‘ä»¬å…
³äºŽç”µå­ä¹¦å±å®³çš„邮件列表</a>。
-</p></blockquote>
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>也可以考虑阅读 <a 
href="/philosophy/ebooks.html">电子书：自由或版权</a>。</p>
+<hr class="no-display" />
+</div>
+
+<div class="infobox extra" role="complementary">
+<hr />
+<p>è¿™ç¯‡æ–‡ç« åŽŸè½½äºŽ<cite>卫报</cite>, 于2012å¹´4月17日发表, 
原题为 &ldquo;<a
+href="https://www.theguardian.com/technology/2012/apr/17/sharing-ebooks-richard-stallman";>技术应该帮助我们分享，而不是限制我们</a>&rdquo;，并带有一些意料之外的修订。这个版本整合了部分修订，同时恢复了部分原文。</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -83,7 +98,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
@@ -102,13 +117,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
@@ -127,7 +142,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2012, 2015, 2016, 2017 Richard Stallman</p>
+<p>Copyright &copy; 2012, 2021 Richard Stallman</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -144,11 +159,12 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/01/08 13:31:55 $
+$Date: 2021/09/24 04:02:01 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: ebooks.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/ebooks.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ebooks.zh-cn.html   22 Apr 2020 13:59:20 -0000      1.1
+++ ebooks.zh-cn.html   24 Sep 2021 04:02:02 -0000      1.2
@@ -1,24 +1,23 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/ebooks.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 cultural access" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>电子书：自由与版权 - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/ebooks.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>电子书：自由与版权</h2>
 
-<p><a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a> 
著</p>
-
-<p><em>原文于2000年在<cite>Technology 
Review</cite>发表。本文是稍作修改的版本。</em></p>
-
-<div class="announcement">
-<p>另请阅读<a
-href="/philosophy/ebooks-must-increase-freedom.html">ç”µå­ä¹¦åº”å½“è¦å¢žåŠ 
我们的自由度，而不是减少它</a>。</p>
-</div>
-<hr />
+<address class="byline"><a 
href="https://www.stallman.org/";>理查德·斯托曼</a> 著</address>
 
 
<p>曾经，在纸质印刷时代，人们制定了一项涵盖写作和出版业务的行业法规——版权。美国宪法中所陈述的版权的目的，是“促进发展”，即鼓励出版。人们采用的方法是使出版商从作è€
…处取得使用近期作品的授权。</p>
 
@@ -35,7 +34,14 @@
 
<p>所以他们说服美国政府为给了他们1998年数字千年版权法(The
 Digital Millennium Copyright Act of 1998,
 DMCA)ï¼Œè¿™éƒ¨æ³•å¾‹èµ‹äºˆäº†ä»–ä»¬ä¸Žç”µå­ä¹¦æœ‰å…³çš„å‡ 
乎所有合法权力。甚至未经授权的阅读都是一项罪名</p>
 
-<p>对于纸质书籍，我们仍然拥有和以前一æ 
·çš„自由。但是，如果电子书取代了纸质书，这种例外也就没什么用处了。“电子墨水”可以使文字就像被下载到了纸上一æ
 ·ï¼Œç”šè‡³æŠ¥çº¸ä¹Ÿå¯ä»¥æˆä¸ºè¿‡çœ¼çƒŸäº‘一æ 
·ä¸œè¥¿ã€‚æƒ³è±¡ä¸€ä¸‹ï¼šå†ä¹Ÿæ²¡æœ‰äºŒæ‰‹ä¹¦åº—äº†ï¼›ä½ 
å†ä¹Ÿä¸èƒ½æŠŠä¹¦å€Ÿç»™ä½ çš„æœ‹å‹äº†ï¼›äººä»¬å†ä¹Ÿæ— æ³•ä»Žå…¬å…
±å›¾ä¹¦é¦†å€Ÿé˜…书籍了；再也不会有不付钱就能阅读这æ 
·çš„“泄漏”存在了。从微软阅读器(Microsoft
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p><a
+href="https://defectivebydesign.org/ebooks.html";>åŠ å…
¥æˆ‘们的邮件列表以了解电子书的危险之处</a>。</p>
+<hr class="no-display" />
+</div>
+
+<p>对于纸质书籍，我们仍然拥有和以前一æ 
·çš„自由。但是，如果电子书取代了纸质书，这种例外也就没什么用处了。“电子墨水”可以使文字就像被下载到了纸上一æ
 ·ï¼Œç”šè‡³æŠ¥çº¸ä¹Ÿå¯ä»¥æˆä¸ºè¿‡çœ¼çƒŸäº‘一æ 
·ä¸œè¥¿ã€‚æƒ³è±¡ä¸€ä¸‹ï¼šå†ä¹Ÿæ²¡æœ‰äºŒæ‰‹ä¹¦åº—äº†ï¼›ä½ 
å†ä¹Ÿä¸èƒ½æŠŠä¹¦å€Ÿç»™ä½ çš„æœ‹å‹äº†ï¼›äººä»¬å†ä¹Ÿæ— æ³•ä»Žå…¬å…
±å›¾ä¹¦é¦†å€Ÿé˜…书籍了&mdash;&mdash;再也不会有不付钱就能阅读这æ 
·çš„“漏洞”存在了。从微软阅读器(Microsoft
 Reader)çš„å¹¿å‘Šæ¥çœ‹ï¼ŒåŒ¿åè´­ä¹¦è¿™æ ·çš„æƒ…
况也不会再出现。这正是出版商们为我们构想的世界。</p>
 
 
<p>为什么发生如此重大的改变，却不见人们有多少争论？这是å›
 为大多数公民还没有机会了解到这项超
现代技术所引发的政治问题。另外，å…
¬ä¼—被教导版权是为了保护版权所有者而存在的，并被暗示å…
¬ä¼—çš„åˆ©ç›Šæ— 关紧要。</p>
@@ -49,9 +55,17 @@
 
 
<p>最终，当计算机网络给人们提供一种简单的小额转账方式时，限制逐字复制的理由将不复存在。如果ä½
 喜欢一本书，这时弹出一个对话框说“点击此处用一美å…
ƒæ”¯æŒä½œè€…â€ï¼Œéš¾é“ä½ 会拒绝吗？</p>
 
-<blockquote class="announcement">
-<p><a href="http://defectivebydesign.org/ebooks.html";>åŠ å…
¥æˆ‘们的邮件列表以了解电子书的危险之处</a>。</p>
-</blockquote>
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>另请阅读<a
+href="/philosophy/ebooks-must-increase-freedom.html">ç”µå­ä¹¦åº”å½“è¦å¢žåŠ 
我们的自由度，而不是减少它</a>。</p>
+</div>
+
+<div class="infobox extra" role="complementary">
+<hr />
+<p>原文于2000年在<cite>Technology 
Review</cite>发表。本文是稍作修改的版本。</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -61,7 +75,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) GNU的一般性问题发送到<a
@@ -80,16 +94,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="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; 2000, 2016 Richard Stallman</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; 2000, 2021 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -102,16 +132,17 @@
 <b>翻译</b>：<a href="mailto:shankangke@gmail.com";>&lt;Shankang Ke
 (柯善康)&gt;</a>，2020。<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/04/22 13:59:20 $
+$Date: 2021/09/24 04:02:02 $
 
 <!-- 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- linux-gnu-freedom.zh-cn.html        19 Aug 2021 08:13:20 -0000      1.10
+++ linux-gnu-freedom.zh-cn.html        24 Sep 2021 04:02:02 -0000      1.11
@@ -18,12 +18,11 @@
 <!--#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">
+<div class="article reduced-width">
 <h2>Linux、GNU和自由</h2>
 
 <address class="byline">Richard Stallman 著</address>
 
-<div class="article">
 <p>
   由于 <a
 
href="https://web.archive.org/web/20190404115541/http://linux.sys-con.com/node/32755";>
@@ -95,7 +94,6 @@
 McVoy</a>。Linux源代ç 
ä»ç„¶å«æœ‰éžè‡ªç”±çš„固件blobs，但是在2008å¹´1月，我们维护了一个<a
 
href="//directory.fsf.org/project/linux">自由版的Linux</a>，并被自由的GNU/Linux发行版使用。</p>
 </div>
-</div>
 
 <div class="translators-notes">
 
@@ -133,6 +131,22 @@
 <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 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 Richard M. Stallman</p>
 
 <p>本页面采用<a rel="license"
@@ -150,7 +164,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/08/19 08:13:20 $
+$Date: 2021/09/24 04:02:02 $
 
 <!-- timestamp end -->
 </p>

Index: po/ebooks-must-increase-freedom.zh-cn-en.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/ebooks-must-increase-freedom.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/ebooks-must-increase-freedom.zh-cn-en.html       8 Jan 2021 13:31:58 
-0000       1.1
+++ po/ebooks-must-increase-freedom.zh-cn-en.html       24 Sep 2021 04:02:03 
-0000      1.2
@@ -1,32 +1,26 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays cultural access" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>E-books must increase our freedom, not decrease it
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/ebooks-must-increase-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>E-books must increase our freedom, not decrease it</h2>
-<p>by <a href="http://www.stallman.org/";><strong>Richard
-Stallman</strong></a></p>
 
-
-<p><em>This essay was originally published by <cite>The Guardian</cite>, on 17 
April 2012,
-as &ldquo;<a
-href="//www.theguardian.com/technology/2012/apr/17/sharing-ebooks-richard-stallman">Technology
-Should Help Us Share, Not Constrain Us</a>&rdquo;, with some surprise editing. 
 This
-version incorporates parts of that editing while restoring parts of the 
original
-text.</em></p>
-
-<div class="announcement">
-<p>Also consider reading <a href="/philosophy/ebooks.html">
-E-Books: Freedom Or Copyright</a>.</p>
-</div>
-<hr />
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
 <p>I love The Jehovah Contract, and I'd like everyone else to love it
 too. I have lent it out at least six times over the years. Printed
 books let us do that.</p>
 
-<p>I couldn't do that with most commercial e-books. It's &ldquo;not 
allowed&rdquo;.
+<p>I couldn't do that with most commercial e-books. It's &ldquo;not 
allowed.&rdquo;
 And if I tried to disobey, the software in e-readers has malicious
 features called Digital Restrictions Management (DRM, for short) to restrict 
reading,
 so it simply won't work. The e-books are encrypted so that only
@@ -39,7 +33,7 @@
 typically available from Amazon only, and Amazon makes users identify
 themselves. Thus, Amazon knows exactly which books each user has
 read. In a country such as the UK, where you can be <a
-href="http://www.stallman.org/archives/2012-mar-jun.html#07_April_2012_%28Wrong_book%29";>prosecuted
 for
+href="https://www.stallman.org/archives/2012-mar-jun.html#07_April_2012_%28Wrong_book%29";>prosecuted
 for
 possessing a forbidden book</a>, this is more than hypothetically
 Orwellian.</p>
 
@@ -67,13 +61,20 @@
 those, some users skilled at programming would remove them, then
 provide the corrected version to all the other users. Users can't
 change non-Libre software, which makes it <a
-href="http://www.bostonreview.net/forum/protecting-internet-without-wrecking-it/root-problem-software-controlled-its-developer";>
 an ideal
+href="https://www.bostonreview.net/forum/protecting-internet-without-wrecking-it/root-problem-software-controlled-its-developer";>
 an ideal
 instrument for exercising power over the public</a>.</p>
 
 <p>Any one of these encroachments on our freedom is reason aplenty to say
 no. If these policies were limited to Amazon, we'd bypass them, but
 the other e-book dealers' policies are roughly similar.</p>
 
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p><a href="https://www.defectivebydesign.org/ebooks.html";>Join our mailing 
list
+about the dangers of eBooks</a>.</p>
+<hr class="no-display" />
+</div>
+
 <p>What worries me most is the prospect of losing the option of printed
 books. The Guardian has announced &ldquo;digital-only reads&rdquo;: in other
 words, books available only at the price of freedom. I will not read
@@ -121,14 +122,27 @@
 handcuffs for readers. If e-books mean that readers' freedom must
 either increase or decrease, we must demand the increase.</p>
 
-<blockquote class="announcement"><p>
-<a href="http://defectivebydesign.org/ebooks.html";>Join our mailing list
-about the dangers of eBooks</a>.
-</p></blockquote>
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Also consider reading <a href="/philosophy/ebooks.html">
+E-Books: Freedom Or Copyright</a>.</p>
+<hr class="no-display" />
+</div>
+
+<div class="infobox extra" role="complementary">
+<hr />
+<p>This essay was originally published by <cite>The Guardian</cite>, on 17 
April 2012,
+as &ldquo;<a
+href="https://www.theguardian.com/technology/2012/apr/17/sharing-ebooks-richard-stallman";>Technology
+Should Help Us Share, Not Constrain Us</a>,&rdquo; with some surprise editing. 
 This
+version incorporates parts of that editing while restoring parts of the 
original
+text.</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
@@ -146,13 +160,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>
 
@@ -173,7 +187,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2012, 2015, 2016, 2017 Richard Stallman</p>
+<p>Copyright &copy; 2012, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -183,10 +197,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/01/08 13:31:58 $
+$Date: 2021/09/24 04:02:03 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/ebooks-must-increase-freedom.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/ebooks-must-increase-freedom.zh-cn.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/ebooks-must-increase-freedom.zh-cn.po    24 Sep 2021 03:54:12 -0000      
1.10
+++ po/ebooks-must-increase-freedom.zh-cn.po    24 Sep 2021 04:02: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-09-02 17:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: po/ebooks.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/ebooks.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/ebooks.zh-cn-en.html     22 Apr 2020 13:59:20 -0000      1.1
+++ po/ebooks.zh-cn-en.html     24 Sep 2021 04:02:03 -0000      1.2
@@ -1,23 +1,20 @@
 <!--#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 cultural access" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>E-Books: Freedom Or Copyright
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/ebooks.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>E-Books: Freedom Or Copyright</h2>
 
-<p>by <a href="http://www.stallman.org/";><strong>Richard
-Stallman</strong></a></p>
-
-<p><em>This is a slightly modified version of an article published
-in <cite>Technology Review</cite> in 2000.</em></p>
-
-<div class="announcement">
-<p>Also consider reading <a
-href="/philosophy/ebooks-must-increase-freedom.html">E-books must
-increase our freedom, not decrease it</a>.</p>
-</div>
-<hr />
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
 <p>Once upon a time, in the age of the printing press, an industrial
 regulation was established to cover the business of writing and
@@ -68,9 +65,16 @@
 legal power over almost anything a reader might do with an e-book.
 Even reading it without authorization is a crime.</p>
 
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p><a href="https://www.defectivebydesign.org/ebooks.html";>Join our mailing 
list
+about the dangers of eBooks</a>.</p>
+<hr class="no-display" />
+</div>
+
 <p>We still have the same old freedoms in using paper books. But if
 e-books replace printed books, that exception will do little good.
-With &ldquo;electronic ink&rdquo;, which makes it possible to download
+With &ldquo;electronic ink,&rdquo; which makes it possible to download
 new text onto an apparently printed piece of paper, even newspapers
 could become ephemeral. Imagine: no more used book stores; no more
 lending a book to your friend; no more borrowing one from the public
@@ -108,19 +112,28 @@
 <p>Eventually, when computer networks provide an easy way to send
 someone a small amount of money, the whole rationale for restricting
 verbatim copying will go away. If you like a book, and it pops up a
-box saying, &ldquo;Click here to give the author one dollar&rdquo;,
+box saying, &ldquo;Click here to give the author one dollar,&rdquo;
 wouldn't you click? Copyright for books and music, as it applies to
 distributing verbatim unmodified copies, will be entirely obsolete.
 And not a moment too soon!</p>
 
-<blockquote class="announcement">
-<p><a href="http://defectivebydesign.org/ebooks.html";>Join our mailing
-list about the dangers of eBooks</a>.</p>
-</blockquote>
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Also consider reading <a
+href="/philosophy/ebooks-must-increase-freedom.html">E-books must
+increase our freedom, not decrease it</a>.</p>
+</div>
+
+<div class="infobox extra" role="complementary">
+<hr />
+<p>This is a slightly modified version of an article published in
+<cite>Technology Review</cite> in 2000.</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
@@ -138,16 +151,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; 2000, 2016 Richard Stallman</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; 2000, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -157,10 +187,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/04/22 13:59:20 $
+$Date: 2021/09/24 04:02:03 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/ebooks.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/ebooks.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/ebooks.zh-cn.po  24 Sep 2021 03:44:31 -0000      1.8
+++ po/ebooks.zh-cn.po  24 Sep 2021 04:02:03 -0000      1.9
@@ -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-09-02 17:26+0000\n"
 
 #. type: Content of: <title>
 msgid "E-Books: Freedom Or Copyright - GNU Project - Free Software Foundation"
@@ -284,8 +283,8 @@
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
-"<b>翻译</b>：<a href=\"mailto:shankangke@gmail.com\";>&lt;Shankang Ke 
(柯善"
-"康)&gt;</a>，2020。<br></br>\n"
+"<b>翻译</b>：<a href=\"mailto:shankangke@gmail.com\";>&lt;Shankang Ke 
(柯善康)"
+"&gt;</a>，2020。<br></br>\n"
 "<b>翻译团队</b>：<a rel=\"team\" 
href=\"https://savannah.gnu.org/projects/";
 "www-zh-cn/\">&lt;CTT&gt;</a>，2020，2021。"
 

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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/linux-gnu-freedom.zh-cn-en.html  19 Aug 2021 08:13:26 -0000      1.6
+++ po/linux-gnu-freedom.zh-cn-en.html  24 Sep 2021 04:02:03 -0000      1.7
@@ -13,12 +13,11 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>Linux, GNU, and Freedom</h2>
 
 <address class="byline">by Richard M. Stallman</address>
 
-<div class="article">
 <p>
   Since <a
   
href="https://web.archive.org/web/20190404115541/http://linux.sys-con.com/node/32755";>Joe
 Barr's
@@ -28,10 +27,10 @@
 <p>
   When SIGLINUX invited me to speak, it was a &ldquo;Linux User
   Group&rdquo;; that is, a group for users of the GNU/Linux system
-  which calls the whole system &ldquo;Linux&rdquo;.  So I replied
+  which calls the whole system &ldquo;Linux.&rdquo;  So I replied
   politely that if they'd like someone from the GNU Project to give a
   speech for them, they ought to treat the GNU Project right, and call
-  the system &ldquo;GNU/Linux&rdquo;.  The system is a variant of GNU,
+  the system &ldquo;GNU/Linux.&rdquo;  The system is a variant of GNU,
   and the GNU Project is its principal developer, so social convention
   says to call it by the name we chose.  Unless there are powerful
   reasons for an exception, I usually decline to give speeches for
@@ -44,14 +43,14 @@
   user groups.  Our webmaster told him that we would not list it under
   the name &ldquo;SIGLINUX&rdquo; because that name implies that the
   group is about Linux.  Strunk proposed to change the name to
-  &ldquo;SIGFREE&rdquo;, and our webmaster agreed that would be fine.
+  &ldquo;SIGFREE,&rdquo; and our webmaster agreed that would be fine.
   (Barr's article said we rejected this proposal.)  However, the group
-  ultimately decided to stay with &ldquo;SIGLINUX&rdquo;.</p>
+  ultimately decided to stay with &ldquo;SIGLINUX.&rdquo;</p>
 <p>
   At that point, the matter came to my attention again, and I
   suggested they consider other possible names.  There are many names
   they could choose that would not call the system
-  &ldquo;Linux&rdquo;, and I hope they will come up with one they
+  &ldquo;Linux,&rdquo; and I hope they will come up with one they
   like.  There the matter rests as far as I know.</p>
 <p>
   Is it true, as Barr writes, that some people see these actions as an
@@ -80,10 +79,10 @@
   about the GNU Project and think them justified; his fellows will
   support him, because they want each other's support in maintaining
   their prejudice.  Dissenters can be reviled; thus, if I decline to
-  participate in an activity under the rubric of &ldquo;Linux&rdquo;,
+  participate in an activity under the rubric of &ldquo;Linux,&rdquo;
   they may find that inexcusable, and hold me responsible for the ill
   will they feel afterwards.  When so many people want me to call the
-  system &ldquo;Linux&rdquo;, how can I, who merely launched its
+  system &ldquo;Linux,&rdquo; how can I, who merely launched its
   development, not comply?  And forcibly denying them a speech is
   forcibly making them unhappy.  That's coercion, as bad as
   Microsoft!</p>
@@ -130,8 +129,8 @@
   Will enough of us care?  That depends on many things; among them,
   how much influence the GNU Project has, and how much influence Linus
   Torvalds has.  The GNU Project says, &ldquo;Value your
-  freedom!&rdquo;.  Joe Barr says, &ldquo;Choose between nonfree and
-  free programs on technical grounds alone!&rdquo;.  If people credit
+  freedom!.&rdquo;  Joe Barr says, &ldquo;Choose between nonfree and
+  free programs on technical grounds alone!.&rdquo;  If people credit
   Torvalds as the main developer of the GNU/Linux system, that's not
   just inaccurate, it also makes his message more
   influential&mdash;and that message says, &ldquo;Nonfree software is
@@ -238,7 +237,6 @@
   Linux</a> is now maintained for use in free GNU/Linux
   distributions.</p>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -269,6 +267,23 @@
 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 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 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -279,7 +294,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 08:13:26 $
+$Date: 2021/09/24 04:02:03 $
 <!-- 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/linux-gnu-freedom.zh-cn.po       24 Sep 2021 03:34:36 -0000      1.16
+++ po/linux-gnu-freedom.zh-cn.po       24 Sep 2021 04:02:03 -0000      1.17
@@ -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-09-12 08:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Linux, GNU, and Freedom - GNU Project - Free Software Foundation"