updated pot file

1 files changed, 405 insertions, 294 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ee713a79..c0e86bc6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-26 17:05+0100\n"
+"POT-Creation-Date: 2004-08-07 12:27+0200\n"
 "PO-Revision-Date: 2004-03-28 01:30+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -23,31 +23,32 @@ msgid "configuration wizard"
 msgstr "配置向导"
 
 #: ../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:200
+#: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
+#: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:206
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "警告。"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
-#: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:206
-#: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
+#: ../samba_wizard/Samba.pm:165 ../samba_wizard/Samba.pm:170
+#: ../samba_wizard/Samba.pm:212 ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "出错。"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/ldap.pm:207 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
-#: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
+#: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:238 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "恭喜"
 
@@ -111,21 +112,23 @@ msgstr "机器名:"
 msgid "IP address of the machine:"
 msgstr "机器的 IP 地址:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:89
-#: ../dhcp_wizard/Dhcp.pm:99 ../dns_wizard/Bind.pm:184
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:184
 msgid "Warning"
 msgstr "警告"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:89
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
 #: ../dns_wizard/Bind.pm:184 ../web_wizard/Apache.pm:85
 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:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
-#: ../drakwizard.pl:91 ../drakwizard.pl:142 ../drakwizard.pl:146
-#: ../kolab_wizard/Kolab.pm:120 ../ldap_wizard/ldap.pm:168
-#: ../postfix_wizard/Postfix.pm:88
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
+#: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/ldap.pm:141
+#: ../ldap_wizard/ldap.pm:145 ../ldap_wizard/ldap.pm:167
+#: ../ldap_wizard/ldap.pm:171 ../ldap_wizard/ldap.pm:175
+#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
 
@@ -167,21 +170,34 @@ msgstr "客户机 IP:"
 msgid "The wizard successfully added the client."
 msgstr "向导成功地添加了客户。"
 
-#: ../dhcp_wizard/Dhcp.pm:43 ../dhcp_wizard/Dhcp.pm:58
+#: ../common/Wizcommon.pm:87
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard ?"
+msgstr ""
+
+#: ../common/Wizcommon.pm:105
+msgid "Close"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP 向导"
 
-#: ../dhcp_wizard/Dhcp.pm:58
+#: ../dhcp_wizard/Dhcp.pm:53
 msgid ""
 "DHCP is a service that automatically assigns networking addresses to your "
 "workstations."
 msgstr "DHCP 是一个服务，它能够为您的工作站自动指派网络地址。"
 
-#: ../dhcp_wizard/Dhcp.pm:58
+#: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "此向导将帮助您在本服务器上配置 DHCP 服务。"
 
-#: ../dhcp_wizard/Dhcp.pm:64
+#: ../dhcp_wizard/Dhcp.pm:58
+msgid "Interface the dhcp server must listen to"
+msgstr "DHCP 服务器必须监听的网卡"
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid ""
 "If you want to enable PXE in your dhcp server please check the box (Pre-boot "
 "eXecution Environment, a protocol that allows computers to boot through the "
@@ -190,11 +206,11 @@ msgstr ""
 "如果您想要在您的 DHCP 服务器中启用 PXE，请选中此框(预启动执行环境 PXE，是一个"
 "允许计算机通过网络启动的协议)。"
 
-#: ../dhcp_wizard/Dhcp.pm:64
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Range of addresses used by DHCP"
 msgstr "DHCP 使用的地址范围"
 
-#: ../dhcp_wizard/Dhcp.pm:64
+#: ../dhcp_wizard/Dhcp.pm:72
 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 "
@@ -203,87 +219,83 @@ msgstr ""
 "选择 DHCP 服务将要分配给各个工作站的地址范围；除非您有特殊要求，接受建议的值"
 "是安全的。(如：192.168.100.20 192.168.100.40)"
 
-#: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
+#: ../dhcp_wizard/Dhcp.pm:82 ../dhcp_wizard/Dhcp.pm:115
 msgid "Lowest IP address:"
 msgstr "最低的 IP 地址:"
 
-#: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
+#: ../dhcp_wizard/Dhcp.pm:83 ../dhcp_wizard/Dhcp.pm:116
 msgid "Highest IP address:"
 msgstr "最高的 IP 地址:"
 
-#: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
+#: ../dhcp_wizard/Dhcp.pm:84 ../dhcp_wizard/Dhcp.pm:117
 msgid "Gateway IP address:"
 msgstr "网关 IP 地址:"
 
-#: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
+#: ../dhcp_wizard/Dhcp.pm:85 ../dhcp_wizard/Dhcp.pm:119
 msgid "Enable PXE:"
 msgstr "启用 PXE:"
 
-#: ../dhcp_wizard/Dhcp.pm:79
-msgid "Interface the dhcp server must listen to"
-msgstr "DHCP 服务器必须监听的网卡"
-
-#: ../dhcp_wizard/Dhcp.pm:94
+#: ../dhcp_wizard/Dhcp.pm:95
 msgid "The IP range specified is not correct."
 msgstr "指定的 IP 范围不对。"
 
-#: ../dhcp_wizard/Dhcp.pm:99
+#: ../dhcp_wizard/Dhcp.pm:100
 msgid "The IP range specified is not in server address range."
 msgstr "指定的 IP 范围并不位于服务器地址的范围内。"
 
-#: ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:105
 msgid "The IP of the server must not be in range."
 msgstr "服务器的 IP 必须不位于范围内。"
 
-#: ../dhcp_wizard/Dhcp.pm:109
+#: ../dhcp_wizard/Dhcp.pm:110
 msgid "Configuring the DHCP server"
 msgstr "配置 DHCP 服务器"
 
-#: ../dhcp_wizard/Dhcp.pm:109
+#: ../dhcp_wizard/Dhcp.pm:110
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "为了配置 DHCP 服务，向导收集了下列需要的参数:"
 
-#: ../dhcp_wizard/Dhcp.pm:111 ../ftp_wizard/Proftpd.pm:128
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
 #: ../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 ../installsrv_wizard/Installsrv.pm:85
-#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:215
-#: ../samba_wizard/Samba.pm:216 ../samba_wizard/Samba.pm:217
+#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:221
+#: ../samba_wizard/Samba.pm:222 ../samba_wizard/Samba.pm:223
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "已禁用"
 
-#: ../dhcp_wizard/Dhcp.pm:111 ../ftp_wizard/Proftpd.pm:128
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
 #: ../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 ../installsrv_wizard/Installsrv.pm:85
-#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:215
-#: ../samba_wizard/Samba.pm:216 ../samba_wizard/Samba.pm:217
+#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:221
+#: ../samba_wizard/Samba.pm:222 ../samba_wizard/Samba.pm:223
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "已启用"
 
-#: ../dhcp_wizard/Dhcp.pm:117
+#: ../dhcp_wizard/Dhcp.pm:118
 msgid "Interface:"
 msgstr "网卡:"
 
-#: ../dhcp_wizard/Dhcp.pm:124
+#: ../dhcp_wizard/Dhcp.pm:125
 msgid "The wizard successfully configured the DHCP services."
 msgstr "向导成功地配置了 DHCP 服务。"
 
-#: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
 #: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
-#: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:237 ../web_wizard/Apache.pm:152
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "失败"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:178
-#: ../samba_wizard/Samba.pm:238 ../web_wizard/Apache.pm:153
+#: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "重新调用配置向导，然后试着更新一些参数。"
 
@@ -300,12 +312,12 @@ msgstr ""
 "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
 "localdomain 或不设置。请使用 DrakConnect 进行调整。"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:692
+#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:707
 msgid "Master DNS server"
 msgstr "主 DNS 服务器"
 
 #: ../dns_wizard/Bind.pm:85 ../dns_wizard/Bind.pm:144
-#: ../dns_wizard/Bind.pm:706
+#: ../dns_wizard/Bind.pm:721
 msgid "Slave DNS server"
 msgstr "从 DNS 服务器"
 
@@ -468,7 +480,7 @@ msgstr ""
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "向导现在将创建您的从 DNS 配置"
 
-#: ../dns_wizard/Bind.pm:209 ../ldap_wizard/ldap.pm:145
+#: ../dns_wizard/Bind.pm:209
 msgid "with this configuration:"
 msgstr "使用这个配置:"
 
@@ -517,18 +529,14 @@ msgstr "向导已成功地为您的服务器配置了 DNS 服务。"
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "请重新调用配置向导，然后试着更新一些参数。"
 
-#: ../dns_wizard/Bind.pm:692
+#: ../dns_wizard/Bind.pm:707
 msgid "Configuring your system as Master DNS server ..."
 msgstr "正在将您的系统配置为主 DNS 服务器..."
 
-#: ../dns_wizard/Bind.pm:706
+#: ../dns_wizard/Bind.pm:721
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "将您的系统配置为从 DNS 服务器..."
 
-#: ../drakwizard.pl:40
-msgid "Apache web server"
-msgstr "Apache Web 服务器"
-
 #: ../drakwizard.pl:41
 msgid "DHCP server"
 msgstr "DHCP 服务器"
@@ -553,7 +561,7 @@ msgstr "邮件服务器"
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:478
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:510
 msgid "Samba server"
 msgstr "Samba 服务器"
 
@@ -581,19 +589,19 @@ msgstr "Mandrakelinux 安装服务器"
 msgid "PXE server"
 msgstr "PXE 服务器"
 
-#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:152
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:154
 msgid "Kolab server"
 msgstr "Kolab 服务器"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:68
 msgid "Drakwizard wizard selection"
 msgstr "选择 Drakwizard 向导"
 
-#: ../drakwizard.pl:61
+#: ../drakwizard.pl:69
 msgid "Please select a wizard"
 msgstr "请选择一个向导"
 
-#: ../drakwizard.pl:142
+#: ../drakwizard.pl:157
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -602,7 +610,7 @@ msgstr ""
 "%s 未安装\n"
 "单击“下一步”安装，单击“取消”退出"
 
-#: ../drakwizard.pl:146 ../kolab_wizard/Kolab.pm:120
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
 msgid "Installation failed"
 msgstr "安装失败"
 
@@ -757,61 +765,66 @@ msgstr "向导成功地配置了您的 Intranet/Internet FTP 服务器"
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "请重新调用配置向导，然后试着更新一些参数。"
 
-#: ../installsrv_wizard/Installsrv.pm:51
+#: ../installsrv_wizard/Installsrv.pm:53
 msgid "Configure a Mandrake install server (via NFS and http)"
 msgstr "配置 Mandrake 安装服务器(通过 NFS 和 HTTP)"
 
-#: ../installsrv_wizard/Installsrv.pm:51
+#: ../installsrv_wizard/Installsrv.pm:53
 msgid ""
 "Easily configure a Mandrake server installation directory, with NFS and HTTP "
 "access."
 msgstr "轻松配置 Mandrake 服务器安装目录，使用 NFS 和 HTTP 方式。"
 
-#: ../installsrv_wizard/Installsrv.pm:56
+#: ../installsrv_wizard/Installsrv.pm:58
 msgid "Destination directory: copy file in which directory ?"
 msgstr "目的目录：在哪个目录中复制文件？"
 
-#: ../installsrv_wizard/Installsrv.pm:56
+#: ../installsrv_wizard/Installsrv.pm:58
 msgid "Install server configuration"
 msgstr "安装服务器配置"
 
-#: ../installsrv_wizard/Installsrv.pm:56
+#: ../installsrv_wizard/Installsrv.pm:58
 msgid ""
 "Path to data: specify your source directory, should be base of an Mandrake "
 "installation."
 msgstr "数据的路径：指定您的源目录，它应该是 Mandrake 安装的基础。"
 
-#: ../installsrv_wizard/Installsrv.pm:71
+#: ../installsrv_wizard/Installsrv.pm:73
 msgid "The destination directory could not be '/var/install/'"
 msgstr "目的目录不能是“/var/install/”"
 
-#: ../installsrv_wizard/Installsrv.pm:71
+#: ../installsrv_wizard/Installsrv.pm:73
 msgid "ie use: /var/install/mdk-release"
 msgstr "例如，使用：/var/install/mdk-release"
 
-#: ../installsrv_wizard/Installsrv.pm:75
+#: ../installsrv_wizard/Installsrv.pm:77
 msgid ""
 "Error, the source path must be a directory with full Mandrake installation "
 "directory."
 msgstr "错误，源目录必须是一个拥有完整的 Mandrake 安装文件的目录。"
 
-#: ../installsrv_wizard/Installsrv.pm:79
+#: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory already in use, please choose another one."
 msgstr "目的目录已经被使用，请选择其他的目录。"
 
-#: ../installsrv_wizard/Installsrv.pm:83
+#: ../installsrv_wizard/Installsrv.pm:85
 msgid "Your install server will be configured with these parameters"
 msgstr "您的安装服务器将会以这些参数加以配置"
 
-#: ../installsrv_wizard/Installsrv.pm:91
+#: ../installsrv_wizard/Installsrv.pm:93
 msgid "Enable NFS install server:"
 msgstr "启用 NFS 安装服务器:"
 
-#: ../installsrv_wizard/Installsrv.pm:92
+#: ../installsrv_wizard/Installsrv.pm:94
 msgid "Enable HTTP install server:"
 msgstr "启用 HTTP 安装服务器:"
 
-#: ../installsrv_wizard/Installsrv.pm:98
+#: ../installsrv_wizard/Installsrv.pm:100
+#, fuzzy
+msgid "Configuring your system, please wait..."
+msgstr "正在将您的系统配置为 NIS 客户..."
+
+#: ../installsrv_wizard/Installsrv.pm:104
 msgid ""
 "Congratulations, Mandrake Install server is now ready. You can now configure "
 "a DHCP server with PXE support, and a PXE server. So it will be very easy to "
@@ -820,14 +833,6 @@ msgstr ""
 "恭喜，Mandrake 安装服务器已经就绪。您现在可以配置支持 PXE 的 DHCP 服务器和 "
 "PXE 服务器了。这样，通过网络安装 Mandrake 将非常简单。"
 
-#: ../installsrv_wizard/Installsrv.pm:143
-msgid "Copying data to destination directory, can take a while...."
-msgstr "正在复制数据到目的文件夹，这将需要几分钟时间...."
-
-#: ../installsrv_wizard/Installsrv.pm:143
-msgid "Install Server"
-msgstr "安装服务器"
-
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
 msgstr "Kolab 配置向导"
@@ -872,8 +877,7 @@ msgstr "输入 Kolab 服务器管理员账户的密码。"
 msgid "Password mismatch, or null password, please correct."
 msgstr "密码不相配，或者密码为空，请纠正。"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/ldap.pm:89
-#: ../ldap_wizard/ldap.pm:128
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/ldap.pm:135
 msgid "Password:"
 msgstr "密码:"
 
@@ -901,184 +905,170 @@ msgstr ""
 "kolab 服务器现已配置并运行起来了。请在 https://127.0.0.1/kolab/admin/ 以用户"
 "名“manager”及您输入的密码登录"
 
-#: ../kolab_wizard/Kolab.pm:115
+#: ../kolab_wizard/Kolab.pm:109
 msgid "Install in progress"
 msgstr "安装进行中"
 
-#: ../kolab_wizard/Kolab.pm:115
+#: ../kolab_wizard/Kolab.pm:109
 msgid "Installing Kolab server on your system..."
 msgstr "正在您的系统中安装 Kolab 服务器..."
 
-#: ../kolab_wizard/Kolab.pm:152
+#: ../kolab_wizard/Kolab.pm:154
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 Kolab 服务器..."
 
-#: ../ldap_wizard/ldap.pm:59
+#: ../ldap_wizard/ldap.pm:26 ../ldap_wizard/ldapdef.pm:25
+msgid "Add POSIX account"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:87
 msgid "Server - Set configuration of LDAP server"
 msgstr "服务器 - 设置 LDAP 服务器的配置"
 
-#: ../ldap_wizard/ldap.pm:60
-msgid "Add - add entry in LDAP server"
+#: ../ldap_wizard/ldap.pm:88
+#, fuzzy
+msgid "Add - Add user in LDAP server"
 msgstr "添加 - 添加 LDAP 服务器的入口"
 
-#: ../ldap_wizard/ldap.pm:67
+#: ../ldap_wizard/ldap.pm:93
 msgid "LDAP configuration wizard"
 msgstr "LDAP 配置向导"
 
-#: ../ldap_wizard/ldap.pm:67
-msgid "Setup a ldap server."
-msgstr "设置 LDAP 服务器。"
-
-#: ../ldap_wizard/ldap.pm:79
-msgid "which operation on LDAP:"
-msgstr "在 LDAP 中进行什么操作:"
-
-#: ../ldap_wizard/ldap.pm:84
-msgid "Add data in LDAP"
-msgstr "往 LDAP 中添加数据"
+#: ../ldap_wizard/ldap.pm:93
+#, fuzzy
+msgid "Setup a LDAP server."
+msgstr "设置 PXE 服务器。"
 
-#: ../ldap_wizard/ldap.pm:84
-msgid "uid, gid, home directory, "
-msgstr "UID，GUID，主目录，"
+#: ../ldap_wizard/ldap.pm:105
+msgid "Your choice:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:86 ../ldap_wizard/ldap.pm:125
-msgid "First Name:"
-msgstr "名:"
+#: ../ldap_wizard/ldap.pm:109
+#, fuzzy
+msgid "Config Server "
+msgstr "Postfix 服务器"
 
-#: ../ldap_wizard/ldap.pm:87 ../ldap_wizard/ldap.pm:126
-msgid "Last Name:"
-msgstr "姓:"
+#: ../ldap_wizard/ldap.pm:111
+#, fuzzy
+msgid "Server Name: "
+msgstr "服务器主机名:"
 
-#: ../ldap_wizard/ldap.pm:88 ../ldap_wizard/ldap.pm:127
-msgid "User Name:"
-msgstr "用户名:"
+#: ../ldap_wizard/ldap.pm:112
+#, fuzzy
+msgid "Server RootDN: "
+msgstr "服务器主机名:"
 
-#: ../ldap_wizard/ldap.pm:90
-msgid "Home Directory:"
-msgstr "主目录:"
+#: ../ldap_wizard/ldap.pm:113
+#, fuzzy
+msgid "RootDN Password: "
+msgstr "密码:"
 
-#: ../ldap_wizard/ldap.pm:91 ../ldap_wizard/ldap.pm:130
-msgid "Login shell:"
-msgstr "登录 shell 环境:"
-
-#: ../ldap_wizard/ldap.pm:92 ../ldap_wizard/ldap.pm:131
-msgid "uid number:"
-msgstr "UID 号:"
-
-#: ../ldap_wizard/ldap.pm:93 ../ldap_wizard/ldap.pm:132
-msgid "Group ID:"
-msgstr "组 IP(GID):"
-
-#: ../ldap_wizard/ldap.pm:99
-msgid ""
-"LDAP RootDSE\n"
-"\n"
-"example:\n"
-"obelx.nux.com\n"
-"\n"
-"will be in ldap config:\n"
-"\n"
-"dc=obelx,dc=nux,dc=com\n"
-"\n"
-"RootDN is the manager of your ldap server."
-msgstr ""
-"LDAP RootDSE\n"
-"\n"
-"例如：\n"
-"obelx.nux.com\n"
-"\n"
-"在 LDAP 配置中应该是:\n"
-"\n"
-"dc=obelx,dc=nux,dc=com\n"
-"\n"
-"RootDN 是您的 LDAP 服务器的管理器。"
-
-#: ../ldap_wizard/ldap.pm:111 ../ldap_wizard/ldap.pm:148
-msgid "RootDSE"
-msgstr "RootDSE"
-
-#: ../ldap_wizard/ldap.pm:113 ../ldap_wizard/ldap.pm:150
-msgid "RootDN"
-msgstr "RootDN"
+#: ../ldap_wizard/ldap.pm:114
+#, fuzzy
+msgid "Server Suffix: "
+msgstr "服务器 IP:"
 
 #: ../ldap_wizard/ldap.pm:115
-msgid "Password"
-msgstr "密码"
+msgid "Server Default Users OU: "
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:117
-msgid "Default OU"
-msgstr "默认 OU"
+#: ../ldap_wizard/ldap.pm:120
+msgid "LDAP User Add"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:123
-msgid "Ok Now add entry in LDAP"
-msgstr "好的，现在在 LDAP 中添加入口"
+#: ../ldap_wizard/ldap.pm:120
+#, fuzzy
+msgid "User Create in: "
+msgstr "用户名:"
 
-#: ../ldap_wizard/ldap.pm:129
-msgid "Home directory:"
-msgstr "用户目录:"
+#: ../ldap_wizard/ldap.pm:123
+msgid "First Name:"
+msgstr "名:"
 
-#: ../ldap_wizard/ldap.pm:133
-msgid "Container:"
-msgstr "容器:"
+#: ../ldap_wizard/ldap.pm:125 ../ldap_wizard/ldap.pm:186
+#, fuzzy
+msgid "Name:"
+msgstr "用户名:"
 
-#: ../ldap_wizard/ldap.pm:134
-msgid "shadowMax:"
-msgstr "shadowMax:"
+#: ../ldap_wizard/ldap.pm:127 ../ldap_wizard/ldap.pm:190
+msgid "User Name:"
+msgstr "用户名:"
 
-#: ../ldap_wizard/ldap.pm:135
-msgid "shadowMin:"
-msgstr "shadowMin:"
+#: ../ldap_wizard/ldap.pm:132
+#, fuzzy
+msgid "LDAP User Password"
+msgstr "密码"
 
-#: ../ldap_wizard/ldap.pm:136
-msgid "shadowWarning:"
-msgstr "shadowWarning:"
+#: ../ldap_wizard/ldap.pm:132
+#, fuzzy
+msgid "Password for Users: "
+msgstr "密码:"
 
 #: ../ldap_wizard/ldap.pm:137
-msgid "shadowInactive:"
-msgstr "shadowInactive:"
+#, fuzzy
+msgid "Password (again):"
+msgstr "重输密码:"
 
-#: ../ldap_wizard/ldap.pm:138
-msgid "shadowExpire:"
-msgstr "shadowExpire:"
+#: ../ldap_wizard/ldap.pm:141 ../ldap_wizard/ldap.pm:171
+msgid "You must enter a password for LDAP."
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:139
-msgid "objectClass:"
-msgstr "objectClass:"
+#: ../ldap_wizard/ldap.pm:145 ../ldap_wizard/ldap.pm:175
+msgid "The passwords do not match"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:145
-msgid "Ok Now building your LDAP configuration"
-msgstr "好的，现在正在创建您的 LDAP 配置"
+#: ../ldap_wizard/ldap.pm:154
+#, fuzzy
+msgid "Configuring LDAP"
+msgstr "配置 Samba"
 
-#: ../ldap_wizard/ldap.pm:156
-msgid "Error in Home directory"
-msgstr "Home 目录中有错"
+#: ../ldap_wizard/ldap.pm:157 ../ldap_wizard/ldap.pm:201
+msgid "LDAP Suffix:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:160
-msgid "Error, pass could not be empty"
-msgstr "错误，pass 不能为空"
+#: ../ldap_wizard/ldap.pm:159
+msgid "LDAP Administrator:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:164
-msgid "Error in Login shell"
-msgstr "Login shell 中有错"
+#: ../ldap_wizard/ldap.pm:161
+#, fuzzy
+msgid "LDAP Password:"
+msgstr "密码:"
 
-#: ../ldap_wizard/ldap.pm:164
-msgid "Please choose a correct one"
-msgstr "请选择正确的项"
+#: ../ldap_wizard/ldap.pm:163
+#, fuzzy
+msgid "LDAP Password (again):"
+msgstr "重输密码:"
+
+#: ../ldap_wizard/ldap.pm:167
+msgid "You must enter a suffix for LDAP."
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:183 ../ldap_wizard/ldap.pm:198
+msgid "Confirmation de l'utilisateur a creer"
+msgstr ""
+
+#: ../ldap_wizard/ldap.pm:188
+#, fuzzy
+msgid "First name:"
+msgstr "名:"
 
-#: ../ldap_wizard/ldap.pm:168
-msgid "Please Should be a number"
-msgstr "应该是一个数字"
+#: ../ldap_wizard/ldap.pm:192
+msgid "Create in:"
+msgstr ""
 
-#: ../ldap_wizard/ldap.pm:173
+#: ../ldap_wizard/ldap.pm:208
 msgid "The wizard successfully configured the LDAP."
 msgstr "向导成功地配置了 LDAP。"
 
-#: ../ldap_wizard/ldap.pm:179
-msgid "Successfully added data"
+#: ../ldap_wizard/ldap.pm:214
+#, fuzzy
+msgid "Successfully added User"
 msgstr "成功地添加了数据"
 
-#: ../ldap_wizard/ldap.pm:180
-msgid "The wizard successfully added an entry in ldap"
+#: ../ldap_wizard/ldap.pm:215
+#, fuzzy
+msgid "The wizard successfully added an user in LDAP"
 msgstr "向导成功地在 LDAP 中添加了项"
 
 #: ../news_wizard/Inn.pm:33
@@ -1182,11 +1172,11 @@ msgstr "向导成功地为您的服务器配置了 Internet 新闻组服务。"
 msgid "NFS Wizard"
 msgstr "NFS 向导"
 
-#: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
+#: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:39
 msgid "All - No access restriction"
 msgstr "全部 - 没有访问限制"
 
-#: ../nfs_wizard/NFS.pm:46 ../proxy_wizard/Squid.pm:38
+#: ../nfs_wizard/NFS.pm:46 ../proxy_wizard/Squid.pm:40
 msgid "Local Network - access for local network (recommended)"
 msgstr "局域网 - 允许局域网访问(推荐)"
 
@@ -1207,16 +1197,21 @@ msgstr ""
 "即将导出给 NFS 客户端目录。此目录将以只读模式导出，而且会禁止任何试图更改文件"
 "系统的请求。"
 
-#: ../nfs_wizard/NFS.pm:59
+#: ../nfs_wizard/NFS.pm:58
 msgid "Directory:"
 msgstr "目录:"
 
-#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:170
+#: ../web_wizard/Apache.pm:119
+msgid "The path you entered does not exist."
+msgstr "您输入的路径不存在。"
+
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:108
 #: ../samba_wizard/Samba.pm:119
 msgid "Access control"
 msgstr "访问控制"
 
-#: ../nfs_wizard/NFS.pm:64
+#: ../nfs_wizard/NFS.pm:69
 msgid ""
 "Choose the level that suits your needs. If you don't know, the local network "
 "level is usually the most appropriate. Beware that the all level may be not "
@@ -1225,30 +1220,25 @@ msgstr ""
 "选择适合您需要的级别。如果不清楚，通常局域网是合适的级别。注意并非所有的级别"
 "都足够安全。"
 
-#: ../nfs_wizard/NFS.pm:64
+#: ../nfs_wizard/NFS.pm:69
 msgid "NFS can be restricted to a certain ip class"
 msgstr "NFS 无法限制到特定的 IP 类型"
 
-#: ../nfs_wizard/NFS.pm:75 ../proxy_wizard/Squid.pm:117
+#: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:119
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
 msgstr ""
 "将允许网络上的主机访问。这里是您当前的局域网的有关信息，如果需要您可以修改。"
 
-#: ../nfs_wizard/NFS.pm:75 ../proxy_wizard/Squid.pm:117
+#: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:119
 msgid "Grant access on local network"
 msgstr "允许局域网访问"
 
-#: ../nfs_wizard/NFS.pm:77 ../proxy_wizard/Squid.pm:122
+#: ../nfs_wizard/NFS.pm:82 ../proxy_wizard/Squid.pm:124
 msgid "Authorized network:"
 msgstr "授权的网络:"
 
-#: ../nfs_wizard/NFS.pm:83 ../samba_wizard/Samba.pm:164
-#: ../web_wizard/Apache.pm:119
-msgid "The path you entered does not exist."
-msgstr "您输入的路径不存在。"
-
 #: ../nfs_wizard/NFS.pm:88
 msgid "The wizard collected the following parameters."
 msgstr "此向导收集了下列参数:"
@@ -1569,41 +1559,41 @@ msgstr "正在删除 Sendmail 以避免冲突..."
 msgid "Configuring your Postfix server....."
 msgstr "正在配置您的 Postfix 服务器..."
 
-#: ../proxy_wizard/Squid.pm:39
+#: ../proxy_wizard/Squid.pm:41
 msgid "Localhost - access restricted to this server only"
 msgstr "本机 - 只允许这个服务器访问"
 
-#: ../proxy_wizard/Squid.pm:42
+#: ../proxy_wizard/Squid.pm:44
 msgid "No upper level proxy (recommended)"
 msgstr "没有上级代理(推荐)"
 
-#: ../proxy_wizard/Squid.pm:43
+#: ../proxy_wizard/Squid.pm:45
 msgid "Define an upper level proxy"
 msgstr "定义一个上级代理"
 
-#: ../proxy_wizard/Squid.pm:47
+#: ../proxy_wizard/Squid.pm:49
 msgid "Squid wizard"
 msgstr "Squid 向导"
 
-#: ../proxy_wizard/Squid.pm:65
+#: ../proxy_wizard/Squid.pm:67
 msgid "Proxy Configuration Wizard"
 msgstr "代理服务器配置向导"
 
-#: ../proxy_wizard/Squid.pm:65
+#: ../proxy_wizard/Squid.pm:67
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
 msgstr "Squid 是一个 Web 缓存代理服务器，它允许从您的局域网更快的访问 Web。"
 
-#: ../proxy_wizard/Squid.pm:65
+#: ../proxy_wizard/Squid.pm:67
 msgid "This wizard will help you in configuring your proxy server."
 msgstr "此向导将帮助您配置代理服务器。"
 
-#: ../proxy_wizard/Squid.pm:70
+#: ../proxy_wizard/Squid.pm:72
 msgid "Proxy Port"
 msgstr "代理服务器端口"
 
-#: ../proxy_wizard/Squid.pm:70
+#: ../proxy_wizard/Squid.pm:72
 msgid ""
 "Proxy port value sets what port the proxy server will listen on for http "
 "requests. Default is 3128, other common value can be 8080, the port value "
@@ -1612,37 +1602,37 @@ msgstr ""
 "代理端口指定代理服务器监听 HTTP 请求所使用的端口。缺省值是 3128，其他常用的值"
 "是 8080，端口号需要大于 1024。"
 
-#: ../proxy_wizard/Squid.pm:76
+#: ../proxy_wizard/Squid.pm:78
 msgid "Proxy port:"
 msgstr "代理服务器端口:"
 
-#: ../proxy_wizard/Squid.pm:81
+#: ../proxy_wizard/Squid.pm:83
 msgid ""
 "Press Next if you want to keep this value, or Back to correct your choice."
 msgstr "如果您要保留这个值，请按“下一步”。要修改您的选择，请按“上一步”。"
 
-#: ../proxy_wizard/Squid.pm:81
+#: ../proxy_wizard/Squid.pm:83
 msgid "You have entered a port that may be useful for this service:"
 msgstr "您输入的断口可能被此服务占用:"
 
-#: ../proxy_wizard/Squid.pm:88
+#: ../proxy_wizard/Squid.pm:90
 msgid "Press back to change the value."
 msgstr "按“上一步”修改值。"
 
-#: ../proxy_wizard/Squid.pm:88
+#: ../proxy_wizard/Squid.pm:90
 msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "请选择一个 1024 到 65535 之间的端口号"
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr "磁盘缓存是可以用作缓存的磁盘空间总量。"
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid "For your information, here is /var/spool/squid space on disk:"
 msgstr "注意，/var/spool/squid 的磁盘空间是:"
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid ""
 "Memory Cache is the amount of RAM dedicated to cache memory operations (note "
 "that actual memory usage of the whole squid process is bigger)."
@@ -1650,25 +1640,25 @@ msgstr ""
 "内存缓冲区是专门用于缓冲内存操作的 RAM 总量(注意整个 squid 进程实际使用的内存"
 "量比这个还多)"
 
-#: ../proxy_wizard/Squid.pm:92
+#: ../proxy_wizard/Squid.pm:94
 msgid "Proxy Cache Size"
 msgstr "代理缓存大小"
 
-#: ../proxy_wizard/Squid.pm:98 ../proxy_wizard/Squid.pm:151
-#: ../proxy_wizard/Squid.pm:164
+#: ../proxy_wizard/Squid.pm:100 ../proxy_wizard/Squid.pm:153
+#: ../proxy_wizard/Squid.pm:166
 msgid "Memory cache (MB):"
 msgstr "内存缓冲区(MB):"
 
-#: ../proxy_wizard/Squid.pm:99 ../proxy_wizard/Squid.pm:152
-#: ../proxy_wizard/Squid.pm:165
+#: ../proxy_wizard/Squid.pm:101 ../proxy_wizard/Squid.pm:154
+#: ../proxy_wizard/Squid.pm:167
 msgid "Disk space (MB):"
 msgstr "磁盘空间(MB):"
 
-#: ../proxy_wizard/Squid.pm:104
+#: ../proxy_wizard/Squid.pm:106
 msgid "Access Control"
 msgstr "访问控制"
 
-#: ../proxy_wizard/Squid.pm:104
+#: ../proxy_wizard/Squid.pm:106
 msgid ""
 "Choose the level that suits your needs. If you don't know, the Local Network "
 "level is usually the most appropriate. Beware that the All level may be not "
@@ -1677,11 +1667,11 @@ msgstr ""
 "选择适合您需要的级别。如果不清楚，通常局域网是合适的级别。注意并非所有的级别"
 "都足够安全。"
 
-#: ../proxy_wizard/Squid.pm:104
+#: ../proxy_wizard/Squid.pm:106
 msgid "The proxy can be configured to use different access control levels"
 msgstr "可以配置代理使用不同的访问控制级别"
 
-#: ../proxy_wizard/Squid.pm:117
+#: ../proxy_wizard/Squid.pm:119
 msgid ""
 "You can use either a numeric format like \"192.168.1.0/255.255.255.0\" or a "
 "text format like \".domain.net\""
@@ -1689,7 +1679,7 @@ msgstr ""
 "可以使用数字格式，如“192.168.1.0/255.255.255.0”，或者文字格式，如“.domain."
 "net”"
 
-#: ../proxy_wizard/Squid.pm:122
+#: ../proxy_wizard/Squid.pm:124
 msgid ""
 "Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like "
 "\".domain.net\""
@@ -1697,47 +1687,47 @@ msgstr ""
 "可以使用数字格式，如“192.168.1.0/255.255.255.0”，或者文字格式，如“.domain."
 "net”"
 
-#: ../proxy_wizard/Squid.pm:127
+#: ../proxy_wizard/Squid.pm:129
 msgid ""
 "As an option, Squid can be configured in proxy cascading. You can add a new "
 "upper level proxy by specifying its hostname and port."
 msgstr "可选的，SQUID 可以配置成多层代理。您可以指定上级代理的主机名和端口。"
 
-#: ../proxy_wizard/Squid.pm:127 ../proxy_wizard/Squid.pm:140
+#: ../proxy_wizard/Squid.pm:129 ../proxy_wizard/Squid.pm:142
 msgid "Cache hierarchy"
 msgstr "缓存层次"
 
-#: ../proxy_wizard/Squid.pm:127
+#: ../proxy_wizard/Squid.pm:129
 msgid ""
 "You can safely select \"No upper level proxy\" if you don't need this "
 "feature."
 msgstr "如果不需要，请选择“没有上级代理”。"
 
-#: ../proxy_wizard/Squid.pm:140
+#: ../proxy_wizard/Squid.pm:142
 msgid ""
 "Enter the qualified hostname (like \"cache.domain.net\") and the port of the "
 "proxy to use."
 msgstr "输入代理使用的完整的主机名(如“cache.domain.net”)和端口。"
 
-#: ../proxy_wizard/Squid.pm:142 ../proxy_wizard/Squid.pm:154
+#: ../proxy_wizard/Squid.pm:144 ../proxy_wizard/Squid.pm:156
 msgid "Upper level proxy hostname:"
 msgstr "上级代理服务器主机名:"
 
-#: ../proxy_wizard/Squid.pm:143 ../proxy_wizard/Squid.pm:155
+#: ../proxy_wizard/Squid.pm:145 ../proxy_wizard/Squid.pm:157
 msgid "Upper level proxy port:"
 msgstr "上级代理端口:"
 
-#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Configuring the Proxy"
 msgstr "配置代理"
 
-#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "为了配置您的代理服务器，向导收集了下列需要的参数:"
 
-#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
-#: ../samba_wizard/Samba.pm:212 ../web_wizard/Apache.pm:131
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
+#: ../samba_wizard/Samba.pm:218 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1745,23 +1735,23 @@ msgstr ""
 "要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
 "们。"
 
-#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
+#: ../proxy_wizard/Squid.pm:152 ../proxy_wizard/Squid.pm:165
 msgid "Port:"
 msgstr "端口:"
 
-#: ../proxy_wizard/Squid.pm:153 ../proxy_wizard/Squid.pm:166
+#: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
 msgid "Access Control:"
 msgstr "访问控制:"
 
-#: ../proxy_wizard/Squid.pm:172
+#: ../proxy_wizard/Squid.pm:174
 msgid "The wizard have successfully configured your proxy server."
 msgstr "向导成功地配置了您的代理服务器。"
 
-#: ../proxy_wizard/Squid.pm:225
+#: ../proxy_wizard/Squid.pm:227
 msgid "Configuring your system as a Proxy server..."
 msgstr "正在将您的系统配置为代理服务器..."
 
-#: ../proxy_wizard/Squid.pm:225
+#: ../proxy_wizard/Squid.pm:227
 msgid "Squid proxy"
 msgstr "Squid 代理服务器"
 
@@ -2142,7 +2132,7 @@ msgstr "Samba 要服务的 Windows 工作组。"
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../samba_wizard/Samba.pm:81 ../samba_wizard/Samba.pm:220
+#: ../samba_wizard/Samba.pm:81 ../samba_wizard/Samba.pm:226
 msgid "Workgroup:"
 msgstr "工作组:"
 
@@ -2253,7 +2243,7 @@ msgstr ""
 "设置一个密码。"
 
 #: ../samba_wizard/Samba.pm:153 ../samba_wizard/Samba.pm:159
-#: ../samba_wizard/Samba.pm:223
+#: ../samba_wizard/Samba.pm:229
 msgid "Shared directory:"
 msgstr "共享目录:"
 
@@ -2261,11 +2251,19 @@ msgstr "共享目录:"
 msgid "Type the path of the directory you want being shared."
 msgstr "请输入您想要共享的目录路径。"
 
-#: ../samba_wizard/Samba.pm:169
+#: ../samba_wizard/Samba.pm:160
+msgid "Create shared directory if it doesn't exists"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:165
+msgid "Failed to create directory."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:175
 msgid "File permissions"
 msgstr "文件许可"
 
-#: ../samba_wizard/Samba.pm:169
+#: ../samba_wizard/Samba.pm:175
 msgid ""
 "Type users or group separated by a comma (groups must be preceded by a '@') "
 "like this :\n"
@@ -2274,59 +2272,59 @@ msgstr ""
 "请为每种许可输入以逗号分隔的用户或组(组必须以“@”开头)，如: \n"
 "root, fred, @users, @wheel。"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:182
 msgid "Read list:"
 msgstr "读取列表:"
 
-#: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
+#: ../samba_wizard/Samba.pm:182 ../samba_wizard/Samba.pm:183
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:177
+#: ../samba_wizard/Samba.pm:183
 msgid "Write list:"
 msgstr "写入列表:"
 
-#: ../samba_wizard/Samba.pm:187
+#: ../samba_wizard/Samba.pm:193
 msgid "Select which printers you want to be accessible from known users"
 msgstr "选择您想要让已知用户访问的打印机"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:200
 msgid "Enable all printers"
 msgstr "启用全部打印机"
 
-#: ../samba_wizard/Samba.pm:212
+#: ../samba_wizard/Samba.pm:218
 msgid "Configuring Samba"
 msgstr "配置 Samba"
 
-#: ../samba_wizard/Samba.pm:212
+#: ../samba_wizard/Samba.pm:218
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "为了配置 Samba，向导收集了下列需要的参数。"
 
-#: ../samba_wizard/Samba.pm:221
+#: ../samba_wizard/Samba.pm:227
 msgid "Server banner:"
 msgstr "服务器标语:"
 
-#: ../samba_wizard/Samba.pm:222
+#: ../samba_wizard/Samba.pm:228
 msgid "File sharing:"
 msgstr "文件共享:"
 
-#: ../samba_wizard/Samba.pm:224
+#: ../samba_wizard/Samba.pm:230
 msgid "Print server:"
 msgstr "打印服务器:"
 
-#: ../samba_wizard/Samba.pm:225
+#: ../samba_wizard/Samba.pm:231
 msgid "Home:"
 msgstr "主目录:"
 
-#: ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:232
 msgid "Printers:"
 msgstr "打印机:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:238
 msgid "The wizard successfully configured your Samba server."
 msgstr "向导成功地配置了您的 Samba 服务器。"
 
-#: ../samba_wizard/Samba.pm:478
+#: ../samba_wizard/Samba.pm:510
 msgid "Configuring your Samba server..."
 msgstr "正在配置您的 Postfix 服务器..."
 
@@ -2555,3 +2553,116 @@ msgstr "Apache 服务器"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
+
+#~ msgid "Apache web server"
+#~ msgstr "Apache Web 服务器"
+
+#~ msgid "Copying data to destination directory, can take a while...."
+#~ msgstr "正在复制数据到目的文件夹，这将需要几分钟时间...."
+
+#~ msgid "Install Server"
+#~ msgstr "安装服务器"
+
+#~ msgid "Setup a ldap server."
+#~ msgstr "设置 LDAP 服务器。"
+
+#~ msgid "which operation on LDAP:"
+#~ msgstr "在 LDAP 中进行什么操作:"
+
+#~ msgid "Add data in LDAP"
+#~ msgstr "往 LDAP 中添加数据"
+
+#~ msgid "uid, gid, home directory, "
+#~ msgstr "UID，GUID，主目录，"
+
+#~ msgid "Last Name:"
+#~ msgstr "姓:"
+
+#~ msgid "Home Directory:"
+#~ msgstr "主目录:"
+
+#~ msgid "Login shell:"
+#~ msgstr "登录 shell 环境:"
+
+#~ msgid "uid number:"
+#~ msgstr "UID 号:"
+
+#~ msgid "Group ID:"
+#~ msgstr "组 IP(GID):"
+
+#~ msgid ""
+#~ "LDAP RootDSE\n"
+#~ "\n"
+#~ "example:\n"
+#~ "obelx.nux.com\n"
+#~ "\n"
+#~ "will be in ldap config:\n"
+#~ "\n"
+#~ "dc=obelx,dc=nux,dc=com\n"
+#~ "\n"
+#~ "RootDN is the manager of your ldap server."
+#~ msgstr ""
+#~ "LDAP RootDSE\n"
+#~ "\n"
+#~ "例如：\n"
+#~ "obelx.nux.com\n"
+#~ "\n"
+#~ "在 LDAP 配置中应该是:\n"
+#~ "\n"
+#~ "dc=obelx,dc=nux,dc=com\n"
+#~ "\n"
+#~ "RootDN 是您的 LDAP 服务器的管理器。"
+
+#~ msgid "RootDSE"
+#~ msgstr "RootDSE"
+
+#~ msgid "RootDN"
+#~ msgstr "RootDN"
+
+#~ msgid "Default OU"
+#~ msgstr "默认 OU"
+
+#~ msgid "Ok Now add entry in LDAP"
+#~ msgstr "好的，现在在 LDAP 中添加入口"
+
+#~ msgid "Home directory:"
+#~ msgstr "用户目录:"
+
+#~ msgid "Container:"
+#~ msgstr "容器:"
+
+#~ msgid "shadowMax:"
+#~ msgstr "shadowMax:"
+
+#~ msgid "shadowMin:"
+#~ msgstr "shadowMin:"
+
+#~ msgid "shadowWarning:"
+#~ msgstr "shadowWarning:"
+
+#~ msgid "shadowInactive:"
+#~ msgstr "shadowInactive:"
+
+#~ msgid "shadowExpire:"
+#~ msgstr "shadowExpire:"
+
+#~ msgid "objectClass:"
+#~ msgstr "objectClass:"
+
+#~ msgid "Ok Now building your LDAP configuration"
+#~ msgstr "好的，现在正在创建您的 LDAP 配置"
+
+#~ msgid "Error in Home directory"
+#~ msgstr "Home 目录中有错"
+
+#~ msgid "Error, pass could not be empty"
+#~ msgstr "错误，pass 不能为空"
+
+#~ msgid "Error in Login shell"
+#~ msgstr "Login shell 中有错"
+
+#~ msgid "Please choose a correct one"
+#~ msgstr "请选择正确的项"
+
+#~ msgid "Please Should be a number"
+#~ msgstr "应该是一个数字"