sync with code

1 files changed, 292 insertions, 293 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index 6a9a6f031..0ca411d8d 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: 2011-12-04 03:44+0200\n"
+"POT-Creation-Date: 2012-12-11 17:34+0100\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"
@@ -23,21 +23,21 @@ msgstr ""
 msgid "Help"
 msgstr "帮助"
 
-#: display_help:67 drakbug:178 drakfont:506
+#: display_help:67 drakbug:178 drakfont:507
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: drakauth:24 drakauth:26 draksec:164
+#: drakauth:24 drakauth:26 draksec:160
 #, c-format
 msgid "Authentication"
 msgstr "认证"
 
-#: drakauth:37 drakclock:111 drakclock:125 drakdvb:74 drakfont:213
-#: drakfont:226 drakfont:264 finish-install:130 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
+#: drakauth:37 drakclock:115 drakclock:131 drakdvb:74 drakfont:213
+#: drakfont:226 drakfont:264 finish-install:134 logdrake:170 logdrake:445
+#: logdrake:450 scannerdrake:57 scannerdrake:99 scannerdrake:140
+#: scannerdrake:198 scannerdrake:257 scannerdrake:727 scannerdrake:738
+#: scannerdrake:877 scannerdrake:888 scannerdrake:958
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -47,7 +47,7 @@ msgstr "错误"
 msgid "No bootloader found, creating a new configuration"
 msgstr "未找到引导程序，创建新配置"
 
-#: drakboot:88 harddrake2:199 harddrake2:200 logdrake:71
+#: drakboot:88 harddrake2:198 harddrake2:199 logdrake:71
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -57,7 +57,7 @@ msgstr "/文件(_F)"
 msgid "/File/_Quit"
 msgstr "/文件(F)/退出(_Q)"
 
-#: drakboot:89 harddrake2:200 logdrake:77
+#: drakboot:89 harddrake2:199 logdrake:77
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -69,22 +69,17 @@ msgstr "只有文本"
 
 #: drakboot:130
 #, c-format
-msgid "Verbose"
-msgstr "详细"
-
-#: drakboot:131
-#, c-format
 msgid "Silent"
 msgstr "静默"
 
-#: drakboot:137 drakbug:250 drakdvb:57 drakfont:681 drakperm:376 drakperm:386
-#: drakups:27 harddrake2:537 localedrake:45 scannerdrake:51 scannerdrake:54
-#: scannerdrake:297 scannerdrake:302 scannerdrake:954
+#: drakboot:136 drakbug:250 drakdvb:57 drakfont:682 drakperm:376 drakperm:386
+#: drakups:27 harddrake2:533 localedrake:45 scannerdrake:49 scannerdrake:52
+#: scannerdrake:295 scannerdrake:300 scannerdrake:952
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: drakboot:138
+#: drakboot:137
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -93,72 +88,72 @@ msgstr ""
 "您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序, 请在引导程序配置工"
 "具中选择图形视频模式。"
 
-#: drakboot:139
+#: drakboot:138
 #, c-format
 msgid "Do you want to configure it now?"
 msgstr "您想要现在配置吗?"
 
-#: drakboot:148
+#: drakboot:147
 #, c-format
 msgid "Install themes"
 msgstr "安装主题"
 
-#: drakboot:150
+#: drakboot:149
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "图形化启动主题选择"
 
-#: drakboot:153
+#: drakboot:152
 #, c-format
 msgid "Graphical boot mode:"
 msgstr "图形化启动模式:"
 
-#: drakboot:155
+#: drakboot:154
 #, c-format
 msgid "Theme"
 msgstr "主题"
 
-#: drakboot:189
+#: drakboot:188
 #, c-format
 msgid "Default user"
 msgstr "默认用户"
 
-#: drakboot:190
+#: drakboot:189
 #, c-format
 msgid "Default desktop"
 msgstr "默认桌面"
 
-#: drakboot:193
+#: drakboot:192
 #, c-format
 msgid "No, I do not want autologin"
 msgstr "否, 不要自动登录"
 
-#: drakboot:194
+#: drakboot:193
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "是, 以指定用户的身份自动登录到指定桌面"
 
-#: drakboot:201
+#: drakboot:200
 #, c-format
 msgid "System mode"
 msgstr "系统模式"
 
-#: drakboot:204
+#: drakboot:203
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "系统启动时进入图形环境"
 
-#: drakboot:259
+#: drakboot:263
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: drakboot:261 drakboot:265
+#: drakboot:265 drakboot:269
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: drakboot:262
+#: drakboot:266
 #, c-format
 msgid ""
 "Please choose a video mode, it will be applied to each of the boot entries "
@@ -178,6 +173,13 @@ msgstr "“%s”程序已崩溃，并抛出如下错误："
 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:51
+#, fuzzy, c-format
+msgid "Mageia"
+msgstr "Mageia"
+
 #: drakbug:67
 #, fuzzy, c-format
 msgid "%s Control Center"
@@ -331,7 +333,7 @@ msgstr ""
 msgid "Thanks."
 msgstr "感谢。"
 
-#: drakclock:30 draksec:170
+#: drakclock:30 draksec:166
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
@@ -346,32 +348,32 @@ msgstr "未定义"
 msgid "Change Time Zone"
 msgstr "更改时区"
 
-#: drakclock:44
+#: drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "时区 - Drak 时间设置"
 
-#: drakclock:44
+#: drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: drakclock:45
+#: drakclock:47
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - Drak 时间设置"
 
-#: drakclock:45
+#: drakclock:47
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "您的系统时钟是否为 GMT?"
 
-#: drakclock:70
+#: drakclock:74
 #, c-format
 msgid "Network Time Protocol"
 msgstr "网络时间协议"
 
-#: drakclock:72
+#: drakclock:76
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -380,42 +382,42 @@ msgstr ""
 "您的计算机可以通过 NTP 协议与远程时间服\n"
 "务器的时钟同步"
 
-#: drakclock:73
+#: drakclock:77
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "启用网络时间协议"
 
-#: drakclock:81
+#: drakclock:85
 #, c-format
 msgid "Server:"
 msgstr "服务器:"
 
-#: drakclock:95
+#: drakclock:99
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: drakclock:111
+#: drakclock:115
 #, c-format
 msgid "Please enter a valid NTP server address."
 msgstr "请输入有效的 NTP 服务器地址。"
 
-#: drakclock:126
+#: drakclock:132
 #, c-format
 msgid "Could not synchronize with %s."
 msgstr "无法与 %s 同步。"
 
-#: drakclock:127 drakdvb:149 logdrake:175 scannerdrake:491
+#: drakclock:133 drakdvb:149 logdrake:175 scannerdrake:489
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: drakclock:128
+#: drakclock:134
 #, c-format
 msgid "Retry"
 msgstr "重试"
 
-#: drakclock:151 drakclock:161
+#: drakclock:161 drakclock:171
 #, c-format
 msgid "Reset"
 msgstr "重置"
@@ -440,10 +442,10 @@ msgstr "%s 已经存在，其内容将丢失"
 msgid "Could not get the list of available channels"
 msgstr "无法获得可用频道的列表"
 
-#: drakdvb:80 draksec:73 drakups:99 finish-install:105 harddrake2:381
-#: scannerdrake:66 scannerdrake:70 scannerdrake:78 scannerdrake:319
-#: scannerdrake:368 scannerdrake:504 scannerdrake:508 scannerdrake:530
-#: service_harddrake:412
+#: drakdvb:80 draksec:69 drakups:99 finish-install:109 harddrake2:378
+#: scannerdrake:64 scannerdrake:68 scannerdrake:76 scannerdrake:317
+#: scannerdrake:366 scannerdrake:502 scannerdrake:506 scannerdrake:528
+#: service_harddrake:416
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -453,7 +455,7 @@ msgstr "请稍候"
 msgid "Detecting DVB channels, this will take a few minutes"
 msgstr "正在检测 DVB 频道，这一过程将持续几分钟"
 
-#: drakdvb:85 drakfont:571 drakfont:651 drakfont:735 drakups:217 logdrake:175
+#: drakdvb:85 drakfont:572 drakfont:652 drakfont:736 drakups:217 logdrake:175
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -532,8 +534,8 @@ msgstr "找不到字体"
 msgid "parse all fonts"
 msgstr "分析所有字体"
 
-#: drakfont:222 drakfont:263 drakfont:338 drakfont:379 drakfont:383
-#: drakfont:409 drakfont:427 drakfont:435
+#: drakfont:222 drakfont:263 drakfont:339 drakfont:380 drakfont:384
+#: drakfont:410 drakfont:428 drakfont:436
 #, c-format
 msgid "done"
 msgstr "完成"
@@ -563,47 +565,47 @@ msgstr "在安装记录中查找字体"
 msgid "%s fonts conversion"
 msgstr "%s 字体转换"
 
-#: drakfont:336
+#: drakfont:337
 #, c-format
 msgid "Fonts copy"
 msgstr "复制字体"
 
-#: drakfont:339
+#: drakfont:340
 #, c-format
 msgid "True Type fonts installation"
 msgstr "TrueType 字体安装"
 
-#: drakfont:347
+#: drakfont:348
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "正在运行 ttmkfdir, 请稍候..."
 
-#: drakfont:348
+#: drakfont:349
 #, c-format
 msgid "True Type install done"
 msgstr "TrueType 字体安装完成"
 
-#: drakfont:354 drakfont:369
+#: drakfont:355 drakfont:370
 #, c-format
 msgid "type1inst building"
 msgstr "正在构造 type1inst"
 
-#: drakfont:363
+#: drakfont:364
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostscript 引用"
 
-#: drakfont:380
+#: drakfont:381
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "删除临时文件"
 
-#: drakfont:425 drakfont:431
+#: drakfont:426 drakfont:432
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "删除字体文件"
 
-#: drakfont:439
+#: drakfont:440
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -616,199 +618,194 @@ msgstr ""
 "\n"
 "通常字体安装可以正常进行。但有罕见的例外, 有问题的字体会使 X 挂住。"
 
-#: drakfont:478
+#: drakfont:479
 #, c-format
 msgid "Font Installation"
 msgstr "字体安装"
 
-#: drakfont:489
+#: drakfont:490
 #, c-format
 msgid "DrakFont"
 msgstr "Drak 字体"
 
-#: drakfont:490 drakfont:641
+#: drakfont:491 drakfont:642
 #, c-format
 msgid "Font List"
 msgstr "字体列表"
 
-#: drakfont:493
+#: drakfont:494
 #, c-format
 msgid "Get Windows Fonts"
 msgstr "获得 Windows 字体"
 
-#: drakfont:499
+#: drakfont:500
 #, c-format
 msgid "About"
 msgstr "关于"
 
-#: drakfont:500 drakfont:540
+#: drakfont:501 drakfont:541
 #, c-format
 msgid "Options"
 msgstr "选项"
 
-#: drakfont:501 drakfont:720
+#: drakfont:502 drakfont:721
 #, c-format
 msgid "Uninstall"
 msgstr "卸载"
 
-#: drakfont:502
+#: drakfont:503
 #, c-format
 msgid "Import"
 msgstr "导入"
 
-#: drakfont:520
+#: drakfont:521
 #, c-format
 msgid "Drakfont"
 msgstr "Drakfont"
 
-#: drakfont:522 harddrake2:237
+#: drakfont:523 harddrake2:234
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "版权 (C) %s Mageia"
 
-#: drakfont:522 drakfont:526 harddrake2:241
-#, fuzzy, c-format
-msgid "Mageia"
-msgstr "Mageia"
-
-#: drakfont:524
+#: drakfont:525
 #, c-format
 msgid "Font installer."
 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:532 harddrake2:245
+#: drakfont:533 harddrake2:242
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: drakfont:542
+#: drakfont:543
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "请选择要支持字体的应用程序: "
 
-#: drakfont:553
+#: drakfont:554
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: drakfont:554
+#: drakfont:555
 #, c-format
 msgid "LibreOffice"
 msgstr ""
 
-#: drakfont:555
+#: drakfont:556
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: drakfont:556
+#: drakfont:557
 #, c-format
 msgid "Generic Printers"
 msgstr "通用打印机"
 
-#: drakfont:561 drakfont:571 drakups:210
+#: drakfont:562 drakfont:572 drakups:210
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: drakfont:570
+#: drakfont:571
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "选择字体文件或目录, 然后单击“添加”"
 
-#: drakfont:571
+#: drakfont:572
 #, c-format
 msgid "File Selection"
 msgstr "选择文件"
 
-#: drakfont:575
+#: drakfont:576
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: drakfont:639 draksec:166
+#: drakfont:640 draksec:162
 #, c-format
 msgid "Import fonts"
 msgstr "导入字体"
 
-#: drakfont:645 drakups:299 drakups:361 drakups:381
+#: drakfont:646 drakups:299 drakups:375
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: drakfont:646 drakfont:734 drakups:301 drakups:363 drakups:383
+#: drakfont:647 drakfont:735 drakups:301 drakups:377
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: drakfont:652
+#: drakfont:653
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: drakfont:683
+#: drakfont:684
 #, c-format
 msgid "Are you sure you want to uninstall the following fonts?"
 msgstr "您确定想要卸载下列字体吗?"
 
-#: drakfont:687 draksec:60 harddrake2:326
+#: drakfont:688 draksec:59 harddrake2:323
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: drakfont:689 draksec:59 harddrake2:327
+#: drakfont:690 draksec:58 harddrake2:324
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: drakfont:728
+#: drakfont:729
 #, c-format
 msgid "Unselect All"
 msgstr "全部不选"
 
-#: drakfont:731
+#: drakfont:732
 #, c-format
 msgid "Select All"
 msgstr "全部选中"
 
-#: drakfont:748
+#: drakfont:749
 #, c-format
 msgid "Importing fonts"
 msgstr "导入字体"
 
-#: drakfont:752 drakfont:772
+#: drakfont:753 drakfont:773
 #, c-format
 msgid "Initial tests"
 msgstr "初始测试"
 
-#: drakfont:753
+#: drakfont:754
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "复制系统中的字体"
 
-#: drakfont:754
+#: drakfont:755
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "安装并转换字体"
 
-#: drakfont:755
+#: drakfont:756
 #, c-format
 msgid "Post Install"
 msgstr "安装后的设置"
 
-#: drakfont:767
+#: drakfont:768
 #, c-format
 msgid "Removing fonts"
 msgstr "删除字体"
 
-#: drakfont:773
+#: drakfont:774
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "删除系统中的字体"
 
-#: drakfont:774
+#: drakfont:775
 #, c-format
 msgid "Post Uninstall"
 msgstr "删除后"
@@ -898,7 +895,7 @@ msgstr "用户"
 msgid "Group"
 msgstr "组"
 
-#: drakperm:50 drakperm:109 drakperm:332 draksec:181
+#: drakperm:50 drakperm:109 drakperm:332 draksec:177
 #, c-format
 msgid "Permissions"
 msgstr "权限"
@@ -973,7 +970,7 @@ msgstr "删除"
 msgid "Delete selected rule"
 msgstr "删除选中的规则"
 
-#: drakperm:128 drakups:300 drakups:362 drakups:382
+#: drakperm:128 drakups:300 drakups:376
 #, c-format
 msgid "Edit"
 msgstr "编辑"
@@ -1124,172 +1121,172 @@ msgstr "用户: %s"
 msgid "Group: %s"
 msgstr "组: %s"
 
-#: draksec:54
+#: draksec:53
 #, c-format
 msgid "ALL"
 msgstr "所有"
 
-#: draksec:55
+#: draksec:54
 #, c-format
 msgid "LOCAL"
 msgstr "本地"
 
-#: draksec:56
+#: draksec:55
 #, c-format
 msgid "NONE"
 msgstr "无"
 
-#: draksec:57
+#: draksec:56
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: draksec:58
+#: draksec:57
 #, c-format
 msgid "Ignore"
 msgstr "忽略"
 
-#: draksec:91
+#: draksec:87
 #, c-format
 msgid "Security Level and Checks"
 msgstr "安全级别和检查"
 
-#: draksec:114
+#: draksec:110
 #, fuzzy, c-format
 msgid "Configure authentication required to access %s tools"
 msgstr "配置访问 Mageia 工具所需的身份认证"
 
-#: draksec:117
+#: draksec:113
 #, c-format
 msgid "No password"
 msgstr "无密码"
 
-#: draksec:118
+#: draksec:114
 #, c-format
 msgid "Root password"
 msgstr "Root 密码"
 
-#: draksec:119
+#: draksec:115
 #, c-format
 msgid "User password"
 msgstr "用户密码"
 
-#: draksec:149 draksec:204
+#: draksec:145 draksec:200
 #, c-format
 msgid "Software Management"
 msgstr "软件管理"
 
-#: draksec:150
+#: draksec:146
 #, fuzzy, c-format
 msgid "%s Update"
 msgstr "Mageia 更新"
 
-#: draksec:151
+#: draksec:147
 #, c-format
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
-#: draksec:152
+#: draksec:148
 #, c-format
 msgid "Configure 3D Desktop effects"
 msgstr "配置三维桌面效果"
 
-#: draksec:153
+#: draksec:149
 #, c-format
 msgid "Graphical Server Configuration"
 msgstr "图形服务器配置"
 
-#: draksec:154
+#: draksec:150
 #, c-format
 msgid "Mouse Configuration"
 msgstr "鼠标配置"
 
-#: draksec:155
+#: draksec:151
 #, c-format
 msgid "Keyboard Configuration"
 msgstr "键盘配置"
 
-#: draksec:156
+#: draksec:152
 #, c-format
 msgid "UPS Configuration"
 msgstr "UPS 配置"
 
-#: draksec:157
+#: draksec:153
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: draksec:158
+#: draksec:154
 #, c-format
 msgid "Hosts definitions"
 msgstr "主机定义"
 
-#: draksec:159
+#: draksec:155
 #, c-format
 msgid "Network Center"
 msgstr "网络中心"
 
-#: draksec:160
+#: draksec:156
 #, c-format
 msgid "Wireless Network Roaming"
 msgstr "无线网络漫游"
 
-#: draksec:161
+#: draksec:157
 #, c-format
 msgid "VPN"
 msgstr "VPN"
 
-#: draksec:162
+#: draksec:158
 #, c-format
 msgid "Proxy Configuration"
 msgstr "代理服务器配置"
 
-#: draksec:163
+#: draksec:159
 #, c-format
 msgid "Connection Sharing"
 msgstr "连接共享"
 
-#: draksec:165
+#: draksec:161
 #, c-format
 msgid "Backups"
 msgstr "备份"
 
-#: draksec:167 logdrake:52
+#: draksec:163 logdrake:52
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: draksec:168
+#: draksec:164
 #, c-format
 msgid "Services"
 msgstr "服务"
 
-#: draksec:169
+#: draksec:165
 #, c-format
 msgid "Users"
 msgstr "用户"
 
-#: draksec:171
+#: draksec:167
 #, c-format
 msgid "Boot Configuration"
 msgstr "启动配置"
 
-#: draksec:205
+#: draksec:201
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: draksec:206
+#: draksec:202
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: draksec:207
+#: draksec:203
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: draksec:208
+#: draksec:204
 #, c-format
 msgid "Boot"
 msgstr "启动"
@@ -1373,7 +1370,7 @@ msgstr ""
 msgid "Autodetection"
 msgstr "自动检测"
 
-#: drakups:99 harddrake2:381
+#: drakups:99 harddrake2:378
 #, c-format
 msgid "Detection in progress"
 msgstr "检测进行中"
@@ -1513,7 +1510,7 @@ msgstr "级别"
 msgid "ACL name"
 msgstr "ACL 名称"
 
-#: drakups:297 finish-install:195
+#: drakups:297 finish-install:199
 #, c-format
 msgid "Password"
 msgstr "密码"
@@ -1554,42 +1551,42 @@ msgstr ""
 "\n"
 "http://www.mandarkelinux.com/zh_CN/hardware.php3"
 
-#: finish-install:57
+#: finish-install:60
 #, c-format
 msgid "Keyboard"
 msgstr "键盘"
 
-#: finish-install:58
+#: finish-install:61
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "请选择您使用的键盘布局。"
 
-#: finish-install:105
+#: finish-install:109
 #, c-format
 msgid "Testing your connection..."
 msgstr ""
 
-#: finish-install:193 finish-install:211 finish-install:223
+#: finish-install:197 finish-install:215 finish-install:228
 #, c-format
 msgid "Encrypted home partition"
 msgstr "加密的主分区"
 
-#: finish-install:193
+#: finish-install:197
 #, c-format
 msgid "Please enter a password for the %s user"
 msgstr "请输入 %s 用户的密码"
 
-#: finish-install:196
+#: finish-install:200
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: finish-install:211
+#: finish-install:215
 #, c-format
 msgid "Creating encrypted home partition"
 msgstr "创建加密的主分区"
 
-#: finish-install:223
+#: finish-install:228
 #, c-format
 msgid "Formatting encrypted home partition"
 msgstr "格式化加密的主分区"
@@ -2222,52 +2219,47 @@ msgstr "特性"
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: harddrake2:182 harddrake2:211 logdrake:80
+#: harddrake2:182 harddrake2:208 logdrake:80
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
 #: harddrake2:186
 #, c-format
-msgid "/Autodetect _printers"
-msgstr "/自动检测打印机(_P)"
-
-#: harddrake2:187
-#, c-format
 msgid "/Autodetect _modems"
 msgstr "/自动检测调制解调器(_M)"
 
-#: harddrake2:188
+#: harddrake2:187
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/自动检测 jaz 驱动器(_J)"
 
-#: harddrake2:189
+#: harddrake2:188
 #, c-format
 msgid "/Autodetect parallel _zip drives"
 msgstr "/自动检测并口 zip 驱动器(_Z)"
 
-#: harddrake2:193
+#: harddrake2:192
 #, c-format
 msgid "Hardware Configuration"
 msgstr "硬件配置"
 
-#: harddrake2:200
+#: harddrake2:199
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: harddrake2:213
+#: harddrake2:210
 #, c-format
 msgid "/_Fields description"
 msgstr "/域描述(_F)"
 
-#: harddrake2:215
+#: harddrake2:212
 #, c-format
 msgid "Harddrake help"
 msgstr "“Drak 硬件配置”帮助"
 
-#: harddrake2:216
+#: harddrake2:213
 #, c-format
 msgid ""
 "Description of the fields:\n"
@@ -2276,100 +2268,101 @@ msgstr ""
 "各个域的描述:\n"
 "\n"
 
-#: harddrake2:224
+#: harddrake2:221
 #, c-format
 msgid "Select a device!"
 msgstr "请选择设备！"
 
-#: harddrake2:224
+#: harddrake2:221
 #, 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 "只要您选中了设备, 您就能看到在右侧框架(“信息”)中显示的解释。"
 
-#: harddrake2:230
+#: harddrake2:227
 #, c-format
 msgid "/_Report Bug"
 msgstr "/故障报告(_R)"
 
-#: harddrake2:232
+#: harddrake2:229
 #, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: harddrake2:235
+#: harddrake2:232
 #, c-format
 msgid "Harddrake"
 msgstr "Drak 硬件配置"
 
-#: harddrake2:239
+#: harddrake2:236
 #, c-format
 msgid "This is HardDrake, a %s hardware configuration tool."
 msgstr "这是 HardDrake，%s 的硬件配置工具。"
 
-#: harddrake2:271
+#: harddrake2:268
 #, c-format
 msgid "Detected hardware"
 msgstr "检测到的硬件"
 
-#: harddrake2:274 scannerdrake:286
+#: harddrake2:271 scannerdrake:284
 #, c-format
 msgid "Information"
 msgstr "信息"
 
-#: harddrake2:276
+#: harddrake2:273
 #, c-format
 msgid "Set current driver options"
 msgstr "设定当前驱动程序选项"
 
-#: harddrake2:283
+#: harddrake2:280
 #, c-format
 msgid "Run config tool"
 msgstr "运行配置工具"
 
-#: harddrake2:303
+#: harddrake2:300
 #, c-format
 msgid ""
-"Click on a device in the tree on the left in order to display its information here."
+"Click on a device in the tree on the left in order to display its "
+"information here."
 msgstr "单击左侧树中的设备, 就可在此显示其信息。"
 
-#: harddrake2:324 notify-x11-free-driver-switch:13
+#: harddrake2:321 notify-x11-free-driver-switch:13
 #, c-format
 msgid "unknown"
 msgstr "未知"
 
-#: harddrake2:325
+#: harddrake2:322
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: harddrake2:345
+#: harddrake2:342
 #, c-format
 msgid "Misc"
 msgstr "杂项"
 
-#: harddrake2:429
+#: harddrake2:425
 #, c-format
 msgid "secondary"
 msgstr "次要"
 
-#: harddrake2:429
+#: harddrake2:425
 #, c-format
 msgid "primary"
 msgstr "主"
 
-#: harddrake2:433
+#: harddrake2:429
 #, c-format
 msgid "burner"
 msgstr "刻录机"
 
-#: harddrake2:433
+#: harddrake2:429
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: harddrake2:537
+#: harddrake2:533
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "下列软件包需要安装: \n"
@@ -2691,7 +2684,7 @@ msgstr "向导已经成功禁用了邮件提醒。"
 msgid "Save as.."
 msgstr "另存为..."
 
-#: notify-x11-free-driver-switch:18 service_harddrake:454
+#: notify-x11-free-driver-switch:18 service_harddrake:458
 #, c-format
 msgid "Display driver setup"
 msgstr ""
@@ -2706,7 +2699,7 @@ msgstr ""
 msgid "Reason: %s."
 msgstr ""
 
-#: scannerdrake:51
+#: scannerdrake:49
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -2717,117 +2710,117 @@ msgstr ""
 "\n"
 "您想要安装 SANE 软件包吗?"
 
-#: scannerdrake:55
+#: scannerdrake:53
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "终止 Drak 扫描仪。"
 
-#: scannerdrake:60
+#: scannerdrake:58
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr "无法安装用“Drak 扫描仪”设置扫描仪所需的软件包。"
 
-#: scannerdrake:61
+#: scannerdrake:59
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "“Drak 扫描仪”现在不会启动。"
 
-#: scannerdrake:67 scannerdrake:505
+#: scannerdrake:65 scannerdrake:503
 #, c-format
 msgid "Searching for configured scanners..."
 msgstr "正在搜索已配置的扫描仪..."
 
-#: scannerdrake:71 scannerdrake:509
+#: scannerdrake:69 scannerdrake:507
 #, c-format
 msgid "Searching for new scanners..."
 msgstr "正在搜索新的扫描仪..."
 
-#: scannerdrake:79 scannerdrake:531
+#: scannerdrake:77 scannerdrake:529
 #, c-format
 msgid "Re-generating list of configured scanners..."
 msgstr "正在重新生成已配置的扫描仪清单..."
 
-#: scannerdrake:101
+#: scannerdrake:99
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "%2$s 版本不支持 %1$s。"
 
-#: scannerdrake:104 scannerdrake:115
+#: scannerdrake:102 scannerdrake:113
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
 
-#: scannerdrake:104
+#: scannerdrake:102
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "发现 %s 连接在 %s 上, 是否自动配置它?"
 
-#: scannerdrake:116
+#: scannerdrake:114
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "扫描仪数据库中没有 %s, 要手工配置它吗?"
 
-#: scannerdrake:130
+#: scannerdrake:128
 #, c-format
 msgid "Scanner configuration"
 msgstr "扫描仪配置"
 
-#: scannerdrake:131
+#: scannerdrake:129
 #, c-format
 msgid "Select a scanner model (Detected model: %s, Port: %s)"
 msgstr "选择扫描仪型号(检测到的型号：%s，端口：%s)"
 
-#: scannerdrake:133
+#: scannerdrake:131
 #, c-format
 msgid "Select a scanner model (Detected model: %s)"
 msgstr "选择扫描仪型号(检测到的型号：%s)"
 
-#: scannerdrake:134
+#: scannerdrake:132
 #, c-format
 msgid "Select a scanner model (Port: %s)"
 msgstr "选择扫描仪型号(端口：%s)"
 
-#: scannerdrake:136 scannerdrake:139
+#: scannerdrake:134 scannerdrake:137
 #, c-format
 msgid " (UNSUPPORTED)"
 msgstr " (不支持)"
 
-#: scannerdrake:142
+#: scannerdrake:140
 #, c-format
 msgid "The %s is not supported under Linux."
 msgstr "%s 不支持 Linux。"
 
-#: scannerdrake:169 scannerdrake:183
+#: scannerdrake:167 scannerdrake:181
 #, c-format
 msgid "Do not install firmware file"
 msgstr "不安装固件文件"
 
-#: scannerdrake:172 scannerdrake:222
+#: scannerdrake:170 scannerdrake:220
 #, c-format
 msgid "Scanner Firmware"
 msgstr "扫描仪固件"
 
-#: scannerdrake:173 scannerdrake:225
+#: scannerdrake:171 scannerdrake:223
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr "很有可能您的 %s 需要每次它们启动时都上载它们的固件。"
 
-#: scannerdrake:174 scannerdrake:226
+#: scannerdrake:172 scannerdrake:224
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr "如果是这样的话, 您可以让它自动完成。"
 
-#: scannerdrake:175 scannerdrake:229
+#: scannerdrake:173 scannerdrake:227
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr "要这样做的话, 您需要提供您扫描仪的固件文件, 这样它就可以被安装了。"
 
-#: scannerdrake:176 scannerdrake:230
+#: scannerdrake:174 scannerdrake:228
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
@@ -2836,51 +2829,51 @@ msgstr ""
 "您可能需要在随同扫描仪的 CD 或者软盘、制造商的网站或者您的 Windows 分区中寻找"
 "它。"
 
-#: scannerdrake:178 scannerdrake:237
+#: scannerdrake:176 scannerdrake:235
 #, c-format
 msgid "Install firmware file from"
 msgstr "固件文件存放在"
 
-#: scannerdrake:180 scannerdrake:188 scannerdrake:239 scannerdrake:246
+#: scannerdrake:178 scannerdrake:186 scannerdrake:237 scannerdrake:244
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: scannerdrake:181 scannerdrake:190 scannerdrake:240 scannerdrake:248
+#: scannerdrake:179 scannerdrake:188 scannerdrake:238 scannerdrake:246
 #, c-format
 msgid "Floppy Disk"
 msgstr "软盘"
 
-#: scannerdrake:182 scannerdrake:192 scannerdrake:241 scannerdrake:250
+#: scannerdrake:180 scannerdrake:190 scannerdrake:239 scannerdrake:248
 #, c-format
 msgid "Other place"
 msgstr "其它位置"
 
-#: scannerdrake:198
+#: scannerdrake:196
 #, c-format
 msgid "Select firmware file"
 msgstr "选择固件文件"
 
-#: scannerdrake:201 scannerdrake:260
+#: scannerdrake:199 scannerdrake:258
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr "固件文件 %s 不存在或无法访问！"
 
-#: scannerdrake:224
+#: scannerdrake:222
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr "很有可能您的扫描仪需要每次它们启动时都上载它们的固件。"
 
-#: scannerdrake:228
+#: scannerdrake:226
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr "要这样做的话, 您需要提供您扫描仪的固件文件, 这样它就可以被安装了。"
 
-#: scannerdrake:231
+#: scannerdrake:229
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -2889,32 +2882,32 @@ msgstr ""
 "如果您已经安装了您扫描仪的固件, 您也可以通过在这里提供新固件的方式来升级固"
 "件。"
 
-#: scannerdrake:233
+#: scannerdrake:231
 #, c-format
 msgid "Install firmware for the"
 msgstr "选择要安装固件的扫描仪"
 
-#: scannerdrake:256
+#: scannerdrake:254
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "选择 %s 的固件文件"
 
-#: scannerdrake:274
+#: scannerdrake:272
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "无法安装 %s 的固件文件!"
 
-#: scannerdrake:287
+#: scannerdrake:285
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "您 %s 的固件文件已经成功安装。"
 
-#: scannerdrake:297
+#: scannerdrake:295
 #, c-format
 msgid "The %s is unsupported"
 msgstr "扫描仪 %s 不被支持"
 
-#: scannerdrake:302
+#: scannerdrake:300
 #, c-format
 msgid ""
 "The %s must be configured by system-config-printer.\n"
@@ -2924,47 +2917,47 @@ msgstr ""
 "这个 %s 必须使用“Drak 打印机”来配置。\n"
 "您可以在“%s 控制中心”的“硬件”部分打开“Drak 打印机”。"
 
-#: scannerdrake:320
+#: scannerdrake:318
 #, c-format
 msgid "Setting up kernel modules..."
 msgstr "正在设置内核模块..."
 
-#: scannerdrake:330 scannerdrake:337 scannerdrake:367
+#: scannerdrake:328 scannerdrake:335 scannerdrake:365
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "自动检测可用的端口"
 
-#: scannerdrake:331 scannerdrake:377
+#: scannerdrake:329 scannerdrake:375
 #, c-format
 msgid "Device choice"
 msgstr "设备选择"
 
-#: scannerdrake:332 scannerdrake:378
+#: scannerdrake:330 scannerdrake:376
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "请选择您的 %s 所连接的设备。"
 
-#: scannerdrake:333
+#: scannerdrake:331
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(注意: 并行端口无法自动检测)"
 
-#: scannerdrake:335 scannerdrake:380
+#: scannerdrake:333 scannerdrake:378
 #, c-format
 msgid "choose device"
 msgstr "选择设备"
 
-#: scannerdrake:369
+#: scannerdrake:367
 #, c-format
 msgid "Searching for scanners..."
 msgstr "正在搜索扫描仪..."
 
-#: scannerdrake:405 scannerdrake:412
+#: scannerdrake:403 scannerdrake:410
 #, c-format
 msgid "Attention!"
 msgstr "小心!"
 
-#: scannerdrake:406
+#: scannerdrake:404
 #, c-format
 msgid ""
 "Your %s cannot be configured fully automatically.\n"
@@ -2976,14 +2969,14 @@ msgstr ""
 "\n"
 "您需要手动调节。请自行编辑配置文件 /etc/sane.d/%s.conf。"
 
-#: scannerdrake:407 scannerdrake:416
+#: scannerdrake:405 scannerdrake:414
 #, c-format
 msgid ""
 "More info in the driver's manual page. Run the command \"man sane-%s\" to "
 "read it."
 msgstr "更多信息请参看驱动程序的手册页。运行“man sane-%s”可阅读。"
 
-#: scannerdrake:409 scannerdrake:418
+#: scannerdrake:407 scannerdrake:416
 #, fuzzy, c-format
 msgid ""
 "After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/"
@@ -2991,14 +2984,14 @@ msgid ""
 msgstr ""
 "此后您就可以从应用程序菜单的“多媒体/图像”中使用“XSane”或“%s”来扫描文档了。"
 
-#: scannerdrake:413
+#: scannerdrake:411
 #, c-format
 msgid ""
 "Your %s has been configured, but it is possible that additional manual "
 "adjustments are needed to get it to work. "
 msgstr "您的 %s 已经配置好了，但可能需要额外的手动调节才能正常工作。"
 
-#: scannerdrake:414
+#: scannerdrake:412
 #, c-format
 msgid ""
 "If it does not appear in the list of configured scanners in the main window "
@@ -3007,17 +3000,17 @@ msgstr ""
 "如果您没有在 ScannerDrake 主窗口的已配置扫描仪列表中找到它，或者无法正常工"
 "作，"
 
-#: scannerdrake:415
+#: scannerdrake:413
 #, c-format
 msgid "edit the configuration file /etc/sane.d/%s.conf. "
 msgstr "请编辑配置文件 /etc/sane.d/%s.conf。"
 
-#: scannerdrake:420
+#: scannerdrake:418
 #, c-format
 msgid "Congratulations!"
 msgstr "恭喜!"
 
-#: scannerdrake:421
+#: scannerdrake:419
 #, fuzzy, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -3027,7 +3020,7 @@ msgstr ""
 "您的 %s 已经配置好了。\n"
 "现在您可以从应用程序菜单的“多媒体/图像”中使用“XSane”或“%s”来扫描文档。"
 
-#: scannerdrake:446
+#: scannerdrake:444
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -3040,7 +3033,7 @@ msgstr ""
 "%s\n"
 "直接连接在您的系统。\n"
 
-#: scannerdrake:447
+#: scannerdrake:445
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -3053,52 +3046,52 @@ msgstr ""
 "%s\n"
 "直接连接在您的系统。\n"
 
-#: scannerdrake:449 scannerdrake:452
+#: scannerdrake:447 scannerdrake:450
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "没有发现扫描仪直接连接在您的机器上。\n"
 
-#: scannerdrake:460
+#: scannerdrake:458
 #, c-format
 msgid "Scanner Management"
 msgstr "扫描仪管理"
 
-#: scannerdrake:466
+#: scannerdrake:464
 #, c-format
 msgid "Search for new scanners"
 msgstr "搜索新扫描仪"
 
-#: scannerdrake:472
+#: scannerdrake:470
 #, c-format
 msgid "Add a scanner manually"
 msgstr "手动添加扫描仪"
 
-#: scannerdrake:479
+#: scannerdrake:477
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "安装/更新固件文件"
 
-#: scannerdrake:485
+#: scannerdrake:483
 #, c-format
 msgid "Scanner sharing"
 msgstr "扫描仪共享"
 
-#: scannerdrake:544 scannerdrake:709
+#: scannerdrake:542 scannerdrake:707
 #, c-format
 msgid "All remote machines"
 msgstr "全部远程计算机"
 
-#: scannerdrake:556 scannerdrake:859
+#: scannerdrake:554 scannerdrake:857
 #, c-format
 msgid "This machine"
 msgstr "本机"
 
-#: scannerdrake:595
+#: scannerdrake:593
 #, c-format
 msgid "Scanner Sharing"
 msgstr "扫描仪共享"
 
-#: scannerdrake:596
+#: scannerdrake:594
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -3107,102 +3100,102 @@ msgstr ""
 "您可以在此选择是否将连接到本机的扫描仪共享给远程计算机, 以及共享给哪些计算"
 "机。"
 
-#: scannerdrake:597
+#: scannerdrake:595
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr "您还可以在此决定是否要将远程的扫描仪自动安装为本机所用。"
 
-#: scannerdrake:600
+#: scannerdrake:598
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "此计算机上的扫描仪可共享给计算机"
 
-#: scannerdrake:602
+#: scannerdrake:600
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "在主机上共享扫描仪:"
 
-#: scannerdrake:607 scannerdrake:624
+#: scannerdrake:605 scannerdrake:622
 #, c-format
 msgid "No remote machines"
 msgstr "没有远程计算机"
 
-#: scannerdrake:616
+#: scannerdrake:614
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "在远程计算机上使用扫描仪"
 
-#: scannerdrake:619
+#: scannerdrake:617
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "在下列主机上使用扫描仪:"
 
-#: scannerdrake:646 scannerdrake:718 scannerdrake:868
+#: scannerdrake:644 scannerdrake:716 scannerdrake:866
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "共享本地扫描仪"
 
-#: scannerdrake:647
+#: scannerdrake:645
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr "下面是本地连接的扫描仪要开放的计算机:"
 
-#: scannerdrake:658 scannerdrake:808
+#: scannerdrake:656 scannerdrake:806
 #, c-format
 msgid "Add host"
 msgstr "添加主机"
 
-#: scannerdrake:664 scannerdrake:814
+#: scannerdrake:662 scannerdrake:812
 #, c-format
 msgid "Edit selected host"
 msgstr "编辑选中的主机"
 
-#: scannerdrake:673 scannerdrake:823
+#: scannerdrake:671 scannerdrake:821
 #, c-format
 msgid "Remove selected host"
 msgstr "删除选中的主机"
 
-#: scannerdrake:682 scannerdrake:832
+#: scannerdrake:680 scannerdrake:830
 #, c-format
 msgid "Done"
 msgstr "完成"
 
-#: scannerdrake:697 scannerdrake:705 scannerdrake:710 scannerdrake:756
-#: scannerdrake:847 scannerdrake:855 scannerdrake:860 scannerdrake:906
+#: scannerdrake:695 scannerdrake:703 scannerdrake:708 scannerdrake:754
+#: scannerdrake:845 scannerdrake:853 scannerdrake:858 scannerdrake:904
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "主机的名称/IP 地址:"
 
-#: scannerdrake:719 scannerdrake:869
+#: scannerdrake:717 scannerdrake:867
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr "选择本地扫描仪适用的网络或主机:"
 
-#: scannerdrake:730 scannerdrake:880
+#: scannerdrake:728 scannerdrake:878
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "您必须输入主机名或 IP 地址。\n"
 
-#: scannerdrake:741 scannerdrake:891
+#: scannerdrake:739 scannerdrake:889
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr "此主机已经位于列表中, 无法再次添加。\n"
 
-#: scannerdrake:796
+#: scannerdrake:794
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "远程扫描仪使用情况"
 
-#: scannerdrake:797
+#: scannerdrake:795
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "下面是要使用扫描仪的计算机:"
 
-#: scannerdrake:954
+#: scannerdrake:952
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -3213,72 +3206,72 @@ msgstr ""
 "\n"
 "您是否想要安装 saned 软件包?"
 
-#: scannerdrake:958 scannerdrake:962
+#: scannerdrake:956 scannerdrake:960
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "您的扫描仪将不会在网络上出现。"
 
-#: scannerdrake:961
+#: scannerdrake:959
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr "无法安装共享您的扫描仪所需的软件包。"
 
-#: service_harddrake:153
+#: service_harddrake:157
 #, fuzzy, c-format
 msgid "The graphics card '%s' is no longer supported by driver '%s'"
 msgstr "%2$s 版本不支持 %1$s。"
 
-#: service_harddrake:163
+#: service_harddrake:167
 #, c-format
 msgid "New release, reconfiguring X for %s"
 msgstr ""
 
-#: service_harddrake:254
+#: service_harddrake:258
 #, c-format
 msgid "The proprietary kernel driver was not found for X.org driver '%s'"
 msgstr ""
 
-#: service_harddrake:293
+#: service_harddrake:297
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "删除了一些“%s”类别的设备:\n"
 
-#: service_harddrake:294
+#: service_harddrake:298
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s 已删除\n"
 
-#: service_harddrake:297
+#: service_harddrake:301
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "添加了一些设备: %s\n"
 
-#: service_harddrake:298
+#: service_harddrake:302
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s 已添加\n"
 
-#: service_harddrake:386
+#: service_harddrake:390
 #, c-format
 msgid "Hardware changes in \"%s\" class (%s seconds to answer)"
 msgstr "在“%s”类别更改了硬件(还剩 %s 秒回答)"
 
-#: service_harddrake:387
+#: service_harddrake:391
 #, c-format
 msgid "Do you want to run the appropriate config tool?"
 msgstr "您想要运行相应的配置工具吗?"
 
-#: service_harddrake:412
+#: service_harddrake:416
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "硬件检测进行中"
 
-#: service_harddrake:433 service_harddrake:438
+#: service_harddrake:437 service_harddrake:442
 #, c-format
 msgid "Display driver issue"
 msgstr ""
 
-#: service_harddrake:434
+#: service_harddrake:438
 #, c-format
 msgid ""
 "The display driver currently configured requires you to use the 'nokmsboot' "
@@ -3287,7 +3280,7 @@ msgid ""
 "specified."
 msgstr ""
 
-#: service_harddrake:439
+#: service_harddrake:443
 #, c-format
 msgid ""
 "Detected a loaded display driver kernel module which conflicts with the "
@@ -3295,12 +3288,12 @@ msgid ""
 "fail."
 msgstr ""
 
-#: service_harddrake:454
+#: service_harddrake:458
 #, c-format
 msgid "The system has to be rebooted due to a display driver change."
 msgstr ""
 
-#: service_harddrake:455
+#: service_harddrake:459
 #, c-format
 msgid "Press Cancel within %d seconds to abort."
 msgstr ""
@@ -3326,12 +3319,18 @@ msgid "Hardware Configuration Tool"
 msgstr "硬件配置工具"
 
 #: ../menu/localedrake-user.desktop.in.h:1
+msgid "Regional Settings"
+msgstr "区域设置"
+
+#: ../menu/localedrake-user.desktop.in.h:2
 msgid "Language & country configuration"
 msgstr "语言和国家配置"
 
-#: ../menu/localedrake-user.desktop.in.h:2
-msgid "Regional Settings"
-msgstr "区域设置"
+#~ msgid "Verbose"
+#~ msgstr "详细"
+
+#~ msgid "/Autodetect _printers"
+#~ msgstr "/自动检测打印机(_P)"
 
 #~ msgid "Its GDB trace is:"
 #~ msgstr "GDB 跟踪在此："