www/philosophy free-sw.zh-cn.html po/free-sw.zh...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/04/03 07:59:03

Modified files:
        philosophy     : free-sw.zh-cn.html 
        philosophy/po  : free-sw.zh-cn-en.html free-sw.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.27&r2=1.28

Patches:
Index: free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- free-sw.zh-cn.html  2 Jan 2018 13:31:27 -0000       1.11
+++ free-sw.zh-cn.html  3 Apr 2018 11:59:03 -0000       1.12
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>什么是自由软件？ - GNU工程 - 自由软件基金会</title>
@@ -27,6 +27,11 @@
 
此处给出自由软件的定义，用以衡量一款软件是否为自由软件。一直以来，我们不断改进这个定义，以此澄æ¸
…并解决我们遇到的各种问题。参考下方的<a
 href="#History">修改历史</a>，我们详细列出了å…
¨éƒ¨çš„影响自由软件定义的修改记录。
 </p>
+
+<p>
+&ldquo;开源&rdquo;是另外一回事：它有基于不同价值观的非常不同的哲学。å
…¶å®žé™…å®šä¹‰ä¹Ÿä¸åŒï¼Œä½†æ˜¯å‡ 
乎所有的开源程序事实上都是自由软件。我们在<a
+href="/philosophy/open-source-misses-the-point.html">为什么&ldquo;开源&rdquo;错失了自由软件的重点</a>一文中阐述了这些不同。
+</p>
 </blockquote>
 
 <p>
@@ -51,7 +56,7 @@
   <li>自由度0ï¼šæ— è®ºç”¨æˆ·å‡ºäºŽä½•ç§ç›®çš„ï¼Œå¿…é¡»å¯ä»¥æŒ‰ç…
§ç”¨æˆ·æ„æ„¿ï¼Œè‡ªç”±åœ°è¿è¡Œè¯¥è½¯ä»¶ã€‚</li>
   <li>自由度1ï¼šç”¨æˆ·å¯ä»¥è‡ªç”±åœ°å­¦ä¹ 
并修改该软件，以此来帮助用户完成用户自己的计算。作为前提，用户å¿
…é¡»å¯ä»¥è®¿é—®åˆ°è¯¥è½¯ä»¶çš„æºä»£ç ã€‚
   </li>
-  <li>自由度2：用户可以自由地分发该软件的拷贝。
+  <li>自由度2：用户可以自由地分发该软件的拷贝，这æ 
·å°±å¯ä»¥åŠ©äººã€‚
   </li>
   
<li>自由度3：用户可以自由地分发该软件修改后的拷贝。借此，用户可以把改进后的软件分享给整个社区令他人也从中受益。作为前提，用户å¿
…é¡»å¯ä»¥è®¿é—®åˆ°è¯¥è½¯ä»¶çš„æºä»£ç ã€‚
   </li>
@@ -420,7 +425,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/01/02 13:31:27 $
+$Date: 2018/04/03 11:59:03 $
 
 <!-- timestamp end -->
 </p>

Index: po/free-sw.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/free-sw.zh-cn-en.html    2 Jan 2018 13:31:27 -0000       1.4
+++ po/free-sw.zh-cn-en.html    3 Apr 2018 11:59:03 -0000       1.5
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 <title>What is free software?
 - GNU Project - Free Software Foundation</title>
 
@@ -29,6 +29,15 @@
 below for a list of changes that affect the definition of free
 software.
 </p>
+
+<p>
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in <a href="/philosophy/open-source-misses-the-point.html">
+Why &ldquo;Open Source&rdquo; misses the point of Free Software</a>.
+</p>
 </blockquote>
 
 <p>
@@ -69,7 +78,7 @@
       does your computing as you wish (freedom 1). Access to the source
       code is a precondition for this.
   </li>
-  <li>The freedom to redistribute copies so you can help your neighbor
+  <li>The freedom to redistribute copies so you can help others
       (freedom 2).
   </li>
   <li>The freedom to distribute copies of your modified versions
@@ -604,7 +613,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/01/02 13:31:27 $
+$Date: 2018/04/03 11:59:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/free-sw.zh-cn.po 3 Apr 2018 11:45:09 -0000       1.27
+++ po/free-sw.zh-cn.po 3 Apr 2018 11:59:03 -0000       1.28
@@ -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"
 "X-Generator: Poedit 1.7.5\n"
 
 #. type: Content of: <title>