updated pot file; English typo fixes; removed string not be translated

1 files changed, 98 insertions, 86 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fe8e0fd9..0c30be17 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-08-15 05:53+0800\n"
+"POT-Creation-Date: 2004-08-20 19:59+0200\n"
 "PO-Revision-Date: 2004-08-15 06:02+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:213 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:202 ../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,11 +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: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
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:92
+#: ../ldap_wizard/Ldap.pm:122 ../ldap_wizard/Ldap.pm:125
+#: ../ldap_wizard/Ldap.pm:129 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:164
+#: ../ldap_wizard/Ldap.pm:168 ../ldap_wizard/Ldap.pm:172
 #: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
@@ -175,8 +175,7 @@ msgstr "向导成功地添加了客户。"
 #: ../common/Wizcommon.pm:86
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"命令仍在运行。您是否想要杀死它然后退出向导?"
+msgstr "命令仍在运行。您是否想要杀死它然后退出向导?"
 
 #: ../common/Wizcommon.pm:104
 msgid "Close"
@@ -309,11 +308,12 @@ 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. Hostname mut be a FQDN: Fully "
+"domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully "
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
-"localdomain 或不设置。主机名必须是 FQDN：全称域名。请使用 DrakConnect 进行调整。"
+"localdomain 或不设置。主机名必须是 FQDN：全称域名。请使用 DrakConnect 进行调"
+"整。"
 
 #: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:707
 msgid "Master DNS server"
@@ -832,8 +832,8 @@ msgid ""
 "configure a DHCP server with PXE support, and a PXE server. So it will be "
 "very easy to install Mandrakelinux through a network."
 msgstr ""
-"恭喜，Mandrakelinux 安装服务器已经就绪。您现在可以配置支持 PXE 的 DHCP 服务器和 "
-"PXE 服务器了。这样，通过网络安装 Mandrakelinux 将非常简单。"
+"恭喜，Mandrakelinux 安装服务器已经就绪。您现在可以配置支持 PXE 的 DHCP 服务器"
+"和 PXE 服务器了。这样，通过网络安装 Mandrakelinux 将非常简单。"
 
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
@@ -879,7 +879,7 @@ msgstr "输入 Kolab 服务器管理员账户的密码。"
 msgid "Password mismatch, or null password, please correct."
 msgstr "密码不相配，或者密码为空，请纠正。"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:137
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:139
 msgid "Password:"
 msgstr "密码:"
 
@@ -923,187 +923,174 @@ msgstr "正在您的系统中配置 Kolab 服务器..."
 msgid "Configuration OpenLDAP Server "
 msgstr "配置 OpenLDAP 服务器"
 
-#: ../ldap_wizard/Ldap.pm:78
+#: ../ldap_wizard/Ldap.pm:79
 msgid "Configure OpenLDAP server"
 msgstr "配置 OpenLDAP 服务器"
 
-#: ../ldap_wizard/Ldap.pm:79
+#: ../ldap_wizard/Ldap.pm:80
 msgid "Add user in OpenLDAP server"
 msgstr "在 OpenLDAP 服务器中添加用户"
 
-#: ../ldap_wizard/Ldap.pm:84
+#: ../ldap_wizard/Ldap.pm:85
 msgid "OpenLDAP configuration wizard"
 msgstr "OpenLDAP 配置向导"
 
-#: ../ldap_wizard/Ldap.pm:84
+#: ../ldap_wizard/Ldap.pm:85
 msgid "Setup a OpenLDAP server."
 msgstr "设置 OpenLDAP 服务器。"
 
-#: ../ldap_wizard/Ldap.pm:91
+#: ../ldap_wizard/Ldap.pm:92
 msgid "You must setup a OpenLDAP server first."
 msgstr "您必须先设置 OpenLDAP 服务器。"
 
-#: ../ldap_wizard/Ldap.pm:96
-msgid "Information "
-msgstr "信息"
-
-#: ../ldap_wizard/Ldap.pm:96
-msgid "would you like save an existing OpenLDAP configuration ?"
-msgstr "您想要保存现有的 OpenLDAP 配置吗?"
-
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:103
 msgid "Your choice:"
 msgstr "您的选择："
 
-#: ../ldap_wizard/Ldap.pm:107
+#: ../ldap_wizard/Ldap.pm:109
 msgid "Save an existing configuration"
 msgstr "保存现有的配置"
 
-#: ../ldap_wizard/Ldap.pm:112
+#: ../ldap_wizard/Ldap.pm:114
 msgid "LDAP User Add"
 msgstr "LDAP 添加用户"
 
-#: ../ldap_wizard/Ldap.pm:112
+#: ../ldap_wizard/Ldap.pm:114
 msgid "User Create in: "
 msgstr "用户创建于:"
 
-#: ../ldap_wizard/Ldap.pm:114
+#: ../ldap_wizard/Ldap.pm:116
 msgid "First Name:"
 msgstr "名:"
 
-#: ../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
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:182
 msgid "Name:"
 msgstr "名称:"
 
-#: ../ldap_wizard/Ldap.pm:116 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:184
 msgid "User Name:"
 msgstr "用户名:"
 
-#: ../ldap_wizard/Ldap.pm:120
+#: ../ldap_wizard/Ldap.pm:122
 msgid "You must enter a valid First Name."
 msgstr "您必须输入有效的名。"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:125
 msgid "You must enter a valid Name."
 msgstr "您必须输入有效的名称。"
 
-#: ../ldap_wizard/Ldap.pm:127
+#: ../ldap_wizard/Ldap.pm:129
 msgid "You must enter a valid User Name."
 msgstr "您必须输入有效的用户名。"
 
-#: ../ldap_wizard/Ldap.pm:135
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP User Password"
 msgstr "LDAP 用户密码"
 
-#: ../ldap_wizard/Ldap.pm:137 ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:139 ../ldap_wizard/Ldap.pm:140
 msgid "passwords must match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:140
 msgid "Password (again):"
 msgstr "重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:168
 msgid "You must enter a password for LDAP."
 msgstr "您必须为 LDAP 输入密码。"
 
-#: ../ldap_wizard/Ldap.pm:146 ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:172
 msgid "The passwords do not match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:153
+#: ../ldap_wizard/Ldap.pm:155
 msgid "Configuring LDAP Server"
 msgstr "配置 LDAP 服务器"
 
-#: ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:157
 msgid ""
 "LDAP Suffix:\n"
 " ex: dc=example,dc=com\n"
-msgstr "LDAP 后缀:\n 如: dc=example,dc=com\n"
+msgstr ""
+"LDAP 后缀:\n"
+" 如: dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:158
+#, fuzzy
 msgid ""
 "LDAP Administrator:\n"
-" "
-msgstr "LDAP 管理员:\n "
+" ex: cn=admin,dc=example,dc=com\n"
+msgstr ""
+"LDAP 后缀:\n"
+" 如: dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:157
+#: ../ldap_wizard/Ldap.pm:159
 msgid "LDAP Password:"
 msgstr "LDAP 密码:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:160
 msgid "LDAP Password (again):"
 msgstr "LDAP 重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:164
 msgid "You must enter a suffix for LDAP."
 msgstr "您必须输入 LDAP 的后缀。"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:180
 msgid "Confirmation of the user to create"
 msgstr "确认创建用户"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:183
 msgid "First name:"
 msgstr "名:"
 
-#: ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:185
 msgid "Create in:"
 msgstr "创建于:"
 
-#: ../ldap_wizard/Ldap.pm:190
-msgid "test"
-msgstr "测试"
-
-#: ../ldap_wizard/Ldap.pm:192
-msgid "OP:"
-msgstr "OP:"
-
-#: ../ldap_wizard/Ldap.pm:193
-msgid "AP:"
-msgstr "AP:"
-
-#: ../ldap_wizard/Ldap.pm:194
-msgid "Add Kerberos"
-msgstr "添加 Kerberos"
-
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:191
 msgid "Confirmation Information for create LDAP server"
 msgstr "确认创建 LDAP 服务器的信息"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:193 ../ldap_wizard/Ldap.pm:221
 msgid "Organisation LDAP:"
 msgstr "组织 LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:205
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
 msgid "Administrator LDAP:"
 msgstr "管理员 LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:214
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:223
+#, fuzzy
+msgid "Users Container:"
+msgstr "用户创建于:"
+
+#: ../ldap_wizard/Ldap.pm:203
 msgid "The wizard successfully configured the LDAP."
 msgstr "向导成功地配置了 LDAP。"
 
-#: ../ldap_wizard/Ldap.pm:220
+#: ../ldap_wizard/Ldap.pm:209
 msgid "Successfully added User"
 msgstr "成功地添加了用户"
 
-#: ../ldap_wizard/Ldap.pm:221
+#: ../ldap_wizard/Ldap.pm:210
 msgid "The wizard successfully added an user in LDAP"
 msgstr "向导成功地在 LDAP 中添加了用户"
 
-#: ../ldap_wizard/Ldap.pm:344
+#: ../ldap_wizard/Ldap.pm:216
+msgid "Server already configured"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:220
+msgid "You have already configure your OpenLDAP Server with drakwizard\n"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:350
 #, perl-format
 msgid "%s Failed"
 msgstr "%s 失败"
 
-#: ../ldap_wizard/Ldap.pm:344 ../ldap_wizard/ldapdef.pm:50
+#: ../ldap_wizard/Ldap.pm:350 ../ldap_wizard/ldapdef.pm:50
 msgid "Error!"
 msgstr "出错!"
 
@@ -1851,7 +1838,8 @@ msgid ""
 "PXE description is used to explain the rule of the boot image, ie: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
-"PXE 描述用于解释引导映像的规则，即: Mandrakelinux 10 映像，Mandrakelinux cooker 映像。"
+"PXE 描述用于解释引导映像的规则，即: Mandrakelinux 10 映像，Mandrakelinux "
+"cooker 映像。"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid ""
@@ -2599,3 +2587,27 @@ msgstr "Apache 服务器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
 
+#~ msgid "Information "
+#~ msgstr "信息"
+
+#~ msgid "would you like save an existing OpenLDAP configuration ?"
+#~ msgstr "您想要保存现有的 OpenLDAP 配置吗?"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " "
+#~ msgstr ""
+#~ "LDAP 管理员:\n"
+#~ " "
+
+#~ msgid "test"
+#~ msgstr "测试"
+
+#~ msgid "OP:"
+#~ msgstr "OP:"
+
+#~ msgid "AP:"
+#~ msgstr "AP:"
+
+#~ msgid "Add Kerberos"
+#~ msgstr "添加 Kerberos"