www-commits
[Top][All Lists]
Advanced

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

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


From: GNUN
Subject: www/distros distros.zh-cn.html po/distros.zh-cn...
Date: Thu, 10 Aug 2017 08:59:22 -0400 (EDT)

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

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

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.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.zh-cn.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.zh-cn-en.html?cvsroot=www&rev=1.1

Patches:
Index: distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/distros.zh-cn.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- distros.zh-cn.html  26 May 2015 05:58:09 -0000      1.14
+++ distros.zh-cn.html  10 Aug 2017 12:59:21 -0000      1.15
@@ -1,65 +1,89 @@
-<!--#set var="PO_FILE"
- value='<a href="/distros/po/distros.zh-cn.po">
- http://www.gnu.org/distros/po/distros.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/distros/distros.html"
- --><!--#set var="DIFF_FILE" value=""
- --><!--#set var="OUTDATED_SINCE" value="2011-09-20" --><!--#set 
var="ENGLISH_PAGE" value="/distros/distros.en.html" -->
-
- 
+<!--#set var="ENGLISH_PAGE" value="/distros/distros.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" -->
-
 <title>GNU/Linux 发行版 - GNU 工程 - 自由软件基金会</title>
+<link rel="alternate" title="自由的 GNU/Linux 发行版"
+      href="http://www.gnu.org/distros/distros.rss";
+      type="application/rss+xml" />
 
-<!-- Fixed by hand on Feb 15, 2014:
-     - disable top-addendum,
-     - remove #translations,
-     - translist before banner.
-     July 5:
-     - update title and footer,
-     - fix typo in a link.
--->
 <!--#include virtual="/distros/po/distros.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
- 
 <h2>GNU/Linux 发行版</h2>
 
 <p>
-GNU/Linux
-自由系统发行版意味着仅仅包
含和发行自由软件。他们拒绝各种非自由的应用程序,非自由的编程平台,非自由的驱动,非自由的固件&ldquo;blobs&rdquo;,以及å
…¶ä»–各种非自由的软件和文档。如果他们发现无意中加å…
¥äº†è¿™äº›éžè‡ªç”±çš„成分,他们会主动去除它。
+自由的 GNU/Linux
+系统发行版(或&ldquo;发行版&rdquo;)只包
含和发行自由软件。他们拒绝各种非自由的应用程序、非自由的编程平台、非自由的驱动、非自由的固件&ldquo;blobs&rdquo;,以及å
…¶ä»–各种非自由的软件和文档。如果他们发现错误地包
含了这些非自由的成分,他们会主动去除它。
 </p>
 
 <h3 id="freeDistros">自由的 GNU/Linux 发行版</h3>
 <p>
- 我们推荐您使用自由的 GNU/Linux
-系统发行版。它们不包含任何专有软件。这æ 
·ï¼Œæ‚¨å°±èƒ½ç¡®å®šè‡ªå·±æ²¡æœ‰è¿è¡Œä»»ä½•éžè‡ªç”±çš„程序。这张
列表列出了这样的发行版:<br /> <a
-href="/distro/free-distros.html">自由的 GNU/Linux 发行版</a>。</p>
+我们推荐您使用自由的 GNU/Linux
+系统发行版,那些不包含任何专有软件的发行版。这æ 
·ï¼Œæ‚¨å°±èƒ½ç¡®å®šè‡ªå·±æ²¡æœ‰è¿è¡Œä»»ä½•éžè‡ªç”±çš„程序。这张
列表列出了这样的发行版:<br />
+<a href="/distros/free-distros.html"> 自由的 GNU/Linux 发行版</a>。</p>
+
+<p>
+这些现有的发行版全部都在开发方面需要更多的帮助。因
此,如果您希望有效地帮助自由的 GNU/Linux
+发行版,那么我们建议您加å…
¥è¿™äº›çŽ°æœ‰å‘行版的开发队伍,而不是再自己从头做一个新的发行版。
+</p>
+
+<h3 id="freeNonDistros">自由的非GNU发行版</h3>
+<p>
+这些发行版是自由的,但它们和GNU大不相同。它们的用法也和使用GNU/Linux不同。但是,它们和自由的GNU/Linux发行版一æ
 ·æ»¡è¶³è‡ªç”±è½¯ä»¶çš„道德标准。<br />
+<a 
href="/distros/free-non-gnu-distros.html">自由的非GNU发行版</a>。</p>
 
 <p>
-这些现有的发行版大多在开发方面需要更多的帮助。因
此,如果您希望制作一个高效且自由的 GNU/Linux
-发行版,那么我们建议您与å…
¶è‡ªå·±ä»Žå¤´åšä¸€ä¸ªæ–°çš„发行版,不如加å…
¥è¿™äº›çŽ°æœ‰å‘行版的开发队伍。
+这些现有的发行版全部都在开发方面需要更多的帮助。因
此,如果您希望有效地帮助自由的 GNU/Linux
+发行版,那么我们建议您加å…
¥è¿™äº›çŽ°æœ‰å‘行版的开发队伍,而不是再自己从头做一个新的发行版。
 </p>
 
 <h3 id="distroGuidelines">自由发行版指南</h3>
 <p>
-这里列出一些可能会使得一个发行版无
法成为自由发行版的一些原因:<br /> <a
-href="/distros/free-system-distribution-guidelines.html">自由系统发行版指南</a>。</p>
+这里列出一些可能会使得一个发行版无
法成为自由发行版的一些原因:<br />
+<a 
href="/distros/free-system-distribution-guidelines.html">自由发行版指南</a>。</p>
 
 <h3 id="otherDistros">常见发行版</h3>
 <p>
-大多数常见的 GNU/Linux 发行版并不能满足我们å…
³äºŽè‡ªç”±çš„要求。这篇文章为您列举了它们的一些问题:<br 
/><a
-href="/distros/common-distros.html">为什么我们不赞同很多著名的 
GNU/Linux 发行版</a></p>
+大多数常见的和知名的 GNU/Linux 发行版并不能满足我们å…
³äºŽè‡ªç”±çš„要求。这篇文章为您列举了它们的一些问题:<br />
+<a 
href="/distros/common-distros.html">为什么我们不能支持众多知名的 
GNU/Linux 发行版</a>。</p>
 
 <p>
-我们呼吁这些常见常见发行版的开发人员把å…
¶ä¸­éžè‡ªç”±çš„部分移除,还用户一个完全自由的系统。
+我们呼吁这些发行版的开发人员把å…
¶ä¸­éžè‡ªç”±çš„部分移除,还用户一个完全自由的系统。
 </p>
 
+<h3 id="optionallyFree">自由作为可选项是不够的</h3>
+<p>
+有些GNU/Linux发行版给用户一个选项,用来安装仅包
含自由软件的系统。您请看:<br />
+<a 
href="/distros/optionally-free-not-enough.html">为什么自由作为可选项是不够的。</a></p>
+
+<h3 id="whyImportant">这为什么重要?</h3>
+<p>
+当一个GNU/Linux发行版包
含了非自由软件,它就有两个问题:</p>
+
+<ul>
+<li>如果你安装了它,你就可能安装
和使用了非自由软件。</li>
+<li>它为人们指引了错误的方向。</li>
+</ul>
 
-<div style="font-size: small;">
+<p>
+第一个问题是直接的:它影响了在该发行版上安装
了非自由软件的用户。然而,第二个问题尤为严重,因
为它影响了整个社区。
+</p>
+
+<p>
+非自由发行版的开发者
并不会说:&ldquo;很抱歉,我们的发行版包
含了非自由软件。我们并不想包含它们。希望下个版本是完å…
¨è‡ªç”±çš„。&rdquo;如果他们做到了,影响还不会太坏。
+</p>
+
+<p>
+然而,他们一般会说非自由软件是å…
¶ç³»ç»Ÿçš„一个有益的功能;他们的目的是&ldquo;给用户最好的体验&rdquo;等等,而非自由。换句话说,他们引导用户更å
…³æ³¨èˆ’适而不是自由&mdash;这恰恰和自由软件运动的主要目æ 
‡èƒŒé“而驰。
+</p>
+
+<p>
+这就是我们不能支持这些不传达自由理念的发行版的原因
。它们不教育人们重视自由的价值,因此我们强烈å…
³æ³¨è¿™ä¸€ç‚¹ã€‚
+</p>
+
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
@@ -70,37 +94,64 @@
 <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>我们尽力提供对本页面精确、优质的翻译,但是我们无
法保证完美。
-请把您的建议和意见发送到 <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
-<p>请参看 <a 
href="/server/standards/README.translations.html">翻译手册</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>
+<!-- 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; 2002, 2003, 2007 自由软件基金会.
-</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>
-<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<!-- 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
+     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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     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>本页面使用<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+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.-->
-Deng, Nan</div>
+<b>翻译</b>:Nan Deng,2010。
+<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 -->
-更新:
+<p class="unprintable"><!-- timestamp start -->
+最后更新:
 
-$Date: 2015/05/26 05:58:09 $
+$Date: 2017/08/10 12:59:21 $
 
 <!-- timestamp end -->
 </p>

Index: po/distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/distros.zh-cn.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/distros.zh-cn.po 10 Aug 2017 12:39:53 -0000      1.17
+++ po/distros.zh-cn.po 10 Aug 2017 12:59:22 -0000      1.18
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-09-20 12:25-0300\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>

Index: po/distros.zh-cn-en.html
===================================================================
RCS file: po/distros.zh-cn-en.html
diff -N po/distros.zh-cn-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/distros.zh-cn-en.html    10 Aug 2017 12:59:22 -0000      1.1
@@ -0,0 +1,179 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>GNU/Linux Distros
+- GNU Project - Free Software Foundation</title>
+<link rel="alternate" title="Free GNU/Linux distributions"
+      href="http://www.gnu.org/distros/distros.rss";
+      type="application/rss+xml" />
+<!--#include virtual="/distros/po/distros.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>GNU/Linux Distros</h2>
+
+<p>
+Free GNU/Linux system distributions (or &ldquo;distros&rdquo;) 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
+and documentation.  If they discover that by mistake some had been
+included, they remove it.
+</p>
+
+<h3 id="freeDistros">Free GNU/Linux Distros</h3>
+<p>
+We recommend that you use a free GNU/Linux system distribution, one that does 
+not include proprietary software at all.  That way you can be sure that you are
+not installing any non-free programs. Here is our list of such distros:<br />
+<a href="/distros/free-distros.html">
+Free GNU/Linux distributions</a>.</p>
+
+<p>
+All of these existing distros could use more development help.  Thus,
+if you want to make an effective contribution to free GNU/Linux
+distributions, we suggest that you join the development of an existing
+free distro rather that starting a new free distro.
+</p>
+
+<h3 id="freeNonDistros">Free Non-GNU Distros</h3>
+<p>
+These system distributions are free but quite different from GNU.
+Using them is not similar to using GNU/Linux.  However, they satisfy
+the same ethical criteria that we apply to GNU/Linux distros.<br />
+<a href="/distros/free-non-gnu-distros.html">
+Free Non-GNU distributions</a>.</p>
+
+<p>
+All of these existing distros could use more development help.  Thus,
+if you want to make an effective contribution in this area, we suggest
+that you join the development of an existing free distro rather that
+starting a new free distro.
+</p>
+
+<h3 id="distroGuidelines">Free Distro Guidelines</h3>
+<p>
+Here is the list of problems that can prevent a distro from being
+considered entirely free:<br />
+<a href="/distros/free-system-distribution-guidelines.html">
+Guidelines for free system distributions</a>.</p>
+
+<h3 id="otherDistros">Common Distros</h3>
+<p>
+Many common and well-known GNU/Linux software distributions don't meet
+our guidelines. You can read about their problems here:<br />
+<a href="/distros/common-distros.html">
+Why we can't endorse many well-known GNU/Linux distros</a>.</p>
+
+<p>
+We appeal to the developers of these distros to remove the non-free parts and
+thus make them entirely free software.
+</p>
+
+<h3 id="optionallyFree">Optionally Free Is Not Enough</h3>
+<p>
+Some GNU/Linux distributions allow the user the option of installing only free 
software. You can read:<br />
+<a href="/distros/optionally-free-not-enough.html">
+Why optionally free is not enough.</a></p>
+
+<h3 id="whyImportant">Why Is This Important?</h3>
+<p>
+When a GNU/Linux distro includes nonfree software, it causes two kinds
+of problems:</p>
+
+<ul>
+<li>If you install it, you may install and use nonfree software.</li>
+<li>It gives people the wrong idea of what the goal is.</li>
+</ul>
+
+<p>
+The first problem is a direct problem: it affects users of the
+distro, if they install the nonfree software.  However, the second
+problem is the more important one, because it affects the community as
+a whole.
+</p>
+
+<p>
+The developers of nonfree distros don't say, &ldquo;We apologize for
+the presence of nonfree components in our distribution.  We don't know
+what possessed us to include them.  We hope that next release we will
+keep our minds on freedom.&rdquo;  If they did, they would have less
+of a bad influence.
+</p>
+
+<p>
+Instead, they generally present the nonfree software in their systems
+as a positive feature; they say that their goal is &ldquo;the best
+possible user experience&rdquo;, or something like that, rather than
+freedom.  In other words, they lead people to place convenience above
+freedom &mdash; working directly against our campaign to make freedom
+the primary goal.
+</p>
+
+<p>
+The fact that these distros don't deliver freedom is why we don't
+endorse them.  That they teach people not to value freedom is why
+we are strongly concerned about this issue.
+</p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<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>
+
+<!-- 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
+     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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     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>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>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2017/08/10 12:59:22 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>



reply via email to

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