www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: GNUN
Subject: www/gnu gnu-linux-faq.zh-cn.html po/gnu-linux-f...
Date: Wed, 8 Jan 2020 18:59:19 -0500 (EST)

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

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.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: gnu-linux-faq.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu-linux-faq.zh-cn.html    15 Dec 2018 14:46:08 -0000      1.3
+++ gnu-linux-faq.zh-cn.html    8 Jan 2020 23:59:18 -0000       1.4
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.90 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>GNU/Linux问答 - GNU工程 - 自由软件基金会</title>
@@ -74,6 +74,9 @@
 <li><a
 
href="#long3">不幸的是,&ldquo;GNU/Linux&rdquo;有5个音节。人们不会使用这么长的术语。ä½
 éš¾é“不该找个更短的术语?</a></li>
 
+<li><a href="#long4">Stallman 并不需要让人每次都叫他的全名 
&ldquo;Richard Matthew
+Stallman&rdquo;。那么为什么要让我们每次都说 
&ldquo;GNU/Linux&rdquo; 呢?</a></li>
+
 <li><a 
href="#justgnu">由于Linux是次要的贡献,难道简单称该系统为&ldquo;GNU&rdquo;有错吗?</a></li>
 
 <li><a
@@ -82,6 +85,9 @@
 <li><a
 href="#many">到今天,许多项目都为该系统做出了贡献;其中包
括TeX、X11、Apache、Perl和许多其他程序。你
的论点不是意味着它们也应该获得荣誉?(但是这æ 
·çš„话名字就长得可笑了。)</a></li>
 
+<li><a href="#systemd">如今,Systemd 在 GNU/Linux 
系统中扮演着重要的角色;我们不是应该称该系统为
+GNU/Systemd/Linux 吗?</a></li>
+
 <li><a 
href="#others">到今天,许多项目都为该系统做出了贡献,但是它们并没有坚持要叫XYZ/Linux。为什么要对GNU特殊对å¾
…呢?</a></li>
 
 <li><a 
href="#allsmall">如今,GNU只是系统的一小部分,为什么我们要提及它呢?</a></li>
@@ -92,6 +98,8 @@
 <li><a 
href="#whyslash">为什么要写成&ldquo;GNU/Linux&rdquo;而不是&ldquo;GNU
 Linux&rdquo;?</a></li>
 
+<li><a href="#pronounce">&ldquo;GNU/Linux&rdquo; 应该怎么念?</a></li>
+
 <li><a
 
href="#whyorder">为什么是&ldquo;GNU/Linux&rdquo;而不是&ldquo;Linux/GNU&rdquo;?</a></li>
 
@@ -428,6 +436,17 @@
 class="anchor-reference-id">(<a href="#long3">#long3</a>)</span></dt>
 <dd><p>实际
上,&ldquo;GNU/Linux&rdquo;只有四个音节。&ldquo;Unfortunately(不幸一词)&rdquo;有五个音节,但是人们会毫不迟疑地使用它。</p></dd>
 
+<dt id="long4">Stallman 并不需要让人每次都叫他的全名 
&ldquo;Richard Matthew Stallman&rdquo;。那么为什么要让我们每次都说
+&ldquo;GNU/Linux&rdquo; 呢?<span class="anchor-reference-id">(<a
+href="#long4">#long4</a>)</span></dt>
+<dd>
+<p>省略 &ldquo;Matthew&rdquo; 不会严重曲解 Stallman 
的本性、来源、理想和目标。省略 &ldquo;GNU&rdquo;
+确实会对 GNU/Linux 系统的这些方面带来曲解。</p>
+
+<p>这是一种隐藏谬误的常见方式:将谬误埋藏在错误的类比之中。更好的类别应该是,&ldquo;为什么我们不应该叫
 Stallman
+&lsquo;Torvalds&rsquo;?&rdquo;
+</p></dd>
+
 <dt 
id="justgnu">由于Linux是次要的贡献,难道简单称该系统为&ldquo;GNU&rdquo;有错吗?<span
 class="anchor-reference-id">(<a href="#justgnu">#justgnu</a>)</span></dt>
 
@@ -468,6 +487,13 @@
 不同的长度会形成不同的系统名称。但是一个名字,无
论怎么样的长度限制,都不会是因为考虑到å…
¬å¹³å’Œè£èª‰è€Œå‡ºçŽ°çš„,它就是&ldquo;Linux&rdquo;。给予一个次要贡献è€
…(Linux)所有的荣誉而忽略主要的贡献者(GNU)不可能是å…
¬å¹³çš„。</p>
 </dd>
 
+<dt id="systemd">如今,Systemd 在 GNU/Linux 
系统中扮演着重要的角色;我们不是应该称该系统为 
GNU/Systemd/Linux 吗?<span
+class="anchor-reference-id">(<a href="others">#others</a>)</span></dt>
+
+<dd>
+Systemd 是一个相当重要的组件,但是它并没有内æ 
¸ï¼ˆLinux)那么重要,也没有整个系统的基础(GNU)那么重要。
+</dd>
+
 <dt 
id="others">到今天,许多项目都为该系统做出了贡献,但是它们并没有坚持要叫XYZ/Linux。为什么要对GNU特殊对å¾
…呢?<span
 class="anchor-reference-id">(<a href="#others">#others</a>)</span></dt>
 
@@ -522,6 +548,15 @@
 con Linux&rdquo;。</p>
 </dd>
 
+<dt id="pronounce">&ldquo;GNU/Linux&rdquo; 应该怎么念?<span 
class="anchor-reference-id">(<a
+href="#pronounce">#pronounce</a>)</span></dt>
+<dd>
+<p>
+请按照 &ldquo;GNU 斜杠 Linux&rdquo; 来发音。如果你不说出斜杠
,人们就会以为你在说 &ldquo;GNU
+Linux&rdquo;,这其实 <a 
href="#whyslash">不是一个对该组合的恰当称呼</a>。
+</p>
+</dd>
+
 <dt 
id="whyorder">为什么是&ldquo;GNU/Linux&rdquo;而不是&ldquo;Linux/GNU&rdquo;?<span
 class="anchor-reference-id">(<a href="#whyorder">#whyorder</a>)</span></dt>
 
@@ -966,7 +1001,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016,
-2017, 2018 Free Software Foundation, Inc.</p>
+2017, 2018, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -979,12 +1014,12 @@
 <b>审校</b>:尚卓燃,2018。<a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a><br></br>
 <b>翻译团队</b>:<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018,2020。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/12/15 14:46:08 $
+$Date: 2020/01/08 23:59: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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/gnu-linux-faq.zh-cn-en.html      15 Dec 2018 14:46:09 -0000      1.3
+++ po/gnu-linux-faq.zh-cn-en.html      8 Jan 2020 23:59:18 -0000       1.4
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.90 -->
 <title>GNU/Linux FAQ
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
@@ -97,6 +97,10 @@
     &ldquo;GNU/Linux&rdquo; is five syllables. People won't use such a
     long term. Shouldn't you find a shorter one?</a></li>
 
+<li><a href="#long4">Stallman doesn't ask us to call him
+    &ldquo;Richard Matthew Stallman&rdquo; every the time.
+    So why ask us to say &ldquo;GNU/Linux&rdquo; every time?</a></li>
+
 <li><a href="#justgnu">Since Linux is a secondary
     contribution, would it be false to the facts to call the system
     simply &ldquo;GNU&rdquo;?</a></li>
@@ -113,6 +117,10 @@
     credit too?  (But that would lead to a name so long it is
     absurd.)</a></li>
 
+<li><a href="#systemd">Systemd plays an important role in the GNU/Linux
+    system as it is today; are we obligated to call it
+    GNU/Systemd/Linux?</a></li>
+
 <li><a href="#others">Many other projects contributed to
     the system as it is today, but they don't insist on calling it
     XYZ/Linux.  Why should we treat GNU specially?</a></li>
@@ -128,6 +136,9 @@
     &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU
     Linux&rdquo;?</a></li>
 
+<li><a href="#pronounce">How is the name &ldquo;GNU/Linux&rdquo;
+pronounced?</a></li>
+
 <li><a href="#whyorder">Why &ldquo;GNU/Linux&rdquo;
 rather than &ldquo;Linux/GNU&rdquo;?</a></li>
 
@@ -688,6 +699,21 @@
   &ldquo;Unfortunately&rdquo; is five syllables, yet people show no
   sign of reluctance to use that word.</p></dd>
 
+<dt id="long4">Stallman doesn't ask us to call him
+    &ldquo;Richard Matthew Stallman&rdquo; every the time.
+    So why ask us to say &ldquo;GNU/Linux&rdquo; every time?
+  <span class="anchor-reference-id">(<a href="#long4">#long4</a>)</span></dt>
+<dd>
+<p>Omitting &ldquo;Matthew&rdquo; does not misrepresent anything
+important about Stallman's nature, origin, ideas or purpose.  Omitting
+&ldquo;GNU&rdquo; does misrepresent those things about the GNU/Linux
+system.</p>
+
+<p>This is an example of a frequent way of hiding a fallacy: to bury
+it inside a misleading analogy.  A better analogy would be, &ldquo;Why
+shouldn't we call Stallman &lsquo;Torvalds&rsquo;?&rdquo;
+</p></dd>
+
 <dt id="justgnu">Since Linux is a secondary
     contribution, would it be false to the facts to call the system simply
     &ldquo;GNU&rdquo;? <span class="anchor-reference-id">(<a 
href="#justgnu">#justgnu</a>)</span></dt>
@@ -764,6 +790,16 @@
 (Linux) while omitting the principal contribution (GNU).</p>
 </dd>
 
+<dt id="systemd">Systemd plays an important role in the GNU/Linux
+    system as it is today; are we obligated to call it
+    GNU/Systemd/Linux? <span class="anchor-reference-id">(<a 
href="#others">#others</a>)</span></dt>
+
+<dd>
+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).
+</dd>
+
 <dt id="others">Many other projects contributed to
     the system as it is today, but they don't insist on calling it
     XYZ/Linux.  Why should we treat GNU specially? <span 
class="anchor-reference-id">(<a href="#others">#others</a>)</span></dt>
@@ -851,6 +887,16 @@
 say &ldquo;GNU con Linux&rdquo;.</p>
 </dd>
 
+<dt id="pronounce">How is the name &ldquo;GNU/Linux&rdquo;
+pronounced? <span class="anchor-reference-id">(<a 
href="#pronounce">#pronounce</a>)</span></dt>
+<dd>
+<p>
+Please pronounce it as &ldquo;GNU slash Linux.&rdquo;  If you don't pronounce
+the slash, people will think you are saying &ldquo;GNU Linux,&rdquo;
+which is <a href="#whyslash">not a suitable name for the combination</a>.
+</p>
+</dd>
+
 <dt id="whyorder">Why &ldquo;GNU/Linux&rdquo; rather
 than &ldquo;Linux/GNU&rdquo;? <span class="anchor-reference-id">(<a 
href="#whyorder">#whyorder</a>)</span></dt>
 
@@ -1579,7 +1625,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 
2016, 2017, 2018
+<p>Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 
2016, 2017, 2018, 2020
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -1590,7 +1636,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:09 $
+$Date: 2020/01/08 23:59: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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/gnu-linux-faq.zh-cn.po   8 Jan 2020 23:42:02 -0000       1.6
+++ po/gnu-linux-faq.zh-cn.po   8 Jan 2020 23:59:18 -0000       1.7
@@ -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: 2020-01-06 21:55+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
@@ -584,8 +583,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: <dl><dd>
 msgid ""
@@ -1169,8 +1168,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: <dl><dd>
 msgid "No, many components take a lot of work."
@@ -1246,8 +1245,8 @@
 #. type: Content of: <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>"
@@ -1507,8 +1506,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和许多其"
 "他程序。你
的论点不是意味着它们也应该获得荣誉?(但是这æ 
·çš„话名字就长得可笑"
@@ -1904,8 +1903,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"
@@ -2210,8 +2209,8 @@
 #. type: Content of: <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>)</"
@@ -2289,8 +2288,8 @@
 
 #. type: Content of: <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>"
@@ -2404,8 +2403,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: <dl><dd>
 msgid ""
@@ -2620,8 +2619,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: <dl><dd><p>
 msgid ""
@@ -2668,8 +2667,8 @@
 #. type: Content of: <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>"
@@ -2695,8 +2694,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: <dl><dd>
 msgid ""
@@ -2837,8 +2836,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: <dl><dd>
 msgid ""
@@ -2963,8 +2962,8 @@
 #. type: Content of: <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>"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]