Routine merge

1 files changed, 22 insertions, 171 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c71bfead..070f33ad 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
-"PO-Revision-Date: 2006-08-12 20:54+1000\n"
+"PO-Revision-Date: 2006-08-20 00:56+1000\n"
 "Last-Translator: Chester Cheng <ccheng@redhat.com>\n"
 "Language-Team: Chinese, Traditional <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,8 +58,7 @@ msgstr "無法設定 802.1Q VLAN 參數。"
 #: /etc/sysconfig/network-scripts/ifup:96
 #: /etc/sysconfig/network-scripts/ifup-eth:75
 #: /etc/sysconfig/network-scripts/ifup-eth.rpmsave:76
-msgid ""
-"$alias device ${DEVICE} does not seem to be present, delaying initialization."
+msgid "$alias device ${DEVICE} does not seem to be present, delaying initialization."
 msgstr "$alias 裝置 ${DEVICE} 並不存在，正在延遲初始化。"
 
 #: /etc/rc.d/init.d/amd:92 /etc/rc.d/init.d/bgpd:59 /etc/rc.d/init.d/btseed:68
@@ -101,8 +100,7 @@ msgstr "正在關閉 $MODEL: "
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:145
 msgid "pppd started for ${DEVNAME} on ${MODEMPORT} at ${LINESPEED}"
-msgstr ""
-"pppd 已於 ${DEVNAME} 裝置的 ${MODEMPORT} 連接埠上以 ${LINESPEED} 的速度啟動"
+msgstr "pppd 已於 ${DEVNAME} 裝置的 ${MODEMPORT} 連接埠上以 ${LINESPEED} 的速度啟動"
 
 #: /etc/rc.d/init.d/otrs:57
 msgid "Starting $OTRS_PROG.."
@@ -239,8 +237,7 @@ msgstr "無法載入軔體。"
 msgid ""
 "Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of "
 "'$tunnelmtu', ignored"
-msgstr ""
-"警告: 為 6to4 設定的 MTU '$IPV6TO4_MTU' 超過 '$tunnelmtu' 最大限制，已忽略"
+msgstr "警告: 為 6to4 設定的 MTU '$IPV6TO4_MTU' 超過 '$tunnelmtu' 最大限制，已忽略"
 
 #: /etc/rc.d/init.d/iscsi:28
 msgid "Setting up iSCSI targets: "
@@ -596,7 +593,6 @@ msgid "Entering non-interactive startup"
 msgstr "正在進入非互動式啟動"
 
 #: /etc/rc.d/init.d/iscsi:43
-#, fuzzy
 msgid "Stopping iSCSI initiator service: "
 msgstr "正在停止 iSCSI initiator 服務: "
 
@@ -894,9 +890,7 @@ msgstr "正在停止 ${NAME} 服務: "
 msgid ""
 "$BASENAME error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import."
 "log"
-msgstr ""
-"$BASENAME 匯入資料庫時發生錯誤，檢查 ${CONFIGDIRECTORY}/rpm/db_import."
-"log"
+msgstr "$BASENAME 匯入資料庫時發生錯誤，檢查 ${CONFIGDIRECTORY}/rpm/db_import.log"
 
 #: /etc/rc.d/init.d/avahi-daemon:39 /etc/rc.d/init.d/avahi-daemon:41
 #: /etc/rc.d/init.d/avahi-dnsconfd:34 /etc/rc.d/init.d/avahi-dnsconfd:36
@@ -1052,7 +1046,6 @@ msgid "No 802.1Q VLAN support available in kernel."
 msgstr "核心中不含 802.1Q VLAN 支援。"
 
 #: /etc/rc.d/rc.sysinit:69 /etc/rc.d/rc.sysinit.rpmsave:69
-#, fuzzy
 msgid "*** problems. Dropping you to a shell; the system will reboot"
 msgstr "*** 發生問題。系統將帶您進入 shell 模式; 然後重新開機"
 
@@ -1106,8 +1099,7 @@ msgid "Shutting down kernel logger: "
 msgstr "正在關閉核心記錄器: "
 
 #: /etc/rc.d/init.d/puppet:84
-msgid ""
-"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+msgid "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
 msgstr "用法: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
 
 #: /etc/rc.d/init.d/ups:48
@@ -1171,8 +1163,7 @@ msgid "Missing parameter 'local IPv4 address' (arg 2)"
 msgstr "缺少參數 'local IPv4 address' (arg 2)"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:287
-msgid ""
-"Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
+msgid "Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
 msgstr "使用 6to4 與 RADVD IPv6 傳遞通常應被啟用，不過並沒有"
 
 #: /etc/rc.d/init.d/thttpd:57
@@ -1244,8 +1235,7 @@ msgstr "/etc/sysconfig/network-scripts/dip-$DEVICE 不存在"
 msgid ""
 "Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and "
 "restart (IPv6) networking"
-msgstr ""
-"'$DEVICE' 裝置在此不被支援，使用 IPV6_AUTOTUNNEL 設定並且重新啟動 (IPv6) 網路"
+msgstr "'$DEVICE' 裝置在此不被支援，使用 IPV6_AUTOTUNNEL 設定並且重新啟動 (IPv6) 網路"
 
 #: /etc/rc.d/init.d/apt:66 /etc/rc.d/init.d/denyhosts:94
 #: /etc/rc.d/init.d/moodle:64 /etc/rc.d/init.d/puppetmaster:86
@@ -1318,7 +1308,7 @@ msgstr "$*"
 
 #: /etc/rc.d/init.d/puppetmaster:43
 msgid "Manifest does not exist: $PUPPETMASTER_MANIFEST"
-msgstr ""
+msgstr "清單不存在：$PUPPETMASTER_MANIFEST"
 
 #: /etc/rc.d/init.d/dc_client:74 /etc/rc.d/init.d/dc_server:70
 #: /etc/rc.d/init.d/ser:84
@@ -1401,8 +1391,7 @@ msgid "Usage: $0 {start|stop|restart|status}"
 msgstr "用法: $0 {start|stop|restart|status}"
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:80
-msgid ""
-"/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
+msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
 msgstr "${DEVICE} 的 /etc/sysconfig/network-scripts/chat-${DEVNAME} 不存在"
 
 #: /etc/rc.d/init.d/radiusd:37
@@ -1539,8 +1528,7 @@ msgstr "發送啟動訊息到 radvd 時，不支援 '$mechanism' 機制"
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-"
 "reload}"
-msgstr ""
-"用法：$0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
+msgstr "用法：$0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
 
 #: /etc/sysconfig/network-scripts/ifup-sl:47
 msgid "/etc/sysconfig/network-scripts/dip-$DEVICE does not exist for $DEVICE"
@@ -1766,9 +1754,7 @@ msgstr "$FILE 中發生錯誤：不合於規定的別名數字"
 msgid ""
 "$BASENAME error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export."
 "log"
-msgstr ""
-"$BASENAME 匯出資料庫時發生錯誤，檢查 ${CONFIGDIRECTORY}/rpm/db_export."
-"log"
+msgstr "$BASENAME 匯出資料庫時發生錯誤，檢查 ${CONFIGDIRECTORY}/rpm/db_export.log"
 
 #: /etc/rc.d/rc.sysinit:166 /etc/rc.d/rc.sysinit.rpmsave:166
 msgid "$dst: no value for hash option, skipping"
@@ -2081,10 +2067,8 @@ msgid "Clearing all current rules and user defined chains:"
 msgstr "正在清除所有目前的規則與使用者定義的鏈（chain）:"
 
 #: /etc/rc.d/init.d/postfix:115
-msgid ""
-"Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
-msgstr ""
-"用法: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
+msgid "Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
+msgstr "用法: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1118
 msgid "Tunnel device '$device' bringing up didn't work"
@@ -2163,12 +2147,12 @@ msgstr "正在重新載入 $named: "
 
 #: /etc/rc.d/rc.sysinit:126 /etc/rc.d/rc.sysinit.rpmsave:126
 msgid "INSECURE OWNER FOR $key"
-msgstr ""
+msgstr "INSECURE OWNER FOR $key"
 
 #: /etc/sysconfig/network-scripts/ifup-eth:176
 #: /etc/sysconfig/network-scripts/ifup-eth.rpmsave:173
 msgid " failed; no link present.  Check cable?"
-msgstr " 失敗； 連結不存在。 檢查一下纜線嗎？"
+msgstr " 失敗； 連結不存在。請檢查網路線。"
 
 #: /etc/rc.d/init.d/moomps:30
 msgid "Starting moomps: "
@@ -2235,8 +2219,7 @@ msgstr "正在停止所有 ${MODULE_NAME} 驅動程式: "
 msgid ""
 "On given address '$testipv6addr_valid' the prefix length is out of range "
 "(valid: 0-128)"
-msgstr ""
-"提供的位址 '$testipv6addr_valid' 中，前置字元長度超出範圍（有效範圍： 0-128）"
+msgstr "提供的位址 '$testipv6addr_valid' 中，前置字元長度超出範圍（有效範圍： 0-128）"
 
 #: /etc/rc.d/init.d/named:90
 msgid "$named: already running"
@@ -2595,8 +2578,7 @@ msgid "Stopping $type $name: "
 msgstr "正在停止 $type $name: "
 
 #: /etc/rc.d/init.d/postgresql:162
-msgid ""
-"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+msgid "See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
 msgstr "參閱 $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist 會有更多資訊"
 
 #: /etc/rc.d/rc.sysinit:287 /etc/rc.d/rc.sysinit.rpmsave:287
@@ -2605,7 +2587,7 @@ msgstr "正在設定時鐘 $CLOCKDEF: `date`"
 
 #: /etc/rc.d/rc.sysinit:123 /etc/rc.d/rc.sysinit.rpmsave:123
 msgid "INSECURE MODE FOR $key"
-msgstr ""
+msgstr "INSECURE MODE FOR $key"
 
 #: /etc/rc.d/init.d/plague-builder:27 /etc/rc.d/init.d/plague-server:27
 msgid "Starting $servicename: "
@@ -2908,10 +2890,8 @@ msgid "WARNING: vconfig not able to disable REORDER_HDR on ${DEVICE}"
 msgstr "警告：vconfig 無法停用 ${DEVICE} 裝置上的 REORDER_HDR"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:151
-msgid ""
-"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
-msgstr ""
-"無法啟用 IPv6 隱私方法 '$IPV6_PRIVACY', 核心不支援"
+msgid "Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
+msgstr "無法啟用 IPv6 隱私方法 '$IPV6_PRIVACY', 核心不支援"
 
 #: /etc/rc.d/init.d/nfslock:88
 msgid "Stopping NFS locking: "
@@ -3219,7 +3199,6 @@ msgid "Stopping $prog: "
 msgstr "正在停止 $prog: "
 
 #: /etc/ppp/ip-up.ipv6to4:192
-#, fuzzy
 msgid "Error occured while calculating the IPv6to4 prefix"
 msgstr "計算 IPv6to4 前綴字元時發生錯誤"
 
@@ -3227,137 +3206,9 @@ msgstr "計算 IPv6to4 前綴字元時發生錯誤"
 msgid ""
 "Argument 1 is empty but should contain interface name - skip IPv6to4 "
 "initialization"
-msgstr ""
-"第 1 個引數沒有內容，但其應該包含介面名稱 - 忽略 IPv6to4 初始化"
+msgstr "第 1 個引數沒有內容，但其應該包含介面名稱 - 忽略 IPv6to4 初始化"
 
 #: /sbin/service:64
 msgid "${SERVICE}: unrecognized service"
 msgstr "${SERVICE}: 服務未能辨識"
 
-#~ msgid "Start $x"
-#~ msgstr "啟動 $x"
-
-#~ msgid "Starting Red Hat Network Daemon: "
-#~ msgstr "正在啟動 Red Hat 網路程式: "
-
-#~ msgid "$prog is not started..."
-#~ msgstr "$prog 未啟動..."
-
-#~ msgid "$prog startup"
-#~ msgstr "$prog 啟動"
-
-#~ msgid "Unmounting file systems (retry): "
-#~ msgstr "正在卸載檔案系統 (重試):"
-
-#~ msgid "Unmounting network block filesystems (retry): "
-#~ msgstr "正在卸載網路區塊檔案系統 (重試):"
-
-#~ msgid "Unmounting network block filesystems: "
-#~ msgstr "正在卸載網路區塊檔案系統:"
-
-#~ msgid "database check"
-#~ msgstr "資料庫檢查"
-
-#~ msgid "Unmounting NFS filesystems: "
-#~ msgstr "正在卸載 NFS 檔案系統: "
-
-#~ msgid ""
-#~ "Active Mount Points:\n"
-#~ "--------------------"
-#~ msgstr ""
-#~ "啟動掛載點\n"
-#~ "----------"
-
-#~ msgid "Stopping cups-config-daemon: "
-#~ msgstr "正在停止 cups-config-daemon："
-
-#~ msgid "done. "
-#~ msgstr "完成。 "
-
-#~ msgid "move passphrase file"
-#~ msgstr "移動 passphrase 檔案"
-
-#~ msgid "Enabling Athlon powersaving mode..."
-#~ msgstr "正在啟動 Athlon powersaving 模式..."
-
-#~ msgid "Stop $command"
-#~ msgstr "停止 $command"
-
-#~ msgid "Stopping Red Hat Network Daemon: "
-#~ msgstr "正在停止 Red Hat 網路程式: "
-
-#~ msgid "Importing packets to monotone database: "
-#~ msgstr "將封包匯入 monotone 資料庫："
-
-#~ msgid "Checking database format in"
-#~ msgstr "檢查資料庫格式於"
-
-#~ msgid "packet import"
-#~ msgstr "封包匯入"
-
-#~ msgid "key generation"
-#~ msgstr "產生金鑰"
-
-#~ msgid "Starting $prog:  "
-#~ msgstr "正在啟動 $prog:  "
-
-#~ msgid "Generating RSA key for server $MONOTONE_KEYID"
-#~ msgstr "正在為伺服器產生 RSA 金鑰 $MONOTONE_KEYID"
-
-#~ msgid "Reload map $command"
-#~ msgstr "重新載入對應 $command"
-
-#~ msgid "Initializing database"
-#~ msgstr "正在初始化資料庫"
-
-#~ msgid "Stopping monotone server: "
-#~ msgstr "正在停止 monotone 伺服器: "
-
-#~ msgid "Moving old server passphrase file to new location: "
-#~ msgstr "將舊的伺服器密碼（passphrase）檔移到新的位置："
-
-#~ msgid "Checking for changes to /etc/auto.master ...."
-#~ msgstr "正在檢查 /etc/auto.master 的變動...."
-
-#~ msgid "No Mountpoints Defined"
-#~ msgstr "沒有指定掛載點"
-
-#~ msgid "Unmounting loopback filesystem $match:  "
-#~ msgstr "正在卸載 loopback 檔案系統 $match："
-
-#~ msgid "database initialization"
-#~ msgstr "資料庫初始化"
-
-#~ msgid ""
-#~ "Configured Mount Points:\n"
-#~ "------------------------"
-#~ msgstr ""
-#~ "已設定的掛載點：\n"
-#~ "---------------"
-
-#~ msgid "$prog is already started..."
-#~ msgstr "$prog 已啟動..."
-
-#~ msgid "Unmounting file systems: "
-#~ msgstr "正在卸載檔案系統: "
-
-#~ msgid "Starting cups-config-daemon: "
-#~ msgstr "正在啟動 cups-config-daemon: "
-
-#~ msgid "error! "
-#~ msgstr "錯誤！ "
-
-#~ msgid "$BASENAME startup"
-#~ msgstr "$BASENAME 啟動"
-
-#~ msgid "Unmounting NFS filesystems (retry): "
-#~ msgstr "正在卸載 NFS 檔案系統(重試): "
-
-#~ msgid "could not make temp file"
-#~ msgstr "無法建立 temp 檔案"
-
-#~ msgid "Stopping $prog:  "
-#~ msgstr "正在停止 $prog:  "
-
-#~ msgid "Starting monotone server: "
-#~ msgstr "正在啟動 monotone 伺服器: "