1 files changed, 191 insertions, 93 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b3281af5..2d39e3b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-23 01:05+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -43,7 +43,7 @@ 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:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../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
@@ -125,12 +125,13 @@ 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:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
 
@@ -517,7 +518,7 @@ msgid "Domainname:"
 msgstr "域名:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "向导成功地在您的 DNS 中添加了主机。"
 
 #: ../dns_wizard/Bind.pm:256
@@ -879,7 +880,7 @@ msgstr "输入 Kolab 服务器管理员账户的密码。"
 msgid "Password mismatch, or null password, please correct."
 msgstr "密码不相配，或者密码为空，请纠正。"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "密码:"
 
@@ -919,180 +920,227 @@ msgstr "正在您的系统中安装 Kolab 服务器..."
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 Kolab 服务器..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "配置 OpenLDAP 服务器"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "配置 OpenLDAP 服务器"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap 向导"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "在 OpenLDAP 服务器中添加用户"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Ldap 配置向导"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "OpenLDAP 配置向导"
+msgid "Add user in Ldap server"
+msgstr "在 Ldap 服务器中添加用户"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "设置 OpenLDAP 服务器。"
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Ldap 配置向导"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "您必须先设置 OpenLDAP 服务器。"
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Ldap 配置向导"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "您必须先设置 Ldap 服务器。"
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "您的选择："
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "保存现有的配置"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "安装服务器配置"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "LDAP 添加用户"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "用户创建于:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "名:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "名称:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "用户名:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "用户容器:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "您必须输入有效的名。"
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "您必须输入有效的名称。"
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "您必须输入有效的用户名。"
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "LDAP 用户密码"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "您必须为 LDAP 输入密码。"
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "管理员 LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "配置 LDAP 服务器"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP 后缀:\n"
-" 如: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "域名:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "管理员 LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP 目录:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"LDAP 管理员:\n"
-" 如: dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP 目录:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "管理员 LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP 密码:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "LDAP 重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "您必须输入 LDAP 的后缀。"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "管理员 LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "您必须输入有效的名。"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "确认创建用户"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "名:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "用户名:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "创建于:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "确认创建 LDAP 服务器的信息"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "组织 LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "管理员 LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "用户容器:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "向导成功地配置了 LDAP。"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "成功地添加了用户"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "向导成功地在 LDAP 中添加了用户"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "在 Ldap 服务器中添加用户"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "服务器已经配置"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "您已经使用 Drakwizard 配置了您的 OpenLDAP 服务器\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "您已经使用 Drakwizard 配置了您的 Ldap 服务器\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s 失败"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "出错!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "无法连接到 %s"
@@ -1833,7 +1881,7 @@ msgstr "添加启动映像"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE 描述用于解释引导映像的规则，即: Mandrakelinux 10 映像，Mandrakelinux "
@@ -1968,7 +2016,7 @@ msgid ""
 msgstr "网卡：通过哪块网卡安装。"
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "内存大小：在启动盘上调整内存大小。"
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2581,6 +2629,56 @@ msgstr "Apache 服务器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "配置 Ldap 服务器"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "配置 OpenLDAP 服务器"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "配置 OpenLDAP 服务器"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "在 OpenLDAP 服务器中添加用户"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "OpenLDAP 配置向导"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "设置 OpenLDAP 服务器。"
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "您必须先设置 OpenLDAP 服务器。"
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "保存现有的配置"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP 后缀:\n"
+#~ " 如: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP 管理员:\n"
+#~ " 如: dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "您必须输入 LDAP 的后缀。"
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "组织 LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "向导成功地在 LDAP 中添加了用户"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "您已经使用 Drakwizard 配置了您的 OpenLDAP 服务器\n"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"