www graphics/agnuhead.zh-cn.html graphics/po/ag...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     19/02/23 05:31:35

Modified files:
        graphics       : agnuhead.zh-cn.html 
        graphics/po    : agnuhead.zh-cn-en.html agnuhead.zh-cn.po 
        licenses       : license-list.ru.html 
        licenses/po    : license-list.ru-en.html license-list.ru.po 
        philosophy     : categories.zh-cn.html 
                         javascript-trap.zh-cn.html 
                         open-source-misses-the-point.zh-cn.html 
                         surveillance-vs-democracy.zh-cn.html 
        philosophy/po  : categories.zh-cn-en.html categories.zh-cn.po 
                         javascript-trap.zh-cn-en.html 
                         javascript-trap.zh-cn.po 
                         open-source-misses-the-point.zh-cn-en.html 
                         open-source-misses-the-point.zh-cn.po 
                         surveillance-vs-democracy.zh-cn-en.html 
                         surveillance-vs-democracy.zh-cn.po 
        software       : recent-releases-include.ru.html 
        software/po    : recent-releases-include.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/agnuhead.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/agnuhead.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/agnuhead.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.116&r2=1.117
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.317&r2=1.318
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/javascript-trap.zh-cn.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.zh-cn.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/surveillance-vs-democracy.zh-cn.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.zh-cn-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.zh-cn.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn-en.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn.po?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn-en.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.1659&r2=1.1660
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.2343&r2=1.2344

Patches:
Index: graphics/agnuhead.zh-cn.html
===================================================================
RCS file: /web/www/www/graphics/agnuhead.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- graphics/agnuhead.zh-cn.html        15 Dec 2018 14:46:11 -0000      1.7
+++ graphics/agnuhead.zh-cn.html        23 Feb 2019 10:31:33 -0000      1.8
@@ -1,95 +1,95 @@
 <!--#set var="ENGLISH_PAGE" value="/graphics/agnuhead.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>GNU头像 - GNU工程 - 自由软件基金会</title>
+<title>由Etienne Suvasa创作的GNU头像 - GNU工程 - 
自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/graphics/graphics.css" 
media="print,screen" />
 
 <!--#include virtual="/graphics/po/agnuhead.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
 <h2>GNU头像</h2>
 
-<p><a href="/graphics/gnu-head-sm.jpg"><img src="/graphics/gnu-head-sm.jpg"
-alt="[GNU头像的图片]"
-width="129" height="122" /></a></p>
+<p class="byline">Etienne Suvasa 作</p>
 
-<p>ä½ å¯èƒ½æ›´æ„¿æ„ä½¿ç”¨<a
+<div class="reduced-width">
+<p class="important" style="margin-bottom: 1.5em">ä½ å¯èƒ½æ›´æ„¿æ„ä½¿ç”¨<a
 
href="/graphics/heckert_gnu.html">粗体的GNU头像</a>，它目前是自由软件基金会在新的GNUå¾½æ
 ‡å’Œè´´çº¸ä¸Šä½¿ç”¨çš„版本。</p>
 
-<p>GNU头像å…
·æœ‰è±¡å¾æ€§çš„胡子和优美的卷角。他或她表现出对到现在为止的工作还满意的微笑,但仍然凝视远方。</p>
+<div class="pict narrow">
+<a href="/graphics/gerwinski-gnu-head.png"><img
+   src="/graphics/gnu-head.jpg"
+   alt="&nbsp;[GNU头像的图片]&nbsp;" /></a>
+</div>
 
-<p>è¯¥å›¾åƒæœ‰ä»¥ä¸‹å‡ ç§æ ¼å¼ï¼š</p>
+<p>GNU头像å…
·æœ‰è±¡å¾æ€§çš„胡子和睿智的卷角。他或她表现出对到现在为止的工作还满意的微笑,但仍然凝视远方。</p>
 
+<p>该图片曾经是本网站页面的默认艺术设计，包括 <a 
href="/">GNU 首页</a>。它也曾印在1997版的 <a
+href="/graphics/gnu-gear#Tshirts">GNU 
T恤衫</a>的正面，而且仍旧是许多 <a
+href="https://shop.fsf.org/collection/books-docs";>GNU 手册</a>的书脊装
饰。</p>
+
+<dl>
+<dt>原始图片</dt>
+<dd>
+<p>该图形由Etienne 
Suvasa绘制，该艺术家还为多个FSF出版物绘制封面。</p>
 <ul>
-  <li>JPEG <a href="/graphics/gnu-head-sm.jpg">7kB</a>，<a
-href="/graphics/gnu-head.jpg">21kB</a></li>
-  <li>PNG <a href="/graphics/gnu-head-sm.png">2kB</a>，<a
-href="/graphics/gnu-head.png">6kB</a>，<a
-href="/graphics/gerwinski-gnu-head.png">566kB</a></li>
-  <li>PDF <a href="/graphics/gnu-head.pdf">41kB</a></li>
-  <li>ASCII（txt） <a href="gnu-head.txt">5kB</a></li>
+  <li>PNG&nbsp; <a href="/graphics/gnu-head-sm.png">2kB</a> (129x122),&nbsp; <a
+href="/graphics/gnu-head.png">5kB</a> (276x261)</li>
+  <li>JPEG&nbsp; <a href="/graphics/gnu-head-sm.jpg">5kB</a> (129x122),&nbsp; 
<a
+href="/graphics/gnu-head.jpg">18kB</a> (276x261)</li>
 </ul>
+</dd>
 
-<p>该GNU头像曾是本网站包括<a 
href="/home.html">GNU主页</a>的默认艺术设计。</p>
-
-<p>它也曾印在1997版的<a 
href="https://shop.fsf.org/collection/gnu-gear#Tshirts";>GNU
-T恤衫</a>的正面。它还曾印在许多<a
-href="https://shop.fsf.org/collection/books-docs";>GNU手册</a>的书脊上。</p>
-
-
-<h3 id="license">许可证</h3>
-
-<p>该头像可以依照<a href="/licenses/fdl.html">GFDL 1.3</a>、或是<a
-href="http://directory.fsf.org/wiki/License:FAL1.3";>自由艺术许可证</a>、或是<a
-href="http://directory.fsf.org/wiki/License:CC_ASA2.0";>CC-BY-SA
-2.0</a>使用。不过，它还是GNUå·¥ç¨‹çš„å•†æ ‡ã€‚<strong>å¦‚æžœä½ 
想用GNU头像来作为指向自由软件基金会或GNU工程运作的网站链接，没问题；或è€
…在正确谈论GNUçš„æ”¯æŒæ€§å†…å®¹ä¸­ï¼Œä½ ä¹Ÿæ— 
需授权就可使用该头像。任何其他使用，请首先征询<a
-href="mailto:address@hidden";>address@hidden</a>的许可。</strong></p>
-
-<h3 id="attribution">归属</h3>
-
-<p>该图形由Etienne 
Suvasa绘制，该艺术家还为多个FSF出版物绘制封面。</p>
-
-<p>我们还要感谢制作1200x1200 PNG版图像的Peter 
Gerwinski，以及制作PDF版的Arlo Barnes。</p>
-
-<h3 id="Variations">衍生版</h3>
-
-<p>Dustin
-Jorge受GNU头像的启发制作了一个优雅
çš„å¢™çº¸ã€‚ä»–æ›¾ç»èŠ±äº†ä¸€äº›æ—¶é—´è°ƒç ”ä¸€ä¸ªä»–ç”¨äºŽè¯¾å 
‚的纸质版图像的版权。同时他制作了该计算机桌面图像。该墙纸有以下æ
 ¼å¼ï¼š</p>
-
+<dt>重新绘制版</dt>
+<dd>
+<p>Peter Gerwinski重新绘制了原始图片的放大版。</p>
 <ul>
-  <li>PNG <a href="/graphics/gnublue.png">503kB</a></li>
+  <li>PNG&nbsp; <a href="/graphics/gerwinski-gnu-head.png">292kB</a> 
(1200x1200)</li>
+  <li>位于 <a
+href="https://commons.wikimedia.org/wiki/File:Gerwinski-gnu-head.jpg";>Wikimedia
+Commons</a> 的JPEG</li>
+  <li>SVG&nbsp; <a href="/graphics/official%20gnu.svg">135kB</a>，由Victor 
Siame矢量化</li>
+  <li>SVG&nbsp; <a href="/graphics/gnuhead_plain.svg">185kB</a>，由Ville
+Solarius和Ruud Steltenpool矢量化</li>
+  <li>PDF&nbsp; <a href="/graphics/gnu-head.pdf">73kB</a>，Arlo Barnes 
作</li>
+  <li>XCF 和 矢量化 EPS，位于 <a
+href="http://www.gerwinski.de/~anja/gnuart/a-gnu-head/index.html";>Anja
+Gerwinski的网站</a></li>
 </ul>
+</dd>
 
-<p>Ville Solarius制作了GNUå¤´åƒçš„å‡ ç§SVGæ ¼å¼ï¼š </p>
+<dt>ASCII 艺术版</dt>
+<dd>
+<p>由SpAwN为仅支持 ASCII 的终端而作。</p>
 <ul>
-   <li>Plain <a href="/graphics/gnuhead_plain.svg">99.2k</a></li>
-   <li>Inkscape <a href="/graphics/gnuhead_inkscape.svg">99.2k</a></li>
+  <li>TXT&nbsp; <a href="/graphics/gnu-head.txt">5kB</a></li> 
 </ul>
+</dd>
+</dl>
+
+<div id="license" class="infobox">
+<hr />
+<p>Copyright &copy; 1996 Etienne Suvasa</p>
+
+<p>该图片使用 <a rel="license" href="/licenses/fdl.html">GNU Free 
Documentation
+License</a> v1.3、<a rel="license"
+href="https://directory.fsf.org/wiki/License:FAL1.3";>Free Art License</a> 或
+<a rel="license"
+href="https://directory.fsf.org/wiki/License:CC_ASA2.0";>Creative Commons
+Attribution-ShareAlike 2.0 License</a>授权。</p>
 
-<p><a href="mailto:address@hidden";>Ripley</a>为<a
-href="/graphics/gnupassion.svg.gz">GNU头像</a>æ·»åŠ äº†å£å·&ldquo;ä½ 
的热情。我们的潜能。<sup><a
-href="#TransNote1">1</a></sup>&rdquo;</p>
-
-<p><a href="mailto:address@hidden";>John
-M. Wooten</a>制作的一套彩色GNU头像：</p>
-  <ul>
-    <li>
-      <a href="/graphics/gnuwooblk.png">黑色</a> | <a
-href="/graphics/gnuwoogrn.png">绿色</a> | <a
-href="/graphics/gnuwoored.png">红色</a> | <a
-href="/graphics/gnuwoowht.png">白色</a> | <a
-href="/graphics/gnuwooylw.png">黄色</a>
-    </li>
-  </ul>
+<p>
+不过，GNU
+头像也是GNUå·¥ç¨‹çš„å•†æ ‡ã€‚<strong>å¦‚æžœä½ 
想用GNU头像来作为指向自由软件基金会或GNU工程运作的网站链接，没问题；或è€
…在正确谈论GNUçš„æ”¯æŒæ€§å†…å®¹ä¸­ï¼Œä½ ä¹Ÿæ— 
需授权就可使用该头像。任何其他使用，请首先征询<a
+href="mailto:address@hidden";>address@hidden</a>的许可。</strong></p>
+</div>
+</div>
 
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
-<h3>译注</h3>
-<ol>
-<li id="TransNote1">原文是：Your Passion. Our Potential.</li>
-</ol></div>
+ </div>
 </div>
 
 <!-- for id="content", starts in the include above -->
@@ -120,27 +120,10 @@
 若您想翻译本文，请参看<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; 2007, 2013, 2014, 2015, 2017, 2018 Free Software
-Foundation, Inc.</p>
-
-<p>本页面使用<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+<!-- Please only list the latest year the page was modified. -->
+<p><em>页面文字：</em>&nbsp; Copyright &copy; 2019 Free Software 
Foundation, Inc.<br />
+本页面使用 <a rel="license"
+href="https://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" -->
@@ -149,12 +132,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>：何冰，2002。<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018-2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/12/15 14:46:11 $
+$Date: 2019/02/23 10:31:33 $
 
 <!-- timestamp end -->
 </p>

Index: graphics/po/agnuhead.zh-cn-en.html
===================================================================
RCS file: /web/www/www/graphics/po/agnuhead.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- graphics/po/agnuhead.zh-cn-en.html  15 Dec 2018 14:46:12 -0000      1.3
+++ graphics/po/agnuhead.zh-cn-en.html  23 Feb 2019 10:31:34 -0000      1.4
@@ -1,98 +1,98 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
-<title>A GNU Head
+<!-- Parent-Version: 1.87 -->
+<title>A GNU Head by Etienne Suvasa
 - GNU Project - Free Software Foundation</title>
+<link rel="stylesheet" type="text/css" href="/graphics/graphics.css" 
media="print,screen" />
 <!--#include virtual="/graphics/po/agnuhead.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>A GNU Head</h2>
 
-<p><a href="/graphics/gnu-head-sm.jpg"><img src="/graphics/gnu-head-sm.jpg"
-alt=" [Image of the head of a GNU] "
-width="129" height="122" /></a></p>
-
-<p>You may prefer to use <a href="/graphics/heckert_gnu.html">a bold
-GNU Head</a>, which is the version now used by the Free Software
-Foundation on any new GNU-emblem items, and stickers.</p>
+<p class="byline">by Etienne Suvasa</p>
 
-<p>A handsome GNU Head with typical beard and smart-looking curled horns.
+<div class="reduced-width">
+<p class="important" style="margin-bottom: 1.5em">You may prefer to use
+the <a href="/graphics/heckert_gnu.html">Bold GNU Head</a>, which is the
+version now used by the Free Software Foundation on any new GNU-emblem
+items and stickers.</p>
+
+<div class="pict narrow">
+<a href="/graphics/gerwinski-gnu-head.png"><img
+   src="/graphics/gnu-head.jpg"
+   alt="&nbsp;[Image of the head of a GNU]&nbsp;" /></a>
+</div>
+
+<p>A handsome GNU head with typical beard and smart-looking curled horns.
 He or she appears to be smiling contentedly with its works as of yet,
 but it still gazes off into the distance.</p>
 
-<p>This image is available in the following formats:</p>
-
+<p>This image was the default art for pages on this website, including
+<a href="/">GNU's home page</a>. It was also used on the front of the 1997 <a 
+href="/graphics/gnu-gear#Tshirts">GNU t-shirt</a>, and
+still adorns the spine of many <a
+href="https://shop.fsf.org/collection/books-docs";>GNU manuals</a>.</p>
+
+<dl>
+<dt>Original image</dt>
+<dd>
+<p>It was drawn by Etienne Suvasa, who has also done several covers for FSF
+publications.</p>
 <ul>
-  <li>JPEG <a href="/graphics/gnu-head-sm.jpg">7kB</a>,
-    <a href="/graphics/gnu-head.jpg">21kB</a></li>
-  <li>PNG <a href="/graphics/gnu-head-sm.png">2kB</a>,
-    <a href="/graphics/gnu-head.png">6kB</a>,
-    <a href="/graphics/gerwinski-gnu-head.png">566kB</a></li>
-  <li>PDF <a href="/graphics/gnu-head.pdf">41kB</a></li>
-  <li>ASCII (txt) <a href="gnu-head.txt">5kB</a></li>
+  <li>PNG&nbsp; <a href="/graphics/gnu-head-sm.png">2kB</a> (129x122),&nbsp;
+    <a href="/graphics/gnu-head.png">5kB</a> (276x261)</li>
+  <li>JPEG&nbsp; <a href="/graphics/gnu-head-sm.jpg">5kB</a> (129x122),&nbsp;
+    <a href="/graphics/gnu-head.jpg">18kB</a> (276x261)</li>
 </ul>
+</dd>
 
-<p>This Head of a GNU was the default art for pages on this web site
-including <a href="/home.html">GNU's home page</a>.</p>
-
-<p>It was also used on the front of the 1997 <a 
-href="https://shop.fsf.org/collection/gnu-gear#Tshirts";>GNU T-shirt</a>. It is 
also on the spine of 
-many <a href="https://shop.fsf.org/collection/books-docs";>GNU Manuals</a>.</p>
-
-
-<h3 id="license">Licensing</h3>
-
-<p>This image is available for use under either the <a 
-href="/licenses/fdl.html">GFDL 1.3</a>, <a 
-href="http://directory.fsf.org/wiki/License:FAL1.3";>the Free Art License</a>, 
-or under <a href="http://directory.fsf.org/wiki/License:CC_ASA2.0";>
-CC-BY-SA 2.0</a>. 
-It is, however, also a trademark for the GNU Project.  <strong>If you want 
-to use the GNU head to link to a website run by the Free Software 
-Foundation or the GNU project, feel free, or if you're using it in contexts 
-talking about GNU in a supportive and accurate way, you can also do this
-without permission. For any other requests, please ask <a 
-href="mailto:address@hidden";>address@hidden</a> 
-for permission first.</strong></p>
-
-<h3 id="attribution">Attribution</h3>
-
-<p>This graphic was drawn by Etienne Suvasa, who has also done several
-covers for FSF publications.</p>
-
-<p>We also would like to thank Peter Gerwinski for the 1200x1200 PNG version
-of this image, and Arlo Barnes for the PDF version.</p>
-
-<h3 id="Variations">Variations</h3>
-
-<p>Dustin Jorge made a nice wallpaper inspired by this GNU head. He spent
-some time researching copyright for a paper he had to do for a
-class. In the meantime he made this desktop. It is available in the 
-following formats:</p>
-
+<dt>Redrawn version</dt>
+<dd>
+<p>The original image was enlarged and redrawn by Peter Gerwinski.</p>
 <ul>
-  <li>PNG <a href="/graphics/gnublue.png">503kB</a></li>
+  <li>PNG&nbsp; <a href="/graphics/gerwinski-gnu-head.png">292kB</a> 
(1200x1200)</li>
+  <li>JPEG on <a 
href="https://commons.wikimedia.org/wiki/File:Gerwinski-gnu-head.jpg";>
+    Wikimedia Commons</a></li>
+  <li>SVG&nbsp; <a href="/graphics/official%20gnu.svg">135kB</a>, vectorized
+    by Victor Siame</li>
+  <li>SVG&nbsp; <a href="/graphics/gnuhead_plain.svg">185kB</a>, vectorized
+    by Ville Solarius and Ruud Steltenpool</li>
+  <li>PDF&nbsp; <a href="/graphics/gnu-head.pdf">73kB</a>, made by Arlo 
Barnes</li>
+  <li>XCF and vectorized EPS on <a
+    href="http://www.gerwinski.de/~anja/gnuart/a-gnu-head/index.html";>Anja
+    Gerwinski's website</a></li>
 </ul>
+</dd>
 
-<p>Ville Solarius has come up with the following variations of the GNU Head 
-in the SVG format: </p>
+<dt>ASCII version</dt>
+<dd>
+<p>It was made by SpAwN for ASCII-only terminals.</p>
 <ul>
-   <li>Plain <a href="/graphics/gnuhead_plain.svg">99.2k</a></li>
-   <li>Inkscape <a href="/graphics/gnuhead_inkscape.svg">99.2k</a></li>
+  <li>TXT&nbsp; <a href="/graphics/gnu-head.txt">5kB</a></li> 
 </ul>
+</dd>
+</dl>
 
-<p><a href="mailto:address@hidden";>Ripley</a> added the slogan "Your
-Passion. Our Potential." to the <a href="/graphics/gnupassion.svg.gz">GNU 
head</a>.</p>
-
-<p>A set of colorful GNU heads by <a
-href="mailto:address@hidden";>John M. Wooten</a>:</p>
-  <ul>
-    <li>
-      <a href="/graphics/gnuwooblk.png">Black</a> |
-      <a href="/graphics/gnuwoogrn.png">Green</a> |
-      <a href="/graphics/gnuwoored.png">Red</a> |
-      <a href="/graphics/gnuwoowht.png">White</a> |
-      <a href="/graphics/gnuwooylw.png">Yellow</a>
-    </li>
-  </ul>
+<div id="license" class="infobox">
+<hr />
+<p>Copyright &copy; 1996 Etienne Suvasa</p>
+
+<p>These images are available under the <a rel="license"
+href="/licenses/fdl.html">GNU Free Documentation License</a> v1.3, or the
+<a rel="license" href="https://directory.fsf.org/wiki/License:FAL1.3";>Free
+Art License</a>, or the <a rel="license"
+href="https://directory.fsf.org/wiki/License:CC_ASA2.0";>Creative Commons
+Attribution-ShareAlike 2.0 License</a>.</p>
+
+<p>
+The GNU head is, however, also a trademark for the GNU Project.
+<strong>If you want to use the GNU head to link to a website run by
+the Free Software Foundation or the GNU project, feel free, or if
+you're using it in contexts talking about GNU in a supportive and
+accurate way, you can also do this without permission.  For any other
+requests, please ask &lt;<a
+href="mailto:address@hidden";>address@hidden</a>&gt; for
+permission first.</strong></p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -124,34 +124,18 @@
 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; 2007, 2013, 2014, 2015, 2017, 2018 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
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+<!-- Please only list the latest year the page was modified. -->
+<p><em>Page text:</em>&nbsp;
+Copyright &copy; 2019 Free Software Foundation, Inc.<br />
+Available under the <a rel="license"
+href="https://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: 2018/12/15 14:46:12 $
+$Date: 2019/02/23 10:31:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: graphics/po/agnuhead.zh-cn.po
===================================================================
RCS file: /web/www/www/graphics/po/agnuhead.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- graphics/po/agnuhead.zh-cn.po       23 Feb 2019 10:21:53 -0000      1.4
+++ graphics/po/agnuhead.zh-cn.po       23 Feb 2019 10:31:34 -0000      1.5
@@ -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: 2019-02-21 19:56+0000\n"
 
 #. type: Content of: <title>
 msgid "A GNU Head by Etienne Suvasa - GNU Project - Free Software Foundation"

Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- licenses/license-list.ru.html       8 Jan 2019 13:59:01 -0000       1.127
+++ licenses/license-list.ru.html       23 Feb 2019 10:31:34 -0000      1.128
@@ -1878,9 +1878,11 @@
 истолкуете раздел&nbsp;3.4, у вас вообще может 
не быть разрешения
 распространять программу саму по 
себе.</p></dd>
 
-<dt><a id="comclause" href="https://commonsclause.com/";>Параграф 
обобществления
-(<span lang="en" xml:lang="en">Commons Clause</span>)</a> <span
-class="anchor-reference-id"> (<a href="#comclause">#comclause</a>)</span></dt>
+<dt><a id="comclause"
+href="https://directory.fsf.org/wiki/License:Commons-Clause";>Параграф
+обобществления (<span lang="en" xml:lang="en">Commons 
Clause</span>)</a>
+<span class="anchor-reference-id"> (<a
+href="#comclause">#comclause</a>)</span></dt>
 <dd>
 <p>&ldquo;Параграф обобществления&rdquo; 
представляет лицензию несвободных
 программ, поскольку запрещает продажу 
копий программы и даже работу с
@@ -2798,7 +2800,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2019/01/08 13:59:01 $
+$Date: 2019/02/23 10:31:34 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- licenses/po/license-list.ru-en.html 8 Jan 2019 13:59:01 -0000       1.116
+++ licenses/po/license-list.ru-en.html 23 Feb 2019 10:31:34 -0000      1.117
@@ -1879,7 +1879,7 @@
 on how you read section 3.4, you may not have permission to distribute
 the software by itself at all.</p></dd>
 
-<dt><a id="comclause" href="https://commonsclause.com/";>Commons Clause</a>
+<dt><a id="comclause" 
href="https://directory.fsf.org/wiki/License:Commons-Clause";>Commons Clause</a>
     <span class="anchor-reference-id">
        (<a href="#comclause">#comclause</a>)</span></dt>
 <dd>
@@ -2767,7 +2767,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/01/08 13:59:01 $
+$Date: 2019/02/23 10:31:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -b -r1.317 -r1.318
--- licenses/po/license-list.ru.po      23 Feb 2019 10:21:40 -0000      1.317
+++ licenses/po/license-list.ru.po      23 Feb 2019 10:31:34 -0000      1.318
@@ -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: 2019-02-23 09:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -3756,24 +3755,15 @@
 "программу саму по себе."
 
 #. type: Content of: <dl><dt>
-# | <a id=\"comclause\" [-href=\"https://commonsclause.com/\";>Commons-]
-# | {+href=\"https://directory.fsf.org/wiki/License:Commons-Clause\";>Commons+}
-# | Clause</a> <span class=\"anchor-reference-id\"> (<a
-# | href=\"#comclause\">#comclause</a>)</span>
-#| msgid ""
-#| "<a id=\"comclause\" href=\"https://commonsclause.com/\";>Commons Clause</"
-#| "a> <span class=\"anchor-reference-id\"> (<a href=\"#comclause"
-#| "\">#comclause</a>)</span>"
 msgid ""
 "<a id=\"comclause\" href=\"https://directory.fsf.org/wiki/License:Commons-";
 "Clause\">Commons Clause</a> <span class=\"anchor-reference-id\"> (<a href="
 "\"#comclause\">#comclause</a>)</span>"
 msgstr ""
 "<a id=\"comclause\" href=\"https://directory.fsf.org/wiki/License:Commons-";
-"Clause\">Параграф "
-"обобществления (<span lang=\"en\" xml:lang=\"en\">Commons 
Clause</span>)</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#comclause\">#comclause</a>)"
-"</span>"
+"Clause\">Параграф обобществления (<span lang=\"en\" 
xml:lang=\"en\">Commons "
+"Clause</span>)</a> <span class=\"anchor-reference-id\"> (<a href=\"#comclause"
+"\">#comclause</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""

Index: philosophy/categories.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/categories.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/categories.zh-cn.html    23 Feb 2019 07:33:28 -0000      1.3
+++ philosophy/categories.zh-cn.html    23 Feb 2019 10:31:34 -0000      1.4
@@ -26,7 +26,8 @@
 </p>
 
       <p>本图最初由 Chao-Kuei 创作并且经过å…
¶ä»–人的更新，解释了不同类别的软件之间的区别。它有<a
-href="/philosophy/category.svg">矢量图版</a>以及<a
+href="/philosophy/category.svg">矢量图版</a>（以及<a
+href="/philosophy/category.zh-cn.svg">中文矢量图版</a>）以及<a
 href="/philosophy/category.fig">XFig æ ¼å¼ç‰ˆæœ¬</a>。本图采用 GNU 
通用公共许可证（GNU GPL）2.0
 或更高版本、GNU 自由文档许可证（GNU FDL）1.2 
或更高版本、或者创作共用-署名-相同方式共享（CC 
BY-SA）许可证 2.0 或更高版本。</p>
 
@@ -56,7 +57,7 @@
 <h3 id="OpenSource">开源软件（Open Source Software）</h3>
 
        <p>
-       
&ldquo;开源软件&rdquo;这一短语被某些人用于指代与自由软件或多或少地相同的一类软件。它们并不是与自由软件严æ
 
¼ä¸€è‡´çš„一类软件：它们接受某些在我们看来约束性过强的许可证（条款），也有一些自由软件许可证（条款）是它们所拒绝接受的。然而，两è€
…å¤–å»¶çš„å·®åˆ«å¹¶ä¸å¤§ï¼šå‡ 
ä¹Žæ‰€æœ‰çš„è‡ªç”±è½¯ä»¶ä¹Ÿç¬¦åˆå¼€æºè½¯ä»¶å®šä¹‰ï¼Œå¹¶ä¸”å‡ 
乎所有的开源软件也是自由的。</p>
+       
&ldquo;开源软件&rdquo;这一短语被某些人用于指代与自由软件或多或少地相同的一类软件。它们并不是与自由软件严æ
 
¼ä¸€è‡´çš„一类软件：它们接受某些在我们看来约束性过强的许可证（条款），也有一些自由软件许可证（条款）是它们所拒绝接受的。然而，两è€
…
外延的差别并不大：就我们所知，只有很少的开源软件不是自由软件。理论上，可能也会有自由软件不被接受为是开源软件，但是我们还没有看到实é™
…的例子。</p>
        
<p>我们倾向于使用自由软件这一概念，由于它代表自由&mdash;&mdash;这是&ldquo;<a
 
href="/philosophy/open-source-misses-the-point.html">开源</a>&rdquo;这一短语所不能体现的。</p>
 
@@ -97,7 +98,7 @@
 
        <p>如果一个程序是自由的但并未采用 copyleft
 许可证，那么某些副本或者修改版本可能完å…
¨ä¸æ˜¯è‡ªç”±çš„。软件公司可以编译该程序，不论是否对å…
¶è¿›è¡Œä¿®æ”¹ï¼Œéƒ½å¯ä»¥å°†å¯æ‰§è¡Œæ–‡ä»¶ä½œä¸º<a
-href="#ProprietraySoftware">专有软件</a>产品发布。</p>
+href="#ProprietarySoftware">专有软件</a>产品发布。</p>
 
        <p><a href="http://www.x.org";>X Window 系统</a>阐释了这一点。X 
联盟将 X11 以某种非 copyleft
 发布条款发布，使其成为非 copyleft
@@ -264,7 +265,7 @@
 </div>
 
 <p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015,
-2016, 2017, 2018 Free Software Foundation, Inc.</p>
+2016, 2017, 2018, 2019 Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -282,7 +283,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/02/23 07:33:28 $
+$Date: 2019/02/23 10:31:34 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/javascript-trap.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/javascript-trap.zh-cn.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/javascript-trap.zh-cn.html       15 Dec 2018 14:46:28 -0000      
1.9
+++ philosophy/javascript-trap.zh-cn.html       23 Feb 2019 10:31:34 -0000      
1.10
@@ -12,7 +12,7 @@
 
 <p><a href="http://www.stallman.org/";>Richard Stallman</a> 著</p>
 
-<p><strong>ä½ 
可能每天都在自己的电脑上运行非自由软件却毫不知情
&mdash;é€šè¿‡ä½¿ç”¨ä½ çš„æµè§ˆå™¨ã€‚</strong></p>
+<p><strong>ä½ 
可能每天都在自己的电脑上运行非自由软件却毫不知情
&mdash;&mdash;é€šè¿‡ä½¿ç”¨ä½ çš„æµè§ˆå™¨ã€‚</strong></p>
 
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
@@ -22,9 +22,9 @@
 </blockquote>
 
 <p>在自由软件社区，<a
-href="/philosophy/free-software-even-more-important.html">非自由软件会侵害å
…
¶ç”¨æˆ·</a>的概念大家都很熟悉。有些人会拒绝在电脑上使用任何专属软件，以此来捍卫自己的自由。还有许多人意识到非自由并拒绝那些程序。</p>
+href="/philosophy/free-software-even-more-important.html">非自由软件会侵害å
…
¶ç”¨æˆ·</a>的概念大家都很熟悉。有些人会拒绝在电脑上使用任何专有软件，以此来捍卫自己的自由。还有许多人意识到非自由并拒绝那些程序。</p>
 
-<p>è®¸å¤šç”¨æˆ·çŸ¥é“æµè§ˆå™¨è¦æ±‚å®‰è£…çš„æ’ä»¶æœ‰æ­¤é—®é¢˜ï¼Œå› 
为它们可能是自由软件，也可能是非自由软件。但是浏览器也会运行不要求ä½
 è®¸å¯çš„å…¶ä»–éžè‡ªç”±è½¯ä»¶ï¼Œç”šè‡³ä¹Ÿä¸å‘Šè¯‰ä½ 
&mdash;网页带有或链接了哪些程序。这些程序多数是用JavaScript编写的，虽然å
…¶ä»–语言也是可以的。</p>
+<p>è®¸å¤šç”¨æˆ·çŸ¥é“æµè§ˆå™¨è¦æ±‚å®‰è£…çš„æ’ä»¶æœ‰æ­¤é—®é¢˜ï¼Œå› 
为它们可能是自由软件，也可能是非自由软件。但是浏览器也会运行不要求ä½
 è®¸å¯çš„å…¶ä»–éžè‡ªç”±è½¯ä»¶ï¼Œç”šè‡³ä¹Ÿä¸å‘Šè¯‰ä½ 
&mdash;&mdash;网页带有或链接了哪些程序。这些程序多数是用JavaScript编写的，虽然å
…¶ä»–语言也是可以的。</p>
 
 
<p>JavaScript（正式名称是ECMAScript，但是很少有人用了）曾经用于不重要的网页è£
…
饰，比如可爱但是并不重要的导航和显示功能。可以认为这些只是HTMLæ
 ‡è®°è¯­è¨€çš„扩展，而不是真正的软件，这æ 
·å°±å¯ä»¥å¿½ç•¥å®ƒçš„问题。</p>
 
@@ -37,7 +37,7 @@
 
 <p>æµè§ˆå™¨ä¸€èˆ¬ä¸ä¼šå‘Šè¯‰ä½ å®ƒä»¬ä»€ä¹ˆæ—¶å€™ä¼šåŠ 
è½½JavaScript程序。有些浏览器提供了完å…
¨ç¦ç”¨JavaScriptçš„æ–¹æ³•ï¼Œå¯æ˜¯å³ä½¿ä½ çŸ¥é“æœ‰é—®é¢˜ï¼Œä½ 
还是需要花很多精力去确认这些非自由软件并拦截它们。然而，就连自由软件社区的大多数用户都不知道这个有问题；而浏览器的沉默也好似在掩盖这个问题。</p>
 
-<p>可以把JavaScript程序发布为自由软件，使用自由软件许可证发布å
…¶æºä»£ç 
å°±è¡Œã€‚如果该程序是自给自足的&mdash;如果它的功能和目的独立于它所应用的网站&mdash;这就没问题；ä½
 å¯ä»¥å°†å…¶æ‹·è´åˆ°ä½ çš„ç”µè„‘ï¼Œä¿®æ”¹å®ƒï¼Œä½¿ç”¨æµè§ˆå™¨åŠ 
载它并运行它。但是这并不是其通常的情形。</p>
+<p>可以把JavaScript程序发布为自由软件，使用自由软件许可证发布å
…¶æºä»£ç 
å°±è¡Œã€‚如果该程序是自给自足的&mdash;&mdash;如果它的功能和目的独立于它所应用的网站&mdash;&mdash;这就没问题；ä½
 å¯ä»¥å°†å…¶æ‹·è´åˆ°ä½ çš„ç”µè„‘ï¼Œä¿®æ”¹å®ƒï¼Œä½¿ç”¨æµè§ˆå™¨åŠ 
载它并运行它。但是这并不是其通常的情形。</p>
 
 <p>通常情
况下，JavaScript程序会和特定的网页或网站一起工作，而那个网页或网站有了这个程序才能正常工作。这就出现了另一个问题：即使有源程序，浏览器也æ—
 æ³•è¿è¡Œä½ ä¿®æ”¹çš„ç‰ˆæœ¬ï¼Œé™¤éžä½ 
使用原来的版本访问特定的网站或网页。这个效果和tivoization<sup><a
 href="#TransNote1">1</a></sup>类似，虽然从æ 
¹æœ¬ä¸Šä¸æ˜¯é‚£ä¹ˆéš¾ä»¥è§£å†³ã€‚</p>
@@ -57,18 +57,31 @@
 
 
<p>什么是我们说的&quot;非平凡&quot;呢？它表示的是程度，所以它是指设计一种简明的æ
 ‡å‡†æ¥èŽ·å¾—好的结果，而不是去寻求唯一正确的答案。</p>
 <p>
-我们目前的政策认为一个JavaScript程序是非平凡的，如果：</p>
+我们目前的æ 
‡å‡†è®¤ä¸ºä¸€ä¸ªJavaScript程序是非平凡的，如果它满足以下任一条件：</p>
 
 <ul>
-  <li>该程序创建AJAX请求或同创建AJAXè¯·æ±‚çš„è„šæœ¬ä¸€èµ·åŠ 
载，</li>
+  <li>该程序引用一个外部的脚本（来自另一个页面）。</li>
 
-  <li>è¯¥ç¨‹åºåŠ¨æ€åŠ è½½å¤–éƒ¨è„šæœ¬æˆ–è€…åŒåŠ 
è½½å¤–éƒ¨è„šæœ¬çš„è„šæœ¬ä¸€èµ·åŠ è½½ï¼Œ</li>
+  <li>该程序声明的数组超过了50ä¸ªå…ƒç´ ã€‚</li>
 
-  <li>è¯¥ç¨‹åºå®šä¹‰å‡½æ•°æˆ–æ–¹æ³•æ¥åŠ è½½å¤–éƒ¨è„šæœ¬ï¼ˆä»Žhtml），或者
è¿™äº›å‡½æ•°å’Œæ–¹æ³•æœ¬èº«å°±ä½œä¸ºå¤–éƒ¨è„šæœ¬è¢«åŠ è½½ï¼Œ</li>
+  
<li>该程序定义的主体（函数或方法）会做调用基本函数以外的调用。</li>
+
+  
<li>该程序定义的主体带有3个以上的条件判断或循环结构。</li>
+
+  <li>除了定义之外，页面的代ç 
è°ƒç”¨äº†è¯¥é¡µé¢ä¸Šé—´éš”很远的非基本函数。</li>
+
+  <li>除了定义之外，页面代ç 
å¸¦æœ‰3个以上的条件判断或循环结构（两个结构的总和超
过3)。</li>
+
+  <li>该程序调用了 <b>eval</b>。</li>
+
+  <li>该程序有 Ajax 调用。</li>
+
+  <li>该程序有 <b>[&hellip;]</b> 调用。</li>
+
+  <li>该程序修改了 DOM。</li>
   
   
<li>该程序要么使用动态JavaScript结构，这些结构在不了解该程序的æƒ
…å†µä¸‹å¾ˆéš¾åˆ†æžï¼Œè¦ä¹ˆè¯¥ç¨‹åºå’Œä½¿ç”¨è¿™äº›ç»“æž„çš„è„šæœ¬ä¸€èµ·åŠ 
载。这些结构是：
     <ul>
-      <li>使用eval函数，</li>
       <li>调用带有方括号表达式的方法，</li>
       <li>使用超
出某些（诸如Obj.write、Obj.createElement、...）方法名称之外的å…
¶ä»–结构。</li>
     </ul>
@@ -154,7 +167,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2009-2013, 2016, 2017, 2018 Richard Stallman</p>
+<p>Copyright &copy; 2009-2013, 2016, 2017, 2018, 2019 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -165,12 +178,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>，2017，2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017-2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/12/15 14:46:28 $
+$Date: 2019/02/23 10:31:34 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/open-source-misses-the-point.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/open-source-misses-the-point.zh-cn.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/open-source-misses-the-point.zh-cn.html  31 Jan 2018 13:02:00 
-0000      1.23
+++ philosophy/open-source-misses-the-point.zh-cn.html  23 Feb 2019 10:31:34 
-0000      1.24
@@ -4,13 +4,19 @@
 <!-- Parent-Version: 1.79 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>为什么开源误导了自由软件的重点 - GNU 工程 - 
自由软件基金会(FSF)</title>
+<title>为什么开源错失了自由软件的重点 - GNU 工程 - 
自由软件基金会(FSF)</title>
 
 <!--#include virtual="/philosophy/po/open-source-misses-the-point.translist" 
-->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<h2>为什么开源误导了自由软件的重点</h2>
+<h2>为什么开源错失了自由软件的重点</h2>
 
-<p><strong>Richard Stallman</strong> 著</p>
+<p class="byline">Richard Stallman 著</p>
+
+<div class="article">
+
+<blockquote class="comment"><p>
+&ldquo;自由软件&rdquo;和&ldquo;开源&rdquo;基本上指的是同一范围的程序。然而，出于不同的价值观，它们对这些程序的看法大相径庭。自由软件运动为用户的计算自由而战斗；这是一个为自由和å
…
¬æ­£è€Œæˆ˜çš„运动。相反，开源理念重视的是实用优势而不是原则利害。我们å›
 此不赞同开源运动，也不使用开源这个词。
+</p></blockquote>
 
 <p>要说一个软件是&ldquo;自由&rdquo;的，这意味着它尊重<a
 
href="/philosophy/free-sw.html">用户的基本自由</a>：自由地运行这个软件，学ä¹
 和修改它，以及重新发布它的原版或修改版。这是个å…
³äºŽè‡ªç”±æƒåˆ©çš„问题，而非价æ 
¼é«˜ä½Žã€‚我们讨论的自由是如同自由言论般的权利，不是å…
è´¹èµ é¥®ä¸€æ ·çš„å¤§æ´¾é€ã€‚</p>
@@ -20,13 +26,13 @@
 
<p>当今世界中，成百上千万的用户正在使用着自由软件；在印度和西班牙某些地区的å
…¬ç«‹å­¦æ ¡é‡Œï¼Œå…¨ä½“å­¦ç”Ÿéƒ½å­¦ä¹ 如何使用自由的<a
 
href="/gnu/linux-and-gnu.html">GNU/Linux操作系统</a>。然而，这些用户之中，大多数人却并不了解我们为何开发这个自由系统，又为何建立起整个自由软件社区，以及背后驱动这一切的道义上的逻辑。å›
 
为如今这个自由系统，乃至整个社区都被以&ldquo;开源&rdquo;一词以蔽之。顺着这个词，一切都被引å
…¥äº†ä¸€ä¸ªå®Œå…
¨ä¸åŒçš„思维之中。在那里，自由这东西，甚少提及。</p>
 
-<p>从1983年起，我们以维护计算机用户自由之名å…
´èµ·äº†è‡ªç”±è½¯ä»¶è¿åŠ¨ã€‚在1984年，我们发起了开发自由操作系统的计划，并将此系统命名为GNU。借此系统，我们就不å¿
…
倚赖非自由的操作系统，不再坐视它们肆意剥夺用户的自由。在二十世纪å
…
«åå¹´ä»£ï¼Œæˆ‘们开发了系统的绝大多数组件。为了保护用户的自由，我们设计了<a
+<p>从1983年起，我们以维护计算机用户自由之名å…
´èµ·äº†è‡ªç”±è½¯ä»¶è¿åŠ¨ã€‚在1984年，我们发起了开发自由操作系统的计划，并将此系统命名为GNU。借此系统，我们就不å¿
…
依赖非自由的操作系统，不再坐视它们肆意剥夺用户的自由。在二十世纪å
…
«åå¹´ä»£ï¼Œæˆ‘们开发了系统的绝大多数组件。为了保护用户的自由，我们设计了<a
 href="/licenses/gpl.html">GNU通用公共许可证</a>（GNU 
GPL），并以该许可证发行大部分组件。</p>
 
 <p>并非全部的自由软件用户和开发者
都赞同自由软件运动的目æ 
‡ã€‚1998年，自由软件阵营中的部分成员分裂出来，并以&ldquo;开源&rdquo;为名继续开展活动。一开始，由于&ldquo;自由软件&rdquo;（free
 
software）一词可能引起歧义，这才提出开源这个说法。但是很快开源这词便开始异化，使得å
…¶èƒŒåŽçš„逻辑与自由软件运动的初衷相去甚远。</p>
 
-<p>ä¸€äº›å¼€æºçš„æ”¯æŒè€…ä¼šè®¤ä¸ºï¼Œæ‰€è°“å¼€æºï¼Œæ— 
非是用来&ldquo;为自由软件做市场营销&rdquo;的。å…
·ä½“说来，就是向那些商界人士展现自由软件的实际
å¥½å¤„ã€‚åŒæ—¶é¿å…è°ˆåŠä»€ä¹ˆå¯¹é”™æ­£è¯¯ï¼Œå› 
为商业大佬们普遍不太喜欢这调调。还有一些开源的支持者
å¹²è„†å°±æŠ›å¼ƒè‡ªç”±è½¯ä»¶é“ä¹‰ä¸Šçš„ä»·å€¼è§‚ã€‚æ— 
论他们持哪种观点，一旦他们开始为开源营销的时候，自由软件运动所珍视的那些价值观就被抛诸脑后。于是，&ldquo;开源&rdquo;一词很快就单纯地和各种实用主义的价值观联系起来。比如说怎么能创é€
 一个强大，稳定的软件。很多开源支持者
从一开始就把这些价值观推崇至极，也难怪局外人会有如此联系了。</p>
+<p>ä¸€äº›å¼€æºçš„æ”¯æŒè€…ä¼šè®¤ä¸ºï¼Œæ‰€è°“å¼€æºï¼Œæ— 
非是用来&ldquo;为自由软件做市场营销&rdquo;的。å…
·ä½“说来，就是向那些商界人士展现自由软件的实际
å¥½å¤„ã€‚åŒæ—¶é¿å…è°ˆåŠä»€ä¹ˆå¯¹é”™æ­£è¯¯ï¼Œå› 
为商业大佬们普遍不太喜欢这调调。还有一些开源的支持者
å¹²è„†å°±æŠ›å¼ƒè‡ªç”±è½¯ä»¶é“ä¹‰ä¸Šçš„ä»·å€¼è§‚ã€‚æ— 
论他们持哪种观点，一旦他们开始为开源营销的时候，自由软件运动所珍视的那些价值观就被抛诸脑后。于是，&ldquo;开源&rdquo;一词很快就单纯地和各种实用主义的价值观联系起来。比如说怎么能创é€
 一个强大、稳定的软件。很多开源支持者
从一开始就把这些价值观推崇至极，也难怪局外人会有如此联系了。</p>
 
 
<p>开源软件和自由软件这两个词在很大程度上描述的是同一类软件，但是它们所基于的价值观却有着本质上的区别。开源是指一套开发方法；而自由软件则是一场社会运动。对于自由软件运动而言，自由软件是一个道德底线，是对用户自由的基本尊重。开源软件则与此不同，开源哲学考虑的是怎么做把软件做得&ldquo;更好&rdquo;&mdash;ä»
…ä»…
从实用的角度。开源的哲学里，非自由软件之所以不好，是å›
 为他们采用了一种劣等的开发方式。开源的大多数讨论å…
³æ³¨çš„不是是非，而仅仅是是否流行和是否成功；<a
 
href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>就是一个å
…¸åž‹çš„例子</a>。</p>
@@ -82,7 +88,7 @@
 
<p>&ldquo;开源&rdquo;一词又一再地被引申到了各个领域，比如政府部门，教育，科学还有å
…¶ä»–åŽ‹æ ¹æ²¡æœ‰æºä»£ç çš„åœ°æ–¹ï¼Œä»¥åŠå’Œè½¯ä»¶è®¸å¯è¯æ ¹æœ¬æ‰¯ä¸ä¸Šå…
³ç³»çš„领域。它们唯一的å…
±åŒç‚¹æ˜¯ï¼šå¤šå¤šå°‘少都是鼓励人们参与到某个活动中来。到头来，开源这词就被引申成了&ldquo;参与性&rdquo;，或è€
…是&ldquo;透明性&rdquo;，或者还不如这些。最可悲的解释，则<a
 
href="http://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>完å
…¨æˆäº†ä¸€ä¸ªè™šå¹»çš„商业流行词</a>。</p>
 
-<h3>不同的价值观可以得到类似的结论&hellip;可惜总有例外</h3>
+<h3>不同的价值观可以得到类似的结论&mdash;&mdash;可惜总有例外</h3>
 
 <p>二十世纪å…
­åå¹´ä»£ï¼Œç¾Žå›½çš„极左派阵营曾由于意见分歧而å…
šç¾½æž—立。尽管他们实际
上有着相同的目的和价值观，但各个派别之间依旧水火不容，å
…³ç³»ç´§å¼ 
。这使得右翼势力得以借力打力，进而攻击整个左派阵营。</p>
 
@@ -123,7 +129,7 @@
 
 
<p>这些没能理解自由软件含义的用户，早晚会出于某些实用角度的考虑，再转投专有软件。æ—
 数的软件公司已经开始做出这æ 
·çš„尝试吸引用户使用专有软件，哪怕是发行å…
è´¹çš„专有软件。用户只有在懂得珍视自由软件赋予他们的自由之后，才会拒绝如此诱惑。所以，我们å¿
…
须反复强调自由，才能渐渐扩散自由的理念。&ldquo;保持沉默&rdquo;的信条在商业化的过程中可能会有用，但过分强调它，让热爱自由被视为自私，则会害了整个社区。</p>
 
-<p>如此的危机恰恰是我们当前面临的。众多参与自由软件社区的人们，尤å
…
¶æ˜¯è‡ªç”±è½¯ä»¶çš„发行商们，对于自由总是闭口不谈&mdash;往往是å›
 为他们想要&ldquo;在商业上被认可&rdquo;ã€‚å‡ 
乎所有GNU/Linux的发行版都会在其基础版中搀å…
¥ä¸“æœ‰è½¯ä»¶ã€‚å®ƒä»¬ç”šè‡³å°†æ­¤å®£ä¼ 有一种优势，而非缺陷。</p>
+<p>如此的危机恰恰是我们当前面临的。众多参与自由软件社区的人们，尤å
…
¶æ˜¯è‡ªç”±è½¯ä»¶çš„发行商们，对于自由总是闭口不谈&mdash;往往是å›
 为他们想要&ldquo;在商业上被认可&rdquo;ã€‚å‡ 
乎所有GNU/Linux的发行版都会在其基础版中搀å…
¥ä¸“æœ‰è½¯ä»¶ã€‚å®ƒä»¬ç”šè‡³å°†æ­¤å®£ä¼ 为一种优势，而非缺陷。</p>
 
 
<p>带有专有插件的软件，和含有专有软件的GNU/Linux发行版之所以有生存和发展的空间，就是å›
 
为我们社区中大多数人并没有坚守自己的自由。这并非巧合。大多数GNU/Linux用户是被&ldquo;开源&rdquo;一词吸引而来，而开源则没有把维护用户自由作为å
…¶ç›®æ ‡ã€‚æ— è§†è‡ªç”±çš„è¨€è®ºå£å£ç›¸ä¼ ï¼Œæ¼ 
视自由的态度比比皆是。人人如此，互相影响。要扭转这æ 
·çš„局势，我们唯一能做的，就是更多地谈论自由，而非把它搁置一边。</p>
 
@@ -142,7 +148,9 @@
 
 <p>开源的支持者们把一个个用户拉å…
¥ä»–们的阵营，而提醒用户维护自由的任务，则落到了我们自由软件支持è€
…
们的肩膀上。我们要敢于用比以往更大的声音说&ldquo;这是自由软件，它才是真正尊重ä½
 的自由的软件！&rdquo;&mdash;æ¯å½“ä½ 
把&ldquo;开源软件&rdquo;一词替换成&ldquo;自由软件&rdquo;的时候，ä½
 就是在支持我们的理念。</p>
 
-<h4>脚注</h4>
+</div>
+
+<h4>注</h4>
 
 <!-- The article is incomplete (#793776) as of 21st January 2013.
 <p>
@@ -190,7 +198,7 @@
 若您想翻译本文，请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
 </div>
 
-<p>Copyright &copy; 2007, 2010, 2012, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2007, 2010, 2012, 2015, 2016, 2019 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -203,12 +211,12 @@
 <b>翻译</b>: é‚“æ¥ ï¼ˆNan Deng）<br></br>
 <b>å®¡æ ¡</b>: 李凡希<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017，2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017-2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/01/31 13:02:00 $
+$Date: 2019/02/23 10:31:34 $
 
 <!-- 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/surveillance-vs-democracy.zh-cn.html     23 Feb 2019 08:29:34 
-0000      1.15
+++ philosophy/surveillance-vs-democracy.zh-cn.html     23 Feb 2019 10:31:34 
-0000      1.16
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/surveillance-vs-democracy.zh-cn.po">
- https://www.gnu.org/philosophy/po/surveillance-vs-democracy.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" 
value="/philosophy/surveillance-vs-democracy.html"
- --><!--#set var="DIFF_FILE" 
value="/philosophy/po/surveillance-vs-democracy.zh-cn-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2018-11-19" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/surveillance-vs-democracy.en.html" -->
+<!--#set var="ENGLISH_PAGE" 
value="/philosophy/surveillance-vs-democracy.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -24,7 +19,6 @@
 <!-- GNUN: localize URL /graphics/dog.small.jpg -->
 <!--#include virtual="/philosophy/po/surveillance-vs-democracy.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
 <h2 class="center">民主能够承受多少监控？</h2>
 
 <p class="byline center"><a href="http://www.stallman.org/";>Richard 
Stallman</a> 著</p>
@@ -46,7 +40,7 @@
 </div>
 
 <p>感谢Edward
-Snowden的揭露，我们知道了目前社会的常规监控已经违背了人权。在美国和世界各地不断重复发生的对持不同政见è€
…、消息来源以及新闻工作者
的骚扰和迫害也印证了这个事实。我们需要降低常规监控的水平，但是降低到什么水平呢？哪个水平正好是<em>最大可容忍的监控</em>，是我们要确保不能è¶
…越的水平呢？这个水平是一旦被超
越，监控就开始干扰正常的民主制度，表现为报警者
（象Snowden）可能会被捕。</p>
+Snowden的揭露，我们知道了目前社会的常规监控已经违背了人权。在美国和世界各地不断重复发生的对持不同政见è€
…、消息来源以及新闻工作者
的骚扰和迫害也印证了这个事实。我们需要降低常规监控的水平，但是降低到什么水平呢？哪个水平正好是<em>最大可容忍的监控</em>，是我们要确保不能è¶
…越的水平呢？这个水平就是一旦被超
越，监控就开始干扰正常的民主制度，表现为报警者
（象Snowden）可能会被捕。</p>
 </div>
 <div class="columns" style="clear:both">
 <p>面对政府秘密，我们普通民众有赖报警者来<a
@@ -164,10 +158,10 @@
 
href="#privatespace">*</a>）。它的记录都保存在本地，最多保留数周。å›
 
为获取这些记录并不方便，所以从来没有大规模地收集此类数据；只有有人报告犯罪活动时，数据才被从本地调取。每天收集上百万的磁带并查看或复制实é™
…上是不可能完成的任务。</p>
 
 <p>今天，安å…
¨æ‘„像头变成了监控摄像头：他们连接到互联网，所以记录能够由数据中心收集并永ä¹
…保存。在底特律，警察向企业施压，要企业给他们<a
-href="https://www.detroitnews.com/story/news/local/detroit-city/2018/01/23/detroit-green-light/109524794/";>æ—
 限制的监控摄像头访问权限</a>，这æ 
·è­¦å¯Ÿå°±å¯ä»¥éšæ—¶æŸ¥çœ‹ã€‚这本身已经很危险，但情
况正变得更糟。人脸识别技术的进展有一天会å…
¨ç¨‹è¿½è¸ªè¢«æ€€ç–‘的记者，从而查看他们在和谁说话。</p>
+href="https://eu.detroitnews.com/story/news/local/detroit-city/2018/01/23/detroit-green-light/109524794/";>æ—
 限制的监控摄像头访问权限</a>，这æ 
·è­¦å¯Ÿå°±å¯ä»¥éšæ—¶æŸ¥çœ‹ã€‚这本身已经很危险，但情
况正变得更糟。人脸识别技术的进展有一天会å…
¨ç¨‹è¿½è¸ªè¢«æ€€ç–‘的记者，从而查看他们在和谁说话。</p>
 
 <p>网络摄像头本身的数字安全性通常很差劲，<a
-href="https://www.networkworld.com/community/blog/cia-wants-spy-you-through-your-appliances";>任何人都可以查看这些摄像头在观察什么</a>。这使网络摄像头成为安å
…¨å’Œéšç§çš„主要威胁。为了保护隐私，我们应该禁止针对å…
¬ä¼—行踪的网络摄像头，除了那些人们随身携带的摄像设备。人们å¿
…须有自由间或发布一些ç…
§ç‰‡å’Œè§†é¢‘，但是在网络上系统收集此类数据的行为必
须受到限制。</p>
+href="https://www.csoonline.com/article/2221934/microsoft-subnet/cia-wants-to-spy-on-you-through-your-appliances.html";>任何人都可以查看这些摄像头在观察什么</a>。这使网络摄像头成为安å
…¨å’Œéšç§çš„主要威胁。为了保护隐私，我们应该禁止针对å…
¬ä¼—行踪的网络摄像头，除了那些人们随身携带的摄像设备。人们å¿
…须有自由间或发布一些ç…
§ç‰‡å’Œè§†é¢‘，但是在网络上系统收集此类数据的行为必
须受到限制。</p>
 
 <p><a
 name="privatespace"><b>*</b></a>此处，我假设安å…
¨æ‘„像头指向商店内部或者
指向街道。指向他人私有空间的摄像头侵犯了隐私权，但那是另一个问题。</p>
@@ -202,7 +196,8 @@
 <h3 class="subheader">针对旅行监控的解药</h3>
 
 <div class="columns">
-<p>æˆ‘ä»¬å¿…é¡»å°†ç”µå­è¿‡è·¯è´¹æ”¶å–ç³»ç»Ÿæ”¹é€ 
为匿名付费系统（比如，使用数字现金）。车牌识别系统会识别所有的牌ç
…§ï¼Œè€Œä¸”<a
+<p>æˆ‘ä»¬å¿…é¡»å°†ç”µå­è¿‡è·¯è´¹æ”¶å–ç³»ç»Ÿæ”¹é€ 
为匿名付费系统（比如，使用数字现金）。车牌识别系统<a
+href="https://www.eff.org/deeplinks/2018/11/eff-and-muckrock-release-records-and-data-200-law-enforcement-agencies-automated";>会识别所有的牌ç
…§</a>，而且<a
 href="http://news.bbc.co.uk/2/hi/programmes/whos_watching_you/8064333.stm";>å…
¶æ•°æ®æ— 
限期保留</a>；法律应该要求这些系统注意并只记录已经有法庭命令需要追踪的车牌号ç
 ã€‚另一个不太安å…
¨çš„æ›¿ä»£æ–¹æ¡ˆæ˜¯å°†æ‰€æœ‰è½¦ç‰Œè®°å½•ï¼Œä½†åªåœ¨æœ¬åœ°ä¿å­˜å‡ 
天，并且不把全部数据通过网络存取；只å…
è®¸æœç´¢é‚£äº›å·²ç»æœ‰æ³•åº­å‘½ä»¤éœ€è¦è¿½è¸ªçš„è½¦ç‰Œå·ç ã€‚</p>
 
 <p>美国的&ldquo;禁止飞行&rdquo;åå•åº”è¯¥å–æ¶ˆï¼Œå› ä¸ºå®ƒæ˜¯<a
@@ -242,7 +237,7 @@
 
 <p>å…
·æœ‰æ”¿åºœç‰¹æƒçš„个人，比如警察，将失去隐私权并被监控。（事实上，警察自己就有å
…³äºŽåšä¼ªè¯çš„专用术语&ldquo;<a
 
href="https://en.wikipedia.org/w/index.php?title=Police_perjury&amp;oldid=552608302";>警察伪证罪（testilying）</a>&rdquo;，å›
 为这事儿经常发生，特别是有关抗议者和<a
-href="https://photographyisnotacrime.com/";>摄影者</a>æ—¶ã€‚ï¼‰åŠ 
州的一个城市要求警察全程穿戴录像机，结果是<a
+href="https://www.themaven.net/pinacnews/";>摄影者</a>æ—¶ã€‚ï¼‰åŠ 
州的一个城市要求警察全程穿戴录像机，结果是<a
 
href="http://www.motherjones.com/kevin-drum/2013/08/ubiquitous-surveillance-police-edition";>警察使用武力的现象减少60%</a>。ACLU（美国å
…¬æ°‘自由联盟）很支持这个做法。</p>
 
 <p><a
@@ -331,7 +326,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015, 2016, 2017, 2018 Richard Stallman</p>
+<p>Copyright &copy; 2015, 2016, 2017, 2018, 2019 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -342,12 +337,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>，2017，2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017-2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/02/23 08:29:34 $
+$Date: 2019/02/23 10:31:34 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/categories.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/categories.zh-cn-en.html      16 Feb 2019 13:30:48 -0000      
1.1
+++ philosophy/po/categories.zh-cn-en.html      23 Feb 2019 10:31:34 -0000      
1.2
@@ -90,8 +90,10 @@
        accept some licenses that we consider too restrictive, and
        there are free software licenses they have not
        accepted. However, the differences in extension of the
-       category are small: nearly all free software is open source,
-       and nearly all open source software is free.</p>
+       category are small: we know of only a few cases of source code that
+       is open source but not free.  In principle it could happen
+       that some free programs are rejected as open source, but
+       we don't know if that has ever happened.</p>
        <p>We prefer the term &ldquo;<a
         href="/philosophy/open-source-misses-the-point.html">free
        software</a>&rdquo; because it refers to
@@ -436,7 +438,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 
2015, 2016, 2017, 2018 Free
+<p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 
2015, 2016, 2017, 2018, 2019 Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -447,7 +449,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/02/16 13:30:48 $
+$Date: 2019/02/23 10:31:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/categories.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/categories.zh-cn.po   23 Feb 2019 10:20:45 -0000      1.6
+++ philosophy/po/categories.zh-cn.po   23 Feb 2019 10:31:34 -0000      1.7
@@ -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: 2019-02-21 01:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: philosophy/po/javascript-trap.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.zh-cn-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/javascript-trap.zh-cn-en.html 15 Dec 2018 14:46:39 -0000      
1.8
+++ philosophy/po/javascript-trap.zh-cn-en.html 23 Feb 2019 10:31:34 -0000      
1.9
@@ -136,23 +136,38 @@
 degree, so this is a matter of designing a simple criterion that gives
 good results, rather than finding the one correct answer.</p>
 <p>
-Our tentative policy is to consider a JavaScript program nontrivial if:</p>
+Our current criterion is to consider a JavaScript program nontrivial
+if any of these conditions is met:</p>
 
 <ul>
-  <li>it makes an AJAX request or is loaded along with scripts that make
-    an AJAX request,</li>
+  <li>it is referred to as an external script (from another page).</li>
 
-  <li>it loads external scripts dynamically or is loaded along with
-    scripts that do,</li>
+  <li>it declares an array more than 50 elements long.</li>
 
-  <li>it defines functions or methods and either loads an external script
-    (from html) or is loaded as one,</li>
+  <li>it defines a named entity (function or method) that calls anything other
+      than a primitive.</li>
+
+  <li>it defines a named entity with more than three conditional
+      constructs and loop construction.</li>
+
+  <li>code outside of named definitions calls anything but primitives and
+      functions defined further up in the page.</li>
+
+  <li>code outside of named definitions contains more than three
+      conditional constructs and loop construction, total.</li>
+
+  <li>it calls <b>eval</b>.</li>
+
+  <li>it does Ajax calls.</li>
+
+  <li>it does <b>[&hellip;]</b> calls.</li>
+
+  <li>it alters the DOM.</li>
   
   <li>it uses dynamic JavaScript constructs that are difficult to analyze
     without interpreting the program, or is loaded along with scripts
     that use such constructs.  These constructs are:
     <ul>
-      <li>using the eval function,</li>
       <li>calling methods with the square bracket notation,</li>
       <li>using any other construct than a string literal with
        certain methods (Obj.write, Obj.createElement, ...).</li>
@@ -259,7 +274,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2009-2013, 2016, 2017, 2018 Richard Stallman</p>
+<p>Copyright &copy; 2009-2013, 2016, 2017, 2018, 2019 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -269,7 +284,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:39 $
+$Date: 2019/02/23 10:31:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/javascript-trap.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.zh-cn.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/javascript-trap.zh-cn.po      23 Feb 2019 10:07:42 -0000      
1.20
+++ philosophy/po/javascript-trap.zh-cn.po      23 Feb 2019 10:31:34 -0000      
1.21
@@ -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: 2019-02-21 01:56+0000\n"
 
 #. type: Content of: <h2>
 msgid "The JavaScript Trap"

Index: philosophy/po/open-source-misses-the-point.zh-cn-en.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/open-source-misses-the-point.zh-cn-en.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/open-source-misses-the-point.zh-cn-en.html    31 Jul 2017 
13:59:12 -0000      1.14
+++ philosophy/po/open-source-misses-the-point.zh-cn-en.html    23 Feb 2019 
10:31:34 -0000      1.15
@@ -6,7 +6,20 @@
 <!--#include virtual="/server/banner.html" -->
 <h2>Why Open Source misses the point of Free Software</h2>
 
-<p>by <strong>Richard Stallman</strong></p>
+<p class="byline">by Richard Stallman</p>
+
+<div class="article">
+
+<blockquote class="comment"><p>
+The terms &ldquo;free software&rdquo; and &ldquo;open
+source&rdquo; stand for almost the same range of programs.  However,
+they say deeply different things about those programs, based on
+different values.  The free software movement campaigns for freedom
+for the users of computing; it is a movement for freedom and justice.
+By contrast, the open source idea values mainly practical advantage
+and does not campaign for principles.  This is why we do not agree
+with open source, and do not use that term.
+</p></blockquote>
 
 <p>When we call software &ldquo;free,&rdquo; we mean that it respects
 the <a href="/philosophy/free-sw.html">users' essential freedoms</a>:
@@ -215,7 +228,7 @@
 has <a 
href="http://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
 become a vacuous buzzword</a>.</p>
 
-<h3>Different Values Can Lead to Similar Conclusions&hellip;but Not Always</h3>
+<h3>Different Values Can Lead to Similar Conclusions&mdash;but Not Always</h3>
 
 <p>Radical groups in the 1960s had a reputation for factionalism: some
 organizations split because of disagreements on details of strategy,
@@ -399,7 +412,9 @@
 than ever.  Every time you say &ldquo;free software&rdquo; rather than
 &ldquo;open source,&rdquo; you help our cause.</p>
 
-<h4>Notes</h4>
+</div>
+
+<h4>Note</h4>
 
 <!-- The article is incomplete (#793776) as of 21st January 2013.
 <p>
@@ -449,7 +464,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2007, 2010, 2012, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2007, 2010, 2012, 2015, 2016, 2019 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -459,7 +474,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/07/31 13:59:12 $
+$Date: 2019/02/23 10:31:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/open-source-misses-the-point.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.zh-cn.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- philosophy/po/open-source-misses-the-point.zh-cn.po 23 Feb 2019 10:07:01 
-0000      1.52
+++ philosophy/po/open-source-misses-the-point.zh-cn.po 23 Feb 2019 10:31:34 
-0000      1.53
@@ -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: 2019-02-20 10:28+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -306,11 +305,11 @@
 "some respects.  Nonetheless, their definition agrees with our definition in "
 "most cases."
 msgstr ""
-"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</"
-"a>（它是由开源促进会发布的，鉴于这个定义过长，就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥"
-"从我们对于自由软件的界定衍生而来。不过二者
也有不同，在某些方面，开源软件的定"
-"义比自由软件更宽松。不过总体而言，开源软件的定义和我们自由软件的定义在很多地"
-"方都是等价的。"
+"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</a>"
+"（它是由开源促进会发布的，鉴于这个定义过长，就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥ä»Ž"
+"我们对于自由软件的界定衍生而来。不过二者
也有不同，在某些方面，开源软件的定义"
+"比自由软件更宽松。不过总体而言，开源软件的定义和我们自由软件的定义在很多地方"
+"都是等价的。"
 
 #. type: Content of: <div><p>
 msgid ""

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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/surveillance-vs-democracy.zh-cn-en.html       15 Dec 2018 
14:46:43 -0000      1.14
+++ philosophy/po/surveillance-vs-democracy.zh-cn-en.html       23 Feb 2019 
10:31:34 -0000      1.15
@@ -394,7 +394,8 @@
 <div class="columns">
 <p>We must convert digital toll collection to anonymous payment (using
 digital cash, for instance).  License-plate recognition systems
-recognize all license plates, and
+<a 
href="https://www.eff.org/deeplinks/2018/11/eff-and-muckrock-release-records-and-data-200-law-enforcement-agencies-automated";>
+recognize all cars' license plates</a>, and
 the <a 
href="http://news.bbc.co.uk/2/hi/programmes/whos_watching_you/8064333.stm";>data
 can be kept indefinitely</a>; they should be required by law to notice
 and record only those license numbers that are on a list of cars
@@ -599,7 +600,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015, 2016, 2017, 2018 Richard Stallman</p>
+<p>Copyright &copy; 2015, 2016, 2017, 2018, 2019 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -609,7 +610,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:43 $
+$Date: 2019/02/23 10:31:34 $
 <!-- 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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- philosophy/po/surveillance-vs-democracy.zh-cn.po    23 Feb 2019 10:20:27 
-0000      1.37
+++ philosophy/po/surveillance-vs-democracy.zh-cn.po    23 Feb 2019 10:31:35 
-0000      1.38
@@ -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-11-19 22:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.1659
retrieving revision 1.1660
diff -u -b -r1.1659 -r1.1660
--- software/recent-releases-include.ru.html    23 Feb 2019 07:33:31 -0000      
1.1659
+++ software/recent-releases-include.ru.html    23 Feb 2019 10:31:35 -0000      
1.1660
@@ -1,9 +1,9 @@
 <ul>
-<li><strong>February 22, 2019</strong>
+<li><strong>22 февраля 2019</strong>
 <ul>
 <li><a
-href="http://lists.gnu.org/archive/html/info-gnu/2019-02/msg00007.html";>GCC
-8.3 Released</a>, <i>Jakub Jelinek</i>, <tt>16:16</tt></li>
+href="http://lists.gnu.org/archive/html/info-gnu/2019-02/msg00007.html";>Выпущен
+GCC 8.3</a>, <i>Якуб Елинек</i>, <tt>16:16</tt></li>
 </ul></li>
 <li><strong>20 февраля 2019</strong>
 <ul>

Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.2343
retrieving revision 1.2344
diff -u -b -r1.2343 -r1.2344
--- software/po/recent-releases-include.ru.po   23 Feb 2019 10:21:40 -0000      
1.2343
+++ software/po/recent-releases-include.ru.po   23 Feb 2019 10:31:35 -0000      
1.2344
@@ -14,24 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-02-23 07:30+0000\n"
 
 #. type: Content of: <ul><li>
-# | <strong>February 2[-0-]{+2+}, 2019</strong>
-#| msgid "<strong>February 20, 2019</strong>"
 msgid "<strong>February 22, 2019</strong>"
 msgstr "<strong>22 февраля 2019</strong>"
 
 #. type: Content of: <ul><li><ul><li>
-# | <a
-# | 
[-href=\"http://lists.gnu.org/archive/html/info-gnu/2018-10/msg00003.html\";>GCC
-# | 6.5-]
-# | 
{+href=\"http://lists.gnu.org/archive/html/info-gnu/2019-02/msg00007.html\";>GCC
-# | 8.3+} Released</a>, <i>Jakub Jelinek</i>, [-<tt>10:08</tt>-]
-# | {+<tt>16:16</tt>+}
-#| msgid ""
-#| "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2018-10/msg00003.html";
-#| "\">GCC 6.5 Released</a>, <i>Jakub Jelinek</i>, <tt>10:08</tt>"
 msgid ""
 "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2019-02/msg00007.html";
 "\">GCC 8.3 Released</a>, <i>Jakub Jelinek</i>, <tt>16:16</tt>"