www-commits
[Top][All Lists]
Advanced

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

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


From: GNUN
Subject: www distros/common-distros.zh-tw.html distros/p...
Date: Sat, 12 Jan 2019 11:28:54 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     19/01/12 11:28:54

Modified files:
        distros        : common-distros.zh-tw.html 
        distros/po     : common-distros.zh-tw-en.html 
                         common-distros.zh-tw.po 
        people         : past-webmasters.zh-cn.html 
        people/po      : past-webmasters.zh-cn-en.html 
                         past-webmasters.zh-cn.po 

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.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/people/past-webmasters.zh-cn.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/past-webmasters.zh-cn-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/past-webmasters.zh-cn.po?cvsroot=www&r1=1.63&r2=1.64

Patches:
Index: distros/common-distros.zh-tw.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-tw.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- distros/common-distros.zh-tw.html   1 Dec 2018 18:29:00 -0000       1.15
+++ distros/common-distros.zh-tw.html   12 Jan 2019 16:28:53 -0000      1.16
@@ -1,12 +1,7 @@
-<!--#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 -->
+<!-- Parent-Version: 1.86 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>解釋我們為何不讚許其他系統 - GNU 專案 - 
自由軟體基金會</title>
@@ -16,7 +11,6 @@
 
 <!--#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" -->
@@ -45,11 +39,11 @@
      alphabetically, then all the non-GNU systems alphabetically. -->
 <h3 id="Arch">Arch GNU/Linux</h3>
 
-<p>Arch 有常見的兩個問題:沒有清楚的政策表明可以包
含怎樣的軟體,而且它們的內核心 Linux 中搭載非自由的 
blob。Arch
-也沒有政策表示不透過其一般頻道散布非自由軟體。</p>
+<p>Arch 
並沒有政策反對以一般管道散布非自由軟體,而且他們的 
Linux 核心附有非自由的 blob。</p>
 
-<p>請改用 <a href="/distros/free-distros.html#for-pc">Parabola</a>
-來取代這套非自由的散布版。Parabola 是以 Arch 
做成的自由散布版。</p>
+<p>請改用 <a href="/distros/free-distros.html#for-pc">Parabola</a> 或<a
+href="https://www.hyperbola.info/?gnu-free-stros-page";>Hyperbola</a>
+來取代這套非自由的散布版。這兩套是以 Arch 
做成的自由散布版。</p>
 
 <h3 id="Canaima">Canaima</h3>
 
@@ -74,9 +68,9 @@
 <p>此外還有一個「contrib」軟體庫,裡面的軟體包
雖然屬於自由軟體,但它們之中有些存在卻是為了載å…
¥å¦å¤–獨立散布的專有程式。這也沒有從主要的 Debian
 散布版中完全隔離開來。</p>
 
-<p>先前的 Debian 發行版本中,內核心 Linux 中包含非自由的 
blob。在2011年2月所發行的 Debian 6.0
-(&ldquo;squeeze&rdquo;) 之後,這些 blob
-已經從主要的散布版中移出,以獨立的軟體包
放到非自由軟體庫中。然而,這個問題依然部分存在:某些æƒ
…
況下,安裝程式會為機器上的周邊設備推薦這些非自由的韌體檔案。</p>
+<p>Debian 是未受讚許散布版中,唯一一個將內核心的非自由 
blob 
保存在主要散布管道之外的散布版。不過,這還是有部份問題。Debian
+將非自由的韌體檔案放在 nofree 
軟體庫中,而這個軟體庫又在 debian.org
+中的文件提及引用,甚至安裝程式在某些情
況下會推薦機器的周邊設備採用這些韌體以求正常運作。</p>
 
 <p>Debian 的 wiki 頁面中載有安裝非自由韌體的相關資訊。</p>
 
@@ -149,7 +143,7 @@
 <a href="#trans1">[按1]</a>。</p>
 
 <p>Ubuntu <a
-href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>似乎å
…è¨±å•†æ¥­æ€§å†æ•£å¸ƒé™„帶商標的完å…
¨ç›¸åŒå‰¯æœ¬</a>;唯有修改過的版本需要移除該å…
¬å¸çš„商標,這對於商標而言是個可接受的政策。從該é 
é¢ä¸­å†ç¹¼çºŒå¾€ä¸‹è®€ï¼Œå¯ä»¥çœ‹åˆ°æœ‰é—œã€ŒUbuntu
+href="https://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>似乎å
…è¨±å•†æ¥­æ€§å†æ•£å¸ƒé™„帶商標的完å…
¨ç›¸åŒå‰¯æœ¬</a>;唯有修改過的版本需要移除該å…
¬å¸çš„商標,這對於商標而言是個可接受的政策。從該é 
é¢ä¸­å†ç¹¼çºŒå¾€ä¸‹è®€ï¼Œå¯ä»¥çœ‹åˆ°æœ‰é—œã€ŒUbuntu
 專利」的模糊、不理想論述,沒有給予足夠清
晰的細節表明何謂侵犯專利或未侵犯。</p>
 
 <p>該頁面中使用令人誤解的<a
@@ -165,6 +159,13 @@
 
 <p>這裡我們討論一些著名或重要的非 GNU/Linux 
系統散布版,它們也不屬於自由之列。</p>
 
+<h3 id="Android">Android</h3>
+
+<p>Google 所發行的 <a 
href="/philosophy/android-and-users-freedom.html">Android</a>
+當中有許多非自由的部分,還有許多自由的部分。絕大多數的自由部分採用聽從式
 (pushover) 授權(非<a
+href="/copyleft/copyleft.html">著作傳</a>式),這樣一來在產品中散布
 Android
+的製造商有時就會將這些部分轉為非自由軟體。</p>
+
 <h3 id="BSD">BSD 系統</h3>
 
 <p>FreeBSD、NetBSD 和 OpenBSD 的 ports 系統中皆包
含非自由程式的獲取指示。此外,它們的內核心也包
含非自由的韌體 blob。</p>
@@ -176,20 +177,17 @@
 
 <p>任何的 BSD 
散布版都沒有政策反對專有授權的獨有二進位韌體,而這些韌體甚至可能被自由的é©
…動程式載入。</p>
 
-<h3 id="Haiku">Haiku</h3>
+<h3 id="ChromeOS">Chrome OS</h3>
 
-<p>Haiku 包含一些不允許你修改的軟體。它也包
含非自由的韌體 blob。</p>
+<p>Chrome OS 的主要部分是非自由的 Chrome 瀏覽器。它也包含å…
¶ä»–非自由的軟體。</p>
 
-<h3 id="Android">Android</h3>
+<h3 id="e">/e/</h3>
 
-<p>Google 所發行的 <a 
href="/philosophy/android-and-users-freedom.html">Android</a>
-當中有許多非自由的部分,還有許多自由的部分。絕大多數的自由部分採用聽從式
 (pushover) 授權(非<a
-href="/copyleft/copyleft.html">著作傳</a>式),這樣一來在產品中散布
 Android
-的製造商有時就會將這些部分轉為非自由軟體。</p>
+<p>/e/(以前稱為 eelo)是修改版的 Android,其包
含了非自由的函式庫。</p>
 
-<h3 id="ChromeOS">Chrome OS</h3>
+<h3 id="Haiku">Haiku</h3>
 
-<p>Chrome OS 的主要部分是非自由的 Chrome 瀏覽器。它也包含å…
¶ä»–非自由的軟體。</p>
+<p>Haiku 包含一些不允許你修改的軟體。它也包
含非自由的韌體 blob。</p>
 
 <h3 id="LineageOS">LineageOS</h3>
 
@@ -255,7 +253,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software
+Foundation, Inc.</p>
 
 <p>本頁面採用<a rel="license"
 href="https://creativecommons.org/licenses/by-nd/4.0/deed.zh_TW";>創用 CC
@@ -265,18 +264,21 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<b>翻譯</b>:曾政嘉
-<a href="mailto:zerngjia (at) member (dot) fsf (dot) org">&lt;zerngjia (at)
-member (dot) fsf (dot) org&gt;</a>, 2017.</div>
+<b>翻譯</b>:<br />
+曾政嘉<a href="mailto:zerngjia (at) member (dot) fsf (dot) org">&lt;zerngjia
+(at) member (dot) fsf (dot) org&gt;</a>, 2017.<br />
+黃柏諺<a href="mailto:s8321414 (at) gmail (dot) com">&lt;s8321414 (at) gmail
+(dot) com&gt;</a>, 2019.</div>
 
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2018/12/01 18:29:00 $
+$Date: 2019/01/12 16:28:53 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: distros/po/common-distros.zh-tw-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- distros/po/common-distros.zh-tw-en.html     2 Sep 2018 09:28:06 -0000       
1.5
+++ distros/po/common-distros.zh-tw-en.html     12 Jan 2019 16:28:53 -0000      
1.6
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.86 -->
 <title>Explaining Why We Don't Endorse Other Systems - GNU Project - Free 
Software Foundation</title>
 <link rel="alternate" title="Free GNU/Linux distributions"
       href="http://www.gnu.org/distros/distros.rss";
@@ -53,14 +53,14 @@
 
 <h3 id="Arch">Arch GNU/Linux</h3>
 
-<p>Arch has the two usual problems: there's no clear policy
-about what software can be included, and nonfree blobs are shipped with
-their kernel, Linux.  Arch also has no policy about not distributing
-nonfree software through their normal channels.</p>
+<p>Arch has no policy against distributing nonfree software through
+their normal channels, and nonfree blobs are shipped with their kernel,
+Linux.</p>
 
 <p>Instead of this nonfree distribution, use <a
-href="/distros/free-distros.html#for-pc">Parabola</a>, the free distro
-which is made from it.</p>
+href="/distros/free-distros.html#for-pc">Parabola</a> or <a
+href="https://www.hyperbola.info/?gnu-free-stros-page";>Hyperbola</a>,
+free distros which are made from it.</p>
 
 <h3 id="Canaima">Canaima</h3>
 
@@ -98,12 +98,11 @@
 proprietary programs.  This too is not thoroughly separated from the
 main Debian distribution.</p>
 
-<p>Previous releases of Debian included nonfree blobs with Linux, the
-kernel.  With the release of Debian 6.0 (&ldquo;squeeze&rdquo;) in
-February 2011, these blobs have been moved out of the main
-distribution to separate packages in the nonfree repository.  However,
-the problem partly remains: the installer in some cases recommends
-these nonfree firmware files for the peripherals on the machine.</p>
+<p>Debian is the only common non-endorsed distribution to keep nonfree
+blobs out of its main distribution. However, the problem partly remains.
+The nonfree firmware files live in Debian's nonfree repository, which
+is referenced in the documentation on debian.org, and the installer in
+some cases recommends them for the peripherals on the machine.</p>
 
 <p>Debian's wiki includes pages about installing nonfree firmware.</p>
 <!-- https://wiki.debian.org/ATIProprietary -->
@@ -205,7 +204,7 @@
 to tell which ones are free</a> since proprietary programs for
 download at no charge are labelled &ldquo;free&rdquo;.</p>
 
-<p>Ubuntu <a 
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
+<p>Ubuntu <a 
href="https://www.ubuntu.com/legal/intellectual-property-policy#your-use-of-ubuntu";>appears
 to permit commercial redistribution of exact copies with the
 trademarks</a>; removal of the trademarks is required only for
 modified versions.  That is an acceptable policy for trademarks.  The
@@ -233,6 +232,15 @@
 <p>Here we discuss some well-known or significant non-GNU/Linux system
 distros that do not qualify as free.</p>
 
+<h3 id="Android">Android</h3>
+
+<p><a href="/philosophy/android-and-users-freedom.html">Android</a> 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
+<a href="/licenses/copyleft.html">copyleft</a>), so manufacturers that
+distribute Android in a product sometimes make those parts nonfree as
+well.</p>
+
 <h3 id="BSD">BSD systems</h3>
 
 <p>FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining
@@ -248,27 +256,23 @@
 &ldquo;contain no blobs&rdquo;, it causes a misunderstanding.  They are not 
 talking about firmware blobs.</p>
 
-<p>No BSD distribution has policies against proprietary binary-only
-firmware that might be loaded even by free drivers.</p>
+<p>None of those BSD distributions has policies against proprietary
+binary-only firmware that might be loaded even by free drivers.</p>
 
-<h3 id="Haiku">Haiku</h3>
+<h3 id="ChromeOS">Chrome OS</h3>
 
-<p>Haiku includes some software that you're not allowed to modify.  It
-also includes nonfree firmware blobs.</p>
+<p>The central part of Chrome OS is the nonfree Chrome browser.
+It may contain other nonfree software as well.</p>
 
-<h3 id="Android">Android</h3>
+<h3 id="e">/e/</h3>
 
-<p><a href="/philosophy/android-and-users-freedom.html">Android</a> 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
-<a href="/licenses/copyleft.html">copyleft</a>), so manufacturers that
-distribute Android in a product sometimes make those parts nonfree as
-well.</p>
+<p>/e/ (formerly eelo) is a modified version of Android,
+which contains nonfree libraries.</p>
 
-<h3 id="ChromeOS">Chrome OS</h3>
+<h3 id="Haiku">Haiku</h3>
 
-<p>The central part of Chrome OS is the nonfree Chrome browser.
-It may contain other nonfree software as well.</p>
+<p>Haiku includes some software that you're not allowed to modify.  It
+also includes nonfree firmware blobs.</p>
 
 <h3 id="LineageOS">LineageOS</h3>
 
@@ -329,7 +333,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software 
Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -339,10 +343,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/09/02 09:28:06 $
+$Date: 2019/01/12 16:28:53 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: distros/po/common-distros.zh-tw.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34

Index: people/past-webmasters.zh-cn.html
===================================================================
RCS file: /web/www/www/people/past-webmasters.zh-cn.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- people/past-webmasters.zh-cn.html   1 Jan 2019 12:29:09 -0000       1.18
+++ people/past-webmasters.zh-cn.html   12 Jan 2019 16:28:54 -0000      1.19
@@ -270,7 +270,7 @@
 
           <dd>GNU工程的发起者
,自由软件基金会的主席。他也为网站工作。</dd>
 
-          <dt><a href="https://rmmm.name";><strong>Robert Musial</strong></a> <a
+          <dt><a href="https://r.musial.xyz";><strong>Robert 
Musial</strong></a> <a
 href="mailto:address@hidden";>&lt;rmmm<b>@</b>gnu.org&gt; </a></dt>
 
           <dd><a href="/">GNU</a>网管,自2003年就是<a 
href="http://www.fsf.org/";>FSF</a>的<a
@@ -375,12 +375,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>:刘昭宏,2001。<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,2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/01/01 12:29:09 $
+$Date: 2019/01/12 16:28:54 $
 
 <!-- timestamp end -->
 </p>

Index: people/po/past-webmasters.zh-cn-en.html
===================================================================
RCS file: /web/www/www/people/po/past-webmasters.zh-cn-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- people/po/past-webmasters.zh-cn-en.html     1 Jan 2019 12:29:10 -0000       
1.16
+++ people/po/past-webmasters.zh-cn-en.html     12 Jan 2019 16:28:54 -0000      
1.17
@@ -351,7 +351,7 @@
           Free Software Foundation. He also works on the web
           pages.</dd>
 
-          <dt><a href="https://rmmm.name";><strong>Robert Musial</strong></a>
+          <dt><a href="https://r.musial.xyz";><strong>Robert Musial</strong></a>
           <a href="mailto:address@hidden";>&lt;rmmm<b>@</b>gnu.org&gt;
           </a></dt>
 
@@ -457,7 +457,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/01/01 12:29:10 $
+$Date: 2019/01/12 16:28:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: people/po/past-webmasters.zh-cn.po
===================================================================
RCS file: /web/www/www/people/po/past-webmasters.zh-cn.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- people/po/past-webmasters.zh-cn.po  12 Jan 2019 13:27:58 -0000      1.63
+++ people/po/past-webmasters.zh-cn.po  12 Jan 2019 16:28:54 -0000      1.64
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-01-08 04:56+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU's Webmasters - GNU Project - Free Software Foundation"



reply via email to

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