www/distros common-distros.zh-tw.html po/common...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/11/17 08:57:57

Modified files:
        distros        : common-distros.zh-tw.html 
        distros/po     : common-distros.zh-tw-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.zh-tw.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw-diff.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: common-distros.zh-tw.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-tw.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- common-distros.zh-tw.html   2 Sep 2018 16:58:06 -0000       1.13
+++ common-distros.zh-tw.html   17 Nov 2018 13:57:57 -0000      1.14
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/distros/po/common-distros.zh-tw.po">
+ https://www.gnu.org/distros/po/common-distros.zh-tw.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/distros/common-distros.html"
+ --><!--#set var="DIFF_FILE" value="/distros/po/common-distros.zh-tw-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2018-09-18" --><!--#set 
var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
 
 <!--#include virtual="/server/header.zh-tw.html" -->
 <!-- Parent-Version: 1.84 -->
@@ -11,6 +16,7 @@
 
 <!--#include virtual="/distros/po/common-distros.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
+<!--#include virtual="/server/outdated.zh-tw.html" -->
 <h2>解釋我們為何不讚許其他系統</h2>
 
 <!--#include virtual="/licenses/fsf-licensing.zh-tw.html" -->
@@ -266,7 +272,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2018/09/02 16:58:06 $
+$Date: 2018/11/17 13:57:57 $
 
 <!-- timestamp end -->
 </p>

Index: po/common-distros.zh-tw-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/common-distros.zh-tw-diff.html   2 Mar 2018 06:35:46 -0000       1.1
+++ po/common-distros.zh-tw-diff.html   17 Nov 2018 13:57:57 -0000      1.2
@@ -70,6 +70,10 @@
 their kernel, Linux.  Arch also has no policy about not distributing
 nonfree software through their normal channels.&lt;/p&gt;
 
+&lt;p&gt;Instead of this nonfree distribution, use &lt;a
+href="/distros/free-distros.html#for-pc"&gt;Parabola&lt;/a&gt;, the free distro
+which is made from it.&lt;/p&gt;
+
 &lt;h3 id="Canaima"&gt;Canaima&lt;/h3&gt;
 
 &lt;p&gt;Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -116,6 +120,11 @@
 &lt;p&gt;Debian's wiki includes pages about installing nonfree 
firmware.&lt;/p&gt;
 &lt;!-- https://wiki.debian.org/ATIProprietary --&gt;
 
+&lt;p&gt;Instead of this nonfree distribution, use one of the free distros
+which are made from it: &lt;a
+href="/distros/free-distros.html#for-pc"&gt;gNewSense&lt;/a&gt;, and &lt;a
+href="/distros/free-distros.html#for-pc"&gt;PureOS&lt;/a&gt;.&lt;/p&gt;
+
 &lt;h3 id="Fedora"&gt;Fedora&lt;/h3&gt;
 
 &lt;p&gt;Fedora does have a clear policy about what can be included in the
@@ -225,12 +234,27 @@
 it.  However, that is not a substantive issue about Ubuntu as a
 GNU/Linux distribution.&lt;/p&gt;
 
+&lt;p&gt;Instead of this nonfree distribution, use one of the free distros
+which are made from it: &lt;a
+href="/distros/free-distros.html#for-pc"&gt;Dyne:bolic&lt;/a&gt;, &lt;a
+href="/distros/free-distros.html#for-pc"&gt;Trisquel&lt;/a&gt;, and &lt;a
+href="/distros/free-distros.html#for-pc"&gt;Ututo S&lt;/a&gt;.&lt;/p&gt;
+
 &lt;h2&gt;Some Other Distros&lt;/h2&gt;
 
 &lt;p&gt;Here we discuss some well-known or significant non-GNU/Linux system
 distros that do not qualify as free.&lt;/p&gt;
 
-&lt;h3 id="BSD"&gt;BSD systems&lt;/h3&gt;
+&lt;h3 <span class="inserted"><ins><em>id="Android"&gt;Android&lt;/h3&gt;
+
+&lt;p&gt;&lt;a 
href="/philosophy/android-and-users-freedom.html"&gt;Android&lt;/a&gt; as
+released by Google contains many nonfree parts as well as many free
+parts.  Most of the free parts are covered by a pushover license (not
+&lt;a href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;), so manufacturers 
that
+distribute Android in a product sometimes make those parts nonfree as
+well.&lt;/p&gt;
+
+&lt;h3</em></ins></span> id="BSD"&gt;BSD systems&lt;/h3&gt;
 
 &lt;p&gt;FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining
 nonfree programs in their ports system.  In addition, their kernels
@@ -245,10 +269,12 @@
 &ldquo;contain no blobs&rdquo;, it causes a misunderstanding.  They are not 
 talking about firmware blobs.&lt;/p&gt;
 
-&lt;p&gt;No BSD distribution has policies against proprietary binary-only
-firmware that might be loaded even by free drivers.&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;No</strong></del></span>
 
-&lt;h3 id="Haiku"&gt;Haiku&lt;/h3&gt;
+<span class="inserted"><ins><em>&lt;p&gt;None of those</em></ins></span> BSD 
<span class="removed"><del><strong>distribution</strong></del></span> <span 
class="inserted"><ins><em>distributions</em></ins></span> has policies against 
proprietary
+binary-only firmware that might be loaded even by free drivers.&lt;/p&gt;
+
+&lt;h3 <span class="removed"><del><strong>id="Haiku"&gt;Haiku&lt;/h3&gt;
 
 &lt;p&gt;Haiku includes some software that you're not allowed to modify.  It
 also includes nonfree firmware blobs.&lt;/p&gt;
@@ -262,11 +288,21 @@
 distribute Android in a product sometimes make those parts nonfree as
 well.&lt;/p&gt;
 
-&lt;h3 <span class="inserted"><ins><em>id="ChromeOS"&gt;Chrome OS&lt;/h3&gt;
+&lt;h3</strong></del></span> id="ChromeOS"&gt;Chrome OS&lt;/h3&gt;
 
 &lt;p&gt;The central part of Chrome OS is the nonfree Chrome browser.
 It may contain other nonfree software as well.&lt;/p&gt;
 
+&lt;h3 <span class="inserted"><ins><em>id="e"&gt;/e/&lt;/h3&gt;
+
+&lt;p&gt;/e/ (formerly eelo) is a modified version of Android,
+which contains nonfree libraries.&lt;/p&gt;
+
+&lt;h3 id="Haiku"&gt;Haiku&lt;/h3&gt;
+
+&lt;p&gt;Haiku includes some software that you're not allowed to modify.  It
+also includes nonfree firmware blobs.&lt;/p&gt;
+
 &lt;h3</em></ins></span> id="LineageOS"&gt;LineageOS&lt;/h3&gt;
 
 &lt;p&gt;LineageOS (formerly CyanogenMod) is a modified version of Android,
@@ -326,7 +362,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, 2016, <span 
class="removed"><del><strong>2017</strong></del></span> <span 
class="inserted"><ins><em>2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -336,7 +372,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/03/02 06:35:46 $
+$Date: 2018/11/17 13:57:57 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;