refresh from elvis

1 files changed, 170 insertions, 168 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 555fccbdb..f82e2a8d9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,4 +1,5 @@
 # Translation of zh_TW.po to Traditional Chinese
+# Translation of tmp.po to Traditional Chinese
 # Translation of anaconda to Traditional Chinese
 # Copyright (C) 2002 Red Hat, Inc.
 # This file is distributed under the same license as the anaconda package.
@@ -8,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: anaconda 10\n"
 "POT-Creation-Date: 2003-08-13 22:03-0400\n"
-"PO-Revision-Date: 2003-08-01 09:33+1000\n"
+"PO-Revision-Date: 2003-08-15 00:19+1000\n"
 "Last-Translator: Ben Wu <hpwu@redhat.com>\n"
 "Language-Team: Traditional Chinese <i18n-list@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +22,14 @@ msgid "Starting VNC..."
 msgstr "VNC 啟動中..."
 
 #: ../anaconda:131
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s installation on host %s"
-msgstr "%s 系統安裝程式在 %s"
+msgstr "%s %s 安裝在主機 %s"
 
 #: ../anaconda:133
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s installation"
-msgstr "執行一個 %s 的完整安裝"
+msgstr "%s %s 安裝"
 
 #: ../anaconda:151
 msgid "Unable to set vnc password - using no password!"
@@ -47,39 +48,42 @@ msgid ""
 "if you would like to secure the server.\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"警告！！！ VNC 伺服器以無密碼的方式執行！\n"
+"假如您想要保護伺服器的安全，您可以\n"
+"使用 vncpassword=<password> 的開機選項。\n"
+"\n"
 
 #: ../anaconda:179
-#, fuzzy
 msgid "The VNC server is now running."
 msgstr "VNC 伺服器現在正在執行中。"
 
 #: ../anaconda:182
 #, c-format
 msgid "Attempting to connect to vnc client on host %s..."
-msgstr ""
+msgstr "試著要連線在主機 %s 的 vnc 用戶端..."
 
 #: ../anaconda:196
 msgid "Giving up attempting to connect after 50 tries!\n"
-msgstr ""
+msgstr "在嘗試 50 次後，將放棄嘗試連線！\n"
 
 #: ../anaconda:198
-#, fuzzy, c-format
+#, c-format
 msgid "Please manually connect your vnc client to %s to begin the install."
-msgstr "請連線至 %s 以進行安裝..."
+msgstr "請手動將您的 vnc 用戶端連線至 %s 以開始進行安裝。"
 
 #: ../anaconda:200
-#, fuzzy
 msgid "Please manually connect your vnc client to begin the install."
-msgstr "請連線至 %s 以進行安裝..."
+msgstr "請手動連線您的 vnc 用戶端以開始進行安裝。"
 
 #: ../anaconda:204
 msgid "Will try to connect again in 15 seconds..."
-msgstr ""
+msgstr "將在 15 秒後試著再連線一次..."
 
 #: ../anaconda:208
-#, fuzzy
 msgid "Connected!"
-msgstr "已完成"
+msgstr "已連線！"
 
 #: ../anaconda:212
 #, c-format
@@ -220,7 +224,7 @@ msgid ""
 "be able to boot this installation."
 msgstr ""
 "Boot 分割區並非放置在磁碟的有效位置。  OpenFirmware 將無法從這個分割區啟動安"
-"裝程式。"
+"裝 程式。"
 
 #: ../autopart.py:1013
 #, python-format
@@ -357,7 +361,6 @@ msgstr ""
 "%s.%s"
 
 #: ../autopart.py:1364
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -368,7 +371,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"您可以選擇不同的自動磁碟分割選項，或回到上一步以選取手動磁碟分割。\n"
+"您可以選擇不同的自動磁碟分割選項，或點選『上一步』以選取手動磁碟分割。\n"
 "\n"
 "請按下『確定』以繼續。"
 
@@ -824,9 +827,10 @@ msgid ""
 "\n"
 "Please fix this problem and restart the installation process."
 msgstr ""
-"系統上的多個裝置已標示為 %s，為了使系統正常運作，裝置的標籤必須是獨特的。\n"
+"您系統上的許多裝置已經標識為 %s，裝置的標識名稱必須是獨特的，您的系統才能 "
+"運作順利。\n"
 "\n"
-"請修正這個問題，然後重新啟動安裝程式。"
+"請修正這個問題，然後再重新啟動安裝程式。"
 
 #: ../fsset.py:2018 ../gui.py:1086 ../packages.py:1295
 msgid "_Reboot"
@@ -1028,7 +1032,7 @@ msgid ""
 "%s\n"
 "The system will now reboot."
 msgstr ""
-"找不到安裝所需的下列 ISO 映像檔:\n"
+"找不到安裝所需的下列 ISO 映像檔：\n"
 "\n"
 "%s\n"
 "現在系統將重新開機。"
@@ -1091,8 +1095,7 @@ msgstr "套件遺失"
 msgid ""
 "You have specified that the package '%s' should be installed.  This package "
 "does not exist. Would you like to continue or abort your installation?"
-msgstr ""
-"您已經指定要安裝 '%s' 套件，這個套件並不存在。 您想要繼續或中斷您的安裝？"
+msgstr "您已經指定要安裝 '%s' 套件，這個套件並不存在。 您想要繼續或中斷您的安裝？"
 
 #: ../kickstart.py:1254 ../kickstart.py:1281
 msgid "_Abort"
@@ -1111,13 +1114,11 @@ msgstr "群組遺失"
 msgid ""
 "You have specified that the group '%s' should be installed.  This group does "
 "not exist. Would you like to continue or abort your installation?"
-msgstr ""
-"您指定要安裝 '%s' 群組，不過這個群組並不存在，您想要繼續或中斷您的安裝程式？"
+msgstr "您指定要安裝 '%s' 群組，不過這個群組並不存在，您想要繼續或中斷您的安裝程式？"
 
 #: ../network.py:41
-#, fuzzy
 msgid "Hostname must be 64 or less characters in length."
-msgstr "請確定您的密碼不得少於六個字元。"
+msgstr "主機名稱不可大於 64 個字元的長度。"
 
 #: ../network.py:44
 msgid "Hostname must start with a valid character in the range 'a-z' or 'A-Z'"
@@ -1156,15 +1157,13 @@ msgstr "正在讀取套件資訊..."
 msgid ""
 "Unable to read header list.  This may be due to a missing file or bad "
 "media.  Press <return> to try again."
-msgstr ""
-"無法讀取表頭清單。 可能是由於遺失檔案或是媒體損毀。 請按 <return> 重試。"
+msgstr "無法讀取表頭清單。 可能是由於遺失檔案或是媒體損毀。 請按 <return> 重試。"
 
 #: ../packages.py:164
 msgid ""
 "Unable to read comps file.  This may be due to a missing file or bad media.  "
 "Press <return> to try again."
-msgstr ""
-"無法讀取 comps 檔案。 可能是由於遺失檔案或是媒體損毀。 請按 <return> 重試。"
+msgstr "無法讀取 comps 檔案。 可能是由於遺失檔案或是媒體損毀。 請按 <return> 重試。"
 
 #: ../packages.py:250
 msgid "Dependency Check"
@@ -1229,8 +1228,7 @@ msgstr "您正試著要在這個 %s 發行沒有支援的機器上執行安裝�
 msgid ""
 "Unable to merge header list.  This may be due to a missing file or bad "
 "media.  Press <return> to try again."
-msgstr ""
-"無法合併表頭清單。 可能是由於遺失檔案或是媒體損毀。 請按 <return> 重試。"
+msgstr "無法合併表頭清單。 可能是由於遺失檔案或是媒體損毀。 請按 <return> 重試。"
 
 #: ../packages.py:719
 msgid "Preparing RPM transaction..."
@@ -1381,7 +1379,7 @@ msgstr ""
 "\n"
 "如要回報程式問題或錯誤，請造訪:\n"
 "\n"
-"    http://bugzilla.redhat.com/bugzilla\n"
+"   http://bugzilla.redhat.com/bugzilla\n"
 "\n"
 "並針對 '%s' 呈送一份報告。\n"
 
@@ -1394,7 +1392,7 @@ msgid "Foreign"
 msgstr "Foreign"
 
 #: ../partedUtils.py:274
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The device %s is LDL formatted instead of CDL formatted.  LDL formatted "
 "DASDs are not supported for usage during an install of %s.  If you wish to "
@@ -1403,11 +1401,11 @@ msgid ""
 "\n"
 "Would you like to reformat this DASD using CDL format?"
 msgstr ""
-"裝置 /dev/%s 是 LDL 格式化的，而非 CDL 格式化的，在  %s 的安裝階段，並不支援 "
-"LDL 格式化的 DASDs。 如要使用這個磁碟來進行安裝，必須先初始化磁碟，這將會造"
-"成 磁碟上『所有資料』的流失。\n"
+"裝置 %s 為 LDL 格式化的，非為 CDL 格式化的。  在 %s 的安裝過程中，並不支援 使"
+"用 LDL 格式化的 DASDs，如要使用這個磁碟來進行安裝，必須先初始化磁碟，這將 會"
+"造成磁碟上『所有資料』的流失。\n"
 "\n"
-"您想要使用 CDL 格式來重新格式化這個 DASD 嗎？"
+"您想要使用 CDL 格式重新格式化這個 DASD 嗎？"
 
 #: ../partedUtils.py:304
 #, python-format
@@ -1758,8 +1756,7 @@ msgid "Confirm Reset"
 msgstr "確認還原"
 
 #: ../partIntfHelpers.py:528
-msgid ""
-"Are you sure you want to reset the partition table to its original state?"
+msgid "Are you sure you want to reset the partition table to its original state?"
 msgstr "您確定要重設磁碟分割表至原設定值?"
 
 #: ../partitioning.py:76
@@ -1771,8 +1768,7 @@ msgid ""
 "The partitioning options you have chosen have already been activated. You "
 "can no longer return to the disk editing screen. Would you like to continue "
 "with the installation process?"
-msgstr ""
-"您選擇的磁碟分割選項已經啟動了。 您無法再回到磁碟編輯視窗。 您想要繼續安裝嗎?"
+msgstr "您選擇的磁碟分割選項已經啟動了。 您無法再回到磁碟編輯視窗。 您想要繼續安裝嗎?"
 
 #: ../partitioning.py:107
 msgid "Low Memory"
@@ -1802,8 +1798,7 @@ msgid ""
 msgstr "您的 root 分割區小於 250 MB，空間太小不足以安裝 %s。"
 
 #: ../partitions.py:819
-msgid ""
-"You must create a /boot/efi partition of type FAT and a size of 50 megabytes."
+msgid "You must create a /boot/efi partition of type FAT and a size of 50 megabytes."
 msgstr "您必須建立一個 FAT 類型的 /boot/efi 分割區,大小為 50 MB。"
 
 #: ../partitions.py:835
@@ -1845,8 +1840,7 @@ msgstr "您指定了超過 32 個 swap 裝置。 %s 的核心只支援到 32 個
 msgid ""
 "You have allocated less swap space (%dM) than available RAM (%dM) on your "
 "system.  This could negatively impact performance."
-msgstr ""
-"您配置了比您系統記憶體 (%dM) 還要少的 swap 空間 (%dM)。 這可能會影響效能。"
+msgstr "您配置了比您系統記憶體 (%dM) 還要少的 swap 空間 (%dM)。 這可能會影響效能。"
 
 #: ../partitions.py:1182
 msgid "the partition in use by the installer."
@@ -1862,8 +1856,7 @@ msgstr "LVM 磁區群組成員的一個分割區。"
 
 #: ../partRequests.py:219
 #, python-format
-msgid ""
-"This mount point is invalid.  The %s directory must be on the / file system."
+msgid "This mount point is invalid.  The %s directory must be on the / file system."
 msgstr "掛載點無效。  %s 目錄必須在 / 檔案系統上。"
 
 #: ../partRequests.py:222
@@ -2096,8 +2089,7 @@ msgid "%s (C) 2003 Red Hat, Inc."
 msgstr "%s (C) 2003 Red Hat, Inc."
 
 #: ../text.py:353
-msgid ""
-" <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen"
+msgid " <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen"
 msgstr "      <F1> 輔助訊息 | <Tab> 移動游標 | <space> 選取 | <F12> 下一個畫面"
 
 #: ../text.py:355
@@ -2246,9 +2238,9 @@ msgid ""
 "\n"
 "Do you wish to continue the upgrade process?"
 msgstr ""
-"這個系統有安裝其他廠商提供的套件，和 Red Hat 提供的套件重覆。 因為套件重覆，"
-"繼續升級可能會造成您的系統不穩定或功能不正常。 請參考發行公告以取得更多資"
-"訊。\n"
+"這個系統有安裝其他廠商提供的套件，和 Red Hat Linux 提供的套件重覆。 因為套件 "
+"重覆，繼續升級可能會造成您的系統不穩定或功能不正常。 請參考發行公告以取得更多 "
+"資訊。\n"
 "\n"
 "您想要繼續升級程序嗎?"
 
@@ -2457,6 +2449,8 @@ msgid ""
 "Enter a boot loader password and then confirm it.  (Note that your BIOS "
 "keymap may be different than the actual keymap you are used to.)"
 msgstr ""
+"請輸入開機管理程式的密碼，然後再輸入一次以作確認。（請注意您的 BIOS 鍵盤配置 "
+"也許與您平時使用的實際鍵盤配置不一樣。）"
 
 #: ../iw/blpasswidget.py:112
 msgid "_Password:"
@@ -2656,7 +2650,7 @@ msgid "Click next to begin installation of %s."
 msgstr "按『下一步』開始安裝 %s。"
 
 #: ../iw/confirm_gui.py:61
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "A complete log of the installation can be found in the file '%s' after "
 "rebooting your system.\n"
@@ -2664,9 +2658,9 @@ msgid ""
 "A kickstart file containing the installation options selected can be found "
 "in the file '%s' after rebooting the system."
 msgstr ""
-"重新開機後，安裝過程的完整紀錄可以在 %s 檔案中找到。\n"
+"重新開機後，安裝過程的完整紀錄可以在 '%s' 檔案中找到。\n"
 "\n"
-"包含您所選擇之安裝選項的一個 kickstart 檔案，在重新開機後，也可在 %s 檔案中找"
+"包含您所選擇之安裝選項的一個 kickstart 檔案，在重新開機後，也可在 '%s' 檔案中找"
 "到。"
 
 #: ../iw/confirm_gui.py:68
@@ -2679,11 +2673,11 @@ msgid "Click next to begin upgrade of %s."
 msgstr "按『下一步』開始升級 %s。"
 
 #: ../iw/confirm_gui.py:74
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "A complete log of the upgrade can be found in the file '%s' after rebooting "
 "your system."
-msgstr "重新開機後，升級過程的完整紀錄可以在 %s 檔案中找到。"
+msgstr "重新開機後，升級過程的完整紀錄可以在 '%s' 檔案中找到。"
 
 #: ../iw/congrats_gui.py:23
 msgid "Congratulations"
@@ -2779,9 +2773,8 @@ msgid "I_gnore package dependencies"
 msgstr "忽略套件相依性(_g)"
 
 #: ../iw/desktop_choice_gui.py:25
-#, fuzzy
 msgid "Package Defaults"
-msgstr "套件群組細節"
+msgstr "預設套件"
 
 #: ../iw/desktop_choice_gui.py:51
 msgid ""
@@ -2789,9 +2782,11 @@ msgid ""
 "selection, including:\n"
 "\n"
 msgstr ""
+"預設的安裝環境含有我們所建議的套件選擇，包括如下：\n"
+"\n"
 
 #: ../iw/desktop_choice_gui.py:53
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
@@ -2802,18 +2797,10 @@ msgid ""
 "to install or avoid installing. Check the box below to customize your "
 "installation."
 msgstr ""
-"預設的個人桌上型系統包含了我們對新使用者的建議，它包括了:\n"
 "\n"
-"\t桌面的 shell (GNOME)\n"
-"\t辦公室套裝軟體 (OpenOffice)\n"
-"\t網頁瀏覽器 (Mozilla) \n"
-"\t電子郵件用戶端 (Evolution)\n"
-"\t即時通訊程式\n"
-"\t音效與視訊應用程式\n"
-"\t遊戲\n"
 "\n"
-"在安裝程式完成後，您可以使用 'redhat-config-package' 工具來增加或移除額外的軟"
-"體。\n"
+"在安裝程式完成後，您可以使用 'redhat-config-packages' 工具來增加或移除額外的"
+"軟體。\n"
 "\n"
 "假如您對 %s 很熟悉，您也許有想安裝或想避免安裝的特定套件。 請勾選以下的選取盒"
 "來自訂您的安裝。"
@@ -2908,9 +2895,8 @@ msgid "Select a drive to partition with fdisk:"
 msgstr "選擇要執行 fdisk 的磁碟機:"
 
 #: ../iw/firewall_gui.py:23 ../textw/firewall_text.py:26
-#, fuzzy
 msgid "Firewall"
-msgstr "無防火牆"
+msgstr "防火牆"
 
 #: ../iw/firewall_gui.py:115
 #, python-format
@@ -2933,25 +2919,23 @@ msgstr "警告: 不當的記號"
 msgid ""
 "A firewall can help prevent unauthorized access to your computer from the "
 "outside world.  Would you like to enable a firewall?"
-msgstr ""
+msgstr "一個防火牆可以防止外來未經授權的存取您的電腦，您想要啟用防火牆嗎？"
 
 #: ../iw/firewall_gui.py:155
 msgid "N_o firewall"
 msgstr "無防火牆(_o)"
 
 #: ../iw/firewall_gui.py:157
-#, fuzzy
 msgid "_Enable firewall"
-msgstr "無防火牆(_o)"
+msgstr "啟用防火牆(_E)"
 
 #: ../iw/firewall_gui.py:159
-#, fuzzy
 msgid "_Custom firewall"
-msgstr "無防火牆(_o)"
+msgstr "自訂防火牆(_C)"
 
 #: ../iw/firewall_gui.py:178
 msgid "What services should be allowed to pass through the firewall?"
-msgstr ""
+msgstr "要允許那些服務通過防火牆？"
 
 #: ../iw/firewall_gui.py:186
 msgid "_Allow incoming:"
@@ -2963,7 +2947,7 @@ msgstr "其他埠(_p):"
 
 #: ../iw/firewall_gui.py:219
 msgid "If you would like to allow all traffic from a device, select it below."
-msgstr ""
+msgstr "假如您想要允許來自一個裝置的所有流量，請於以下選取。"
 
 #: ../iw/firewall_gui.py:228
 msgid "_Trusted devices:"
@@ -3079,8 +3063,7 @@ msgstr "太小"
 msgid ""
 "This change in the value of the physical extent will waste substantial space "
 "on one or more of the physical volumes in the volume group."
-msgstr ""
-"這個實體容量數值的變更將會浪費在磁區群組中一或更多的實體磁區上相當大的空間。"
+msgstr "這個實體容量數值的變更將會浪費在磁區群組中一或更多的實體磁區上相當大的空間。"
 
 #: ../iw/lvm_dialog_gui.py:205
 #, python-format
@@ -3423,8 +3406,7 @@ msgstr "您還未指定一個主機名稱。  取決於您的網路環境，這�
 msgid ""
 "You have not specified the field \"%s\".  Depending on your network "
 "environment this may cause problems later."
-msgstr ""
-"您還未指定 \"%s\" 欄位。  取決於您的網路環境，這樣的設定也許會造成問題。"
+msgstr "您還未指定 \"%s\" 欄位。  取決於您的網路環境，這樣的設定也許會造成問題。"
 
 #: ../iw/network_gui.py:164 ../textw/network_text.py:399
 #, python-format
@@ -3811,14 +3793,12 @@ msgid "Partitioning"
 msgstr "設定分割區"
 
 #: ../iw/partition_gui.py:639
-msgid ""
-"The following critical errors exist with your requested partitioning scheme."
+msgid "The following critical errors exist with your requested partitioning scheme."
 msgstr "您的磁碟分割發生下列錯誤。"
 
 #: ../iw/partition_gui.py:642
 #, python-format
-msgid ""
-"These errors must be corrected prior to continuing with your install of %s."
+msgid "These errors must be corrected prior to continuing with your install of %s."
 msgstr "在您繼續安裝 %s 之前必須先更正這些錯誤。"
 
 #: ../iw/partition_gui.py:648
@@ -3909,8 +3889,7 @@ msgstr "找不到 RAID minors 的裝置號碼"
 msgid ""
 "A software RAID device cannot be created because all of the available RAID "
 "minor device numbers have been used."
-msgstr ""
-"無法建立軟體 RAID 裝置，因為所有的 RAID minors 裝置號碼都已經被使用了。"
+msgstr "無法建立軟體 RAID 裝置，因為所有的 RAID minors 裝置號碼都已經被使用了。"
 
 #: ../iw/partition_gui.py:1226
 msgid "RAID Options"
@@ -4374,8 +4353,7 @@ msgstr "這將會更新您目前的開機管理程式。"
 
 #: ../iw/upgrade_bootloader_gui.py:72 ../textw/upgrade_bootloader_text.py:49
 #, python-format
-msgid ""
-"The installer has detected the %s boot loader currently installed on %s."
+msgid "The installer has detected the %s boot loader currently installed on %s."
 msgstr "安裝程式偵測到 %s 開機管理程式已安裝在 %s。"
 
 #: ../iw/upgrade_bootloader_gui.py:76
@@ -4502,8 +4480,7 @@ msgid "The swap file must be between 1 and 2000 MB in size."
 msgstr "swap 檔案必須介於 1 至 2000 MB 之間。"
 
 #: ../iw/upgrade_swap_gui.py:216 ../textw/upgrade_text.py:173
-msgid ""
-"There is not enough space on the device you selected for the swap partition."
+msgid "There is not enough space on the device you selected for the swap partition."
 msgstr "您所選擇的磁碟機空間不足以建立 swap 分割區。"
 
 #: ../iw/welcome_gui.py:20
@@ -4831,8 +4808,7 @@ msgstr ""
 "所在的分割區，並分別給予一個開機識別標籤。"
 
 #: ../textw/bootloader_text.py:316
-msgid ""
-" <Space> selects button | <F2> select default boot entry | <F12> next screen>"
+msgid " <Space> selects button | <F2> select default boot entry | <F12> next screen>"
 msgstr "      <Space> 選取按鈕 | <F2> 選取預設開機登錄 | <F12> 下一個畫面"
 
 #: ../textw/bootloader_text.py:395
@@ -4915,8 +4891,7 @@ msgstr "開始安裝"
 msgid ""
 "A complete log of your installation will be in %s after rebooting your "
 "system. You may want to keep this file for later reference."
-msgstr ""
-"重新開機後，完整的安裝過程會記錄在 %s。您可以留下這個檔案以供日後參考。"
+msgstr "重新開機後，完整的安裝過程會記錄在 %s。您可以留下這個檔案以供日後參考。"
 
 #: ../textw/confirm_text.py:24 ../textw/confirm_text.py:26
 #: ../textw/confirm_text.py:36 ../textw/confirm_text.py:38
@@ -4941,15 +4916,14 @@ msgstr "開始升級系統"
 msgid ""
 "A complete log of your upgrade will be in %s after rebooting your system. "
 "You may want to keep this file for later reference."
-msgstr ""
-"重新開機後，完整的升級過程會記錄在 %s。您可以留下這個檔案以供日後參考。"
+msgstr "重新開機後，完整的升級過程會記錄在 %s。您可以留下這個檔案以供日後參考。"
 
 #: ../textw/desktop_choice_text.py:24
 msgid "Workstation Defaults"
 msgstr "工作站安裝預設值"
 
 #: ../textw/desktop_choice_text.py:27
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The default installation environment includes our recommended package "
 "selection.  After installation, additional software can be added or removed "
@@ -4958,9 +4932,8 @@ msgid ""
 "However %s ships with many more applications, and you may customize the "
 "selection of software installed if you want."
 msgstr ""
-"個人電腦與工作站選項將會安裝預設的一組應用程式，讓您可以在您的 %s 系統上瀏覽"
-"網際網路，傳送與接收電子郵件，以及建立與編輯文件。 工作站的選項也包括了程式開"
-"發與管理工具。\n"
+"預設的安裝環境包括了我們所建議的套件選擇，在安裝完成後，您可以使用 'redhat-"
+"config-packages' 工具來新增或移除其他的軟體。\n"
 "\n"
 "然而，在 %s 中提供了許多更多的應用程式，而您可以自訂要安裝的軟體套件。"
 
@@ -5028,9 +5001,8 @@ msgid "Customize"
 msgstr "自訂"
 
 #: ../textw/firewall_text.py:45
-#, fuzzy
 msgid "Enable firewall"
-msgstr "無防火牆"
+msgstr "啟用防火牆"
 
 #: ../textw/firewall_text.py:48
 msgid "No firewall"
@@ -5262,8 +5234,7 @@ msgid "Select individual packages"
 msgstr "選擇個別套件"
 
 #: ../textw/packages_text.py:73
-msgid ""
-"<Space>,<+>,<-> selection   |   <F2> Group Details   |   <F12> next screen"
+msgid "<Space>,<+>,<-> selection   |   <F2> Group Details   |   <F12> next screen"
 msgstr "      <Space>,<+>,<-> 選擇   |   <F2> 群組細節   |   <F12> 下一個畫面"
 
 #: ../textw/packages_text.py:110
@@ -5288,8 +5259,7 @@ msgid "Total size"
 msgstr "全部大小"
 
 #: ../textw/packages_text.py:319
-msgid ""
-"   <Space>,<+>,<-> selection   |   <F1> help   |   <F2> package description"
+msgid "   <Space>,<+>,<-> selection   |   <F1> help   |   <F2> package description"
 msgstr "      <Space>,<+>,<-> 選擇   |   <F1> 輔助訊息   |   <F2> 套件說明"
 
 #: ../textw/packages_text.py:367
@@ -5512,8 +5482,7 @@ msgid "RAID"
 msgstr "RAID"
 
 #: ../textw/partition_text.py:1136
-msgid ""
-"    F1-Help     F2-New      F3-Edit   F4-Delete    F5-Reset    F12-OK        "
+msgid "    F1-Help     F2-New      F3-Edit   F4-Delete    F5-Reset    F12-OK        "
 msgstr "    F1-求助     F2-新增     F3-修改    F4-刪除    F5-重置     F12-確定"
 
 #: ../textw/partition_text.py:1165
@@ -5768,13 +5737,11 @@ msgid "User Exists"
 msgstr "使用者已經存在"
 
 #: ../textw/userauth_text.py:156
-msgid ""
-"The root user is already configured. You don't need to add this user here."
+msgid "The root user is already configured. You don't need to add this user here."
 msgstr "使用者 root 已經設定完成。你不需要在這裡增加這個使用者。"
 
 #: ../textw/userauth_text.py:163
-msgid ""
-"This system user is already configured. You don't need to add this user here."
+msgid "This system user is already configured. You don't need to add this user here."
 msgstr "使用者 root 已經設定好了。你不需要在這裡增加這個使用者。"
 
 #: ../textw/userauth_text.py:171
@@ -6070,8 +6037,7 @@ msgstr "顯示記憶體"
 msgid ""
 "Please select the amount of video RAM present on your video card. Choose '%"
 "s' to reset the selection to the amount the installer detected on your card."
-msgstr ""
-"請選擇您顯示卡的顯示記憶體容量。 選擇 '%s' 來重設安裝程式所偵測到的值。"
+msgstr "請選擇您顯示卡的顯示記憶體容量。 選擇 '%s' 來重設安裝程式所偵測到的值。"
 
 #: ../textw/xconfig_text.py:629
 msgid "Skip X Configuration"
@@ -6122,8 +6088,7 @@ msgstr "自訂安裝(_C)"
 msgid ""
 "Select this installation type to gain complete control over the installation "
 "process, including software package selection and partitioning."
-msgstr ""
-"選擇這個安裝類型來獲取對安裝過程完全的控制，包括軟體套件的選擇與磁碟分割。"
+msgstr "選擇這個安裝類型來獲取對安裝過程完全的控制，包括軟體套件的選擇與磁碟分割。"
 
 #: ../installclasses/personal_desktop.py:11
 msgid "_Personal Desktop"
@@ -6148,6 +6113,13 @@ msgid ""
 "\tSound and video applications\n"
 "\tGames\n"
 msgstr ""
+"\t桌面的 shell (GNOME)\n"
+"\t辦公室套裝軟體 (OpenOffice)\n"
+"\t網頁瀏覽器 (Mozilla)\n"
+"\t電子郵件用戶端 (Evolution)\n"
+"\t即時傳訊\n"
+"\t音效與視訊應用程式\n"
+"\t遊戲\n"
 
 #: ../installclasses/server.py:11
 msgid "_Server"
@@ -6184,6 +6156,15 @@ msgid ""
 "\tSoftware Development Tools\n"
 "\tAdministration Tools\n"
 msgstr ""
+"\t桌面的 shell (GNOME)\n"
+"\t辦公室套裝軟體 (OpenOffice)\n"
+"\t網頁瀏覽器 (Mozilla) \n"
+"\t電子郵件用戶端 (Evolution)\n"
+"\t即時傳訊\n"
+"\t音效與視訊應用程式\n"
+"\t遊戲\n"
+"\t軟體開發工具\n"
+"\t管理工具\n"
 
 #: ../loader2/cdinstall.c:88 ../loader2/cdinstall.c:109
 #: ../loader2/mediacheck.c:272
@@ -6251,8 +6232,7 @@ msgstr ""
 msgid ""
 "No %s CD was found which matches your boot media.  Please insert the %s CD "
 "and press %s to retry."
-msgstr ""
-"在您的光碟機中找不到開機媒體光碟片 %s，請置入 %s 光碟片，並按下 %s 重試。"
+msgstr "在您的光碟機中找不到開機媒體光碟片 %s，請置入 %s 光碟片，並按下 %s 重試。"
 
 #: ../loader2/cdinstall.c:380
 msgid "CD Not Found"
@@ -6483,8 +6463,7 @@ msgid "Welcome to %s"
 msgstr "歡迎使用 %s"
 
 #: ../loader2/lang.c:53 ../loader2/loader.c:173
-msgid ""
-"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+msgid "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr "      <Tab>/<Alt-Tab> 移動游標 | <Space> 選取 | <F12> 下一個畫面"
 
 #: ../loader2/lang.c:371
@@ -6620,8 +6599,7 @@ msgstr "執行 anaconda，%s 系統安裝程式 - 請稍候...\n"
 msgid ""
 "Unable to read the disc checksum from the primary volume descriptor.  This "
 "probably means the disc was created without adding the checksum."
-msgstr ""
-"無法從主卷冊描述中讀取磁碟數值。 這也許表示在建立此磁碟時沒有加上數值資訊。"
+msgstr "無法從主卷冊描述中讀取磁碟數值。 這也許表示在建立此磁碟時沒有加上數值資訊。"
 
 #: ../loader2/mediacheck.c:264
 #, c-format
@@ -7016,8 +6994,7 @@ msgid "Atlantic Time - E Labrador"
 msgstr "大西洋標準時區 - 拉布拉多東部"
 
 #. generated from zone.tab
-msgid ""
-"Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI"
+msgid "Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI"
 msgstr ""
 "大西洋標準時區 - 諾華史高沙省 (大部分地方)、NB、拉布拉多西部、魁北克東部 & "
 "PEI"
@@ -7199,8 +7176,7 @@ msgid "Eastern Time - Ontario & Quebec - most locations"
 msgstr "東部標準時間 -  安大略省 & 魁北克 - 大部分地方"
 
 #. generated from zone.tab
-msgid ""
-"Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973"
+msgid "Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973"
 msgstr "東部標準時間 - 安大略省 & 魁北克 - 不遵照 DST 1967-1973 的地方"
 
 #. generated from zone.tab
@@ -7376,8 +7352,7 @@ msgid "Mountain Standard Time - Arizona"
 msgstr "山岳部標準時間 - 亞利桑那"
 
 #. generated from zone.tab
-msgid ""
-"Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia"
+msgid "Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia"
 msgstr "山岳部標準時間 - 道森河 & 福聖約翰、英屬哥倫比亞"
 
 #. generated from zone.tab
@@ -7684,6 +7659,65 @@ msgstr "瑞典語"
 msgid "Turkish"
 msgstr "土耳其文"
 
+#~ msgid "Enter a boot loader password and then confirm it."
+#~ msgstr "請輸入開機管理程式密碼並再輸入確認一次。"
+
+#~ msgid "_Accept the current package list"
+#~ msgstr "接受目前的套件清單(_A)"
+
+#~ msgid "Perform a new %s installation"
+#~ msgstr "執行一個 %s 的完整安裝"
+
+#~ msgid ""
+#~ "Choose this option to install your system from scratch.  Depending on how "
+#~ "you choose to partition your system the existing data on your drives may "
+#~ "or may not be preserved."
+#~ msgstr ""
+#~ "選擇這個選項以完整安裝您的系統。 您硬碟上既有的資料是否會被保留，將完全視"
+#~ "您 如何分割您系統的磁碟。"
+
+#~ msgid "_Customize packages to be upgraded"
+#~ msgstr "自訂要升級的套件(_C)"
+
+#~ msgid "Location"
+#~ msgstr "地區"
+
+#~ msgid "Use _daylight saving time (US only)"
+#~ msgstr "使用日光節約時間(_d)(僅限美國地區)"
+
+#~ msgid "UTC Offset"
+#~ msgstr "UTC 時差"
+
+#~ msgid ""
+#~ "Your system will be setup to use the frame buffer driver for the X Window "
+#~ "System.  If you do not want to setup the X Window System , choose 'Skip X "
+#~ "Configuration' below."
+#~ msgstr ""
+#~ "您的系統將會設定為在 X 視窗系統上使用 framebuffer 驅動程式，假如您不想要設"
+#~ "定 X 視窗系統，請選擇以下的 『略過 X 組態設定』。"
+
+#~ msgid "Red Hat Enterprise Linux AS"
+#~ msgstr "Red Hat Enterprise Linux AS"
+
+#~ msgid ""
+#~ "\tDesktop shell (GNOME)\n"
+#~ "\tAdministration Tools\n"
+#~ "\tServer Configuration Tools\n"
+#~ "\tWeb Server\n"
+#~ "\tWindows File Server (SMB)\n"
+#~ msgstr ""
+#~ "\t桌面的 shell (GNOME)\n"
+#~ "\t管理工具\n"
+#~ "\t伺服器設定工具\n"
+#~ "\t網頁伺服器\n"
+#~ "\tWindows 檔案伺服器 (SMB)\n"
+
+#~ msgid "Red Hat Enterprise Linux ES"
+#~ msgstr "Red Hat Enterprise Linux ES"
+
+#~ msgid "Red Hat Enterprise Linux WS"
+#~ msgstr "Red Hat Enterprise Linux WS"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -7693,7 +7727,8 @@ msgstr "土耳其文"
 #~ "\n"
 #~ "警告！！！VNC 伺服器以無密碼的狀態執行！"
 
-#~ msgid "You can use the vncpasswd=<password> boot option"
+#, fuzzy
+#~ msgid "You can use the vncpassword=<password> boot option"
 #~ msgstr "您可以使用 vncpasswd=<password> 的開機選項"
 
 #~ msgid ""
@@ -7703,9 +7738,6 @@ msgstr "土耳其文"
 #~ "假如您想要加強伺服器的安全性。\n"
 #~ "\n"
 
-#~ msgid "Enter a boot loader password and then confirm it."
-#~ msgstr "請輸入開機管理程式密碼並再輸入確認一次。"
-
 #~ msgid ""
 #~ "The default workstation environment includes our recommendations for new "
 #~ "users, including:\n"
@@ -7767,14 +7799,6 @@ msgstr "土耳其文"
 #~ msgstr "自訂(_C)"
 
 #~ msgid ""
-#~ "Your system will be setup to use the frame buffer driver for the X Window "
-#~ "System.  If you do not want to setup the X Window System , choose 'Skip X "
-#~ "Configuration' below."
-#~ msgstr ""
-#~ "您的系統將會設定為在 X 視窗系統上使用 framebuffer 驅動程式，假如您不想要設"
-#~ "定 X 視窗系統，請選擇以下的 『略過 X 組態設定』。"
-
-#~ msgid ""
 #~ "A firewall protects against unauthorized network intrusions. High "
 #~ "security blocks all incoming accesses. Medium blocks access to system "
 #~ "services (such as telnet or printing), but allows other connections. No "
@@ -7825,20 +7849,6 @@ msgstr "土耳其文"
 #~ msgid "Root passwords do not match."
 #~ msgstr "系統管理員密碼不符。"
 
-#~ msgid "_Accept the current package list"
-#~ msgstr "接受目前的套件清單(_A)"
-
-#~ msgid ""
-#~ "Choose this option to install your system from scratch.  Depending on how "
-#~ "you choose to partition your system the existing data on your drives may "
-#~ "or may not be preserved."
-#~ msgstr ""
-#~ "選擇這個選項以完整安裝您的系統。 您硬碟上既有的資料是否會被保留，將完全視"
-#~ "您 如何分割您系統的磁碟。"
-
-#~ msgid "_Customize packages to be upgraded"
-#~ msgstr "自訂要升級的套件(_C)"
-
 #~ msgid "Check for _bad blocks"
 #~ msgstr "格式化時順便檢查是否有損壞的磁區(_b)"
 
@@ -7850,15 +7860,6 @@ msgstr "土耳其文"
 #~ "建立\n"
 #~ "_RAID"
 
-#~ msgid "Location"
-#~ msgstr "地區"
-
-#~ msgid "Use _daylight saving time (US only)"
-#~ msgstr "使用日光節約時間(_d)(僅限美國地區)"
-
-#~ msgid "UTC Offset"
-#~ msgstr "UTC 時差"
-
 #~ msgid ""
 #~ "If you created a boot disk to use to boot your %s system, insert it "
 #~ "before you press <Enter> to reboot.\n"
@@ -8817,3 +8818,4 @@ msgstr "土耳其文"
 #~ msgstr ""
 #~ "繁體中文   zh_TW.Big5      無    無            zh_TW.Big5              "
 #~ "us              亞洲/台北"
+