www/gnu linux-and-gnu.zh-cn.html po/linux-and-g...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/04/12 03:02:47

Modified files:
        gnu            : linux-and-gnu.zh-cn.html 
        gnu/po         : linux-and-gnu.zh-cn-en.html 
                         linux-and-gnu.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.zh-cn.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9

Patches:
Index: linux-and-gnu.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.zh-cn.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- linux-and-gnu.zh-cn.html    30 Dec 2019 12:08:29 -0000      1.10
+++ linux-and-gnu.zh-cn.html    12 Apr 2021 07:02:47 -0000      1.11
@@ -1,25 +1,28 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
 
-<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.90 -->
+<!--#include virtual="/server/html5-header.zh-cn.html" -->
+<!-- Parent-Version: 1.96 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>Linux和GNU - GNU工程 - 自由软件基金会</title>
+<title>Linux 和 GNU - GNU 工程 - 自由软件基金会</title>
 <meta http-equiv="Keywords" 
content="GNU、FSF、自由软件基金会、Linux、Emacs、GCC、Unix、自由软件、操作系统、GNUå†
…æ ¸ã€HURD、GNU HURD、Hurd" />
 <meta http-equiv="Description" 
content="自1983年以来，我们一直在开发自由的类Unix操作系统GNU，这æ
 
·è®¡ç®—机用户就能够拥有分享和改进他们使用的软件的自由。"
 />
 
 <!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<h2>Linux和GNU系统</h2>
+<h2 class="c">Linux和GNU系统</h2>
 
-<p><strong><a href="http://www.stallman.org/";>Richard Stallman</a></strong> 
著</p>
+<address class="byline c"><a 
href="https://www.stallman.org/";>理查德·斯托曼</a> 著</address>
 
+<div class="reduced-width">
+<hr class="no-display" />
 <div class="announcement">
-  <blockquote><p>更多信息，请同时参看<a 
href="/gnu/gnu-linux-faq.html">GNU/Linux常见问题</a>和<a
+<p>更多信息，请同时参看<a 
href="/gnu/gnu-linux-faq.html">GNU/Linux常见问题</a>和<a
 href="/gnu/why-gnu-linux.html">为什么是GNU/Linux？</a></p>
-  </blockquote>
 </div>
+<hr class="thin" />
 
+<div class="article">
 <p>
 每天都有许多计算机用户使用一个被改动过的<a
 
href="/philosophy/categories.html#TheGNUsystem">GNU系统</a>，但是他们并没有意识到。经过一系列的事件，现在被广泛使用的GNU版本则经常被称作&ldquo;Linux&rdquo;，而且许多用户并<a
@@ -98,8 +101,9 @@
 å¦‚æžœä½ æƒ³ä¸º&ldquo;GNU/Linux&rdquo;提供参考链接，本页面和<a
 
href="/gnu/the-gnu-project.html">http://www.gnu.org/gnu/the-gnu-project.html</a>是好的选择。如果ä½
 è¯´çš„æ˜¯ä½œä¸ºå†…æ ¸çš„Linux，要为它提供参考链接，<a
 
href="http://foldoc.org/linux";>http://foldoc.org/linux</a>是一个好的URL。</p>
+<div class="column-limit"></div>
 
-<h3>后记</h3>
+<h3 class="footnote">后记</h3>
 
 <p>
 
除了GNU，还有一个独立进行的工程开发了一个自由的类似Unix的操作系统。这个系统是BSD，它是由UC
@@ -109,8 +113,9 @@
 <p>
 人们有时会问BSD是否也是一个GNU的派生版本，像GNU/Linux那æ 
·ã€‚BSD的开发者受到GNU工程的激励而将他们的代ç 
å˜æˆäº†è‡ªç”±è½¯ä»¶ï¼Œå°¤å…
¶å—到来自GNU的活动家的明确吸引和帮助，但是他们的代ç 
å’ŒGNU并不重合。BSD系统现在也使用一些GNU程序，正如GNU系统及å
…¶æ´¾ç”Ÿç‰ˆä½¿ç”¨ä¸€äº›BSD程序一æ 
·ï¼›ç„¶è€Œï¼Œæ•´ä½“来看，他们是两个独立发展的不同系统。BSD的开发è€
…å¹¶æ²¡ç¼–å†™ä¸€ä¸ªå†…æ ¸ï¼Œå¹¶å°†ä¹‹æ·»åŠ 
到GNU系统，进而起个譬如叫GNU/BSD的名字，并不是这个情
况。<a
 href="#gnubsd">(5)</a></p>
+<div class="column-limit"></div>
 
-<h3>注：</h3>
+<h3 class="footnote">注：</h3>
 <ol>
 <li>
 <a id="unexciting"></a>这些关键但枯燥的部件包
括GNU汇编器（GAS）和连接器（GLD），他们现在都是<a
@@ -135,6 +140,8 @@
 C库已经移植到多个BSDå†…æ ¸ç‰ˆæœ¬ï¼Œè¿™å°±ä½¿ç»„åˆGNU系统和这些内
æ ¸å˜å¾—ç›´æˆªäº†å½“ã€‚æ­£å¦‚GNU/Linux一æ 
·ï¼Œè¿™äº›ä¹Ÿæ˜¯GNUç³»ç»Ÿçš„æ´¾ç”Ÿç‰ˆæœ¬ï¼Œè€Œä¸”ä»–ä»¬ä¹Ÿå› æ­¤æ ¹æ®å†…æ 
¸çš„不同，被称为，比如，GNU/kFreeBSD和GNU/kNetBSD。普通桌面版本用户很难分辨出GNU/Linux和GNU/*BSD。</li>
 
 </ol>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -147,7 +154,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有关自由软件基金会(FSF) &amp; GNU 的一般性 &amp; 
问题发送到<a
@@ -166,11 +173,12 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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>
+请参考 <a href="/server/standards/README.translations.html">翻译说明</a>
+äº†è§£æœ‰å…³åè°ƒå’Œæäº¤æ–‡ç« ç¿»è¯‘çš„ä¿¡æ¯ã€‚</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -189,8 +197,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016,
-2017, 2019 Richard M. Stallman</p>
+<p>Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. 
Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -203,12 +210,12 @@
 <b>翻译</b>: 白若玉<br></br>
 <b>å®¡æ ¡</b>: 刘昭宏<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017，2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017，2019，2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/12/30 12:08:29 $
+$Date: 2021/04/12 07:02:47 $
 
 <!-- timestamp end -->
 </p>

Index: po/linux-and-gnu.zh-cn-en.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/linux-and-gnu.zh-cn-en.html      30 Dec 2019 12:08:30 -0000      1.3
+++ po/linux-and-gnu.zh-cn-en.html      12 Apr 2021 07:02:47 -0000      1.4
@@ -1,22 +1,26 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.90 -->
+<!--#include virtual="/server/html5-header.html" -->
+<!-- Parent-Version: 1.96 -->
 <title>Linux and GNU
 - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
 <meta http-equiv="Description" content="Since 1983, developing the free Unix 
style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." />
 <!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Linux and the GNU System</h2>
+<h2 class="c">Linux and the GNU System</h2>
 
-<p><strong>by <a href="http://www.stallman.org/";>Richard 
Stallman</a></strong></p>
+<address class="byline c">by <a
+href="https://www.stallman.org/";>Richard Stallman</a></address>
 
+<div class="reduced-width">
+<hr class="no-display" />
 <div class="announcement">
-  <blockquote><p>For more information see also
+<p>For more information see also
 the <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>,
 and <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></p>
-  </blockquote>
 </div>
+<hr class="thin" />
 
+<div class="article">
 <p>
 Many computer users run a modified version of
 <a href="/philosophy/categories.html#TheGNUsystem">the GNU system</a>
@@ -184,8 +188,9 @@
 you mention Linux, the kernel, and want to add a link for further
 reference, <a href="http://foldoc.org/linux";>http://foldoc.org/linux</a> 
 is a good URL to use.</p>
+<div class="column-limit"></div>
 
-<h3>Postscripts</h3>
+<h3 class="footnote">Postscripts</h3>
 
 <p>
 Aside from GNU, one other project has independently produced
@@ -206,8 +211,9 @@
 BSD developers did not write a kernel and add it to the GNU system,
 and a name like GNU/BSD would not fit the situation.<a
 href="#gnubsd">(5)</a></p>
+<div class="column-limit"></div>
 
-<h3>Notes:</h3>
+<h3 class="footnote">Notes</h3>
 <ol>
 <li>
 <a id="unexciting"></a>These unexciting but essential components
@@ -245,10 +251,12 @@
 GNU/*BSD.</li>
 
 </ol>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -266,13 +274,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -293,8 +301,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002,
-2007, 2014, 2015, 2016, 2017, 2019 Richard M. Stallman</p>
+<p>Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. 
Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -304,7 +311,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/12/30 12:08:30 $
+$Date: 2021/04/12 07:02:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/linux-and-gnu.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/linux-and-gnu.zh-cn.po   12 Apr 2021 06:33:59 -0000      1.8
+++ po/linux-and-gnu.zh-cn.po   12 Apr 2021 07:02:47 -0000      1.9
@@ -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: 2021-04-07 17:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Linux and GNU - GNU Project - Free Software Foundation"
@@ -248,12 +247,12 @@
 "it was work that, in the nature of things, was surely going to be done by "
 "someone."
 msgstr ""
-"把它们组合到一起并不是一个简单的工作。有些GNU部件<a 
href=\"#somecomponents"
-"\">(3)</a>需要作大量的修改才能适应Linux。把系统集成到一个完整的发行版本中、使"
-"之&ldquo;能够直接安装
并工作&rdquo;也是一项艰巨的工作。它需要考虑如何安装和启"
-"动系统&mdash;æˆ‘ä»¬é‚£æ—¶è¿˜æœªå¤„ç†æ­¤é—®é¢˜ï¼Œå› 
ä¸ºæˆ‘ä»¬è¿˜æ²¡æœ‰èµ°åˆ°é‚£ä¸€æ­¥ã€‚å› æ­¤ï¼Œé‚£äº›å¼€å‘"
-"了不同的发行版的人们作出了许多重要的工作。但是这些工作的属性是，它们终究会被"
-"某些人做的。"
+"把它们组合到一起并不是一个简单的工作。有些GNU部件<a 
href=\"#somecomponents\">"
+"(3)</a>需要作大量的修改才能适应Linux。把系统集成到一个完整的发行版本中、使之"
+"&ldquo;能够直接安装
并工作&rdquo;也是一项艰巨的工作。它需要考虑如何安装
和启动"
+"系统&mdash;æˆ‘ä»¬é‚£æ—¶è¿˜æœªå¤„ç†æ­¤é—®é¢˜ï¼Œå› 
ä¸ºæˆ‘ä»¬è¿˜æ²¡æœ‰èµ°åˆ°é‚£ä¸€æ­¥ã€‚å› æ­¤ï¼Œé‚£äº›å¼€å‘äº†"
+"不同的发行版的人们作出了许多重要的工作。但是这些工作的属性是，它们终究会被某"
+"些人做的。"
 
 #. type: Content of: <div><div><p>
 msgid ""