updated pot file

1 files changed, 252 insertions, 178 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c148346b..329937ab 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-21 11:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "配置向导"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,9 +34,9 @@ msgstr "配置向导"
 msgid "Warning."
 msgstr "警告。"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -44,12 +44,12 @@ msgid "Error."
 msgstr "出错。"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -86,22 +86,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "此向导将帮助您把一个新的客户机添加到您的本地 DNS。"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(在名字后面不必输入域名)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "客户机身份:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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, "
@@ -110,27 +110,28 @@ msgstr ""
 "您的网络客户机将通过名字来鉴别，例如 clientname.company.net。网络中每台机器必"
 "须有一个(唯一的)IP 地址，使用常规的点分隔语法。"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "机器名:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "机器的 IP 地址:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "警告"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "您在使用 dhcp，服务器可能无法按照您的配置工作。"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -174,7 +175,7 @@ msgstr "客户机 IP:"
 msgid "The wizard successfully added the client."
 msgstr "向导成功地添加了客户。"
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP 向导"
 
@@ -189,57 +190,86 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "此向导将帮助您在本服务器上配置 DHCP 服务。"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "DHCP 使用的地址范围"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "选择 DHCP 服务将要分配给各个工作站的地址范围；除非您有特殊要求，接受建议的值"
 "是安全的。"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "最低的 IP 地址:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "最高的 IP 地址:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "DHCP 服务器必须监听的网卡"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "指定的 IP 范围不对。"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "指定的 IP 范围并不位于服务器地址的范围内。"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "服务器的 IP 必须不位于范围内。"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "配置 DHCP 服务器"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "为了配置 DHCP 服务，向导收集了下列需要的参数:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:130 ../ftp_wizard/Proftpd.pm:131
+#: ../ftp_wizard/Proftpd.pm:132 ../ftp_wizard/Proftpd.pm:133
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "已禁用"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:130 ../ftp_wizard/Proftpd.pm:131
+#: ../ftp_wizard/Proftpd.pm:132 ../ftp_wizard/Proftpd.pm:133
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "已启用"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "网卡："
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "向导成功地为您的服务器配置了 DHCP 服务。"
 
@@ -247,7 +277,7 @@ msgstr "向导成功地为您的服务器配置了 DHCP 服务。"
 msgid "You need to readjust your hostname."
 msgstr "您需要重新调整您的主机名。"
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -256,12 +286,12 @@ msgstr ""
 "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
 "localdomain 或不设置。请使用 DrakConnect 进行调整。"
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "主 DNS 服务器"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "从 DNS 服务器"
 
@@ -294,70 +324,71 @@ msgstr ""
 "此向导将帮助您配置您服务器上的 DNS 服务。所做的配置将提供 DNS 服务以解析本地"
 "的计算机名字，非本地的请求将被转发给外部的 DNS。"
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "您想要执行何种操作:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr "请在下面的列表中选择您想要删除的主机。"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "在现有的 DNS 配置中删除主机。"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "删除主机:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "新闻组服务器名:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 msgid ""
 "A slave name server will take some of the burden away from your primary name "
 "server, and will also function as a backup server, in case your master "
 "server is unreachable."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "主 DNS 服务器的 IP:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Search list for host-name lookup.  The search list is normally determined "
 "from the local domain name; by default, it contains only the local domain "
@@ -365,115 +396,115 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "出错"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS(配置)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "新闻组服务器名:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "服务器标题:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "NIS 域名:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "向导成功地添加了客户。"
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "向导成功地添加了客户。"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "向导已成功地为您的服务器配置了 DNS 服务。"
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "正在将您的系统配置为主 DNS 服务器..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "将您的系统配置为 NIS+Autofs(nfs) 服务器..."
@@ -563,107 +594,104 @@ msgstr "安装失败"
 msgid "FTP wizard"
 msgstr "FTP 向导"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP 服务器配置向导"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "此向导将帮助您在网络中配置 FTP 服务器。"
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "如果不想激活 FTP 服务，请清除前面的方框。"
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "选择您要激活的 FTP 服务类型:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid ""
 "Your server can act as an FTP Server toward your internal network (intranet) "
 "and as an FTP Server for the Internet."
 msgstr "您的服务器可以向内部提供 FTP 服务，也可以向互联网提供 FTP 服务。"
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "激活对互联网的 FTP 服务"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "为互联网激活 FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "允许的主机:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"警告\n"
-"您在使用 DHCP，服务器可能无法按照您的配置工作。"
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "对不起，您必须是 root 才能执行此操作..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "配置 FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "为了配置 FTP 服务器，向导收集了下列需要的参数"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -671,35 +699,35 @@ msgstr ""
 "要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
 "们"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "已禁用"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "已启用"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "局域网 FTP 服务器:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "互联网 FTP 服务器:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "向导成功地配置了您的 Intranet/Internet FTP 服务器"
 
@@ -747,7 +775,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1021,7 +1049,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "为了配置 Internet 新闻组服务，向导收集了下列需要的参数:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1292,49 +1320,72 @@ msgstr "正在将您的系统配置为 NIS 客户..."
 msgid "Nis Client"
 msgstr "NIS 客户"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix 向导"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "邮件服务器"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "邮件服务器"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet 邮件配置向导"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "此向导将帮助您在您的网络上配置 Internet 电子邮件服务。"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "发出邮件地址"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "这应该和您用来接收邮件的地址一致。"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "You can select the kind of address that outgoing mail will show in the "
 "\"From:\" and \"Reply-to\" field."
 msgstr "您可以选择发出邮件在“From:”和“Reply-to”字段显示的地址类型。"
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "伪装域名:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "警告:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "您输入的邮件网关地址是空的。"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1342,15 +1393,21 @@ msgstr ""
 "您的选择可以被接受，不过那样您将不能发送邮件到您的局域网以外。点击“下一步”继"
 "续，或“后退”并输入一个值。"
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "伪装有问题！"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet 邮件网关"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the internet mail server is "
@@ -1359,61 +1416,67 @@ msgstr ""
 "互联网主机名必须采用下列格式“host.domain.domaintype”；例如，您的服务商"
 "是“provider.com”，邮件服务器通常就是“smtp.provider.com”。"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "您的服务器将使用一个邮件网关发出邮件，它会负责最终的投递。"
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "邮件服务器名:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "配置 Internet 邮件"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "为了配置 Internet 邮件服务，向导收集了下列需要的参数:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "地址形式"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "向导成功地为您的服务器配置了 Internet 邮件服务。"
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "配置您的 Postfix 服务器。"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Postfix 服务器"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "配置您的 Postfix 服务器。"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "本机 - 只允许这个服务器访问"
@@ -1577,7 +1640,8 @@ msgid "Access Control:"
 msgstr "访问控制:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "向导成功地配置了您的代理服务器。"
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1593,15 +1657,6 @@ msgstr "Squid 代理服务器"
 msgid "PXE Wizard"
 msgstr "PXE 向导"
 
-#: ../pxe_wizard/Pxe.pm:72
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-"您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
-"localdomain 或不设置。请使用 DrakConnect 进行调整。"
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "设置 PXE 服务器"
@@ -2296,6 +2351,25 @@ msgstr "用户目录:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "向导成功地配置了您的 Intranet/Internet Web 服务器"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "如果不想激活 FTP 服务，请清除前面的方框。"
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "警告\n"
+#~ "您在使用 DHCP，服务器可能无法按照您的配置工作。"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. Launch drakconnect to adjust "
+#~ "it."
+#~ msgstr ""
+#~ "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
+#~ "localdomain 或不设置。请使用 DrakConnect 进行调整。"
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."