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

[GNUN]

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

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.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn.po?cvsroot=www&r1=1.43&r2=1.44

Patches:
Index: philosophy.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.zh-cn.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- philosophy.zh-cn.html       2 Oct 2017 01:28:36 -0000       1.26
+++ philosophy.zh-cn.html       3 Apr 2018 13:28:58 -0000       1.27
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/philosophy.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
@@ -56,22 +56,22 @@
   <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.html">为什么开源误导了自由软件的重点</a></li>
+  <li><a
+href="/philosophy/open-source-misses-the-point.html">为什么&ldquo;开源&rdquo;错失了自由软件的重点</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>
-
 <!-- please leave both these ID attributes here. ... -->
 <!-- ... we removed this as an H$ section as it was duplicating the  -->
 <!-- same information on links.html, but it's possible that some users -->
 <!-- have the URLs bookmarked or on their pages. -len -->
-<a id="TOCFreedomOrganizations">我们</a><a
-id="FreedomOrganizations">还</a>提供了一份<a
+<div id="TOCFreedomOrganizations">
+<p id="FreedomOrganizations">我们还提供了一份<a
 
href="/links/links.html#FreedomOrganizations">开发自由计算机系统和电子通信系统的组织</a>名单。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -124,7 +124,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -137,12 +137,12 @@
 <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>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017，2018。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2017/10/02 01:28:36 $
+$Date: 2018/04/03 13:28:58 $
 
 <!-- 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/philosophy.zh-cn-en.html 26 Sep 2017 11:59:42 -0000      1.3
+++ po/philosophy.zh-cn-en.html 3 Apr 2018 13:28:58 -0000       1.4
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <title>Philosophy of the GNU Project
@@ -47,7 +47,8 @@
 <p>For further reading, please select a section
 from the menu above.</p>
 
-<p>We also maintain a list of <a href="/philosophy/latest-articles.html">most 
recently added articles</a>.</p>
+<p>We also maintain a list of <a
+href="/philosophy/latest-articles.html">most recently added articles</a>.</p>
 
 <h3 id="introduction">Introduction</h3>
 
@@ -67,23 +68,24 @@
   Dystopian Short Story</a> by <a href="http://www.stallman.org/";>
   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>       
+       &ldquo;Open Source&rdquo; 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>
 <!-- please leave both these ID attributes here. ... -->
-<a id="TOCFreedomOrganizations">We</a>
-<a id="FreedomOrganizations">also</a>
 <!-- ... we removed this as an H$ section as it was duplicating the  -->
 <!-- same information on links.html, but it's possible that some users -->
 <!-- have the URLs bookmarked or on their pages. -len -->
-keep a list of
+<div id="TOCFreedomOrganizations">
+<p id="FreedomOrganizations">We also keep a list of
 <a href="/links/links.html#FreedomOrganizations">Organizations
 that Work for Freedom in
 Computer Development and Electronic Communications</a>.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -132,7 +134,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2015, 2016, 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
@@ -142,7 +144,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/09/26 11:59:42 $
+$Date: 2018/04/03 13:28:58 $
 <!-- 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.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- po/philosophy.zh-cn.po      3 Apr 2018 13:00:47 -0000       1.43
+++ po/philosophy.zh-cn.po      3 Apr 2018 13:28:58 -0000       1.44
@@ -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-04-01 08:56+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>