resync

1 files changed, 64 insertions, 75 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6e931f3e..7cbbf903 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-13 09:10+0100\n"
+"POT-Creation-Date: 2004-02-13 19:23+0100\n"
 "PO-Revision-Date: 2004-02-12 18:13+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -46,7 +46,7 @@ msgstr "出错。"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
-#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:163
+#: ../ftp_wizard/Proftpd.pm:149 ../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:147 ../proxy_wizard/Squid.pm:172
@@ -130,7 +130,7 @@ 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:71
 #: ../drakwizard.pl:90 ../drakwizard.pl:139 ../drakwizard.pl:143
-#: ../ldap_wizard/ldap.pm:159
+#: ../ldap_wizard/ldap.pm:168
 msgid "Error"
 msgstr "出错"
 
@@ -468,7 +468,7 @@ msgstr ""
 msgid "Ok Now building your DNS slave configuration"
 msgstr "好的，现在正在创建您的从 DNS 服务器配置"
 
-#: ../dns_wizard/Bind.pm:208 ../ldap_wizard/ldap.pm:136
+#: ../dns_wizard/Bind.pm:208 ../ldap_wizard/ldap.pm:145
 msgid "with this configuration:"
 msgstr "使用这个配置:"
 
@@ -838,19 +838,19 @@ msgstr "往 LDAP 中添加数据"
 msgid "uid, guid, home directory, "
 msgstr "UID，GUID，home 目录，"
 
-#: ../ldap_wizard/ldap.pm:86 ../ldap_wizard/ldap.pm:116
+#: ../ldap_wizard/ldap.pm:86 ../ldap_wizard/ldap.pm:125
 msgid "First Name:"
 msgstr "名:"
 
-#: ../ldap_wizard/ldap.pm:87 ../ldap_wizard/ldap.pm:117
+#: ../ldap_wizard/ldap.pm:87 ../ldap_wizard/ldap.pm:126
 msgid "Last Name:"
 msgstr "姓:"
 
-#: ../ldap_wizard/ldap.pm:88 ../ldap_wizard/ldap.pm:118
+#: ../ldap_wizard/ldap.pm:88 ../ldap_wizard/ldap.pm:127
 msgid "User Name:"
 msgstr "用户名:"
 
-#: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:119
+#: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "密码:"
 
@@ -859,129 +859,123 @@ msgstr "密码:"
 msgid "Home Directory:"
 msgstr "用户目录:"
 
-#: ../ldap_wizard/ldap.pm:91 ../ldap_wizard/ldap.pm:121
+#: ../ldap_wizard/ldap.pm:91 ../ldap_wizard/ldap.pm:130
 msgid "Login shell:"
 msgstr "登录 shell 环境:"
 
-#: ../ldap_wizard/ldap.pm:92 ../ldap_wizard/ldap.pm:122
+#: ../ldap_wizard/ldap.pm:92 ../ldap_wizard/ldap.pm:131
 msgid "uid number:"
 msgstr "UID 号:"
 
-#: ../ldap_wizard/ldap.pm:93 ../ldap_wizard/ldap.pm:123
+#: ../ldap_wizard/ldap.pm:93 ../ldap_wizard/ldap.pm:132
 msgid "Group ID:"
 msgstr "组 IP(GID):"
 
 #: ../ldap_wizard/ldap.pm:99
 #, fuzzy
-msgid "LDAP RootDSE"
-msgstr "RootDSE"
-
-#: ../ldap_wizard/ldap.pm:99
-msgid "RootDN is the manager of your ldap server."
-msgstr ""
-
-#: ../ldap_wizard/ldap.pm:99
-msgid "dc=obelx,dc=nux,dc=com"
-msgstr ""
-
-#: ../ldap_wizard/ldap.pm:99
-msgid "example:"
-msgstr ""
-
-#: ../ldap_wizard/ldap.pm:99
-msgid "obelx.nux.com"
-msgstr ""
-
-#: ../ldap_wizard/ldap.pm:99
-msgid "will be in ldap config:"
+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"
+"例如：\"obelx.nux.com\"应该是\"dc=obelx,dc=nux,dc=com\" 在 LDAP 配置中。\n"
+"\n"
+"RootDN 是您的 LDAP 服务器的管理器。"
 
-#: ../ldap_wizard/ldap.pm:102 ../ldap_wizard/ldap.pm:139
+#: ../ldap_wizard/ldap.pm:111 ../ldap_wizard/ldap.pm:148
 msgid "RootDSE"
 msgstr "RootDSE"
 
-#: ../ldap_wizard/ldap.pm:104 ../ldap_wizard/ldap.pm:141
+#: ../ldap_wizard/ldap.pm:113 ../ldap_wizard/ldap.pm:150
 msgid "RootDN"
 msgstr "RootDN"
 
-#: ../ldap_wizard/ldap.pm:106
+#: ../ldap_wizard/ldap.pm:115
 msgid "Password"
 msgstr "密码"
 
-#: ../ldap_wizard/ldap.pm:108
+#: ../ldap_wizard/ldap.pm:117
 msgid "Default OU"
 msgstr "默认 OU"
 
-#: ../ldap_wizard/ldap.pm:114
+#: ../ldap_wizard/ldap.pm:123
 msgid "Ok Now add entry in LDAP"
 msgstr "好的，现在在 LDAP 中添加入口"
 
-#: ../ldap_wizard/ldap.pm:120
+#: ../ldap_wizard/ldap.pm:129
 msgid "Home directory:"
 msgstr "用户目录:"
 
-#: ../ldap_wizard/ldap.pm:124
+#: ../ldap_wizard/ldap.pm:133
 msgid "Container:"
 msgstr "容器:"
 
-#: ../ldap_wizard/ldap.pm:125
+#: ../ldap_wizard/ldap.pm:134
 msgid "shadowMax:"
 msgstr "shadowMax:"
 
-#: ../ldap_wizard/ldap.pm:126
+#: ../ldap_wizard/ldap.pm:135
 msgid "shadowMin:"
 msgstr "shadowMin:"
 
-#: ../ldap_wizard/ldap.pm:127
+#: ../ldap_wizard/ldap.pm:136
 msgid "shadowWarning:"
 msgstr "shadowWarning:"
 
-#: ../ldap_wizard/ldap.pm:128
+#: ../ldap_wizard/ldap.pm:137
 msgid "shadowInactive:"
 msgstr "shadowInactive:"
 
-#: ../ldap_wizard/ldap.pm:129
+#: ../ldap_wizard/ldap.pm:138
 msgid "shadowExpire:"
 msgstr "shadowExpire:"
 
-#: ../ldap_wizard/ldap.pm:130
+#: ../ldap_wizard/ldap.pm:139
 msgid "objectClass:"
 msgstr "objectClass:"
 
-#: ../ldap_wizard/ldap.pm:136
+#: ../ldap_wizard/ldap.pm:145
 msgid "Ok Now building your LDAP configuration"
 msgstr "好的，现在正在创建您的 LDAP 配置"
 
-#: ../ldap_wizard/ldap.pm:147
+#: ../ldap_wizard/ldap.pm:156
 msgid "Error in Home directory"
 msgstr "Home 目录中有错"
 
-#: ../ldap_wizard/ldap.pm:151
+#: ../ldap_wizard/ldap.pm:160
 msgid "Error, pass could not be empty"
 msgstr "错误，pass 不能为空"
 
-#: ../ldap_wizard/ldap.pm:155
+#: ../ldap_wizard/ldap.pm:164
 msgid "Error in Login shell"
 msgstr "Login shell 中有错"
 
-#: ../ldap_wizard/ldap.pm:155
+#: ../ldap_wizard/ldap.pm:164
 msgid "Please choose a correct one"
 msgstr "请选择正确的项"
 
-#: ../ldap_wizard/ldap.pm:159
+#: ../ldap_wizard/ldap.pm:168
 msgid "Please Should be a number"
 msgstr "应该是一个数字"
 
-#: ../ldap_wizard/ldap.pm:164
+#: ../ldap_wizard/ldap.pm:173
 msgid "The wizard successfully configured the LDAP."
 msgstr "向导成功地配置了 LDAP。"
 
-#: ../ldap_wizard/ldap.pm:170
+#: ../ldap_wizard/ldap.pm:179
 #, fuzzy
 msgid "Successfully add data"
 msgstr "成功地添加了数据"
 
-#: ../ldap_wizard/ldap.pm:171
+#: ../ldap_wizard/ldap.pm:180
 #, fuzzy
 msgid "The wizard successfully add entry in ldap"
 msgstr "向导成功地在 LDAP 中添加了项"
@@ -1190,7 +1184,7 @@ msgstr ""
 msgid "NIS Server with autofs map"
 msgstr "带 Autofs 映射的 NIS 服务器"
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:338
 msgid "NIS Client"
 msgstr "NIS 客户端"
 
@@ -1205,7 +1199,8 @@ msgid "NIS server with autofs map"
 msgstr "带 Autofs 映射的 NIS 服务器"
 
 #: ../nisautofs_wizard/Nisautofs.pm:76
-msgid "Setup a Nis server with autofs map, auto.home and auto.master files."
+#, fuzzy
+msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "设置带 Autofs 映射的 NIS 服务器，auto.home 和 auto.master 文件。"
 
 #: ../nisautofs_wizard/Nisautofs.pm:84
@@ -1262,7 +1257,8 @@ msgid "Will set your NIS server with  autofs map"
 msgstr "将要设置您的带 Autofs 映射的 NIS 服务器"
 
 #: ../nisautofs_wizard/Nisautofs.pm:112
-msgid "Nis directory:"
+#, fuzzy
+msgid "NIS directory:"
 msgstr "NIS 目录:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:113
@@ -1270,7 +1266,8 @@ msgid "Network File:"
 msgstr "网络文件:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Nfs exports:"
+#, fuzzy
+msgid "NFS exports:"
 msgstr "NFS 导出:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:115
@@ -1329,13 +1326,10 @@ msgid "NIS with autofs map"
 msgstr "带 autofs 映射的 NIS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:338
-msgid "Configuring your system as Nis Client ..."
+#, fuzzy
+msgid "Configuring your system as NIS Client ..."
 msgstr "正在将您的系统配置为 NIS 客户..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:338
-msgid "Nis Client"
-msgstr "NIS 客户"
-
 #: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix 向导"
@@ -2391,21 +2385,16 @@ msgstr "Apache 服务器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
 
+#, fuzzy
+#~ msgid "LDAP RootDSE"
+#~ msgstr "RootDSE"
+
+#~ msgid "Nis Client"
+#~ msgstr "NIS 客户"
+
 #~ msgid "UID number:"
 #~ msgstr "UID 号:"
 
-#~ msgid ""
-#~ "LDAP RootDSE\n"
-#~ "Example: \"obelx.nux.com\" will be \"dc=obelx,dc=nux,dc=com\" in LDAP "
-#~ "config.\n"
-#~ "\n"
-#~ "RootDN is the manager of your LDAP server."
-#~ msgstr ""
-#~ "LDAP RootDSE\n"
-#~ "例如：\"obelx.nux.com\"应该是\"dc=obelx,dc=nux,dc=com\" 在 LDAP 配置中。\n"
-#~ "\n"
-#~ "RootDN 是您的 LDAP 服务器的管理器。"
-
 #~ msgid "Will set your computer has a NIS client."
 #~ msgstr "将要设置您的计算机拥有一个 NIS 客户端。"