sync translations with code

1 files changed, 226 insertions, 249 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index d8b5f5783..8809bb263 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-01-02 14:54+0100\n"
+"POT-Creation-Date: 2016-02-09 00:37+0100\n"
 "PO-Revision-Date: 2015-02-13 05:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: any.pm:262 any.pm:970 diskdrake/interactive.pm:642
-#: diskdrake/interactive.pm:866 diskdrake/interactive.pm:928
-#: diskdrake/interactive.pm:1046 diskdrake/interactive.pm:1278
-#: diskdrake/interactive.pm:1336 do_pkgs.pm:342 do_pkgs.pm:387
-#: harddrake/sound.pm:77 interactive.pm:712 pkgs.pm:293
+#: any.pm:262 any.pm:970 diskdrake/interactive.pm:646
+#: diskdrake/interactive.pm:870 diskdrake/interactive.pm:932
+#: diskdrake/interactive.pm:1050 diskdrake/interactive.pm:1282
+#: diskdrake/interactive.pm:1340 do_pkgs.pm:342 do_pkgs.pm:387
+#: interactive.pm:712 pkgs.pm:293
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -176,7 +176,7 @@ msgstr "密码"
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:427 authentication.pm:260 diskdrake/interactive.pm:1502
+#: any.pm:427 authentication.pm:260 diskdrake/interactive.pm:1509
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
@@ -1002,51 +1002,51 @@ msgstr ""
 "wait for default boot.\n"
 "\n"
 
-#: bootloader.pm:1277
+#: bootloader.pm:1278
 #, c-format
 msgid "LILO with text menu"
 msgstr "文本菜单 LILO"
 
-#: bootloader.pm:1278
+#: bootloader.pm:1279
 #, c-format
 msgid "GRUB2 with graphical menu"
 msgstr ""
 
-#: bootloader.pm:1279
+#: bootloader.pm:1280
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1280
+#: bootloader.pm:1281
 #, c-format
 msgid "GRUB with text menu"
 msgstr "文本菜单 GRUB"
 
-#: bootloader.pm:1335
+#: bootloader.pm:1336
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:2122
+#: bootloader.pm:2123
 #, c-format
 msgid "You cannot install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:2297
+#: bootloader.pm:2298
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:2310
+#: bootloader.pm:2311
 #, c-format
 msgid ""
 "The bootloader cannot be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:2311
+#: bootloader.pm:2312
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -1130,15 +1130,15 @@ msgid "Server"
 msgstr "服务器"
 
 #: diskdrake/dav.pm:67 diskdrake/interactive.pm:408
-#: diskdrake/interactive.pm:719 diskdrake/interactive.pm:737
-#: diskdrake/interactive.pm:741 diskdrake/removable.pm:23
+#: diskdrake/interactive.pm:723 diskdrake/interactive.pm:741
+#: diskdrake/interactive.pm:745 diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "挂载点"
 
 #: diskdrake/dav.pm:68 diskdrake/interactive.pm:410
-#: diskdrake/interactive.pm:1173 diskdrake/removable.pm:24
+#: diskdrake/interactive.pm:1177 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
@@ -1155,14 +1155,14 @@ msgstr "删除"
 msgid "Done"
 msgstr "完成"
 
-#: diskdrake/dav.pm:79 diskdrake/hd_gtk.pm:146 diskdrake/hd_gtk.pm:320
+#: diskdrake/dav.pm:79 diskdrake/hd_gtk.pm:146 diskdrake/hd_gtk.pm:321
 #: diskdrake/interactive.pm:245 diskdrake/interactive.pm:258
-#: diskdrake/interactive.pm:456 diskdrake/interactive.pm:527
-#: diskdrake/interactive.pm:545 diskdrake/interactive.pm:550
-#: diskdrake/interactive.pm:709 diskdrake/interactive.pm:1012
-#: diskdrake/interactive.pm:1064 diskdrake/interactive.pm:1221
-#: diskdrake/interactive.pm:1234 diskdrake/interactive.pm:1237
-#: diskdrake/interactive.pm:1502 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:49
+#: diskdrake/interactive.pm:456 diskdrake/interactive.pm:531
+#: diskdrake/interactive.pm:549 diskdrake/interactive.pm:554
+#: diskdrake/interactive.pm:713 diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1068 diskdrake/interactive.pm:1225
+#: diskdrake/interactive.pm:1238 diskdrake/interactive.pm:1241
+#: diskdrake/interactive.pm:1509 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:49
 #: do_pkgs.pm:54 do_pkgs.pm:79 do_pkgs.pm:103 do_pkgs.pm:108 do_pkgs.pm:142
 #: fsedit.pm:256 interactive/http.pm:117 interactive/http.pm:118
 #: modules/interactive.pm:19 scanner.pm:94 scanner.pm:105 scanner.pm:112
@@ -1181,12 +1181,12 @@ msgstr "请输入 WebDAV 服务器的 URL"
 msgid "The URL must begin with http:// or https://"
 msgstr "URL 应该是以 http:// 或 https:// 开头"
 
-#: diskdrake/dav.pm:107 diskdrake/hd_gtk.pm:455 diskdrake/interactive.pm:304
-#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:597
-#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:877
-#: diskdrake/interactive.pm:1044 diskdrake/interactive.pm:1086
-#: diskdrake/interactive.pm:1087 diskdrake/interactive.pm:1321
-#: diskdrake/interactive.pm:1359 diskdrake/interactive.pm:1501 do_pkgs.pm:45
+#: diskdrake/dav.pm:107 diskdrake/hd_gtk.pm:456 diskdrake/interactive.pm:304
+#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:601
+#: diskdrake/interactive.pm:816 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:1048 diskdrake/interactive.pm:1090
+#: diskdrake/interactive.pm:1091 diskdrake/interactive.pm:1325
+#: diskdrake/interactive.pm:1363 diskdrake/interactive.pm:1508 do_pkgs.pm:45
 #: do_pkgs.pm:74 do_pkgs.pm:100 do_pkgs.pm:137
 #, c-format
 msgid "Warning"
@@ -1203,12 +1203,12 @@ msgid "Server: "
 msgstr "服务器: "
 
 #: diskdrake/dav.pm:126 diskdrake/interactive.pm:501
-#: diskdrake/interactive.pm:1383 diskdrake/interactive.pm:1462
+#: diskdrake/interactive.pm:1387 diskdrake/interactive.pm:1469
 #, c-format
 msgid "Mount point: "
 msgstr "挂载点: "
 
-#: diskdrake/dav.pm:127 diskdrake/interactive.pm:1469
+#: diskdrake/dav.pm:127 diskdrake/interactive.pm:1476
 #, c-format
 msgid "Options: %s"
 msgstr "选项: %s"
@@ -1228,8 +1228,8 @@ msgstr "分区"
 msgid "Click on a partition, choose a filesystem type then choose an action"
 msgstr "点击分区，选择文件系统类型，然后选择操作"
 
-#: diskdrake/hd_gtk.pm:125 diskdrake/interactive.pm:1194
-#: diskdrake/interactive.pm:1204 diskdrake/interactive.pm:1259
+#: diskdrake/hd_gtk.pm:125 diskdrake/interactive.pm:1198
+#: diskdrake/interactive.pm:1208 diskdrake/interactive.pm:1263
 #, c-format
 msgid "Read carefully"
 msgstr "请仔细阅读！"
@@ -1277,69 +1277,69 @@ msgstr "请单击一个分区"
 msgid "Details"
 msgstr "细节"
 
-#: diskdrake/hd_gtk.pm:320
+#: diskdrake/hd_gtk.pm:321
 #, c-format
 msgid "No hard disk drives found"
 msgstr "没有发现硬盘"
 
-#: diskdrake/hd_gtk.pm:359
+#: diskdrake/hd_gtk.pm:360
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: diskdrake/hd_gtk.pm:426
+#: diskdrake/hd_gtk.pm:427
 #, c-format
 msgid "Ext4"
 msgstr "Ext4"
 
-#: diskdrake/hd_gtk.pm:426 fs/partitioning_wizard.pm:425
+#: diskdrake/hd_gtk.pm:427 fs/partitioning_wizard.pm:425
 #, c-format
 msgid "XFS"
 msgstr "XFS"
 
-#: diskdrake/hd_gtk.pm:426 fs/partitioning_wizard.pm:425
+#: diskdrake/hd_gtk.pm:427 fs/partitioning_wizard.pm:425
 #, c-format
 msgid "Swap"
 msgstr "交换"
 
-#: diskdrake/hd_gtk.pm:426 fs/partitioning_wizard.pm:425
+#: diskdrake/hd_gtk.pm:427 fs/partitioning_wizard.pm:425
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:427 fs/partitioning_wizard.pm:426 services.pm:195
+#: diskdrake/hd_gtk.pm:428 fs/partitioning_wizard.pm:426 services.pm:195
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: diskdrake/hd_gtk.pm:427 diskdrake/interactive.pm:1389
+#: diskdrake/hd_gtk.pm:428 diskdrake/interactive.pm:1393
 #: fs/partitioning_wizard.pm:426
 #, c-format
 msgid "Empty"
 msgstr "空"
 
-#: diskdrake/hd_gtk.pm:434
+#: diskdrake/hd_gtk.pm:435
 #, c-format
 msgid "Filesystem types:"
 msgstr "文件系统类型: "
 
-#: diskdrake/hd_gtk.pm:455
+#: diskdrake/hd_gtk.pm:456
 #, c-format
 msgid "This partition is already empty"
 msgstr "此分区已经为空"
 
-#: diskdrake/hd_gtk.pm:464
+#: diskdrake/hd_gtk.pm:465
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "请先“Unmount”"
 
-#: diskdrake/hd_gtk.pm:464
+#: diskdrake/hd_gtk.pm:465
 #, c-format
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "用“%s”代替(在专家模式中)"
 
-#: diskdrake/hd_gtk.pm:464 diskdrake/interactive.pm:409
-#: diskdrake/interactive.pm:636 diskdrake/removable.pm:25
+#: diskdrake/hd_gtk.pm:465 diskdrake/interactive.pm:409
+#: diskdrake/interactive.pm:640 diskdrake/removable.pm:25
 #: diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
@@ -1362,7 +1362,7 @@ msgid "More"
 msgstr "更多"
 
 #: diskdrake/interactive.pm:279 diskdrake/interactive.pm:292
-#: diskdrake/interactive.pm:1305 mygtk2.pm:1228 mygtk3.pm:1282
+#: diskdrake/interactive.pm:1309 mygtk2.pm:1228 mygtk3.pm:1282
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1460,7 +1460,7 @@ msgstr "详细信息"
 msgid "View"
 msgstr "查看"
 
-#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:829
 #, c-format
 msgid "Resize"
 msgstr "改变大小"
@@ -1470,12 +1470,12 @@ msgstr "改变大小"
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:415 diskdrake/interactive.pm:975
+#: diskdrake/interactive.pm:415 diskdrake/interactive.pm:979
 #, c-format
 msgid "Add to RAID"
 msgstr "加入 RAID"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:994
+#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:998
 #, c-format
 msgid "Add to LVM"
 msgstr "加入 LVM"
@@ -1535,52 +1535,52 @@ msgstr "创建一个新分区"
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:497 diskdrake/interactive.pm:1079
+#: diskdrake/interactive.pm:497 diskdrake/interactive.pm:1083
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:499 diskdrake/interactive.pm:1080
+#: diskdrake/interactive.pm:499 diskdrake/interactive.pm:1084
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
 
-#: diskdrake/interactive.pm:505
+#: diskdrake/interactive.pm:509
 #, c-format
 msgid "Preference: "
 msgstr "首选项: "
 
-#: diskdrake/interactive.pm:508
+#: diskdrake/interactive.pm:512
 #, c-format
 msgid "Logical volume name "
 msgstr "逻辑卷标"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:514
 #, c-format
 msgid "Encrypt partition"
 msgstr "加密分区"
 
-#: diskdrake/interactive.pm:511
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid "Encryption key "
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:512 diskdrake/interactive.pm:1506
+#: diskdrake/interactive.pm:516 diskdrake/interactive.pm:1513
 #, c-format
 msgid "Encryption key (again)"
 msgstr "加密密钥(再输入一次)"
 
-#: diskdrake/interactive.pm:524 diskdrake/interactive.pm:1502
+#: diskdrake/interactive.pm:528 diskdrake/interactive.pm:1509
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:525
+#: diskdrake/interactive.pm:529
 #, c-format
 msgid "Missing encryption key"
 msgstr "缺少加密密钥"
 
-#: diskdrake/interactive.pm:545
+#: diskdrake/interactive.pm:549
 #, c-format
 msgid ""
 "You cannot create a new partition\n"
@@ -1591,68 +1591,68 @@ msgstr ""
 "(您超过了允许的主分区数量)。\n"
 "请先删除一个主分区, 然后创建一个扩展分区。"
 
-#: diskdrake/interactive.pm:597
+#: diskdrake/interactive.pm:601
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "删除回环(loopback)文件?"
 
-#: diskdrake/interactive.pm:617
+#: diskdrake/interactive.pm:621
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "在改变分区表 %s 的类型之后, 在这个分区上的所有资料将要被清除"
 
-#: diskdrake/interactive.pm:633
+#: diskdrake/interactive.pm:637
 #, c-format
 msgid "Change partition type"
 msgstr "更改分区类型"
 
-#: diskdrake/interactive.pm:635 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:639 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "您希望使用哪种文件系统?"
 
-#: diskdrake/interactive.pm:642
+#: diskdrake/interactive.pm:646
 #, c-format
 msgid "Switching from %s to %s"
 msgstr "从 %s 切换到 %s"
 
-#: diskdrake/interactive.pm:677
+#: diskdrake/interactive.pm:681
 #, c-format
 msgid "Set volume label"
 msgstr "设定卷标"
 
-#: diskdrake/interactive.pm:679
+#: diskdrake/interactive.pm:683
 #, c-format
 msgid "Beware, this will be written to disk as soon as you validate!"
 msgstr "小心，当您确定之后，这一内容将会立即写入磁盘！"
 
-#: diskdrake/interactive.pm:680
+#: diskdrake/interactive.pm:684
 #, c-format
 msgid "Beware, this will be written to disk only after formatting!"
 msgstr "小心，格式化之后这一内容将会立即写入磁盘！"
 
-#: diskdrake/interactive.pm:682
+#: diskdrake/interactive.pm:686
 #, c-format
 msgid "Which volume label?"
 msgstr "哪个卷标？"
 
-#: diskdrake/interactive.pm:683
+#: diskdrake/interactive.pm:687
 #, c-format
 msgid "Label:"
 msgstr "标签:"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:708
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:705
+#: diskdrake/interactive.pm:709
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您想把设备 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:710
+#: diskdrake/interactive.pm:714
 #, c-format
 msgid ""
 "Cannot unset mount point as this partition is used for loop back.\n"
@@ -1661,58 +1661,58 @@ msgstr ""
 "无法取消设定的挂载点, 因为该分区正用于回环。\n"
 "请先删除回环"
 
-#: diskdrake/interactive.pm:740
+#: diskdrake/interactive.pm:744
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "您想把 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:770 diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:774 diskdrake/interactive.pm:870
 #: fs/partitioning_wizard.pm:143 fs/partitioning_wizard.pm:225
 #, c-format
 msgid "Resizing"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:770
+#: diskdrake/interactive.pm:774
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "计算 FAT 文件系统的边界"
 
-#: diskdrake/interactive.pm:812
+#: diskdrake/interactive.pm:816
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "无法更改此分区的大小"
 
-#: diskdrake/interactive.pm:817
+#: diskdrake/interactive.pm:821
 #, c-format
 msgid "All data on this partition should be backed up"
 msgstr "应该先备份在这个分区上的所有数据"
 
-#: diskdrake/interactive.pm:819
+#: diskdrake/interactive.pm:823
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
 
-#: diskdrake/interactive.pm:826
+#: diskdrake/interactive.pm:830
 #, c-format
 msgid "Choose the new size"
 msgstr "选择新的大小"
 
-#: diskdrake/interactive.pm:827
+#: diskdrake/interactive.pm:831
 #, c-format
 msgid "New size in MB: "
 msgstr "新大小(MB): "
 
-#: diskdrake/interactive.pm:828
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "Minimum size: %s MB"
 msgstr "最小大小：%s MB"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:833
 #, c-format
 msgid "Maximum size: %s MB"
 msgstr "最大大小：%s MB"
 
-#: diskdrake/interactive.pm:877 fs/partitioning_wizard.pm:233
+#: diskdrake/interactive.pm:881 fs/partitioning_wizard.pm:233
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s),\n"
@@ -1721,57 +1721,57 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
 "可能会自动运行文件系统检查"
 
-#: diskdrake/interactive.pm:943 diskdrake/interactive.pm:1497
+#: diskdrake/interactive.pm:947 diskdrake/interactive.pm:1504
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "文件系统加密密钥"
 
-#: diskdrake/interactive.pm:944
+#: diskdrake/interactive.pm:948
 #, c-format
 msgid "Enter your filesystem encryption key"
 msgstr "输入您的文件系统加密密钥"
 
-#: diskdrake/interactive.pm:945 diskdrake/interactive.pm:1505
+#: diskdrake/interactive.pm:949 diskdrake/interactive.pm:1512
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:952
+#: diskdrake/interactive.pm:956
 #, c-format
 msgid "Invalid key"
 msgstr "无效的密钥"
 
-#: diskdrake/interactive.pm:975
+#: diskdrake/interactive.pm:979
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:977 diskdrake/interactive.pm:996
+#: diskdrake/interactive.pm:981 diskdrake/interactive.pm:1000
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:994
+#: diskdrake/interactive.pm:998
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:1006 diskdrake/interactive.pm:1015
+#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1019
 #, c-format
 msgid "LVM name"
 msgstr "LVM 名称"
 
-#: diskdrake/interactive.pm:1007
+#: diskdrake/interactive.pm:1011
 #, c-format
 msgid "Enter a name for the new LVM volume group"
 msgstr "输入新 LVM 卷组的名称"
 
-#: diskdrake/interactive.pm:1012
+#: diskdrake/interactive.pm:1016
 #, c-format
 msgid "\"%s\" already exists"
 msgstr "“%s”已经存在"
 
-#: diskdrake/interactive.pm:1044
+#: diskdrake/interactive.pm:1048
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -1780,117 +1780,117 @@ msgstr ""
 "物理卷 %s 仍在使用中。\n"
 "您是否想要将此卷上已用的物理扩展分区移动到其它卷上？"
 
-#: diskdrake/interactive.pm:1046
+#: diskdrake/interactive.pm:1050
 #, c-format
 msgid "Moving physical extents"
 msgstr "移动物理扩展分区"
 
-#: diskdrake/interactive.pm:1064
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "This partition cannot be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:1077
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:1078
+#: diskdrake/interactive.pm:1082
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1087
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:1086
+#: diskdrake/interactive.pm:1090
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:1087
+#: diskdrake/interactive.pm:1091
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:1119 diskdrake/interactive.pm:1122
+#: diskdrake/interactive.pm:1123 diskdrake/interactive.pm:1126
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:1129
+#: diskdrake/interactive.pm:1133
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1175
+#: diskdrake/interactive.pm:1179
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1176
+#: diskdrake/interactive.pm:1180
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1177
+#: diskdrake/interactive.pm:1181
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1195
+#: diskdrake/interactive.pm:1199
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1212
+#: diskdrake/interactive.pm:1216
 #, c-format
 msgid "Partitioning Type"
 msgstr "分区类型"
 
-#: diskdrake/interactive.pm:1212
+#: diskdrake/interactive.pm:1216
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1250
+#: diskdrake/interactive.pm:1254
 #, c-format
 msgid "You'll need to reboot before the modification can take effect"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1259
+#: diskdrake/interactive.pm:1263
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1278 fs/format.pm:107 fs/format.pm:114
+#: diskdrake/interactive.pm:1282 fs/format.pm:107 fs/format.pm:114
 #, c-format
 msgid "Formatting partition %s"
 msgstr "正在格式化分区 %s"
 
-#: diskdrake/interactive.pm:1291
+#: diskdrake/interactive.pm:1295
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1305 fs/partitioning.pm:48
+#: diskdrake/interactive.pm:1309 fs/partitioning.pm:48
 #, c-format
 msgid "Check for bad blocks?"
 msgstr "是否检查坏磁块?"
 
-#: diskdrake/interactive.pm:1320
+#: diskdrake/interactive.pm:1324
 #, c-format
 msgid "Move files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1320
+#: diskdrake/interactive.pm:1324
 #, c-format
 msgid "Hide files"
 msgstr "隐藏文件"
 
-#: diskdrake/interactive.pm:1321
+#: diskdrake/interactive.pm:1325
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -1906,122 +1906,127 @@ msgstr ""
 "您可以选择将文件移动到即将挂载到该目录的分区，或者将其保留在原地(这将导致这些"
 "文件因为其它分区被挂载被隐藏)"
 
-#: diskdrake/interactive.pm:1336
+#: diskdrake/interactive.pm:1340
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1340
+#: diskdrake/interactive.pm:1344
 #, c-format
 msgid "Copying %s"
 msgstr "复制 %s"
 
-#: diskdrake/interactive.pm:1344
+#: diskdrake/interactive.pm:1348
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: diskdrake/interactive.pm:1358
+#: diskdrake/interactive.pm:1362
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "分区 %s 现在被识别为 %s"
 
-#: diskdrake/interactive.pm:1359
+#: diskdrake/interactive.pm:1363
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "分区已被重新编号: "
 
-#: diskdrake/interactive.pm:1384 diskdrake/interactive.pm:1446
+#: diskdrake/interactive.pm:1388 diskdrake/interactive.pm:1453
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: diskdrake/interactive.pm:1385
+#: diskdrake/interactive.pm:1389
 #, c-format
 msgid "Volume label: "
 msgstr "卷标: "
 
-#: diskdrake/interactive.pm:1386
+#: diskdrake/interactive.pm:1390
 #, c-format
 msgid "UUID: "
 msgstr "UUDI: "
 
-#: diskdrake/interactive.pm:1387
+#: diskdrake/interactive.pm:1391
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 下的盘符: %s(只是猜测)\n"
 
-#: diskdrake/interactive.pm:1391 diskdrake/interactive.pm:1465
+#: diskdrake/interactive.pm:1395 diskdrake/interactive.pm:1472
 #, c-format
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1393
+#: diskdrake/interactive.pm:1397
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "开始: 第 %s 扇区\n"
 
-#: diskdrake/interactive.pm:1394
+#: diskdrake/interactive.pm:1399
+#, c-format
+msgid "Size: %s (%s%% of disk)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1401
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1396
+#: diskdrake/interactive.pm:1403
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇区"
 
-#: diskdrake/interactive.pm:1398
+#: diskdrake/interactive.pm:1405
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "柱面 %d 到 %d\n"
 
-#: diskdrake/interactive.pm:1399
+#: diskdrake/interactive.pm:1406
 #, c-format
 msgid "Number of logical extents: %d\n"
 msgstr "逻辑分区数：%d\n"
 
-#: diskdrake/interactive.pm:1400
+#: diskdrake/interactive.pm:1407
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1401
+#: diskdrake/interactive.pm:1408
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1402
+#: diskdrake/interactive.pm:1409
 #, c-format
 msgid "Mounted\n"
 msgstr "已挂载\n"
 
-#: diskdrake/interactive.pm:1403
+#: diskdrake/interactive.pm:1410
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1405
+#: diskdrake/interactive.pm:1412
 #, c-format
 msgid "Encrypted"
 msgstr "已加密"
 
-#: diskdrake/interactive.pm:1407
+#: diskdrake/interactive.pm:1414
 #, c-format
 msgid " (mapped on %s)"
 msgstr " (已映射为 %s)"
 
-#: diskdrake/interactive.pm:1408
+#: diskdrake/interactive.pm:1415
 #, c-format
 msgid " (to map on %s)"
 msgstr "  (应映射为 %s)"
 
-#: diskdrake/interactive.pm:1409
+#: diskdrake/interactive.pm:1416
 #, c-format
 msgid " (inactive)"
 msgstr " (交互)"
 
-#: diskdrake/interactive.pm:1416
+#: diskdrake/interactive.pm:1423
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2030,7 +2035,7 @@ msgstr ""
 "回环文件: \n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1417
+#: diskdrake/interactive.pm:1424
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2039,27 +2044,27 @@ msgstr ""
 "预设的启动分区\n"
 "    (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
 
-#: diskdrake/interactive.pm:1419
+#: diskdrake/interactive.pm:1426
 #, c-format
 msgid "Level %s\n"
 msgstr "级别 %s\n"
 
-#: diskdrake/interactive.pm:1420
+#: diskdrake/interactive.pm:1427
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "组块大小 %d KB\n"
 
-#: diskdrake/interactive.pm:1421
+#: diskdrake/interactive.pm:1428
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1423
+#: diskdrake/interactive.pm:1430
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "回环文件名称: %s"
 
-#: diskdrake/interactive.pm:1426
+#: diskdrake/interactive.pm:1433
 #, c-format
 msgid ""
 "\n"
@@ -2071,7 +2076,7 @@ msgstr ""
 "此分区很可能是驱动器分区。\n"
 "您最好请不要更改它。\n"
 
-#: diskdrake/interactive.pm:1429
+#: diskdrake/interactive.pm:1436
 #, c-format
 msgid ""
 "\n"
@@ -2083,62 +2088,62 @@ msgstr ""
 "该 Bootstrap 分区特别\n"
 "是保留给双重启动系统。\n"
 
-#: diskdrake/interactive.pm:1438
+#: diskdrake/interactive.pm:1445
 #, c-format
 msgid "Free space on %s (%s)"
 msgstr "%s (%s) 上的空闲空间"
 
-#: diskdrake/interactive.pm:1447
+#: diskdrake/interactive.pm:1454
 #, c-format
 msgid "Read-only"
 msgstr "只读"
 
-#: diskdrake/interactive.pm:1448
+#: diskdrake/interactive.pm:1455
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1449
+#: diskdrake/interactive.pm:1456
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
 
-#: diskdrake/interactive.pm:1450
+#: diskdrake/interactive.pm:1457
 #, c-format
 msgid "Name: "
 msgstr "名称: "
 
-#: diskdrake/interactive.pm:1451
+#: diskdrake/interactive.pm:1458
 #, c-format
 msgid "Medium type: "
 msgstr "介质类型: "
 
-#: diskdrake/interactive.pm:1452
+#: diskdrake/interactive.pm:1459
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1453
+#: diskdrake/interactive.pm:1460
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "分区表类型: %s\n"
 
-#: diskdrake/interactive.pm:1454
+#: diskdrake/interactive.pm:1461
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1498
+#: diskdrake/interactive.pm:1505
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
 
-#: diskdrake/interactive.pm:1501
+#: diskdrake/interactive.pm:1508
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 
-#: diskdrake/interactive.pm:1508
+#: diskdrake/interactive.pm:1515
 #, c-format
 msgid "Encryption algorithm"
 msgstr "加密算法"
@@ -3047,114 +3052,65 @@ msgstr "未知/其它"
 msgid "cpu # "
 msgstr "CPU # "
 
-#: harddrake/sound.pm:77
-#, c-format
-msgid "Please Wait... Applying the configuration"
-msgstr "请稍候...正在应用配置"
-
-#: harddrake/sound.pm:98
+#: harddrake/sound.pm:80
 #, c-format
 msgid "No known driver"
 msgstr "没有已知驱动程序"
 
-#: harddrake/sound.pm:99
+#: harddrake/sound.pm:81
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "没有已知的驱动程序可以用在您的声卡(%s)上"
 
-#: harddrake/sound.pm:130
+#: harddrake/sound.pm:110
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "启用 PulseAudio"
 
-#: harddrake/sound.pm:135
+#: harddrake/sound.pm:115
 #, c-format
 msgid "Use Glitch-Free mode"
 msgstr "使用无干扰模式"
 
-#: harddrake/sound.pm:141
+#: harddrake/sound.pm:121
 #, c-format
 msgid "Reset sound mixer to default values"
 msgstr "将混音器重置为默认值"
 
-#: harddrake/sound.pm:146
+#: harddrake/sound.pm:125
 #, c-format
 msgid "Troubleshooting"
 msgstr "疑难解答"
 
-#: harddrake/sound.pm:153
+#: harddrake/sound.pm:132
 #, c-format
 msgid "No alternative driver"
 msgstr "没有替代的驱动程序"
 
-#: harddrake/sound.pm:154
+#: harddrake/sound.pm:133
 #, 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:161
+#: harddrake/sound.pm:140
 #, c-format
 msgid "Sound configuration"
 msgstr "声音配置"
 
-#. -PO: here the first %s is either "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:167
+#: harddrake/sound.pm:143
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Your card currently uses the %s\"%s\" driver (the default driver for your "
-"card is \"%s\")"
+msgid "Your card uses the \"%s\" driver"
 msgstr ""
 
-#: harddrake/sound.pm:169
-#, c-format
-msgid ""
-"OSS (Open Sound System) was the first sound API. It's an OS independent "
-"sound API (it's available on most UNIX(tm) systems) but it's a very basic "
-"and limited API.\n"
-"What's more, OSS drivers all reinvent the wheel.\n"
-"\n"
-"ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
-"which\n"
-"supports quite a large range of ISA, USB and PCI cards.\n"
-"\n"
-"It also provides a much higher API than OSS.\n"
-"\n"
-"To use alsa, one can either use:\n"
-"- the old compatibility OSS API\n"
-"- the new ALSA API that provides many enhanced features but requires using "
-"the ALSA library.\n"
-msgstr ""
-"OSS(开放声音系统)是第一个声音 API。这是一个与操作系统无关的声音 API(在绝大多"
-"数 UNIX 系统可用), 但是它非常基础且 API 也受到很大限制。\n"
-"更重要的是, OSS 驱动程序需要彻底的重新开发。\n"
-"\n"
-"ALSA(高级 Linux 声音体系)是一个模块化架构, 它支持大量的 ISA、USB 和 PCI 声"
-"卡。\n"
-"\n"
-"它提供的 API 比 OSS 高级得多。\n"
-"\n"
-"要使用 alsa, 您可以获得:\n"
-"- 与旧的 OSS 兼容的 API\n"
-"- 新的 ALSA API 带来许多增强特性, 但这需要使用 ALSA 库。\n"
-
-#: harddrake/sound.pm:184 harddrake/sound.pm:266
-#, c-format
-msgid "Driver:"
-msgstr "驱动程序: "
-
-#: harddrake/sound.pm:206
+#: harddrake/sound.pm:155
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "声音疑难解决"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:209
+#: harddrake/sound.pm:158
 #, c-format
 msgid ""
 "Below are some basic tips to help debug audio problems, but for accurate and "
@@ -3213,27 +3169,6 @@ msgid ""
 "PulseAudio)\n"
 msgstr ""
 
-#: harddrake/sound.pm:255
-#, c-format
-msgid "Let me pick any driver"
-msgstr "让我挑选任意驱动"
-
-#: harddrake/sound.pm:258
-#, 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:261
-#, c-format
-msgid ""
-"If you really think that you know which driver is the right one for your "
-"card\n"
-"you can pick one from the list below.\n"
-"\n"
-"The current driver for your \"%s\" sound card is \"%s\" "
-msgstr ""
-
 #: harddrake/v4l.pm:12
 #, c-format
 msgid "Auto-detect"
@@ -4639,7 +4574,7 @@ msgstr "物理卷 %s 仍在使用中"
 msgid "Remove the logical volumes first\n"
 msgstr "请先删除逻辑卷\n"
 
-#: lvm.pm:247
+#: lvm.pm:248
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
 msgstr "引导程序无法识别多个物理卷上的 /boot"
@@ -6718,3 +6653,45 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
+
+#~ msgid "Please Wait... Applying the configuration"
+#~ msgstr "请稍候...正在应用配置"
+
+#~ msgid ""
+#~ "OSS (Open Sound System) was the first sound API. It's an OS independent "
+#~ "sound API (it's available on most UNIX(tm) systems) but it's a very basic "
+#~ "and limited API.\n"
+#~ "What's more, OSS drivers all reinvent the wheel.\n"
+#~ "\n"
+#~ "ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
+#~ "which\n"
+#~ "supports quite a large range of ISA, USB and PCI cards.\n"
+#~ "\n"
+#~ "It also provides a much higher API than OSS.\n"
+#~ "\n"
+#~ "To use alsa, one can either use:\n"
+#~ "- the old compatibility OSS API\n"
+#~ "- the new ALSA API that provides many enhanced features but requires "
+#~ "using the ALSA library.\n"
+#~ msgstr ""
+#~ "OSS(开放声音系统)是第一个声音 API。这是一个与操作系统无关的声音 API(在绝大"
+#~ "多数 UNIX 系统可用), 但是它非常基础且 API 也受到很大限制。\n"
+#~ "更重要的是, OSS 驱动程序需要彻底的重新开发。\n"
+#~ "\n"
+#~ "ALSA(高级 Linux 声音体系)是一个模块化架构, 它支持大量的 ISA、USB 和 PCI 声"
+#~ "卡。\n"
+#~ "\n"
+#~ "它提供的 API 比 OSS 高级得多。\n"
+#~ "\n"
+#~ "要使用 alsa, 您可以获得:\n"
+#~ "- 与旧的 OSS 兼容的 API\n"
+#~ "- 新的 ALSA API 带来许多增强特性, 但这需要使用 ALSA 库。\n"
+
+#~ msgid "Driver:"
+#~ msgstr "驱动程序: "
+
+#~ msgid "Let me pick any driver"
+#~ msgstr "让我挑选任意驱动"
+
+#~ msgid "Choosing an arbitrary driver"
+#~ msgstr "选择其它驱动"