Rename debian entity to debian-gnu.

13 files changed, 130 insertions, 130 deletions

diff --git a/po/zh_TW/bookinfo.po b/po/zh_TW/bookinfo.po
index 6118a5e16..567dfa5a9 100644
--- a/po/zh_TW/bookinfo.po
+++ b/po/zh_TW/bookinfo.po
@@ -14,21 +14,21 @@ msgstr ""
 #. Tag: title
 #: bookinfo.xml:5
 #, no-c-format
-msgid "&debian; Installation Guide"
-msgstr "&debian; 安裝手冊"
+msgid "&debian-gnu; Installation Guide"
+msgstr "&debian-gnu; 安裝手冊"
 
 #. Tag: para
 #: bookinfo.xml:8
 #, fuzzy, no-c-format
 msgid ""
-"This document contains installation instructions for the &debian; &release; "
+"This document contains installation instructions for the &debian-gnu; &release; "
 "system (codename <quote>&releasename;</quote>), for the &arch-title; "
 "(<quote>&architecture;</quote>) architecture. It also contains pointers to "
 "more information and information on how to make the most of your new Debian "
 "system."
 msgstr ""
 "本文件包含了在 &arch-title; (<quote>&architecture;</quote>) 硬體架構下 "
-"&debian; &release; 系統的安裝指引。文章內容還包括建立最適合您的 Debian 系統的"
+"&debian-gnu; &release; 系統的安裝指引。文章內容還包括建立最適合您的 Debian 系統的"
 "資訊，以及其他相關資料的超鏈結。"
 
 #. Tag: para
diff --git a/po/zh_TW/boot-installer.po b/po/zh_TW/boot-installer.po
index 1f8b0e258..8ea6bdc0c 100644
--- a/po/zh_TW/boot-installer.po
+++ b/po/zh_TW/boot-installer.po
@@ -440,7 +440,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian; installer."
+"asked and the system will be prepared to start the &debian-gnu; installer."
 msgstr ""
 
 #. Tag: title
@@ -4025,18 +4025,18 @@ msgstr ""
 
 #~ msgid ""
 #~ "GNU/Linux is the only operating system on Alpha that can be booted from "
-#~ "both console types, but &debian; &release; only supports booting on SRM-"
+#~ "both console types, but &debian-gnu; &release; only supports booting on SRM-"
 #~ "based systems. If you have an Alpha for which no version of SRM is "
 #~ "available, if you will be dual-booting the system with Windows NT, or if "
 #~ "your boot device requires ARC console support for BIOS initialization, "
-#~ "you will not be able to use the &debian; &release; installer. You can "
-#~ "still run &debian; &release; on such systems by using other install "
+#~ "you will not be able to use the &debian-gnu; &release; installer. You can "
+#~ "still run &debian-gnu; &release; on such systems by using other install "
 #~ "media; for instance, you can install Debian woody with MILO and upgrade."
 #~ msgstr ""
-#~ "由於 GNU/Linux 是唯一能夠透過兩種控制台格式開機的系統，但是 &debian; "
+#~ "由於 GNU/Linux 是唯一能夠透過兩種控制台格式開機的系統，但是 &debian-gnu; "
 #~ "$release只支援從以 SRM 為基礎的系統開機。如果您的 Alpha 沒有任何版本的 "
 #~ "SRM，如果您希望和 Windows NT 做雙重開機，或是您個開機設備需要 ARC 控制台支"
-#~ "援 BIOS 的初始化，您無法使用 &debian; &release; 安裝程式。所有其他的 Unix "
+#~ "援 BIOS 的初始化，您無法使用 &debian-gnu; &release; 安裝程式。所有其他的 Unix "
 #~ "型作業系統 (Tru64 Unix，FreeBSD，OpenBSD，以及 NetBSD) 和 OpenVMS 只能從 "
 #~ "SRM 上面開機，而 Windows NT 只能從 ARC 上面開機。"
 
@@ -4253,24 +4253,24 @@ msgstr ""
 #~ "firmware. Also, once SRM is installed, it is possible to run ARC/"
 #~ "AlphaBIOS from a floppy disk (using the <command>arc</command> command). "
 #~ "For the reasons mentioned above, we recommend switching to SRM before "
-#~ "installing &debian;."
+#~ "installing &debian-gnu;."
 #~ msgstr ""
 #~ "大部分 AlphaServers 以及目前所有的伺服器以及工作站產品韌體中都同時含有 "
 #~ "SRM 和 AlphaBIOS 。對於具有不同試用主機板的 <quote>half-flash</quote> 機器"
 #~ "來說。可以透過重寫韌體切換到另外一個版本。一旦 SRM 安裝完畢，從軟碟上運行 "
 #~ "ARC/AlphaBIOS 也是可能的 (使用 <command>arc</command>)。基於上述理由，我們"
-#~ "建議在安裝 &debian; 之前切換至 SRM。"
+#~ "建議在安裝 &debian-gnu; 之前切換至 SRM。"
 
 #~ msgid ""
 #~ "As on other architectures, you should install the newest available "
 #~ "revision of the firmware<footnote> <para> Except on Jensen, where Linux "
 #~ "is not supported on firmware versions newer than 1.7 &mdash; see <ulink "
 #~ "url=\"&url-jensen-howto;\"></ulink> for more information. </para> </"
-#~ "footnote> before installing &debian;. For Alpha, firmware updates can be "
+#~ "footnote> before installing &debian-gnu;. For Alpha, firmware updates can be "
 #~ "obtained from <ulink url=\"&url-alpha-firmware;\">Alpha Firmware Updates</"
 #~ "ulink>."
 #~ msgstr ""
-#~ "和其他的架構一樣，您也應該在安裝 &debian; 之前安裝最新的韌體版本。但 "
+#~ "和其他的架構一樣，您也應該在安裝 &debian-gnu; 之前安裝最新的韌體版本。但 "
 #~ "<footnote><para> 不包括 Jensen 1.7 以上的韌體版本，其不支援 Linux &mdash; "
 #~ "請參閱 <ulink url=\"&url-jensen-howto;\"></ulink> 以取得更多的資訊。</"
 #~ "para> </footnote>。對於 Alpha 來說，韌體升級可以從 <ulink url=\"&url-"
diff --git a/po/zh_TW/boot-new.po b/po/zh_TW/boot-new.po
index 8eb2841ab..c74d617ac 100644
--- a/po/zh_TW/boot-new.po
+++ b/po/zh_TW/boot-new.po
@@ -158,11 +158,11 @@ msgstr "NewWorld PowerMacs"
 #, no-c-format
 msgid ""
 "On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian; will "
+"and get a graphical screen with a button for each bootable OS, &debian-gnu; will "
 "be a button with a small penguin icon."
 msgstr ""
 "在 G4 機器和 iBooks 上，您可以按住 <keycap>option</keycap> 鍵，進入一個圖形介"
-"面，每個可以啟動的系統會對應到一個圖示，&debian; 將是一個企鵝的圖示。"
+"面，每個可以啟動的系統會對應到一個圖示，&debian-gnu; 將是一個企鵝的圖示。"
 
 #. Tag: para
 #: boot-new.xml:104
@@ -193,15 +193,15 @@ msgstr ""
 #: boot-new.xml:118
 #, no-c-format
 msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
+"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; "
 "by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE "
+"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE "
 "disk this may not work and you will have to enter OpenFirmware and set the "
 "<envar>boot-device</envar> variable, <command>ybin</command> normally does "
 "this automatically."
 msgstr ""
-"重設 G3 或 G4 硬體上的 OpenFirmware 將導致預設啟動 &debian; (假設您正確分割"
-"區， 並將 Apple_Bootstrap 分割區放在首位)。如果您將 &debian; 放在 SCSI 磁碟，"
+"重設 G3 或 G4 硬體上的 OpenFirmware 將導致預設啟動 &debian-gnu; (假設您正確分割"
+"區， 並將 Apple_Bootstrap 分割區放在首位)。如果您將 &debian-gnu; 放在 SCSI 磁碟，"
 "而 MacOS 位於 IDE 磁碟，這也許不會運作，而您不得不進入 OpenFirmware 並設定 "
 "<envar>boot-device</envar> 變數，<command>ybin</command> 通常會自動完成這個動"
 "作。"
@@ -210,13 +210,13 @@ msgstr ""
 #: boot-new.xml:127
 #, no-c-format
 msgid ""
-"After you boot &debian; for the first time you can add any additional "
+"After you boot &debian-gnu; for the first time you can add any additional "
 "options you desire (such as dual boot options) to <filename>/etc/yaboot."
 "conf</filename> and run <command>ybin</command> to update your boot "
 "partition with the changed configuration. Please read the <ulink url=\"&url-"
 "powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
 msgstr ""
-"在首次啟動 &debian; 之後，您可以添加額外選項 (如雙啟動選項) 到 <filename>/"
+"在首次啟動 &debian-gnu; 之後，您可以添加額外選項 (如雙啟動選項) 到 <filename>/"
 "etc/yaboot.conf</filename> 並執行 <command>ybin</command> 以更新修改過的設"
 "定。請參閱 <ulink url=\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</ulink> 以了"
 "解更多資訊。"
diff --git a/po/zh_TW/hardware.po b/po/zh_TW/hardware.po
index 64b0e2690..123073ff5 100644
--- a/po/zh_TW/hardware.po
+++ b/po/zh_TW/hardware.po
@@ -43,12 +43,12 @@ msgid ""
 "to which the Linux kernel, libc, <command>gcc</command>, etc. have been "
 "ported, and for which a Debian port exists, can run Debian. Please refer to "
 "the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on "
-"&arch-title; architecture systems which have been tested with &debian;."
+"&arch-title; architecture systems which have been tested with &debian-gnu;."
 msgstr ""
 "Debian 不會超出 Linux 核心與 GNU 工具集所支援的硬體範圍之外。因此，任何移植"
 "了 Linux 核心、libc、<command>gcc</command>，以及針對 Debian 移植的硬體架構或"
 "平台都可以運行 Debian。請參考移植網頁 <ulink url=\"&url-ports;\"></ulink> 以"
-"瞭解更多已被 &debian; 測試過的 &arch-title; 架構。"
+"瞭解更多已被 &debian-gnu; 測試過的 &arch-title; 架構。"
 
 #. Tag: para
 #: hardware.xml:32
@@ -460,7 +460,7 @@ msgstr ""
 #: hardware.xml:188
 #, fuzzy, no-c-format
 msgid ""
-"This is the first official release of &debian; for the &arch-title; "
+"This is the first official release of &debian-gnu; for the &arch-title; "
 "architecture. We feel that it has proven itself sufficiently to be released. "
 "However, because it has not had the exposure (and hence testing by users) "
 "that some other architectures have had, you may encounter a few bugs. Use "
@@ -469,7 +469,7 @@ msgid ""
 "platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;"
 "\">debian-&arch-listname; mailing list</ulink> as well."
 msgstr ""
-"此為第一個 &arch-title; 架構的 &debian; 官方發佈版。我們認為它已經到達可發佈"
+"此為第一個 &arch-title; 架構的 &debian-gnu; 官方發佈版。我們認為它已經到達可發佈"
 "的品質要求。但是，由於它沒有像其他架構那樣得到足夠的曝光(經過使用者測試)，您"
 "可能會遇到一些臭蟲。請使用我們的 <ulink url=\"&url-bts;\">臭蟲追蹤系統</"
 "ulink>來報告問題，並註明該臭蟲是在 &arch-title; 平台上產生的。您也可以透過 "
@@ -816,7 +816,7 @@ msgstr ""
 #: hardware.xml:566
 #, no-c-format
 msgid ""
-"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
+"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
 "subarchitectures are supported."
 msgstr ""
 
@@ -1870,7 +1870,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel can "
-"generally be made to work under &debian;, but are not supported during the "
+"generally be made to work under &debian-gnu;, but are not supported during the "
 "installation."
 msgstr ""
 
@@ -1888,7 +1888,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
-"during the installation, it is still possible to install &debian; using a "
+"during the installation, it is still possible to install &debian-gnu; using a "
 "full CD-ROM or DVD image. Select the option to not configure a network and "
 "install using only the packages available from the CD/DVD. You can then "
 "install the driver and firmware you need after the installation is completed "
@@ -1989,7 +1989,7 @@ msgid ""
 "in <classname>brltty</classname>. Most displays work under "
 "<classname>brltty</classname>, connected via either a serial port, USB or "
 "bluetooth. Details on supported braille devices can be found on the <ulink "
-"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; "
+"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; "
 "&release; ships with <classname>brltty</classname> version &brlttyver;."
 msgstr ""
 
@@ -2009,7 +2009,7 @@ msgid ""
 "devices connected to a serial port (no USB or serial-to-USB adapters are "
 "supported). Details on supported hardware speech synthesis devices can be "
 "found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
-"website</ulink>. &debian; &release; ships with <classname>speakup</"
+"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
 "classname> version &speakupver;."
 msgstr ""
 
@@ -2093,9 +2093,9 @@ msgstr ""
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
-"&debian; project and thus cannot be included in the main distribution or in "
+"&debian-gnu; project and thus cannot be included in the main distribution or in "
 "the installation system. If the device driver itself is included in the "
-"distribution and if &debian; legally can distribute the firmware, it will "
+"distribution and if &debian-gnu; legally can distribute the firmware, it will "
 "often be available as a separate package from the non-free section of the "
 "archive."
 msgstr ""
@@ -2105,7 +2105,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian; 5.0, &d-i; supports loading firmware "
+"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware "
 "files or packages containing firmware from a removable medium, such as a "
 "floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
 "detailed information on how to load firmware files or packages during the "
@@ -2489,12 +2489,12 @@ msgstr "Un*x 或 GNU 系統"
 #, fuzzy, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of this manual. This "
+"&debian-gnu; without using the &d-i; described in the rest of this manual. This "
 "kind of install may be useful for users with otherwise unsupported hardware "
 "or on hosts which can't afford downtime. If you are interested in this "
 "technique, skip to the <xref linkend=\"linux-upgrade\"/>."
 msgstr ""
-"如果您正在使用其它的類 Unix 系統，也可以用它來安裝 &debian; 而無須本手冊其他"
+"如果您正在使用其它的類 Unix 系統，也可以用它來安裝 &debian-gnu; 而無須本手冊其他"
 "部分所描述的 &d-i; 使用方法。這類安裝方法可能對那些因為硬體不支援或機器停產的"
 "使用者有用。如果您對此技術感興趣，請直接跳到 <xref linkend=\"linux-upgrade\"/"
 ">。"
diff --git a/po/zh_TW/install-methods.po b/po/zh_TW/install-methods.po
index b92018cb0..4ebd66e63 100644
--- a/po/zh_TW/install-methods.po
+++ b/po/zh_TW/install-methods.po
@@ -20,14 +20,14 @@ msgstr "取得系統安裝媒介"
 #. Tag: title
 #: install-methods.xml:12
 #, no-c-format
-msgid "Official &debian; CD-ROM Sets"
-msgstr "&debian; 官方光碟套件"
+msgid "Official &debian-gnu; CD-ROM Sets"
+msgstr "&debian-gnu; 官方光碟套件"
 
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
 msgid ""
-"By far the easiest way to install &debian; is from an Official Debian CD-ROM "
+"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM "
 "Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-"
 "vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images "
 "from a Debian mirror and make your own set, if you have a fast network "
@@ -40,7 +40,7 @@ msgid ""
 "above. You may also consider using the DVD version, which saves a lot of "
 "space on your shelf and you avoid the CD shuffling marathon."
 msgstr ""
-"目前安裝 &debian; 最容易的方法是使用一個官方的 Debian光碟套件。您可以向零售商"
+"目前安裝 &debian-gnu; 最容易的方法是使用一個官方的 Debian光碟套件。您可以向零售商"
 "購買 (參閱 <ulink url=\"&url-debian-cd-vendors;\">光碟零售商</ulink>)。如果您"
 "有快速的網路連接和光碟燒錄機的話，也可以從 Debian 鏡像站下載光碟映像檔然後自"
 "行燒錄光碟 (具體參閱 <ulink url=\"&url-debian-cd;\">Debian 光碟網頁</"
@@ -546,11 +546,11 @@ msgstr "寫入磁碟映像檔：使用<command>Disk Copy</command>"
 #, no-c-format
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
-"official &debian; CD, then the Type and Creator are already set correctly. "
+"official &debian-gnu; CD, then the Type and Creator are already set correctly. "
 "The following <command>Creator-Changer</command> steps are only necessary if "
 "you downloaded the image files from a Debian mirror."
 msgstr ""
-"假如您是使用官方 &debian;光碟上的軟碟映像檔文件，那麼 Type 和 Creator 已經設"
+"假如您是使用官方 &debian-gnu;光碟上的軟碟映像檔文件，那麼 Type 和 Creator 已經設"
 "置正確。 以下 <command>Creator-Changer</command> 步驟只針對從 Debian 鏡像站下"
 "載映像檔的情況。"
 
@@ -1610,7 +1610,7 @@ msgstr ""
 #: install-methods.xml:1124
 #, no-c-format
 msgid ""
-"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's "
 "written by the same author as the <classname>syslinux</classname> bootloader "
 "and is therefore least likely to cause issues. A good alternative is "
 "<classname>atftpd</classname>."
@@ -1670,7 +1670,7 @@ msgstr "設置 DHCP 伺服器"
 #: install-methods.xml:1175
 #, no-c-format
 msgid ""
-"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
+"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, "
 "the <classname>dhcp3-server</classname> package is recommended. Here is a "
 "sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</"
 "filename>):"
@@ -1700,7 +1700,7 @@ msgid ""
 "  fixed-address 192.168.1.90;\n"
 "}"
 msgstr ""
-"ISC <command>dhcpd</command> 是一種自由軟體 DHCP 伺服器。在 &debian; 裡，它被"
+"ISC <command>dhcpd</command> 是一種自由軟體 DHCP 伺服器。在 &debian-gnu; 裡，它被"
 "包含在 <classname>dhcp</classname> 軟體套件中。這裡有它的一個設定檔的範例(通"
 "常是 <filename>/etc/dhcpd.conf</filename>)：<informalexample><screen>\n"
 "option domain-name \"example.com\";\n"
@@ -1842,13 +1842,13 @@ msgstr "設置 BOOTP 伺服器"
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
 "<command>bootpd</command>. The other is actually a DHCP server: ISC "
-"<command>dhcpd</command>. In &debian; these are contained in the "
+"<command>dhcpd</command>. In &debian-gnu; these are contained in the "
 "<classname>bootp</classname> and <classname>dhcp3-server</classname> "
 "packages respectively."
 msgstr ""
 "在 GNU/Linux 下面有兩種 BOOTP 伺服器。他們是 CMU <command>bootpd</command> 和"
 "另外一種實際上是 DHCP 伺服器的程式 ISC <command>dhcpd</command>，他們被包含"
-"在 &debian; 的 <classname>bootp</classname> 和 <classname>dhcp</classname> 軟"
+"在 &debian-gnu; 的 <classname>bootp</classname> 和 <classname>dhcp</classname> 軟"
 "體套件中。"
 
 #. Tag: para
@@ -1856,7 +1856,7 @@ msgstr ""
 #, fuzzy, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
-"relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
+"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can "
 "run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
 "etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
 "does not run Debian, the line in question should look like: "
@@ -1886,7 +1886,7 @@ msgid ""
 "userinput> variable is the machine's MAC address. </phrase>"
 msgstr ""
 "要使用 CMU <command>bootpd</command>，您必須先將 <filename>/etc/inetd.conf</"
-"filename> 中相關的註釋標記去掉 (或者加入一些新行)。在 &debian; 裡，您可以執"
+"filename> 中相關的註釋標記去掉 (或者加入一些新行)。在 &debian-gnu; 裡，您可以執"
 "行 <userinput>update-inetd --enable bootps</userinput>，然後執行 <userinput>/"
 "etc/init.d/inetd reload</userinput> 來完成此工作。在其它系統中，這行設定應該"
 "看起來像這樣：<informalexample><screen>\n"
@@ -1958,7 +1958,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
-"to serve images from. However, &debian; packages may use other directories "
+"to serve images from. However, &debian-gnu; packages may use other directories "
 "to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
 "Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default "
 "uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the "
@@ -2214,12 +2214,12 @@ msgstr ""
 #~ msgid ""
 #~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
 #~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "a &debian-gnu; server, the <classname>atftpd</classname> and <classname>tftpd-"
 #~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
 #~ "classname>."
 #~ msgstr ""
 #~ "如果想用 TFTP 的 Pre-boot Execution Environment (PXE) 方式啟動，您將需要一"
-#~ "台支援 <userinput>tsize</userinput> 的 TFTP 伺服器。在 &debian; 伺服器上，"
+#~ "台支援 <userinput>tsize</userinput> 的 TFTP 伺服器。在 &debian-gnu; 伺服器上，"
 #~ "<classname>atftpd</classname> 和 <classname>tftpd-hpa</classname>套件符合"
 #~ "此要求，我們建議使用 <classname>tftpd-hpa</classname>。"
 
diff --git a/po/zh_TW/installation-howto.po b/po/zh_TW/installation-howto.po
index 0f0dfcb27..7c018a4c0 100644
--- a/po/zh_TW/installation-howto.po
+++ b/po/zh_TW/installation-howto.po
@@ -21,7 +21,7 @@ msgstr "安裝 Howto"
 #: installation-howto.xml:7
 #, fuzzy, no-c-format
 msgid ""
-"This document describes how to install &debian; &releasename; for the &arch-"
+"This document describes how to install &debian-gnu; &releasename; for the &arch-"
 "title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick "
 "walkthrough of the installation process which should contain all the "
 "information you will need for most installs. When more information can be "
@@ -29,9 +29,9 @@ msgid ""
 "document."
 msgstr ""
 "本文介紹了如何在 &arch-title; (<quote>&architecture;</quote>)架構的電腦上，使"
-"用新版 &d-i; 來安裝 &debian; &releasename;。我們簡要說明安裝過程，但會囊括了"
+"用新版 &d-i; 來安裝 &debian-gnu; &releasename;。我們簡要說明安裝過程，但會囊括了"
 "大多數情況下您進行安裝所需的訊息。當有必要取得更多訊息時，我們會有較詳盡的說"
-"明文件 <link linkend=\"debian_installation_guide\">&debian;安裝指南</link>。"
+"明文件 <link linkend=\"debian_installation_guide\">&debian-gnu;安裝指南</link>。"
 
 #. Tag: title
 #: installation-howto.xml:19
diff --git a/po/zh_TW/partitioning.po b/po/zh_TW/partitioning.po
index 61aa13306..7113932df 100644
--- a/po/zh_TW/partitioning.po
+++ b/po/zh_TW/partitioning.po
@@ -108,13 +108,13 @@ msgstr "目錄樹"
 #: partitioning.xml:68
 #, no-c-format
 msgid ""
-"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
+"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
 "Standard</ulink> for directory and file naming. This standard allows users "
 "and software programs to predict the location of files and directories. The "
 "root level directory is represented simply by the slash <filename>/</"
 "filename>. At the root level, all Debian systems include these directories:"
 msgstr ""
-"&debian; 依照 <ulink url=\"&url-fhs-home;\">檔案系統層次標準 (Filesystem "
+"&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">檔案系統層次標準 (Filesystem "
 "Hierarchy Standard)</ulink> 為目錄以及檔案命名。這個標準允許使用者以及軟體程"
 "式預測檔案及目錄的位置。根層次目錄只是簡單表現為 <filename>/</filename>。在根"
 "層次，所有的 Debian 系統包括這些目錄："
@@ -1040,13 +1040,13 @@ msgid ""
 "Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
 "usable primary partitions, 12 logical partitions), and 63 partitions on an "
 "IDE drive (3 usable primary partitions, 60 logical partitions). However the "
-"normal &debian; system provides only 20 devices for partitions, so you may "
+"normal &debian-gnu; system provides only 20 devices for partitions, so you may "
 "not install on partitions higher than 20 unless you first manually create "
 "devices for those partitions."
 msgstr ""
 "對於 SCSI 來說，Linux 限制每個磁碟最多有 15 個分割區( 3 個可用的主分割區，12 "
 "個邏輯分割區)。對於 IDE 來說可以有 63 個分割區( 3 個可用的主分割區， 60 個邏"
-"輯分割區)。但是通常 &debian; 系統只支持 20 個分割區裝置，因此您不能安裝超過 "
+"輯分割區)。但是通常 &debian-gnu; 系統只支持 20 個分割區裝置，因此您不能安裝超過 "
 "20 個的分割區，除非您先為這些分割區手動建立裝置檔案。"
 
 #. Tag: para
@@ -1378,7 +1378,7 @@ msgstr ""
 #: partitioning.xml:850
 #, no-c-format
 msgid ""
-"In order for OpenFirmware to automatically boot &debian; the bootstrap "
+"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
 "partition should appear before other boot partitions on the disk, especially "
 "MacOS boot partitions. The bootstrap partition should be the first one you "
 "create. However, if you add a bootstrap partition later, you can use "
@@ -1387,7 +1387,7 @@ msgid ""
 "(which is always partition 1). It's the logical map order, not the physical "
 "address order, that counts."
 msgstr ""
-"為了確保 OpenFirmware 能夠自動啟動 &debian;，開機磁區必須位於硬碟上其他開機磁"
+"為了確保 OpenFirmware 能夠自動啟動 &debian-gnu;，開機磁區必須位於硬碟上其他開機磁"
 "區之前，特別是 MacOS 開機磁區。開機分割區應該是您第一個建立的分割區。但是，如"
 "果您在之後新加入開機磁區，您可以使用 <command>mac-fdisk</command> 的 "
 "<userinput>r</userinput> 命令來重新調整分割區順序，如此一來開機磁區就可以在此"
diff --git a/po/zh_TW/post-install.po b/po/zh_TW/post-install.po
index a39b478d7..126bdd95e 100644
--- a/po/zh_TW/post-install.po
+++ b/po/zh_TW/post-install.po
@@ -27,9 +27,9 @@ msgstr ""
 #: post-install.xml:15
 #, no-c-format
 msgid ""
-"To shut down a running &debian; system, you must not reboot with the reset "
+"To shut down a running &debian-gnu; system, you must not reboot with the reset "
 "switch on the front or back of your computer, or just turn off the computer. "
-"&debian; should be shut down in a controlled manner, otherwise files might get "
+"&debian-gnu; should be shut down in a controlled manner, otherwise files might get "
 "lost and/or disk damage might occur. If you run a desktop environment, there "
 "is usually an option to <quote>log out</quote> available from the "
 "application menu that allows you to shutdown (or reboot) the system."
@@ -381,7 +381,7 @@ msgstr ""
 msgid ""
 "Even if you are planning to use a graphical mail program, it is important "
 "that a traditional MTA/MDA is also installed and correctly set up on your "
-"&debian; system. Reason is that various utilities running on the "
+"&debian-gnu; system. Reason is that various utilities running on the "
 "system<footnote> <para> Examples are: <command>cron</command>, "
 "<command>quota</command>, <command>logcheck</command>, <command>aide</"
 "command>, &hellip; </para> </footnote> can send important notices by e-mail "
diff --git a/po/zh_TW/preface.po b/po/zh_TW/preface.po
index 8ab07bf3f..692d216ec 100644
--- a/po/zh_TW/preface.po
+++ b/po/zh_TW/preface.po
@@ -14,21 +14,21 @@ msgstr ""
 #. Tag: title
 #: preface.xml:5
 #, no-c-format
-msgid "Installing &debian; &release; For &architecture;"
-msgstr "在 &architecture; 架構上安裝 &debian; &release;"
+msgid "Installing &debian-gnu; &release; For &architecture;"
+msgstr "在 &architecture; 架構上安裝 &debian-gnu; &release;"
 
 #. Tag: para
 #: preface.xml:6
 #, no-c-format
 msgid ""
 "We are delighted that you have decided to try Debian, and are sure that you "
-"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings "
+"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings "
 "together high-quality free software from around the world, integrating it "
 "into a coherent whole. We believe that you will find that the result is "
 "truly more than the sum of the parts."
 msgstr ""
 "我們非常高興您決定嘗試 Debian，並確信您將發現 Debian 的 GNU/&arch-kernel; 發行套件是"
-"獨一無二的。&debian; 集合了來自世界各地的高品質自由軟體，並將它們緊密的整合在"
+"獨一無二的。&debian-gnu; 集合了來自世界各地的高品質自由軟體，並將它們緊密的整合在"
 "一起。您會發現整合後的效果比單純的程式集合還要更好。"
 
 #. Tag: para
diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po
index 705db2f50..2912ca814 100644
--- a/po/zh_TW/preparing.po
+++ b/po/zh_TW/preparing.po
@@ -14,8 +14,8 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:5
 #, no-c-format
-msgid "Before Installing &debian;"
-msgstr "安裝 &debian; 之前"
+msgid "Before Installing &debian-gnu;"
+msgstr "安裝 &debian-gnu; 之前"
 
 #. Tag: para
 #: preparing.xml:6
@@ -62,7 +62,7 @@ msgstr ""
 #: preparing.xml:35
 #, no-c-format
 msgid ""
-"Under &debian;, it is much more likely that your OS can be repaired rather "
+"Under &debian-gnu;, it is much more likely that your OS can be repaired rather "
 "than replaced if things go wrong. Upgrades never require a wholesale "
 "installation; you can always upgrade in-place. And the programs are almost "
 "always compatible with successive OS releases. If a new program version "
@@ -72,7 +72,7 @@ msgid ""
 "installation, so think of it as your very last option. The installer is "
 "<emphasis>not</emphasis> designed to re-install over an existing system."
 msgstr ""
-"在 &debian; 裡，如果作業系統遇到錯誤，大多數的時候您都能把它修復而不用重新安"
+"在 &debian-gnu; 裡，如果作業系統遇到錯誤，大多數的時候您都能把它修復而不用重新安"
 "裝。在這裡，升級不再需要進行大規模的安裝動作，您可以就地升級它，而這些程式也"
 "總能和新版的作業系統和平共處。如果一個程式的新版本需要其他程式的更新來支援"
 "它，Debian 軟體套件管理系統會自動幫您把所有必須的軟體一併安裝上。關鍵是，"
@@ -184,10 +184,10 @@ msgstr "等待自動化的下載、安裝和設置<firstterm>基本系統</first
 #: preparing.xml:128
 #, no-c-format
 msgid ""
-"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/"
+"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/"
 "or your existing system."
 msgstr ""
-"安裝<firstterm>boot loader</firstterm>，它負責開機 &debian; 和 (或) 已有的其"
+"安裝<firstterm>boot loader</firstterm>，它負責開機 &debian-gnu; 和 (或) 已有的其"
 "他系統。"
 
 #. Tag: para
@@ -255,7 +255,7 @@ msgid ""
 "the <quote>Desktop environment</quote> task, you will only have a relatively "
 "basic, command line driven system. Installing the Desktop environment task "
 "is optional because it requires a fairly large amount of disk space, and "
-"because many &debian; systems are servers which don't really have any need "
+"because many &debian-gnu; systems are servers which don't really have any need "
 "for a graphical user interface to do their job."
 msgstr ""
 
@@ -284,7 +284,7 @@ msgid ""
 "Before you start, make sure to back up every file that is now on your "
 "system. If this is the first time a non-native operating system has been "
 "installed on your computer, it's quite likely you will need to re-partition "
-"your disk to make room for &debian;. Anytime you partition your disk, you "
+"your disk to make room for &debian-gnu;. Anytime you partition your disk, you "
 "run a risk of losing everything on the disk, no matter what program you use "
 "to do it. The programs used in installation are quite reliable and most have "
 "seen years of use; but they are also quite powerful and a false move can "
@@ -1061,7 +1061,7 @@ msgstr ""
 #: preparing.xml:721
 #, fuzzy, no-c-format
 msgid ""
-"Disk space required for the smooth operation of the &debian; system itself "
+"Disk space required for the smooth operation of the &debian-gnu; system itself "
 "is taken into account in these recommended system requirements. Notably, the "
 "<filename>/var</filename> partition contains a lot of state information "
 "specific to Debian in addition to its regular contents, like logfiles. The "
@@ -1186,7 +1186,7 @@ msgstr ""
 #, fuzzy, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
-"replace the current operating system with &debian;, you also can wait to "
+"replace the current operating system with &debian-gnu;, you also can wait to "
 "partition as part of the installation process (<xref linkend=\"di-partition"
 "\"/>), after you have booted the installation system. However this only "
 "works if you plan to boot the installer system from tapes, CD-ROM or files "
@@ -1197,7 +1197,7 @@ msgid ""
 "some alternate means of reviving your machine like the original system's "
 "installation tapes or CDs."
 msgstr ""
-"若是您的機器只有一顆硬碟，而且您願意把原來的作業系統全部替換成 &debian;，那麼"
+"若是您的機器只有一顆硬碟，而且您願意把原來的作業系統全部替換成 &debian-gnu;，那麼"
 "您可以在開機安裝系統後，等待安裝時再進行分割 (<xref linkend=\"partman\"/>)。 "
 "但是，只有當您使用儲存於磁帶、光碟機或者網際網路上的機器的安裝系統，並從它們"
 "開機安裝程式時，前述才適用於您的情形。試想一下：假如您用放在硬碟上的檔案開"
@@ -1242,7 +1242,7 @@ msgid ""
 "of the partitions will be owned by other operating systems, you should "
 "create those partitions using native operating system partitioning programs. "
 "We recommend that you do <emphasis>not</emphasis> attempt to create "
-"partitions for &debian; using another operating system's tools. Instead, you "
+"partitions for &debian-gnu; using another operating system's tools. Instead, you "
 "should just create the native operating system's partitions you will want to "
 "retain."
 msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
 #: preparing.xml:862
 #, no-c-format
 msgid ""
-"In order for OpenFirmware to automatically boot &debian; the Linux "
+"In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
 "partitions should appear before all other partitions on the disk, especially "
 "MacOS boot partitions. This should be kept in mind when pre-partitioning; "
 "you should create a Linux placeholder partition to come <emphasis>before</"
@@ -1288,7 +1288,7 @@ msgid ""
 "placeholder with the Linux partition tools later during the actual install, "
 "and replace it with Linux partitions."
 msgstr ""
-"為了能讓 OpemFirmware 自動開機，&debian; Linux 分割區必須被安置在其它分割區之"
+"為了能讓 OpemFirmware 自動開機，&debian-gnu; Linux 分割區必須被安置在其它分割區之"
 "前，特別是 MacOS 的開機分割區。在分割之前時，這一點您必須牢記在心。也就是說，"
 "您必須在其它可開機分割區<emphasis>之前</emphasis>為 Linux 預留一個分割區。(專"
 "門留給 Apple 的硬碟驅動程式的那些小分割區並不是可開機的。) 您可以在真正安裝"
@@ -1330,9 +1330,9 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
-"Leave either a place holder partition or free space for &debian;."
+"Leave either a place holder partition or free space for &debian-gnu;."
 msgstr ""
-"使用原有系統裡的分割區工具來建立屬於原來系統的分割區。為 &debian; 預留一個分"
+"使用原有系統裡的分割區工具來建立屬於原來系統的分割區。為 &debian-gnu; 預留一個分"
 "割區，或者騰出一塊空間。"
 
 #. Tag: para
@@ -1648,10 +1648,10 @@ msgstr ""
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
 "positioned first in the disk layout. it doesn't matter what type it is, it "
-"will be deleted and replaced later inside the &debian; installer."
+"will be deleted and replaced later inside the &debian-gnu; installer."
 msgstr ""
 "記得要建立一個給 GNU/Linux 佔用的分割區，最好是磁碟分割中的第一個分割區。它的"
-"類型無關緊要，在後面的 &debian; 安裝程式中，它會被刪除並替換。"
+"類型無關緊要，在後面的 &debian-gnu; 安裝程式中，它會被刪除並替換。"
 
 #. Tag: para
 #: preparing.xml:1107
@@ -1709,14 +1709,14 @@ msgid ""
 "involves checking and possibly changing firmware settings for your system. "
 "The <quote>firmware</quote> is the core software used by the hardware; it is "
 "most critically invoked during the bootstrap process (after power-up). Known "
-"hardware issues affecting the reliability of &debian; on your system are "
+"hardware issues affecting the reliability of &debian-gnu; on your system are "
 "also highlighted."
 msgstr ""
 "在本節中，我們將討論安裝之前有關硬體設定的一些問題。如果這些問題的確存在，您"
 "就需要在安裝 Debian 前先做一些準備工作了。一般來說，準備工作包括：檢查韌體"
 "(firmware)以及為您的系統修改韌體中的設定。所謂<quote>韌體</quote>就是硬體運行"
 "所需的核心軟體。它在系統開機過程中有至關重要的作用。我們同時也會著於重提出一"
-"些硬體問題，您系統上這些硬體問題在將會影響到 &debian; 的可靠性。"
+"些硬體問題，您系統上這些硬體問題在將會影響到 &debian-gnu; 的可靠性。"
 
 #. Tag: title
 #: preparing.xml:1163
@@ -2430,7 +2430,7 @@ msgstr "BIOS 設置"
 #: preparing.xml:1646
 #, no-c-format
 msgid ""
-"In order to install &debian; on a &arch-title; or zSeries machine you have "
+"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have "
 "first boot a kernel into the system. The boot mechanism of this platform is "
 "inherently different to other ones, especially from PC-like systems: there "
 "are no floppy devices available at all. You will notice another big "
@@ -2439,7 +2439,7 @@ msgid ""
 "telnet, or a browser. This is due to that special system architecture where "
 "the 3215/3270 console is line-based instead of character-based."
 msgstr ""
-"為了安裝 &debian; 到 &arch-title; 或者 zSeries 機器上，您首先要將核心載入系"
+"為了安裝 &debian-gnu; 到 &arch-title; 或者 zSeries 機器上，您首先要將核心載入系"
 "統。在此平台上的開機機制與其他類型，特別是類 PC 的系統，有著本質上的不同：它"
 "根本就沒有軟碟機。您還會注意到此平台上的另外一個顯著差異：大多數 (如果不是全"
 "部) 的時間，您將借助於一些客戶端連線軟體如 telnet 或者一個瀏覽器， 透過遙控的"
@@ -2564,11 +2564,11 @@ msgstr ""
 #, fuzzy, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
-"&debian; mirror, but only the s390 and architecture-independent files are "
+"&debian-gnu; mirror, but only the s390 and architecture-independent files are "
 "required. You can also copy the contents of all installation CDs into such a "
 "directory tree."
 msgstr ""
-"安裝伺服器需要從任意 &debian; 鏡像複製精確的目錄結構，當然只需複製 s390 相關"
+"安裝伺服器需要從任意 &debian-gnu; 鏡像複製精確的目錄結構，當然只需複製 s390 相關"
 "和一些獨立於架構的檔案。您也可以複製所有的安裝光碟片到這樣的目錄樹中。"
 
 #. Tag: emphasis
@@ -2974,14 +2974,14 @@ msgstr ""
 #~ "system load, you have only a very basic command line driven system. The "
 #~ "graphical interface which displays windows on your monitor will not be "
 #~ "installed unless you select it with <classname>tasksel</classname>. It's "
-#~ "optional because many &debian; systems are servers which don't really "
+#~ "optional because many &debian-gnu; systems are servers which don't really "
 #~ "have any need for a graphical user interface to do their job."
 #~ msgstr ""
 #~ "當 <classname>debian-installer</classname> 程式執行結束、系統首次載入之"
 #~ "前，您只有一個非常簡單的命令列系統。除非您在最後一個步驟裡用 "
 #~ "<classname>tasksel</classname> 或 <classname>aptitude</classname> 選擇安裝"
 #~ "了能在您的顯示器上顯示視窗的圖形界面，否則它將不會被自動安裝。因為許多 "
-#~ "&debian; 系統是被用作伺服器，它們的工作根本不需要任何圖形化的使用者界面，"
+#~ "&debian-gnu; 系統是被用作伺服器，它們的工作根本不需要任何圖形化的使用者界面，"
 #~ "所以它在這裡只是一個選項。"
 
 #~ msgid "<entry>RAM</entry>"
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index cdabc8acc..47098e3a8 100644
--- a/po/zh_TW/random-bits.po
+++ b/po/zh_TW/random-bits.po
@@ -793,26 +793,26 @@ msgstr ""
 #. Tag: title
 #: random-bits.xml:358
 #, no-c-format
-msgid "Installing &debian; from a Unix/Linux System"
-msgstr "透過 Unix/Linux 系統來安裝 &debian;"
+msgid "Installing &debian-gnu; from a Unix/Linux System"
+msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:360
 #, no-c-format
 msgid ""
-"This section explains how to install &debian; from an existing Unix or Linux "
+"This section explains how to install &debian-gnu; from an existing Unix or Linux "
 "system, without using the menu-driven installer as explained in the rest of "
 "the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this "
+"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
 "section some familiarity with entering *nix commands and navigating the file "
 "system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
 "to be entered in the user's current system, while <prompt>#</prompt> refers "
 "to a command entered in the Debian chroot."
 msgstr ""
-"本節說明了如何透過現有的 Unix 或 Linux 系統來安裝 &debian;，而非使用本手冊後"
+"本節說明了如何透過現有的 Unix 或 Linux 系統來安裝 &debian-gnu;，而非使用本手冊後"
 "面要談到的基於 ncurses，由選單驅動的安裝軟體。這篇<quote>交叉安裝(cross-"
 "install)</quote> HOWTO 是應使用者的要求而撰寫的。他們原來是 Redhat、Mandrake "
-"和 SUSE 的使用者，現轉而使用 &debian;。在本節中，我們假設您對於輸入 *nix 指令"
+"和 SUSE 的使用者，現轉而使用 &debian-gnu;。在本節中，我們假設您對於輸入 *nix 指令"
 "以及在檔案系統中穿梭移動並不生疏。同時，在本節中，<prompt>$</prompt> 符號表示"
 "這個指令是在使用者當前使用的系統中輸入的，而 <prompt>#</prompt> 則表示這個指"
 "令是在 Debian chroot 環境中輸入的。"
@@ -823,13 +823,13 @@ msgstr ""
 msgid ""
 "Once you've got the new Debian system configured to your preference, you can "
 "migrate your existing user data (if any) to it, and keep on rolling. This is "
-"therefore a <quote>zero downtime</quote> &debian; install. It's also a "
+"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a "
 "clever way for dealing with hardware that otherwise doesn't play friendly "
 "with various boot or installation media."
 msgstr ""
 "您一旦根據自己的需求設定好了新的 Debian 系統，就可以將您的原來系統中的使用者"
 "資料(如果有的話)全部遷移到 Debian 裡去。然後就能繼續爽了。一言以蔽之，這是一"
-"次<quote>不關機</quote>的 &debian; 安裝。同時，這也是處理那些因為硬體原因不能"
+"次<quote>不關機</quote>的 &debian-gnu; 安裝。同時，這也是處理那些因為硬體原因不能"
 "透過任何開機或者安裝媒介完成安裝的權宜之計。"
 
 #. Tag: para
@@ -1015,11 +1015,11 @@ msgstr ""
 #: random-bits.xml:503
 #, no-c-format
 msgid ""
-"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
+"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
 "filename>, you could substitute a file URL instead of the http URL: "
 "<userinput>file:/cdrom/debian/</userinput>"
 msgstr ""
-"如果您已經把一張 &releasename; 版本的 &debian; CD 掛載在 <filename>/cdrom</"
+"如果您已經把一張 &releasename; 版本的 &debian-gnu; CD 掛載在 <filename>/cdrom</"
 "filename>，那麼也可以把 http URL 替換成 file URL，即：<userinput>file:/cdrom/"
 "debian/</userinput>"
 
@@ -1513,12 +1513,12 @@ msgstr "Boot Loader 的設定"
 #: random-bits.xml:765
 #, fuzzy, no-c-format
 msgid ""
-"To make your &debian; system bootable, set up your boot loader to load the "
+"To make your &debian-gnu; system bootable, set up your boot loader to load the "
 "installed kernel with your new root partition. Note that "
 "<command>debootstrap</command> does not install a boot loader, though you "
 "can use <command>aptitude</command> inside your Debian chroot to do so."
 msgstr ""
-"要讓您的 &debian; 系統能夠啟動，還要設定您的 boot loader，好讓它能已安裝的核"
+"要讓您的 &debian-gnu; 系統能夠啟動，還要設定您的 boot loader，好讓它能已安裝的核"
 "心並用上新的根分割區。注意 debootstrap 不會安裝 boot loader， 因此您要在 "
 "Debian 的 chroot 中使用 apt-get 完成。"
 
@@ -1703,14 +1703,14 @@ msgstr ""
 #. Tag: title
 #: random-bits.xml:875
 #, fuzzy, no-c-format
-msgid "Installing &debian; over Parallel Line IP (PLIP)"
-msgstr "透過 Unix/Linux 系統來安裝 &debian;"
+msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
+msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:877
 #, no-c-format
 msgid ""
-"This section explains how to install &debian; on a computer without an "
+"This section explains how to install &debian-gnu; on a computer without an "
 "Ethernet card, but with just a remote gateway computer attached via a Null-"
 "Modem cable (also called Null-Printer cable). The gateway computer should be "
 "connected to a network that has a Debian mirror on it (e.g. to the Internet)."
@@ -1920,8 +1920,8 @@ msgstr ""
 #. Tag: title
 #: random-bits.xml:1046
 #, fuzzy, no-c-format
-msgid "Installing &debian; using PPP over Ethernet (PPPoE)"
-msgstr "透過 Unix/Linux 系統來安裝 &debian;"
+msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
+msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:1048
diff --git a/po/zh_TW/using-d-i.po b/po/zh_TW/using-d-i.po
index 8567a0846..a621fab3b 100644
--- a/po/zh_TW/using-d-i.po
+++ b/po/zh_TW/using-d-i.po
@@ -532,8 +532,8 @@ msgstr "base-installer"
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
-"operate under &debian; when rebooted."
-msgstr "安裝一些基本的套件，讓電腦重起後能在 &debian; 下運行。"
+"operate under &debian-gnu; when rebooted."
+msgstr "安裝一些基本的套件，讓電腦重起後能在 &debian-gnu; 下運行。"
 
 #. Tag: term
 #: using-d-i.xml:324
@@ -727,11 +727,11 @@ msgstr "檢測有效的記憶體"
 msgid ""
 "One of the first things &d-i; does, is to check available memory. If the "
 "available memory is limited, this component will make some changes in the "
-"installation process which hopefully will allow you to install &debian; on "
+"installation process which hopefully will allow you to install &debian-gnu; on "
 "your system."
 msgstr ""
 "&d-i; 首先要做的一件事是檢測有效的記憶體。如果記憶體有限，該元件將修改後續的"
-"安裝進程，使您可以將 &debian; 安裝到您的系統上。"
+"安裝進程，使您可以將 &debian-gnu; 安裝到您的系統上。"
 
 #. Tag: para
 #: using-d-i.xml:458
@@ -3125,7 +3125,7 @@ msgstr "設定網路"
 #: using-d-i.xml:2236
 #, no-c-format
 msgid ""
-"One of the tools used to install packages on a &debian; system is a program "
+"One of the tools used to install packages on a &debian-gnu; system is a program "
 "called <command>apt-get</command>, from the <classname>apt</classname> "
 "package<footnote> <para> Note that the program which actually installs the "
 "packages is called <command>dpkg</command>. However, this program is more of "
@@ -4069,13 +4069,13 @@ msgid ""
 "<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> "
 "created back in the partitioning component. If this step completes "
 "successfully then your disk should now be bootable and OpenFirmware will be "
-"set to boot &debian;."
+"set to boot &debian-gnu;."
 msgstr ""
 "新的 (1998 年以後)的 PowerMacs 使用 <command>yaboot</command> 作為它們的 "
 "boot loader。安裝程式會自動設定 <command>yaboot</command>，您只需一個 820k 的"
 "小分割區，命名為 <quote>bootstrap</quote>，類型為 <emphasis>Apple_Bootstrap</"
 "emphasis> 這由分割區元件建立。如果這步完全成功，硬碟就可以啟動，OpenFireware "
-"將設為啟動 &debian;。"
+"將設為啟動 &debian-gnu;。"
 
 #. Tag: title
 #: using-d-i.xml:2964
@@ -4262,7 +4262,7 @@ msgstr ""
 #, fuzzy, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
-"supported on &arch-title;. You then need to IPL &debian; from the DASD which "
+"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which "
 "you selected for the root filesystem during the first steps of the "
 "installation."
 msgstr ""
diff --git a/po/zh_TW/welcome.po b/po/zh_TW/welcome.po
index 113ed1b6a..708256468 100644
--- a/po/zh_TW/welcome.po
+++ b/po/zh_TW/welcome.po
@@ -21,12 +21,12 @@ msgstr "歡迎使用 Debian"
 #: welcome.xml:5
 #, no-c-format
 msgid ""
-"This chapter provides an overview of the Debian Project and &debian;. If you "
-"already know about the Debian Project's history and the &debian; "
+"This chapter provides an overview of the Debian Project and &debian-gnu;. If you "
+"already know about the Debian Project's history and the &debian-gnu; "
 "distribution, feel free to skip to the next chapter."
 msgstr ""
-"本章將簡要介紹 Debian 計畫和 &debian;。如果您已經對 Debian 計畫的歷史和 "
-"&debian; 發行套件有一定的瞭解，您可略過本章。"
+"本章將簡要介紹 Debian 計畫和 &debian-gnu;。如果您已經對 Debian 計畫的歷史和 "
+"&debian-gnu; 發行套件有一定的瞭解，您可略過本章。"
 
 #. Tag: title
 #: welcome.xml:19
@@ -522,13 +522,13 @@ msgstr "取得 Debian"
 #: welcome.xml:348
 #, no-c-format
 msgid ""
-"For information on how to download &debian; from the Internet or from whom "
+"For information on how to download &debian-gnu; from the Internet or from whom "
 "official Debian CDs can be purchased, see the <ulink url=\"&url-debian-"
 "distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-"
 "mirrors;\">list of Debian mirrors</ulink> contains a full set of official "
 "Debian mirrors, so you can easily find the nearest one."
 msgstr ""
-"關於如何從網際網路上下載 &debian; 或者從何購買官方 Debian光碟的資訊，請參閱 "
+"關於如何從網際網路上下載 &debian-gnu; 或者從何購買官方 Debian光碟的資訊，請參閱 "
 "<ulink url=\"&url-debian-distrib;\">發行網頁</ulink>。<ulink url=\"&url-"
 "debian-mirrors;\">Debian 鏡像列表</ulink>包含完整的 Debian 官方鏡像站，您可以"
 "很容易找到最近的一個。"
@@ -556,12 +556,12 @@ msgstr "取得本文件最新版本"
 msgid ""
 "This document is constantly being revised. Be sure to check the <ulink url="
 "\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute "
-"information about the &release; release of the &debian; system. Updated "
+"information about the &release; release of the &debian-gnu; system. Updated "
 "versions of this installation manual are also available from the <ulink url="
 "\"&url-install-manual;\">official Install Manual pages</ulink>."
 msgstr ""
 "本文件會不斷地修訂。請查閱 <ulink url=\"&url-release-area;\">Debian "
-"&release; 網頁</ulink> 以瞭解最新的 &release; 版 &debian; 系統相關資訊。更新"
+"&release; 網頁</ulink> 以瞭解最新的 &release; 版 &debian-gnu; 系統相關資訊。更新"
 "的安裝手冊也可以從<ulink url=\"&url-install-manual;\">官方安裝手冊網頁</"
 "ulink>取得。"
 
@@ -601,11 +601,11 @@ msgstr ""
 msgid ""
 "In general, this manual is arranged in a linear fashion, walking you through "
 "the installation process from start to finish. Here are the steps in "
-"installing &debian;, and the sections of this document which correlate with "
+"installing &debian-gnu;, and the sections of this document which correlate with "
 "each step:"
 msgstr ""
 "基本上，本手冊內容以線性鋪陳，從開始安裝帶領您到安裝結束。以下是安裝 "
-"&debian; 的步驟，以及每步驟相關的章節："
+"&debian-gnu; 的步驟，以及每步驟相關的章節："
 
 #. Tag: para
 #: welcome.xml:416
@@ -752,7 +752,7 @@ msgid ""
 "We're sure that you've read some of the licenses that come with most "
 "commercial software &mdash; they usually say that you can only use one copy "
 "of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of &debian; on every computer in your "
+"at all. We encourage you to put a copy of &debian-gnu; on every computer in your "
 "school or place of business. Lend your installation media to your friends "
 "and help them install it on their computers! You can even make thousands of "
 "copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "