updated po files

1 files changed, 23 insertions, 79 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 00e79fc0..df89cd95 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-01-03 09:17+0100\n"
-"PO-Revision-Date: 2005-02-15 14:09+0800\n"
+"PO-Revision-Date: 2005-02-16 05:35+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -61,32 +61,23 @@ 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
+msgstr ""
+"您的本地端網路上的客戶端是一部連線到網路上擁有個別名稱和 IP 位址的機器。"
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
 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."
@@ -100,34 +91,21 @@ msgstr "(您不需要在名字後鍵入網域)"
 msgid "Client identification:"
 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
+msgstr ""
+"注意在網路上所給定的 IP 位址和客戶端名稱都應該是唯一的。"
 
-<<<<<<< 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."
 "company.net. Every machine on the network must have a (unique) IP address, "
 "in the usual dotted syntax."
 msgstr ""
-"在網路上, 您的客戶端會用名稱來識別, 如clientname.company.net.網路上每一部機器"
-"都必須有一個以常用小點記號排列方式的(獨一) IP 位址."
->>>>>>> 1.97
+"在網路上，您的客戶端會使用名稱來識別，如 clientname.company.net。"
+"網路上每一部機器都必須有一個以小數點分隔 (且唯一) 的 IP 位址。"
 
 #: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
@@ -173,26 +151,18 @@ msgid "Adding a new client to your network"
 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
+msgstr ""
+"精靈收集到下列為了加入客戶端到您的網路所需要的參數："
 
 #: ../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
+msgstr ""
+"按下一步按鍵接受這些數值和加入您的客戶端，或按上一步按鍵作出更正。"
 
 #: ../client_wizard/Bind_client.pm:90
 msgid "Client name"
@@ -207,45 +177,28 @@ msgid "The wizard successfully added the client."
 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 "
 "for a DNS server. Hostname must be a FQDN: Fully Qualified Domain Name"
 msgstr ""
-"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
-"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
->>>>>>> 1.97
+"需要重新調整您的網域名稱，'localhost' 對於 DNS 伺服器而言並不是一個正確的"
+"主機名稱。主機名稱必須為 FQDN：完整領域名稱"
 
 #: ../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 "
 "domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully "
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
-"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
-"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
->>>>>>> 1.97
+"您需要重新調整您的網域名稱。對於一個 DNS 伺服器而言，您需要一個不同於本地"
+"網域或空白的正確網域名稱。主機名稱必須為 FQDN：完整領域名稱。"
+"i請啟動 drakconnect 來調整它。"
 
 #: ../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"
@@ -256,15 +209,11 @@ 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
+msgstr ""
+"DHCP 是一個會自動分配網路位址給您工作站的服務。"
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
@@ -286,18 +235,13 @@ msgid "Range of addresses used by 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 "
 "values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
-"選擇由 DHCP 為工作站所分配的位址的範圍; 除非您有特別的需要, 否則您可以安全地"
-"接受所建議的數值. (ie: 192.168.100.20 192.168.100.40)"
->>>>>>> 1.97
+"選擇由 DHCP 為工作站所分配的位址的範圍；除非您有特別的需要，否則可以安心地"
+"接受所建議的數值。(ie: 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:82 ../dhcp_wizard/Dhcp.pm:115
 msgid "Lowest IP address:"