updated po files

1 files changed, 94 insertions, 35 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index d344b673..00e79fc0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,6 +3,7 @@
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Hilbert <freehil@yahoo.com>, 2004.
 # Hilbert <h@mandrake.org>, 2004.
+# Shiva Huang <shivahuang@gmail.com>, 2005.
 #
 msgid ""
 msgstr ""
@@ -27,7 +28,7 @@ msgstr "設定精靈"
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
-msgstr "警告."
+msgstr "警告。"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
@@ -36,7 +37,7 @@ msgstr "警告."
 #: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
-msgstr "錯誤."
+msgstr "錯誤。"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
@@ -60,26 +61,36 @@ msgid "You must first run the DNS server wizard"
 msgstr "您必須先執行 DNS 伺服器精靈"
 
 #: ../client_wizard/Bind_client.pm:55
+<<<<<<< zh_TW.po
+msgid "A client of your local network is a machine connected to the network having its own name and IP address."
+msgstr "您的本地端網路上的客戶端是一部連線到網路上擁有個別名稱和 IP 位址的機器。"
+=======
 msgid ""
 "A client of your local network is a machine connected to the network having "
 "its own name and IP address."
 msgstr "您的本地端網路上的客戶端是一部連線到網路上擁有個別名稱和IP 號碼的機器."
+>>>>>>> 1.97
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "按下一步開始, 或取消離開這精靈."
+msgstr "按下一步開始，或按取消離開本精靈。"
 
 #: ../client_wizard/Bind_client.pm:55
+<<<<<<< zh_TW.po
+msgid "The server will use the information you enter here to make the name of the client available to other machines into your network."
+msgstr "這個伺服器將會使用您所輸入的資料創造一個可以被您網路上其它主機所辨識的客戶端名稱。"
+=======
 msgid ""
 "The server will use the information you enter here to make the name of the "
 "client available to other machines into your network."
 msgstr ""
 "這個伺服器將會使用您所輸入的資料而創造一個通用於您的網路上其它主機的客戶端名"
 "稱."
+>>>>>>> 1.97
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "本精靈會幫助您去增加一個新客戶端在您的本地端 DNS 中."
+msgstr "本精靈將協助您新增一個客戶端到您的本地端 DNS 中。"
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -87,14 +98,27 @@ msgstr "(您不需要在名字後鍵入網域)"
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
-msgstr "客戶端認證:"
+msgstr "客戶端認證："
 
+<<<<<<< zh_TW.po
+#: ../client_wizard/Bind_client.pm:61
+#: ../dns_wizard/Bind.pm:128
+msgid "Note that the given IP address and client name should be unique in the network."
+msgstr "注意在網路上所給定的 IP 位址和客戶端名稱都應該是唯一的。"
+=======
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "注意在網路上所給定的 IP 位址和客戶端名稱都應該是獨一的."
+>>>>>>> 1.97
 
+<<<<<<< zh_TW.po
+#: ../client_wizard/Bind_client.pm:61
+#: ../dns_wizard/Bind.pm:128
+msgid "Your client on the network will be identified by name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax."
+msgstr "在網路上，您的客戶端會用名稱來識別，如 clientname.company.net。網路上每一部機器都必須有一個以小數點分隔 (且唯一) 的 IP 位址。"
+=======
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
 "Your client on the network will be identified by name, as in clientname."
@@ -103,14 +127,15 @@ msgid ""
 msgstr ""
 "在網路上, 您的客戶端會用名稱來識別, 如clientname.company.net.網路上每一部機器"
 "都必須有一個以常用小點記號排列方式的(獨一) IP 位址."
+>>>>>>> 1.97
 
 #: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
-msgstr "機器名稱:"
+msgstr "機器名稱："
 
 #: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
-msgstr "機器的 IP 位址:"
+msgstr "機器的 IP 位址："
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
 #: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
@@ -120,7 +145,7 @@ msgstr "警告"
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
 #: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
-msgstr "您正在 dncp 中, 伺服器可能不能與您的設定運作."
+msgstr "您正在 DHCP 中，伺服器可能不採用您的設定值來運作。"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
@@ -137,27 +162,37 @@ msgstr "錯誤"
 
 #: ../client_wizard/Bind_client.pm:78
 msgid "System error, no configuration done"
-msgstr "系統錯誤, 沒有完成任何設定"
+msgstr "系統錯誤，沒有完成任何設定"
 
 #: ../client_wizard/Bind_client.pm:83
 msgid "This is not a valid address... press next to continue"
-msgstr "這不是一個有效的位址. 請按下一步繼續"
+msgstr "這不是一個有效的位址... 請按下一步繼續"
 
 #: ../client_wizard/Bind_client.pm:88
 msgid "Adding a new client to your network"
-msgstr "正在加入一個新客戶端於您的網路"
+msgstr "正在新增一個客戶端到您的網路中"
 
 #: ../client_wizard/Bind_client.pm:88
+<<<<<<< zh_TW.po
+msgid "The wizard collected the following parameters needed to add a client to your network:"
+msgstr "精靈收集到下列為了加入客戶端到您的網路所需要的參數："
+=======
 msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr "精靈收集到以下需要加入您的網路的客戶端的參數:"
+>>>>>>> 1.97
 
 #: ../client_wizard/Bind_client.pm:88
+<<<<<<< zh_TW.po
+msgid "To accept these values, and add your client, click the Next button or use the Back button to correct them."
+msgstr "按下一步按鍵接受這些數值和加入您的客戶端，或按上一步按鍵作出更正。"
+=======
 msgid ""
 "To accept these values, and add your client, click the Next button or use "
 "the Back button to correct them."
 msgstr "按下一步按鍵接受這些數值和加入您的客戶端, 或按上一步按鍵作出更正."
+>>>>>>> 1.97
 
 #: ../client_wizard/Bind_client.pm:90
 msgid "Client name"
@@ -165,13 +200,18 @@ msgstr "客戶端名稱"
 
 #: ../client_wizard/Bind_client.pm:91
 msgid "Client IP:"
-msgstr "客戶端 IP:"
+msgstr "客戶端 IP："
 
 #: ../client_wizard/Bind_client.pm:97
 msgid "The wizard successfully added the client."
-msgstr "精靈已成功加入一個客戶端."
+msgstr "精靈已成功加入一個客戶端。"
 
 #: ../common/Wizcommon.pm:57
+<<<<<<< zh_TW.po
+#
+msgid "You need to readjust your hostname. 'localhost' is not a correct hostname for a DNS server. Hostname must be a FQDN: Fully Qualified Domain Name"
+msgstr "您需要重新調整您的網域名稱，'localhost' 對於 DNS 伺服器而言並不是一個正確的主機名稱。主機名稱必須為 FQDN：完整領域名稱"
+=======
 #, fuzzy
 msgid ""
 "You need to readjust your hostname. 'localhost' is not a correct hostname "
@@ -179,8 +219,14 @@ msgid ""
 msgstr ""
 "您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
 "稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
+>>>>>>> 1.97
 
 #: ../common/Wizcommon.pm:60
+<<<<<<< zh_TW.po
+#
+msgid "You need to readjust your domainname. For a DNS server you need a correct domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully Qualified Domain Name. Launch drakconnect to adjust it."
+msgstr "您需要重新調整您的網域名稱。對於一個 DNS 伺服器而言，您需要一個不同於本地端網域或空白的正確網域名稱。主機名稱必須為 FQDN：完整領域名稱。啟動 drakconnect 來調整它。"
+=======
 #, fuzzy
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
@@ -189,11 +235,17 @@ msgid ""
 msgstr ""
 "您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
 "稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
+>>>>>>> 1.97
 
 #: ../common/Wizcommon.pm:98
+<<<<<<< zh_TW.po
+msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+msgstr "命令仍在執行中。您要強制停止並且離開精靈？"
+=======
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
+>>>>>>> 1.97
 
 #: ../common/Wizcommon.pm:115
 msgid "Close"
@@ -204,18 +256,23 @@ msgid "DHCP Wizard"
 msgstr "DHCP 精靈"
 
 #: ../dhcp_wizard/Dhcp.pm:53
+<<<<<<< zh_TW.po
+msgid "DHCP is a service that automatically assigns networking addresses to your workstations."
+msgstr "DHCP 是一個會自動分配網路位址給您工作站的服務。"
+=======
 msgid ""
 "DHCP is a service that automatically assigns networking addresses to your "
 "workstations."
 msgstr "DHCP 是一種會自動分配網路位址給您的工作站的服務."
+>>>>>>> 1.97
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "這精靈將會幫助您為您的伺服器設定 DHCP 服務."
+msgstr "這精靈將協助您為您的伺服器設定 DHCP 服務."
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "Interface the dhcp server must listen to"
-msgstr "介面 dhcp 伺服器必須聽取"
+msgstr "介面 DHCP 伺服器必須聽取"
 
 #: ../dhcp_wizard/Dhcp.pm:72
 msgid ""
@@ -226,9 +283,13 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:72
 msgid "Range of addresses used by DHCP"
-msgstr "dhcp 所用的位址範圍"
+msgstr "DHCP 所用的位址範圍"
 
 #: ../dhcp_wizard/Dhcp.pm:72
+<<<<<<< zh_TW.po
+msgid "Select the range of addresses assigned to the workstations by the DHCP service; unless you have special needs, you can safely accept the proposed values. (ie: 192.168.100.20 192.168.100.40)"
+msgstr "選擇由 DHCP 為工作站所分配的位址的範圍；除非您有特別的需要，否則您可以安全地接受所建議的數值。 (ie: 192.168.100.20 192.168.100.40)"
+=======
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
@@ -236,22 +297,23 @@ msgid ""
 msgstr ""
 "選擇由 DHCP 為工作站所分配的位址的範圍; 除非您有特別的需要, 否則您可以安全地"
 "接受所建議的數值. (ie: 192.168.100.20 192.168.100.40)"
+>>>>>>> 1.97
 
 #: ../dhcp_wizard/Dhcp.pm:82 ../dhcp_wizard/Dhcp.pm:115
 msgid "Lowest IP address:"
-msgstr "最低的 IP 位址:"
+msgstr "最低的 IP 位址："
 
 #: ../dhcp_wizard/Dhcp.pm:83 ../dhcp_wizard/Dhcp.pm:116
 msgid "Highest IP address:"
-msgstr "最高的 IP 位址:"
+msgstr "最高的 IP 位址："
 
 #: ../dhcp_wizard/Dhcp.pm:84 ../dhcp_wizard/Dhcp.pm:117
 msgid "Gateway IP address:"
-msgstr "閘道 IP 位址:"
+msgstr "閘道 IP 位址："
 
 #: ../dhcp_wizard/Dhcp.pm:85 ../dhcp_wizard/Dhcp.pm:119
 msgid "Enable PXE:"
-msgstr "啟用 PXE:"
+msgstr "啟用 PXE："
 
 #: ../dhcp_wizard/Dhcp.pm:95
 msgid "The IP range specified is not correct."
@@ -297,12 +359,12 @@ msgstr "已啟用"
 
 #: ../dhcp_wizard/Dhcp.pm:118
 msgid "Interface:"
-msgstr "介面:"
+msgstr "介面："
 
 #: ../dhcp_wizard/Dhcp.pm:125
 #, fuzzy
 msgid "The wizard successfully configured the DHCP services."
-msgstr "這精靈成功為您的伺服器設定 DHCP 服務."
+msgstr "本精靈已經成功地設定了 DHCP 伺服器。"
 
 #: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
@@ -316,7 +378,7 @@ msgstr "失敗"
 #: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
 #: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
-msgstr "重新發動 drakwizard, 且嘗試改變某些參數."
+msgstr "重新啟動 drakwizard，且試著改變某些參數。"
 
 #: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
@@ -340,7 +402,7 @@ msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
-" DNS  (Domain Name Server)是對應一個機器 IP 位址到一個網際網路主機名稱的服務."
+"DNS (Domain Name Server) 是將某台機器的 IP 位址到對應到網際網路主機名稱的服務。"
 
 #: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
@@ -358,42 +420,39 @@ msgstr ""
 #: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
-msgstr "您想要做什麼:"
+msgstr "您想要做什麼："
 
 #: ../dns_wizard/Bind.pm:120
-#, fuzzy
 msgid "DNS server Interface"
-msgstr "DNS 伺服器"
+msgstr "DNS 伺服器介面"
 
 #: ../dns_wizard/Bind.pm:128
-#, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(您不需要在名字後鍵入網域)"
 
 #: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
-msgstr "伺服器:"
+msgstr "伺服器："
 
 #: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
-msgstr "DNS 網域名稱:"
+msgstr "DNS 網域名稱："
 
 #: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
-msgstr "請於下列清單中選擇您想要移除的主機."
+msgstr "請於下列清單中選擇您想要移除的主機。"
 
 #: ../dns_wizard/Bind.pm:139
-#, fuzzy
 msgid "Remove a host in existing DNS configuration."
-msgstr "於存在的 dns 組態設定中移除一個主機."
+msgstr "再存在的 DNS 組態設定中移除一個主機。"
 
 #: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
-msgstr "移除主機:"
+msgstr "移除主機："
 
 #: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
-msgstr "電腦名稱:"
+msgstr "電腦名稱："
 
 #: ../dns_wizard/Bind.pm:147
 msgid ""