www/gnu gnu-linux-faq.zh-cn.html po/gnu-linux-f...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/08 04:33:18

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

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.zh-cn-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.zh-cn.po?cvsroot=www&r1=1.20&r2=1.21

Patches:
Index: gnu-linux-faq.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu-linux-faq.zh-cn.html    12 Apr 2021 07:33:48 -0000      1.7
+++ gnu-linux-faq.zh-cn.html    8 Sep 2021 08:33:18 -0000       1.8
@@ -1,30 +1,25 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
 
-<!--#include virtual="/server/html5-header.zh-cn.html" -->
+<!--#include virtual="/server/header.zh-cn.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>GNU/Linux 问答 - GNU 工程 - 自由软件基金会</title>
 
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<h2 class="c">GNU/Linux 问答</h2>
+<div class="article reduced-width">
+<h2>GNU/Linux 问答</h2>
 
-<address class="byline c">Richard Stallman 著</address>
+<address class="byline">Richard Stallman 著</address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>è¦äº†è§£æ›´å¤šï¼Œä½ è¿˜å¯ä»¥é˜…è¯»æˆ‘ä»¬å…³äºŽ<a 
href="/gnu/linux-and-gnu.html">Linux和GNU工程</a>的网页、关于<a
-href="/gnu/why-gnu-linux.html">为什么是GNU/Linux？</a>的网页和关于<a
-href="/gnu/gnu-users-never-heard-of-gnu.html">从未听说过GNU的GNU用户</a>的网页。</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 当人们看到我们使用并建议GNU/Linux作为系统名称，而å…
¶ä»–人称之为&ldquo;Linux&rdquo;时，他们会问许多问题。此处列举了常见问题以及我们的回答。</p>
 
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">目录</h3>
 <ul>
 
 <li><a href="#why">ä¸ºä»€ä¹ˆä½ 
称该系统为GNU/Linux而不是Linux？</a></li>
@@ -197,7 +192,14 @@
 <li><a 
href="#winning">许多人在乎的是哪里方便或谁个获胜，而不是谁是谁非。通过不同的方式不是能获得更多的支持吗？</a></li>
 
 </ul>
-<hr class="thin" />
+</div>
+
+<div class="announcement comment" role="complementary">
+<p>è¦äº†è§£æ›´å¤šï¼Œä½ è¿˜å¯ä»¥é˜…è¯»æˆ‘ä»¬å…³äºŽ <a 
href="/gnu/linux-and-gnu.html">Linux 和 GNU
+工程</a>的网页、关于<a href="/gnu/why-gnu-linux.html">为什么是 
GNU/Linux？</a>的网页和关于<a
+href="/gnu/gnu-users-never-heard-of-gnu.html">从未听说过 GNU 的 GNU 
用户</a>的网页。</p>
+<hr class="no-display" />
+</div>
 
 <dl>
 
@@ -225,8 +227,11 @@
 <dt id="what">GNU和Linux究竟是什么关系？<span 
class="anchor-reference-id">(<a
 href="#what">#what</a>)</span></dt>
 
-<dd>GNU操作系统和Linux内æ 
¸æ˜¯ç‹¬ç«‹çš„软件项目，它们完成互补的工作。通常，它们会打åŒ
ɌϬ<a
-href="/distros/distros.html">GNU/Linux发行版</a>里，并被一起使用。</dd>
+<dd>
+<p>
+GNU操作系统和Linux内æ 
¸æ˜¯ç‹¬ç«‹çš„软件项目，它们完成互补的工作。通常，它们会打åŒ
ɌϬ<a
+href="/distros/distros.html">GNU/Linux发行版</a>里，并被一起使用。</p>
+</dd>
 
 <dt 
id="howerror">为什么大多数人会叫该系统为&ldquo;Linux&rdquo;？<span
 class="anchor-reference-id">(<a
 href="#howerror">#howerror</a>)</span></dt>
@@ -282,7 +287,8 @@
 <dt 
id="freespeech">难道GNU工程不支持每个人按自己的选择为系统命名的言论自由吗？<span
 class="anchor-reference-id">(<a
 href="#freespeech">#freespeech</a>)</span></dt>
 <dd>
-æ˜¯çš„ï¼Œç¡®å®žï¼Œæˆ‘ä»¬ç›¸ä¿¡ä½ 
有按自己的意愿称呼该操作系统的言论自由权利。我们请求大家称之为GNU/Linux是为了å
…¬æ­£åœ°å¯¹å¾…
GNU工程、是为了促进GNU代表的自由价值、是为了告诉大家正是这些自由价值才使该系统能够存在。
+<p>
+æ˜¯çš„ï¼Œç¡®å®žï¼Œæˆ‘ä»¬ç›¸ä¿¡ä½ 
有按自己的意愿称呼该操作系统的言论自由权利。我们请求大家称之为GNU/Linux是为了å
…¬æ­£åœ°å¯¹å¾…
GNU工程、是为了促进GNU代表的自由价值、是为了告诉大家正是这些自由价值才使该系统能够存在。</p>
 </dd>
 
 <dt 
id="everyoneknows">由于每个人都知道GNU在系统开发中的角色，难道名字里不说&ldquo;GNU/&rdquo;不是一æ
 ·å—？<span
@@ -303,8 +309,9 @@
 href="#everyoneknows2">#everyoneknows2</a>)</span></dt>
 
 <dd>
+<p>
 å¦‚æžœä½ è¯´çš„è¯æ²¡æœ‰è¡¨è¾¾å‡ºä½ çš„è®¤è¯†ï¼Œé‚£ä¹ˆä½ 
不是在教育别人。大多数听到过GNU/Linux系统的人认为这就是&ldquo;Linux&rdquo;，而它是由Linus
-Torvalds开始的，并且它要做的是&ldquo;开源&rdquo;ã€‚å¦‚æžœä½ 
不告诉人们事实，谁来告诉他们呢？
+Torvalds开始的，并且它要做的是&ldquo;开源&rdquo;ã€‚å¦‚æžœä½ 
不告诉人们事实，谁来告诉他们呢？</p>
 </dd>
 
 <dt 
id="windows">把&ldquo;GNU/Linux&rdquo;缩写为&ldquo;Linux&rdquo;不正好和把&ldquo;Microsoft
@@ -366,14 +373,16 @@
 href="#brain">#brain</a>)</span></dt>
 
 <dd>
-ç”µè„‘ç³»ç»Ÿå’Œäººä½“ä¸ä¸€æ ·ï¼Œå…¶ä¸­æ²¡æœ‰ä¸€ä¸ªéƒ¨ä»¶æ‹…å½“å’Œäººè„‘ä¸€æ 
·çš„角色。
+<p>
+ç”µè„‘ç³»ç»Ÿå’Œäººä½“ä¸ä¸€æ ·ï¼Œå…¶ä¸­æ²¡æœ‰ä¸€ä¸ªéƒ¨ä»¶æ‹…å½“å’Œäººè„‘ä¸€æ 
·çš„角色。</p>
 </dd>
 
 <dt id="kernelmost">编写内æ 
¸ä¸æ˜¯æž„建操作系统的主要工作吗？<span 
class="anchor-reference-id">(<a
 href="#kernelmost">#kernelmost</a>)</span></dt>
 
 <dd>
-不，许多部件都要花费大量的劳动。
+<p>
+不，许多部件都要花费大量的劳动。</p>
 </dd>
 
 <dt id="nokernel">æ“ä½œç³»ç»Ÿéœ€è¦å†…æ ¸ã€‚è€Œ GNU 工程并没有开发内æ 
¸ï¼Œé‚£ä¹ˆç³»ç»Ÿæ€Žä¹ˆèƒ½å¤Ÿå« GNU 呢？<span
@@ -431,7 +440,8 @@
 href="#feel">#feel</a>)</span></dt>
 
 <dd>
-并没有一种叫&ldquo;Linux的感觉&rdquo;çš„ä¸œè¥¿ï¼Œå› 
为Linuxæ²¡æœ‰ç”¨æˆ·ç•Œé¢ã€‚å’Œæ‰€æœ‰å½“ä»£å†…æ ¸ä¸€æ 
·ï¼ŒLinux是运行程序的基础；用户界面属于系统的å…
¶ä»–部分。人们在GNU/Linux上的交互总是通过å…
¶ä»–程序，而这就是&ldquo;感觉&rdquo;的来源。
+<p>
+并没有一种叫&ldquo;Linux的感觉&rdquo;çš„ä¸œè¥¿ï¼Œå› 
为Linuxæ²¡æœ‰ç”¨æˆ·ç•Œé¢ã€‚å’Œæ‰€æœ‰å½“ä»£å†…æ ¸ä¸€æ 
·ï¼ŒLinux是运行程序的基础；用户界面属于系统的å…
¶ä»–部分。人们在GNU/Linux上的交互总是通过å…
¶ä»–程序，而这就是&ldquo;感觉&rdquo;的来源。</p>
 </dd>
 
 <dt 
id="long">问题是&ldquo;GNU/Linux&rdquo;太长了。用一个更短的名字怎么æ
 ·ï¼Ÿ<span
@@ -489,7 +499,7 @@
 Torvalds荣誉不是绅
å£«æ‰€ä¸ºã€‚ä»–ç¡®å®žç¼–å†™äº†ç³»ç»Ÿçš„ä¸€ä¸ªé‡è¦éƒ¨ä»¶ã€‚æˆ‘ä»¬å¸Œæœ›å› 
为发起和维护了该系统的开发而得到荣誉，但这并不是说我们要像那些称该系统为&ldquo;Linux&rdquo;的人对å¾
…æˆ‘ä»¬ä¸€æ ·å¯¹å¾…
Linus。我们强烈反对他的政治观点，但是我们对此采取真诚和å
…
¬å¼€çš„做法，而不是试图削弱他在系统贡献方面应得的荣誉。</li>
 <li>
 
由于许多人对该系统的认识是&ldquo;Linux&rdquo;，如果我们说&ldquo;GNU&rdquo;，他们可能不会意识到我们说的是同一个系统。如果我们说&ldquo;GNU/Linux&rdquo;，他们就能够和他们原å
…ˆå¬è¯´çš„系统建立联系。</li>
-</ul><p></p>
+</ul>
 </dd>
 
 <dt 
id="trademarkfee">如果产品名称使用&ldquo;Linux&rdquo;要付费，那么使用&ldquo;GNU/Linux&rdquo;也一æ
 
·ä»˜è´¹ã€‚难道使用&ldquo;GNU&rdquo;而不带&ldquo;Linux&rdquo;不是可以省去该费用？<span
@@ -519,8 +529,9 @@
 class="anchor-reference-id">(<a href="others">#others</a>)</span></dt>
 
 <dd>
+<p>
 Systemd 是一个相当重要的组件，但是它并没有内æ 
¸ï¼ˆLinux）那么重要，也没有整个系统的基础（GNU）那么重要。不过，如果ä½
 强调系统中有
-Systemd 并且称之为 
&ldquo;GNU/Systemd/Linux&rdquo;，也没有什么错误。
+Systemd 并且称之为 
&ldquo;GNU/Systemd/Linux&rdquo;，也没有什么错误。</p>
 </dd>
 
 <dt 
id="others">到今天，许多项目都为该系统做出了贡献，但是它们并没有坚持要叫XYZ/Linux。为什么要对GNU特殊对å¾
…呢？<span
@@ -567,9 +578,10 @@
 Linux不是一个GNU包
；就是说，它不是在GNU工程的庇护下开发的，也不是专门贡献给GNU工程的。Linus
 
Torvalds独立编写了Linux，作为他自己的项目。所以&ldquo;Linux，是一个GNUåŒ
…&rdquo;的说法不对。</p>
 <p>
-我们不是在讨论特别针对GNU的Linux内æ 
¸ç‰ˆæœ¬ã€‚GNU/Linux发行版确实有一个<a
-href="http://directory.fsf.org/project/linux";>独立的Linux版本</a>，这是由于&ldquo;æ
 
‡å‡†çš„&rdquo;版本带有非自由的固件&ldquo;blobs&rdquo;。如果这曾是GNU工程的一部分，那么可以考虑叫它&ldquo;GNU
-Linux&rdquo;ï¼›ä¸è¿‡æˆ‘ä»¬ä¸æƒ³è¿™ä¹ˆå«ï¼Œå› ä¸ºè¿™å¤ªä»¤äººè¿·æƒ‘äº†ã€‚</p>
+我们不是在讨论特别针对 GNU 的 Linux å†…æ ¸ç‰ˆæœ¬ã€‚GNU/Linux 
发行版确实有一个<a
+href="https://directory.fsf.org/project/linux";>独立的 Linux
+版本</a>，这是由于&ldquo;æ 
‡å‡†çš„&rdquo;版本带有非自由的固件&ldquo;blobs&rdquo;。如果这曾是
 GNU
+工程的一部分，那么可以考虑叫它&ldquo;GNU 
Linux&rdquo;ï¼›ä¸è¿‡æˆ‘ä»¬ä¸æƒ³è¿™ä¹ˆå«ï¼Œå› ä¸ºè¿™å¤ªä»¤äººè¿·æƒ‘äº†ã€‚</p>
 <p>
 我们讨论的是GNU操作系统的一个版本，它由于带有Linux内æ 
¸è€ŒåŒºåˆ«äºŽå…¶ä»–GNUç‰ˆæœ¬ã€‚æ–œæ é€‚åˆæ­¤æƒ…å†µï¼Œå› 
为它表示&ldquo;联合。&rdquo;（类似&ldquo;输å…
¥/输出&rdquo;。）该系统是GNU和Linuxçš„è”åˆï¼›å› 
此，它叫&ldquo;GNU/Linux&rdquo;。</p>
 <p>
@@ -654,13 +666,17 @@
 class="anchor-reference-id">(<a href="#reserve">#reserve</a>)</span></dt>
 
 <dd>
-对我们的社区来说，在GNU/Linuxç³»ç»Ÿé‡Œæ·»åŠ 
非自由软件的普遍做法是一个主要问题。它教育用户非自由软件是可以的，而且使用非自由软件是&ldquo;Linux&rdquo;精神的一部分。许多&ldquo;Linux&rdquo;用户组把帮助用户使用非自由的附åŠ
 
组件当成自己的一个使命，甚至不惜邀请销售人员来为此营销。他们接纳了以下目æ
 ‡ï¼š&ldquo;帮助GNU/Linux用户&rdquo;（包
括帮助他们使用非自由的应用和驱动），甚或是以自由为代价让系统更流行。
+对我们的社区来说，在 GNU/Linux
+ç³»ç»Ÿé‡Œæ·»åŠ 
非自由软件的普遍做法是一个主要问题。它教育用户非自由软件是可以的，而且使用非自由软件是&ldquo;Linux&rdquo;精神的一部分。许多&ldquo;Linux&rdquo;用户组把帮助用户使用非自由的附åŠ
 
组件当成自己的一个使命，甚至不惜邀请销售人员来为此营销。他们接纳了以下目æ
 ‡ï¼š&ldquo;帮助
+GNU/Linux 用户&rdquo;（包
括帮助他们使用非自由的应用和驱动），甚或是以自由为代价让系统更流行。
 <p>
 问题是怎么才能改变这个情况。</p>
 <p>
 由于大多数使用GNUåŠ 
Linux的社区用户并没有意识到他们用的是什么，所以让我们和这些掺假的版本脱离å
…
³ç³»ï¼Œè¯´å®ƒä»¬ä¸æ˜¯çœŸæ­£çš„GNU，并不能更多地教育用户自由的价值。他们将不能获得应得的信息。他们首å
…ˆåªä¼šååº”出他们从来没想到该系统是GNU。</p>
 <p>
-让这些用户看到该系统和自由的å…
³è”的方法正好相反：告诉他们所有这些系统版本<em>都是</em>GNU，这些系统都是建立在一个特意为用户自由而存在的系统之上的。有了这æ
 ·çš„理解，他们就能够开始意识到包
含非自由软件的发行版是反常的、掺假的GNU版本，而不再认为它们是合理和适当的&ldquo;Linux版本&rdquo;。</p>
+让这些用户看到该系统和自由的å…
³è”的方法正好相反：告诉他们所有这些系统版本<em>都是</em>
+GNU，这些系统都是建立在一个特意为用户自由而存在的系统之上的。有了这æ
 ·çš„理解，他们就能够开始意识到包
含非自由软件的发行版是反常的、掺假的 GNU
+版本，而不再认为它们是合理和适当的&ldquo;Linux版本&rdquo;。</p>
 <p>
 
发起GNU/Linux用户组会非常有用，它会称系统为GNU/Linux并接纳GNU工程是系统的基础这一理念。如果ä½
 当地的Linuxç”¨æˆ·ç»„æœ‰ä»¥ä¸ŠæåŠçš„é—®é¢˜ï¼Œé‚£ä¹ˆæˆ‘ä»¬å»ºè®®ä½ æˆ–è€…
发起改变其倾向（和名称）的活动，或者
开展一个新的用户组。关注表面目æ 
‡çš„äººä»¬æœ‰æƒé¡¾åŠä»–ä»¬çš„è§‚ç‚¹ï¼Œä½†æ˜¯è¯·ä¸è¦è®©ä»–ä»¬æŠŠä½ 
带到沟里去！</p>
 </dd>
@@ -674,7 +690,7 @@
 å…
³äºŽå¼€å‘一个GNU/Linux发行版，我们已经做过一次，就是我们资助Debian
 
GNU/Linux早期开发的时候。再做一次看来并不会有用；新的发行版要耗费大量工作，并且除非它比å
…¶ä»–发行版有非常大的实际优势，它的目的不明确。</p>
 <p>
-反之，我们会帮助100%自由的GNU/Linux发行版的开发者
，比如gNewSense和Ututo的开发者。</p>
+反之，我们会帮助100%自由的 GNU/Linux 发行版的开发者，比如 
Trisquel 和 Parabola 的开发者。</p>
 </dd>
 
 <dt id="linuxgnu">为什么不简单地说&ldquo;Linux是GNU的内æ 
¸&rdquo;并把现有的GNU/Linux版本用&ldquo;GNU&rdquo;发布？
@@ -736,9 +752,10 @@
 <p>
 GNU中没有Unixçš„ä»£ç ï¼Œä½†GNU是一个å…
¼å®¹Unix的系统；所以，许多GNU的想法和规æ 
¼ç¡®å®žæ¥è‡ªUnix。&ldquo;GNU&rdquo;，代表&ldquo;GNU并非Unix&rdquo;，就是给予Unix致意的幽默方式，这也遵循了70年代黑客使用递归缩写的ä¼
 统。</p>
 <p>
-ç¬¬ä¸€ä¸ªè¿™æ ·çš„é€’å½’ç¼©å†™æ˜¯TINT，表示&ldquo;TINT不是TECO（TINT Is 
Not
-TECO）&rdquo;。TINT的作者
写了TECO的另一种实现（当时有很多实现，用在不同的系统上），但是不再叫它为æ—
 聊的&ldquo;<em>另一种</em>TECO&rdquo;，该作者
想出了这个精灵、有趣的名字。（这就是黑客的意义：<a
-href="http://stallman.org/articles/on-hacking.html";>玩得机灵</a>。）</p>
+ç¬¬ä¸€ä¸ªè¿™æ ·çš„é€’å½’ç¼©å†™æ˜¯ TINT，表示&ldquo;TINT不是 TECO（TINT 
Is Not TECO）&rdquo;。TINT 的作者写了
+TECO
+的另一种实现（当时有很多实现，用在不同的系统上），但是不再叫它为æ—
 聊的&ldquo;<em>另一种</em>TECO&rdquo;，该作者
想出了这个精灵、有趣的名字。（这就是黑客的意义：<a
+href="https://stallman.org/articles/on-hacking.html";>玩得机灵</a>。）</p>
 <p>
 å…
¶ä»–黑客非常喜欢这个名字，他们开始模仿这个做法。这成了一个ä¼
 ç»Ÿï¼Œå½“ä½ 
重新开始写一个和现有程序类似的程序时（设想现有程序名字叫&ldquo;Klever&rdquo;），ä½
 就可以给新程序起递归缩写名，比如代表&ldquo;MINK
 Is Not
@@ -753,8 +770,8 @@
 <dd>
 我们不叫BSD系统（比如FreeBSD。）为&ldquo;GNU/BSD&rdquo;ç³»ç»Ÿï¼Œå› 
ä¸ºè¿™æ ·å«ä¸ç¬¦åˆBSD系统的历史。
 <p>
-BSD系统是由UC
-Berkeley在80年代开发的非自由系统，并在90年代早期成为自由软件。现今的自由操作系统å‡
 乎可以确定不是GNU系统的变化版，就是BSD系统的一种。</p>
+BSD 系统是由 UC Berkeley 在 80 年代开发的非自由系统，并在 90 
å¹´ä»£æ—©æœŸæˆä¸ºè‡ªç”±è½¯ä»¶ã€‚çŽ°ä»Šçš„è‡ªç”±æ“ä½œç³»ç»Ÿå‡ 
乎可以确定不是 GNU
+系统的变化版，就是 BSD 系统的一种。</p>
 <p>
 人们有时会问BSD是否也是GNU的一个变化版，就像GNU/Linux一æ 
·ã€‚它不是。BSD的开发者受到GNUå·¥ç¨‹çš„æ¦œæ ·æ¿€åŠ±è€ŒæŠŠä»£ç 
å˜æˆè‡ªç”±è½¯ä»¶ï¼Œè€Œä¸”明确受到来自GNU活动家的请求，这些请求帮助说服他们开始走向自由软件，但是他们的代ç
 å’ŒGNU没有什么重合。</p>
 <p>
@@ -770,14 +787,16 @@
 class="anchor-reference-id">(<a href="#othersys">#othersys</a>)</span></dt>
 
 <dd>
-这和我们说&ldquo;GNU/Linux&rdquo;å¹¶ä¸ä¸€æ ·ã€‚GNU的工å…
·åªæ˜¯GNU软件的一部分，也就只是GNU系统的一部分，而且在它们的下层ä½
 还有另一个完整的操作系统，该操作系统和GNU没有å…
±åŒçš„ä»£ç ã€‚æ€»è€Œè¨€ä¹‹ï¼Œè¿™å’ŒGNU/Linux的情况大不相同。
+<p>
+这和我们说&ldquo;GNU/Linux&rdquo;å¹¶ä¸ä¸€æ ·ã€‚GNU的工å…
·åªæ˜¯GNU软件的一部分，也就只是GNU系统的一部分，而且在它们的下层ä½
 还有另一个完整的操作系统，该操作系统和GNU没有å…
±åŒçš„ä»£ç ã€‚æ€»è€Œè¨€ä¹‹ï¼Œè¿™å’ŒGNU/Linux的情况大不相同。</p>
 </dd>
 
 <dt id="justlinux">Linux没有GNU就不能用了吗？<span 
class="anchor-reference-id">(<a
 href="#justlinux">#justlinux</a>)</span></dt>
 
 <dd>
-Linux自己也在一些应用中被使用，或者是和å…
¶ä»–一些小程序一起。这些小的软件系统远没法和GNU/Linux系统相提并论。比如，用户不会在电脑上安è£
…
它们，而且会感到这些应用令人失望。这些运行Linux的应用可以用来展示它们和GNU/Linux系统有多么的不同。
+<p>
+Linux自己也在一些应用中被使用，或者是和å…
¶ä»–一些小程序一起。这些小的软件系统远没法和GNU/Linux系统相提并论。比如，用户不会在电脑上安è£
…
它们，而且会感到这些应用令人失望。这些运行Linux的应用可以用来展示它们和GNU/Linux系统有多么的不同。</p>
 </dd>
 
 <dt id="howmuch">需要多少GNU的系统才要叫做GNU/Linux系统？<span 
class="anchor-reference-id">(<a
@@ -828,7 +847,10 @@
 Torvalds是他自己追求的&ldquo;广告人物&rdquo;（å…
¶ä»–人挑选的词语，而不是我们说的），不是我们的。他的目的是使该系统更流行，而且他坚信该系统的社会价值ä»
…åœ¨äºŽå®ƒæä¾›çš„å®žç”¨ä¼˜åŠ¿ï¼šå…¶èƒ½åŠ›ã€å¯é 
性和易得性。他从来没有致力于把<a
 
href="/philosophy/why-free.html">自由合作</a>作为一个道德原则，这就是å
…
¬ä¼—没有把&ldquo;Linux&rdquo;这一名称和该道德原则连接到一起的原å›
 。
 <p>
-Linuså…
¬å¼€é™ˆè¿°ä»–不同意自由软件运动的理念。他在工作中开发非自由软件多年（并且在&ldquo;Linux&rdquo;世界巡展上对众多听众这么说），而且å
…¬å¼€é‚€è¯·Linuxå†…æ ¸çš„å¼€å‘è€…
和他一起使用非自由软件来工作。他甚至走得更远，他指责那些建议工程师和科学家应该考虑技术进步对社会影响的人们&mdash;拒绝学ä¹
 原子弹的开发对社会的教训。</p>
+Linus
+å…
¬å¼€é™ˆè¿°ä»–不同意自由软件运动的理念。他在工作中开发非自由软件多年（并且在&ldquo;Linux&rdquo;世界巡展上对众多听众这么说），而且å
…¬å¼€é‚€è¯·
+Linux
+å†…æ ¸çš„å¼€å‘è€…
和他一起使用非自由软件来工作。他甚至走得更远，他指责那些建议工程师和科学家应该考虑技术进步对社会影响的人们&mdash;&mdash;拒绝学ä¹
 原子弹的开发对社会的教训。</p>
 <p>
 ä¸ºäº†å­¦ä¹ å’Œå¿«ä¹ç¼–å†™ä¸€ä¸ªè‡ªç”±è½¯ä»¶å¹¶æ²¡æœ‰ä»€ä¹ˆé”™ï¼›Linuså› 
此编写的内æ 
¸å¯¹æˆ‘们的社区是一个重要的贡献。但是这些动机并不是整个自由系统，GNU/Linux，存在的理由，而且它们也不能保证我们将来的自由。å
…¬ä¼—应该知道这个道理。Linus有权利推动å…
¶è§‚点；不过，人们应该知晓我们讨论的操作系统源自自由的理念，而不是他的观点。</p>
 </dd>
@@ -837,7 +859,8 @@
 href="#claimlinux">#claimlinux</a>)</span></dt>
 
 <dd>
-å› ä¸ºé‚£æ˜¯é”™è¯¯çš„ï¼Œæ‰€ä»¥æˆ‘ä»¬æ²¡æœ‰é‚£æ 
·åšã€‚Torvalds的工作是Linuxï¼Œå†…æ ¸ï¼›æˆ‘ä»¬å¾ˆè°¨æ…
Žï¼Œå¹¶æ²¡æœ‰æŠŠå®ƒä½œä¸ºGNU工程的贡献，也没有把它贴上&ldquo;GNU&rdquo;的æ
 
‡ç­¾ã€‚当我们谈论整个系统时，我们使用&ldquo;GNU/Linux&rdquo;的名字来给予他应得的荣誉。
+<p>
+å› ä¸ºé‚£æ˜¯é”™è¯¯çš„ï¼Œæ‰€ä»¥æˆ‘ä»¬æ²¡æœ‰é‚£æ 
·åšã€‚Torvalds的工作是Linuxï¼Œå†…æ ¸ï¼›æˆ‘ä»¬å¾ˆè°¨æ…
Žï¼Œå¹¶æ²¡æœ‰æŠŠå®ƒä½œä¸ºGNU工程的贡献，也没有把它贴上&ldquo;GNU&rdquo;的æ
 
‡ç­¾ã€‚当我们谈论整个系统时，我们使用&ldquo;GNU/Linux&rdquo;的名字来给予他应得的荣誉。</p>
 </dd>
 
 
@@ -845,9 +868,10 @@
 href="#linusagreed">#linusagreed</a>)</span></dt>
 
 <dd>
-<p>ä»–ä¸€å¼€å§‹æ˜¯è¿™æ ·çœ‹çš„ã€‚Linux最早的发布声明曾说，<a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>&ldquo;大多数和linux一起使用的工å
…·æ˜¯GNU软件，是使用GNU
-copyleft发布的。这些工具不在此发布之列——请向我（或者
是GNU）咨询详情&rdquo;</a>。</p>
+<p>ä»–ä¸€å¼€å§‹æ˜¯è¿™æ ·çœ‹çš„ã€‚Linux 最早的发布声明曾说，<a
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>&ldquo;大多数和
+linux 一起使用的工具是 GNU 软件，是使用 GNU copyleft 
发布的。这些工具不在此发布之列——请向我（或者是
+GNU）咨询详情&rdquo;</a>。</p>
 </dd>
 
 <dt id="finishhurd">为什么不完成GNU Hurd内æ 
¸ã€å‘布整个GNU系统并把GNU/Linux的问题抛在脑后？<span
@@ -856,23 +880,25 @@
 <dd>
 æ— è®ºä½¿ç”¨å“ªä¸ªå†…æ ¸ï¼Œæˆ‘ä»¬éƒ½å¸Œæœ›GNU操作系统获得荣誉。
 
-<p>要使GNU
-Hurd能够和Linux竞争是一个艰巨的工作，而且并没有明确的必
要。Linux作为内æ 
¸å”¯ä¸€çš„道德错误是它带有固件&ldquo;blobs&rdquo;；对å…
¶æœ€å¥½çš„解决方案是<a
-href="http://fsf.org/campaigns/priority-projects";>开发这些blobs的自由替代软件</a>。</p>
+<p>要使 GNU Hurd 能够和 Linux 
竞争是一个艰巨的工作，而且并没有明确的必要。Linux
+ä½œä¸ºå†…æ ¸å”¯ä¸€çš„é“å¾·é”™è¯¯æ˜¯å®ƒå¸¦æœ‰å›ºä»¶&ldquo;blobs&rdquo;；对å…
¶æœ€å¥½çš„解决方案是<a
+href="https://fsf.org/campaigns/priority-projects";>开发这些 blobs 
的自由替代软件</a>。</p>
 </dd>
 
 <dt 
id="lost">战斗已经失败了&mdash;ç¤¾åŒºå·²ç»åšå‡ºäº†é€‰æ‹©è€Œæˆ‘ä»¬æ— 
æ³•æ›´æ”¹ï¼Œä¸ºä»€ä¹ˆè¿˜çº ç»“è¿™äº‹å„¿ï¼Ÿ<span
 class="anchor-reference-id">(<a href="#lost">#lost</a>)</span></dt>
 
 <dd>
-这不是战斗，这是教育活动。系统应该叫什么不是一个单一的决定，它不应该由&ldquo;社会&rdquo;在短时间å†
…å†³å®šï¼šæ¯ä¸ªäººã€æ¯ä¸ªç»„ç»‡éƒ½èƒ½å†³å®šä½¿ç”¨ä»€ä¹ˆåå­—ã€‚ä½ 
不能强求其他人说&ldquo;GNU/Linux&rdquo;ï¼Œä½†æ˜¯ä½ 
能够决定自己叫该系统为&ldquo;GNU/Linux&rdquo;&mdash;ä½ è¿™æ 
·åšï¼Œä½ 就是在教育其他人。
+<p>
+这不是战斗，这是教育活动。系统应该叫什么不是一个单一的决定，它不应该由&ldquo;社会&rdquo;在短时间å†
…å†³å®šï¼šæ¯ä¸ªäººã€æ¯ä¸ªç»„ç»‡éƒ½èƒ½å†³å®šä½¿ç”¨ä»€ä¹ˆåå­—ã€‚ä½ 
不能强求其他人说&ldquo;GNU/Linux&rdquo;ï¼Œä½†æ˜¯ä½ 
能够决定自己叫该系统为&ldquo;GNU/Linux&rdquo;&mdash;ä½ è¿™æ 
·åšï¼Œä½ 就是在教育其他人。</p>
 </dd>
 
 <dt id="whatgood">ç¤¾åŒºå·²ç»åšå‡ºäº†é€‰æ‹©è€Œæˆ‘ä»¬æ— 
法更改，如果我说&ldquo;GNU/Linux&rdquo;又有什么用呢？<span
 class="anchor-reference-id">(<a href="#whatgood">#whatgood</a>)</span></dt>
 
 <dd>
-这不是一个全部或者没有的情
å†µï¼šæ­£ç¡®å’Œé”™è¯¯çš„æ¦‚å¿µæˆ–å¤šæˆ–å°‘åœ°è¢«äººä»¬ä¼ æ’­ç€ã€‚å¦‚æžœä½ 
称该系统为&ldquo;GNU/Linux&rdquo;ï¼Œé‚£ä¹ˆä½ 
就是在帮助他人了解该系统的真正历史、渊源和存在的理由。ä½
 ä¹Ÿè®¸ä¸èƒ½å‡­å€Ÿä¸€å·±ä¹‹åŠ›æ›´æ­£æ‰€æœ‰çš„è¯¯ä¼ ï¼Œä½†æ˜¯ä½ 
èƒ½å¤Ÿèµ·åˆ°å¸®åŠ©ã€‚å“ªæ€•ä»…æœ‰å‡ ç™¾ä¸ªäººçœ‹åˆ°ä½ 
在使用&ldquo;GNU/Linux&rdquo;ï¼Œä½ 
也已经不费吹灰之力地教育了相当数目的人了。而且å…
¶ä¸­ä¼šæœ‰ä¸€äº›äººç»§ç»­å‘å¦å¤–çš„äººä¼ 播正确的概念。
+<p>
+这不是一个全部或者没有的情
å†µï¼šæ­£ç¡®å’Œé”™è¯¯çš„æ¦‚å¿µæˆ–å¤šæˆ–å°‘åœ°è¢«äººä»¬ä¼ æ’­ç€ã€‚å¦‚æžœä½ 
称该系统为&ldquo;GNU/Linux&rdquo;ï¼Œé‚£ä¹ˆä½ 
就是在帮助他人了解该系统的真正历史、渊源和存在的理由。ä½
 ä¹Ÿè®¸ä¸èƒ½å‡­å€Ÿä¸€å·±ä¹‹åŠ›æ›´æ­£æ‰€æœ‰çš„è¯¯ä¼ ï¼Œä½†æ˜¯ä½ 
èƒ½å¤Ÿèµ·åˆ°å¸®åŠ©ã€‚å“ªæ€•ä»…æœ‰å‡ ç™¾ä¸ªäººçœ‹åˆ°ä½ 
在使用&ldquo;GNU/Linux&rdquo;ï¼Œä½ 
也已经不费吹灰之力地教育了相当数目的人了。而且å…
¶ä¸­ä¼šæœ‰ä¸€äº›äººç»§ç»­å‘å¦å¤–çš„äººä¼ 播正确的概念。</p>
 </dd>
 
 <dt id="explain">把系统叫做&ldquo;Linux&rdquo;再花10分钟教育人们å…
¶æ¥é¾™åŽ»è„‰ä¸æ˜¯æ›´å¥½å—？<span
@@ -910,28 +936,35 @@
 href="#rename">#rename</a>)</span></dt>
 
 <dd>
-我们不是在命名所有的东西；我们自从1983年声明以来，就一直叫该系统为&ldquo;GNU&rdquo;。那些将系统改称为&ldquo;Linux&rdquo;的人本不该那么做。</dd>
+<p>
+我们不是在命名所有的东西；我们自从1983年声明以来，就一直叫该系统为&ldquo;GNU&rdquo;。那些将系统改称为&ldquo;Linux&rdquo;的人本不该那么做。</p>
+</dd>
 
 <dt 
id="force">强制人们叫它&ldquo;GNU/Linux&rdquo;系统不是错误吗？<span
 class="anchor-reference-id">(<a
 href="#force">#force</a>)</span></dt>
 
 <dd>
-如果我们是强制，那么我们错了；我们没有那æ 
·ã€‚我们称该系统为&ldquo;GNU/Linux&rdquo;ï¼Œå¹¶ä¸”æˆ‘ä»¬ä¹Ÿè¯·æ±‚ä½ 
这么做。
+<p>
+如果我们是强制，那么我们错了；我们没有那æ 
·ã€‚我们称该系统为&ldquo;GNU/Linux&rdquo;ï¼Œå¹¶ä¸”æˆ‘ä»¬ä¹Ÿè¯·æ±‚ä½ 
这么做。</p>
 </dd>
 
 <dt 
id="whynotsue">为什么不控告哪些叫整个系统为&ldquo;Linux&rdquo;的人？<span
 class="anchor-reference-id">(<a
 href="#whynotsue">#whynotsue</a>)</span></dt>
 
 <dd>
-控告没有法律基础，由于我们坚信言论自由，即使有理我们也不会诉之法律。我们请求人们称系统为&ldquo;GNU/Linux&rdquo;是å›
 为这是在做正确的事。
+<p>
+控告没有法律基础，由于我们坚信言论自由，即使有理我们也不会诉之法律。我们请求人们称系统为&ldquo;GNU/Linux&rdquo;是å›
 为这是在做正确的事。</p>
 </dd>
 
 <dt id="require">难道不能在GNU 
GPL中要求人们称该系统为&ldquo;GNU&rdquo;吗？<span
 class="anchor-reference-id">(<a href="#require">#require</a>)</span></dt>
 
 <dd>
-GNU
-GPL的目的是保护用户的自由不受那些会把自由软件变成专属软件的人的限制。虽然称系统为&ldquo;Linux&rdquo;的人经常会做些限制用户自由的事，比如在GNU/Linux中åŠ
 入非自由软件，甚至是为此开发非自由软件，仅仅
是称系统为&ldquo;Linux&rdquo;本身并不剥夺用户的自由。让GPL限制人们对所用系统的名称并不合适。
+<p>
+GNU GPL
+的目的是保护用户的自由不受那些会把自由软件变成专属软件的人的限制。虽然称系统为&ldquo;Linux&rdquo;的人经常会做些限制用户自由的事，比如在
+GNU/Linux ä¸­åŠ å…¥éžè‡ªç”±è½¯ä»¶ï¼Œç”šè‡³æ˜¯ä¸ºæ­¤å¼€å‘éžè‡ªç”±è½¯ä»¶ï¼Œä»…
仅是称系统为&ldquo;Linux&rdquo;本身并不剥夺用户的自由。让 GPL
+限制人们对所用系统的名称并不合适。</p>
 </dd>
 
 <dt id="BSDlicense">ç”±äºŽä½ 
曾经反对原始BSDè®¸å¯è¯è¦æ±‚é€šè¿‡å¹¿å‘Šè‡´è°¢åŠ 
åˆ©ç¦å°¼äºšå¤§å­¦ï¼Œæ‰€ä»¥ä½ çŽ°åœ¨è¦æ±‚è‡´è°¢GNU工程不是虚伪吗？<span
@@ -967,14 +1000,16 @@
 href="#somanyright">#somanyright</a>)</span></dt>
 
 <dd>
-我们认为将一个流行的错误当成事实是不对的。
+<p>
+我们认为将一个流行的错误当成事实是不对的。</p>
 </dd>
 
 <dt id="knownname">把系统名称按ç…
§å¤§å¤šæ•°ç”¨æˆ·å·²çŸ¥çš„名称来叫不是更好吗？<span 
class="anchor-reference-id">(<a
 href="#knownname">#knownname</a>)</span></dt>
 
 <dd>
-ç”¨æˆ·æœ‰å­¦ä¹ çš„èƒ½åŠ›ã€‚ç”±äºŽ&ldquo;GNU/Linux&rdquo;包
含了&ldquo;Linux&rdquo;ï¼Œä»–ä»¬ä¼šäº†è§£ä½ æŒ‡çš„æ˜¯ä»€ä¹ˆã€‚å¦‚æžœä½ 
æ—¶ä¸æ—¶åœ°åŠ 
上&ldquo;（经常错误地被认为是&lsquo;Linux&rsquo;）&rdquo;，他们就å
…¨éƒ½æ˜Žç™½äº†ã€‚
+<p>
+ç”¨æˆ·æœ‰å­¦ä¹ çš„èƒ½åŠ›ã€‚ç”±äºŽ&ldquo;GNU/Linux&rdquo;包
含了&ldquo;Linux&rdquo;ï¼Œä»–ä»¬ä¼šäº†è§£ä½ æŒ‡çš„æ˜¯ä»€ä¹ˆã€‚å¦‚æžœä½ 
æ—¶ä¸æ—¶åœ°åŠ 
上&ldquo;（经常错误地被认为是&lsquo;Linux&rsquo;）&rdquo;，他们就å
…¨éƒ½æ˜Žç™½äº†ã€‚</p>
 </dd>
 
 <dt 
id="winning">许多人在乎的是哪里方便或谁个获胜，而不是谁是谁非。通过不同的方式不是能获得更多的支持吗？<span
@@ -988,7 +1023,6 @@
 
 </dl>
 </div>
-</div>
 
 <div class="translators-notes">
 
@@ -1024,8 +1058,9 @@
         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="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -1044,8 +1079,8 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation,
+Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -1063,7 +1098,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/04/12 07:33:48 $
+$Date: 2021/09/08 08:33:18 $
 
 <!-- timestamp end -->
 </p>

Index: po/gnu-linux-faq.zh-cn-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.zh-cn-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/gnu-linux-faq.zh-cn-en.html      12 Apr 2021 07:33:48 -0000      1.7
+++ po/gnu-linux-faq.zh-cn-en.html      8 Sep 2021 08:33:18 -0000       1.8
@@ -1,30 +1,23 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>GNU/Linux FAQ
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">GNU/Linux FAQ</h2>
+<div class="article reduced-width">
+<h2>GNU/Linux FAQ</h2>
 
-<address class="byline c">by Richard Stallman</address>
+<address class="byline">by Richard Stallman</address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>To learn more about this issue, you can also read
-our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU Project</a>, 
our
- page on <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a>
-and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
-Users Who Have Never Heard of GNU</a>.</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.</p>
 
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">Table of Contents</h3>
 <ul>
 
 <li><a href="#why">Why do you call the system we use GNU/Linux and not 
Linux?</a></li>
@@ -285,7 +278,16 @@
     get more of their support by a different road?</a></li>
 
 </ul>
-<hr class="thin" />
+</div>
+
+<div class="announcement comment" role="complementary">
+<p>To learn more about this issue, you can also read
+our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU System</a>, our
+ page on <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a>
+and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
+Users Who Have Never Heard of GNU</a>.</p>
+<hr class="no-display" />
+</div>
 
 <dl>
 
@@ -326,10 +328,13 @@
 
 <dt id="what">What is the real relationship between GNU and Linux? <span 
class="anchor-reference-id">(<a href="#what">#what</a>)</span></dt>
 
-<dd>The GNU operating system and the Linux kernel are separate
+<dd>
+<p>
+The GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a <a href="/distros/distros.html">GNU/Linux distribution</a>, and 
used
-together.</dd>
+together.</p>
+</dd>
 
 <dt id="howerror">How did it come about that most
     people call the system &ldquo;Linux&rdquo;? <span 
class="anchor-reference-id">(<a href="#howerror">#howerror</a>)</span></dt>
@@ -442,11 +447,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? <span 
class="anchor-reference-id">(<a href="#freespeech">#freespeech</a>)</span></dt>
 <dd>
+<p>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into existence.</p>
 </dd>
 
 <dt id="everyoneknows">Since everyone knows the role
@@ -476,11 +482,12 @@
     why does it matter what name I use? <span class="anchor-reference-id">(<a 
href="#everyoneknows2">#everyoneknows2</a>)</span></dt>
 
 <dd>
+<p>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who will?</p>
 </dd>
 
 <dt id="windows">Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -587,16 +594,18 @@
 <dt id="brain">Isn't the kernel the brain of the system? <span 
class="anchor-reference-id">(<a href="#brain">#brain</a>)</span></dt>
 
 <dd>
+<p>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a human.</p>
 </dd>
 
 <dt id="kernelmost">Isn't writing the kernel most of the work in an
 operating system? <span class="anchor-reference-id">(<a 
href="#kernelmost">#kernelmost</a>)</span></dt>
 
 <dd>
-No, many components take a lot of work.
+<p>
+No, many components take a lot of work.</p>
 </dd>
 
 <dt id="nokernel">An operating system requires a kernel.
@@ -682,11 +691,12 @@
     feel of Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#feel">#feel</a>)</span></dt>
 
 <dd>
+<p>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from them.</p>
 </dd>
 
 <dt id="long">The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.
@@ -777,7 +787,7 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.</li>
-</ul><p></p>
+</ul>
 </dd>
 
 <dt id="trademarkfee">I would have
@@ -831,11 +841,12 @@
     GNU/systemd/Linux? <span class="anchor-reference-id">(<a 
href="#others">#others</a>)</span></dt>
 
 <dd>
+<p>
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.</p>
 </dd>
 
 <dt id="others">Many other projects contributed to
@@ -907,8 +918,8 @@
 <p>
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a <a href="http://directory.fsf.org/project/linux";>separate version of
-Linux</a>, since the &ldquo;standard&rdquo; version contains non-free
+a <a href="https://directory.fsf.org/wiki/Linux-libre";>separate version of
+Linux</a>, since the &ldquo;standard&rdquo; version contains nonfree
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.</p>
@@ -1028,13 +1039,13 @@
     free software?  After all, that is the ideal of GNU. <span 
class="anchor-reference-id">(<a href="#reserve">#reserve</a>)</span></dt>
 
 <dd>
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding nonfree software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that nonfree software is ok, and that using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use nonfree add-ons, and may even invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use nonfree
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 <p>
@@ -1052,7 +1063,7 @@
 versions <em>are</em> versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include nonfree software as perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.</p>
 <p>
@@ -1081,7 +1092,7 @@
 other distributions, it would serve no purpose.</p>
 <p>
 Instead we help the developers of 100% free GNU/Linux distributions,
-such as gNewSense and Ututo.</p>
+such as Trisquel and Parabola.</p>
 </dd>
 
 <dt id="linuxgnu">Why not just say &ldquo;Linux is
@@ -1205,7 +1216,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: <a href="http://stallman.org/articles/on-hacking.html";>playful
+means: <a href="https://stallman.org/articles/on-hacking.html";>playful
 cleverness</a>.)</p>
 <p>
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1231,7 +1242,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 <p>
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as nonfree software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.</p>
@@ -1262,22 +1273,24 @@
 on Windows, does that mean I am running a GNU/Windows system? <span 
class="anchor-reference-id">(<a href="#othersys">#othersys</a>)</span></dt>
 
 <dd>
+<p>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from GNU/Linux.</p>
 </dd>
 
 <dt id="justlinux">Can't Linux be used without GNU? <span 
class="anchor-reference-id">(<a href="#justlinux">#justlinux</a>)</span></dt>
 
 <dd>
+<p>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from GNU/Linux.</p>
 </dd>
 
 <dt id="howmuch">How much of the GNU system is needed for the system
@@ -1367,10 +1380,10 @@
 &ldquo;Linux&rdquo; with that principle.
 <p>
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed nonfree software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+nonfree software to work on it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.</p>
@@ -1389,11 +1402,12 @@
     work as GNU? <span class="anchor-reference-id">(<a 
href="#claimlinux">#claimlinux</a>)</span></dt>
 
 <dd>
+<p>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+credit.</p>
 </dd>
 
 
@@ -1403,7 +1417,7 @@
 <dd>
 <p>He recognized this at the beginning.  The earliest Linux release notes
 said, <a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;</a>.</p>
@@ -1421,7 +1435,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is <a href="http://fsf.org/campaigns/priority-projects";> developing
+is <a href="https://www.fsf.org/campaigns/priority-projects";> developing
 free replacement for the blobs</a>.</p>
 </dd>
 
@@ -1430,12 +1444,13 @@
     it? <span class="anchor-reference-id">(<a 
href="#lost">#lost</a>)</span></dt>
 
 <dd>
+<p>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate others.</p>
 </dd>
 
 <dt id="whatgood">Society has made its
@@ -1443,6 +1458,7 @@
     &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whatgood">#whatgood</a>)</span></dt>
 
 <dd>
+<p>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1450,7 +1466,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to others.</p>
 </dd>
 
 <dt id="explain">Wouldn't it be better to call
@@ -1521,39 +1537,44 @@
     is it legitimate to rename the operating system? <span 
class="anchor-reference-id">(<a href="#rename">#rename</a>)</span></dt>
 
 <dd>
+<p>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.</dd>
+it to &ldquo;Linux&rdquo; should not have done so.</p>
+</dd>
 
 <dt id="force">Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#force">#force</a>)</span></dt>
 
 <dd>
+<p>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.</p>
 </dd>
 
 <dt id="whynotsue">Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whynotsue">#whynotsue</a>)</span></dt>
 
 <dd>
+<p>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.</p>
 </dd>
 
 <dt id="require">Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? <span 
class="anchor-reference-id">(<a href="#require">#require</a>)</span></dt>
 
 <dd>
+<p>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling nonfree software with the
+GNU/Linux system or even developing nonfree software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the system.</p>
 </dd>
 
 <dt id="BSDlicense">Since you objected to the original BSD license's
@@ -1601,17 +1622,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? <span 
class="anchor-reference-id">(<a 
href="#somanyright">#somanyright</a>)</span></dt>
 
 <dd>
-We don't think that the popularity of an error makes it the truth.
+<p>
+We don't think that the popularity of an error makes it the truth.</p>
 </dd>
 
 <dt id="knownname">Isn't it better to call the
     system by the name most users already know? <span 
class="anchor-reference-id">(<a href="#knownname">#knownname</a>)</span></dt>
 
 <dd>
+<p>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.</p>
 </dd>
 
 <dt id="winning">Many people care about what's
@@ -1621,7 +1644,7 @@
 
 <dd>
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  Nonfree software is an example of that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1631,7 +1654,6 @@
 
 </dl>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -1680,7 +1702,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021
+<p>Copyright &copy; 2001-2011, 2013-2018, 2020, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -1691,7 +1713,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/12 07:33:48 $
+$Date: 2021/09/08 08:33:18 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/gnu-linux-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.zh-cn.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/gnu-linux-faq.zh-cn.po   8 Sep 2021 08:18:59 -0000       1.20
+++ po/gnu-linux-faq.zh-cn.po   8 Sep 2021 08:33:18 -0000       1.21
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
@@ -608,8 +607,8 @@
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 msgstr ""
-"ä¸ºä»€ä¹ˆä½ ç§°è¯¥ç³»ç»Ÿä¸ºGNU/Linux而不是Linux？<span 
class=\"anchor-reference-id"
-"\">(<a href=\"#why\">#why</a>)</span>"
+"ä¸ºä»€ä¹ˆä½ ç§°è¯¥ç³»ç»Ÿä¸ºGNU/Linux而不是Linux？<span 
class=\"anchor-reference-id\">"
+"(<a href=\"#why\">#why</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
 msgid ""
@@ -1193,8 +1192,8 @@
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
 "span>"
 msgstr ""
-"ç¼–å†™å†…æ ¸ä¸æ˜¯æž„å»ºæ“ä½œç³»ç»Ÿçš„ä¸»è¦å·¥ä½œå—ï¼Ÿ<span 
class=\"anchor-reference-id"
-"\">(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
+"ç¼–å†™å†…æ ¸ä¸æ˜¯æž„å»ºæ“ä½œç³»ç»Ÿçš„ä¸»è¦å·¥ä½œå—ï¼Ÿ<span 
class=\"anchor-reference-id\">"
+"(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
@@ -1308,8 +1307,8 @@
 #. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
-"name an operating system after a kernel? <span class=\"anchor-reference-id"
-"\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
+"name an operating system after a kernel? <span class=\"anchor-reference-id\">"
+"(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 msgstr ""
 "æˆ‘ä»¬ç”¨å†…æ ¸æ¥ç§°å‘¼æ•´ä¸ªç³»ç»Ÿï¼ŒLinux。用内æ 
¸å‘½åæ“ä½œç³»ç»Ÿä¸æ˜¯æ­£å¸¸çš„吗？<span class="
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
@@ -1569,8 +1568,8 @@
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
 "we have to give them credit too? (But that would lead to a name so long it "
-"is absurd.) <span class=\"anchor-reference-id\">(<a href=\"#many\">#many</"
-"a>)</span>"
+"is absurd.) <span class=\"anchor-reference-id\">(<a href=\"#many\">#many</a>)"
+"</span>"
 msgstr ""
 "到今天，许多项目都为该系统做出了贡献；其中包
括TeX、X11、Apache、Perl和许多其"
 "ä»–ç¨‹åºã€‚ä½ 
的论点不是意味着它们也应该获得荣誉？（但是这æ 
·çš„话名字就长得可笑"
@@ -1999,8 +1998,8 @@
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
-"GNU. <span class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</"
-"a>)</span>"
+"GNU. <span class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)"
+"</span>"
 msgstr ""
 "把名称&ldquo;GNU/Linux&rdquo;保留给完å…
¨çš„è‡ªç”±è½¯ä»¶ä¸æ˜¯æ›´å¥½å—ï¼Ÿå½’æ ¹ç»“åº•ï¼Œè¿™å°±æ˜¯"
 "GNU的理想嘛。<span class=\"anchor-reference-id\">(<a href=\"#reserve"
@@ -2305,8 +2304,8 @@
 #. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
-"using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id"
-"\">(<a href=\"#unix\">#unix</a>)</span>"
+"using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
+"(<a href=\"#unix\">#unix</a>)</span>"
 msgstr ""
 
"由于GNU基本来自Unix，难道GNU不应该尊重Unix并以&ldquo;Unix&rdquo;作为名字的一"
 "部分？<span class=\"anchor-reference-id\">(<a href=\"#unix\">#unix</a>)</"
@@ -2384,8 +2383,8 @@
 
 #. type: Content of: <div><dl><dt>
 msgid ""
-"Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id"
-"\">(<a href=\"#bsd\">#bsd</a>)</span>"
+"Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
+"(<a href=\"#bsd\">#bsd</a>)</span>"
 msgstr ""
 "我们也应该说&ldquo;GNU/BSD&rdquo;吗？<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#bsd\">#bsd</a>)</span>"
@@ -2500,8 +2499,8 @@
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 msgstr ""
-"需要多少GNU的系统才要叫做GNU/Linux系统？<span 
class=\"anchor-reference-id"
-"\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
+"需要多少GNU的系统才要叫做GNU/Linux系统？<span 
class=\"anchor-reference-id\">"
+"(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
 #. type: Content of: <div><dl><dd>
 msgid ""
@@ -2717,8 +2716,8 @@
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 msgstr ""
-"Linus Torvalds同意Linuxåªæ˜¯å†…æ ¸çš„è¯´æ³•å—ï¼Ÿ<span 
class=\"anchor-reference-id"
-"\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
+"Linus Torvalds同意Linuxåªæ˜¯å†…æ ¸çš„è¯´æ³•å—ï¼Ÿ<span 
class=\"anchor-reference-id\">"
+"(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
@@ -2765,8 +2764,8 @@
 #. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
-"change it, so why even think about it? <span class=\"anchor-reference-id"
-"\">(<a href=\"#lost\">#lost</a>)</span>"
+"change it, so why even think about it? <span class=\"anchor-reference-id\">"
+"(<a href=\"#lost\">#lost</a>)</span>"
 msgstr ""
 "战斗已经失败了&mdash;ç¤¾åŒºå·²ç»åšå‡ºäº†é€‰æ‹©è€Œæˆ‘ä»¬æ— 
æ³•æ›´æ”¹ï¼Œä¸ºä»€ä¹ˆè¿˜çº ç»“è¿™äº‹å„¿ï¼Ÿ"
 "<span class=\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
@@ -2792,8 +2791,8 @@
 "href=\"#whatgood\">#whatgood</a>)</span>"
 msgstr ""
 "ç¤¾åŒºå·²ç»åšå‡ºäº†é€‰æ‹©è€Œæˆ‘ä»¬æ— 
法更改，如果我说&ldquo;GNU/Linux&rdquo;又有什么用"
-"呢？<span class=\"anchor-reference-id\">(<a href=\"#whatgood\">#whatgood</"
-"a>)</span>"
+"呢？<span class=\"anchor-reference-id\">(<a 
href=\"#whatgood\">#whatgood</a>)"
+"</span>"
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
@@ -2934,8 +2933,8 @@
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
 msgstr ""
-"æ— è®ºä½ åšäº†ä»€ä¹ˆè´¡çŒ®ï¼Œä½ æœ‰æƒé‡å‘½åç³»ç»Ÿå—ï¼Ÿ<span 
class=\"anchor-reference-id"
-"\">(<a href=\"#rename\">#rename</a>)</span>"
+"æ— è®ºä½ åšäº†ä»€ä¹ˆè´¡çŒ®ï¼Œä½ æœ‰æƒé‡å‘½åç³»ç»Ÿå—ï¼Ÿ<span 
class=\"anchor-reference-id\">"
+"(<a href=\"#rename\">#rename</a>)</span>"
 
 #. type: Content of: <div><dl><dd><p>
 msgid ""
@@ -3060,8 +3059,8 @@
 #. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
-"<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</"
-"a>)</span>"
+"<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
+"</span>"
 msgstr ""
 "å¦‚æžœä½ ä»¬ä¸å’Œè¿™ä¹ˆå¤šäººä½œå¯¹ï¼Œæƒ…å†µä¸æ˜¯æ›´å¥½å—ï¼Ÿ<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#contradict\">#contradict</a>)</span>"