sync with code

1 files changed, 222 insertions, 210 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index d8a093ff8..2c6083b29 100644
--- a/perl-install/standalone/po/zh_CN.po
+++ b/perl-install/standalone/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 2007\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 11:41+0100\n"
+"POT-Creation-Date: 2009-02-13 16:30+0100\n"
 "PO-Revision-Date: 2006-09-16 07:01+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: drakauth:24 drakauth:26 draksec:291 draksec:340
+#: drakauth:24 drakauth:26 draksec:163
 #, c-format
 msgid "Authentication"
 msgstr "认证"
 
-#: drakauth:37 drakclock:111 drakclock:125 drakfont:213 drakfont:226
-#: drakfont:264 draksplash:202 finish-install:119 logdrake:170 logdrake:445
-#: logdrake:450 scannerdrake:59 scannerdrake:101 scannerdrake:142
+#: drakauth:37 drakclock:111 drakclock:125 drakdvb:72 drakfont:213
+#: drakfont:226 drakfont:264 draksplash:202 finish-install:119 logdrake:170
+#: logdrake:445 logdrake:450 scannerdrake:59 scannerdrake:101 scannerdrake:142
 #: scannerdrake:200 scannerdrake:259 scannerdrake:729 scannerdrake:740
 #: scannerdrake:879 scannerdrake:890 scannerdrake:960
 #, c-format
@@ -65,8 +65,8 @@ msgstr "详细"
 msgid "Silent"
 msgstr "静默"
 
-#: drakboot:137 drakbug:254 drakfont:682 drakperm:376 drakperm:386 drakups:27
-#: harddrake2:516 localedrake:43 notify-x11-free-driver-switch:15
+#: drakboot:137 drakbug:254 drakdvb:57 drakfont:682 drakperm:376 drakperm:386
+#: drakups:27 harddrake2:516 localedrake:43 notify-x11-free-driver-switch:15
 #: scannerdrake:51 scannerdrake:54 scannerdrake:297 scannerdrake:302
 #: scannerdrake:954
 #, c-format
@@ -304,7 +304,7 @@ msgstr "您应该安装下列软件包：%s"
 msgid "Please describe what you were doing when it crashed:"
 msgstr "请描述崩溃时您正在执行的操作："
 
-#: drakbug:185 drakperm:136 draksec:450 draksec:452 draksec:471 draksec:473
+#: drakbug:185 drakperm:136
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -342,7 +342,7 @@ msgstr ""
 msgid "Thanks."
 msgstr "感谢。"
 
-#: drakclock:30 draksec:346
+#: drakclock:30 draksec:169
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
@@ -416,7 +416,7 @@ msgstr "请输入有效的 NTP 服务器地址。"
 msgid "Could not synchronize with %s."
 msgstr "无法与 %s 同步。"
 
-#: drakclock:127 draksplash:125 logdrake:175 scannerdrake:491
+#: drakclock:127 drakdvb:122 draksplash:125 logdrake:175 scannerdrake:491
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -431,6 +431,54 @@ msgstr "重试"
 msgid "Reset"
 msgstr "重置"
 
+#: drakdvb:30
+#, fuzzy, c-format
+msgid "DVB"
+msgstr "DVD"
+
+#: drakdvb:39 harddrake2:100
+#, c-format
+msgid "Channel"
+msgstr "通道"
+
+#: drakdvb:57
+#, c-format
+msgid "%s already exists and its contents will be lost"
+msgstr ""
+
+#: drakdvb:72
+#, c-format
+msgid "Could not get the list of available channels"
+msgstr ""
+
+#: drakdvb:78 draksec:73 drakups:99 harddrake2:370 scannerdrake:66
+#: scannerdrake:70 scannerdrake:78 scannerdrake:319 scannerdrake:368
+#: scannerdrake:504 scannerdrake:508 scannerdrake:530 service_harddrake:264
+#, c-format
+msgid "Please wait"
+msgstr "请稍候"
+
+#: drakdvb:82
+#, c-format
+msgid "Detecting DVB channels, this will take a few minutes"
+msgstr ""
+
+#: drakdvb:83 drakfont:572 drakfont:652 drakfont:736 draksplash:213
+#: drakups:217 logdrake:175
+#, c-format
+msgid "Cancel"
+msgstr "取消"
+
+#: drakdvb:121
+#, fuzzy, c-format
+msgid "Detect Channels"
+msgstr "通道"
+
+#: drakdvb:123
+#, fuzzy, c-format
+msgid "View Channel"
+msgstr "通道"
+
 #: drakedm:41
 #, c-format
 msgid "GDM (GNOME Display Manager)"
@@ -686,18 +734,12 @@ msgstr "选择字体文件或目录, 然后单击“添加”"
 msgid "File Selection"
 msgstr "选择文件"
 
-#: drakfont:572 drakfont:652 drakfont:736 draksplash:213 drakups:217
-#: logdrake:175
-#, c-format
-msgid "Cancel"
-msgstr "取消"
-
 #: drakfont:576
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: drakfont:640 draksec:342
+#: drakfont:640 draksec:165
 #, c-format
 msgid "Import fonts"
 msgstr "导入字体"
@@ -722,12 +764,12 @@ msgstr "安装"
 msgid "Are you sure you want to uninstall the following fonts?"
 msgstr "您确定想要卸载下列字体吗?"
 
-#: drakfont:688 draksec:59 harddrake2:324
+#: drakfont:688 draksec:60 harddrake2:324
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: drakfont:690 draksec:58 harddrake2:325
+#: drakfont:690 draksec:59 harddrake2:325
 #, c-format
 msgid "No"
 msgstr "否"
@@ -866,7 +908,7 @@ msgstr "用户"
 msgid "Group"
 msgstr "组"
 
-#: drakperm:50 drakperm:109 drakperm:332
+#: drakperm:50 drakperm:109 drakperm:332 draksec:180
 #, c-format
 msgid "Permissions"
 msgstr "权限"
@@ -1092,321 +1134,171 @@ msgstr "用户: %s"
 msgid "Group: %s"
 msgstr "组: %s"
 
-#: draksec:53
+#: draksec:54
 #, c-format
 msgid "ALL"
 msgstr "所有"
 
-#: draksec:54
+#: draksec:55
 #, c-format
 msgid "LOCAL"
 msgstr "本地"
 
-#: draksec:55
+#: draksec:56
 #, c-format
 msgid "NONE"
 msgstr "无"
 
-#: draksec:56
+#: draksec:57
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: draksec:57
+#: draksec:58
 #, c-format
 msgid "Ignore"
 msgstr "忽略"
 
-#: draksec:72 drakups:99 harddrake2:370 scannerdrake:66 scannerdrake:70
-#: scannerdrake:78 scannerdrake:319 scannerdrake:368 scannerdrake:504
-#: scannerdrake:508 scannerdrake:530 service_harddrake:264
-#, c-format
-msgid "Please wait"
-msgstr "请稍候"
-
-#. -PO: Do not alter the <span ..> and </span> tags.
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
-#: draksec:93
-#, c-format
-msgid ""
-"Here, you can setup the security level and administrator of your machine.\n"
-"\n"
-"\n"
-"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
-"will receive security alerts if the\n"
-"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
-"username or an email.\n"
-"\n"
-"\n"
-"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
-"one of the six preconfigured security levels\n"
-"provided with msec. These levels range from '<span weight=\"bold\">poor</"
-"span>' security and ease of use, to\n"
-"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
-"server applications:\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
-"very\n"
-"easy to use security level. It should only be used for machines not "
-"connected to\n"
-"any network and that are not accessible to everybody.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Standard</span>: This is the standard "
-"security\n"
-"recommended for a computer that will be used to connect to the Internet as "
-"a\n"
-"client.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">High</span>: There are already some\n"
-"restrictions, and more automatic checks are run every night.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Higher</span>: The security is now high "
-"enough\n"
-"to use the system as a server which can accept connections from many "
-"clients. If\n"
-"your machine is only a client on the Internet, you should choose a lower "
-"level.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
-"previous\n"
-"level, but the system is entirely closed and security features are at their\n"
-"maximum"
-msgstr ""
-"您可在此设置安全级别以及您机器的管理员。\n"
-"\n"
-"\n"
-"“<span weight=\"bold\">安全管理员</span>”是这样一个人, 如果设置了“<span "
-"weight=\"bold\">安全警告</span>”选项, 他就会收到这样的安全警告。您可以设置用"
-"户名或者电子邮件。\n"
-"\n"
-"\n"
-"“<span weight=\"bold\">安全级别</span>”菜单允许您从 msec 提供的六种预先配置的"
-"安全级别中选择一种。这些级别涵盖从易于使用的“<span weight=\"bold\">低</"
-"span>”安全性到适合非常敏感的服务器应用的“<span weight=\"bold\">苛刻</span>”配"
-"置：\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">低</span>：这种情况下非常不安全, 但却是非常易"
-"于使用的安全级别。这一安全级别应仅用于不连接到任何网络, 且并非人人都可访问的"
-"机器。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">标准</span>：对于那些会以客户端连接到 "
-"Internet 的计算机, 推荐使用本安全级别。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">高</span>：此安全级别已有一些限制, 并且会在每"
-"晚执行更多的自动检查。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">较高</span>：假如要将系统用作将接受大量客户访"
-"问的服务器的话, 本安全级别已经足够安全了。如果您的计算机仅仅是 Internet 的客"
-"户端, 请使用较低的级别。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">苛刻</span>：本级别与前一级别类似, 但系统几乎"
-"完全封闭, 安全特性达到最高"
-
-#: draksec:147 harddrake2:214
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"各个域的描述:\n"
-"\n"
-
-#: draksec:161
-#, c-format
-msgid "(default value: %s)"
-msgstr "(默认值: %s)"
-
-#: draksec:166
+#: draksec:91
 #, c-format
 msgid "Security Level and Checks"
 msgstr "安全级别和检查"
 
-#: draksec:203
+#: draksec:114
 #, c-format
-msgid "Security Level:"
-msgstr "安全级别:"
-
-#: draksec:206
-#, c-format
-msgid "Security Alerts:"
-msgstr "安全警告: "
-
-#: draksec:210
-#, c-format
-msgid "Security Administrator:"
-msgstr "安全管理员:"
-
-#: draksec:212
-#, c-format
-msgid "Basic options"
-msgstr "基本选项"
-
-#: draksec:226
-#, c-format
-msgid "Network Options"
-msgstr "网络选项"
-
-#: draksec:226
-#, c-format
-msgid "System Options"
-msgstr "系统选项"
-
-#: draksec:269
-#, c-format
-msgid "Periodic Checks"
-msgstr "定期检查"
+msgid "Configure authentication required to access Mandriva tools"
+msgstr ""
 
-#: draksec:294
+#: draksec:117
 #, c-format
 msgid "No password"
 msgstr "无密码"
 
-#: draksec:295
+#: draksec:118
 #, c-format
 msgid "Root password"
 msgstr "Root 密码"
 
-#: draksec:296
+#: draksec:119
 #, c-format
 msgid "User password"
 msgstr "用户密码"
 
-#: draksec:326 draksec:372
+#: draksec:149 draksec:203
 #, c-format
 msgid "Software Management"
 msgstr "软件管理"
 
-#: draksec:327
+#: draksec:150
 #, c-format
 msgid "Mandriva Update"
 msgstr "Mandriva 更新"
 
-#: draksec:328
+#: draksec:151
 #, c-format
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
-#: draksec:329
+#: draksec:152
 #, c-format
 msgid "Configure 3D Desktop effects"
 msgstr "配置三维桌面效果"
 
-#: draksec:330
+#: draksec:153
 #, c-format
 msgid "Graphical Server Configuration"
 msgstr "图形服务器配置"
 
-#: draksec:331
+#: draksec:154
 #, c-format
 msgid "Mouse Configuration"
 msgstr "鼠标配置"
 
-#: draksec:332
+#: draksec:155
 #, c-format
 msgid "Keyboard Configuration"
 msgstr "键盘配置"
 
-#: draksec:333
+#: draksec:156
 #, c-format
 msgid "UPS Configuration"
 msgstr "UPS 配置"
 
-#: draksec:334
+#: draksec:157
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: draksec:335
+#: draksec:158
 #, c-format
 msgid "Hosts definitions"
 msgstr "主机定义"
 
-#: draksec:336
+#: draksec:159
 #, c-format
 msgid "Network Center"
 msgstr "网络中心"
 
-#: draksec:337
+#: draksec:160
 #, c-format
 msgid "VPN"
 msgstr "VPN"
 
-#: draksec:338
+#: draksec:161
 #, c-format
 msgid "Proxy Configuration"
 msgstr "代理服务器配置"
 
-#: draksec:339
+#: draksec:162
 #, c-format
 msgid "Connection Sharing"
 msgstr "连接共享"
 
-#: draksec:341
+#: draksec:164
 #, c-format
 msgid "Backups"
 msgstr "备份"
 
-#: draksec:343 logdrake:52
+#: draksec:166 logdrake:52
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: draksec:344
+#: draksec:167
 #, c-format
 msgid "Services"
 msgstr "服务"
 
-#: draksec:345
+#: draksec:168
 #, c-format
 msgid "Users"
 msgstr "用户"
 
-#: draksec:347
+#: draksec:170
 #, c-format
 msgid "Boot Configuration"
 msgstr "启动配置"
 
-#: draksec:373
+#: draksec:204
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: draksec:374
+#: draksec:205
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: draksec:375
+#: draksec:206
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: draksec:376
+#: draksec:207
 #, c-format
 msgid "Boot"
 msgstr "启动"
 
-#: draksec:401
-#, c-format
-msgid "Please wait, setting security level..."
-msgstr "请稍候, 正在设置安全级别..."
-
-#: draksec:407
-#, c-format
-msgid "Please wait, setting security options..."
-msgstr "请稍候, 正在设置安全选项..."
-
 #: draksound:48
 #, c-format
 msgid "No Sound Card detected!"
@@ -2378,11 +2270,6 @@ msgstr "驱动器接受的软盘格式"
 
 #: harddrake2:100
 #, c-format
-msgid "Channel"
-msgstr "通道"
-
-#: harddrake2:100
-#, c-format
 msgid "EIDE/SCSI channel"
 msgstr "EIDE/SCSI 通道"
 
@@ -2609,6 +2496,15 @@ msgstr "/域描述(_F)"
 msgid "Harddrake help"
 msgstr "“Drak 硬件配置”帮助"
 
+#: harddrake2:214
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"各个域的描述:\n"
+"\n"
+
 #: harddrake2:222
 #, c-format
 msgid "Select a device!"
@@ -3615,3 +3511,119 @@ msgstr "语言和国家配置"
 #: ../menu/localedrake-user.desktop.in.h:2
 msgid "Regional Settings"
 msgstr "区域设置"
+
+#~ msgid ""
+#~ "Here, you can setup the security level and administrator of your "
+#~ "machine.\n"
+#~ "\n"
+#~ "\n"
+#~ "The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+#~ "will receive security alerts if the\n"
+#~ "'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+#~ "username or an email.\n"
+#~ "\n"
+#~ "\n"
+#~ "The '<span weight=\"bold\">Security Level</span>' menu allows you to "
+#~ "select one of the six preconfigured security levels\n"
+#~ "provided with msec. These levels range from '<span weight=\"bold\">poor</"
+#~ "span>' security and ease of use, to\n"
+#~ "'<span weight=\"bold\">paranoid</span>' config, suitable for very "
+#~ "sensitive server applications:\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
+#~ "very\n"
+#~ "easy to use security level. It should only be used for machines not "
+#~ "connected to\n"
+#~ "any network and that are not accessible to everybody.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Standard</span>: This is the standard "
+#~ "security\n"
+#~ "recommended for a computer that will be used to connect to the Internet "
+#~ "as a\n"
+#~ "client.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">High</span>: There are already some\n"
+#~ "restrictions, and more automatic checks are run every night.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Higher</span>: The security is now high "
+#~ "enough\n"
+#~ "to use the system as a server which can accept connections from many "
+#~ "clients. If\n"
+#~ "your machine is only a client on the Internet, you should choose a lower "
+#~ "level.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
+#~ "previous\n"
+#~ "level, but the system is entirely closed and security features are at "
+#~ "their\n"
+#~ "maximum"
+#~ msgstr ""
+#~ "您可在此设置安全级别以及您机器的管理员。\n"
+#~ "\n"
+#~ "\n"
+#~ "“<span weight=\"bold\">安全管理员</span>”是这样一个人, 如果设置了“<span "
+#~ "weight=\"bold\">安全警告</span>”选项, 他就会收到这样的安全警告。您可以设置"
+#~ "用户名或者电子邮件。\n"
+#~ "\n"
+#~ "\n"
+#~ "“<span weight=\"bold\">安全级别</span>”菜单允许您从 msec 提供的六种预先配"
+#~ "置的安全级别中选择一种。这些级别涵盖从易于使用的“<span weight=\"bold\">低"
+#~ "</span>”安全性到适合非常敏感的服务器应用的“<span weight=\"bold\">苛刻</"
+#~ "span>”配置：\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">低</span>：这种情况下非常不安全, 但却是非"
+#~ "常易于使用的安全级别。这一安全级别应仅用于不连接到任何网络, 且并非人人都可"
+#~ "访问的机器。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">标准</span>：对于那些会以客户端连接到 "
+#~ "Internet 的计算机, 推荐使用本安全级别。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">高</span>：此安全级别已有一些限制, 并且会"
+#~ "在每晚执行更多的自动检查。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">较高</span>：假如要将系统用作将接受大量客"
+#~ "户访问的服务器的话, 本安全级别已经足够安全了。如果您的计算机仅仅是 "
+#~ "Internet 的客户端, 请使用较低的级别。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">苛刻</span>：本级别与前一级别类似, 但系统"
+#~ "几乎完全封闭, 安全特性达到最高"
+
+#~ msgid "(default value: %s)"
+#~ msgstr "(默认值: %s)"
+
+#~ msgid "Security Level:"
+#~ msgstr "安全级别:"
+
+#~ msgid "Security Alerts:"
+#~ msgstr "安全警告: "
+
+#~ msgid "Security Administrator:"
+#~ msgstr "安全管理员:"
+
+#~ msgid "Basic options"
+#~ msgstr "基本选项"
+
+#~ msgid "Network Options"
+#~ msgstr "网络选项"
+
+#~ msgid "System Options"
+#~ msgstr "系统选项"
+
+#~ msgid "Periodic Checks"
+#~ msgstr "定期检查"
+
+#~ msgid "Please wait, setting security level..."
+#~ msgstr "请稍候, 正在设置安全级别..."
+
+#~ msgid "Please wait, setting security options..."
+#~ msgstr "请稍候, 正在设置安全选项..."