sync with code

1 files changed, 129 insertions, 103 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index e94f18a0a..67240506b 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 2007\n"
-"POT-Creation-Date: 2007-07-01 08:35+0200\n"
+"POT-Creation-Date: 2007-07-30 16:14+0200\n"
 "PO-Revision-Date: 2006-09-10 21:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: any.pm:240 diskdrake/interactive.pm:422 diskdrake/interactive.pm:621
-#: diskdrake/interactive.pm:811 diskdrake/interactive.pm:855
-#: diskdrake/interactive.pm:917 diskdrake/interactive.pm:1201 do_pkgs.pm:209
+#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:852
+#: diskdrake/interactive.pm:914 diskdrake/interactive.pm:1201 do_pkgs.pm:209
 #: do_pkgs.pm:255 harddrake/sound.pm:201 interactive.pm:576
 #, c-format
 msgid "Please wait"
@@ -746,9 +746,8 @@ msgstr "本地文件:"
 
 #: authentication.pm:66
 #, c-format
-msgid ""
-"Use local for all authentication and information user tell in local file"
-msgstr "使用本地进行全部身份验证并在本地文件中存储关于用户的信息"
+msgid "Use information stored in local file for all authentication"
+msgstr ""
 
 #: authentication.pm:67
 #, c-format
@@ -1123,7 +1122,7 @@ msgid "Mount point"
 msgstr "挂载点"
 
 #: diskdrake/dav.pm:65 diskdrake/interactive.pm:442
-#: diskdrake/interactive.pm:1060 diskdrake/removable.pm:24
+#: diskdrake/interactive.pm:1057 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
@@ -1133,8 +1132,8 @@ msgstr "选项"
 #: diskdrake/interactive.pm:242 diskdrake/interactive.pm:398
 #: diskdrake/interactive.pm:416 diskdrake/interactive.pm:547
 #: diskdrake/interactive.pm:552 diskdrake/interactive.pm:670
-#: diskdrake/interactive.pm:935 diskdrake/interactive.pm:1105
-#: diskdrake/interactive.pm:1118 diskdrake/interactive.pm:1121
+#: diskdrake/interactive.pm:932 diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1115 diskdrake/interactive.pm:1118
 #: diskdrake/interactive.pm:1361 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:19
 #: do_pkgs.pm:24 do_pkgs.pm:40 do_pkgs.pm:56 do_pkgs.pm:61 fsedit.pm:229
 #: interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19
@@ -1179,8 +1178,8 @@ msgstr "选项: %s"
 msgid "Partitioning"
 msgstr "分区"
 
-#: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1080
-#: diskdrake/interactive.pm:1090 diskdrake/interactive.pm:1143
+#: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1077
+#: diskdrake/interactive.pm:1087 diskdrake/interactive.pm:1140
 #, c-format
 msgid "Read carefully!"
 msgstr "请仔细阅读！"
@@ -1300,8 +1299,8 @@ msgstr "文件系统类型: "
 #: diskdrake/hd_gtk.pm:380 diskdrake/interactive.pm:291
 #: diskdrake/interactive.pm:392 diskdrake/interactive.pm:428
 #: diskdrake/interactive.pm:577 diskdrake/interactive.pm:761
-#: diskdrake/interactive.pm:822 diskdrake/interactive.pm:915
-#: diskdrake/interactive.pm:957 diskdrake/interactive.pm:958
+#: diskdrake/interactive.pm:819 diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:954 diskdrake/interactive.pm:955
 #: diskdrake/interactive.pm:1186 diskdrake/interactive.pm:1224
 #: diskdrake/interactive.pm:1360 do_pkgs.pm:16 do_pkgs.pm:35 do_pkgs.pm:53
 #: harddrake/sound.pm:285
@@ -1325,7 +1324,7 @@ msgid "Use ``%s'' instead"
 msgstr "用“%s”代替"
 
 #: diskdrake/hd_gtk.pm:389 diskdrake/interactive.pm:441
-#: diskdrake/interactive.pm:615 diskdrake/interactive.pm:1096
+#: diskdrake/interactive.pm:615 diskdrake/interactive.pm:1093
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
@@ -1510,12 +1509,12 @@ msgstr "改变大小"
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:447 diskdrake/interactive.pm:863
+#: diskdrake/interactive.pm:447 diskdrake/interactive.pm:860
 #, c-format
 msgid "Add to RAID"
 msgstr "加入 RAID"
 
-#: diskdrake/interactive.pm:448 diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:448 diskdrake/interactive.pm:877
 #, c-format
 msgid "Add to LVM"
 msgstr "加入 LVM"
@@ -1560,12 +1559,12 @@ msgstr "创建一个新分区"
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:516 diskdrake/interactive.pm:950
+#: diskdrake/interactive.pm:516 diskdrake/interactive.pm:947
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:518 diskdrake/interactive.pm:951
+#: diskdrake/interactive.pm:518 diskdrake/interactive.pm:948
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
@@ -1651,7 +1650,7 @@ msgstr ""
 msgid "Where do you want to mount %s?"
 msgstr "您想把 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:725 diskdrake/interactive.pm:811
+#: diskdrake/interactive.pm:725 diskdrake/interactive.pm:808
 #: fs/partitioning_wizard.pm:141 fs/partitioning_wizard.pm:173
 #, c-format
 msgid "Resizing"
@@ -1697,7 +1696,7 @@ msgstr "最小大小：%s MB"
 msgid "Maximum size: %s MB"
 msgstr "最大大小：%s MB"
 
-#: diskdrake/interactive.pm:822 fs/partitioning_wizard.pm:181
+#: diskdrake/interactive.pm:819 fs/partitioning_wizard.pm:181
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -1706,27 +1705,27 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
 "可能会自动运行文件系统检查。"
 
-#: diskdrake/interactive.pm:863
+#: diskdrake/interactive.pm:860
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:865 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:862 diskdrake/interactive.pm:879
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:877
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:887
+#: diskdrake/interactive.pm:884
 #, c-format
 msgid "LVM name?"
 msgstr "LVM 名称?"
 
-#: diskdrake/interactive.pm:915
+#: diskdrake/interactive.pm:912
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -1735,82 +1734,82 @@ msgstr ""
 "物理卷 %s 仍在使用中。\n"
 "您是否想要将此卷上已用的物理扩展分区移动到其它卷上？"
 
-#: diskdrake/interactive.pm:917
+#: diskdrake/interactive.pm:914
 #, c-format
 msgid "Moving physical extents"
 msgstr "移动物理扩展分区"
 
-#: diskdrake/interactive.pm:935
+#: diskdrake/interactive.pm:932
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:948
+#: diskdrake/interactive.pm:945
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:949
+#: diskdrake/interactive.pm:946
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:954
+#: diskdrake/interactive.pm:951
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:957
+#: diskdrake/interactive.pm:954
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:958
+#: diskdrake/interactive.pm:955
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:987 diskdrake/interactive.pm:990
+#: diskdrake/interactive.pm:984 diskdrake/interactive.pm:987
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:997
+#: diskdrake/interactive.pm:994
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1062
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1063
+#: diskdrake/interactive.pm:1060
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1064
+#: diskdrake/interactive.pm:1061
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1081
+#: diskdrake/interactive.pm:1078
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1096
+#: diskdrake/interactive.pm:1093
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1131
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1143
+#: diskdrake/interactive.pm:1140
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
@@ -5045,32 +5044,32 @@ msgid "Your scanner(s) will not be available for non-root users."
 msgstr "您的扫描仪将无法被非 root 用户使用。"
 
 #: security/help.pm:11
-#, c-format
-msgid "Accept/Refuse bogus IPv4 error messages."
-msgstr "允许/拒绝 bogus IPv4 错误消息。"
+#, fuzzy, c-format
+msgid "Accept bogus IPv4 error messages."
+msgstr "接受 bogus IPv4 错误消息"
 
 #: security/help.pm:13
-#, c-format
-msgid "Accept/Refuse broadcasted icmp echo."
-msgstr "允许/拒绝广播 ICMP 回应。"
+#, fuzzy, c-format
+msgid "Accept broadcasted icmp echo."
+msgstr "接受广播 ICMP 回应"
 
 #: security/help.pm:15
-#, c-format
-msgid "Accept/Refuse icmp echo."
-msgstr "允许/拒绝 ICMP 回应。"
+#, fuzzy, c-format
+msgid "Accept icmp echo."
+msgstr "接受 icmp 回应"
 
 #: security/help.pm:17
-#, c-format
-msgid "Allow/Forbid autologin."
+#, fuzzy, c-format
+msgid "Allow autologin."
 msgstr "允许/禁止自动登录。"
 
 #. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
 #: security/help.pm:21
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
 "\n"
-"If set to NONE, no issues are allowed.\n"
+"If set to \"None\", no issues are allowed.\n"
 "\n"
 "Else only /etc/issue is allowed."
 msgstr ""
@@ -5080,31 +5079,30 @@ msgstr ""
 "否则只能允许 /etc/issue。"
 
 #: security/help.pm:27
-#, c-format
-msgid "Allow/Forbid reboot by the console user."
+#, fuzzy, c-format
+msgid "Allow reboot by the console user."
 msgstr "允许/禁止控制台用户重新启动。"
 
 #: security/help.pm:29
-#, c-format
-msgid "Allow/Forbid remote root login."
-msgstr "允许/禁止远程 root 登录。"
+#, fuzzy, c-format
+msgid "Allow remote root login."
+msgstr "允许远程 root 登录"
 
 #: security/help.pm:31
-#, c-format
-msgid "Allow/Forbid direct root login."
+#, fuzzy, c-format
+msgid "Allow direct root login."
 msgstr "允许/禁止直接 root 登录。"
 
 #: security/help.pm:33
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Allow/Forbid the list of users on the system on display managers (kdm and "
-"gdm)."
+"Allow the list of users on the system on display managers (kdm and gdm)."
 msgstr "允许/禁止系统中的用户列表显示在管理器(kdm 或 gdm)上。"
 
 #: security/help.pm:35
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Allow/forbid to export display when\n"
+"Allow to export display when\n"
 "passing from the root account to the other users.\n"
 "\n"
 "See pam_xauth(8) for more details.'"
@@ -5114,15 +5112,15 @@ msgstr ""
 "请查看 pam_xauth(8) 中的细节。"
 
 #: security/help.pm:40
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Allow/Forbid X connections:\n"
+"Allow X connections:\n"
 "\n"
-"- ALL (all connections are allowed),\n"
+"- \"All\" (all connections are allowed),\n"
 "\n"
-"- LOCAL (only connection from local machine),\n"
+"- \"Local\" (only connection from local machine),\n"
 "\n"
-"- NONE (no connection)."
+"- \"None\" (no connection)."
 msgstr ""
 "允许/禁止 X 连接:\n"
 "\n"
@@ -5139,18 +5137,18 @@ msgid ""
 "to the X server from the network on the tcp port 6000 or not."
 msgstr "参数指定了客户端要要通过 TCP 端口 6000 连接到 X 服务器是否要认证。"
 
-#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#. -PO: here "ALL", "Local" and "None" are values in a pull-down menu; translate them the same as they're
 #: security/help.pm:53
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Authorize:\n"
 "\n"
 "- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if "
 "set to \"ALL\",\n"
 "\n"
-"- only local ones if set to \"LOCAL\"\n"
+"- only local ones if set to \"Local\"\n"
 "\n"
-"- none if set to \"NONE\".\n"
+"- none if set to \"None\".\n"
 "\n"
 "To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
 "(5))."
@@ -5187,9 +5185,9 @@ msgstr ""
 "件时, 决定是否要添加服务。"
 
 #: security/help.pm:72
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Enable/Disable crontab and at for users.\n"
+"Enable crontab and at for users.\n"
 "\n"
 "Put allowed users in /etc/cron.allow and /etc/at.allow (see man at(1)\n"
 "and crontab(1))."
@@ -5200,14 +5198,14 @@ msgstr ""
 "的 man)。"
 
 #: security/help.pm:77
-#, c-format
-msgid "Enable/Disable syslog reports to console 12"
+#, fuzzy, c-format
+msgid "Enable syslog reports to console 12"
 msgstr "在 12 控制台上启用/禁用系统日志报告"
 
 #: security/help.pm:79
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Enable/Disable name resolution spoofing protection.  If\n"
+"Enable name resolution spoofing protection.  If\n"
 "\"%s\" is true, also reports to syslog."
 msgstr ""
 "启用/禁用名称解析欺骗保护。如果“%s”为 true, \n"
@@ -5219,24 +5217,24 @@ msgid "Security Alerts:"
 msgstr "安全警告: "
 
 #: security/help.pm:82
-#, c-format
-msgid "Enable/Disable IP spoofing protection."
-msgstr "启用/禁用 IP 欺骗保护。"
+#, fuzzy, c-format
+msgid "Enable IP spoofing protection."
+msgstr "启用 IP 欺骗保护"
 
 #: security/help.pm:84
-#, c-format
-msgid "Enable/Disable libsafe if libsafe is found on the system."
-msgstr "启用/禁用 libsafe, 若在系统中发现 libsafe。"
+#, fuzzy, c-format
+msgid "Enable libsafe if libsafe is found on the system."
+msgstr "启用 libsafe, 若在系统中发现 libsafe"
 
 #: security/help.pm:86
-#, c-format
-msgid "Enable/Disable the logging of IPv4 strange packets."
-msgstr "启用/禁用 IPv4 异常包日志。"
+#, fuzzy, c-format
+msgid "Enable the logging of IPv4 strange packets."
+msgstr "启用 IPv4 异常包日志"
 
 #: security/help.pm:88
-#, c-format
-msgid "Enable/Disable msec hourly security check."
-msgstr "启用/禁用 msec 每小时安全检查。"
+#, fuzzy, c-format
+msgid "Enable msec hourly security check."
+msgstr "启用 msec 每小时安全检查"
 
 #: security/help.pm:90
 #, c-format
@@ -5251,18 +5249,18 @@ msgid "Use password to authenticate users."
 msgstr "使用密码认证用户。"
 
 #: security/help.pm:94
-#, c-format
-msgid "Activate/Disable ethernet cards promiscuity check."
+#, fuzzy, c-format
+msgid "Activate ethernet cards promiscuity check."
 msgstr "激活/禁用以太网卡混用检查。"
 
 #: security/help.pm:96
-#, c-format
-msgid "Activate/Disable daily security check."
+#, fuzzy, c-format
+msgid "Activate daily security check."
 msgstr "激活/禁用每日安全检查。"
 
 #: security/help.pm:98
-#, c-format
-msgid "Enable/Disable sulogin(8) in single user level."
+#, fuzzy, c-format
+msgid "Enable sulogin(8) in single user level."
 msgstr "在单用户级别上启用/禁用 sulogin(8)。"
 
 #: security/help.pm:100
@@ -5288,8 +5286,8 @@ msgid ""
 msgstr "设置密码最短长度, 数字的最少个数, 大写字母的最少个数。"
 
 #: security/help.pm:108
-#, c-format
-msgid "Set the root umask."
+#, fuzzy, c-format
+msgid "Set the root's file mode creation mask."
 msgstr "设置 root umask。"
 
 #: security/help.pm:109
@@ -5413,8 +5411,8 @@ msgid "Timeout unit is second"
 msgstr "超时单位为秒"
 
 #: security/help.pm:138
-#, c-format
-msgid "Set the user umask."
+#, fuzzy, c-format
+msgid "Set the user's file mode creation mask."
 msgstr "设置用户 umask。"
 
 #: security/l10n.pm:11
@@ -6549,6 +6547,34 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid ""
+#~ "Use local for all authentication and information user tell in local file"
+#~ msgstr "使用本地进行全部身份验证并在本地文件中存储关于用户的信息"
+
+#~ msgid "Accept/Refuse bogus IPv4 error messages."
+#~ msgstr "允许/拒绝 bogus IPv4 错误消息。"
+
+#~ msgid "Accept/Refuse broadcasted icmp echo."
+#~ msgstr "允许/拒绝广播 ICMP 回应。"
+
+#~ msgid "Accept/Refuse icmp echo."
+#~ msgstr "允许/拒绝 ICMP 回应。"
+
+#~ msgid "Allow/Forbid remote root login."
+#~ msgstr "允许/禁止远程 root 登录。"
+
+#~ msgid "Enable/Disable IP spoofing protection."
+#~ msgstr "启用/禁用 IP 欺骗保护。"
+
+#~ msgid "Enable/Disable libsafe if libsafe is found on the system."
+#~ msgstr "启用/禁用 libsafe, 若在系统中发现 libsafe。"
+
+#~ msgid "Enable/Disable the logging of IPv4 strange packets."
+#~ msgstr "启用/禁用 IPv4 异常包日志。"
+
+#~ msgid "Enable/Disable msec hourly security check."
+#~ msgstr "启用/禁用 msec 每小时安全检查。"
+
 #~ msgid "Icon"
 #~ msgstr "图标"