www/philosophy philosophy.zh-cn.html po/philoso...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/08/23 09:58:51

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

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.zh-cn.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn.po?cvsroot=www&r1=1.36&r2=1.37

Patches:
Index: philosophy.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.zh-cn.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy.zh-cn.html       18 Nov 2016 07:32:47 -0000      1.23
+++ philosophy.zh-cn.html       23 Aug 2017 13:58:51 -0000      1.24
@@ -1,25 +1,11 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/philosophy.zh-cn.po">
- https://www.gnu.org/philosophy/po/philosophy.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/philosophy.html"
- --><!--#set var="DIFF_FILE" value="/philosophy/po/philosophy.zh-cn-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2012-02-26" -->
-
- 
+<!--#set var="ENGLISH_PAGE" value="/philosophy/philosophy.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-
-<!-- This file is automatically generated by GNUnited Nations! -->
+<!-- Parent-Version: 1.79 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
-<title>GNU 工程的哲学 - GNU 工程 - 自由软件基金会 (FSF)</title>
-
-<!-- Fixed by hand on Feb 14, 2014, to fit the new layout and the new
-     includes:
-     - disable top addendum,
-     - include the translist before banner to have the #translations
-       div on top instead of near the nav-bar,
-     - move outdated and <h2> after #education-content. -->
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>GNU 工程的哲学 - GNU 工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/philosophy.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
@@ -29,16 +15,28 @@
 </div> 
 
 <!-- id="education-content" -->
-
 <!--GNUN: OUT-OF-DATE NOTICE-->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
- 
+<!--#if expr="$OUTDATED_SINCE" -->
+<!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<!--#endif -->
+<!--#endif -->
 <h2>GNU 工程的哲学</h2>
 
-<p>自由软件运动的的哲学，激励着我们不断进行 GNU 
自由软件的开发。本页面介绍 GNU 的哲学。</p>
+<blockquote><p>
+请观赏 <a href="http://audio-video.gnu.org/";>audio-video.gnu.org</a> Richard
+Stallman 演讲的录音和视频。
+</p></blockquote>
+
+<p><em>自由软件</em>æ„å‘³ç€å…¶ç”¨æˆ·æ‹¥æœ‰è‡ªç”±ã€‚ï¼ˆè¿™æ— å…³ä»·æ 
¼ã€‚）我们开发了GNUç³»ç»Ÿï¼Œè¿™æ ·ç”¨æˆ·å°±æœ‰äº†è®¡ç®—çš„è‡ªç”±ã€‚</p>
 
-<p>自由软件å…
³ä¹Žç”¨æˆ·çš„自由：人们应当可以以任何有价值的方式自由地使用软件。软件不同于生活中的事物
 &mdash; 它不同于椅子、三明治或是汽油
-&mdash; 
软件可以更容易地被复制或修改。恰恰是这一特性，使得软件更为有用。我们由此坚信，软件的这一天然属性应该被用户利用。</p>
+<p>具体来说，自由软件的用户拥有<a
+href="/philosophy/free-sw.html">四项基本自由</a>：(0)自由运行软件、(1)自由学ä¹
 和修改软件源代ç 
ã€(2)自由再发布软件拷贝以及(3)自由发布修改后的软件版本。</p>
+
+<p>软件不同于生活中的事物 &mdash; 它不同于椅
子、三明治或是汽油 &mdash;
+软件可以更容易地被复制或修改。恰恰是这一特性，使得软件更为有用。我们由此坚信，软件的这一天然属性应该被用户利用。</p>
 
 <p>åœ¨ä¸Šé¢çš„èœå•ä¸­é€‰æ‹©ç›¸å…³çš„ç« èŠ‚äº†è§£è¿›ä¸€æ­¥çš„ä¿¡æ¯ã€‚</p>
 
@@ -46,23 +44,24 @@
 
 <h3 id="introduction">简介</h3>
 
-<!-- I don't think it's good idea to link specific translation -->
-<!-- (e.g. foo.fr.html) from here.  It would be better to link them -->
-<!-- from philosophy.fr.html and the original documents. -mhatta -->
 <ul>
-  <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
+  <li><a href="/philosophy/free-sw.html">什么是自由软件？</a></li>
+  <li><a
+href="/philosophy/free-software-even-more-important.html">为什么我们必
须坚持自由软件</a></li>
+  <li><a 
href="/philosophy/proprietary.html">专属软件常常是恶意软件</a></li>
   <li><a href="/gnu/gnu.html">GNU/Linux 的历史</a></li>
-  <li><a href="/philosophy/why-free.html">Why Software Should Not Have 
Owners</a></li>
-  <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic 
Idealism</a></li>
-  <li><a href="/philosophy/free-doc.html">Why Free Software Needs Free
-Documentation</a></li>
-  <li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
-  <li><a href="/philosophy/fs-motives.html">Motives For Writing Free 
Software</a></li>
-  <li><a href="/philosophy/right-to-read.html">The Right to Read: A Dystopian
-Short Story</a> by <a href="http://www.stallman.org/";> Richard 
Stallman</a></li>
-  <li><a 
href="/philosophy/open-source-misses-the-point.zh-cn.html">开源究竟差哪了</a></li>
-  <li><a href="/philosophy/government-free-software.html">Measures governments 
can
-use to promote free software</a></li>       
+  <li><a 
href="/philosophy/pragmatic.html">Copyleft：务实的理想主义</a></li>
+  <li><a 
href="/philosophy/free-doc.html">为什么自由软件需要自由文档</a></li>
+  <li><a 
href="/philosophy/selling.html">销售自由软件</a>没问题！</li>
+  <li><a 
href="/philosophy/fs-motives.html">编写自由软件的动机</a></li>
+  <li><a href="/philosophy/right-to-read.html">阅
读的权利：一个非乌托邦人的故事</a> <a
+href="http://www.stallman.org/";>Richard Stallman</a> 著</li>
+  <li><a
+href="/philosophy/open-source-misses-the-point.zh-cn.html">为什么开源误导了自由软件的重点</a></li>
+ <li><a
+href="/philosophy/when-free-software-isnt-practically-superior.html">当自由软件（使用起来）并不更好时</a></li>
+  <li><a 
href="/philosophy/government-free-software.html">政府就推动自由软件可以采取的措施</a></li>
       
+  <li><a href="/education/education.html">教育中的自由软件</a></li>
 </ul>
 
 <p>
@@ -75,13 +74,7 @@
 id="FreedomOrganizations">还</a>提供了一份<a
 
href="/links/links.html#FreedomOrganizations">开发自由计算机系统和电子通信系统的组织</a>名单。</p>
 
-<!-- If needed, change the copyright block at the bottom. In general,
-     pages on the GNU web server should be under CC BY-ND 3.0 US.
-     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
-     and that it is like this: "2001, 2002", not this: "2001-2002". -->
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
@@ -90,40 +83,67 @@
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
-<p>
-请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。您也可以通过 <a
-href="/contact/">其它方法</a> 联系自由软件基金会。
-<br />
-发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。
-</p>
+<div class="unprintable">
 
-<p>
-若您想翻译本文，请参看 <a 
href="/server/standards/README.translations.html">翻译手册</a>
-获取有关协调和提交翻译的相关事项。
-</p>
+<p>请将有关自由软件基金会(FSF) &amp; 
GNU的一般性问题发送到<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过 <a
+href="/contact/">其他联系方法</a> 
联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议，请发送邮件到<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
 
 <p>
-版板所有 &copy; 2011 自由软件基金会</p>
-<p>本页面采用 <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a> 许可证授权。
-</p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+若您想翻译本文，请参看 <a 
href="/server/standards/README.translations.html">翻译须知</a>
+获取有关协调和提交翻译的相关事项。</p>
+</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; 2013, 2015, 2016 Free Software Foundation, Inc.</p>
+
+<p>本页面使用<a rel="license"
+href="http://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" -->
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<b>翻译</b>: 李凡希 2010 <br></br>
-<b>å®¡æ ¡</b>: é‚“æ¥  2010</div>
-
+<b>翻译</b>：李凡希，2010。<br></br>
+<b>å®¡æ ¡</b>ï¼šé‚“æ¥ ï¼Œ2010。<br></br>
+<b>翻译团队</b>：<a rel="team"
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017。</div>
 
- <p>
-<!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2016/11/18 07:32:47 $
+$Date: 2017/08/23 13:58:51 $
 
 <!-- timestamp end -->
 </p>

Index: po/philosophy.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/philosophy.zh-cn-en.html 16 Feb 2012 17:33:52 -0000      1.1
+++ po/philosophy.zh-cn-en.html 23 Aug 2017 13:58:51 -0000      1.2
@@ -1,27 +1,48 @@
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.79 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
-<title>Philosophy of the GNU Project - GNU Project - Free Software Foundation 
(FSF)</title>
+<title>Philosophy of the GNU Project
+- GNU Project - Free Software Foundation</title>
 
-<!--#include virtual="/server/banner.html" -->
 <!--#include virtual="/philosophy/po/philosophy.translist" -->
+<!--#include virtual="/server/banner.html" -->
 
 <div id="education-content">
-<h2>Philosophy of the GNU Project</h2>
 
 <!--#include virtual="/philosophy/philosophy-menu.html" -->
 
 </div> <!-- id="education-content" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Philosophy of the GNU Project</h2>
 
-<p>Our development of the GNU free software operating system is motivated
-by the philosophy of the free software movement.  This page provides an
-introduction to that philosophy.</p>
-
-<p>Free software is a matter of freedom: people should be free to use
-software in all the ways that are socially useful.  Software differs
-from material objects&mdash;such as chairs, sandwiches, and
-gasoline&mdash;in that it can be copied and changed much more easily.
-These possibilities make software as useful as it is; we believe
-software users should be able to make use of them.</p>
+<blockquote><p>
+See <a href="http://audio-video.gnu.org/";>audio-video.gnu.org</a>
+for recordings of Richard Stallman's speeches.
+</p></blockquote>
+
+<p><em>Free software</em> means that the software's users have
+freedom.  (The issue is not about price.)  We developed the GNU
+operating system so that users can have freedom in their
+computing.</p>
+
+<p>Specifically, free software means users have
+the <a href="/philosophy/free-sw.html">four essential freedoms</a>:
+(0) to run the program, (1) to study and change the program in source
+code form, (2) to redistribute exact copies, and (3) to distribute
+modified versions.</p>
+
+<p>Software differs from material objects&mdash;such as chairs,
+sandwiches, and gasoline&mdash;in that it can be copied and changed
+much more easily.  These facilities are why software is useful; we
+believe a program's users should be free to take advantage of them,
+not solely its developer.</p>
 
 <p>For further reading, please select a section
 from the menu above.</p>
@@ -30,15 +51,13 @@
 
 <h3 id="introduction">Introduction</h3>
 
-<!-- I don't think it's good idea to link specific translation -->
-<!-- (e.g. foo.fr.html) from here.  It would be better to link them -->
-<!-- from philosophy.fr.html and the original documents. -mhatta -->
-
 <ul>
   <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
+  <li><a href="/philosophy/free-software-even-more-important.html">
+      Why we must insist on free software</a></li>
+  <li><a href="/philosophy/proprietary.html">
+      Proprietary software is often malware</a></li>
   <li><a href="/gnu/gnu.html">History of GNU/Linux</a></li>
-  <li><a href="/philosophy/why-free.html">Why
-       Software Should Not Have Owners</a></li>
   <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic 
Idealism</a></li>
   <li><a href="/philosophy/free-doc.html">Why Free Software Needs
       Free Documentation</a></li>
@@ -49,7 +68,9 @@
   Richard Stallman</a></li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
        "Open Source" misses the point of Free Software</a></li>
+ <li><a 
href="/philosophy/when-free-software-isnt-practically-superior.html">When Free 
Software Isn't (Practically) Superior</a></li>
   <li><a href="/philosophy/government-free-software.html">Measures governments 
can use to promote free software</a></li>       
+  <li><a href="/education/education.html">Free software in education</a></li>
 </ul>
 
 <p>
@@ -64,43 +85,64 @@
 that Work for Freedom in
 Computer Development and Electronic Communications</a>.</p>
 
-<!-- If needed, change the copyright block at the bottom. In general,
-     pages on the GNU web server should be under CC BY-ND 3.0 US.
-     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
-     and that it is like this: "2001, 2002", not this: "2001-2002". -->
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting 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>
+</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; 2013, 2015, 2016 Free Software Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
-<p>
-Updated:
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2012/02/16 17:33:52 $
+$Date: 2017/08/23 13:58:51 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/philosophy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-cn.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- po/philosophy.zh-cn.po      23 Aug 2017 13:52:29 -0000      1.36
+++ po/philosophy.zh-cn.po      23 Aug 2017 13:58:51 -0000      1.37
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-02-26 12:25-0500\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>