merge

1 files changed, 181 insertions, 160 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c2b8e52f..ad0cc9a4 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-21 12:03+0100\n"
+"POT-Creation-Date: 2004-01-22 19:33+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"
@@ -44,14 +44,14 @@ msgid "Error."
 msgstr "出错。"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:242
-#: ../dns_wizard/Bind.pm:247 ../dns_wizard/Bind.pm:253
+#: ../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:172
 #: ../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
-#: ../pxe_wizard/Pxe.pm:233 ../pxe_wizard/Pxe.pm:238 ../pxe_wizard/Pxe.pm:243
-#: ../pxe_wizard/Pxe.pm:248 ../samba_wizard/Samba.pm:228
+#: ../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:144
 msgid "Congratulations"
 msgstr "恭喜"
@@ -85,21 +85,21 @@ 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:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 msgid "(you don't need to type the domain after the name)"
 msgstr "(在名字后面不必输入域名)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 msgid "Client identification:"
 msgstr "客户机身份:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 msgid ""
 "Note that the given IP number and client name should be unique in the "
 "network."
 msgstr "注意提供的 IP 地址和客户机名字在网络上应该是唯一的。"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
 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, "
@@ -108,24 +108,21 @@ msgstr ""
 "您的网络客户机将通过名字来鉴别，例如 clientname.company.net。网络中每台机器必"
 "须有一个(唯一的)IP 地址，使用常规的点分隔语法。"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
-#: ../dns_wizard/Bind.pm:135 ../dns_wizard/Bind.pm:216
-#: ../dns_wizard/Bind.pm:225
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
 msgid "Name of the machine:"
 msgstr "机器名:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
-#: ../dns_wizard/Bind.pm:217
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
 msgid "IP number 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:181
+#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
 msgid "Warning"
 msgstr "警告"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:181 ../web_wizard/Apache.pm:83
+#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:83
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "您在使用 dhcp，服务器可能无法按照您的配置工作。"
 
@@ -243,11 +240,11 @@ msgstr "网卡："
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "向导成功地为您的服务器配置了 DHCP 服务。"
 
-#: ../dns_wizard/Bind.pm:71
+#: ../dns_wizard/Bind.pm:72
 msgid "You need to readjust your hostname."
 msgstr "您需要重新调整您的主机名。"
 
-#: ../dns_wizard/Bind.pm:74 ../pxe_wizard/Pxe.pm:72
+#: ../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 egal to localdomain or none. Launch drakconnect to adjust it."
@@ -255,20 +252,20 @@ msgstr ""
 "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
 "localdomain 或不设置。请使用 DrakConnect 进行调整。"
 
-#: ../dns_wizard/Bind.pm:81 ../dns_wizard/Bind.pm:682
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
 msgid "Master DNS server"
 msgstr "主 DNS 服务器"
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:141
-#: ../dns_wizard/Bind.pm:696
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:693
 msgid "Slave DNS server"
 msgstr "从 DNS 服务器"
 
-#: ../dns_wizard/Bind.pm:83
+#: ../dns_wizard/Bind.pm:84
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:84
+#: ../dns_wizard/Bind.pm:85
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "删除主机:"
@@ -293,64 +290,70 @@ msgstr ""
 "此向导将帮助您配置您服务器上的 DNS 服务。所做的配置将提供 DNS 服务以解析本地"
 "的计算机名字，非本地的请求将被转发给外部的 DNS。"
 
-#: ../dns_wizard/Bind.pm:118
+#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "您想要执行何种操作:"
 
-#: ../dns_wizard/Bind.pm:133
+#: ../dns_wizard/Bind.pm:134
 msgid "Choose the host you want to remove in the following list."
 msgstr "请在下面的列表中选择您想要删除的主机。"
 
-#: ../dns_wizard/Bind.pm:133
+#: ../dns_wizard/Bind.pm:134
 msgid "Remove a host in existing dns configuration."
 msgstr "在现有的 DNS 配置中删除主机。"
 
-#: ../dns_wizard/Bind.pm:133
+#: ../dns_wizard/Bind.pm:134
 msgid "Remove host:"
 msgstr "删除主机:"
 
-#: ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:136
+#, fuzzy
+msgid "Computer Name:"
+msgstr "新闻组服务器名:"
+
+#: ../dns_wizard/Bind.pm:142
 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:143
-msgid "IP of master DNS server:"
+#: ../dns_wizard/Bind.pm:144 ../dns_wizard/Bind.pm:209
+#, fuzzy
+msgid "Address IP of the master DNS server:"
 msgstr "主 DNS 服务器的 IP:"
 
-#: ../dns_wizard/Bind.pm:150
+#: ../dns_wizard/Bind.pm:151
 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:150
-msgid "IP of your forwarders"
+#: ../dns_wizard/Bind.pm:151
+msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:150
+#: ../dns_wizard/Bind.pm:151
 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:152 ../dns_wizard/Bind.pm:235
-msgid "IP forwarders:"
+#: ../dns_wizard/Bind.pm:153 ../dns_wizard/Bind.pm:236
+msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:158
+#: ../dns_wizard/Bind.pm:159
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:158
+#: ../dns_wizard/Bind.pm:159
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:158
+#: ../dns_wizard/Bind.pm:159
 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 "
@@ -358,126 +361,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
-msgid "add search domain:"
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:166
-msgid "Error IP of forwarder."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:166
+#: ../dns_wizard/Bind.pm:167
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:171
-msgid "Error Ip of DNS master."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:171
+#: ../dns_wizard/Bind.pm:172
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:176
-msgid "Error Ip of new host."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:176
+#: ../dns_wizard/Bind.pm:177
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:186
+#: ../dns_wizard/Bind.pm:187
 msgid "Error add host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:186
+#: ../dns_wizard/Bind.pm:187
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:191
+#: ../dns_wizard/Bind.pm:192
 msgid "Error remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:191
+#: ../dns_wizard/Bind.pm:192
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:196
+#: ../dns_wizard/Bind.pm:197
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201
+#: ../dns_wizard/Bind.pm:202
 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:206
+#: ../dns_wizard/Bind.pm:207
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:206 ../dns_wizard/Bind.pm:231
-#: ../ldap_wizard/ldap.pm:147
+#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:147
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS(配置)"
 
-#: ../dns_wizard/Bind.pm:208
-#, fuzzy
-msgid "Ip of master DNS server:"
-msgstr "配置 DNS 服务器"
-
-#: ../dns_wizard/Bind.pm:214
+#: ../dns_wizard/Bind.pm:215
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:223
+#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+msgid "Computer name:"
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:218
+msgid "Computer IP number:"
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:231
-msgid "Ok Now building your DNS configuration"
+#: ../dns_wizard/Bind.pm:232
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "服务器标题:"
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "Domainname:"
 msgstr "NIS 域名:"
 
-#: ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:244
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "向导成功地添加了客户。"
 
-#: ../dns_wizard/Bind.pm:248
+#: ../dns_wizard/Bind.pm:254
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "向导成功地添加了客户。"
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "向导已成功地为您的服务器配置了 DNS 服务。"
 
-#: ../dns_wizard/Bind.pm:682
+#: ../dns_wizard/Bind.pm:680
 msgid "Configuring your system as Master DNS server ..."
 msgstr "正在将您的系统配置为主 DNS 服务器..."
 
-#: ../dns_wizard/Bind.pm:696
+#: ../dns_wizard/Bind.pm:693
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "将您的系统配置为 NIS+Autofs(nfs) 服务器..."
@@ -487,12 +481,14 @@ msgid "Apache web server"
 msgstr "Apache Web 服务器"
 
 #: ../drakwizard.pl:41
-msgid "Dhcp server"
-msgstr "DHCP 服务器"
+#, fuzzy
+msgid "DHCP server"
+msgstr "PXE 服务器"
 
 #: ../drakwizard.pl:42
-msgid "Dns server"
-msgstr "DNS 服务器"
+#, fuzzy
+msgid "DNS server"
+msgstr "NFS 服务器"
 
 #: ../drakwizard.pl:43
 msgid "News server"
@@ -507,7 +503,8 @@ msgid "Mail server"
 msgstr "邮件服务器"
 
 #: ../drakwizard.pl:46
-msgid "Ftp server"
+#, fuzzy
+msgid "FTP server"
 msgstr "FTP 服务器"
 
 #: ../drakwizard.pl:47
@@ -531,11 +528,12 @@ msgid "NIS server autofs map"
 msgstr "NIS 服务器 Autofs 映射"
 
 #: ../drakwizard.pl:52
-msgid "Mdk Install server"
+#, fuzzy
+msgid "Mandrake Install server"
 msgstr "Mandrake 安装服务器"
 
-#: ../drakwizard.pl:53
-msgid "Pxe server"
+#: ../drakwizard.pl:53 ../pxe_wizard/Pxe.pm:497
+msgid "PXE server"
 msgstr "PXE 服务器"
 
 #: ../drakwizard.pl:58
@@ -756,8 +754,9 @@ msgid "Enable NFS install server:"
 msgstr "启用全部打印机"
 
 #: ../installsrv_wizard/Installsrv.pm:92
-msgid "Enable HTTP  install server:"
-msgstr ""
+#, fuzzy
+msgid "Enable HTTP install server:"
+msgstr "启用全部打印机"
 
 #: ../installsrv_wizard/Installsrv.pm:98
 msgid "Congratulations, Mandrake Install server is now ready."
@@ -1602,7 +1601,7 @@ msgstr "Squid 代理服务器"
 msgid "PXE Wizard"
 msgstr "PXE 向导"
 
-#: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "设置 PXE 服务器"
 
@@ -1621,15 +1620,15 @@ msgstr "删除 - 在 PXE 中删除引导映像"
 msgid "Modify boot image in PXE"
 msgstr "修改 - 修改 PXE 中的引导映像"
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid "PXE wizard"
 msgstr "PXE 向导"
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid "Set a PXE server."
 msgstr "设置 PXE 服务器。"
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid ""
 "This wizard will help you configuring the PXE server. PXE (Pre-boot "
 "Execution Environment) is a protocol designed by Intel that allows computers "
@@ -1639,205 +1638,211 @@ msgid ""
 "an operating system loaded through the network."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:112
+#: ../pxe_wizard/Pxe.pm:105
 msgid ""
 "This wizard will provide a pxe service, and ability to add/remove/modify "
 "boot images."
 msgstr "此向导将提供一个 PXE 服务，以及添加/删除/修改引导映像的能力。"
 
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:127
 msgid "Add a boot image"
 msgstr "添加引导映像"
 
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:127
 msgid "PXE name: name in PXE menu (one word/number, no space please)"
 msgstr "PXE 名称: PXE 菜单中的名称(一个单词/数字，无空格)"
 
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:127
 msgid "Path to image: full path to image (need network boot image)"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:142
+#: ../pxe_wizard/Pxe.pm:137
 msgid "Choose PXE boot image you want to remove from PXE server."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:142
+#: ../pxe_wizard/Pxe.pm:137
 msgid "Remove a boot image"
 msgstr "删除引导映像"
 
-#: ../pxe_wizard/Pxe.pm:144
+#: ../pxe_wizard/Pxe.pm:139
 msgid "Boot image to remove:"
 msgstr "要删除的引导映像:"
 
-#: ../pxe_wizard/Pxe.pm:149
+#: ../pxe_wizard/Pxe.pm:144
 msgid "Add option to boot image:"
 msgstr "将选项添加到引导映像:"
 
-#: ../pxe_wizard/Pxe.pm:149
+#: ../pxe_wizard/Pxe.pm:144
 msgid "Please choose PXE boot image to modify"
 msgstr "请选择要修改的 PXE 引导映像"
 
-#: ../pxe_wizard/Pxe.pm:151
+#: ../pxe_wizard/Pxe.pm:147
 msgid "Boot image to configure:"
 msgstr "要配置的引导映像:"
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid "Acpi option: Advanced Configuration and Power Interface"
-msgstr ""
-
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid "Install directory: full path to MDK install server directory"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid "Installation method: choose nfs/http to install via nfs/http."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid ""
-"Network client interface: through wich interface client should be installed."
-msgstr ""
-
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid "Options to add to PXE boot disk"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid "Ramsize: adjust ramsize on boot disk."
-msgstr ""
-
-#: ../pxe_wizard/Pxe.pm:157
+#: ../pxe_wizard/Pxe.pm:153
 msgid ""
 "Server IP: IP address of server wich contain installation directory. You can "
 "create one with MDK install server wizard."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:157
-msgid "VGA option: if you encounter some problem whith VGA, please adjust. "
-msgstr ""
-
-#: ../pxe_wizard/Pxe.pm:159 ../pxe_wizard/Pxe.pm:201
+#: ../pxe_wizard/Pxe.pm:155 ../pxe_wizard/Pxe.pm:211
 msgid "Boot image to modify:"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:160 ../pxe_wizard/Pxe.pm:202
+#: ../pxe_wizard/Pxe.pm:156 ../pxe_wizard/Pxe.pm:212
 msgid "Server IP:"
 msgstr "服务器 IP:"
 
-#: ../pxe_wizard/Pxe.pm:161 ../pxe_wizard/Pxe.pm:203
+#: ../pxe_wizard/Pxe.pm:157 ../pxe_wizard/Pxe.pm:213
 msgid "Install directory:"
 msgstr "安装目录:"
 
-#: ../pxe_wizard/Pxe.pm:162 ../pxe_wizard/Pxe.pm:204
+#: ../pxe_wizard/Pxe.pm:158 ../pxe_wizard/Pxe.pm:214
 msgid "Installation method:"
 msgstr "安装方式:"
 
-#: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:205
+#: ../pxe_wizard/Pxe.pm:163
+msgid "Acpi option: Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:163
+msgid ""
+"Network client interface: through wich interface client should be installed."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:163
+msgid "Ramsize: adjust ramsize on boot disk."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:163
+msgid "VGA option: if you encounter some problem whith VGA, please adjust. "
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:215
 msgid "Network client interface:"
 msgstr "网卡:"
 
-#: ../pxe_wizard/Pxe.pm:164 ../pxe_wizard/Pxe.pm:206
+#: ../pxe_wizard/Pxe.pm:166 ../pxe_wizard/Pxe.pm:216
 msgid "Ramsize:"
 msgstr "内存大小:"
 
-#: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:207
+#: ../pxe_wizard/Pxe.pm:167 ../pxe_wizard/Pxe.pm:217
 msgid "VGA option:"
 msgstr "VGA 选项:"
 
-#: ../pxe_wizard/Pxe.pm:166 ../pxe_wizard/Pxe.pm:208
+#: ../pxe_wizard/Pxe.pm:168 ../pxe_wizard/Pxe.pm:218
 msgid "Acpi option:"
 msgstr "Acpi 选项:"
 
-#: ../pxe_wizard/Pxe.pm:167 ../pxe_wizard/Pxe.pm:209
+#: ../pxe_wizard/Pxe.pm:169 ../pxe_wizard/Pxe.pm:219
 msgid "Apic option:"
 msgstr "Apic 选项:"
 
-#: ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:174
 msgid ""
 "This will configure all needed default configurations files to set a PXE "
 "server."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:172
+#: ../pxe_wizard/Pxe.pm:174
 msgid "We need to use a special dhcpd.conf with PXE parameter."
 msgstr "我们需要使用带 PXE 参数的特殊 dhcpd.conf。"
 
-#: ../pxe_wizard/Pxe.pm:176
+#: ../pxe_wizard/Pxe.pm:178
 msgid "Please provide a bootable image..."
 msgstr "请提供可引导的映像..."
 
-#: ../pxe_wizard/Pxe.pm:180
-msgid "Please provide a correct name in PXE entry (one word)"
+#: ../pxe_wizard/Pxe.pm:182
+#, perl-format
+msgid "Please choose an image from a different directory than %s."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:186
+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."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:184
+#: ../pxe_wizard/Pxe.pm:194
 msgid "Please provide another PXE Menu name"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:184
+#: ../pxe_wizard/Pxe.pm:194
 msgid "Similar name is already used in PXE menu entry"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:188
+#: ../pxe_wizard/Pxe.pm:198
 msgid "Now will prepare all default files to set the PXE server"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:190
+#: ../pxe_wizard/Pxe.pm:200
 msgid "Tftp directory:"
 msgstr "TFTP 目录:"
 
-#: ../pxe_wizard/Pxe.pm:191
+#: ../pxe_wizard/Pxe.pm:201
 msgid "Boot image path:"
 msgstr "引导映像路径:"
 
-#: ../pxe_wizard/Pxe.pm:192
+#: ../pxe_wizard/Pxe.pm:202
 msgid "PXE 'default' file:"
 msgstr "PXE 默认文件:"
 
-#: ../pxe_wizard/Pxe.pm:193
+#: ../pxe_wizard/Pxe.pm:203
 msgid "PXE 'help' file:"
 msgstr "PXE 帮助文件:"
 
-#: ../pxe_wizard/Pxe.pm:199
+#: ../pxe_wizard/Pxe.pm:209
 msgid "Now will modify boot options in image"
 msgstr "现在即将修改映像中的引导选项"
 
-#: ../pxe_wizard/Pxe.pm:215
+#: ../pxe_wizard/Pxe.pm:225
 msgid "Now will remove your PXE boot image"
 msgstr "现在即将删除您的 PXE 引导映像"
 
-#: ../pxe_wizard/Pxe.pm:217
+#: ../pxe_wizard/Pxe.pm:227
 msgid "PXE entry to remove:"
 msgstr "要删除的 PXE 项:"
 
-#: ../pxe_wizard/Pxe.pm:223
+#: ../pxe_wizard/Pxe.pm:233
 msgid "Now will add your PXE boot image"
 msgstr "现在将添加您的 PXE 引导映像"
 
-#: ../pxe_wizard/Pxe.pm:234
+#: ../pxe_wizard/Pxe.pm:244
 msgid "The wizard successfully add a PXE boot image."
 msgstr "向导成功地添加了 PXE 引导映像。"
 
-#: ../pxe_wizard/Pxe.pm:239
+#: ../pxe_wizard/Pxe.pm:256
 msgid "The wizard successfully remove a PXE boot image."
 msgstr "向导成功地删除了 PXE 引导映像。"
 
-#: ../pxe_wizard/Pxe.pm:244
+#: ../pxe_wizard/Pxe.pm:268
 msgid "The wizard successfully modify image(s)."
 msgstr "向导成功地修改了映像。"
 
-#: ../pxe_wizard/Pxe.pm:249
+#: ../pxe_wizard/Pxe.pm:273
 msgid "The wizard successfully configured your PXE server."
 msgstr "向导成功地配置了您的 PXE 服务器。"
 
-#: ../pxe_wizard/Pxe.pm:482
+#: ../pxe_wizard/Pxe.pm:497
 msgid "Configuring PXE server on your system..."
 msgstr "正在您的系统中配置 PXE 服务器..."
 
-#: ../pxe_wizard/Pxe.pm:482
-msgid "PXE server"
-msgstr "PXE 服务器"
-
 #: ../samba_wizard/Samba.pm:34
 msgid "Samba wizard"
 msgstr "Samba 向导"
@@ -2287,6 +2292,22 @@ msgstr "用户目录:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "向导成功地配置了您的 Intranet/Internet Web 服务器"
 
+#, fuzzy
+#~ msgid "Ip of master DNS server:"
+#~ msgstr "配置 DNS 服务器"
+
+#~ msgid "Dhcp server"
+#~ msgstr "DHCP 服务器"
+
+#~ msgid "Dns server"
+#~ msgstr "DNS 服务器"
+
+#~ msgid "Ftp server"
+#~ msgstr "FTP 服务器"
+
+#~ msgid "Pxe server"
+#~ msgstr "PXE 服务器"
+
 #~ msgid "Master - Master DNS server"
 #~ msgstr "主 - 主 DNS 服务器"