www/distros distros.zh-cn.html po/distros.zh-cn...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/10/19 08:59:01

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

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/distros.zh-cn.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.zh-cn.po?cvsroot=www&r1=1.20&r2=1.21

Patches:
Index: distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/distros.zh-cn.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- distros.zh-cn.html  10 Aug 2017 12:59:21 -0000      1.15
+++ distros.zh-cn.html  19 Oct 2017 12:58:58 -0000      1.16
@@ -14,8 +14,8 @@
 <h2>GNU/Linux 发行版</h2>
 
 <p>
-自由的 GNU/Linux
-系统发行版（或&ldquo;发行版&rdquo;）只包
含和发行自由软件。他们拒绝各种非自由的应用程序、非自由的编程平台、非自由的驱动、非自由的固件&ldquo;blobs&rdquo;，以及å
…¶ä»–各种非自由的软件和文档。如果他们发现错误地包
含了这些非自由的成分，他们会主动去除它。
+自由的<a
+href="/gnu/linux-and-gnu.html">GNU/Linux系统</a>发行版（或&ldquo;发行版&rdquo;）只åŒ
…
含和发行自由软件。他们拒绝各种非自由的应用程序、非自由的编程平台、非自由的驱动、非自由的固件&ldquo;blobs&rdquo;，以及å
…¶ä»–各种非自由的软件和文档。如果他们发现错误地包
含了这些非自由的成分，他们会主动去除它。
 </p>
 
 <h3 id="freeDistros">自由的 GNU/Linux 发行版</h3>
@@ -120,7 +120,7 @@
 
 <!-- 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 3.0 US.  Please do NOT change or remove this
+     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
@@ -134,24 +134,24 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2017 Free Software Foundation, Inc.</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>
+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>：Nan Deng，2010。
+<b>翻译</b>ï¼šé‚“æ¥ ï¼ˆNan Deng），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/10 12:59:21 $
+$Date: 2017/10/19 12:58:58 $
 
 <!-- timestamp end -->
 </p>

Index: po/distros.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/distros.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/distros.zh-cn-en.html    10 Aug 2017 12:59:22 -0000      1.1
+++ po/distros.zh-cn-en.html    19 Oct 2017 12:59:01 -0000      1.2
@@ -10,7 +10,8 @@
 <h2>GNU/Linux Distros</h2>
 
 <p>
-Free GNU/Linux system distributions (or &ldquo;distros&rdquo;) only
+Free distributions (or &ldquo;distros&rdquo;) of
+the <a href="/gnu/linux-and-gnu.html">GNU/Linux system</a> only
 include and only propose free software.  They reject non-free
 applications, non-free programming platforms, non-free drivers,
 non-free firmware &ldquo;blobs&rdquo;, and any other non-free software
@@ -145,7 +146,7 @@
 
 <!-- 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 3.0 US.  Please do NOT change or remove this
+     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
@@ -160,17 +161,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2017 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>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/08/10 12:59:22 $
+$Date: 2017/10/19 12:59:01 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/distros.zh-cn.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/distros.zh-cn.po 19 Oct 2017 12:38:02 -0000      1.20
+++ po/distros.zh-cn.po 19 Oct 2017 12:59:01 -0000      1.21
@@ -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-10-16 18:55+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>