www/doc doc.zh-cn.html po/doc.zh-cn-en.html po/...

[GNUN]

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

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

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/doc.zh-cn.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/doc.zh-cn-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/doc.zh-cn.po?cvsroot=www&r1=1.11&r2=1.12

Patches:
Index: doc.zh-cn.html
===================================================================
RCS file: /web/www/www/doc/doc.zh-cn.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- doc.zh-cn.html      18 Feb 2015 19:27:09 -0000      1.16
+++ doc.zh-cn.html      25 Aug 2017 14:29:15 -0000      1.17
@@ -1,30 +1,17 @@
-<!--#set var="PO_FILE"
- value='<a href="/doc/po/doc.zh-cn.po">
- http://www.gnu.org/doc/po/doc.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/doc/doc.html"
- --><!--#set var="DIFF_FILE" value="/doc/po/doc.zh-cn-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2013-02-23" -->
+<!--#set var="ENGLISH_PAGE" value="/doc/doc.en.html" -->
+
 <!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.77 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
- <!--#set var="ENGLISH_PAGE" value="/doc/doc.en.html" -->
-
-<title>GNU 工程的文档 - GNU 工程 - 自由软件基金会</title>
+<title>文档 - GNU 工程 - 自由软件基金会</title>
 
-<!-- Fixed by hand on April 16, 2014:
-     - disable top addendum,
-     - translist before banner.
-     Sept 1st: update title and footer.
--->
 <!--#include virtual="/doc/po/doc.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
- 
 <h2>GNU 工程的文档</h2>
 
 <p>
-å¯ä»¥ä»Žä»¥ä¸‹æ¸ é“èŽ·å– GNU 文档和其它自由文档
+ä»Žä»¥ä¸‹æ¸ é“å¯ä»¥èŽ·å– GNU 文档和其他自由文档：
 </p>
 
 <ul>
@@ -37,7 +24,7 @@
 
 <li><a href="http://shop.fsf.org";>FSF 
在线商店：出售图书、T恤、海报等商品。</a></li>
 
-<li><a href="/doc/other-free-books.html">å…
¶å®ƒå‡ºç‰ˆå•†å‡ºç‰ˆçš„自由图书</a>：使用自由文档许可证出版的图书。</li>
+<li><a href="/doc/other-free-books.html">å…
¶ä»–出版商出版的自由图书</a>：使用自由文档许可证出版的图书。</li>
 </ul>
 
 
@@ -51,69 +38,76 @@
 href="/licenses/licenses.html#FDL">GNU 自由文档许可证 (FDL)</a>
 
的诞生填补了以前自由软件许可证与文档证可证之间的空白。有å
…³è‡ªç”±æ–‡æ¡£çš„更多信息，可以阅读 <a
 href="http://www.stallman.org/";>理查德·斯托曼</a> çš„æ–‡ç« ï¼Œ&ldquo;<a
-href="/philosophy/free-doc.html">自由软件与自由手册</a>&rdquo;。</p>
+href="/philosophy/free-doc.html">自由软件与自由手册</a>&rdquo;。<a
+href="freemanuals.texi">此文的Texinfo版</a>可以嵌å…
¥åˆ°æ‰‹å†Œä¸­ä½¿ç”¨ã€‚</p>
 
 
 <h3>贡献</h3>
 
 
<p>请帮助我们撰写更多的文档！这是对自由软件运动最重要的贡献方式之一。请
 <a
-href="/help/help.html#helpgnu">点击此处</a> 查看细节和其它相å…
³ä¿¡æ¯ã€‚</p>
+href="/help/help.html#helpgnu">点击此处</a> 查看细节和其他相å…
³ä¿¡æ¯ã€‚</p>
 
 <p><b>GNU 出版社：</b> 另外一条帮助我们的途径是让 <a 
href="/doc/gnupresspub.html">GNU 出版社</a>
-出版的图书 <a href="/doc/expanding.html">出现在更多的书店</a> 
。如果有兴趣，请 <a
-href="/doc/contact.html">与 GNU 出版社联系</a> 。</p>
-
+出版的图书 <a 
href="/doc/expanding.html">出现在更多的书店</a>。如果有兴趣，请 
<a
+href="/doc/contact.html">与 GNU 出版社联系</a>。</p>
 
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
 
-<p>
-请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。您也可以通过 <a
-href="/contact/">其它方法</a> 联系自由软件基金会。 
-发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</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>
-若您想翻译本文，请参看 <a 
href="/server/standards/README.translations.html">翻译手册</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>
 
-<p>
-版权所有 &copy; 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 
自由软件基金会
-</p>
+<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
 
-<p>
-本页面采用 <a rel="license"
+<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>
+Attribution-NoDerivs 3.0 United States 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</div>
-
+<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 class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2015/02/18 19:27:09 $
+$Date: 2017/08/25 14:29:15 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/doc.zh-cn-en.html
===================================================================
RCS file: /web/www/www/doc/po/doc.zh-cn-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/doc.zh-cn-en.html        9 Feb 2013 07:44:37 -0000       1.9
+++ po/doc.zh-cn-en.html        25 Aug 2017 14:29:15 -0000      1.10
@@ -1,7 +1,9 @@
 <!--#include virtual="/server/header.html" -->
-<title>Documentation - GNU Project - Free Software Foundation (FSF)</title>
-<!--#include virtual="/server/banner.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>Documentation of the GNU Project
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/doc/po/doc.translist" -->
+<!--#include virtual="/server/banner.html" -->
 <h2>Documentation of the GNU Project</h2>
 
 <p>
@@ -41,7 +43,9 @@
 originally designed for software.  For more information on free
 documentation, please see <a href="http://www.stallman.org/";>Richard
 Stallman's</a> essay, &ldquo;<a href="/philosophy/free-doc.html">Free
-Software and Free Manuals</a>&rdquo;.</p>
+Software and Free Manuals</a>&rdquo;.  A <a
+href="freemanuals.texi">Texinfo version of that essay</a> is available
+for inclusion in manuals.</p>
 
 
 <h3>Contribute</h3>
@@ -54,51 +58,51 @@
 <p><b>GNU Press:</b> another way to contribute is to help us <a
 href="/doc/expanding.html">expand bookstore availability</a> of <a
 href="/doc/gnupresspub.html">GNU Press</a> books.  For this or any
-reason, you can <a href="/doc/contact.html">contact GNU Press</a>.</p>
-
-</div>
+reason, you can <a href="mailto:address@hidden";>contact GNU Press</a>.</p>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
+<div class="unprintable">
 
-<p>
-Please send 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>
-
-<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>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.  Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</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>
 
-<p>
-Copyright &copy; 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010
-Free Software Foundation, Inc.
-</p>
+<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
 
-<p>
-This page is licensed under a <a rel="license"
+<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>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/09 07:44:37 $
+$Date: 2017/08/25 14:29:15 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/doc.zh-cn.po
===================================================================
RCS file: /web/www/www/doc/po/doc.zh-cn.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/doc.zh-cn.po     25 Aug 2017 14:08:28 -0000      1.11
+++ po/doc.zh-cn.po     25 Aug 2017 14:29:15 -0000      1.12
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-02-23 18:55-0500\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>