www/distros optionally-free-not-enough.zh-cn.ht...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/04/29 04:32:00

Modified files:
        distros        : optionally-free-not-enough.zh-cn.html 
        distros/po     : optionally-free-not-enough.zh-cn-en.html 
                         optionally-free-not-enough.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/optionally-free-not-enough.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/optionally-free-not-enough.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/optionally-free-not-enough.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: optionally-free-not-enough.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/optionally-free-not-enough.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- optionally-free-not-enough.zh-cn.html       19 Aug 2018 09:57:57 -0000      
1.2
+++ optionally-free-not-enough.zh-cn.html       29 Apr 2021 08:32:00 -0000      
1.3
@@ -12,19 +12,25 @@
 
 <p>我们拒绝推荐某些发行版，它们为用户提供只安装
自由软件的选项。有了这个可选项，足够看重自由并且思考了此问题的用户会把这些发行版做成完å
…¨è‡ªç”±çš„发行版。</p>
 
-<p>提供了这个选项的发行版明显比没有这个选项的发行版要好。但是该选项一般而言并不能使此发行版成为被推荐的发行版。毕竟，我们社区的大多数人并没有意识到这个问题。我们不能ä»
…ä»…å› 
为发行版有了一个自由的选项就期望社区的大多数人能够拒绝非自由软件。</p>
+<p>提供了这个选项的发行版明显比没有这个选项的发行版要好。但是该选项一般而言并不能使此发行版成为被推荐的发行版。毕竟，我们社区的大多数人并没有意识到这个问题。我们不能ä»
…ä»…å› 
为发行版有了一个自由的选项就期望社区的大多数人能够拒绝非自由软件。我们不想引导用户安è£
…非自由软件。我们已经选择的方式就是让安装
非自由软件成为不可能。</p>
 
 
<p>所以如果我们考虑是否会推荐一个发行版，那么我们需要考虑要向谁推荐。比如，可能会是：</p>
 
 <ol>
 <li>ç‰¹å®šçš„å¿ è¯šäºŽè‡ªç”±è½¯ä»¶æ”¯æŒè€…ï¼Œæˆ‘ä»¬çŸ¥é“ä»–ä»¬ä¼šåŠªåŠ›é¿å…
ä½¿ç”¨éžè‡ªç”±è½¯ä»¶ã€‚</li>
 
-<li>一个庞大的人群，也许就是普通大众。</li>
+<li>一个庞大的、多元化的人群，也许就是普通大众。</li>
 </ol>
 
-<p>å¯¹å‰ä¸€ç§æƒ…å†µï¼Œæˆ‘ä»¬å¯ä»¥æŽ¨èå¸¦æœ‰æ¸…æ™°å’Œå¯é 
的拒绝非自由软件手段的发行版。</p>
+<p>å¯¹ç¬¬ä¸€ç§äººç¾¤ï¼Œæˆ‘ä»¬å¯ä»¥ç§ä¸‹æŽ¨èå¸¦æœ‰æ¸…æ™°å’Œå¯é 
的拒绝非自由软件手段的发行版。</p>
 
-<p>然而，要向普通大众推荐发行版，我们就要坚持我们现在使用的准则：明确承诺不提供或不推荐任何非自由软件。只有这æ
 ·ï¼Œæˆ‘们才能确保这些发行版不会引导大众安装
任何的非自由软件。</p>
+<p>然而，要向普通大众推荐发行版，我们就要坚持（我们一直在坚持）我们现在使用的准则：明确承诺不提供或不推荐任何非自由软件。只有这æ
 ·ï¼Œæˆ‘们才能确保这些发行版不会引导大众安装
任何的非自由软件。</p>
+
+<p>在电脑安装活动中应该向公众推荐或者该为公众安装
ä»€ä¹ˆæ ·çš„å‘è¡Œç‰ˆå‘¢ï¼Ÿä»Žé“ä¹‰ä¸Šçœ‹ï¼Œå®‰è£…
活动不应该推荐或安装
非自由程序。然而，人们带来的电脑需要非自由的驱动或固件才能运行&mdash;&mdash;没有这些程序，他们会失望而去，并认为
+GNU/Linux 不行。</p>
+
+<p>我们为此想了一个平衡两方的点子：安装活动安装
一个自由的发行版，然后 <a
+href="/philosophy/install-fest-devil.html">&ldquo;魔鬼&rdquo;（带有魔鬼面å
…·çš„人）安装必要的非自由驱动或固件</a>。</p>
 
 <div class="translators-notes">
 
@@ -62,7 +68,7 @@
 
 <!-- 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
+     be under CC BY-ND 4.0.  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
@@ -76,23 +82,23 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2021 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>
+<p>本页面使用 <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International 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>：<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，2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/08/19 09:57:57 $
+$Date: 2021/04/29 08:32:00 $
 
 <!-- timestamp end -->
 </p>

Index: po/optionally-free-not-enough.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/optionally-free-not-enough.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/optionally-free-not-enough.zh-cn-en.html 16 Aug 2018 13:36:05 -0000      
1.1
+++ po/optionally-free-not-enough.zh-cn-en.html 29 Apr 2021 08:32:00 -0000      
1.2
@@ -8,32 +8,48 @@
 <p>There are distros we decline to recommend that offer the user the 
 option of installing only free software.  Given that option, a user 
 who values freedom strongly enough, and thinks about the issue, can 
-make those distros respect her freedom.</p>
+make those distros respect per freedom.</p>
 
-<p>A distro that offers that option is clearly better than one that fails 
-to offer that option.  But that option does not make the distro ok to 
-recommend in general.  After all, most people in our community are not 
-conscious of this issue.  We cannot expect most of them to reject 
-nonfree software just because the distro offers a way to do so.</p>
-
-<p>So if we are considering whether to recommend a distro, 
-we need to consider who we would recommend it to.  For instance, 
-it could be:</p>
+<p>A distro that offers that option is clearly better than one that
+fails to offer that option.  But that option does not make the distro
+ok to recommend in general.  After all, most people in our community
+are not conscious of this issue.  We cannot expect most of them to
+choose to reject nonfree software just because the distro offers a way
+to do so.  And we don't want to lead people to install nonfree
+software.  We've chosen our practices to make that unlikely.</p>
+
+<p>Thus, our decision about recommending a distro depends on who we
+would recommend it to.  For instance, it could be:</p>
 
 <ol>
 <li>Specific committed free software supporters that we know will
 make an effort to avoid nonfree software.</li>
 
-<li>A large group such as perhaps the general public.</li>
+<li>A large and diverse group, such as, perhaps. the public in general.</li>
 </ol>
 
-<p>For the first case, we could recommend the distro if the distro 
-provides a clear and reliable way to reject nonfree software.</p>
-
-<p>However, for recommending a distro to the general public, we need to 
-insist on the criteria we actually use: an explicit commitment not to 
-offer or suggest any nonfree programs.  That way, we know the distro 
-won't lead the public to install any of those.</p>
+<p>We could recommend the distro privately to people in that first
+group if the distro provides a clear and reliable way to reject
+nonfree software.</p>
+
+<p>However, when it comes to recommending a distro to the general
+public, we should insist (and we do insist) on an explicit commitment
+not to offer or suggest any nonfree programs.  That way, we know our
+recommendation of that distro won't lead the public to install any of
+those.</p>
+
+<p>What distros should an install fest recommend or install for the
+public?  On moral grounds, an install fest should not recommend or
+install nonfree programs.  However, people will bring computers that
+need nonfree drivers or firmware blobs in order to run at
+all&mdash;without those, they will go away disappointed and consider
+GNU/Linux a failure.</p>
+
+<p>We thought of an idea for how to reconcile these two needs: the
+install fest installs a free distro,
+then <a href="/philosophy/install-fest-devil.html">&ldquo;the
+devil&rdquo; (a person wearing a devil mask) offers to install the
+nonfree drivers or blobs that machine needs</a>.</p>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -67,7 +83,7 @@
 
 <!-- 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
+     be under CC BY-ND 4.0.  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
@@ -82,17 +98,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2021 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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/08/16 13:36:05 $
+$Date: 2021/04/29 08:32:00 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/optionally-free-not-enough.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/optionally-free-not-enough.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/optionally-free-not-enough.zh-cn.po      29 Apr 2021 08:22:07 -0000      
1.6
+++ po/optionally-free-not-enough.zh-cn.po      29 Apr 2021 08:32:00 -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: 2021-04-29 04:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Optionally Free Is Not Enough - GNU Project - Free Software Foundation"