www gnu/thegnuproject.zh-cn.html gnu/po/thegnup...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/04/03 08:28:40

Modified files:
        gnu            : thegnuproject.zh-cn.html 
        gnu/po         : thegnuproject.zh-cn-en.html 
                         thegnuproject.zh-cn.po 
        philosophy     : compromise.zh-cn.html 
                         surveillance-vs-democracy.zh-cn.html 
        philosophy/po  : compromise.zh-cn-en.html compromise.zh-cn.po 
                         surveillance-vs-democracy.zh-cn-en.html 
                         surveillance-vs-democracy.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.zh-cn.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/surveillance-vs-democracy.zh-cn.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn.po?cvsroot=www&r1=1.23&r2=1.24

Patches:
Index: gnu/thegnuproject.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/thegnuproject.zh-cn.html        3 Jan 2018 13:01:06 -0000       1.7
+++ gnu/thegnuproject.zh-cn.html        3 Apr 2018 12:28:39 -0000       1.8
@@ -390,7 +390,9 @@
 
我们面临的最恶劣的威胁是软件专利，它可以用算法和功能点限制自由软件最长达20年。LZW压缩算法于1983年启用专利，我们至今不能发布可以生成适当压缩的<acronym
 title="Graphics Interchange
 Format，图形交换æ 
¼å¼">GIF</acronym>图片的自由软件。[在2009年，这些专利过期。]在1998年，由于受到专利的威胁，一个生成<acronym
-title="MPEG-1 Audio Layer 3">MP3</acronym>æ 
¼å¼çš„音频压缩自由软件从发行版中被移除了。</p>
+title="MPEG-1 Audio Layer
+3">MP3</acronym>æ 
¼å¼çš„音频压缩自由软件从发行版中被移除了。[在2017年，这些专利过期。看看我们等了多长时间。]
+</p>
 <p>
 æˆ‘ä»¬æœ‰äº›æ–¹æ³•æ¥å¯¹ä»˜ä¸“åˆ©ï¼šæˆ‘ä»¬å¯ä»¥å¯»æ‰¾ä¸“åˆ©æ˜¯æ— 
效的证据，我们还可以寻找å…
¶ä»–的方法替代专利限制的方法。但是这些方法不总是有效；当上述两种方法都失败时，专利可能迫使自由软件æ—
 法具备用户需要的某些功能。经过长时间的等待
，专利会过期（MP3专利应该在2018年过期），但是在此之前我们怎么办？</p>
 <p>
@@ -516,7 +518,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/01/03 13:01:06 $
+$Date: 2018/04/03 12:28:39 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/thegnuproject.zh-cn-en.html
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/po/thegnuproject.zh-cn-en.html  3 Jan 2018 13:01:07 -0000       1.3
+++ gnu/po/thegnuproject.zh-cn-en.html  3 Apr 2018 12:28:40 -0000       1.4
@@ -851,7 +851,9 @@
 compressed <acronym title="Graphics Interchange Format">GIF</acronym>s.
 [As of 2009 they have expired.]  In 1998, a free program to produce
 <acronym title="MPEG-1 Audio Layer 3">MP3</acronym> compressed audio
-was removed from distribution under threat of a patent suit.</p>
+was removed from distribution under threat of a patent suit.  [As of
+2017, these patents have expired.  Look how long we had to wait.]
+</p>
 <p>
 There are ways to cope with patents: we can search for evidence that a
 patent is invalid, and we can look for alternative ways to do a job.
@@ -1058,7 +1060,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/01/03 13:01:07 $
+$Date: 2018/04/03 12:28:40 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/thegnuproject.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/po/thegnuproject.zh-cn.po       3 Apr 2018 11:59:28 -0000       1.6
+++ gnu/po/thegnuproject.zh-cn.po       3 Apr 2018 12:28:40 -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: 2018-03-31 00:56+0000\n"
 
 #. type: Content of: <title>
 msgid "About the GNU Project - GNU Project - Free Software Foundation"

Index: philosophy/compromise.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.zh-cn.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/compromise.zh-cn.html    1 Oct 2017 14:00:38 -0000       1.27
+++ philosophy/compromise.zh-cn.html    3 Apr 2018 12:28:40 -0000       1.28
@@ -63,7 +63,7 @@
 
<p>思想上的妥协就是那些只会对我们的努力形成反作用力的妥协。我们的目æ
 ‡æ˜¯åˆ›é€ 
一个所有软件用户都享有自由的世界，但是，就现在而言，大多数的计算机用户还不把自由当作一回事。他们的心被一种
 &ldquo;消费者主义&rdquo; 的价值观所包
围。换言之，对于任何的软件，他们只考虑实用的一面，比如价æ
 ¼çš„高低和是否好用。</p>
 
-<p>卡内
基写过一本著名的励志书<cite>《如何赢得朋友与影响别人》</cite>，书里提到，要说服别人做某件事æƒ
…
有一种最有效的办法，就是向这些人展示出迎合他们自身价值判断的论据。在我们这个社会，我们可以以很多的方式来迎合消费è€
…çš„å£å‘³ã€‚æ¯”æ–¹è¯´ï¼Œè‡ªç”±è½¯ä»¶èµ¢å¾—æ¶ˆè´¹è€…é’çï¼Œå› 
ä¸ºä½¿ç”¨è‡ªç”±è½¯ä»¶æ›´çœé’±ã€‚ä¹Ÿæœ‰å¾ˆå¤šçš„è‡ªç”±è½¯ä»¶æ˜¯å¥½ç”¨ä¸”å¯é 
的。通过向人们展示自由软件的这些特色，我们成功地吸引到了很多用户。</p>
+<p>戴尔.卡内
基写过一本著名的励志书<cite>《如何赢得朋友与影响别人》</cite>，书里提到，要说服别人做某件事æƒ
…
有一种最有效的办法，就是向这些人展示出迎合他们自身价值判断的论据。在我们这个社会，我们可以以很多的方式来迎合消费è€
…的口味。比方说，å…
è´¹èŽ·å¾—的自由软件能够为用户省钱。也有很多的自由软件是好用且可é
 
的。通过向人们展示自由软件的这些特色，我们说服很多用户采纳了自由软件，å
…¶ä¸­æœ‰äº›çŽ°åœ¨å¾ˆæˆåŠŸã€‚</p>
 
 <p>假如吸引更多人使用自由软件是我们的终极目æ 
‡ï¼Œé‚£æˆ‘们就不会提及自由的概念，而只会提到那些容易为消费è€
…理解的实用性的特性。这就是
 &ldquo;开源&rdquo; 一词及其鼓吹者的用意。</p>
@@ -71,7 +71,7 @@
 <p>可那æ 
·åšçš„话，我们就只会停留在长征的途中，而摘取不到自由的果实。对于那些基于实用性考虑而使用自由软件的用户，软件好用，他们就会用；不好用，他们就会考虑舍弃。他们也会抵挡不住私有软件的诱惑，只要后è€
…是好用的。</p>
 
 <p>开源软件支持者的理念是以消费者
的需要为第一追求的目æ 
‡ï¼Œä»–们的行动也印证了他们的这一理念。这恰恰是我们<a
-href="/philosophy/open-source-misses-the-point.html">不认同“开源软件”</a>的原å›
 。</p>
+href="/philosophy/open-source-misses-the-point.html">不提倡“开源软件”</a>的原å›
 。</p>
 
 <img src="/graphics/gnulaptop.png"
      alt="[悬浮的 Gnu 和一个笔记本]" class="imgright" />
@@ -145,8 +145,8 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017 <a
-href="http://www.stallman.org/";>Richard Stallman</a>。</p>
+<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017, 2018 <a
+href="http://www.stallman.org/";>Richard Stallman</a>.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -158,12 +158,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>: Tony Yet，2010。<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017，2018。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2017/10/01 14:00:38 $
+$Date: 2018/04/03 12:28:40 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/surveillance-vs-democracy.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/surveillance-vs-democracy.zh-cn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/surveillance-vs-democracy.zh-cn.html     19 Feb 2018 11:00:44 
-0000      1.8
+++ philosophy/surveillance-vs-democracy.zh-cn.html     3 Apr 2018 12:28:40 
-0000       1.9
@@ -154,7 +154,8 @@
 <p>让隐私在监控下安全的一个方法是<a 
name="dispersal">分散数据并使之不容易获取</a>。老式的安å…
¨æ‘„像头对隐私不构成威胁（<a
 
href="#privatespace">*</a>）。它的记录都保存在本地，最多保留数周。å›
 
为获取这些记录并不方便，所以从来没有大规模地收集此类数据；只有有人报告犯罪活动时，数据才被从本地调取。每天收集上百万的磁带并查看或复制实é™
…上是不可能完成的任务。</p>
 
-<p>今天，安å…
¨æ‘„像头变成了监控摄像头：他们连接到互联网，所以记录能够由数据中心收集并永ä¹
…保存。这本身已经很危险，但情
况正变得更糟。人脸识别技术的进展有一天会å…
¨ç¨‹è¿½è¸ªè¢«æ€€ç–‘的记者，从而查看他们在和谁说话。</p>
+<p>今天，安å…
¨æ‘„像头变成了监控摄像头：他们连接到互联网，所以记录能够由数据中心收集并永ä¹
…保存。在底特律，警察向企业施压，要企业给他们<a
+href="http://www.detroitnews.com/story/news/local/detroit-city/2018/01/23/detroit-green-light/109524794/";>æ—
 限制的监控摄像头访问权限</a>，这æ 
·è­¦å¯Ÿå°±å¯ä»¥éšæ—¶æŸ¥çœ‹ã€‚这本身已经很危险，但情
况正变得更糟。人脸识别技术的进展有一天会å…
¨ç¨‹è¿½è¸ªè¢«æ€€ç–‘的记者，从而查看他们在和谁说话。</p>
 
 <p>网络摄像头本身的数字安全性通常很差劲，<a
 
href="http://www.networkworld.com/community/blog/cia-wants-spy-you-through-your-appliances";>任何人都可以查看这些摄像头在观察什么</a>。这使网络摄像头成为安å
…¨å’Œéšç§çš„主要威胁。为了保护隐私，我们应该禁止针对å…
¬ä¼—行踪的网络摄像头，除了那些人们随身携带的摄像设备。人们å¿
…须有自由间或发布一些ç…
§ç‰‡å’Œè§†é¢‘，但是在网络上系统收集此类数据的行为必
须受到限制。</p>
@@ -337,7 +338,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/02/19 11:00:44 $
+$Date: 2018/04/03 12:28:40 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/compromise.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/compromise.zh-cn-en.html      28 Aug 2017 14:29:28 -0000      
1.15
+++ philosophy/po/compromise.zh-cn-en.html      3 Apr 2018 12:28:40 -0000       
1.16
@@ -95,7 +95,7 @@
 <p>Dale Carnegie's classic self-help book, <cite>How to Win Friends and
 Influence People</cite>, advises that the most effective way to
 persuade someone to do something is to present arguments that appeal
-to his values.  There are ways we can appeal to the consumer values
+to per values.  There are ways we can appeal to the consumer values
 typical in our society.  For instance, free software obtained gratis
 can save the user money.  Many free programs are convenient and
 reliable, too.  Citing those practical benefits has succeeded in
@@ -110,13 +110,13 @@
 
 <p>That approach can get us only part way to the goal of freedom.  People
 who use free software only because it is convenient will stick with it
-only as long as it is convenient.  And they will see no reason not to
-use convenient proprietary programs along with it.</p>
+only as long as it is more convenient.  And they will see no reason not
+to use convenient proprietary programs along with it.</p>
 
 <p>The philosophy of open source presupposes and appeals to consumer
 values, and this affirms and reinforces them.  That's why we
-<a href="/philosophy/open-source-misses-the-point.html">do not support
-open source.</a></p>
+<a href="/philosophy/open-source-misses-the-point.html">do not
+advocate open source.</a></p>
 
 <img src="/graphics/gnulaptop.png"
      alt=" [Levitating Gnu with a laptop] " class="imgright" />
@@ -234,7 +234,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017 <a 
href="http://www.stallman.org/";>Richard
+<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017, 2018 <a 
href="http://www.stallman.org/";>Richard
 Stallman</a>.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -245,7 +245,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/08/28 14:29:28 $
+$Date: 2018/04/03 12:28:40 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/po/compromise.zh-cn.po   3 Apr 2018 12:14:35 -0000       1.30
+++ philosophy/po/compromise.zh-cn.po   3 Apr 2018 12:28:40 -0000       1.31
@@ -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: 2018-03-31 00:56+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>

Index: philosophy/po/surveillance-vs-democracy.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.zh-cn-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/surveillance-vs-democracy.zh-cn-en.html       19 Feb 2018 
11:00:44 -0000      1.8
+++ philosophy/po/surveillance-vs-democracy.zh-cn-en.html       3 Apr 2018 
12:28:40 -0000       1.9
@@ -294,7 +294,11 @@
 
 <p>Nowadays, security cameras have become surveillance cameras: they
 are connected to the Internet so recordings can be collected in a data
-center and saved forever.  This is already dangerous, but it is going
+center and saved forever.  In Detroit, the cops pressure businesses to
+give
+them <a 
href="http://www.detroitnews.com/story/news/local/detroit-city/2018/01/23/detroit-green-light/109524794/";>unlimited
+access to their surveillance cameras</a> so that they can look through
+them at any and all times.  This is already dangerous, but it is going
 to get worse.  Advances in face recognition may bring the day when
 suspected journalists can be tracked on the street all the time to see
 who they talk with.</p>
@@ -601,7 +605,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/02/19 11:00:44 $
+$Date: 2018/04/03 12:28:40 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/surveillance-vs-democracy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.zh-cn.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/surveillance-vs-democracy.zh-cn.po    3 Apr 2018 12:23:27 
-0000       1.23
+++ philosophy/po/surveillance-vs-democracy.zh-cn.po    3 Apr 2018 12:28:40 
-0000       1.24
@@ -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: 2018-03-31 01:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""