1 files changed, 299 insertions, 317 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index 230f26068..45228243f 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: 2013-10-11 11:11+0100\n"
+"POT-Creation-Date: 2014-02-02 08:56+0200\n"
 "PO-Revision-Date: 2009-04-09 11:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: display_help:54 display_help:59 drakbug:173 drakperm:136
+#: display_help:54 display_help:59 drakbug:173 drakperm:134
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -28,14 +28,14 @@ msgstr "帮助"
 msgid "Close"
 msgstr "关闭"
 
-#: drakauth:24 drakauth:26 draksec:160
+#: drakauth:24 drakauth:26 draksec:183
 #, c-format
 msgid "Authentication"
 msgstr "认证"
 
-#: drakauth:37 drakclock:115 drakclock:131 drakdvb:74 drakfont:213
-#: drakfont:226 drakfont:264 finish-install:136 logdrake:173 logdrake:448
-#: logdrake:453 scannerdrake:57 scannerdrake:99 scannerdrake:140
+#: drakauth:37 drakclock:116 drakclock:139 drakdvb:74 drakfont:213
+#: drakfont:226 drakfont:264 finish-install:136 logdrake:178 logdrake:454
+#: logdrake:459 scannerdrake:57 scannerdrake:99 scannerdrake:140
 #: scannerdrake:198 scannerdrake:257 scannerdrake:727 scannerdrake:738
 #: scannerdrake:877 scannerdrake:888 scannerdrake:958
 #, c-format
@@ -47,39 +47,39 @@ msgstr "错误"
 msgid "No bootloader found, creating a new configuration"
 msgstr "未找到引导程序，创建新配置"
 
-#: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74
+#: drakboot:90 harddrake2:191 logdrake:78
 #, c-format
 msgid "_File"
 msgstr "文件(_F)"
 
-#: drakboot:89 logdrake:80
+#: drakboot:91 harddrake2:192 logdrake:79 logdrake:80
 #, c-format
-msgid "File/_Quit"
-msgstr "文件(F)/退出(_Q)"
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: drakboot:89 harddrake2:199 logdrake:80
+#: drakboot:91 harddrake2:192 logdrake:80
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: drakboot:129
+#: drakboot:139
 #, c-format
 msgid "Text only"
 msgstr "只有文本"
 
-#: drakboot:130
+#: drakboot:140
 #, c-format
 msgid "Silent"
 msgstr "静默"
 
-#: drakboot:136 drakbug:250 drakdvb:57 drakfont:682 drakperm:376 drakperm:386
-#: drakups:27 harddrake2:533 localedrake:45 scannerdrake:49 scannerdrake:52
+#: drakboot:146 drakbug:250 drakdvb:57 drakfont:681 drakperm:371 drakperm:381
+#: drakups:27 harddrake2:504 localedrake:45 scannerdrake:49 scannerdrake:52
 #: scannerdrake:295 scannerdrake:300 scannerdrake:952
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: drakboot:137
+#: drakboot:147
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -88,72 +88,72 @@ msgstr ""
 "您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序, 请在引导程序配置工"
 "具中选择图形视频模式。"
 
-#: drakboot:138
+#: drakboot:148
 #, c-format
 msgid "Do you want to configure it now?"
 msgstr "您想要现在配置吗?"
 
-#: drakboot:147
+#: drakboot:157
 #, c-format
 msgid "Install themes"
 msgstr "安装主题"
 
-#: drakboot:149
+#: drakboot:159
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "图形化启动主题选择"
 
-#: drakboot:152
+#: drakboot:162
 #, c-format
 msgid "Graphical boot mode:"
 msgstr "图形化启动模式:"
 
-#: drakboot:154
+#: drakboot:164
 #, c-format
 msgid "Theme"
 msgstr "主题"
 
-#: drakboot:188
+#: drakboot:198
 #, c-format
 msgid "Default user"
 msgstr "默认用户"
 
-#: drakboot:189
+#: drakboot:199
 #, c-format
 msgid "Default desktop"
 msgstr "默认桌面"
 
-#: drakboot:192
+#: drakboot:202
 #, c-format
 msgid "No, I do not want autologin"
 msgstr "否, 不要自动登录"
 
-#: drakboot:193
+#: drakboot:203
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "是, 以指定用户的身份自动登录到指定桌面"
 
-#: drakboot:200
+#: drakboot:210
 #, c-format
 msgid "System mode"
 msgstr "系统模式"
 
-#: drakboot:203
+#: drakboot:213
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "系统启动时进入图形环境"
 
-#: drakboot:263
+#: drakboot:273
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: drakboot:265 drakboot:269
+#: drakboot:275 drakboot:279
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: drakboot:266
+#: drakboot:276
 #, c-format
 msgid ""
 "Please choose a video mode, it will be applied to each of the boot entries "
@@ -174,8 +174,8 @@ msgid "%s Bug Report Tool"
 msgstr "Mageia 故障报告工具"
 
 #: drakbug:62 drakbug:67 drakbug:72 drakbug:73 drakbug:99 drakfont:523
-#: drakfont:527 drakhelp:53 draksec:110 draksec:146 harddrake2:234
-#: harddrake2:238 logdrake:54
+#: drakfont:527 drakhelp:53 draksec:110 draksec:169 harddrake2:523
+#: harddrake2:527 logdrake:56
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
@@ -333,37 +333,37 @@ msgstr ""
 msgid "Thanks."
 msgstr "感谢。"
 
-#: drakclock:30 draksec:166
+#: drakclock:29 draksec:189
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: drakclock:39
+#: drakclock:38
 #, c-format
 msgid "not defined"
 msgstr "未定义"
 
-#: drakclock:41
+#: drakclock:40
 #, c-format
 msgid "Change Time Zone"
 msgstr "更改时区"
 
-#: drakclock:46
+#: drakclock:45
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "时区 - Drak 时间设置"
 
-#: drakclock:46
+#: drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: drakclock:47
+#: drakclock:46
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - Drak 时间设置"
 
-#: drakclock:47
+#: drakclock:46
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "您的系统时钟是否为 GMT?"
@@ -397,27 +397,27 @@ msgstr "服务器:"
 msgid "Timezone"
 msgstr "时区"
 
-#: drakclock:115
+#: drakclock:116
 #, c-format
 msgid "Please enter a valid NTP server address."
 msgstr "请输入有效的 NTP 服务器地址。"
 
-#: drakclock:132
+#: drakclock:140
 #, c-format
 msgid "Could not synchronize with %s."
 msgstr "无法与 %s 同步。"
 
-#: drakclock:133 drakdvb:149 logdrake:178 scannerdrake:489
+#: drakclock:141 drakdvb:149 logdrake:183 scannerdrake:489
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: drakclock:134
+#: drakclock:142
 #, c-format
 msgid "Retry"
 msgstr "重试"
 
-#: drakclock:161 drakclock:171
+#: drakclock:165 drakclock:175
 #, c-format
 msgid "Reset"
 msgstr "重置"
@@ -442,7 +442,7 @@ msgstr "%s 已经存在，其内容将丢失"
 msgid "Could not get the list of available channels"
 msgstr "无法获得可用频道的列表"
 
-#: drakdvb:80 draksec:69 drakups:99 finish-install:109 harddrake2:378
+#: drakdvb:80 draksec:69 drakups:99 finish-install:109 harddrake2:358
 #: scannerdrake:64 scannerdrake:68 scannerdrake:76 scannerdrake:317
 #: scannerdrake:366 scannerdrake:502 scannerdrake:506 scannerdrake:528
 #: service_harddrake:410
@@ -455,7 +455,7 @@ msgstr "请稍候"
 msgid "Detecting DVB channels, this will take a few minutes"
 msgstr "正在检测 DVB 频道，这一过程将持续几分钟"
 
-#: drakdvb:85 drakfont:572 drakfont:652 drakfont:736 drakups:217 logdrake:178
+#: drakdvb:85 drakfont:570 drakfont:650 drakfont:735 drakups:217 logdrake:183
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -628,7 +628,7 @@ msgstr "字体安装"
 msgid "DrakFont"
 msgstr "Drak 字体"
 
-#: drakfont:491 drakfont:642
+#: drakfont:491 drakfont:640
 #, c-format
 msgid "Font List"
 msgstr "字体列表"
@@ -643,12 +643,12 @@ msgstr "获得 Windows 字体"
 msgid "About"
 msgstr "关于"
 
-#: drakfont:501 drakfont:541
+#: drakfont:501 drakfont:539
 #, c-format
 msgid "Options"
 msgstr "选项"
 
-#: drakfont:502 drakfont:721
+#: drakfont:502 drakfont:720
 #, c-format
 msgid "Uninstall"
 msgstr "卸载"
@@ -663,7 +663,7 @@ msgstr "导入"
 msgid "Drakfont"
 msgstr "Drakfont"
 
-#: drakfont:523 harddrake2:234
+#: drakfont:523 harddrake2:523
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "版权 (C) %s %s"
@@ -675,137 +675,137 @@ msgstr "字体安装程序。"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: drakfont:533 harddrake2:242
+#: drakfont:531 harddrake2:531
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: drakfont:543
+#: drakfont:541
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "请选择要支持字体的应用程序: "
 
-#: drakfont:554
+#: drakfont:552
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: drakfont:555
+#: drakfont:553
 #, c-format
 msgid "LibreOffice"
 msgstr ""
 
-#: drakfont:556
+#: drakfont:554
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: drakfont:557
+#: drakfont:555
 #, c-format
 msgid "Generic Printers"
 msgstr "通用打印机"
 
-#: drakfont:562 drakfont:572 drakups:210
+#: drakfont:560 drakfont:570 drakups:210
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: drakfont:571
+#: drakfont:569
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "选择字体文件或目录, 然后单击“添加”"
 
-#: drakfont:572
+#: drakfont:570
 #, c-format
 msgid "File Selection"
 msgstr "选择文件"
 
-#: drakfont:576
+#: drakfont:574
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: drakfont:640 draksec:162
+#: drakfont:638 draksec:185
 #, c-format
 msgid "Import fonts"
 msgstr "导入字体"
 
-#: drakfont:646 drakups:299 drakups:375
+#: drakfont:644 drakups:299 drakups:375
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: drakfont:647 drakfont:735 drakups:301 drakups:377
+#: drakfont:645 drakfont:734 drakups:301 drakups:377
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: drakfont:653
+#: drakfont:651
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: drakfont:684
+#: drakfont:683
 #, c-format
 msgid "Are you sure you want to uninstall the following fonts?"
 msgstr "您确定想要卸载下列字体吗?"
 
-#: drakfont:688 draksec:59 harddrake2:323
+#: drakfont:687 draksec:59 harddrake2:302
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: drakfont:690 draksec:58 harddrake2:324
+#: drakfont:689 draksec:58 harddrake2:303
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: drakfont:729
+#: drakfont:728
 #, c-format
 msgid "Unselect All"
 msgstr "全部不选"
 
-#: drakfont:732
+#: drakfont:731
 #, c-format
 msgid "Select All"
 msgstr "全部选中"
 
-#: drakfont:749
+#: drakfont:748
 #, c-format
 msgid "Importing fonts"
 msgstr "导入字体"
 
-#: drakfont:753 drakfont:773
+#: drakfont:752 drakfont:772
 #, c-format
 msgid "Initial tests"
 msgstr "初始测试"
 
-#: drakfont:754
+#: drakfont:753
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "复制系统中的字体"
 
-#: drakfont:755
+#: drakfont:754
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "安装并转换字体"
 
-#: drakfont:756
+#: drakfont:755
 #, c-format
 msgid "Post Install"
 msgstr "安装后的设置"
 
-#: drakfont:768
+#: drakfont:767
 #, c-format
 msgid "Removing fonts"
 msgstr "删除字体"
 
-#: drakfont:774
+#: drakfont:773
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "删除系统中的字体"
 
-#: drakfont:775
+#: drakfont:774
 #, c-format
 msgid "Post Uninstall"
 msgstr "删除后"
@@ -880,22 +880,22 @@ msgstr "安全权限"
 msgid "Editable"
 msgstr "可编辑"
 
-#: drakperm:50 drakperm:320
+#: drakperm:50 drakperm:318
 #, c-format
 msgid "Path"
 msgstr "路径"
 
-#: drakperm:50 drakperm:249
+#: drakperm:50 drakperm:247
 #, c-format
 msgid "User"
 msgstr "用户"
 
-#: drakperm:50 drakperm:249
+#: drakperm:50 drakperm:247
 #, c-format
 msgid "Group"
 msgstr "组"
 
-#: drakperm:50 drakperm:109 drakperm:332 draksec:177
+#: drakperm:50 drakperm:107 drakperm:330 draksec:200
 #, c-format
 msgid "Permissions"
 msgstr "权限"
@@ -905,12 +905,12 @@ msgstr "权限"
 msgid "Add a new rule"
 msgstr "添加新规则"
 
-#: drakperm:67 drakperm:102 drakperm:128
+#: drakperm:67 drakperm:102 drakperm:126
 #, c-format
 msgid "Edit current rule"
 msgstr "编辑当前规则"
 
-#: drakperm:110
+#: drakperm:108
 #, c-format
 msgid ""
 "Here you can see files to use in order to fix permissions, owners, and "
@@ -921,7 +921,7 @@ msgstr ""
 "等。\n"
 "您还可以编辑您自己的规则以取代默认的规则。"
 
-#: drakperm:112
+#: drakperm:110
 #, c-format
 msgid ""
 "The current security level is %s.\n"
@@ -930,115 +930,115 @@ msgstr ""
 "当前安全级别为 %s。\n"
 "选择要查看/编辑的权限"
 
-#: drakperm:124
+#: drakperm:122
 #, c-format
 msgid "Up"
 msgstr "上移"
 
-#: drakperm:124
+#: drakperm:122
 #, c-format
 msgid "Move selected rule up one level"
 msgstr "把选中的规则提高一级"
 
-#: drakperm:125
+#: drakperm:123
 #, c-format
 msgid "Down"
 msgstr "下移"
 
-#: drakperm:125
+#: drakperm:123
 #, c-format
 msgid "Move selected rule down one level"
 msgstr "把选中的规则降低一级"
 
-#: drakperm:126
+#: drakperm:124
 #, c-format
 msgid "Add a rule"
 msgstr "添加规则"
 
-#: drakperm:126
+#: drakperm:124
 #, c-format
 msgid "Add a new rule at the end"
 msgstr "在末尾添加新的规则"
 
-#: drakperm:127
+#: drakperm:125
 #, c-format
 msgid "Delete"
 msgstr "删除"
 
-#: drakperm:127
+#: drakperm:125
 #, c-format
 msgid "Delete selected rule"
 msgstr "删除选中的规则"
 
-#: drakperm:128 drakups:300 drakups:376
+#: drakperm:126 drakups:300 drakups:376
 #, c-format
 msgid "Edit"
 msgstr "编辑"
 
-#: drakperm:241
+#: drakperm:239
 #, c-format
 msgid "browse"
 msgstr "浏览"
 
-#: drakperm:246
+#: drakperm:244
 #, c-format
 msgid "user"
 msgstr "用户"
 
-#: drakperm:246
+#: drakperm:244
 #, c-format
 msgid "group"
 msgstr "组"
 
-#: drakperm:246
+#: drakperm:244
 #, c-format
 msgid "other"
 msgstr "其它"
 
-#: drakperm:249
+#: drakperm:247
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: drakperm:251
+#: drakperm:249
 #, c-format
 msgid "Read"
 msgstr "读取"
 
 #. -PO: here %s will be either "user", "group" or "other"
-#: drakperm:254
+#: drakperm:252
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr "允许“%s”读取文件"
 
-#: drakperm:258
+#: drakperm:256
 #, c-format
 msgid "Write"
 msgstr "写入"
 
 #. -PO: here %s will be either "user", "group" or "other"
-#: drakperm:261
+#: drakperm:259
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr "允许“%s”写入文件"
 
-#: drakperm:265
+#: drakperm:263
 #, c-format
 msgid "Execute"
 msgstr "执行"
 
 #. -PO: here %s will be either "user", "group" or "other"
-#: drakperm:268
+#: drakperm:266
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr "允许“%s”执行此文件"
 
-#: drakperm:271
+#: drakperm:269
 #, c-format
 msgid "Sticky-bit"
 msgstr "Sticky-bit"
 
-#: drakperm:271
+#: drakperm:269
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -1047,57 +1047,57 @@ msgstr ""
 "用于目录:\n"
 " 只有目录的所有者或目录中文件的所有者可以删除它"
 
-#: drakperm:272
+#: drakperm:270
 #, c-format
 msgid "Set-UID"
 msgstr "Set-UID"
 
-#: drakperm:272
+#: drakperm:270
 #, c-format
 msgid "Use owner id for execution"
 msgstr "使用所有者 ID 执行"
 
-#: drakperm:273
+#: drakperm:271
 #, c-format
 msgid "Set-GID"
 msgstr "Set-GID"
 
-#: drakperm:273
+#: drakperm:271
 #, c-format
 msgid "Use group id for execution"
 msgstr "使用组 ID 执行"
 
-#: drakperm:290
+#: drakperm:288
 #, c-format
 msgid "User:"
 msgstr "用户:"
 
-#: drakperm:291
+#: drakperm:289
 #, c-format
 msgid "Group:"
 msgstr "组:"
 
-#: drakperm:295
+#: drakperm:293
 #, c-format
 msgid "Current user"
 msgstr "当前用户"
 
-#: drakperm:296
+#: drakperm:294
 #, c-format
 msgid "When checked, owner and group will not be changed"
 msgstr "选中后，无法更改所有者和组"
 
-#: drakperm:306
+#: drakperm:304
 #, c-format
 msgid "Path selection"
 msgstr "选择路径"
 
-#: drakperm:326
+#: drakperm:324
 #, c-format
 msgid "Property"
 msgstr "属性"
 
-#: drakperm:376
+#: drakperm:371
 #, c-format
 msgid ""
 "The first character of the path must be a slash (\"/\"):\n"
@@ -1106,17 +1106,17 @@ msgstr ""
 "路径的第一个字符必须是斜线(“/”):\n"
 "“%s”"
 
-#: drakperm:386
+#: drakperm:381
 #, c-format
 msgid "Both the username and the group must valid!"
 msgstr "用户名和组名必须都有效!"
 
-#: drakperm:387
+#: drakperm:382
 #, c-format
 msgid "User: %s"
 msgstr "用户: %s"
 
-#: drakperm:388
+#: drakperm:383
 #, c-format
 msgid "Group: %s"
 msgstr "组: %s"
@@ -1136,7 +1136,7 @@ msgstr "本地"
 msgid "NONE"
 msgstr "无"
 
-#: draksec:56
+#: draksec:56 draksec:113
 #, c-format
 msgid "Default"
 msgstr "默认"
@@ -1156,137 +1156,137 @@ msgstr "安全级别和检查"
 msgid "Configure authentication required to access %s tools"
 msgstr "配置访问 Mageia 工具所需的身份认证"
 
-#: draksec:113
+#: draksec:114
 #, c-format
 msgid "No password"
 msgstr "无密码"
 
-#: draksec:114
+#: draksec:115
 #, c-format
 msgid "Administrator password"
 msgstr "Root 密码"
 
-#: draksec:115
+#: draksec:116
 #, c-format
 msgid "User password"
 msgstr "用户密码"
 
-#: draksec:145 draksec:200
+#: draksec:168 draksec:222
 #, c-format
 msgid "Software Management"
 msgstr "软件管理"
 
-#: draksec:146
+#: draksec:169
 #, fuzzy, c-format
 msgid "%s Update"
 msgstr "Mageia 更新"
 
-#: draksec:147
+#: draksec:170
 #, c-format
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
-#: draksec:148
+#: draksec:171
 #, c-format
 msgid "Configure 3D Desktop effects"
 msgstr "配置三维桌面效果"
 
-#: draksec:149
+#: draksec:172
 #, c-format
 msgid "Graphical Server Configuration"
 msgstr "图形服务器配置"
 
-#: draksec:150
+#: draksec:173
 #, c-format
 msgid "Mouse Configuration"
 msgstr "鼠标配置"
 
-#: draksec:151
+#: draksec:174
 #, c-format
 msgid "Keyboard Configuration"
 msgstr "键盘配置"
 
-#: draksec:152
+#: draksec:175
 #, c-format
 msgid "UPS Configuration"
 msgstr "UPS 配置"
 
-#: draksec:153
+#: draksec:176
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: draksec:154
+#: draksec:177
 #, c-format
 msgid "Hosts definitions"
 msgstr "主机定义"
 
-#: draksec:155
+#: draksec:178
 #, c-format
 msgid "Network Center"
 msgstr "网络中心"
 
-#: draksec:156
+#: draksec:179
 #, c-format
 msgid "Wireless Network Roaming"
 msgstr "无线网络漫游"
 
-#: draksec:157
+#: draksec:180
 #, c-format
 msgid "VPN"
 msgstr "VPN"
 
-#: draksec:158
+#: draksec:181
 #, c-format
 msgid "Proxy Configuration"
 msgstr "代理服务器配置"
 
-#: draksec:159
+#: draksec:182
 #, c-format
 msgid "Connection Sharing"
 msgstr "连接共享"
 
-#: draksec:161
+#: draksec:184
 #, c-format
 msgid "Backups"
 msgstr "备份"
 
-#: draksec:163 logdrake:55
+#: draksec:186 logdrake:57
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: draksec:164
+#: draksec:187
 #, c-format
 msgid "Services"
 msgstr "服务"
 
-#: draksec:165
+#: draksec:188
 #, c-format
 msgid "Users"
 msgstr "用户"
 
-#: draksec:167
+#: draksec:190
 #, c-format
 msgid "Boot Configuration"
 msgstr "启动配置"
 
-#: draksec:201
+#: draksec:223
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: draksec:202
+#: draksec:224
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: draksec:203
+#: draksec:225
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: draksec:204
+#: draksec:226
 #, c-format
 msgid "Boot"
 msgstr "启动"
@@ -1370,12 +1370,12 @@ msgstr ""
 msgid "Autodetection"
 msgstr "自动检测"
 
-#: drakups:99 harddrake2:378
+#: drakups:99 harddrake2:358
 #, c-format
 msgid "Detection in progress"
 msgstr "检测进行中"
 
-#: drakups:118 drakups:157 logdrake:460 logdrake:466
+#: drakups:118 drakups:157 logdrake:466 logdrake:472
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
@@ -2213,160 +2213,154 @@ msgstr "分区"
 msgid "Features"
 msgstr "特性"
 
-#. -PO: please keep all "/" characters !!!
-#: harddrake2:181 logdrake:81
-#, c-format
-msgid "_Options"
-msgstr "选项(_O)"
-
-#: harddrake2:182 harddrake2:208 logdrake:83
-#, c-format
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: harddrake2:186
+#: harddrake2:179
 #, c-format
 msgid "Autodetect _modems"
 msgstr "自动检测调制解调器(_M)"
 
-#: harddrake2:187
-#, c-format
-msgid "Autodetect _jaz drives"
-msgstr "自动检测 jaz 驱动器(_J)"
-
-#: harddrake2:188
+#: harddrake2:180
 #, c-format
 msgid "Autodetect parallel _zip drives"
 msgstr "自动检测并口 zip 驱动器(_Z)"
 
-#: harddrake2:192
+#: harddrake2:184
 #, c-format
 msgid "Hardware Configuration"
 msgstr "硬件配置"
 
-#: harddrake2:199
+#: harddrake2:193
 #, c-format
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: harddrake2:210
-#, c-format
-msgid "_Fields description"
-msgstr "域描述(_F)"
-
-#: harddrake2:212
-#, c-format
-msgid "Harddrake help"
-msgstr "“Drak 硬件配置”帮助"
+msgid "_Options"
+msgstr "选项(_O)"
 
-#: harddrake2:213
+#: harddrake2:194 harddrake2:195
 #, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"各个域的描述:\n"
-"\n"
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: harddrake2:221
-#, c-format
-msgid "Select a device!"
-msgstr "请选择设备！"
+#: harddrake2:195
+#, fuzzy, c-format
+msgid "<control>H"
+msgstr "<control>Q"
 
-#: harddrake2:221
+#: harddrake2:196
 #, c-format
-msgid ""
-"Once you've selected a device, you'll be able to see the device information "
-"in fields displayed on the right frame (\"Information\")"
-msgstr "只要您选中了设备, 您就能看到在右侧框架(“信息”)中显示的解释。"
+msgid "_Fields description"
+msgstr "域描述(_F)"
 
-#: harddrake2:227
+#: harddrake2:197
 #, c-format
 msgid "_Report Bug"
 msgstr "故障报告(_R)"
 
-#: harddrake2:229
+#: harddrake2:198
 #, c-format
 msgid "_About..."
 msgstr "关于(_A)..."
 
-#: harddrake2:232
-#, c-format
-msgid "Harddrake"
-msgstr "Drak 硬件配置"
-
-#: harddrake2:236
-#, c-format
-msgid "This is HardDrake, a %s hardware configuration tool."
-msgstr "这是 HardDrake，%s 的硬件配置工具。"
-
-#: harddrake2:268
+#: harddrake2:242
 #, c-format
 msgid "Detected hardware"
 msgstr "检测到的硬件"
 
-#: harddrake2:271 scannerdrake:284
+#: harddrake2:245 scannerdrake:284
 #, c-format
 msgid "Information"
 msgstr "信息"
 
-#: harddrake2:273
+#: harddrake2:247
 #, c-format
 msgid "Set current driver options"
 msgstr "设定当前驱动程序选项"
 
-#: harddrake2:280
+#: harddrake2:254
 #, c-format
 msgid "Run config tool"
 msgstr "运行配置工具"
 
-#: harddrake2:300
+#: harddrake2:280
 #, c-format
 msgid ""
 "Click on a device in the tree on the left in order to display its "
 "information here."
 msgstr "单击左侧树中的设备, 就可在此显示其信息。"
 
-#: harddrake2:321 notify-x11-free-driver-switch:13
+#: harddrake2:300 notify-x11-free-driver-switch:13
 #, c-format
 msgid "unknown"
 msgstr "未知"
 
-#: harddrake2:322
+#: harddrake2:301
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: harddrake2:342
+#: harddrake2:321
 #, c-format
 msgid "Misc"
 msgstr "杂项"
 
-#: harddrake2:425
+#: harddrake2:404
 #, c-format
 msgid "secondary"
 msgstr "次要"
 
-#: harddrake2:425
+#: harddrake2:404
 #, c-format
 msgid "primary"
 msgstr "主"
 
-#: harddrake2:429
+#: harddrake2:408
 #, c-format
 msgid "burner"
 msgstr "刻录机"
 
-#: harddrake2:429
+#: harddrake2:408
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: harddrake2:533
+#: harddrake2:504
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "下列软件包需要安装: \n"
 
+#: harddrake2:521
+#, c-format
+msgid "Harddrake"
+msgstr "Drak 硬件配置"
+
+#: harddrake2:525
+#, c-format
+msgid "This is HardDrake, a %s hardware configuration tool."
+msgstr "这是 HardDrake，%s 的硬件配置工具。"
+
+#: harddrake2:540
+#, c-format
+msgid "Harddrake help"
+msgstr "“Drak 硬件配置”帮助"
+
+#: harddrake2:541
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"各个域的描述:\n"
+"\n"
+
+#: harddrake2:548
+#, c-format
+msgid "Select a device!"
+msgstr "请选择设备！"
+
+#: harddrake2:548
+#, c-format
+msgid ""
+"Once you've selected a device, you'll be able to see the device information "
+"in fields displayed on the right frame (\"Information\")"
+msgstr "只要您选中了设备, 您就能看到在右侧框架(“信息”)中显示的解释。"
+
 #: localedrake:38
 #, c-format
 msgid "LocaleDrake"
@@ -2383,220 +2377,175 @@ msgstr "您应该安装下列软件包：%s"
 msgid ", "
 msgstr "、"
 
-#: logdrake:54
+#: logdrake:56
 #, fuzzy, c-format
 msgid "%s Tools Logs"
 msgstr "Mageia 工具日志"
 
-#: logdrake:68
+#: logdrake:70
 #, c-format
 msgid "Show only for the selected day"
 msgstr "仅显示被选择的日期"
 
-#: logdrake:75
-#, c-format
-msgid "File/_New"
-msgstr "文件(F)/新建(_N)"
-
-#: logdrake:75
-#, c-format
-msgid "<control>N"
-msgstr "<control>N"
-
-#: logdrake:76
-#, c-format
-msgid "File/_Open"
-msgstr "文件(F)/打开(_O)"
-
-#: logdrake:76
-#, c-format
-msgid "<control>O"
-msgstr "<control>O"
-
-#: logdrake:77
-#, c-format
-msgid "File/_Save"
-msgstr "文件(F)/保存(_S)"
-
-#: logdrake:77
+#: logdrake:79
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: logdrake:78
-#, c-format
-msgid "File/Save _As"
-msgstr "文件(F)/另存为(_A)"
-
-#: logdrake:79
-#, c-format
-msgid "File/-"
-msgstr "文件(F)/-"
-
-#: logdrake:82
-#, c-format
-msgid "Options/Test"
-msgstr "选项(O)/测试"
-
-#: logdrake:84
-#, c-format
-msgid "Help/_About..."
-msgstr "帮助(H)/关于(_A)..."
-
-#: logdrake:113
+#: logdrake:118
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "身份认证"
 
-#: logdrake:114
+#: logdrake:119
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "用户"
 
-#: logdrake:115
+#: logdrake:120
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "消息"
 
-#: logdrake:116
+#: logdrake:121
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "系统日志"
 
-#: logdrake:120
+#: logdrake:125
 #, c-format
 msgid "search"
 msgstr "搜索"
 
-#: logdrake:132
+#: logdrake:137
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "日志监视工具"
 
-#: logdrake:134
+#: logdrake:139
 #, c-format
 msgid "Settings"
 msgstr "设置"
 
-#: logdrake:137
+#: logdrake:142
 #, c-format
 msgid "Matching"
 msgstr "匹配"
 
-#: logdrake:138
+#: logdrake:143
 #, c-format
 msgid "but not matching"
 msgstr "不匹配"
 
-#: logdrake:141
+#: logdrake:146
 #, c-format
 msgid "Choose file"
 msgstr "选择文件"
 
-#: logdrake:153
+#: logdrake:158
 #, c-format
 msgid "Calendar"
 msgstr "日历"
 
-#: logdrake:162
+#: logdrake:167
 #, c-format
 msgid "Content of the file"
 msgstr "文件内容"
 
-#: logdrake:166 logdrake:410
+#: logdrake:171 logdrake:416
 #, c-format
 msgid "Mail alert"
 msgstr "邮件提醒"
 
-#: logdrake:173
+#: logdrake:178
 #, c-format
 msgid "The alert wizard has failed unexpectedly:"
 msgstr "提醒向导意外失败:"
 
-#: logdrake:177
+#: logdrake:182
 #, c-format
 msgid "Save"
 msgstr "保存"
 
-#: logdrake:225
+#: logdrake:231
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "请等待, 正在分析文件: %s"
 
-#: logdrake:247
+#: logdrake:253
 #, c-format
 msgid "Sorry, log file isn't available!"
 msgstr "抱歉，没有可用的日志文件！"
 
-#: logdrake:295
+#: logdrake:301
 #, c-format
 msgid "Error while opening \"%s\" log file: %s\n"
 msgstr "打开日志文件“%s”时出错：%s\n"
 
-#: logdrake:388
+#: logdrake:394
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache WWW 服务器"
 
-#: logdrake:389
+#: logdrake:395
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "域名解析器"
 
-#: logdrake:390
+#: logdrake:396
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP 服务器"
 
-#: logdrake:391
+#: logdrake:397
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix 邮件服务"
 
-#: logdrake:392
+#: logdrake:398
 #, c-format
 msgid "Samba Server"
 msgstr "Samba 服务器"
 
-#: logdrake:393
+#: logdrake:399
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 服务器"
 
-#: logdrake:394
+#: logdrake:400
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin 服务"
 
-#: logdrake:395
+#: logdrake:401
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd 服务"
 
-#: logdrake:404
+#: logdrake:410
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "配置邮件提醒系统"
 
-#: logdrake:405
+#: logdrake:411
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "停止邮件提醒系统"
 
-#: logdrake:413
+#: logdrake:419
 #, c-format
 msgid "Mail alert configuration"
 msgstr "邮件提醒设定"
 
-#: logdrake:414
+#: logdrake:420
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -2607,71 +2556,71 @@ msgstr ""
 "\n"
 "您可以在这里配置提醒。\n"
 
-#: logdrake:417
+#: logdrake:423
 #, c-format
 msgid "What do you want to do?"
 msgstr "您想做什么?"
 
-#: logdrake:424
+#: logdrake:430
 #, c-format
 msgid "Services settings"
 msgstr "服务设置"
 
-#: logdrake:425
+#: logdrake:431
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "如果选中的服务中有任何一个停止运行, 您将收到提醒"
 
-#: logdrake:432
+#: logdrake:438
 #, c-format
 msgid "Load setting"
 msgstr "负载设置"
 
-#: logdrake:433
+#: logdrake:439
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "当负载超过这个值时您会收到一个警报"
 
-#: logdrake:434
+#: logdrake:440
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "负载"
 
-#: logdrake:439
+#: logdrake:445
 #, c-format
 msgid "Alert configuration"
 msgstr "提醒配置"
 
-#: logdrake:440
+#: logdrake:446
 #, c-format
 msgid "Please enter your email address below "
 msgstr "请在下面输入您的电子邮件地址 "
 
-#: logdrake:441
+#: logdrake:447
 #, c-format
 msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "请输入您想使用的 SMTP 服务器的名称(或 IP 地址)"
 
-#: logdrake:443
+#: logdrake:449
 #, fuzzy, c-format
 msgid "Email address"
 msgstr "IP 地址"
 
-#: logdrake:444
+#: logdrake:450
 #, fuzzy, c-format
 msgid "Email server"
 msgstr "Samba 服务器"
 
-#: logdrake:448
+#: logdrake:454
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "“%s”既不是有效的电子邮件, 也不是已存在的本地用户!"
 
-#: logdrake:453
+#: logdrake:459
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -2679,17 +2628,17 @@ msgid ""
 msgstr ""
 "“%s”是本地用户, 但是您没有选择本地 SMTP, 所以您必须使用完整的电子邮件地址!"
 
-#: logdrake:460
+#: logdrake:466
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "向导已经成功配置了邮件提醒。"
 
-#: logdrake:466
+#: logdrake:472
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "向导已经成功禁用了邮件提醒。"
 
-#: logdrake:525
+#: logdrake:531
 #, c-format
 msgid "Save as.."
 msgstr "另存为..."
@@ -3453,6 +3402,39 @@ msgstr "图形服务器配置"
 msgid "Authentication is required to run Mageia Service Configuration"
 msgstr ""
 
+#~ msgid "File/_Quit"
+#~ msgstr "文件(F)/退出(_Q)"
+
+#~ msgid "Autodetect _jaz drives"
+#~ msgstr "自动检测 jaz 驱动器(_J)"
+
+#~ msgid "File/_New"
+#~ msgstr "文件(F)/新建(_N)"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "File/_Open"
+#~ msgstr "文件(F)/打开(_O)"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "File/_Save"
+#~ msgstr "文件(F)/保存(_S)"
+
+#~ msgid "File/Save _As"
+#~ msgstr "文件(F)/另存为(_A)"
+
+#~ msgid "File/-"
+#~ msgstr "文件(F)/-"
+
+#~ msgid "Options/Test"
+#~ msgstr "选项(O)/测试"
+
+#~ msgid "Help/_About..."
+#~ msgstr "帮助(H)/关于(_A)..."
+
 #~ msgid "Verbose"
 #~ msgstr "详细"