updated pot file

1 files changed, 63 insertions, 54 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 371395fd..ecf87fde 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-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-06 12:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -26,8 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "配置向导"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../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:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,8 +35,7 @@ msgid "Warning."
 msgstr "警告。"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../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 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "出错。"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ 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:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
 
@@ -280,7 +278,7 @@ msgstr "向导成功地配置了 DHCP 服务。"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -447,7 +445,7 @@ msgid ""
 "continue"
 msgstr "看起来主机已经在您的 DNS 配置中了...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "错误:"
 
@@ -588,15 +586,20 @@ msgstr "Mandrake 安装服务器"
 msgid "PXE server"
 msgstr "PXE 服务器"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba 服务器"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "选择 Drakwizard 向导"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "请选择一个向导"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -605,7 +608,7 @@ msgstr ""
 "%s 未安装\n"
 "单击“下一步”安装，单击“取消”退出"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "安装失败"
 
@@ -755,7 +758,7 @@ msgstr "允许 FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "向导成功地配置了您的 Intranet/Internet FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "请重新调用配置向导，然后试着更新一些参数。"
@@ -852,6 +855,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "欢迎使用 Kolab 群件服务器配置向导。"
 
@@ -859,16 +869,20 @@ msgstr "欢迎使用 Kolab 群件服务器配置向导。"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "密码:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "重输密码:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "向导现在将用此参数配置 Kolab 服务器"
 
@@ -876,11 +890,11 @@ msgstr "向导现在将用此参数配置 Kolab 服务器"
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "邮件域名:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -888,16 +902,11 @@ msgid ""
 msgstr ""
 "kolab 服务器现已配置并运行起来了。请以用户名“manager”及您输入的密码登录。"
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 PXE 服务器..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba 服务器"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "服务器 - 设置 LDAP 服务器的配置"
@@ -1142,7 +1151,7 @@ msgid ""
 "Internet News service:"
 msgstr "为了配置 Internet 新闻组服务，向导收集了下列需要的参数:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1426,23 +1435,23 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr "您可以选择发出邮件在“From:”和“Reply-to”字段显示的地址类型。"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "伪装必须是有效的域名，如“mydomain.com”！"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "伪装域名:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "警告:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "您输入的邮件网关地址是空的。"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1450,13 +1459,13 @@ msgstr ""
 "您的选择可以被接受，不过那样您将不能发送邮件到您的局域网以外。点击“下一步”继"
 "续，或“后退”并输入一个值。"
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr "出错，已经安装 sendmail，请在安装并配置 Postfix 前先删除该软件"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1465,71 +1474,71 @@ msgstr ""
 "Internet 主机名必须采用下列格式“host.domain.domaintype”；例如，您的服务商"
 "是“provider.com”，邮件服务器通常就是“smtp.provider.com”。"
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Internet 邮件网关"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "您的服务器将使用一个邮件网关发出邮件，它会负责最终的投递。"
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "邮件服务器名:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "默认是附加 myhostname，这对小站点很好。"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr "myorigin 参数指定了本地发出的邮件中“来自”一栏中要出现的域"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "配置外部邮件服务器"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "为了配置外部邮件服务器，向导收集了下列需要的参数:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "地址格式"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "向导现在将配置 Internet 邮件服务器。"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "向导成功地配置了您的外部邮件服务器。"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix 服务器"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "请检查是否已安装 sendmail，以避免冲突..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "正在配置您的 Postfix 服务器..."
 
@@ -1738,7 +1747,7 @@ msgid "Set PXE server"
 msgstr "设置 PXE 服务器"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1750,7 +1759,7 @@ msgid "Modify boot image in PXE"
 msgstr "修改 PXE 中的启动映像"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111