conflict found

1 files changed, 18 insertions, 31 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 467997d0..e5dea405 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-30 15:54+0100\n"
-"PO-Revision-Date: 2004-01-26 11:56+0800\n"
+"POT-Creation-Date: 2004-01-25 15:27+0100\n"
+"PO-Revision-Date: 2004-02-02 15:53+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "DNS «È¤áºÝºëÆF"
 
 #: ../client_wizard/Bind_client.pm:47
 msgid "You must first run the DNS server wizard"
-msgstr ""
+msgstr "±z¥²¶·¥ý°õ¦æ DNS ¦øªA¾¹ºëÆF"
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -296,8 +296,7 @@ msgstr ""
 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)¬O¹ïÀ³¤@­Ó¾÷¾¹ IP ¦ì§}¨ì¤@­Óºô»Úºô¸ô¥D¾÷¦WºÙªºªA°È."
+msgstr " DNS  (Domain Name Server)¬O¹ïÀ³¤@­Ó¾÷¾¹ IP ¦ì§}¨ì¤@­Óºô»Úºô¸ô¥D¾÷¦WºÙªºªA°È."
 
 #: ../dns_wizard/Bind.pm:104
 msgid "DNS Master configuration wizard"
@@ -387,8 +386,7 @@ msgid "Default domain name to search:"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:166
-msgid ""
-"This is not a valid IP address for your forwarder... press next to continue"
+msgid "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "¹ï±zªºÂà±HªÌ¦Ó¨¥, ³o¤£¬O¤@­Ó¦³®Äªº IP ¦ì§}... ½Ð«ö¤U¤@¨BÄ~Äò"
 
 #: ../dns_wizard/Bind.pm:171
@@ -452,8 +450,7 @@ msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:231
-msgid ""
-"The DNS server is about to be configured with the following configuration"
+msgid "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:233
@@ -1021,8 +1018,7 @@ msgid "Polling Interval:"
 msgstr "±´¸ß¶¡¶Z:"
 
 #: ../news_wizard/Inn.pm:96
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
+msgid "The wizard successfully configured your Internet News service of your server."
 msgstr "ºëÆF¦¨¥\³]©w±zªº¦øªA¾¹ªººô»Úºô¸ô·s»DªA°È."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1245,8 +1241,7 @@ msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "ºëÆF¦¨¥\¦a³]©w±zªº¾÷¾¹¦¨¬°¤@­Ó NIS «È¤áºÝ."
 
 #: ../nisautofs_wizard/Nisautofs.pm:148
-msgid ""
-"The wizard successfully configured your machine to be a NIS with autofs map."
+msgid "The wizard successfully configured your machine to be a NIS with autofs map."
 msgstr "ºëÆF¦¨¥\¦a³]©w±zªº¾÷¾¹¦¨¬°¤@­Ó¦³ autofs ¦a¹Ïªº NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:302
@@ -1274,9 +1269,8 @@ msgid "Error, can't find your hostname in /etc/hosts. Exiting."
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:59
-#, fuzzy
 msgid "External Mail server"
-msgstr "¹q¶l¦øªA¾¹"
+msgstr "¥~³¡¶l¥ó¦øªA¾¹"
 
 #: ../postfix_wizard/Postfix.pm:60
 #, fuzzy
@@ -1404,8 +1398,7 @@ msgid "myorigin"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:149
-msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+msgid "The wizard successfully configured your Internet Mail service of your server."
 msgstr "ºëÆF¦¨¥\³]©w±zªº¦øªA¾¹ªººô»Úºô¸ô¹q¶lªA°È."
 
 #: ../postfix_wizard/Postfix.pm:164
@@ -1470,8 +1463,7 @@ msgid "Proxy port:"
 msgstr "¥N²z³q°T°ð:"
 
 #: ../proxy_wizard/Squid.pm:81
-msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+msgid "Press Next if you want to keep this value, or Back to correct your choice."
 msgstr "¦pªG±z·Q«O«ù³o­Ó¼Æ­È½Ð«ö¤U¤@¨B, ©Î¤W¤@¨B§ó§ï±zªº¿ï¾Ü."
 
 #: ../proxy_wizard/Squid.pm:81
@@ -1487,8 +1479,7 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "±z¥²¶·¿ï¾Ü¤@­Ó¤j©ó1024¤Î¤Ö©ó65535ªº³q°T°ð"
 
 #: ../proxy_wizard/Squid.pm:92
-msgid ""
-"Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr "ºÏ½L½w¨R¬O¤@­Ó¥i¥Î§@½w¨R©óºÏ½L¤WªººÏ½LªÅ¶¡Á`ÃB."
 
 #: ../proxy_wizard/Squid.pm:92
@@ -1533,8 +1524,7 @@ msgstr ""
 msgid ""
 "Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like "
 "\".domain.net\""
-msgstr ""
-"¨Ï¥Î¼Æ¦r§Î¦¡¦p \"192.168.1.0/255.255.255.0\" ©Î¤å¦r§Î¦¡¦p \".domain.net\""
+msgstr "¨Ï¥Î¼Æ¦r§Î¦¡¦p \"192.168.1.0/255.255.255.0\" ©Î¤å¦r§Î¦¡¦p \".domain.net\""
 
 #: ../proxy_wizard/Squid.pm:127
 msgid ""
@@ -1573,8 +1563,7 @@ msgid "Configuring the Proxy"
 msgstr "³]©w¥N²z¦øªA¾¹¤¤"
 
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
-msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+msgid "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "ºëÆF¦¬¶°¨ì¥H¤U»Ý­n³]©w±zªº¥N²z¦øªA¾¹ªº°Ñ¼Æ:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
@@ -1717,8 +1706,7 @@ msgid "ACPI option: Advanced Configuration and Power Interface"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:163
-msgid ""
-"Network client interface: through which interface client should be installed."
+msgid "Network client interface: through which interface client should be installed."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:163
@@ -1773,8 +1761,7 @@ msgid "Please provide a correct name in PXE entry (one word)."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:190
-msgid ""
-"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:194
@@ -1867,8 +1854,7 @@ msgstr ""
 "¤u§@¯¸."
 
 #: ../samba_wizard/Samba.pm:71
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+msgid "This wizard will help you configuring the Samba services of your server."
 msgstr "³oºëÆF·|À°§U±z³]©w±zªº¦øªA¾¹ªº Samba ªA°È."
 
 #: ../samba_wizard/Samba.pm:76
@@ -2927,3 +2913,4 @@ msgstr "³oºëÆF¦¨¥\³]©w±zªº¤º³¡ºô¸ô/ºô»Úºô¸ôºô­¶¦øªA¾¹"
 
 #~ msgid "Enable the Web Server for the Intranet and for the Internet"
 #~ msgstr "±Ò°Ê¤ºÁpºô©M¤¬Ápºôªººô­¶¦øªA¾¹"
+