Mandrake -> Mandrakelinux

1 files changed, 255 insertions, 322 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 17a39c26..fe8e0fd9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-08 17:57+0200\n"
-"PO-Revision-Date: 2004-03-28 01:30+0800\n"
+"POT-Creation-Date: 2004-08-15 05:53+0800\n"
+"PO-Revision-Date: 2004-08-15 06:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,7 @@ msgstr "配置向导"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:206
+#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
@@ -32,9 +32,9 @@ msgstr "警告。"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
-#: ../samba_wizard/Samba.pm:165 ../samba_wizard/Samba.pm:170
-#: ../samba_wizard/Samba.pm:212 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
+#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "出错。"
@@ -43,12 +43,12 @@ msgstr "出错。"
 #: ../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:207 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:213 ../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: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:238 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "恭喜"
 
@@ -125,9 +125,11 @@ msgstr "您在使用 dhcp，服务器可能无法按照您的配置工作。"
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../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
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:91
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:127 ../ldap_wizard/Ldap.pm:142
+#: ../ldap_wizard/Ldap.pm:146 ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
 #: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
@@ -170,14 +172,15 @@ msgstr "客户机 IP:"
 msgid "The wizard successfully added the client."
 msgstr "向导成功地添加了客户。"
 
-#: ../common/Wizcommon.pm:87
+#: ../common/Wizcommon.pm:86
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
+"命令仍在运行。您是否想要杀死它然后退出向导?"
 
-#: ../common/Wizcommon.pm:105
+#: ../common/Wizcommon.pm:104
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
@@ -261,8 +264,8 @@ msgstr "为了配置 DHCP 服务，向导收集了下列需要的参数:"
 #: ../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:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:221
-#: ../samba_wizard/Samba.pm:222 ../samba_wizard/Samba.pm:223
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
+#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "已禁用"
@@ -271,8 +274,8 @@ msgstr "已禁用"
 #: ../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:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:221
-#: ../samba_wizard/Samba.pm:222 ../samba_wizard/Samba.pm:223
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
+#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "已启用"
@@ -289,13 +292,13 @@ msgstr "向导成功地配置了 DHCP 服务。"
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
 #: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "失败"
 
 #: ../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
+#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "重新调用配置向导，然后试着更新一些参数。"
 
@@ -306,11 +309,11 @@ msgstr "您需要重新调整您的主机名。"
 #: ../dns_wizard/Bind.pm:77
 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 "
-"it."
+"domainname, not equal to localdomain or none. Hostname mut be a FQDN: Fully "
+"Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
-"localdomain 或不设置。请使用 DrakConnect 进行调整。"
+"localdomain 或不设置。主机名必须是 FQDN：全称域名。请使用 DrakConnect 进行调整。"
 
 #: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:707
 msgid "Master DNS server"
@@ -561,7 +564,7 @@ msgstr "邮件服务器"
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:510
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
 msgid "Samba server"
 msgstr "Samba 服务器"
 
@@ -582,17 +585,17 @@ msgid "NIS server autofs map"
 msgstr "NIS 服务器 Autofs 映射"
 
 #: ../drakwizard.pl:52
-msgid "Mandrake Install server"
+msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux 安装服务器"
 
-#: ../drakwizard.pl:53 ../pxe_wizard/Pxe.pm:624
-msgid "PXE server"
-msgstr "PXE 服务器"
-
-#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:154
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:154
 msgid "Kolab server"
 msgstr "Kolab 服务器"
 
+#: ../drakwizard.pl:54
+msgid "ldap server"
+msgstr "ldap 服务器"
+
 #: ../drakwizard.pl:68
 msgid "Drakwizard wizard selection"
 msgstr "选择 Drakwizard 向导"
@@ -766,14 +769,14 @@ msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "请重新调用配置向导，然后试着更新一些参数。"
 
 #: ../installsrv_wizard/Installsrv.pm:53
-msgid "Configure a Mandrake install server (via NFS and http)"
-msgstr "配置 Mandrake 安装服务器(通过 NFS 和 HTTP)"
+msgid "Configure a Mandrakelinux install server (via NFS and http)"
+msgstr "配置 Mandrakelinux 安装服务器(通过 NFS 和 HTTP)"
 
 #: ../installsrv_wizard/Installsrv.pm:53
 msgid ""
-"Easily configure a Mandrake server installation directory, with NFS and HTTP "
-"access."
-msgstr "轻松配置 Mandrake 服务器安装目录，使用 NFS 和 HTTP 方式。"
+"Easily configure a Mandrakelinux server installation directory, with NFS and "
+"HTTP access."
+msgstr "轻松配置 Mandrakelinux 服务器安装目录，使用 NFS 和 HTTP 方式。"
 
 #: ../installsrv_wizard/Installsrv.pm:58
 msgid "Destination directory: copy file in which directory?"
@@ -785,9 +788,9 @@ msgstr "安装服务器配置"
 
 #: ../installsrv_wizard/Installsrv.pm:58
 msgid ""
-"Path to data: specify your source directory, should be base of an Mandrake "
-"installation."
-msgstr "数据的路径：指定您的源目录，它应该是 Mandrake 安装的基础。"
+"Path to data: specify your source directory, should be base of an "
+"Mandrakelinux installation."
+msgstr "数据的路径：指定您的源目录，它应该是 Mandrakelinux 安装的基础。"
 
 #: ../installsrv_wizard/Installsrv.pm:73
 msgid "The destination directory could not be '/var/install/'"
@@ -799,9 +802,9 @@ msgstr "例如，使用：/var/install/mdk-release"
 
 #: ../installsrv_wizard/Installsrv.pm:77
 msgid ""
-"Error, the source path must be a directory with full Mandrake installation "
-"directory."
-msgstr "错误，源目录必须是一个拥有完整的 Mandrake 安装文件的目录。"
+"Error, the source path must be a directory with full Mandrakelinux "
+"installation directory."
+msgstr "错误，源目录必须是一个拥有完整的 Mandrakelinux 安装文件的目录。"
 
 #: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory already in use, please choose another one."
@@ -820,18 +823,17 @@ msgid "Enable HTTP install server:"
 msgstr "启用 HTTP 安装服务器:"
 
 #: ../installsrv_wizard/Installsrv.pm:100
-#, fuzzy
 msgid "Configuring your system, please wait..."
-msgstr "正在将您的系统配置为 NIS 客户..."
+msgstr "正在配置您的系统，请稍候..."
 
 #: ../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 "
-"install Mandrake through a network."
+"Congratulations, Mandrakelinux 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 install Mandrakelinux through a network."
 msgstr ""
-"恭喜，Mandrake 安装服务器已经就绪。您现在可以配置支持 PXE 的 DHCP 服务器和 "
-"PXE 服务器了。这样，通过网络安装 Mandrake 将非常简单。"
+"恭喜，Mandrakelinux 安装服务器已经就绪。您现在可以配置支持 PXE 的 DHCP 服务器和 "
+"PXE 服务器了。这样，通过网络安装 Mandrakelinux 将非常简单。"
 
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
@@ -877,7 +879,7 @@ msgstr "输入 Kolab 服务器管理员账户的密码。"
 msgid "Password mismatch, or null password, please correct."
 msgstr "密码不相配，或者密码为空，请纠正。"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/ldap.pm:135
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:137
 msgid "Password:"
 msgstr "密码:"
 
@@ -917,159 +919,198 @@ msgstr "正在您的系统中安装 Kolab 服务器..."
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 Kolab 服务器..."
 
-#: ../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:26
+msgid "Configuration OpenLDAP Server "
+msgstr "配置 OpenLDAP 服务器"
 
-#: ../ldap_wizard/ldap.pm:88
-#, fuzzy
-msgid "Add - Add user in LDAP server"
-msgstr "添加 - 添加 LDAP 服务器的入口"
+#: ../ldap_wizard/Ldap.pm:78
+msgid "Configure OpenLDAP server"
+msgstr "配置 OpenLDAP 服务器"
 
-#: ../ldap_wizard/ldap.pm:93
-msgid "LDAP configuration wizard"
-msgstr "LDAP 配置向导"
+#: ../ldap_wizard/Ldap.pm:79
+msgid "Add user in OpenLDAP server"
+msgstr "在 OpenLDAP 服务器中添加用户"
 
-#: ../ldap_wizard/ldap.pm:93
-#, fuzzy
-msgid "Setup a LDAP server."
-msgstr "设置 PXE 服务器。"
+#: ../ldap_wizard/Ldap.pm:84
+msgid "OpenLDAP configuration wizard"
+msgstr "OpenLDAP 配置向导"
 
-#: ../ldap_wizard/ldap.pm:105
-msgid "Your choice:"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:84
+msgid "Setup a OpenLDAP server."
+msgstr "设置 OpenLDAP 服务器。"
 
-#: ../ldap_wizard/ldap.pm:109
-#, fuzzy
-msgid "Config Server "
-msgstr "Postfix 服务器"
+#: ../ldap_wizard/Ldap.pm:91
+msgid "You must setup a OpenLDAP server first."
+msgstr "您必须先设置 OpenLDAP 服务器。"
 
-#: ../ldap_wizard/ldap.pm:111
-#, fuzzy
-msgid "Server Name: "
-msgstr "服务器主机名:"
+#: ../ldap_wizard/Ldap.pm:96
+msgid "Information "
+msgstr "信息"
 
-#: ../ldap_wizard/ldap.pm:112
-#, fuzzy
-msgid "Server RootDN: "
-msgstr "服务器主机名:"
+#: ../ldap_wizard/Ldap.pm:96
+msgid "would you like save an existing OpenLDAP configuration ?"
+msgstr "您想要保存现有的 OpenLDAP 配置吗?"
 
-#: ../ldap_wizard/ldap.pm:113
-#, fuzzy
-msgid "RootDN Password: "
-msgstr "密码:"
+#: ../ldap_wizard/Ldap.pm:101
+msgid "Your choice:"
+msgstr "您的选择："
 
-#: ../ldap_wizard/ldap.pm:114
-#, fuzzy
-msgid "Server Suffix: "
-msgstr "服务器 IP:"
+#: ../ldap_wizard/Ldap.pm:107
+msgid "Save an existing configuration"
+msgstr "保存现有的配置"
 
-#: ../ldap_wizard/ldap.pm:115
-msgid "Server Default Users OU: "
-msgstr ""
-
-#: ../ldap_wizard/ldap.pm:120
+#: ../ldap_wizard/Ldap.pm:112
 msgid "LDAP User Add"
-msgstr ""
+msgstr "LDAP 添加用户"
 
-#: ../ldap_wizard/ldap.pm:120
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:112
 msgid "User Create in: "
-msgstr "用户名:"
+msgstr "用户创建于:"
 
-#: ../ldap_wizard/ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:114
 msgid "First Name:"
 msgstr "名:"
 
-#: ../ldap_wizard/ldap.pm:125 ../ldap_wizard/ldap.pm:186
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:114 ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:116 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:156 ../ldap_wizard/Ldap.pm:157
+#: ../ldap_wizard/Ldap.pm:158
+msgid "aide p"
+msgstr "aide p"
+
+#: ../ldap_wizard/Ldap.pm:115 ../ldap_wizard/Ldap.pm:180
 msgid "Name:"
-msgstr "用户名:"
+msgstr "名称:"
 
-#: ../ldap_wizard/ldap.pm:127 ../ldap_wizard/ldap.pm:190
+#: ../ldap_wizard/Ldap.pm:116 ../ldap_wizard/Ldap.pm:182
 msgid "User Name:"
 msgstr "用户名:"
 
-#: ../ldap_wizard/ldap.pm:132
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:120
+msgid "You must enter a valid First Name."
+msgstr "您必须输入有效的名。"
+
+#: ../ldap_wizard/Ldap.pm:123
+msgid "You must enter a valid Name."
+msgstr "您必须输入有效的名称。"
+
+#: ../ldap_wizard/Ldap.pm:127
+msgid "You must enter a valid User Name."
+msgstr "您必须输入有效的用户名。"
+
+#: ../ldap_wizard/Ldap.pm:135
 msgid "LDAP User Password"
-msgstr "密码"
+msgstr "LDAP 用户密码"
 
-#: ../ldap_wizard/ldap.pm:132
-#, fuzzy
-msgid "Password for Users: "
-msgstr "密码:"
+#: ../ldap_wizard/Ldap.pm:137 ../ldap_wizard/Ldap.pm:138
+msgid "passwords must match"
+msgstr "密码不匹配"
 
-#: ../ldap_wizard/ldap.pm:137
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:138
 msgid "Password (again):"
 msgstr "重输密码:"
 
-#: ../ldap_wizard/ldap.pm:141 ../ldap_wizard/ldap.pm:171
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:166
 msgid "You must enter a password for LDAP."
-msgstr ""
+msgstr "您必须为 LDAP 输入密码。"
 
-#: ../ldap_wizard/ldap.pm:145 ../ldap_wizard/ldap.pm:175
+#: ../ldap_wizard/Ldap.pm:146 ../ldap_wizard/Ldap.pm:170
 msgid "The passwords do not match"
-msgstr ""
+msgstr "密码不匹配"
 
-#: ../ldap_wizard/ldap.pm:154
-#, fuzzy
-msgid "Configuring LDAP"
-msgstr "配置 Samba"
+#: ../ldap_wizard/Ldap.pm:153
+msgid "Configuring LDAP Server"
+msgstr "配置 LDAP 服务器"
 
-#: ../ldap_wizard/ldap.pm:157 ../ldap_wizard/ldap.pm:201
-msgid "LDAP Suffix:"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:155
+msgid ""
+"LDAP Suffix:\n"
+" ex: dc=example,dc=com\n"
+msgstr "LDAP 后缀:\n 如: dc=example,dc=com\n"
 
-#: ../ldap_wizard/ldap.pm:159
-msgid "LDAP Administrator:"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:156
+msgid ""
+"LDAP Administrator:\n"
+" "
+msgstr "LDAP 管理员:\n "
 
-#: ../ldap_wizard/ldap.pm:161
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:157
 msgid "LDAP Password:"
-msgstr "密码:"
+msgstr "LDAP 密码:"
 
-#: ../ldap_wizard/ldap.pm:163
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:158
 msgid "LDAP Password (again):"
-msgstr "重输密码:"
+msgstr "LDAP 重输密码:"
 
-#: ../ldap_wizard/ldap.pm:167
+#: ../ldap_wizard/Ldap.pm:162
 msgid "You must enter a suffix for LDAP."
-msgstr ""
+msgstr "您必须输入 LDAP 的后缀。"
 
-#: ../ldap_wizard/ldap.pm:183 ../ldap_wizard/ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:178
 msgid "Confirmation of the user to create"
-msgstr ""
+msgstr "确认创建用户"
 
-#: ../ldap_wizard/ldap.pm:188
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:181
 msgid "First name:"
 msgstr "名:"
 
-#: ../ldap_wizard/ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Create in:"
-msgstr ""
+msgstr "创建于:"
+
+#: ../ldap_wizard/Ldap.pm:190
+msgid "test"
+msgstr "测试"
+
+#: ../ldap_wizard/Ldap.pm:192
+msgid "OP:"
+msgstr "OP:"
 
-#: ../ldap_wizard/ldap.pm:208
+#: ../ldap_wizard/Ldap.pm:193
+msgid "AP:"
+msgstr "AP:"
+
+#: ../ldap_wizard/Ldap.pm:194
+msgid "Add Kerberos"
+msgstr "添加 Kerberos"
+
+#: ../ldap_wizard/Ldap.pm:202
+msgid "Confirmation Information for create LDAP server"
+msgstr "确认创建 LDAP 服务器的信息"
+
+#: ../ldap_wizard/Ldap.pm:204
+msgid "Organisation LDAP:"
+msgstr "组织 LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:205
+msgid "Administrator LDAP:"
+msgstr "管理员 LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:214
 msgid "The wizard successfully configured the LDAP."
 msgstr "向导成功地配置了 LDAP。"
 
-#: ../ldap_wizard/ldap.pm:214
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:220
 msgid "Successfully added User"
-msgstr "成功地添加了数据"
+msgstr "成功地添加了用户"
 
-#: ../ldap_wizard/ldap.pm:215
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:221
 msgid "The wizard successfully added an user in LDAP"
-msgstr "向导成功地在 LDAP 中添加了项"
+msgstr "向导成功地在 LDAP 中添加了用户"
+
+#: ../ldap_wizard/Ldap.pm:344
+#, perl-format
+msgid "%s Failed"
+msgstr "%s 失败"
+
+#: ../ldap_wizard/Ldap.pm:344 ../ldap_wizard/ldapdef.pm:50
+msgid "Error!"
+msgstr "出错!"
+
+#: ../ldap_wizard/ldapdef.pm:50
+#, perl-format
+msgid "Unable to connect to %s"
+msgstr "无法连接到 %s"
 
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
@@ -1201,13 +1242,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "目录:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:170
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
 #: ../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
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
+#: ../samba_wizard/Samba.pm:120
 msgid "Access control"
 msgstr "访问控制"
 
@@ -1727,7 +1768,7 @@ msgid ""
 msgstr "为了配置您的代理服务器，向导收集了下列需要的参数:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:218 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:219 ../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."
@@ -1764,7 +1805,7 @@ msgid "Set PXE server"
 msgstr "设置 PXE 服务器"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot image (Mandrake release < 9.2)"
+msgid "Add boot image (Mandrakelinux release < 9.2)"
 msgstr "添加启动映像(Mandrakelinux 版本<9.2)"
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1776,7 +1817,7 @@ msgid "Modify boot image in PXE"
 msgstr "修改 PXE 中的启动映像"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz image (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrakelinux release > 10.0)"
 msgstr "添加 all.rdz 映像(Mandrakelinux 版本 >=10.0)"
 
 #: ../pxe_wizard/Pxe.pm:111
@@ -1807,10 +1848,10 @@ msgstr "添加启动映像"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the rule of the boot image, ie: Mandrake "
-"10 image, Mandrake cooker image.."
+"PXE description is used to explain the rule of the boot image, ie: "
+"Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
-"PXE 描述用于解释引导映像的规则，即: Mandrake 10 映像，Mandrake cooker 映像。"
+"PXE 描述用于解释引导映像的规则，即: Mandrakelinux 10 映像，Mandrakelinux cooker 映像。"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid ""
@@ -2091,78 +2132,82 @@ msgstr "向导成功地配置了您的 PXE 服务器。"
 msgid "Configuring PXE server on your system..."
 msgstr "正在您的系统中配置 PXE 服务器..."
 
-#: ../samba_wizard/Samba.pm:34
+#: ../pxe_wizard/Pxe.pm:624
+msgid "PXE server"
+msgstr "PXE 服务器"
+
+#: ../samba_wizard/Samba.pm:35
 msgid "Samba wizard"
 msgstr "Samba 向导"
 
-#: ../samba_wizard/Samba.pm:59 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#: ../samba_wizard/Samba.pm:65
+#: ../samba_wizard/Samba.pm:66
 msgid "All - no access restriction"
 msgstr "全部 - 没有访问限制"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:67
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "我的规则 - 询问我允许和禁用主机"
 
-#: ../samba_wizard/Samba.pm:71
+#: ../samba_wizard/Samba.pm:72
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 "Samba 让您的服务器为运行 Linux 以外操作系统的工作站提供文件和打印服务。"
 
-#: ../samba_wizard/Samba.pm:71
+#: ../samba_wizard/Samba.pm:72
 msgid "Samba configuration wizard"
 msgstr "Samba 配置向导"
 
-#: ../samba_wizard/Samba.pm:71
+#: ../samba_wizard/Samba.pm:72
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "此向导将帮助您在您的服务器上配置 Samba 服务。"
 
-#: ../samba_wizard/Samba.pm:76
+#: ../samba_wizard/Samba.pm:77
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba 要服务的 Windows 工作组。"
 
-#: ../samba_wizard/Samba.pm:76
+#: ../samba_wizard/Samba.pm:77
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../samba_wizard/Samba.pm:81 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
 msgid "Workgroup:"
 msgstr "工作组:"
 
-#: ../samba_wizard/Samba.pm:87
+#: ../samba_wizard/Samba.pm:88
 msgid "The Workgroup is wrong"
 msgstr "工作组不对"
 
-#: ../samba_wizard/Samba.pm:92
+#: ../samba_wizard/Samba.pm:93
 msgid "Server banner."
 msgstr "服务器标志。"
 
-#: ../samba_wizard/Samba.pm:92
+#: ../samba_wizard/Samba.pm:93
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "这个标志会显示在 Windows 网络邻居中这个服务器名字旁边作为描述。"
 
-#: ../samba_wizard/Samba.pm:98
+#: ../samba_wizard/Samba.pm:99
 msgid "Banner:"
 msgstr "标志:"
 
-#: ../samba_wizard/Samba.pm:103
+#: ../samba_wizard/Samba.pm:104
 msgid "The server banner is incorrect"
 msgstr "服务器标志不对"
 
-#: ../samba_wizard/Samba.pm:114
+#: ../samba_wizard/Samba.pm:115
 msgid "Access level:"
 msgstr "访问级别:"
 
-#: ../samba_wizard/Samba.pm:119
+#: ../samba_wizard/Samba.pm:120
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2170,7 +2215,7 @@ msgstr ""
 "* 示例 1: 允许 150.203.*.* 中的所有 IP，除了其中一个\n"
 "允许的主机 = 150.203. 除了 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:119
+#: ../samba_wizard/Samba.pm:120
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2178,7 +2223,7 @@ msgstr ""
 "* 示例 2: 所有的主机都必须与给定的网络/网络掩码匹配\n"
 "主机允许 = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:119
+#: ../samba_wizard/Samba.pm:120
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2186,7 +2231,7 @@ msgstr ""
 "* 示例 3: 允许一组主机\n"
 "主机允许 = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:119
+#: ../samba_wizard/Samba.pm:120
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2197,23 +2242,23 @@ msgstr ""
 "主机允许 = @foonet\n"
 "主机禁止 = pirate"
 
-#: ../samba_wizard/Samba.pm:119
+#: ../samba_wizard/Samba.pm:120
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "请注意，访问仍然需要适当的用户级别密码。"
 
-#: ../samba_wizard/Samba.pm:126
+#: ../samba_wizard/Samba.pm:127
 msgid "Allow hosts:"
 msgstr "允许的主机:"
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:128
 msgid "Deny hosts:"
 msgstr "禁止的主机:"
 
-#: ../samba_wizard/Samba.pm:132
+#: ../samba_wizard/Samba.pm:133
 msgid "Enabled Samba services"
 msgstr "已启用 Samba 服务"
 
-#: ../samba_wizard/Samba.pm:132
+#: ../samba_wizard/Samba.pm:133
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2222,19 +2267,19 @@ msgstr ""
 "Samba 可以为您的 Windows 工作站提供一个文件共享区域，还可以让其他网络客户共享"
 "您的服务器连接的打印机。"
 
-#: ../samba_wizard/Samba.pm:140
+#: ../samba_wizard/Samba.pm:141
 msgid "Enable file sharing area"
 msgstr "启用文件共享区域"
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:142
 msgid "Enable server Printer Sharing"
 msgstr "启用服务器打印机共享"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:143
 msgid "Make home directories available for their owners"
 msgstr "让用户可以访问自己的主目录"
 
-#: ../samba_wizard/Samba.pm:147
+#: ../samba_wizard/Samba.pm:148
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2242,28 +2287,28 @@ msgstr ""
 "您选择了允许用户通过 Samba 访问他们的 home 目录，但是用户必须使用 smbpasswd "
 "设置一个密码。"
 
-#: ../samba_wizard/Samba.pm:153 ../samba_wizard/Samba.pm:159
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
+#: ../samba_wizard/Samba.pm:230
 msgid "Shared directory:"
 msgstr "共享目录:"
 
-#: ../samba_wizard/Samba.pm:153
+#: ../samba_wizard/Samba.pm:154
 msgid "Type the path of the directory you want being shared."
 msgstr "请输入您想要共享的目录路径。"
 
-#: ../samba_wizard/Samba.pm:160
+#: ../samba_wizard/Samba.pm:161
 msgid "Create shared directory if it doesn't exists"
-msgstr ""
+msgstr "如果目录不存在则创建"
 
-#: ../samba_wizard/Samba.pm:165
+#: ../samba_wizard/Samba.pm:166
 msgid "Failed to create directory."
-msgstr ""
+msgstr "创建目录失败。"
 
-#: ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:176
 msgid "File permissions"
 msgstr "文件许可"
 
-#: ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:176
 msgid ""
 "Type users or group separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2272,59 +2317,59 @@ msgstr ""
 "请为每种许可输入以逗号分隔的用户或组(组必须以“@”开头)，如: \n"
 "root, fred, @users, @wheel。"
 
-#: ../samba_wizard/Samba.pm:182
+#: ../samba_wizard/Samba.pm:183
 msgid "Read list:"
 msgstr "读取列表:"
 
-#: ../samba_wizard/Samba.pm:182 ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:184
 msgid "Write list:"
 msgstr "写入列表:"
 
-#: ../samba_wizard/Samba.pm:193
+#: ../samba_wizard/Samba.pm:194
 msgid "Select which printers you want to be accessible from known users"
 msgstr "选择您想要让已知用户访问的打印机"
 
-#: ../samba_wizard/Samba.pm:200
+#: ../samba_wizard/Samba.pm:201
 msgid "Enable all printers"
 msgstr "启用全部打印机"
 
-#: ../samba_wizard/Samba.pm:218
+#: ../samba_wizard/Samba.pm:219
 msgid "Configuring Samba"
 msgstr "配置 Samba"
 
-#: ../samba_wizard/Samba.pm:218
+#: ../samba_wizard/Samba.pm:219
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "为了配置 Samba，向导收集了下列需要的参数。"
 
-#: ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:228
 msgid "Server banner:"
 msgstr "服务器标语:"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:229
 msgid "File sharing:"
 msgstr "文件共享:"
 
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:231
 msgid "Print server:"
 msgstr "打印服务器:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:232
 msgid "Home:"
 msgstr "主目录:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:233
 msgid "Printers:"
 msgstr "打印机:"
 
-#: ../samba_wizard/Samba.pm:238
+#: ../samba_wizard/Samba.pm:239
 msgid "The wizard successfully configured your Samba server."
 msgstr "向导成功地配置了您的 Samba 服务器。"
 
-#: ../samba_wizard/Samba.pm:510
+#: ../samba_wizard/Samba.pm:521
 msgid "Configuring your Samba server..."
 msgstr "正在配置您的 Postfix 服务器..."
 
@@ -2554,115 +2599,3 @@ msgstr "Apache 服务器"
 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 "应该是一个数字"