- sync with code (especially for #1011)

- unbreak af.po

1 files changed, 197 insertions, 201 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index f1fa7daf5..89320da4e 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: zh_CN\n"
-"POT-Creation-Date: 2011-04-29 01:59+0200\n"
+"POT-Creation-Date: 2011-08-05 21:16+0200\n"
 "PO-Revision-Date: 2009-04-09 11:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -16,21 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: any.pm:258 any.pm:955 diskdrake/interactive.pm:648
+#: any.pm:270 any.pm:967 diskdrake/interactive.pm:648
 #: diskdrake/interactive.pm:871 diskdrake/interactive.pm:931
 #: diskdrake/interactive.pm:1033 diskdrake/interactive.pm:1263
 #: diskdrake/interactive.pm:1315 do_pkgs.pm:241 do_pkgs.pm:287
-#: harddrake/sound.pm:303 interactive.pm:587 pkgs.pm:285
+#: harddrake/sound.pm:270 interactive.pm:587 pkgs.pm:285
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: any.pm:258
+#: any.pm:270
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "启动引导程序安装中"
 
-#: any.pm:269
+#: any.pm:281
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -46,12 +46,12 @@ msgstr ""
 "\n"
 "要指定新卷 ID 吗?"
 
-#: any.pm:280
+#: any.pm:292
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "安装系统引导程序失败。出现下列错误:"
 
-#: any.pm:286
+#: any.pm:298
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -67,7 +67,7 @@ msgstr ""
 " 然后输入: shut-down\n"
 "您将在下次开机时看到引导程序提示。"
 
-#: any.pm:326
+#: any.pm:338
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -82,268 +82,268 @@ msgstr ""
 "\n"
 "您要用哪个硬盘启动?"
 
-#: any.pm:337
+#: any.pm:349
 #, c-format
 msgid "Bootloader Installation"
 msgstr "引导程序安装"
 
-#: any.pm:341
+#: any.pm:353
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:365
+#: any.pm:377
 #, c-format
 msgid "First sector (MBR) of drive %s"
 msgstr "驱动器 %s 的第一扇区(MBR)"
 
-#: any.pm:367
+#: any.pm:379
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "驱动器的第一扇区(MBR)"
 
-#: any.pm:369
+#: any.pm:381
 #, c-format
 msgid "First sector of the root partition"
 msgstr "根分区的第一扇区"
 
-#: any.pm:371
+#: any.pm:383
 #, c-format
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:373 pkgs.pm:281 ugtk2.pm:526
+#: any.pm:385 pkgs.pm:281 ugtk2.pm:526
 #, c-format
 msgid "Skip"
 msgstr "跳过"
 
-#: any.pm:408
+#: any.pm:420
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:418 any.pm:451 any.pm:452
+#: any.pm:430 any.pm:463 any.pm:464
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
-#: any.pm:422
+#: any.pm:434
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:423 any.pm:455
+#: any.pm:435 any.pm:467
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:426 any.pm:458
+#: any.pm:438 any.pm:470
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
 
-#: any.pm:429
+#: any.pm:441
 #, c-format
 msgid "Main options"
 msgstr "主选项"
 
-#: any.pm:430
+#: any.pm:442
 #, c-format
 msgid "Delay before booting default image"
 msgstr "启动默认映像前的延迟"
 
-#: any.pm:431
+#: any.pm:443
 #, c-format
 msgid "Enable ACPI"
 msgstr "启用 ACPI"
 
-#: any.pm:432
+#: any.pm:444
 #, c-format
 msgid "Enable SMP"
 msgstr "启用 SMP"
 
-#: any.pm:433
+#: any.pm:445
 #, c-format
 msgid "Enable APIC"
 msgstr "启用 APIC"
 
-#: any.pm:435
+#: any.pm:447
 #, c-format
 msgid "Enable Local APIC"
 msgstr "启用本地 APIC"
 
-#: any.pm:436 security/level.pm:51
+#: any.pm:448 security/level.pm:63
 #, c-format
 msgid "Security"
 msgstr "安全"
 
-#: any.pm:437 any.pm:890 any.pm:909 authentication.pm:252
+#: any.pm:449 any.pm:902 any.pm:921 authentication.pm:252
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "密码"
 
-#: any.pm:440 authentication.pm:263
+#: any.pm:452 authentication.pm:263
 #, c-format
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:440 authentication.pm:263 diskdrake/interactive.pm:1490
+#: any.pm:452 authentication.pm:263 diskdrake/interactive.pm:1490
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
 
-#: any.pm:442
+#: any.pm:454
 #, c-format
 msgid "You cannot use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:446 any.pm:893 any.pm:911 authentication.pm:253
+#: any.pm:458 any.pm:905 any.pm:923 authentication.pm:253
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: any.pm:447
+#: any.pm:459
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次启动时清除 /tmp"
 
-#: any.pm:457
+#: any.pm:469
 #, c-format
 msgid "Init Message"
 msgstr "初始信息"
 
-#: any.pm:459
+#: any.pm:471
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "开放固件延迟"
 
-#: any.pm:460
+#: any.pm:472
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心启动超时"
 
-#: any.pm:461
+#: any.pm:473
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允许 CD 启动?"
 
-#: any.pm:462
+#: any.pm:474
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "启用 OF 启动?"
 
-#: any.pm:463
+#: any.pm:475
 #, c-format
 msgid "Default OS?"
 msgstr "默认操作系统?"
 
-#: any.pm:536
+#: any.pm:548
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:537 any.pm:551
+#: any.pm:549 any.pm:563
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:538 any.pm:564
+#: any.pm:550 any.pm:576
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:540
+#: any.pm:552
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:542
+#: any.pm:554
 #, c-format
 msgid "Requires password to boot"
 msgstr ""
 
-#: any.pm:544
+#: any.pm:556
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:546
+#: any.pm:558
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:547
+#: any.pm:559
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:556 any.pm:561 any.pm:563 diskdrake/interactive.pm:407
+#: any.pm:568 any.pm:573 any.pm:575 diskdrake/interactive.pm:407
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:558 any.pm:566 harddrake/v4l.pm:438
+#: any.pm:570 any.pm:578 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:565
+#: any.pm:577
 #, c-format
 msgid "NoVideo"
 msgstr "无视频"
 
-#: any.pm:576
+#: any.pm:588
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:577
+#: any.pm:589
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:577
+#: any.pm:589
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:578
+#: any.pm:590
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:596
+#: any.pm:608
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:597
+#: any.pm:609
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:597
+#: any.pm:609
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其它操作系统(SunOS...)"
 
-#: any.pm:598
+#: any.pm:610
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其它操作系统(MacOS...)"
 
-#: any.pm:598
+#: any.pm:610
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:645
+#: any.pm:657
 #, c-format
 msgid "Bootloader Configuration"
 msgstr "引导程序配置"
 
-#: any.pm:646
+#: any.pm:658
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -352,194 +352,194 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:851
+#: any.pm:863
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:852
+#: any.pm:864
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:853
+#: any.pm:865
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:854
+#: any.pm:866
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:855
+#: any.pm:867
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:856
+#: any.pm:868
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:862
+#: any.pm:874
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:868
+#: any.pm:880
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:869
+#: any.pm:881
 #, c-format
 msgid ""
 "The user name must start with a lower case letter followed by only lower "
 "cased letters, numbers, `-' and `_'"
 msgstr "用户名只能包含小写字母、数字、“-”和“_”"
 
-#: any.pm:870
+#: any.pm:882
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:871
+#: any.pm:883
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:877 any.pm:913
+#: any.pm:889 any.pm:925
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:877 any.pm:914
+#: any.pm:889 any.pm:926
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:878
+#: any.pm:890
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:879
+#: any.pm:891
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s 应该大于 500。仍然接受吗？"
 
-#: any.pm:883
+#: any.pm:895
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:888
+#: any.pm:900
 #, c-format
 msgid "Enable guest account"
 msgstr ""
 
-#: any.pm:889 authentication.pm:239
+#: any.pm:901 authentication.pm:239
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:895
+#: any.pm:907
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:897
+#: any.pm:909
 #, c-format
 msgid "Icon"
 msgstr "图标"
 
-#: any.pm:900
+#: any.pm:912
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:907
+#: any.pm:919
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:912
+#: any.pm:924
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:955
+#: any.pm:967
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: any.pm:985 security/l10n.pm:14
+#: any.pm:997 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:986
+#: any.pm:998
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:987
+#: any.pm:999
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:988
+#: any.pm:1000
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:989
+#: any.pm:1001
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:1000 any.pm:1020 any.pm:1088
+#: any.pm:1012 any.pm:1032 any.pm:1100
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:1027 any.pm:1376 interactive/gtk.pm:819
+#: any.pm:1039 any.pm:1388 interactive/gtk.pm:819
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:1074
+#: any.pm:1086
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:1076 diskdrake/dav.pm:26
+#: any.pm:1088 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:1083
+#: any.pm:1095
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "您接受此许可协议吗?"
 
-#: any.pm:1084
+#: any.pm:1096
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:1084
+#: any.pm:1096
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:1110 any.pm:1172
+#: any.pm:1122 any.pm:1184
 #, c-format
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
-#: any.pm:1138
+#: any.pm:1150
 #, fuzzy, c-format
 msgid ""
 "%s can support multiple languages. Select\n"
@@ -549,82 +549,82 @@ msgstr ""
 "Mageia 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:1140 fs/partitioning_wizard.pm:172
+#: any.pm:1152 fs/partitioning_wizard.pm:172
 #, c-format
 msgid "Mageia"
 msgstr ""
 
-#: any.pm:1141
-#, c-format
-msgid "Multi languages"
+#: any.pm:1153
+#, fuzzy, c-format
+msgid "Multiple languages"
 msgstr "多语言"
 
-#: any.pm:1150 any.pm:1181
+#: any.pm:1162 any.pm:1193
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:1151
+#: any.pm:1163
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1173
+#: any.pm:1185
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:1227
+#: any.pm:1239
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1228
+#: any.pm:1240
 #, c-format
 msgid "Please choose your country"
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1230
+#: any.pm:1242
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1231
+#: any.pm:1243
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1231 interactive.pm:488 interactive/gtk.pm:445
+#: any.pm:1243 interactive.pm:488 interactive/gtk.pm:445
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1237
+#: any.pm:1249
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1240
+#: any.pm:1252
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1321
+#: any.pm:1333
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1321
+#: any.pm:1333
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1321
+#: any.pm:1333
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1325
+#: any.pm:1337
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -637,32 +637,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1337
+#: any.pm:1349
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1340
+#: any.pm:1352
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr "SMB: Windows、MacOS X 和其它现代 Linux 系统所用的文件共享系统。"
 
-#: any.pm:1348
+#: any.pm:1360
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1376
+#: any.pm:1388
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1378
+#: any.pm:1390
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -671,54 +671,54 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1485
+#: any.pm:1498
 #, c-format
 msgid ""
 "You need to logout and back in again for changes to take effect. Press OK to "
 "logout now."
 msgstr "您需要注销后重新登录才能让更改生效。单击确定立即注销。"
 
-#: any.pm:1489
+#: any.pm:1502
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1524
+#: any.pm:1537
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1524
+#: any.pm:1537
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1547 any.pm:1549
+#: any.pm:1560 any.pm:1562
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1550
+#: any.pm:1563
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1554
+#: any.pm:1567
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1555
+#: any.pm:1568
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1557
+#: any.pm:1570
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1558
+#: any.pm:1571
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -1044,7 +1044,7 @@ msgid "Domain Admin Password"
 msgstr "域管理员密码"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:994
+#: bootloader.pm:982
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1059,56 +1059,56 @@ msgstr ""
 "wait for default boot.\n"
 "\n"
 
-#: bootloader.pm:1171
+#: bootloader.pm:1159
 #, c-format
 msgid "LILO with text menu"
 msgstr "文本菜单 LILO"
 
-#: bootloader.pm:1172
+#: bootloader.pm:1160
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1173
+#: bootloader.pm:1161
 #, c-format
 msgid "GRUB with text menu"
 msgstr "文本菜单 GRUB"
 
-#: bootloader.pm:1174
+#: bootloader.pm:1162
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1175
+#: bootloader.pm:1163
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:1259
+#: bootloader.pm:1247
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:1985
+#: bootloader.pm:1973
 #, c-format
 msgid "You cannot install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:2106
+#: bootloader.pm:2094
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:2119
+#: bootloader.pm:2107
 #, c-format
 msgid ""
 "The bootloader cannot be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:2120
+#: bootloader.pm:2108
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -1248,7 +1248,7 @@ msgstr "URL 应该是以 http:// 或 https:// 开头"
 #: diskdrake/interactive.pm:1031 diskdrake/interactive.pm:1073
 #: diskdrake/interactive.pm:1074 diskdrake/interactive.pm:1300
 #: diskdrake/interactive.pm:1338 diskdrake/interactive.pm:1489 do_pkgs.pm:19
-#: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:77 harddrake/sound.pm:442
+#: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:77 harddrake/sound.pm:399
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -2373,22 +2373,22 @@ msgstr "卸载 %s 出错: %s"
 msgid "Enabling swap partition %s"
 msgstr "正在启用 swap 分区 %s"
 
-#: fs/mount_options.pm:112
+#: fs/mount_options.pm:113
 #, c-format
 msgid "Enable POSIX Access Control Lists"
 msgstr ""
 
-#: fs/mount_options.pm:114
+#: fs/mount_options.pm:115
 #, c-format
 msgid "Flush write cache on file close"
 msgstr "关闭文件时清空缓存"
 
-#: fs/mount_options.pm:116
+#: fs/mount_options.pm:117
 #, c-format
 msgid "Enable group disk quota accounting and optionally enforce limits"
 msgstr "启用群组磁盘配额记账及可选强制限制"
 
-#: fs/mount_options.pm:118
+#: fs/mount_options.pm:119
 #, c-format
 msgid ""
 "Do not update inode access times on this filesystem\n"
@@ -2397,7 +2397,7 @@ msgstr ""
 "不在此文件系统更新 inode 访问次数\n"
 "(例如, 为了加速对新闻服务器的新闻池的访问)"
 
-#: fs/mount_options.pm:121
+#: fs/mount_options.pm:122
 #, c-format
 msgid ""
 "Update inode access times on this filesystem in a more efficient way\n"
@@ -2406,7 +2406,7 @@ msgstr ""
 "以更有效的方式更新文件系统中的 inode 访问次数\n"
 "(例如, 为了加速对新闻服务器的新闻池的访问)。"
 
-#: fs/mount_options.pm:124
+#: fs/mount_options.pm:125
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2415,12 +2415,12 @@ msgstr ""
 "只能显式装载。\n"
 "(即, -a 选项将不会装载文件系统)"
 
-#: fs/mount_options.pm:127
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Do not interpret character or block special devices on the filesystem."
 msgstr "不解释文件系统中的字符或特殊块设备。"
 
-#: fs/mount_options.pm:129
+#: fs/mount_options.pm:130
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2431,7 +2431,7 @@ msgstr ""
 "此选项对于特定服务器可能非常有用, 比如服务器所包含的文件系统中包含其它\n"
 "架构的二进制文件。"
 
-#: fs/mount_options.pm:133
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2441,42 +2441,42 @@ msgstr ""
 "不允许 set-user-identifier 或 set-group-identifier 位生效。\n"
 "(这可能比较安全, 如果您安装了 suidperl(1) 则不太安全。)"
 
-#: fs/mount_options.pm:137
+#: fs/mount_options.pm:138
 #, c-format
 msgid "Mount the filesystem read-only."
 msgstr "以只读装载文件系统。"
 
-#: fs/mount_options.pm:139
+#: fs/mount_options.pm:140
 #, c-format
 msgid "All I/O to the filesystem should be done synchronously."
 msgstr "所有到文件系统的输入/输出都应该是同步完成的。"
 
-#: fs/mount_options.pm:141
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Allow every user to mount and umount the filesystem."
 msgstr "允许每个用户挂载和卸载文件系统。"
 
-#: fs/mount_options.pm:143
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Allow an ordinary user to mount the filesystem."
 msgstr "允许普通用户挂载文件系统。"
 
-#: fs/mount_options.pm:145
+#: fs/mount_options.pm:146
 #, c-format
 msgid "Enable user disk quota accounting, and optionally enforce limits"
 msgstr "启用用户磁盘配额记账及可选强制限制"
 
-#: fs/mount_options.pm:147
+#: fs/mount_options.pm:148
 #, c-format
 msgid "Support \"user.\" extended attributes"
 msgstr "支持“user.”扩展属性"
 
-#: fs/mount_options.pm:149
+#: fs/mount_options.pm:150
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "给普通用户以写权限"
 
-#: fs/mount_options.pm:151
+#: fs/mount_options.pm:152
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "给普通用户以只读权限"
@@ -3118,59 +3118,49 @@ msgstr "未知/其它"
 msgid "cpu # "
 msgstr "CPU # "
 
-#: harddrake/sound.pm:303
+#: harddrake/sound.pm:270
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "请稍候...正在应用配置"
 
-#: harddrake/sound.pm:366
+#: harddrake/sound.pm:331
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "启用 PulseAudio"
 
-#: harddrake/sound.pm:370
-#, c-format
-msgid "Enable 5.1 sound with Pulse Audio"
-msgstr "启用 Pulse Audio 的5.1声道"
-
-#: harddrake/sound.pm:375
-#, c-format
-msgid "Enable user switching for audio applications"
-msgstr "让用户能选择音频程序"
-
-#: harddrake/sound.pm:379
+#: harddrake/sound.pm:336
 #, c-format
 msgid "Use Glitch-Free mode"
 msgstr "使用无干扰模式"
 
-#: harddrake/sound.pm:385
+#: harddrake/sound.pm:342
 #, c-format
 msgid "Reset sound mixer to default values"
 msgstr "将混音器重置为默认值"
 
-#: harddrake/sound.pm:390
+#: harddrake/sound.pm:347
 #, c-format
 msgid "Troubleshooting"
 msgstr "疑难解答"
 
-#: harddrake/sound.pm:397
+#: harddrake/sound.pm:354
 #, c-format
 msgid "No alternative driver"
 msgstr "没有替代的驱动程序"
 
-#: harddrake/sound.pm:398
+#: harddrake/sound.pm:355
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr "没有已知的 OSS/ALSA 替代驱动程序可以用在您的声卡(%s)上, 现正使用“%s”"
 
-#: harddrake/sound.pm:405
+#: harddrake/sound.pm:362
 #, c-format
 msgid "Sound configuration"
 msgstr "声音配置"
 
-#: harddrake/sound.pm:407
+#: harddrake/sound.pm:364
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3181,7 +3171,7 @@ msgstr ""
 #. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
-#: harddrake/sound.pm:412
+#: harddrake/sound.pm:369
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3193,7 +3183,7 @@ msgstr ""
 "\n"
 "您的声卡现在正在使用 %s“%s”驱动程序(其默认驱动程序为“%s”)"
 
-#: harddrake/sound.pm:414
+#: harddrake/sound.pm:371
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3225,12 +3215,12 @@ msgstr ""
 "- 与旧的 OSS 兼容的 API\n"
 "- 新的 ALSA API 带来许多增强特性, 但这需要使用 ALSA 库。\n"
 
-#: harddrake/sound.pm:428 harddrake/sound.pm:511
+#: harddrake/sound.pm:385 harddrake/sound.pm:468
 #, c-format
 msgid "Driver:"
 msgstr "驱动程序: "
 
-#: harddrake/sound.pm:442
+#: harddrake/sound.pm:399
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3245,12 +3235,12 @@ msgstr ""
 "\n"
 "新的“%s”驱动程序仅会在下此启动时使用。"
 
-#: harddrake/sound.pm:450
+#: harddrake/sound.pm:407
 #, c-format
 msgid "No open source driver"
 msgstr "没有开放源代码的驱动程序"
 
-#: harddrake/sound.pm:451
+#: harddrake/sound.pm:408
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3259,23 +3249,23 @@ msgstr ""
 "没有已知的 OSS/ALSA 替代驱动程序可以用在您的(%s)声卡上, 不过在“%s”有一个专有"
 "的驱动程序。"
 
-#: harddrake/sound.pm:454
+#: harddrake/sound.pm:411
 #, c-format
 msgid "No known driver"
 msgstr "没有已知驱动程序"
 
-#: harddrake/sound.pm:455
+#: harddrake/sound.pm:412
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "没有已知的驱动程序可以用在您的声卡(%s)上"
 
-#: harddrake/sound.pm:470
+#: harddrake/sound.pm:427
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "声音疑难解决"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:473
+#: harddrake/sound.pm:430
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3315,18 +3305,18 @@ msgstr ""
 "\n"
 "- “/sbin/fuser -v /dev/dsp”将会告诉您哪个程序使用声卡。\n"
 
-#: harddrake/sound.pm:500
+#: harddrake/sound.pm:457
 #, c-format
 msgid "Let me pick any driver"
 msgstr "让我挑选任意驱动"
 
-#: harddrake/sound.pm:503
+#: harddrake/sound.pm:460
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "选择其它驱动"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:506
+#: harddrake/sound.pm:463
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -5883,7 +5873,7 @@ msgstr "标准"
 msgid "Secure"
 msgstr "安全"
 
-#: security/level.pm:40
+#: security/level.pm:52
 #, c-format
 msgid ""
 "This level is to be used with care, as it disables all additional security\n"
@@ -5895,7 +5885,7 @@ msgstr ""
 "自\n"
 "行维护系统安全时才使用此级别。"
 
-#: security/level.pm:43
+#: security/level.pm:55
 #, c-format
 msgid ""
 "This is the standard security recommended for a computer that will be used "
@@ -5904,7 +5894,7 @@ msgstr ""
 "标准安全级别: \n"
 "推荐在作为客户连接互联网的电脑上使用。"
 
-#: security/level.pm:44
+#: security/level.pm:56
 #, c-format
 msgid ""
 "With this security level, the use of this system as a server becomes "
@@ -5918,28 +5908,28 @@ msgstr ""
 "拥有足够的安全性, 系统可以作为服务器接受来自众多客户的连接。注意: 如果您的机"
 "器不在互联网上提供服务, 请选择一个较低级别。"
 
-#: security/level.pm:51
+#: security/level.pm:63
 #, c-format
 msgid "DrakSec Basic Options"
 msgstr "“Drak 安全管理”基本选项"
 
-#: security/level.pm:54
+#: security/level.pm:66
 #, c-format
 msgid "Please choose the desired security level"
 msgstr "请选择期望的安全级别"
 
 #. -PO: this string is used to properly format "<security level>: <level description>"
-#: security/level.pm:58
+#: security/level.pm:70
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: security/level.pm:61
+#: security/level.pm:73
 #, c-format
 msgid "Security Administrator:"
 msgstr "安全管理员:"
 
-#: security/level.pm:62
+#: security/level.pm:74
 #, c-format
 msgid "Login or email:"
 msgstr "登录名或电子邮件:"
@@ -6838,6 +6828,12 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid "Enable 5.1 sound with Pulse Audio"
+#~ msgstr "启用 Pulse Audio 的5.1声道"
+
+#~ msgid "Enable user switching for audio applications"
+#~ msgstr "让用户能选择音频程序"
+
 #~ msgid ""
 #~ "Most of these components, but excluding the applications and software "
 #~ "provided by Google Inc. or \n"