www/philosophy compromise.zh-cn.html po/comprom...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/08/28 10:29:28

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

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.zh-cn.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn-en.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.24&r2=1.25

Patches:
Index: compromise.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.zh-cn.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- compromise.zh-cn.html       7 Aug 2017 15:29:49 -0000       1.24
+++ compromise.zh-cn.html       28 Aug 2017 14:29:27 -0000      1.25
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/compromise.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.84 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>避免毁灭性的妥协 - GNU 工程 - 自由软件基金会</title>
@@ -54,7 +54,7 @@
 宽通用公å…
±è®¸å¯è¯</a>（简称LGPL）也是一项妥协：我们选定一些自由的库，并å
…è®¸æŠŠå®ƒä»¬ç”¨äºŽç§æœ‰è½¯ä»¶å½“ä¸­ã€‚å› 
为我们认为要是从法律上禁止这æ 
·çš„使用的话，只会使得开发者使用私有的库。我们å…
è®¸å¼€å‘者
在私有软件里面使用GNU的程序，并通过文档进行说明，表明我们鼓励使用自由软件的立场。我们会对某些我们认同的活动进行支持，尽管我们并不完å
…¨è®¤åŒä»–们所属的团体。</p>
 
 
<p>但是，我们也会反对某些妥协行为，尽管我们的社区里头很多人想要这æ
 ·çš„妥协。比如，我们仅仅
认同那些不含任何私有软件成分、或不会引导用户去安装
私有软件的<a
-href="/philosophy/free-system-distribution-guidelines.html">GNU/Linux发行版</a>。我们认为，认同åŒ
…含私有软件成分的发行版是一种<acronym
+href="/distros/free-system-distribution-guidelines.html">GNU/Linux发行版</a>。我们认为，认同åŒ
…含私有软件成分的发行版是一种<acronym
 title="ruinous (r&#363;'&#601;-n&#601;s) adj. 1. Causing or apt to cause
 ruin; destructive.  2. Falling to ruin; dilapidated or
 decayed.">毁灭性的</acronym>妥协。</p>
@@ -99,7 +99,7 @@
 
 <p>å‡å¦‚ä½ 
想使用自由软件，同时也要追求自由的话，请浏览<a
 
href="http://www.fsf.org/resources";>自由软件基金会网站的资源页面</a>。那里列出了各种与自由软件相å
…¼å®¹çš„硬件配置，各种<a
-href="/distros">只含自由软件的GNU/Linux发行版</a>，以及运行于100%自由软件环境下的<a
+href="/distros/distros.html\">只含自由软件的GNU/Linux发行版</a>，以及运行于100%自由软件环境下的<a
 href="http://directory.fsf.org/";>数以千计的自由软件套装
</a>ã€‚å‡å¦‚ä½ 
希望帮助我们的社区走向自由，最重要的是弘扬“å…
¬æ°‘价值”。当人们在讨论何为善与恶，以及该做些什么时，请ä½
 向人们阐发自由与社区的理念，并由此展开深入的讨论。</p>
 
 <p>è¦æ˜¯æˆ‘ä»¬å—è¾•åŒ—è¾™ï¼Œèµ°å¾—å†å¿«ä¹Ÿæ¯«æ— 
意义。要实现一个伟大的目æ 
‡ï¼Œæˆ‘们需要作出妥协，但切记万不可作出偏离目æ 
‡çš„妥协。</p>
@@ -146,25 +146,25 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2008, 2009, 2014, 2015 <a
+<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017 <a
 href="http://www.stallman.org/";>Richard Stallman</a>。</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>
+<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>: Tony Yet，2010。
+<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>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2017/08/07 15:29:49 $
+$Date: 2017/08/28 14:29:27 $
 
 <!-- timestamp end -->
 </p>

Index: po/compromise.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn-en.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/compromise.zh-cn-en.html 7 Aug 2017 15:29:50 -0000       1.14
+++ po/compromise.zh-cn-en.html 28 Aug 2017 14:29:28 -0000      1.15
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.84 -->
 <title>Avoiding Ruinous Compromises
 - GNU Project - Free Software Foundation</title>
 <style type="text/css" media="print,screen">
@@ -73,7 +73,7 @@
 
 <p>But we reject certain compromises even though many others in our
 community are willing to make them.  For instance,
-we <a href="/philosophy/free-system-distribution-guidelines.html">
+we <a href="/distros/free-system-distribution-guidelines.html">
 endorse only the GNU/Linux distributions</a> that have policies not to
 include nonfree software or lead users to install it.  To endorse
 nonfree distributions would be a <acronym title="ruinous
@@ -183,7 +183,7 @@
 <p>If you want to move to free software without compromising the goal
 of freedom, look at <a href="http://www.fsf.org/resources";>the FSF's
 resources area</a>.  It lists hardware and machine configurations that
-work with free software, <a href="/distros"> totally free GNU/Linux
+work with free software, <a href="/distros/distros.html"> totally free 
GNU/Linux
 distros</a> to install, and <a href="http://directory.fsf.org/";>
 thousands of free software packages</a> that
 work in a 100 percent free software environment.  If you want to help the
@@ -234,18 +234,18 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2008, 2009, 2014, 2015 <a 
href="http://www.stallman.org/";>Richard
+<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017 <a 
href="http://www.stallman.org/";>Richard
 Stallman</a>.</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>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/08/07 15:29:50 $
+$Date: 2017/08/28 14:29:28 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/compromise.zh-cn.po      28 Aug 2017 14:05:42 -0000      1.24
+++ po/compromise.zh-cn.po      28 Aug 2017 14:29:28 -0000      1.25
@@ -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: 2017-08-27 14:56+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>