www-commits
[Top][All Lists]
Advanced

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

www home.zh-tw.html distros/common-distros.zh-t...


From: GNUN
Subject: www home.zh-tw.html distros/common-distros.zh-t...
Date: Sat, 8 Feb 2020 04:59:59 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/02/08 04:59:59

Modified files:
        .              : home.zh-tw.html 
        distros        : common-distros.zh-tw.html 
                         free-distros.zh-tw.html 
        distros/po     : common-distros.zh-tw-en.html 
                         common-distros.zh-tw.po 
                         free-distros.zh-tw-en.html 
                         free-distros.zh-tw.po 
        education      : edu-schools.zh-tw.html 
        education/po   : edu-schools.zh-tw-en.html edu-schools.zh-tw.po 
        gnu            : 2020-announcement-1.es.html gnu.zh-tw.html 
                         initial-announcement.es.html 
        gnu/po         : 2020-announcement-1.es-en.html 
                         gnu.zh-tw-en.html gnu.zh-tw.po 
        philosophy     : categories.zh-tw.html free-doc.zh-tw.html 
                         the-danger-of-ebooks.zh-tw.html 
        philosophy/po  : categories.zh-tw-en.html categories.zh-tw.po 
                         free-doc.zh-tw-en.html free-doc.zh-tw.po 
                         free-sw.zh-tw-diff.html free-sw.zh-tw.po 
                         the-danger-of-ebooks.zh-tw-en.html 
                         the-danger-of-ebooks.zh-tw.po 
        po             : home.zh-tw-en.html home.zh-tw.po 
        proprietary/po : proprietary.zh-tw-diff.html 
                         proprietary.zh-tw.po 
        server         : footer-text.zh-tw.html 
        server/po      : footer-text.zh-tw.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.zh-tw.html?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.zh-tw.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.zh-tw.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.zh-tw-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.zh-tw.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-schools.zh-tw.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.zh-tw-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.zh-tw.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/2020-announcement-1.es.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu.zh-tw.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/initial-announcement.es.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/2020-announcement-1.es-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.zh-tw-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.zh-tw.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.zh-tw.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.zh-tw.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/the-danger-of-ebooks.zh-tw.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-tw-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-tw.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-tw-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-tw.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw-diff.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw.po?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/the-danger-of-ebooks.zh-tw-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/the-danger-of-ebooks.zh-tw.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-tw-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-tw.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.zh-tw-diff.html?cvsroot=www&r1=1.136&r2=1.137
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.zh-tw.po?cvsroot=www&r1=1.147&r2=1.148
http://web.cvs.savannah.gnu.org/viewcvs/www/server/footer-text.zh-tw.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/footer-text.zh-tw.po?cvsroot=www&r1=1.35&r2=1.36

Patches:
Index: home.zh-tw.html
===================================================================
RCS file: /web/www/www/home.zh-tw.html,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- home.zh-tw.html     7 Feb 2020 12:35:05 -0000       1.65
+++ home.zh-tw.html     8 Feb 2020 09:59:57 -0000       1.66
@@ -190,9 +190,8 @@
 <!--#include virtual="/po/home.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
 <blockquote class="highlight-para">
-<p>The GNU Project and the Free Software Foundation are <a
-href="/gnu/2020-announcement-1.html">defining how these two groups
-cooperate</a>.  Please send any further input by February 13.</p>
+<p>GNU 專案與自由軟體基金會<a
+href="/gnu/2020-announcement-1.html">正在研議å…
©ç¾¤çµ„合作的方式</a>。請在2月13日之前寄出任何意見供參é…
Œã€‚</p>
 </blockquote>
 <p class="no-display">GNU 是唯一特別開發給使用者
享受自由的作業系統。GNU 
是什麼?我們有哪些自由正受到危害?</p>
 
@@ -237,7 +236,7 @@
 <p class="c">
 <a
 
href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf";>
-ShoeTool &mdash; HAPPY HOLIDAYS FROM THE FSF!</a></p>
+ShoeTool &mdash; FSF 祝您佳節愉快!</a></p>
 
 <h2 class="first">GNU 是什麼?</h2>
 
@@ -256,43 +255,43 @@
 <div class="screenshot">
  <a href="/distros/screenshots/dragora-ice.png"><img
    src="/distros/screenshots/dragora-ice.png"
-   alt="&nbsp;[Screenshot of Dragora&nbsp;3.0-beta1 with IceWM window 
manager]&nbsp;" /></a>
+   alt="&nbsp;[Dragora&nbsp;3.0-beta1 搭配 IceWM 
視窗管理員的畫面快照]&nbsp;" /></a>
 </div>
 <p><small><a href="https://dragora.org/en/index.html";>
-Dragora&nbsp;3.0-beta1</a> with customized <a href="https://ice-wm.org/";>
-IceWM</a> window manager</small></p>
+Dragora&nbsp;3.0-beta1</a> 搭配自訂的 <a href="https://ice-wm.org/";> 
IceWM</a>
+視窗管理員</small></p>
 <!--#endif
 -->
 <!--#if expr="$DISTRO = guix" -->
 <div class="screenshot">
  <a href="/distros/screenshots/guixSD-gnome3.jpg"><img
    src="/distros/screenshots/guixSD-gnome3-medium.jpg"
-   alt="&nbsp;[Screenshot of Guix&nbsp;0.15 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a>
+   alt="&nbsp;[Guix&nbsp;0.15 搭配 GNOME&nbsp;3 桌面的畫面快ç…
§]&nbsp;" /></a>
 </div>
-<p><small><a href="/software/guix/">Guix&nbsp;0.15</a> with <a
-href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop, Epiphany web
-browser, Totem video player, and GNOME terminal emulator</small></p>
+<p><small><a href="/software/guix/">Guix&nbsp;0.15</a> 搭配 <a
+href="https://www.gnome.org/";>GNOME&nbsp;3</a> 桌面、Epiphany 網é 
ç€è¦½å™¨ã€Totem
+影片播放器、GNOME 終端模擬器</small></p>
 <!--#endif
 -->
 <!--#if expr="$DISTRO = hyperbola" -->
 <div class="screenshot">
  <a href="/distros/screenshots/hyperbola-i3.png"><img
    src="/distros/screenshots/hyperbola-i3.png"
-   alt="&nbsp;[Screenshot of Hyperbola with i3 window manager]&nbsp;" /></a>
+   alt="&nbsp;[Hyperbola 搭配 i3 視窗管理員的畫面快照]&nbsp;" 
/></a>
 </div>
-<p><small><a href="https://www.hyperbola.info/";> Hyperbola&nbsp;0.3</a> with <a
-href="https://i3wm.org/";>i3 window manager</a>, cool-retro-term (terminal
-emulator), Gimp (image editor), and Iceweasel-UXP (web browser)</small></p>
+<p><small><a href="https://www.hyperbola.info/";> Hyperbola&nbsp;0.3</a> 搭配 
<a
+href="https://i3wm.org/";>i3 視窗管理員</a>、cool-retro-term 
(終端機模擬器)、Gimp
+(影像編輯器)、Iceweasel-UXP (網頁瀏覽器)</small></p>
 <!--#endif
 -->
 <!--#if expr="$DISTRO = parabola" -->
 <div class="screenshot">
  <a href="/distros/screenshots/parabola2020-lxde.jpg"><img
    src="/distros/screenshots/parabola2020-lxde-medium.jpg"
-   alt="&nbsp;[Screenshot of Parabola with LXDE desktop]&nbsp;" /></a>
+   alt="&nbsp;[Parabola 搭配 LXDE 桌面的畫面快照]&nbsp;" /></a>
 </div>
-<p><small><a href="https://www.parabola.nu";>Parabola&nbsp;2020</a> with <a
-href="https://lxde.org/";>LXDE desktop</a></small></p>
+<p><small><a href="https://www.parabola.nu";>Parabola&nbsp;2020</a> 搭配 <a
+href="https://lxde.org/";>LXDE 桌面</a></small></p>
 <!--#endif
 -->
 <!--#if expr="$DISTRO = pureos" -->
@@ -322,16 +321,16 @@
  <tr class="image">
   <td><a href="/home.html?distro=dragora#gnu-linux"><img
    src="/distros/screenshots/dragora-ice-thumb.jpg"
-   alt="&nbsp;[Screenshot of Dragora&nbsp;3.0-beta1 with IceWM window 
manager]&nbsp;" /></a></td>
+   alt="&nbsp;[Dragora&nbsp;3.0-beta1 搭配 IceWM 
視窗管理員的畫面快照]&nbsp;" /></a></td>
   <td><a href="/home.html?distro=guix#gnu-linux"><img
    src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
-   alt="&nbsp;[Screenshot of Guix&nbsp;0.15 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
+   alt="&nbsp;[Guix&nbsp;0.15 搭配 GNOME&nbsp;3 桌面的畫面快ç…
§]&nbsp;" /></a></td>
   <td><a href="/home.html?distro=hyperbola#gnu-linux"><img
    src="/distros/screenshots/hyperbola-i3-thumb.jpg"
-   alt="&nbsp;[Screenshot of Hyperbola&nbsp;0.3 with i3 window manager]&nbsp;" 
/></a></td>
+   alt="&nbsp;[Hyperbola&nbsp;0.3 搭配 i3 視窗管理員的畫面快ç…
§]&nbsp;" /></a></td>
   <td><a href="/home.html?distro=parabola#gnu-linux"><img
    src="/distros/screenshots/parabola2020-lxde-thumb.jpg"
-   alt="&nbsp;[Screenshot of Parabola&nbsp;2020 with LXDE desktop]&nbsp;" 
/></a></td>
+   alt="&nbsp;[Parabola&nbsp;2020 搭配 LXDE 桌面的畫面快照]&nbsp;" 
/></a></td>
   <td><a href="/home.html?distro=pureos#gnu-linux"><img
    src="/distros/screenshots/gnome3-thumb.jpg"
    alt="&nbsp;[PureOS&nbsp;8 搭配 GNOME&nbsp;3 桌面的畫面快照]&nbsp;" 
/></a></td>
@@ -371,14 +370,9 @@
 
 <ul>
 <li>依照你
的想法執行該程式的自由,無論任何目的(自由之零)。</li>
-<li>The freedom to study how the program works, and change it so it does your
-computing as you wish (freedom 1). Access to the source code is a
-precondition for this.</li>
-<li>The freedom to redistribute copies so you can help others (freedom 2).</li>
-<li>The freedom to distribute copies of your modified versions to others
-(freedom 3).  By doing this you can give the whole community a chance to
-benefit from your changes.  Access to the source code is a precondition for
-this.</li>
+<li>研究該程式如何運作、並將之修改來讓電腦運算符合你
所設想的自由(自由之壹)。能存取程式的源始碼 (source 
code) 是這項自由的先決條件。</li>
+<li>再次散佈程式副本的自由,如此你
就能幫助他人(自由之貳)。</li>
+<li>將你
所修改後的版本作成副本散布給他人的自由(自由之參)。如此一來ä½
 å°±è®“社群整體有機會因為你
的改動而受益。能存取源始碼是這項自由的先決條件。</li>
 </ul>
 
 
<p>科技的發展與網路的普及,使得現在這些自由比起1983年之時<a
@@ -414,14 +408,13 @@
 <div class="second-column">
 
 <div class="emph-box beige">
-<p><strong>The GNU Project strongly urges the community to communicate in ways
-that are friendly, welcoming and kind. See the <a
+<p><strong>GNU 
專案強烈推薦社群以友善、溫暖、親切的方式溝通。請見 <a
 href="/philosophy/kind-communication.html"> GNU Kind Communications
-Guidelines</a></strong>.</p>
+Guidelines</a></strong>。</p>
 </div>
 
 <div id="Flashes" class="emph-box white">
-<h3>Planet GNU <a href="https://planet.gnu.org/rss20.xml";><img 
src="/feed-icon-10x10.png"
+<h3>GNU 星球 <a href="https://planet.gnu.org/rss20.xml";><img 
src="/feed-icon-10x10.png"
 alt="RSS 消息饋流" /></a></h3>
 <div class="ltr">
 
@@ -433,15 +426,14 @@
 <h3>採取行動</h3>
 
 <ul>
-<li><strong>Support the efforts on net neutrality <a
+<li>支持<strong><a
 href="https://www.freepress.net/issues/free-open-internet/net-neutrality";
-title="Net neutrality in the United States of America">in the
-USA</a></strong>, and in your home country.</li>
+title="Net neutrality in the United States of
+America">美國</a></strong>、以及您所在地的網路中立運動。</li>
 
-<li>Defend <a href="https://www.laquadrature.net/en/personnal-data/";>
-privacy</a>, and support <a
-href="https://www.laquadrature.net/en/?s=copyright";> global copyright
-reform</a> with <a href="https://www.laquadrature.net/en/";>LQDN</a>.</li>
+<li>和 <a href="https://www.laquadrature.net/en/";>LQDN</a> 一同捍衛<a
+href="https://www.laquadrature.net/en/personnal-data/";> 
隱私</a>、並支持<a
+href="https://www.laquadrature.net/en/personnal-data/";> å…
¨çƒè‘—作權法改革</a>。</li>
 
 <li><strong><a href="http://www.fsf.org/campaigns";>支持目前的 FSF 
活動</a></strong>。</li>
 
@@ -521,7 +513,7 @@
 <p id="sisters"><a href="http://www.fsf.org/";>FSF</a> 在 <a
 href="http://www.fsfe.org";>歐洲</a>、<a 
href="http://www.fsfla.org/";>拉丁美洲</a> 和
 <a href="http://fsf.org.in/";>印度</a> 皆有姐妹組織。<br />
-Feel free to join them!</p>
+自由加入參與!</p>
 
 <!--#include virtual="/server/fs-gang.zh-tw.html" -->
 <div id="footer">
@@ -585,7 +577,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2020/02/07 12:35:05 $
+$Date: 2020/02/08 09:59:57 $
 
 <!-- timestamp end -->
 </p>

Index: distros/common-distros.zh-tw.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-tw.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- distros/common-distros.zh-tw.html   29 Sep 2019 11:29:06 -0000      1.17
+++ distros/common-distros.zh-tw.html   8 Feb 2020 09:59:57 -0000       1.18
@@ -1,9 +1,4 @@
-<!--#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="2019-07-31" --><!--#set 
var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
+<!--#set var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
 
 <!--#include virtual="/server/header.zh-tw.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -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" -->
@@ -47,16 +41,19 @@
 
 <p>Arch 
並沒有政策反對以一般管道散布非自由軟體,而且他們的 
Linux 核心附有非自由的 blob。</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>
-
+<!--
+<p>
+Instead of this nonfree distribution, use <a
+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>
 
 <p>Canaima GNU/Linux 是個委內瑞拉政府製作用以分發電腦的 
GNU/Linux。雖然整體計畫令人欽佩,Canaima
 的缺陷是收錄非自由軟體。</p>
 
-<p>它的主要選單有個「安裝非自由軟體」選項
可安裝非自由的驅動程式(即使這些驅動程式沒有必
要)。該散布版也為 Linux 核心提供
+<p>它的主要選單有個「安裝非自由軟體」選項
可安裝非自由的驅動程式(即使這些驅動程式沒有必
要)。該散布版也為 Linux 核心供應
 blob,還會邀請使用者安裝非自由的應用程式如 Flash 
Player。</p>
 
 <h3 id="CentOS">CentOS</h3>
@@ -67,7 +64,7 @@
 <h3 id="Debian">Debian GNU/Linux</h3>
 
 <p>Debian 的《社會契約 (Social Contract)》中表明其目標在於使 
Debian 完全成為自由軟體,並且 Debian
-會認真負責地讓非自由軟體遠離官方 Debian 
系統。然而,Debian 卻也提供非自由軟體的軟體庫。æ 
¹æ“šè©²å°ˆæ¡ˆçš„說法,這些軟體「不是 Debian
+會認真負責地讓非自由軟體遠離官方 Debian 
系統。然而,Debian 卻也維護非自由軟體的軟體庫。æ 
¹æ“šè©²å°ˆæ¡ˆçš„說法,這些軟體「不是 Debian
 
系統的一部分」,但是這個軟體庫卻由該專案中的許多主要伺服器代管,人們甚至可以隨意瀏覽
 Debian 的線上軟體包資料庫和其 wiki
 就輕鬆找到這些非自由軟體。</p>
 
@@ -78,13 +75,19 @@
 將非自由的韌體檔案放在 nofree 
軟體庫中,而這個軟體庫又在 debian.org
 中的文件提及引用,甚至安裝程式在某些情
況下會推薦機器的周邊設備採用這些韌體以求正常運作。</p>
 
-<p>Debian 的 wiki 頁面中載有安裝非自由韌體的相關資訊。</p>
+<p>此外,有些屬於 Debian 
官方部分的自由軟體,會邀請使用者
安裝某些非自由的軟體。例如,Debian 版本的 Firefox 和 Chromium
+會建議安裝非自由的外掛程式。</p>
 
-<!-- https://wiki.debian.org/ATIProprietary -->
-<p>請改用其他以 Debian 
做成的自由散布版,來取代這套非自由的散布版:<a
-href="/distros/free-distros.html#for-pc">gNewSense</a> 或 <a
-href="/distros/free-distros.html#for-pc">PureOS</a>。</p>
+<p>Debian 的 wiki é 
é¢ä¸­ä¹Ÿè¼‰æœ‰å®‰è£éžè‡ªç”±éŸŒé«”的相關資訊。</p>
 
+<!-- https://wiki.debian.org/ATIProprietary -->
+<!--
+<p>
+Instead of this nonfree distribution, use one of the free distros
+which are made from it: <a
+href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+-->
 <h3 id="Fedora">Fedora</h3>
 
 <p>Fedora
@@ -100,7 +103,12 @@
 <p>Mandriva 
確實有政策宣明主要系統中可以收錄什麼軟體。它的政策係æ 
¹æ“š Fedora
 而來,這代表它也å…
è¨±æ”¶éŒ„特定類型的非自由韌體。除此之外,它還å…
è¨±æ”¶éŒ„採用原始 Artistic License 
授權的軟體,即便那是種非自由軟體授權。</p>
 
-<p>Mandriva 也透過專用的軟體庫提供非自由軟體。</p>
+<p>Mandriva 也透過專用的軟體庫供應非自由軟體。</p>
+
+<h3 id="Manjaro">Manjaro GNU/Linux</h3>
+
+<p>Manjoro 包含以一般管道散布的非自由軟體,而且供應的æ 
¸å¿ƒé™„有非自由的 blob。它還包含專有的辦公套裝軟體、具有 
DRM
+的專有軟體。該散布版也推薦安裝非自由的驅動程式。</p>
 
 <h3 id="Mint">Mint GNU/Linux</h3>
 
@@ -141,7 +149,7 @@
 
 <h3 id="Ubuntu">Ubuntu GNU/Linux</h3>
 
-<p>Ubuntu 提供非自由軟體的專用軟體庫,而且 Canonical 
擺明在採用 Ubuntu 名號的軟體散布é 
»é“中宣傳並推薦非自由軟體。Ubuntu
+<p>Ubuntu 維護非自由軟體的專用軟體庫,而且 Canonical 
擺明在採用 Ubuntu 名號的軟體散布é 
»é“中宣傳並推薦非自由軟體。Ubuntu
 提供選項讓你僅只安裝自由軟體;反過來說,它也提供選項
讓你安裝非自由軟體。此外,Ubuntu 所包含的 Linux 內æ 
¸å¿ƒç‰ˆæœ¬ä¸­äº¦å«æœ‰éŸŒé«” blob。</p>
 
 <p>「Ubuntu 
軟體中心」裡將專有軟體和自由軟體混雜在一塊。這導致<a
@@ -156,11 +164,14 @@
 href="/philosophy/not-ipr.html">「智æ…
§è²¡ç”¢æ¬Šã€</a>一詞散播令人混淆的訊息。該詞語錯誤假定商標法、專利法和許多å
…¶ä»–法律都落在同個單一概念性框架下。使用該詞語將造
成社群的傷害,毫無例外;所以在引用å…
¶ä»–人如何使用該詞語之外,我們自身必
當拒絕使用這個詞語。不過,對於
 Ubuntu 身為 GNU/Linux 
散布版這件事而言,這實質上不算是重大問題。</p>
 
-<p>請改用其他以 Ubuntu 
做成的自由散布版,來取代這套非自由的散布版:<a
-href="/distros/free-distros.html#for-pc">Dyne:bolic</a>、<a
-href="/distros/free-distros.html#for-pc">Trisquel</a>、<a
-href="/distros/free-distros.html#for-pc">Ututo S</a>。</p>
-
+<!--
+<p>
+Instead of this nonfree distribution, use one of the free distros
+which are made from it: <a
+href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
+href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+-->
 <h2>一些其他散布版</h2>
 
 <p>這裡我們討論一些著名或重要的非 GNU/Linux 
系統散布版,它們也不屬於自由之列。</p>
@@ -238,8 +249,8 @@
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 
我們努力盡所能提供貼切、品質良善的翻譯。然而,我們無法十å
…¨åç¾Žï¼Œé‚„請將你的意見評述與一般建議寄給 <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
-<p>請參照 <a href="/server/standards/README.translations.html">翻譯讀我 
README</a>
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a></p><p>請參照
+<a href="/server/standards/README.translations.html">翻譯讀我 README</a>
 來瞭解協調和提交我們的網頁翻譯相關事宜。</p>
 </div>
 
@@ -264,7 +275,7 @@
 
 <p>本頁面採用<a rel="license"
 href="https://creativecommons.org/licenses/by-nd/4.0/deed.zh_TW";>創用 CC
-授權姓名標示-禁止改作 4.0 國際</a>條款給予授權。</p>
+姓名標示-禁止改作 4.0 國際</a>條款給予授權。</p>
 
 <!--#include virtual="/server/bottom-notes.zh-tw.html" -->
 <div class="translators-credits">
@@ -279,7 +290,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/09/29 11:29:06 $
+$Date: 2020/02/08 09:59:57 $
 
 <!-- timestamp end -->
 </p>

Index: distros/free-distros.zh-tw.html
===================================================================
RCS file: /web/www/www/distros/free-distros.zh-tw.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- distros/free-distros.zh-tw.html     19 Mar 2019 18:33:36 -0000      1.5
+++ distros/free-distros.zh-tw.html     8 Feb 2020 09:59:57 -0000       1.6
@@ -1,12 +1,7 @@
-<!--#set var="PO_FILE"
- value='<a href="/distros/po/free-distros.zh-tw.po">
- https://www.gnu.org/distros/po/free-distros.zh-tw.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/distros/free-distros.html"
- --><!--#set var="DIFF_FILE" value="/distros/po/free-distros.zh-tw-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2018-11-19" -->
+<!--#set var="ENGLISH_PAGE" value="/distros/free-distros.en.html" -->
 
 <!--#include virtual="/server/header.zh-tw.html" -->
-<!-- Parent-Version: 1.85 -->
+<!-- Parent-Version: 1.86 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由的 GNU/Linux 散布版列表 - GNU 專案 - 
自由軟體基金會</title>
@@ -27,8 +22,9 @@
    margin-bottom: 0;
 }
 table.listing { margin-bottom: 3em; }
-td.icon { width: 20%; }
-td.icon img { max-width: 100%; max-height: 4em; }
+table.listing td.icon { width: 20%; }
+table.listing td.icon img { max-width: 100%; max-height: 4em; }
+table.listing td a { display: inline; }
 @media (max-width: 48em) {
    .note, .summary { width: 30em; max-width: 93%; }
 }
@@ -37,7 +33,6 @@
 
 <!--#include virtual="/distros/po/free-distros.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
-<!--#include virtual="/server/outdated.zh-tw.html" -->
 <h2>自由的 GNU/Linux 散布版</h2>
 
 <!--#include virtual="/licenses/fsf-licensing.zh-tw.html" -->
@@ -92,7 +87,7 @@
   </tr></thead>
 
  <tr class="even">
-   <td class="icon"><a href="https://dragora.org/";>
+   <td class="icon"><a href="https://dragora.org/en/index.html";>
        <img src="/graphics/distros-dragora.png"
             alt="Dragora GNU/Linux-Libre" /></a></td>
    <td>Dragora GNU/Linux-Libre,是以簡潔為本獨立開發的 GNU/Linux 
散布版。</td></tr>
@@ -109,16 +104,18 @@
    <td>gNewSense,根據 Debian 而來的 GNU/Linux 
散布版,受自由軟體基金會 (FSF) 贊助。</td></tr>
 
  <tr class="odd">
-   <td class="icon"><a href="http://www.gnu.org/software/guix/";>
-       <img src="/software/guix/graphics/GuixSD-V.png" alt="guix" /></a></td>
-   <td>Guix 系統散布版是以 GNU 
Guix(發音為「geeks」)為基礎打造的進階 GNU/Linux 
散布版。GNU Guix 是一套為 GNU
+   <td class="icon"><a href="/software/guix/">
+       <img src="/software/guix/static/base/img/Guix.png" alt="guix" 
/></a></td>
+   <td>Guix 系統,是以 GNU Guix(發音為「geeks」)為基礎打造
的進階 GNU/Linux 散布版,是一套為 GNU
 系統設計的純功能性軟體包管理系統。 </td></tr>
 
  <tr class="even">
-   <td class="icon"><a href="https://musixdistro.wordpress.com/";>
-       <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
-   <td>Musix,基於 Knoppix 而來的 GNU+Linux 
散布版,特別注重音訊工程生產領域。這是一套「靜æ…
‹ã€çš„散布版,一般情況下以 Live CD
-即時執行。它不會有任何安全性更新,應只用於離線狀æ…
‹ä½œæ¥­ã€‚</td></tr>
+   <td class="icon"><a href="https://www.hyperbola.info/";>
+       <img src="/graphics/distro-hyperbola.png" alt="Hyperbola" /></a></td>
+   <td>
+   Hyperbola GNU/Linux-libre,是個以 Arch GNU/Linux 為基礎,å…
·å‚™é•·æœŸæ”¯æ´ã€è‘—重簡單性的散布版。
+   </td>
+ </tr>
 
  <tr class="odd">
    <td class="icon"><a href="https://www.parabola.nu";>
@@ -148,6 +145,7 @@
 
 
<p>以下為小型系統散布版的列表。這些散布版針對資源受限的裝置打é€
 ï¼Œä¾‹å¦‚無線路由器等。有些自由的小型系統散布版無法
 self-host,但至少必須要能在上述某一套完å…
¨è‡ªç”±çš„散布版中開發和建置起來,像是透過小型系統散布版本身之外一起散布的自由工å
…·è¼”助之下完成。</p>
+
 <table class="listing">
   <thead><tr>
     <th>散布版</th>
@@ -159,6 +157,7 @@
        src="/graphics/librecmc.png" alt="libreCMC" /></a></td>
       <td>libreCMC 是給極度資源受限裝置使用的內嵌式 GNU/Linux
 
散布版。雖然主要是以路由器為目標,但它也提供廣泛的裝置與使用案例支援。在2015年時,LibreWRT
 和 libreCMC 兩者合併。</td></tr>
+
  <tr class="even">
    <td class="icon"><a href="http://proteanos.com/";> <img
        src="/graphics/proteanos.png" alt="ProteanOS" /></a></td>
@@ -207,6 +206,14 @@
    <td>BLAG Linux and GNU,是一套根據 Fedora 而來的 GNU/Linux 
散布版。</td>
    <td><em>於2018年6月移除</em>。依散布版維護者
之請求而移除,主因該專案已停止維護。</td>
   </tr>
+
+  <tr class="even">
+   <td class="icon"><a href="https://musixdistro.wordpress.com/";>
+       <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
+   <td>Musix,基於 Knoppix 而來的 GNU+Linux 
散布版,特別注重音訊工程生產領域。這是一套「靜æ…
‹ã€çš„散布版,一般情況下以 Live CD
+即時執行。它不會有任何安全性更新,應只用於離線狀æ…
‹ä½œæ¥­ã€‚</td>
+   <td><em>於2019年3月移除</em>。依維護者之請求而移除,主因
該專案已停止維護。</td>
+  </tr>
 </table>
 
 <div class="translators-notes">
@@ -220,9 +227,9 @@
 <div id="footer">
 <div class="unprintable">
 
-<p>請來信到 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a> 
詢問有關自由軟體基金會 (FSF)
-和 GNU 的一般問題;或者<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> 
詢問有關自由軟體基金會(FSF)和
+GNU 的一般問題;或者<a href="/contact/">以å…
¶ä»–方式</a>聯絡自由軟體基金會。至於損毀的連結及å…
¶ä»–修正和建議,可以將之寄給 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
 
 <p>
 <!-- TRANSLATORS: Ignore the original text in this paragraph,
@@ -240,7 +247,7 @@
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 
我們努力盡所能提供貼切、品質良善的翻譯。然而,我們無法十å
…¨åç¾Žï¼Œé‚„請將你的意見評述與一般建議寄給 <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p><p>請參照
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a></p><p>請參照
 <a href="/server/standards/README.translations.html">翻譯讀我 README</a>
 來瞭解協調和提交我們的網頁翻譯相關事宜。</p>
 </div>
@@ -261,11 +268,12 @@
      
      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, 2020 Free Software
+Foundation, Inc.</p>
 
 <p>本頁面採用<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>創用 CC 
姓名標示-禁止改作 4.0
-國際</a>條款給予授權。</p>
+href="https://creativecommons.org/licenses/by-nd/4.0/deed.zh_TW";>創用 CC
+姓名標示-禁止改作 4.0 國際</a>條款給予授權。</p>
 
 <!--#include virtual="/server/bottom-notes.zh-tw.html" -->
 <div class="translators-credits">
@@ -279,11 +287,12 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/03/19 18:33:36 $
+$Date: 2020/02/08 09:59:57 $
 
 <!-- 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- distros/po/common-distros.zh-tw-en.html     12 Jan 2019 16:28:53 -0000      
1.6
+++ distros/po/common-distros.zh-tw-en.html     8 Feb 2020 09:59:57 -0000       
1.7
@@ -56,12 +56,12 @@
 <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> 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>
 
 <p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -70,7 +70,7 @@
 
 <p>Its main menu has an option, &ldquo;Install nonfree
 software&rdquo;, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also ships blobs for the
 kernel, Linux, and invites installing nonfree applications including
 Flash Player.</p>
 
@@ -86,7 +86,7 @@
 
 <p>Debian's Social Contract states the goal of making Debian entirely
 free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system.  However, Debian also provides a
+of the official Debian system.  However, Debian also maintains a
 repository of nonfree software.  According to the project, this
 software is &ldquo;not part of the Debian system,&rdquo; but the
 repository is hosted on many of the project's main servers, and people
@@ -104,14 +104,20 @@
 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 -->
+<p>In addition, some of the free programs that are officially part of
+Debian invite the user to install some nonfree programs.
+Specifically, the Debian versions of Firefox and Chromium suggest
+nonfree plug-ins to install into them.</p>
 
+<p>Debian's wiki also includes pages about installing nonfree
+firmware.</p>
+<!-- https://wiki.debian.org/ATIProprietary -->
+<!--
 <p>Instead of this nonfree distribution, use one of the free distros
 which are made from it: <a
 href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
 href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
-
+-->
 <h3 id="Fedora">Fedora</h3>
 
 <p>Fedora does have a clear policy about what can be included in the
@@ -134,9 +140,16 @@
 permits software released under the original Artistic License to be
 included, even though that's a nonfree license.</p>
 
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also ships nonfree software through dedicated
 repositories.</p>
 
+<h3 id="Manjaro">Manjaro GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
 <h3 id="Mint">Mint GNU/Linux</h3>
 
 <p>Mint does not have a policy against including nonfree software, it
@@ -191,7 +204,7 @@
 
 <h3 id="Ubuntu">Ubuntu GNU/Linux</h3>
 
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu maintains specific repositories of nonfree software, and
 Canonical expressly promotes and recommends nonfree software under the
 Ubuntu name in some of their distribution channels.  Ubuntu offers the
 option to install only free packages, which means it also offers the
@@ -220,13 +233,13 @@
 reference to someone else's use of the term, we should always reject
 it.  However, that is not a substantive issue about Ubuntu as a
 GNU/Linux distribution.</p>
-
+<!--
 <p>Instead of this nonfree distribution, use one of the free distros
 which are made from it: <a
 href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
 href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
 href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
-
+-->
 <h2>Some Other Distros</h2>
 
 <p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -343,7 +356,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/01/12 16:28:53 $
+$Date: 2020/02/08 09:59:57 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/common-distros.zh-tw.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- distros/po/common-distros.zh-tw.po  8 Feb 2020 09:26:32 -0000       1.39
+++ distros/po/common-distros.zh-tw.po  8 Feb 2020 09:59:57 -0000       1.40
@@ -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-07-31 11:25+0000\n"
 "X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -132,10 +131,6 @@
 "Canaima GNU/Linux 是個委內瑞拉政府製作用以分發電腦的 
GNU/Linux。雖然整體計畫"
 "令人欽佩,Canaima 的缺陷是收錄非自由軟體。"
 
-# | Its main menu has an option, &ldquo;Install nonfree software&rdquo;, which
-# | installs all the nonfree drivers (even the ones that are not necessary).
-# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
-# | invites installing nonfree applications including Flash Player.
 #. type: Content of: <p>
 msgid ""
 "Its main menu has an option, &ldquo;Install nonfree software&rdquo;, which "
@@ -166,14 +161,6 @@
 msgid "Debian GNU/Linux"
 msgstr "Debian GNU/Linux"
 
-# | Debian's Social Contract states the goal of making Debian entirely free
-# | software, and Debian conscientiously keeps nonfree software out of the
-# | official Debian system.  However, Debian also [-provides-] {+maintains+} a
-# | repository of nonfree software.  According to the project, this software
-# | is &ldquo;not part of the Debian system,&rdquo; but the repository is
-# | hosted on many of the project's main servers, and people can readily find
-# | these nonfree packages by browsing Debian's online package database and
-# | its wiki.
 #. type: Content of: <p>
 msgid ""
 "Debian's Social Contract states the goal of making Debian entirely free "
@@ -223,7 +210,6 @@
 "此外,有些屬於 Debian 官方部分的自由軟體,會邀請使用者
安裝某些非自由的軟體。"
 "例如,Debian 版本的 Firefox 和 Chromium 
會建議安裝非自由的外掛程式。"
 
-# | Debian's wiki {+also+} includes pages about installing nonfree firmware.
 #. type: Content of: <p>
 msgid "Debian's wiki also includes pages about installing nonfree firmware."
 msgstr "Debian 的 wiki é 
é¢ä¸­ä¹Ÿè¼‰æœ‰å®‰è£éžè‡ªç”±éŸŒé«”的相關資訊。"
@@ -272,15 +258,11 @@
 "來,這代表它也å…
è¨±æ”¶éŒ„特定類型的非自由韌體。除此之外,它還å…
è¨±æ”¶éŒ„採用原始 "
 "Artistic License 授權的軟體,即便那是種非自由軟體授權。"
 
-# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
-# | repositories.
 #. type: Content of: <p>
 msgid "Mandriva also ships nonfree software through dedicated repositories."
 msgstr "Mandriva 也透過專用的軟體庫供應非自由軟體。"
 
-# | [-Mandriva-]{+Manjaro+} GNU/Linux
 #. type: Content of: <h3>
-#| msgid "Mandriva GNU/Linux"
 msgid "Manjaro GNU/Linux"
 msgstr "Manjaro GNU/Linux"
 
@@ -398,12 +380,6 @@
 msgid "Ubuntu GNU/Linux"
 msgstr "Ubuntu GNU/Linux"
 
-# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
-# | software, and Canonical expressly promotes and recommends nonfree software
-# | under the Ubuntu name in some of their distribution channels.  Ubuntu
-# | offers the option to install only free packages, which means it also
-# | offers the option to install nonfree packages too.  In addition, the
-# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
 #. type: Content of: <p>
 msgid ""
 "Ubuntu maintains specific repositories of nonfree software, and Canonical "

Index: distros/po/free-distros.zh-tw-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.zh-tw-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- distros/po/free-distros.zh-tw-en.html       15 Sep 2018 12:57:59 -0000      
1.1
+++ distros/po/free-distros.zh-tw-en.html       8 Feb 2020 09:59:58 -0000       
1.2
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.85 -->
+<!-- Parent-Version: 1.86 -->
 <title>List of Free GNU/Linux Distributions
 - GNU Project - Free Software Foundation</title>
 <link rel="alternate" title="Free GNU/Linux distributions"
@@ -19,8 +19,9 @@
    margin-bottom: 0;
 }
 table.listing { margin-bottom: 3em; }
-td.icon { width: 20%; }
-td.icon img { max-width: 100%; max-height: 4em; }
+table.listing td.icon { width: 20%; }
+table.listing td.icon img { max-width: 100%; max-height: 4em; }
+table.listing td a { display: inline; }
 @media (max-width: 48em) {
    .note, .summary { width: 30em; max-width: 93%; }
 }
@@ -110,7 +111,7 @@
   </tr></thead>
 
  <tr class="even">
-   <td class="icon"><a href="https://dragora.org/";>
+   <td class="icon"><a href="https://dragora.org/en/index.html";>
        <img src="/graphics/distros-dragora.png"
             alt="Dragora GNU/Linux-Libre" /></a></td>
    <td>Dragora GNU/Linux-Libre, an independent GNU/Linux distribution
@@ -131,19 +132,21 @@
        sponsorship from the FSF.</td></tr>
 
  <tr class="odd">
-   <td class="icon"><a href="http://www.gnu.org/software/guix/";>
-       <img src="/software/guix/graphics/GuixSD-V.png" alt="guix" /></a></td>
-   <td>Guix System Distribution is an advanced GNU/Linux distro built
+   <td class="icon"><a href="/software/guix/">
+       <img src="/software/guix/static/base/img/Guix.png" alt="guix" 
/></a></td>
+   <td>Guix System, an advanced GNU/Linux distro built
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. </td></tr>
 
  <tr class="even">
-   <td class="icon"><a href="https://musixdistro.wordpress.com/";>
-       <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
-   <td>Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production. This is a &ldquo;static&rdquo;
-       distro, normally run from a live CD. Since it will not receive
-       security updates, it should be used offline.</td></tr>
+   <td class="icon"><a href="https://www.hyperbola.info/";>
+       <img src="/graphics/distro-hyperbola.png" alt="Hyperbola" /></a></td>
+   <td>
+   Hyperbola GNU/Linux-libre, a
+   long-term support simplicity-focused distribution based on Arch
+   GNU/Linux.
+   </td>
+ </tr>
 
  <tr class="odd">
    <td class="icon"><a href="https://www.parabola.nu";>
@@ -181,6 +184,7 @@
    self-hosting, but it must be developable and buildable on top of one of 
    the free complete systems listed above, perhaps with the aid of free 
    tools distributed alongside the small system distribution itself.</p>
+
 <table class="listing">
   <thead><tr>
     <th>Distribution</th>
@@ -194,6 +198,7 @@
        very limited resources. While primarily targeting routers, it
        offers support for a wide range of devices and use cases. In
        2015, LibreWRT merged with libreCMC.</td></tr>
+
  <tr class="even">
    <td class="icon"><a href="http://proteanos.com/";> <img
        src="/graphics/proteanos.png" alt="ProteanOS" /></a></td>
@@ -262,6 +267,17 @@
    <td><em>Removed June 2018</em>. Removed at the request of the
        maintainers, as they had stopped maintaining it.</td>
   </tr>
+
+  <tr class="even">
+   <td class="icon"><a href="https://musixdistro.wordpress.com/";>
+       <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
+   <td>Musix, a GNU+Linux distribution based on Knoppix, with special
+       emphasis on audio production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used offline.</td>
+   <td><em>Removed March 2019</em>. Removed at the request of the
+       maintainer, as they had stopped maintaining it.</td>
+  </tr>
 </table>
 
 </div><!-- for id="content", starts in the include above -->
@@ -311,7 +327,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, 2020 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
@@ -321,10 +337,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/09/15 12:57:59 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: distros/po/free-distros.zh-tw.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.zh-tw.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- distros/po/free-distros.zh-tw.po    8 Feb 2020 09:26:32 -0000       1.16
+++ distros/po/free-distros.zh-tw.po    8 Feb 2020 09:59:58 -0000       1.17
@@ -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: 2018-11-19 22:26+0000\n"
 "X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -173,10 +172,7 @@
 msgid "Brief Description"
 msgstr "簡要描述說明"
 
-# | <a [-href=\"https://dragora.org/\";>-]
-# | {+href=\"https://dragora.org/en/index.html\";>+}
 #. type: Content of: <table><tr><td><a>
-#| msgid "<a href=\"https://dragora.org/\";>"
 msgid "<a href=\"https://dragora.org/en/index.html\";>"
 msgstr "<a href=\"https://dragora.org/en/index.html\";>"
 
@@ -227,10 +223,7 @@
 msgstr ""
 "gNewSense,根據 Debian 而來的 GNU/Linux 
散布版,受自由軟體基金會 (FSF) 贊助。"
 
-# | <a [-href=\"http://www.gnu.org/software/guix/\";>-]
-# | {+href=\"/software/guix/\">+}
 #. type: Content of: <table><tr><td><a>
-#| msgid "<a href=\"http://www.gnu.org/software/guix/\";>"
 msgid "<a href=\"/software/guix/\">"
 msgstr "<a href=\"/software/guix/\">"
 
@@ -238,9 +231,6 @@
 msgid "guix"
 msgstr "guix"
 
-# | Guix [-System Distribution is-] {+System,+} an advanced GNU/Linux distro
-# | built on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
-# | functional package manager for the GNU system.
 #. type: Content of: <table><tr><td>
 msgid ""
 "Guix System, an advanced GNU/Linux distro built on top of GNU Guix "
@@ -250,10 +240,7 @@
 "Guix 系統,是以 GNU Guix(發音為「geeks」)為基礎打造
的進階 GNU/Linux 散布"
 "版,是一套為 GNU 系統設計的純功能性軟體包管理系統。"
 
-# | <a [-href=\"https://www.parabola.nu\";>-]
-# | {+href=\"https://www.hyperbola.info/\";>+}
 #. type: Content of: <table><tr><td><a>
-#| msgid "<a href=\"https://www.parabola.nu\";>"
 msgid "<a href=\"https://www.hyperbola.info/\";>"
 msgstr "<a href=\"https://www.hyperbola.info/\";>"
 
@@ -510,8 +497,6 @@
 "套「靜態」的散布版,一般情況下以 Live CD 
即時執行。它不會有任何安全性更新,應"
 "只用於離線狀態作業。"
 
-# | <em>Removed [-June 2018</em>.-] {+March 2019</em>.+} Removed at the
-# | request of the maintainer[-s-], as they had stopped maintaining it.
 #. type: Content of: <table><tr><td>
 msgid ""
 "<em>Removed March 2019</em>. Removed at the request of the maintainer, as "
@@ -559,12 +544,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 2014, 2015, 2016, 2017, 2018, [-2019-] {+2019, 2020+}
-# | Free Software Foundation, Inc.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free Software "
 "Foundation, Inc."

Index: education/edu-schools.zh-tw.html
===================================================================
RCS file: /web/www/www/education/edu-schools.zh-tw.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- education/edu-schools.zh-tw.html    27 Aug 2019 15:31:14 -0000      1.4
+++ education/edu-schools.zh-tw.html    8 Feb 2020 09:59:58 -0000       1.5
@@ -106,7 +106,7 @@
 來瞭解協調和提交我們的網頁翻譯相關事宜。</p>
 </div>
 
-<p>Copyright &copy; 2003, 2009, 2014, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2003, 2009, 2014, 2015, 2016, 2019, 2020 Richard 
Stallman</p>
 
 <p>本頁面採用<a rel="license"
 href="https://creativecommons.org/licenses/by-nd/4.0/deed.zh_TW";>創用 CC
@@ -124,7 +124,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/08/27 15:31:14 $
+$Date: 2020/02/08 09:59:58 $
 
 <!-- timestamp end -->
 </p>
@@ -132,3 +132,4 @@
 </div>
 </body>
 </html>
+

Index: education/po/edu-schools.zh-tw-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-schools.zh-tw-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education/po/edu-schools.zh-tw-en.html      15 Dec 2018 05:28:12 -0000      
1.1
+++ education/po/edu-schools.zh-tw-en.html      8 Feb 2020 09:59:58 -0000       
1.2
@@ -176,7 +176,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2003, 2009, 2014, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2003, 2009, 2014, 2015, 2016, 2019, 2020 Richard 
Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -186,10 +186,11 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 05:28:12 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>
 </div>
 </body>
 </html>
+

Index: education/po/edu-schools.zh-tw.po
===================================================================
RCS file: /web/www/www/education/po/edu-schools.zh-tw.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- education/po/edu-schools.zh-tw.po   8 Feb 2020 09:26:32 -0000       1.11
+++ education/po/edu-schools.zh-tw.po   8 Feb 2020 09:59:58 -0000       1.12
@@ -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-12-31 12:56+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.4\n"
 
@@ -308,10 +307,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 2003, 2009, 2014, 2015, [-2016-] {+2016, 2019, 2020+}
-# | Richard Stallman
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2003, 2009, 2014, 2015, 2016 Richard Stallman"
 msgid ""
 "Copyright &copy; 2003, 2009, 2014, 2015, 2016, 2019, 2020 Richard Stallman"
 msgstr ""

Index: gnu/2020-announcement-1.es.html
===================================================================
RCS file: /web/www/www/gnu/2020-announcement-1.es.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/2020-announcement-1.es.html     6 Feb 2020 22:59:44 -0000       1.1
+++ gnu/2020-announcement-1.es.html     8 Feb 2020 09:59:58 -0000       1.2
@@ -23,8 +23,9 @@
 Proyecto GNU) se han reunido para elaborar un marco general que sirva como
 fundamento para ulteriores diálogos sobre áreas específicas de
 cooperación. Juntos hemos tomado en consideración los aportes enviados por
-el público a <a href="address@hidden">&lt;address@hidden&gt;</a> y
-<a href="address@hidden">&lt;address@hidden&gt;</a>. Prevemos
+el público a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a> y <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Prevemos
 concluir el marco en breve, por lo que instamos a enviar cualquier nuevo
 comentario no más tarde del 13 de febrero.</p>
 
@@ -106,7 +107,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2020/02/06 22:59:44 $
+$Date: 2020/02/08 09:59:58 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/gnu.zh-tw.html
===================================================================
RCS file: /web/www/www/gnu/gnu.zh-tw.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/gnu.zh-tw.html  27 Aug 2019 15:31:16 -0000      1.3
+++ gnu/gnu.zh-tw.html  8 Feb 2020 09:59:58 -0000       1.4
@@ -152,7 +152,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 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2019, 2020 Free Software Foundation, 
Inc.</p>
 
 <p>本頁面採用<a rel="license"
 href="https://creativecommons.org/licenses/by-nd/4.0/deed.zh_TW";>創用 CC
@@ -170,7 +170,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/08/27 15:31:16 $
+$Date: 2020/02/08 09:59:58 $
 
 <!-- timestamp end -->
 </p>
@@ -178,3 +178,4 @@
 </div>
 </body>
 </html>
+

Index: gnu/initial-announcement.es.html
===================================================================
RCS file: /web/www/www/gnu/initial-announcement.es.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/initial-announcement.es.html    15 Sep 2019 21:05:53 -0000      1.32
+++ gnu/initial-announcement.es.html    8 Feb 2020 09:59:58 -0000       1.33
@@ -114,7 +114,7 @@
   ...!mit-eddie!RMS@OZ<br />
   ...!mit-vax!RMS@OZ</p>
 
-<p>Dirección postal en los EE.UU.:<br />
+<p>Dirección postal en los EE.&nbsp;UU.:<br />
   Richard Stallman<br />
   166 Prospect St<br />
   Cambridge, MA 02139</p>
@@ -315,7 +315,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2019/09/15 21:05:53 $
+$Date: 2020/02/08 09:59:58 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/2020-announcement-1.es-en.html
===================================================================
RCS file: /web/www/www/gnu/po/2020-announcement-1.es-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/2020-announcement-1.es-en.html       6 Feb 2020 22:59:44 -0000       
1.1
+++ gnu/po/2020-announcement-1.es-en.html       8 Feb 2020 09:59:58 -0000       
1.2
@@ -19,10 +19,10 @@
 which will serve as the foundation for further discussion about
 specific areas of cooperation.  Together we have been considering the
 input received from the public on <a
-href="address@hidden">&lt;address@hidden&gt;</a> and <a
-href="address@hidden">&lt;address@hidden&gt;</a>.  We urge
-people to send any further input by February 13, because we expect to
-finish this framework soon.</p>
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a> and
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+We urge people to send any further input by February 13, because we
+expect to finish this framework soon.</p>
 
 <p>This joint announcement can also be read on
 <a href="https://www.fsf.org/news/gnu-fsf-cooperation-update";>
@@ -85,7 +85,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/02/06 22:59:44 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/gnu.zh-tw-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu.zh-tw-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/gnu.zh-tw-en.html    21 Sep 2017 13:59:07 -0000      1.1
+++ gnu/po/gnu.zh-tw-en.html    8 Feb 2020 09:59:58 -0000       1.2
@@ -156,7 +156,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 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2019, 2020 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
@@ -166,10 +166,11 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/09/21 13:59:07 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>
 </div>
 </body>
 </html>
+

Index: gnu/po/gnu.zh-tw.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu.zh-tw.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/po/gnu.zh-tw.po 8 Feb 2020 09:26:32 -0000       1.8
+++ gnu/po/gnu.zh-tw.po 8 Feb 2020 09:59:58 -0000       1.9
@@ -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: 2019-12-31 12:56+0000\n"
 "X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -230,12 +229,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 2014, 2015, 2016, [-2017, 2018-] {+2019, 2020+} Free
-# | Software Foundation, Inc.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
-#| "Inc."
 msgid ""
 "Copyright &copy; 2014, 2015, 2016, 2019, 2020 Free Software Foundation, Inc."
 msgstr ""

Index: philosophy/categories.zh-tw.html
===================================================================
RCS file: /web/www/www/philosophy/categories.zh-tw.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/categories.zh-tw.html    27 Aug 2019 15:31:20 -0000      1.12
+++ philosophy/categories.zh-tw.html    8 Feb 2020 09:59:58 -0000       1.13
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/categories.zh-tw.po">
- https://www.gnu.org/philosophy/po/categories.zh-tw.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
- --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.zh-tw-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2019-02-21" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
 
 <!--#include virtual="/server/header.zh-tw.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -20,7 +15,6 @@
 
 <!--#include virtual="/philosophy/po/categories.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
-<!--#include virtual="/server/outdated.zh-tw.html" -->
 <h2>自由與非自由軟體的類別</h2>
 
 <p>也請參閱<a href="/philosophy/words-to-avoid.html">你或許想避å…
çš„混淆詞語</a>。</p>
@@ -61,7 +55,7 @@
 <h3 id="OpenSource">開源軟體 (Open source software)</h3>
 
        <p>
-       
「開源」軟體是有些人用來描述差不多和自由軟體相同類別的軟體而提出的用語。它所講的這類軟體和自由軟體並非完å
…
¨ç›¸åŒï¼šä»–們接受一些我們認為限制過度的授權條款。然而,這類軟體所涵蓋的範圍和自由軟體差異很小:幾乎所有自由軟體都是開源軟體,而且幾乎所有開源軟體都是自由軟體。</p>
+       
「開源」軟體是有些人用來描述差不多和自由軟體相同類別的軟體而提出的用語。它所講的這類軟體和自由軟體並非完å
…
¨ç›¸åŒï¼šä»–們接受一些我們認為限制過度的授權條款。然而,這類軟體所涵蓋的範圍和自由軟體差異很小:據我們所知只有少數案例中的源始碼屬於開放源始碼但不是自由軟體。從原則上來說,也有可能有自由軟體不被認為是開源軟體,但我們不知道是否有這樣子的案例。</p>
        <p>我們偏好採用「<a
 
href="/philosophy/open-source-misses-the-point.html">自由軟體</a>」這個講法,å›
 
為它把「自由」點了出來——這是「開源」二字所辦不到的。</p>
 
@@ -236,9 +230,9 @@
 <div id="footer">
 <div class="unprintable">
 
-<p>請來信到 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a> 
詢問有關自由軟體基金會 (FSF)
-和 GNU 的一般問題;或者<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> 
詢問有關自由軟體基金會(FSF)和
+GNU 的一般問題;或者<a href="/contact/">以å…
¶ä»–方式</a>聯絡自由軟體基金會。至於損毀的連結及å…
¶ä»–修正和建議,可以將之寄給 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
 
 <p>
 <!-- TRANSLATORS: Ignore the original text in this paragraph,
@@ -262,7 +256,7 @@
 </div>
 
 <p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015,
-2016, 2017, 2018 Free Software Foundation, Inc.</p>
+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
@@ -277,7 +271,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/08/27 15:31:20 $
+$Date: 2020/02/08 09:59:58 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/free-doc.zh-tw.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.zh-tw.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/free-doc.zh-tw.html      27 Aug 2019 15:31:20 -0000      1.2
+++ philosophy/free-doc.zh-tw.html      8 Feb 2020 09:59:58 -0000       1.3
@@ -23,10 +23,10 @@
 
 <p>
 很久很久以前,我想過要學 
Perl,所以找來了一份自由手冊的副本,但發現很難讀。而當我向
 Perl
-群組詢問其他方案時,他們告訴我雖然有更好的å…
¥é–€æ‰‹å†Šï¼Œä½†æŽˆæ¬Šä¸¦ä¸è‡ªç”±ã€‚</p>
+群組詢問其他方案時,他們告訴我雖然有更好的å…
¥é–€æ‰‹å†Šï¼Œä½†æŽˆæ¬Šä¸¦ä¸è‡ªç”±ï¼ˆä¸å°Šé‡è‡ªç”±ï¼‰ã€‚</p>
 
 <p>
-這是為什麼?那些好讀手冊的作者
,為歐萊禮出版社編寫文章
,並以限制性的授權條款出版:不可複製、不能修改、當然也不提供原始檔,導致這些手冊被排除在自由軟體社群之外。</p>
+這是為什麼?那些好讀手冊的作者
,為歐萊禮出版社編寫文章
,並以限制性的授權條款出版:不可複製、不能修改、也不提供原始檔,導致這些手冊不自由,所以被排除在自由世界之外。</p>
 
 <p>
 
這不是第一次發生這種事,(對我們社群的巨大損失來說)也不會是最後一次。從那段時期開始,發行專有手冊的出版社吸引了許許多多作è€
…以授權限制他們所編寫的手冊。有好多次,我聽到一些
@@ -133,7 +133,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2009, 2015, 2016 Free Software Foundation, Inc.</p>
+2006, 2007, 2009, 2015, 2016, 2019 Free Software Foundation, Inc.</p>
 
 <p>本頁面採用<a rel="license"
 href="https://creativecommons.org/licenses/by-nd/4.0/deed.zh_TW";>創用 CC
@@ -151,7 +151,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/08/27 15:31:20 $
+$Date: 2020/02/08 09:59:58 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/the-danger-of-ebooks.zh-tw.html
===================================================================
RCS file: /web/www/www/philosophy/the-danger-of-ebooks.zh-tw.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/the-danger-of-ebooks.zh-tw.html  27 Aug 2019 15:31:22 -0000      
1.4
+++ philosophy/the-danger-of-ebooks.zh-tw.html  8 Feb 2020 09:59:58 -0000       
1.5
@@ -1,26 +1,16 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/the-danger-of-ebooks.zh-tw.po">
- https://www.gnu.org/philosophy/po/the-danger-of-ebooks.zh-tw.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/the-danger-of-ebooks.html"
- --><!--#set var="DIFF_FILE" 
value="/philosophy/po/the-danger-of-ebooks.zh-tw-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2019-05-19" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html" 
-->
 
 <!--#include virtual="/server/header.zh-tw.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.90 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>電子書的危害 - GNU 專案 - 自由軟體基金會</title>
 
 <!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
-<!--#include virtual="/server/outdated.zh-tw.html" -->
 <h2>電子書的危害</h2>
 
-<blockquote class="announcement"><p>
-<a href="http://defectivebydesign.org/ebooks.html";>加å…
¥æˆ‘們討論電子書危害的郵遞論壇</a>。
-</p></blockquote>
-
-<p>我們處於企業主宰政府並編寫法律的時代,每一項
技術發展都為企業提供了對大眾強施加新限制的機會。原å…
ˆèƒ½è³¦äºˆæˆ‘們力量的科技,反而成為束縛我們的枷鎖。</p>
+<p 
class="comment">我們處於企業主宰政府並編寫法律的時代,每一é
 …技術發展都為企業提供了對大眾強施加新限制的機會。原å…
ˆèƒ½è³¦äºˆæˆ‘們力量的科技,反而成為束縛我們的枷鎖。</p>
 
 <p>對於紙本書來說,</p>
 <ul>
@@ -45,28 +35,34 @@
 <li>亞馬遜還可以利用後門從遠
端刪除這些電子書。他們在2009年利用後門刪除了數千本喬治・歐威爾著作的《1984》電子書副本。</li>
 </ul>
 
-<p>即便只有上述任何一項
侵犯權利的行為,都讓電子書較紙本書更為倒退。我們必é 
ˆæ‹’絕電子書,直到他們願意尊重我們的自由時才重新考æ…
®ã€‚</p>
+<p>即便只有上述任何一項
侵犯權利的行為,都讓電子書較紙本書更為倒退。我們必é 
ˆæ‹’絕電子書,直到他們願意尊重我們的自由時才重新考æ…
®ã€‚&nbsp;[<a
+href="#footnote2">2</a>]</p>
 
 <p>電子書公司則表示,阻撓我們傳統以來的自由權利有所必
要,這是為了繼續支付款項給作者
。現行的著作權制度對這些公司來說可是非常慷æ…
¨ï¼Œå°è‘—作者來說反而相當苛刻。我們可以用å…
¶ä»–方式支持著作者
,以不需要削減我們自由權利的方式,以甚至能合法分享的方式。我在此建議å
…©å€‹è¾¦æ³•ï¼š</p>
 
 <ul>
-<li>根據每位作者受歡迎的程度之立方根來分配版稅收入。<a 
href="#footnote1">[1]</a></li>
+<li>根據每位作者受歡迎的程度之立方根來分配版稅收å…
¥ã€‚&nbsp;[<a href="#footnote1">1</a>]</li>
 <li>設計個可以讓使用者向作者
以匿名方式隨心意付款的閱讀器。</li>
 </ul>
 
 <p>電子書不需要攻擊我們的自由(至少 Project
 Gutengberg,古騰å 
¡è¨ˆåŠƒæ‰€æä¾›çš„電子書不會),但如果販售電子書的å…
¬å¸æ±ºæ„å¦‚此我們就會被攻擊。我們有責任阻止他們。</p>
 
+<blockquote class="announcement">
 <p>請加入戰鬥的行列:前往 <a
 
href="http://DefectiveByDesign.org/ebooks.html";>http://DefectiveByDesign.org/ebooks.html</a>
 註冊。</p>
+</blockquote>
 
-<h4>註腳</h4>
+<div class="column-limit"></div>
+<h3 style="font-size: 1.2em">註腳</h3>
 <ol> 
 <li id="footnote1">可參考我的兩次演講:<a
 href="/philosophy/copyright-versus-community.html">《電è…
¦ç¶²è·¯æ™‚代下的著作權與社群》</a>以及<a
 
href="http://stallman.org/articles/internet-sharing-license.en.html";>我在2012年寫給巴西聯邦參議會主席
 José Sarney 的公開信</a>瞭解相關資訊。</li>
+<li id="footnote2">[2019] 為了表達我們對 Amazon 
的電子書閱讀器的反對聲,我們改將它稱為 <a
+href="/philosophy/why-call-it-the-swindle.html">Swindle</a>。</li>
 </ol>
 
 <div class="translators-notes">
@@ -100,8 +96,8 @@
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 
我們努力盡所能提供貼切、品質良善的翻譯。然而,我們無法十å
…¨åç¾Žï¼Œé‚„請將你的意見評述與一般建議寄給 <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
-<p>請參照 <a href="/server/standards/README.translations.html">翻譯讀我 
README</a>
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a></p><p>請參照
+<a href="/server/standards/README.translations.html">翻譯讀我 README</a>
 來瞭解協調和提交我們的網頁翻譯相關事宜。</p>
 </div>
 
@@ -121,7 +117,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2011, 2014, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2011, 2014, 2015, 2016, 2019 Richard Stallman</p>
 
 <p>本頁面採用<a rel="license"
 href="https://creativecommons.org/licenses/by-nd/4.0/deed.zh_TW";>創用 CC
@@ -139,7 +135,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/08/27 15:31:22 $
+$Date: 2020/02/08 09:59:58 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/categories.zh-tw-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-tw-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/categories.zh-tw-en.html      15 Dec 2018 14:46:35 -0000      
1.5
+++ philosophy/po/categories.zh-tw-en.html      8 Feb 2020 09:59:58 -0000       
1.6
@@ -90,8 +90,10 @@
        accept some licenses that we consider too restrictive, and
        there are free software licenses they have not
        accepted. However, the differences in extension of the
-       category are small: nearly all free software is open source,
-       and nearly all open source software is free.</p>
+       category are small: we know of only a few cases of source code that
+       is open source but not free.  In principle it could happen
+       that some free programs are rejected as open source, but
+       we don't know if that has ever happened.</p>
        <p>We prefer the term &ldquo;<a
         href="/philosophy/open-source-misses-the-point.html">free
        software</a>&rdquo; because it refers to
@@ -436,7 +438,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 
2015, 2016, 2017, 2018 Free
+<p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 
2015, 2016, 2017, 2018, 2019 Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -447,7 +449,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:35 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/categories.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-tw.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/categories.zh-tw.po   8 Feb 2020 09:26:33 -0000       1.20
+++ philosophy/po/categories.zh-tw.po   8 Feb 2020 09:59:58 -0000       1.21
@@ -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: 2019-02-21 01:56+0000\n"
 "X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -148,15 +147,6 @@
 msgid "Open source software"
 msgstr "開源軟體 (Open source software)"
 
-# | The term &ldquo;open source&rdquo; software is used by some people to mean
-# | more or less the same category as free software. It is not exactly the
-# | same class of software: they accept some licenses that we consider too
-# | restrictive, and there are free software licenses they have not accepted.
-# | However, the differences in extension of the category are small: [-nearly
-# | all free software-] {+we know of only a few cases of source code that+} is
-# | open [-source, and nearly all open-] source [-software is-] {+but not+}
-# | free.  {+In principle it could happen that some free programs are rejected
-# | as open source, but we don't know if that has ever happened.+}
 #. type: Content of: <p>
 msgid ""
 "The term &ldquo;open source&rdquo; software is used by some people to mean "
@@ -782,12 +772,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014,
-# | 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free Software Foundation, Inc.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, "
-#| "2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, "
 "2016, 2017, 2018, 2019 Free Software Foundation, Inc."

Index: philosophy/po/free-doc.zh-tw-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.zh-tw-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/free-doc.zh-tw-en.html        17 Dec 2018 17:59:30 -0000      
1.1
+++ philosophy/po/free-doc.zh-tw-en.html        8 Feb 2020 09:59:58 -0000       
1.2
@@ -29,14 +29,15 @@
 Once upon a time, many years ago, I thought I would learn Perl.  I got
 a copy of a free manual, but I found it hard to read.  When I asked
 Perl users about alternatives, they told me that there were better
-introductory manuals&mdash;but those were not free.</p>
+introductory manuals&mdash;but those were not free (not
+freedom-respecting).</p>
 
 <p>
 Why was this?  The authors of the good manuals had written them for
 O'Reilly Associates, which published them with restrictive
 terms&mdash;no copying, no modification, source files not
-available&mdash;which exclude them from the free software
-community.</p>
+available&mdash;which made them nonfree, thus excluded them from the
+Free World.</p>
 
 <p>
 That wasn't the first time this sort of thing has happened, and (to
@@ -195,7 +196,7 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2009, 2015, 2016 Free Software Foundation, Inc.</p>
+2005, 2006, 2007, 2009, 2015, 2016, 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
@@ -205,7 +206,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/17 17:59:30 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/free-doc.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.zh-tw.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/free-doc.zh-tw.po     8 Feb 2020 09:26:33 -0000       1.5
+++ philosophy/po/free-doc.zh-tw.po     8 Feb 2020 09:59:58 -0000       1.6
@@ -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-12-27 22:55+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.4\n"
 
@@ -55,11 +54,6 @@
 "元件;當重要的自由軟體包
中沒有隨附自由手冊時,就會是很大的空白。而現在,我們"
 "就有很多這樣的空白。"
 
-# | Once upon a time, many years ago, I thought I would learn Perl.  I got a
-# | copy of a free manual, but I found it hard to read.  When I asked Perl
-# | users about alternatives, they told me that there were better introductory
-# | manuals&mdash;but those were not [-free.-] {+free (not
-# | freedom-respecting).+}
 #. type: Content of: <p>
 msgid ""
 "Once upon a time, many years ago, I thought I would learn Perl.  I got a "
@@ -71,11 +65,6 @@
 "當我向 Perl 群組詢問å…
¶ä»–方案時,他們告訴我雖然有更好的å…
¥é–€æ‰‹å†Šï¼Œä½†æŽˆæ¬Šä¸¦ä¸è‡ª"
 "由(不尊重自由)。"
 
-# | Why was this? The authors of the good manuals had written them for
-# | O'Reilly Associates, which published them with restrictive terms&mdash;no
-# | copying, no modification, source files not available&mdash;which
-# | [-exclude-] {+made them nonfree, thus excluded+} them from the [-free
-# | software community.-] {+Free World.+}
 #. type: Content of: <p>
 msgid ""
 "Why was this? The authors of the good manuals had written them for O'Reilly "
@@ -312,13 +301,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# | 2005, 2006, 2007, 2009, 2015, [-2016-] {+2016, 2019+} Free Software
-# | Foundation, Inc.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
-#| "2005, 2006, 2007, 2009, 2015, 2016 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007, 2009, 2015, 2016, 2019 Free Software Foundation, Inc."

Index: philosophy/po/free-sw.zh-tw-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-tw-diff.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- philosophy/po/free-sw.zh-tw-diff.html       27 Aug 2019 15:31:23 -0000      
1.43
+++ philosophy/po/free-sw.zh-tw-diff.html       8 Feb 2020 09:59:58 -0000       
1.44
@@ -668,7 +668,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2019/08/27 15:31:23 $
+$Date: 2020/02/08 09:59:58 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/free-sw.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-tw.po,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- philosophy/po/free-sw.zh-tw.po      8 Feb 2020 09:26:33 -0000       1.64
+++ philosophy/po/free-sw.zh-tw.po      8 Feb 2020 09:59:58 -0000       1.65
@@ -130,8 +130,8 @@
 "A program is free software if the program's users have the four essential "
 "freedoms: <a href=\"#f1\">[1]</a>"
 msgstr ""
-"如果軟體使用者能擁有以下四項
自由,則該程式軟體就是自由軟體︰<a href="
-"\"#f1\">[1]</a>"
+"如果軟體使用者能擁有以下四項
自由,則該程式軟體就是自由軟體︰<a href=\"#f1\">"
+"[1]</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -276,13 +276,13 @@
 msgid "The freedom to study the source code and make changes"
 msgstr "研究源始碼並修改的自由"
 
+#. type: Content of: <div><p>
 # | In order for freedoms 1 and 3 (the freedom to make changes and the freedom
 # | to publish the changed versions) to be meaningful, you [-must-] {+need
 # | to+} have access to the source code of the program.  Therefore,
 # | accessibility of source code is a necessary condition for free software.
 # | Obfuscated &ldquo;source code&rdquo; is not real source code and does not
 # | count as source code.
-#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "In order for freedoms 1 and 3 (the freedom to make changes and the "
@@ -736,6 +736,7 @@
 
"我們會不時修訂「自由軟體」的定義。這裡是有實際更改的紀錄æ¸
…單,隨附確實指出修"
 "改何處的連結。"
 
+#. type: Content of: <ul><li>
 # | <a
 # | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135\";>Version
 # | 1.135</a>: Say each time-]
@@ -743,7 +744,6 @@
 # | 1.165</a>: Clarify+} that [-freedom 0 is-] {+arbitrary annoyances in+} the
 # | {+code do not negate+} freedom {+0, and that freedoms 1 and 3 enable
 # | users+} to [-run the program as you wish.-] {+remove them.+}
-#. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
@@ -1124,12 +1124,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 1996, 2002, 2004-2007, 2009-201[-8-]{+9+} Free Software
-# | Foundation, Inc.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019 Free Software Foundation, "
 "Inc."

Index: philosophy/po/the-danger-of-ebooks.zh-tw-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/the-danger-of-ebooks.zh-tw-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/the-danger-of-ebooks.zh-tw-en.html    19 Jan 2019 04:59:44 
-0000      1.1
+++ philosophy/po/the-danger-of-ebooks.zh-tw-en.html    8 Feb 2020 09:59:58 
-0000       1.2
@@ -1,17 +1,12 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.90 -->
 <title>The Danger of E-Books
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>The Danger of E-Books</h2>
 
-<blockquote class="announcement"><p>
-<a href="http://defectivebydesign.org/ebooks.html";>Join our mailing list
-about the dangers of eBooks</a>.
-</p></blockquote>
-
-<p>In an age where business dominates our governments and writes our laws, 
+<p class="comment">In an age where business dominates our governments and 
writes our laws, 
 every technological advance offers business an opportunity to impose new 
 restrictions on the public. Technologies that could have empowered us are 
 used to chain us instead.</p>
@@ -50,7 +45,7 @@
 </ul>
 
 <p>Even one of these infringements makes e-books a step backward from 
-printed books. We must reject e-books until they respect our freedom.</p>
+printed books. We must reject e-books until they respect our freedom&nbsp;[<a 
href="#footnote2">2</a>].</p>
 
 <p>The e-book companies say denying our traditional freedoms is
 necessary to continue to pay authors. The current copyright system
@@ -61,18 +56,21 @@
 
 <ul>
 <li>To distribute tax funds to authors based on the cube root of each 
-author's popularity.<a href="#footnote1">[1]</a></li>
+author's popularity&nbsp;[<a href="#footnote1">1</a>].</li>
 <li>To design players so users can send authors anonymous voluntary 
payments.</li>
 </ul>
 
 <p>E-books need not attack our freedom (Project Gutenberg's e-books don't), 
 but they will if companies get to decide. It's up to us to stop them.</p>
 
+<blockquote class="announcement">
 <p>Join the fight: sign up
 at <a href="http://DefectiveByDesign.org/ebooks.html";>
 http://DefectiveByDesign.org/ebooks.html</a>.</p>
+</blockquote>
 
-<h4>Footnotes</h4>
+<div class="column-limit"></div>
+<h3 style="font-size: 1.2em">Footnotes</h3>
 <ol> 
 <li id="footnote1">See both my speech
 <a href="/philosophy/copyright-versus-community.html">&ldquo;Copyright
@@ -80,6 +78,9 @@
 and <a href="http://stallman.org/articles/internet-sharing-license.en.html";>my
 2012 open letter to the President of the Brazilian Senate</a>, Senator
 José Sarney, for more on this.</li>
+<li id="footnote2">[2019] To show our rejection of Amazon's e-book reader,
+we call it <a href="/philosophy/why-call-it-the-swindle.html">the
+Swindle</a>.</li>
 </ol>
 
 </div><!-- for id="content", starts in the include above -->
@@ -129,7 +130,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2011, 2014, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2011, 2014, 2015, 2016, 2019 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -139,7 +140,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/01/19 04:59:44 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/the-danger-of-ebooks.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/the-danger-of-ebooks.zh-tw.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/po/the-danger-of-ebooks.zh-tw.po 8 Feb 2020 09:26:33 -0000       
1.10
+++ philosophy/po/the-danger-of-ebooks.zh-tw.po 8 Feb 2020 09:59:58 -0000       
1.11
@@ -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: 2019-05-19 16:58+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.4\n"
 
@@ -125,9 +124,6 @@
 "亞馬遜還可以利用後門從遠
端刪除這些電子書。他們在2009年利用後門刪除了數千本喬"
 "治・歐威爾著作的《1984》電子書副本。"
 
-# | Even one of these infringements makes e-books a step backward from printed
-# | books. We must reject e-books until they respect our [-freedom.-]
-# | {+freedom&nbsp;[<a href=\"#footnote2\">2</a>].+}
 #. type: Content of: <p>
 msgid ""
 "Even one of these infringements makes e-books a step backward from printed "
@@ -151,13 +147,7 @@
 "我們可以用其他方式支持著作者
,以不需要削減我們自由權利的方式,以甚至能合法分"
 "享的方式。我在此建議兩個辦法:"
 
-# | To distribute tax funds to authors based on the cube root of each author's
-# | [-popularity.<a href=\"#footnote1\">[1]</a>-] {+popularity&nbsp;[<a
-# | href=\"#footnote1\">1</a>].+}
-#. type: Content of: <ul><li>
-#| msgid ""
-#| "To distribute tax funds to authors based on the cube root of each "
-#| "author's popularity.<a href=\"#footnote1\">[1]</a>"
+#. type: Content of: <ul><li>
 msgid ""
 "To distribute tax funds to authors based on the cube root of each author's "
 "popularity&nbsp;[<a href=\"#footnote1\">1</a>]."
@@ -198,8 +188,8 @@
 "html\">my 2012 open letter to the President of the Brazilian Senate</a>, "
 "Senator José Sarney, for more on this."
 msgstr ""
-"可參考我的兩次演講:<a 
href=\"/philosophy/copyright-versus-community.html"
-"\">《電腦網路時代下的著作權與社群》</a>以及<a 
href=\"http://stallman.org/";
+"可參考我的兩次演講:<a 
href=\"/philosophy/copyright-versus-community.html\">"
+"《電腦網路時代下的著作權與社群》</a>以及<a 
href=\"http://stallman.org/";
 
"articles/internet-sharing-license.en.html\">我在2012年寫給巴西聯邦參議會主席
 "
 "José Sarney 的公開信</a>瞭解相關資訊。"
 
@@ -252,9 +242,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 2011, 2014, 2015, [-2016-] {+2016, 2019+} Richard Stallman
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2011, 2014, 2015, 2016 Richard Stallman"
 msgid "Copyright &copy; 2011, 2014, 2015, 2016, 2019 Richard Stallman"
 msgstr "Copyright &copy; 2011, 2014, 2015, 2016, 2019 Richard Stallman"
 

Index: po/home.zh-tw-en.html
===================================================================
RCS file: /web/www/www/po/home.zh-tw-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/home.zh-tw-en.html       18 Jan 2019 15:59:15 -0000      1.9
+++ po/home.zh-tw-en.html       8 Feb 2020 09:59:58 -0000       1.10
@@ -1,8 +1,8 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!--#include virtual="/server/html5-header.html" -->
+<!-- Parent-Version: 1.91 -->
    <!--#if expr="$QUERY_STRING = /distro=([^&#]+)/"
 --><!--#set var="DISTRO" value="$1"
---><!--#else --><!--#set var="DISTRO" value="pureos8"
+--><!--#else --><!--#set var="DISTRO" value="hyperbola"
 --><!--#endif -->
 <title>The GNU Operating System and the Free Software Movement</title>
 
@@ -12,9 +12,8 @@
 
 <style type="text/css" media="print,screen">
 <!--
-#content {
-   margin: 0;
-}
+blockquote.highlight-para { margin: 1.5em 0 0; }
+
 .first-column, .second-column {
    width: 46em; max-width: 100%;
    margin: auto;
@@ -60,7 +59,6 @@
    padding-bottom: .2em;
 }
 .thumbs td {
-   width: 33.3%;
    vertical-align: top;
    padding: .1em;
    border: 0;
@@ -77,6 +75,14 @@
    max-width: 100%;
    min-width: 8em;
 }
+p.btn-left a, p.btn-right a,
+ p.btn-left a:visited, p.btn-right a:visited {
+   font-size: 1.6em;
+   padding: .4em .6em;
+   color: #b02500;
+   border: .1em solid #b02500;
+   margin: .3em 0;
+}
 p.btn-left {
    float: left;
    margin: .7em 0;
@@ -85,13 +91,6 @@
    float: right;
    margin: 0 0 .3em;
 }
-p.button a, p.button a:visited {
-   font-size: 1.6em;
-   padding: .4em .6em;
-   color: #b02500;
-   border: .1em solid #b02500;
-   margin: .3em 0;
-}
 p.button a:hover {
    color: #777;
    border-color: #777;
@@ -146,20 +145,16 @@
    text-align: left;
 }
 
-.clear {
-   clear: both;
-   height: 2em;
-}
 .translators-notes {
    width: 44.4em; max-width: 100%;
    margin: 0 auto;
 }
-#mission-statement {
-   margin-bottom: 0;
-}
 #sisters {
    font-size: .9em;
-   margin: 0 3% 2em;
+   text-align: center;
+   background-color: white;
+   padding: 0 3% 2em;
+   margin: 0;
 }
 
 @media (min-width: 60em) {
@@ -182,6 +177,11 @@
 <!--#include virtual="/server/fs-gang-definitions.html" -->
 <!--#include virtual="/po/home.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<blockquote class="highlight-para">
+<p>The GNU Project and the Free Software Foundation are
+<a href="/gnu/2020-announcement-1.html">defining how these
+two groups cooperate</a>.  Please send any further input by February 13.</p>
+</blockquote>
 <p class="no-display">GNU is the only operating system developed
 specifically to give its users freedom.  What is GNU, and what freedom
 is at stake?</p>
@@ -189,6 +189,45 @@
 <div id="home">
 <div class="first-column">
 
+<div style="max-width: 40em; margin: 2.3em auto 0">
+<video width="100%" controls="controls" crossorigin="anonymous"
+poster="https://static.fsf.org/nosvn/videos/fsf-shoetool/thumbnails/ShoeTool-Cover-1.jpg";>
+
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.webm";
+type="video/webm" />
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.ogv";
+type="video/ogg" />
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.mp4";
+type="video/mp4" />
+
+<!-- GNUN: localize URL /server/banners/shoetoolfsf.vtt -->
+<track kind="subtitles" label="default" default="default"
+src="/server/banners/shoetoolfsf.vtt" />
+<track kind="subtitles" label="English" srclang="en"
+src="/server/banners/shoetoolfsf.en.vtt" />
+<track kind="subtitles" label="español" srclang="es"
+src="/server/banners/shoetoolfsf.es.vtt" />
+<track kind="subtitles" label="euskara" srclang="eu"
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_eu.vtt";
 />
+<track kind="subtitles" label="français" srclang="fr"
+src="/server/banners/shoetoolfsf.fr.vtt" />
+<track kind="subtitles" label="Nederlands" srclang="nl"
+src="/server/banners/shoetoolfsf.nl.vtt" />
+<track kind="subtitles" label="română" srclang="ro"
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_ro.vtt";
 />
+<track kind="subtitles" label="தமிழ்" srclang="ta"
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_ta.vtt";
 />
+<track kind="subtitles" label="українська" srclang="uk"
+src="/server/banners/shoetoolfsf.uk.vtt" />
+</video>
+</div>
+<p class="c">
+<a 
href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf";>
+ShoeTool &mdash; HAPPY HOLIDAYS FROM THE FSF!</a></p>
+
 <h2 class="first">What is GNU?</h2>
 
 <p>GNU is an operating system that
@@ -208,25 +247,43 @@
   <a href="/distros/free-distros.html">Try GNU/Linux</a></p>
 <div style="clear: left"></div>
 
-<div id="gnu-linux"><!--#if expr="$DISTRO = trisquel8" -->
+<div id="gnu-linux"><!--#if expr="$DISTRO = dragora" -->
 <div class="screenshot">
- <a href="/distros/screenshots/trisquel8-mate.jpg"><img
-   src="/distros/screenshots/trisquel8-mate-medium.jpg"
-   alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" /></a>
-</div>
-<p><small><a href="https://trisquel.info";>Trisquel&nbsp;8</a> with <a
-href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser (web browser),
-and Inkscape (vector graphics editor)</small></p><!--#endif
+ <a href="/distros/screenshots/dragora-ice.png"><img
+   src="/distros/screenshots/dragora-ice.png"
+   alt="&nbsp;[Screenshot of Dragora&nbsp;3.0-beta1 with IceWM window 
manager]&nbsp;" /></a>
+</div>
+<p><small><a href="https://dragora.org/en/index.html";>
+Dragora&nbsp;3.0-beta1</a> with customized <a href="https://ice-wm.org/";>
+IceWM</a> window manager</small></p><!--#endif
 --><!--#if expr="$DISTRO = guix" -->
 <div class="screenshot">
  <a href="/distros/screenshots/guixSD-gnome3.jpg"><img
    src="/distros/screenshots/guixSD-gnome3-medium.jpg"
-   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a>
+   alt="&nbsp;[Screenshot of Guix&nbsp;0.15 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a>
 </div>
-<p><small><a href="/software/guix/">GuixSD&nbsp;0.15</a> with <a
+<p><small><a href="/software/guix/">Guix&nbsp;0.15</a> with <a
 href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop, Epiphany web
 browser, Totem video player, and GNOME terminal emulator</small></p><!--#endif
---><!--#if expr="$DISTRO = pureos8" -->
+--><!--#if expr="$DISTRO = hyperbola" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/hyperbola-i3.png"><img
+   src="/distros/screenshots/hyperbola-i3.png"
+   alt="&nbsp;[Screenshot of Hyperbola with i3 window manager]&nbsp;" /></a>
+</div>
+<p><small><a href="https://www.hyperbola.info/";>
+Hyperbola&nbsp;0.3</a> with <a href="https://i3wm.org/";>i3 window manager</a>,
+cool-retro-term (terminal emulator), Gimp (image editor), and Iceweasel-UXP 
(web
+browser)</small></p><!--#endif
+--><!--#if expr="$DISTRO = parabola" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/parabola2020-lxde.jpg"><img
+   src="/distros/screenshots/parabola2020-lxde-medium.jpg"
+   alt="&nbsp;[Screenshot of Parabola with LXDE desktop]&nbsp;" /></a>
+</div>
+<p><small><a href="https://www.parabola.nu";>Parabola&nbsp;2020</a> with <a
+href="https://lxde.org/";>LXDE desktop</a></small></p><!--#endif
+--><!--#if expr="$DISTRO = pureos" -->
 <div class="screenshot">
  <a href="/distros/screenshots/pureos8-gnome3.jpg"><img
    src="/distros/screenshots/gnome3-medium.jpg"
@@ -234,27 +291,48 @@
 </div>
 <p><small><a href="https://www.pureos.net/";>PureOS&nbsp;8</a> with <a
 href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop,
-PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif -->
+PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif
+--><!--#if expr="$DISTRO = trisquel" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/trisquel8-mate.jpg"><img
+   src="/distros/screenshots/trisquel8-mate-medium.jpg"
+   alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" /></a>
+</div>
+<p><small><a href="https://trisquel.info";>Trisquel&nbsp;8</a> with <a
+href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser (web browser),
+and Inkscape (vector graphics editor)</small></p><!--#endif -->
+</div>
 
 <table class="thumbs">
  <tr class="image">
-  <td><a href="/home.html?distro=trisquel8#gnu-linux"><img
-   src="/distros/screenshots/trisquel8-mate-thumb.jpg"
-   alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" 
/></a></td>
+  <td><a href="/home.html?distro=dragora#gnu-linux"><img
+   src="/distros/screenshots/dragora-ice-thumb.jpg"
+   alt="&nbsp;[Screenshot of Dragora&nbsp;3.0-beta1 with IceWM window 
manager]&nbsp;" /></a></td>
   <td><a href="/home.html?distro=guix#gnu-linux"><img
    src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
-   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a></td>
-  <td><a href="/home.html?distro=pureos8#gnu-linux"><img
+   alt="&nbsp;[Screenshot of Guix&nbsp;0.15 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
+  <td><a href="/home.html?distro=hyperbola#gnu-linux"><img
+   src="/distros/screenshots/hyperbola-i3-thumb.jpg"
+   alt="&nbsp;[Screenshot of Hyperbola&nbsp;0.3 with i3 window manager]&nbsp;" 
/></a></td>
+  <td><a href="/home.html?distro=parabola#gnu-linux"><img
+   src="/distros/screenshots/parabola2020-lxde-thumb.jpg"
+   alt="&nbsp;[Screenshot of Parabola&nbsp;2020 with LXDE desktop]&nbsp;" 
/></a></td>
+  <td><a href="/home.html?distro=pureos#gnu-linux"><img
    src="/distros/screenshots/gnome3-thumb.jpg"
    alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
+  <td><a href="/home.html?distro=trisquel#gnu-linux"><img
+   src="/distros/screenshots/trisquel8-mate-thumb.jpg"
+   alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" 
/></a></td>
  </tr>
  <tr class="caption">
-  <td><small>Trisquel&nbsp;8 &amp; MATE</small></td>
-  <td><small>GuixSD &amp; GNOME&nbsp;3</small></td>
-  <td><small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small></td>
+  <td><small>Dragora / IceWM</small></td>
+  <td><small>Guix / GNOME3</small></td>
+  <td><small>Hyperbola / i3</small></td>
+  <td><small>Parabola / LXDE</small></td>
+  <td><small>PureOS / GNOME3</small></td>
+  <td><small>Trisquel / MATE</small></td>
  </tr>
 </table>
-</div>
 
 <p class="button btn-right">
   ... or <a
@@ -287,13 +365,15 @@
 <ul>
 <li>The freedom to run the program as you wish,
      for any purpose (freedom 0).</li>
-<li>The freedom to study how the program works, and adapt it to your needs
-    (freedom 1).   Access to the source code is a precondition for this.</li>
-<li>The freedom to redistribute copies so you can help your neighbor
+<li>The freedom to study how the program works, and change it so it
+    does your computing as you wish (freedom 1). Access to the source
+    code is a precondition for this.</li>
+<li>The freedom to redistribute copies so you can help others
     (freedom 2).</li>
-<li>The freedom to improve the program, and release your improvements
-   to the public, so that the whole community benefits
-    (freedom 3).   Access to the source code is a precondition for this.</li>
+<li>The freedom to distribute copies of your modified versions
+    to others (freedom 3).  By doing this you can give the whole
+    community a chance to benefit from your changes.
+    Access to the source code is a precondition for this.</li>
 </ul>
 
 <p>Developments in technology and network use have made these freedoms
@@ -338,16 +418,20 @@
 
 <div class="second-column">
 
+<div class="emph-box beige">
+<p><strong>The GNU Project strongly urges the community to communicate in 
+ways that are friendly, welcoming and kind. See the 
+<a href="/philosophy/kind-communication.html">
+GNU Kind Communications Guidelines</a></strong>.</p>
+</div>
+
 <div id="Flashes" class="emph-box white">
-<h3><a href="http://planet.gnu.org/";>Planet GNU</a>
-<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
+<h3>Planet GNU
+<a href="https://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
 alt="RSS Feed" /></a></h3>
 <div class="ltr">
 <!--#include virtual="/planetfeeds.html" -->
 </div>
-<p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>
-and the list of <a href="/software/recent-releases.html">recent GNU
-releases</a>.</p>
 </div>
 
 <div id="Action" class="emph-box beige">
@@ -355,15 +439,15 @@
 
 <ul>
 <li><strong>Support the efforts on net neutrality
-<a href="http://www.savetheinternet.com"; title="Net
+<a href="https://www.freepress.net/issues/free-open-internet/net-neutrality"; 
title="Net
 neutrality in the United States of America">in the USA</a></strong>,
 and in your home country.</li>
 
-<li>Defend <a href="http://www.laquadrature.net/en/Privacy";>
+<li>Defend <a href="https://www.laquadrature.net/en/personnal-data/";>
 privacy</a>, and support <a
-href="http://www.laquadrature.net/en/the-eu-commissions-outrageous-attempt-to-avoid-copyright-reform";>
+href="https://www.laquadrature.net/en/?s=copyright";>
 global copyright reform</a> with <a
-href="http://www.laquadrature.net/en/";>LQDN</a>.</li>
+href="https://www.laquadrature.net/en/";>LQDN</a>.</li>
 
 <li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
 campaigns</a></strong>.</li>
@@ -430,15 +514,16 @@
 
 </div><!-- /second-column -->
 </div><!-- /home -->
-<div class="clear"></div>
 
+<div style="clear:both"></div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 
 <p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
 organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
 href="http://www.fsfla.org/";>Latin America</a> and <a
-href="http://gnu.org.in/";>India</a>.</p>
+href="http://fsf.org.in/";>India</a>.<br />
+Feel free to join them!</p>
 
 <!--#include virtual="/server/fs-gang.html" -->
 
@@ -487,7 +572,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-2018 <a
+<p>Copyright &copy; 1996-2020 <a
 href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -498,7 +583,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/01/18 15:59:15 $
+$Date: 2020/02/08 09:59:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/home.zh-tw.po
===================================================================
RCS file: /web/www/www/po/home.zh-tw.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- po/home.zh-tw.po    8 Feb 2020 09:26:33 -0000       1.65
+++ po/home.zh-tw.po    8 Feb 2020 09:59:58 -0000       1.66
@@ -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: 2019-02-16 17:57+0000\n"
 "X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -100,17 +99,11 @@
 msgid "<a href=\"/distros/free-distros.html\">Try GNU/Linux</a>"
 msgstr "<a href=\"/distros/free-distros.html\">試試 GNU/Linux</a>"
 
-# | <a [-href=\"/distros/screenshot-gnewsense.html\">-]
-# | {+href=\"/distros/screenshots/dragora-ice.png\">+}
 #. type: Content of: <div><div><div><div><a>
-#| msgid "<a href=\"/distros/screenshot-gnewsense.html\">"
 msgid "<a href=\"/distros/screenshots/dragora-ice.png\">"
 msgstr "<a href=\"/distros/screenshots/dragora-ice.png\">"
 
-# | &nbsp;[Screenshot of [-Trisquel&nbsp;8-] {+Dragora&nbsp;3.0-beta1+} with
-# | [-MATE desktop]&nbsp;-] {+IceWM window manager]&nbsp;+}
 #. type: Attribute 'alt' of: <div><div><table><tr><td><a><img>
-#| msgid "&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;"
 msgid ""
 "&nbsp;[Screenshot of Dragora&nbsp;3.0-beta1 with IceWM window manager]&nbsp;"
 msgstr "&nbsp;[Dragora&nbsp;3.0-beta1 搭配 IceWM 
視窗管理員的畫面快照]&nbsp;"
@@ -133,16 +126,10 @@
 msgid "<a href=\"/distros/screenshots/guixSD-gnome3.jpg\">"
 msgstr "<a href=\"/distros/screenshots/guixSD-gnome3.jpg\">"
 
-# | &nbsp;[Screenshot of [-GuixSD&nbsp;0.15-] {+Guix&nbsp;0.15+} with
-# | GNOME&nbsp;3 desktop]&nbsp;
 #. type: Attribute 'alt' of: <div><div><table><tr><td><a><img>
 msgid "&nbsp;[Screenshot of Guix&nbsp;0.15 with GNOME&nbsp;3 desktop]&nbsp;"
 msgstr "&nbsp;[Guix&nbsp;0.15 搭配 GNOME&nbsp;3 桌面的畫面快照]&nbsp;"
 
-# | <small><a [-href=\"/software/guix/\">GuixSD&nbsp;0.15</a>-]
-# | {+href=\"/software/guix/\">Guix&nbsp;0.15</a>+} with <a
-# | href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, Epiphany web
-# | browser, Totem video player, and GNOME terminal emulator</small>
 #. type: Content of: <div><div><div><p>
 msgid ""
 "<small><a href=\"/software/guix/\">Guix&nbsp;0.15</a> with <a href=\"https://";
@@ -153,30 +140,15 @@
 "www.gnome.org/\">GNOME&nbsp;3</a> 桌面、Epiphany 網頁瀏覽器、Totem 
影片播放"
 "器、GNOME 終端模擬器</small>"
 
-# | <a [-href=\"/distros/screenshots/pureos8-gnome3.jpg\">-]
-# | {+href=\"/distros/screenshots/hyperbola-i3.png\">+}
 #. type: Content of: <div><div><div><div><a>
-#| msgid "<a href=\"/distros/screenshots/pureos8-gnome3.jpg\">"
 msgid "<a href=\"/distros/screenshots/hyperbola-i3.png\">"
 msgstr "<a href=\"/distros/screenshots/hyperbola-i3.png\">"
 
-# | &nbsp;[Screenshot of [-Trisquel&nbsp;8-] {+Hyperbola+} with [-MATE
-# | desktop]&nbsp;-] {+i3 window manager]&nbsp;+}
 #. type: Attribute 'alt' of: <div><div><div><div><a><img>
 msgid "&nbsp;[Screenshot of Hyperbola with i3 window manager]&nbsp;"
 msgstr "&nbsp;[Hyperbola 搭配 i3 視窗管理員的畫面快照]&nbsp;"
 
-# | <small><a [-href=\"https://www.pureos.net/\";>PureOS&nbsp;8</a>-]
-# | {+href=\"https://www.hyperbola.info/\";> Hyperbola&nbsp;0.3</a>+} with <a
-# | [-href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, PureBrowser
-# | (web browser), and-] {+href=\"https://i3wm.org/\";>i3 window manager</a>,
-# | cool-retro-term (terminal emulator),+} Gimp (image [-editor)</small>-]
-# | {+editor), and Iceweasel-UXP (web browser)</small>+}
-#. type: Content of: <div><div><div><p>
-#| msgid ""
-#| "<small><a href=\"https://www.pureos.net/\";>PureOS&nbsp;8</a> with <a href="
-#| "\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, PureBrowser (web "
-#| "browser), and Gimp (image editor)</small>"
+#. type: Content of: <div><div><div><p>
 msgid ""
 "<small><a href=\"https://www.hyperbola.info/\";> Hyperbola&nbsp;0.3</a> with "
 "<a href=\"https://i3wm.org/\";>i3 window manager</a>, cool-retro-term "
@@ -187,29 +159,15 @@
 "<a href=\"https://i3wm.org/\";>i3 視窗管理員</a>、cool-retro-term 
(終端機模擬"
 "器)、Gimp (影像編輯器)、Iceweasel-UXP (網頁瀏覽器)</small>"
 
-# | <a [-href=\"/distros/screenshots/pureos8-gnome3.jpg\">-]
-# | {+href=\"/distros/screenshots/parabola2020-lxde.jpg\">+}
 #. type: Content of: <div><div><div><div><a>
-#| msgid "<a href=\"/distros/screenshots/pureos8-gnome3.jpg\">"
 msgid "<a href=\"/distros/screenshots/parabola2020-lxde.jpg\">"
 msgstr "<a href=\"/distros/screenshots/parabola2020-lxde.jpg\">"
 
-# | &nbsp;[Screenshot of [-Trisquel&nbsp;8-] {+Parabola+} with [-MATE-]
-# | {+LXDE+} desktop]&nbsp;
 #. type: Attribute 'alt' of: <div><div><div><div><a><img>
 msgid "&nbsp;[Screenshot of Parabola with LXDE desktop]&nbsp;"
 msgstr "&nbsp;[Parabola 搭配 LXDE 桌面的畫面快照]&nbsp;"
 
-# | <small><a [-href=\"https://www.pureos.net/\";>PureOS&nbsp;8</a>-]
-# | {+href=\"https://www.parabola.nu\";>Parabola&nbsp;2020</a>+} with <a
-# | [-href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, PureBrowser
-# | (web browser), and Gimp (image editor)</small>-]
-# | {+href=\"https://lxde.org/\";>LXDE desktop</a></small>+}
-#. type: Content of: <div><div><div><p>
-#| msgid ""
-#| "<small><a href=\"https://www.pureos.net/\";>PureOS&nbsp;8</a> with <a href="
-#| "\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, PureBrowser (web "
-#| "browser), and Gimp (image editor)</small>"
+#. type: Content of: <div><div><div><p>
 msgid ""
 "<small><a href=\"https://www.parabola.nu\";>Parabola&nbsp;2020</a> with <a "
 "href=\"https://lxde.org/\";>LXDE desktop</a></small>"
@@ -250,13 +208,10 @@
 "Inkscape (vector graphics editor)</small>"
 msgstr ""
 "<small><a href=\"https://trisquel.info\";>Trisquel&nbsp;8</a> 搭配 <a href="
-"\"https://mate-desktop.org/\";>MATE</a> 桌面、Abrowser(網é 
ç€è¦½å™¨ï¼‰ã€"
-"Inkscape(向量圖編輯器)</small>"
+"\"https://mate-desktop.org/\";>MATE</a> 桌面、Abrowser(網é 
ç€è¦½å™¨ï¼‰ã€Inkscape"
+"(向量圖編輯器)</small>"
 
-# | <a [-href=\"/home.html?distro=guix#gnu-linux\">-]
-# | {+href=\"/home.html?distro=dragora#gnu-linux\">+}
 #. type: Content of: <div><div><table><tr><td><a>
-#| msgid "<a href=\"/home.html?distro=guix#gnu-linux\">"
 msgid "<a href=\"/home.html?distro=dragora#gnu-linux\">"
 msgstr "<a href=\"/home.html?distro=dragora#gnu-linux\">"
 
@@ -264,43 +219,27 @@
 msgid "<a href=\"/home.html?distro=guix#gnu-linux\">"
 msgstr "<a href=\"/home.html?distro=guix#gnu-linux\">"
 
-# | <a [-href=\"/home.html?distro=pureos8#gnu-linux\">-]
-# | {+href=\"/home.html?distro=hyperbola#gnu-linux\">+}
 #. type: Content of: <div><div><table><tr><td><a>
-#| msgid "<a href=\"/home.html?distro=pureos8#gnu-linux\">"
 msgid "<a href=\"/home.html?distro=hyperbola#gnu-linux\">"
 msgstr "<a href=\"/home.html?distro=hyperbola#gnu-linux\">"
 
-# | &nbsp;[Screenshot of [-Trisquel&nbsp;8-] {+Hyperbola&nbsp;0.3+} with
-# | [-MATE desktop]&nbsp;-] {+i3 window manager]&nbsp;+}
 #. type: Attribute 'alt' of: <div><div><table><tr><td><a><img>
-#| msgid "&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;"
 msgid "&nbsp;[Screenshot of Hyperbola&nbsp;0.3 with i3 window manager]&nbsp;"
 msgstr "&nbsp;[Hyperbola&nbsp;0.3 搭配 i3 視窗管理員的畫面快ç…
§]&nbsp;"
 
-# | <a [-href=\"/home.html?distro=pureos8#gnu-linux\">-]
-# | {+href=\"/home.html?distro=parabola#gnu-linux\">+}
 #. type: Content of: <div><div><table><tr><td><a>
-#| msgid "<a href=\"/home.html?distro=pureos8#gnu-linux\">"
 msgid "<a href=\"/home.html?distro=parabola#gnu-linux\">"
 msgstr "<a href=\"/home.html?distro=parabola#gnu-linux\">"
 
-# | &nbsp;[Screenshot of [-Trisquel&nbsp;8-] {+Parabola&nbsp;2020+} with
-# | [-MATE-] {+LXDE+} desktop]&nbsp;
 #. type: Attribute 'alt' of: <div><div><table><tr><td><a><img>
-#| msgid "&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;"
 msgid "&nbsp;[Screenshot of Parabola&nbsp;2020 with LXDE desktop]&nbsp;"
 msgstr "&nbsp;[Parabola&nbsp;2020 搭配 LXDE 桌面的畫面快照]&nbsp;"
 
-# | <a href=\"/home.html?distro=pureos[-8-]#gnu-linux\">
 #. type: Content of: <div><div><table><tr><td><a>
-#| msgid "<a href=\"/home.html?distro=pureos8#gnu-linux\">"
 msgid "<a href=\"/home.html?distro=pureos#gnu-linux\">"
 msgstr "<a href=\"/home.html?distro=pureos#gnu-linux\">"
 
-# | <a href=\"/home.html?distro=trisquel[-8-]#gnu-linux\">
 #. type: Content of: <div><div><table><tr><td><a>
-#| msgid "<a href=\"/home.html?distro=trisquel8#gnu-linux\">"
 msgid "<a href=\"/home.html?distro=trisquel#gnu-linux\">"
 msgstr "<a href=\"/home.html?distro=trisquel#gnu-linux\">"
 
@@ -308,10 +247,7 @@
 msgid "<small>Dragora / IceWM</small>"
 msgstr "<small>Dragora / IceWM</small>"
 
-# | [-<small>GuixSD &amp; GNOME&nbsp;3</small>-]{+<small>Guix /
-# | GNOME3</small>+}
 #. type: Content of: <div><div><table><tr><td>
-#| msgid "<small>GuixSD &amp; GNOME&nbsp;3</small>"
 msgid "<small>Guix / GNOME3</small>"
 msgstr "<small>Guix / GNOME3</small>"
 
@@ -319,23 +255,15 @@
 msgid "<small>Hyperbola / i3</small>"
 msgstr "<small>Hyperbola / i3</small>"
 
-# | [-<small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small>-]{+<small>Parabola /
-# | LXDE</small>+}
 #. type: Content of: <div><div><table><tr><td>
-#| msgid "<small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small>"
 msgid "<small>Parabola / LXDE</small>"
 msgstr "<small>Parabola / LXDE</small>"
 
-# | [-<small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small>-]{+<small>PureOS /
-# | GNOME3</small>+}
 #. type: Content of: <div><div><table><tr><td>
-#| msgid "<small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small>"
 msgid "<small>PureOS / GNOME3</small>"
 msgstr "<small>PureOS / GNOME3</small>"
 
-# | [-<small>Trisquel&nbsp;8 &amp;-]{+<small>Trisquel /+} MATE</small>
 #. type: Content of: <div><div><table><tr><td>
-#| msgid "<small>Trisquel&nbsp;8 &amp; MATE</small>"
 msgid "<small>Trisquel / MATE</small>"
 msgstr "<small>Trisquel / MATE</small>"
 
@@ -400,9 +328,6 @@
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr "依照你
的想法執行該程式的自由,無論任何目的(自由之零)。"
 
-# | The freedom to study how the program works, and [-adapt-] {+change+} it
-# | [-to-] {+so it does+} your [-needs-] {+computing as you wish+} (freedom
-# | 1). Access to the source code is a precondition for this.
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to study how the program works, and change it so it does your "
@@ -412,17 +337,10 @@
 "研究該程式如何運作、並將之修改來讓電腦運算符合你
所設想的自由(自由之壹)。能"
 "存取程式的源始碼 (source code) 是這項自由的先決條件。"
 
-# | The freedom to redistribute copies so you can help [-your neighbor-]
-# | {+others+} (freedom 2).
 #. type: Content of: <div><div><ul><li>
 msgid "The freedom to redistribute copies so you can help others (freedom 2)."
 msgstr "再次散佈程式副本的自由,如此你
就能幫助他人(自由之貳)。"
 
-# | The freedom to [-improve the program, and release-] {+distribute copies
-# | of+} your [-improvements-] {+modified versions+} to [-the public, so
-# | that-] {+others (freedom 3).  By doing this you can give+} the whole
-# | community [-benefits (freedom 3).-] {+a chance to benefit from your
-# | changes.+}  Access to the source code is a precondition for this.
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to distribute copies of your modified versions to others "
@@ -521,13 +439,7 @@
 "philosophy/kind-communication.html\"> GNU Kind Communications Guidelines</"
 "a></strong>。"
 
-# | {+Planet GNU+} <a [-href=\"http://planet.gnu.org/\";>Planet GNU</a> <a
-# | href=\"http://planet.gnu.org/rss20.xml\";>-]
-# | {+href=\"https://planet.gnu.org/rss20.xml\";>+}
 #. type: Content of: <div><div><div><h3><a>
-#| msgid ""
-#| "<a href=\"http://planet.gnu.org/\";>Planet GNU</a> <a href=\"http://planet.";
-#| "gnu.org/rss20.xml\">"
 msgid "Planet GNU <a href=\"https://planet.gnu.org/rss20.xml\";>"
 msgstr "GNU 星球 <a href=\"https://planet.gnu.org/rss20.xml\";>"
 
@@ -539,11 +451,6 @@
 msgid "Take Action"
 msgstr "採取行動"
 
-# | <strong>Support the efforts on net neutrality <a
-# | [-href=\"http://www.savetheinternet.com\"-]
-# | 
{+href=\"https://www.freepress.net/issues/free-open-internet/net-neutrality\"+}
-# | title=\"Net neutrality in the United States of America\">in the
-# | USA</a></strong>, and in your home country.
 #. type: Content of: <div><div><div><ul><li>
 msgid ""
 "<strong>Support the efforts on net neutrality <a href=\"https://www.";
@@ -555,13 +462,6 @@
 "net-neutrality\" title=\"Net neutrality in the United States of America\">美"
 "國</a></strong>、以及您所在地的網路中立運動。"
 
-# | Defend <a [-href=\"http://www.laquadrature.net/en/Privacy\";>-]
-# | {+href=\"https://www.laquadrature.net/en/personnal-data/\";>+} privacy</a>,
-# | and support <a
-# | 
[-href=\"http://www.laquadrature.net/en/the-eu-commissions-outrageous-attempt-to-avoid-copyright-reform\";>-]
-# | {+href=\"https://www.laquadrature.net/en/?s=copyright\";>+} global
-# | copyright reform</a> with <a
-# | href=\"http{+s+}://www.laquadrature.net/en/\">LQDN</a>.
 #. type: Content of: <div><div><div><ul><li>
 msgid ""
 "Defend <a href=\"https://www.laquadrature.net/en/personnal-data/\";> privacy</"
@@ -755,8 +655,6 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; [-1996-2018-] {+1996-2020+} <a
-# | href=\"http://www.fsf.org\";>Free Software Foundation</a>, Inc.
 #. type: Content of: <div><p>
 msgid ""
 "Copyright &copy; 1996-2020 <a href=\"http://www.fsf.org\";>Free Software "

Index: proprietary/po/proprietary.zh-tw-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.zh-tw-diff.html,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- proprietary/po/proprietary.zh-tw-diff.html  1 Feb 2020 14:33:19 -0000       
1.136
+++ proprietary/po/proprietary.zh-tw-diff.html  8 Feb 2020 09:59:59 -0000       
1.137
@@ -369,7 +369,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2020/02/01 14:33:19 $
+$Date: 2020/02/08 09:59:59 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: proprietary/po/proprietary.zh-tw.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.zh-tw.po,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- proprietary/po/proprietary.zh-tw.po 8 Feb 2020 09:26:33 -0000       1.147
+++ proprietary/po/proprietary.zh-tw.po 8 Feb 2020 09:59:59 -0000       1.148
@@ -31,16 +31,16 @@
 msgid "Proprietary Software Is Often Malware"
 msgstr "專有軟體常是惡意軟體"
 
-# | [-Table-]{+<a href=\"#TOC\">Table+} of [-Contents-] {+contents</a>+}
 #. type: Content of: <div><div><p>
+# | [-Table-]{+<a href=\"#TOC\">Table+} of [-Contents-] {+contents</a>+}
 #, fuzzy
 #| msgid "Table of Contents"
 msgid "<a href=\"#TOC\">Table of contents</a>"
 msgstr "目錄"
 
+#. type: Content of: <div><div><p>
 # | <a [-href=\"#patrons\" id=\"TOCpatrons\">Patrons</a>-]
 # | {+href=\"#latest\">Latest additions</a>+}
-#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid "<a href=\"#patrons\" id=\"TOCpatrons\">Patrons</a>"
 msgid "<a href=\"#latest\">Latest additions</a>"
@@ -88,11 +88,11 @@
 
"臣服於誘惑之下已經空前地普及;時至今日反倒成為標準作法。現代最常見的軟體授權"
 "方式為專有軟體。"
 
+#. type: Content of: <div><p>
 # | As of [-April, 2017,-] {+January, 2020,+} the [-files-] {+pages+} in this
 # | directory list around [-300-] {+450+} instances of malicious
 # | [-functionalities,-] {+functionalities (with more than 500 references to
 # | back them up),+} but there are surely thousands more we don't know about.
-#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "As of April, 2017, the files in this directory list around 300 instances "
@@ -114,17 +114,17 @@
 msgid "Products or companies"
 msgstr ""
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-deception.html\">Deception</a>-]
 # | {+href=\"/proprietary/proprietary-addictions.html\">Addictions</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-deception.html\">Deception</a>"
 msgid "<a href=\"/proprietary/proprietary-addictions.html\">Addictions</a>"
 msgstr "<a href=\"/proprietary/proprietary-deception.html\">欺騙</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a href=\"/proprietary/proprietary-back-doors.html\">Back [-doors</a>-]
 # | {+doors</a>&nbsp;(<a href=\"#f1\">1</a>)+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-back-doors.html\">Back doors</a>"
 msgid ""
@@ -136,8 +136,8 @@
 msgid "<a href=\"/proprietary/proprietary-censorship.html\">Censorship</a>"
 msgstr "<a href=\"/proprietary/proprietary-censorship.html\">審查</a>"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <div><table><tr><td><ul><li>
+# || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-coverups.html\">Coverups</a>"
 msgid "<a href=\"/proprietary/proprietary-coverups.html\">Coverups</a>"
@@ -147,10 +147,10 @@
 msgid "<a href=\"/proprietary/proprietary-deception.html\">Deception</a>"
 msgstr "<a href=\"/proprietary/proprietary-deception.html\">欺騙</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-sabotage.html\">Sabotage</a>-]
 # | {+href=\"/proprietary/proprietary-drm.html\">DRM</a>&nbsp;(<a
 # | href=\"#f2\">2</a>)+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-sabotage.html\">Sabotage</a>"
 msgid ""
@@ -158,9 +158,9 @@
 "\"#f2\">2</a>)"
 msgstr "<a href=\"/proprietary/proprietary-sabotage.html\">破壞</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-coverups.html\">Coverups</a>-]
 # | {+href=\"/proprietary/proprietary-fraud.html\">Fraud</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-coverups.html\">Coverups</a>"
 msgid "<a href=\"/proprietary/proprietary-fraud.html\">Fraud</a>"
@@ -179,10 +179,10 @@
 msgid "<a href=\"/proprietary/proprietary-interference.html\">Interference</a>"
 msgstr "<a href=\"/proprietary/proprietary-interference.html\">干擾</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-sabotage.html\">Sabotage</a>-]
 # | {+href=\"/proprietary/proprietary-jails.html\">Jails</a>&nbsp;(<a
 # | href=\"#f3\">3</a>)+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-sabotage.html\">Sabotage</a>"
 msgid ""
@@ -190,17 +190,17 @@
 "\"#f3\">3</a>)"
 msgstr "<a href=\"/proprietary/proprietary-sabotage.html\">破壞</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-deception.html\">Deception</a>-]
 # | {+href=\"/proprietary/proprietary-manipulation.html\">Manipulation</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-deception.html\">Deception</a>"
 msgid "<a href=\"/proprietary/proprietary-manipulation.html\">Manipulation</a>"
 msgstr "<a href=\"/proprietary/proprietary-deception.html\">欺騙</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-deception.html\">Deception</a>-]
 # | {+href=\"/proprietary/proprietary-obsolescence.html\">Obsolescence</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-deception.html\">Deception</a>"
 msgid "<a href=\"/proprietary/proprietary-obsolescence.html\">Obsolescence</a>"
@@ -219,11 +219,11 @@
 msgid "<a href=\"/proprietary/proprietary-surveillance.html\">Surveillance</a>"
 msgstr "<a href=\"/proprietary/proprietary-surveillance.html\">監控</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-tethers.html\">Tethers</a> to
 # | servers-]
 # | {+href=\"/proprietary/proprietary-tethers.html\">Tethers</a>&nbsp;(<a
 # | href=\"#f4\">4</a>)+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/proprietary-tethers.html\">Tethers</a> to servers"
@@ -232,10 +232,10 @@
 "\"#f4\">4</a>)"
 msgstr "<a 
href=\"/proprietary/proprietary-tethers.html\">綁死</a>在伺服器"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/proprietary-sabotage.html\">Sabotage</a>-]
 # | {+href=\"/proprietary/proprietary-tyrants.html\">Tyrants</a>&nbsp;(<a
 # | href=\"#f5\">5</a>)+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/proprietary-sabotage.html\">Sabotage</a>"
 msgid ""
@@ -243,19 +243,19 @@
 "\"#f5\">5</a>)"
 msgstr "<a href=\"/proprietary/proprietary-sabotage.html\">破壞</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/potential-malware.html\">Potential Malware</a>-]
 # | {+href=\"/proprietary/potential-malware.html\">In the pipe</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/potential-malware.html\">Potential Malware</a>"
 msgid "<a href=\"/proprietary/potential-malware.html\">In the pipe</a>"
 msgstr "<a 
href=\"/proprietary/potential-malware.html\">潛藏性惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-appliances.html\">Malware in
 # | appliances</a>-]
 # | {+href=\"/proprietary/malware-appliances.html\">Appliances</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/malware-appliances.html\">Malware in appliances</a>"
@@ -263,25 +263,25 @@
 msgstr ""
 "<a 
href=\"/proprietary/malware-appliances.html\">應用程式的惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-cars.html\">Malware in cars</a>-]
 # | {+href=\"/proprietary/malware-cars.html\">Cars</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/malware-cars.html\">Malware in cars</a>"
 msgid "<a href=\"/proprietary/malware-cars.html\">Cars</a>"
 msgstr "<a href=\"/proprietary/malware-games.html\">車內的惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-games.html\">Malware in games</a>-]
 # | {+href=\"/proprietary/malware-games.html\">Games</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/malware-games.html\">Malware in games</a>"
 msgid "<a href=\"/proprietary/malware-games.html\">Games</a>"
 msgstr "<a href=\"/proprietary/malware-games.html\">遊戲的惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-mobiles.html\">Malware in mobile
 # | devices</a>-] {+href=\"/proprietary/malware-mobiles.html\">Mobiles</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/malware-mobiles.html\">Malware in mobile devices</"
@@ -289,50 +289,50 @@
 msgid "<a href=\"/proprietary/malware-mobiles.html\">Mobiles</a>"
 msgstr "<a 
href=\"/proprietary/malware-mobiles.html\">行動裝置的惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-webpages.html\">Malware in webpages</a>-]
 # | {+href=\"/proprietary/malware-webpages.html\">Webpages</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/malware-webpages.html\">Malware in webpages</a>"
 msgid "<a href=\"/proprietary/malware-webpages.html\">Webpages</a>"
 msgstr "<a href=\"/proprietary/malware-webpages.html\">網é 
çš„惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-adobe.html\">Adobe Malware</a>-]
 # | {+href=\"/proprietary/malware-adobe.html\">Adobe</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/malware-adobe.html\">Adobe Malware</a>"
 msgid "<a href=\"/proprietary/malware-adobe.html\">Adobe</a>"
 msgstr "<a href=\"/proprietary/malware-adobe.html\">Adobe 惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-amazon.html\">Amazon Malware</a>-]
 # | {+href=\"/proprietary/malware-amazon.html\">Amazon</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/malware-amazon.html\">Amazon Malware</a>"
 msgid "<a href=\"/proprietary/malware-amazon.html\">Amazon</a>"
 msgstr "<a href=\"/proprietary/malware-amazon.html\">Amazon 惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-apple.html\">Apple Malware</a>-]
 # | {+href=\"/proprietary/malware-apple.html\">Apple</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/malware-apple.html\">Apple Malware</a>"
 msgid "<a href=\"/proprietary/malware-apple.html\">Apple</a>"
 msgstr "<a href=\"/proprietary/malware-apple.html\">蘋果惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-google.html\">Google Malware</a>-]
 # | {+href=\"/proprietary/malware-google.html\">Google</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid "<a href=\"/proprietary/malware-google.html\">Google Malware</a>"
 msgid "<a href=\"/proprietary/malware-google.html\">Google</a>"
 msgstr "<a href=\"/proprietary/malware-google.html\">Google 惡意軟體</a>"
 
+#. type: Content of: <div><table><tr><td><ul><li>
 # | <a [-href=\"/proprietary/malware-microsoft.html\">Microsoft Malware</a>-]
 # | {+href=\"/proprietary/malware-microsoft.html\">Microsoft</a>+}
-#. type: Content of: <div><table><tr><td><ul><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/malware-microsoft.html\">Microsoft Malware</a>"
@@ -346,11 +346,11 @@
 "send it commands."
 msgstr ""
 
+#. type: Content of: <div><table><tr><td><ol><li>
 # | [-<a href=\"/proprietary/proprietary-drm.html\">Digital-]{+<em>Digital+}
 # | restrictions [-management</a>-] {+management,+} or [-&ldquo;DRM&rdquo;
 # | means-] {+&ldquo;DRM&rdquo;:</em>&nbsp;+} functionalities designed to
 # | restrict what users can do with the data in their computers.
-#. type: Content of: <div><table><tr><td><ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/proprietary-drm.html\">Digital restrictions "
@@ -364,10 +364,10 @@
 "<a 
href=\"/proprietary/proprietary-drm.html\">數位限制管理</a>或稱「DRM」,代"
 "表用來限制哪些使用者可以對自身電腦資料能做哪些事情
的功能。"
 
+#. type: Content of: <div><table><tr><td><ol><li>
 # | [-<a
 # | 
href=\"/proprietary/proprietary-jails.html\">Jails</a>&mdash;systems-]{+<em>Jail:</em>&nbsp;
 # | system+} that impose{+s+} censorship on application programs.
-#. type: Content of: <div><table><tr><td><ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/proprietary-jails.html\">Jails</a>&mdash;systems "
@@ -384,11 +384,11 @@
 "frequent) connection to a server."
 msgstr ""
 
+#. type: Content of: <div><table><tr><td><ol><li>
 # | [-<a
 # | 
href=\"/proprietary/proprietary-tyrants.html\">Tyrants</a>&mdash;systems-]{+<em>Tyrant:</em>&nbsp;
 # | system+} that reject{+s+} any operating system not
 # | &ldquo;authorized&rdquo; by the manufacturer.
-#. type: Content of: <div><table><tr><td><ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/proprietary/proprietary-tyrants.html\">Tyrants</a>&mdash;"
@@ -401,13 +401,13 @@
 "<a href=\"/proprietary/proprietary-tyrants.html\">暴君 
(Tyrant)</a>&mdash;拒"
 "絕任何廠商未授權作業系統的系統。"
 
+#. type: Content of: <div><p>
 # | Users of proprietary software are defenseless against these forms of
 # | mistreatment.  The way to avoid them is by insisting on <a
 # | href=\"/philosophy/free-software-even-more-important.html\">free
 # | (freedom-respecting) [-software.</a>-] {+software</a>.+}  Since free
 # | software is controlled by its users, they have a pretty good defense
 # | against malicious software functionality.
-#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Users of proprietary software are defenseless against these forms of "
@@ -589,12 +589,7 @@
 "translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
 "宜。"
 
-# | Copyright &copy; 2013, 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019,
-# | 2020+} Free Software Foundation, Inc.
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2013, 2014, 2015, 2016, 2017, 2018 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free "
 "Software Foundation, Inc."
@@ -602,8 +597,8 @@
 "Copyright &copy; 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free "
 "Software Foundation, Inc."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid ""
 #| "This page is licensed under a <a rel=\"license\" href=\"http://";

Index: server/footer-text.zh-tw.html
===================================================================
RCS file: /web/www/www/server/footer-text.zh-tw.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/footer-text.zh-tw.html       16 Feb 2019 18:30:13 -0000      1.26
+++ server/footer-text.zh-tw.html       8 Feb 2020 09:59:59 -0000       1.27
@@ -10,7 +10,7 @@
   <li class="gnu"><a href="/graphics/graphics.html">GNU&nbsp;藝術</a></li>
   <li class="gnu"><a href="/people/people.html">GNU&nbsp;有誰?</a></li>
   <li class="gnu"><a href="/server/sitemap.html">網站地圖</a></li>
-  <li><a href="//directory.fsf.org">SOFTWARE&nbsp;DIRECTORY</a></li>
+  <li><a href="//directory.fsf.org">自由軟體目錄</a></li>
   <li><a href="https://h-node.org/";>硬體</a></li>
  </ul>
 </div>
@@ -26,9 +26,9 @@
 
 <p id="support-the-fsf" class="button">
   <a class="join"
-href="//www.fsf.org/associate/support_freedom?referrer=4052">JOIN</a> <a
-class="donate" href="//donate.fsf.org/">DONATE</a> <a class="shop"
-href="//shop.fsf.org/">SHOP</a>
+href="//www.fsf.org/associate/support_freedom?referrer=4052">加入</a> <a
+class="donate" href="//donate.fsf.org/">贊助</a> <a class="shop"
+href="//shop.fsf.org/">購物</a>
 </p>
 
 </div>

Index: server/po/footer-text.zh-tw.po
===================================================================
RCS file: /web/www/www/server/po/footer-text.zh-tw.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/po/footer-text.zh-tw.po      8 Feb 2020 09:26:33 -0000       1.35
+++ server/po/footer-text.zh-tw.po      8 Feb 2020 09:59:59 -0000       1.36
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-02-14 13:26+0000\n"
 "X-Generator: Poedit 2.2.4\n"
 
 #. type: Content of: <div>
@@ -39,8 +38,6 @@
 msgid "<a href=\"/server/sitemap.html\">SITEMAP</a>"
 msgstr "<a href=\"/server/sitemap.html\">網站地圖</a>"
 
-# | <a [-href=\"//directory.fsf.org\">FREE&nbsp;SOFTWARE&nbsp;DIR.</a>-]
-# | {+href=\"//directory.fsf.org\">SOFTWARE&nbsp;DIRECTORY</a>+}
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"//directory.fsf.org\">SOFTWARE&nbsp;DIRECTORY</a>"
 msgstr "<a href=\"//directory.fsf.org\">自由軟體目錄</a>"



reply via email to

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