sync with code

1 files changed, 297 insertions, 242 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index f0fb98332..8f92737de 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: DrakX 2007\n"
-"POT-Creation-Date: 2007-07-30 20:17+0200\n"
+"POT-Creation-Date: 2007-08-06 12:28+0200\n"
 "PO-Revision-Date: 2006-09-10 21:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -15,10 +15,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: any.pm:240 diskdrake/interactive.pm:422 diskdrake/interactive.pm:621
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:852
-#: diskdrake/interactive.pm:914 diskdrake/interactive.pm:1201 do_pkgs.pm:209
-#: do_pkgs.pm:255 harddrake/sound.pm:201 interactive.pm:576
+#: any.pm:240 diskdrake/interactive.pm:603 diskdrake/interactive.pm:790
+#: diskdrake/interactive.pm:834 diskdrake/interactive.pm:896
+#: diskdrake/interactive.pm:1183 do_pkgs.pm:209 do_pkgs.pm:255
+#: harddrake/sound.pm:201 interactive.pm:576
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -170,7 +170,7 @@ msgstr "密码"
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:395 authentication.pm:207 diskdrake/interactive.pm:1361
+#: any.pm:395 authentication.pm:207 diskdrake/interactive.pm:1343
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
@@ -281,7 +281,7 @@ msgstr "Initrd"
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:506 any.pm:511 any.pm:513 diskdrake/interactive.pm:443
+#: any.pm:506 any.pm:511 any.pm:513 diskdrake/interactive.pm:425
 #, c-format
 msgid "Label"
 msgstr "标签"
@@ -1103,38 +1103,38 @@ msgstr ""
 msgid "New"
 msgstr "新建"
 
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:449 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:431 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "卸载"
 
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:446 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:428 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "挂载"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:440
-#: diskdrake/interactive.pm:680 diskdrake/interactive.pm:698
-#: diskdrake/interactive.pm:702 diskdrake/removable.pm:23
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:422
+#: diskdrake/interactive.pm:662 diskdrake/interactive.pm:680
+#: diskdrake/interactive.pm:684 diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "挂载点"
 
-#: diskdrake/dav.pm:65 diskdrake/interactive.pm:442
-#: diskdrake/interactive.pm:1057 diskdrake/removable.pm:24
+#: diskdrake/dav.pm:65 diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:1039 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
 msgstr "选项"
 
 #: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:115 diskdrake/interactive.pm:229
-#: diskdrake/interactive.pm:242 diskdrake/interactive.pm:398
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:547
-#: diskdrake/interactive.pm:552 diskdrake/interactive.pm:670
-#: diskdrake/interactive.pm:932 diskdrake/interactive.pm:1102
-#: diskdrake/interactive.pm:1115 diskdrake/interactive.pm:1118
-#: diskdrake/interactive.pm:1361 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:19
+#: diskdrake/interactive.pm:242 diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:404 diskdrake/interactive.pm:529
+#: diskdrake/interactive.pm:534 diskdrake/interactive.pm:652
+#: diskdrake/interactive.pm:914 diskdrake/interactive.pm:1084
+#: diskdrake/interactive.pm:1097 diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1343 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:19
 #: do_pkgs.pm:24 do_pkgs.pm:40 do_pkgs.pm:56 do_pkgs.pm:61 fsedit.pm:229
 #: interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19
 #: scanner.pm:94 scanner.pm:105 scanner.pm:112 scanner.pm:119 wizards.pm:95
@@ -1158,13 +1158,13 @@ msgstr "URL 应该是以 http:// 或 https:// 开头"
 msgid "Server: "
 msgstr "服务器: "
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:520
-#: diskdrake/interactive.pm:1243 diskdrake/interactive.pm:1321
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:502
+#: diskdrake/interactive.pm:1225 diskdrake/interactive.pm:1303
 #, c-format
 msgid "Mount point: "
 msgstr "挂载点: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1328
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1310
 #, c-format
 msgid "Options: %s"
 msgstr "选项: %s"
@@ -1178,8 +1178,8 @@ msgstr "选项: %s"
 msgid "Partitioning"
 msgstr "分区"
 
-#: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1077
-#: diskdrake/interactive.pm:1087 diskdrake/interactive.pm:1140
+#: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1059
+#: diskdrake/interactive.pm:1069 diskdrake/interactive.pm:1122
 #, c-format
 msgid "Read carefully!"
 msgstr "请仔细阅读！"
@@ -1281,12 +1281,12 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:352 services.pm:149
+#: diskdrake/hd_gtk.pm:352 services.pm:158
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: diskdrake/hd_gtk.pm:352 diskdrake/interactive.pm:1257
+#: diskdrake/hd_gtk.pm:352 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Empty"
 msgstr "空"
@@ -1297,12 +1297,12 @@ msgid "Filesystem types:"
 msgstr "文件系统类型: "
 
 #: diskdrake/hd_gtk.pm:380 diskdrake/interactive.pm:291
-#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:428
-#: diskdrake/interactive.pm:577 diskdrake/interactive.pm:761
-#: diskdrake/interactive.pm:819 diskdrake/interactive.pm:912
-#: diskdrake/interactive.pm:954 diskdrake/interactive.pm:955
-#: diskdrake/interactive.pm:1186 diskdrake/interactive.pm:1224
-#: diskdrake/interactive.pm:1360 do_pkgs.pm:16 do_pkgs.pm:35 do_pkgs.pm:53
+#: diskdrake/interactive.pm:380 diskdrake/interactive.pm:410
+#: diskdrake/interactive.pm:559 diskdrake/interactive.pm:743
+#: diskdrake/interactive.pm:801 diskdrake/interactive.pm:894
+#: diskdrake/interactive.pm:936 diskdrake/interactive.pm:937
+#: diskdrake/interactive.pm:1168 diskdrake/interactive.pm:1206
+#: diskdrake/interactive.pm:1342 do_pkgs.pm:16 do_pkgs.pm:35 do_pkgs.pm:53
 #: harddrake/sound.pm:285
 #, c-format
 msgid "Warning"
@@ -1323,8 +1323,8 @@ msgstr "请先“Unmount”"
 msgid "Use ``%s'' instead"
 msgstr "用“%s”代替"
 
-#: diskdrake/hd_gtk.pm:389 diskdrake/interactive.pm:441
-#: diskdrake/interactive.pm:615 diskdrake/interactive.pm:1093
+#: diskdrake/hd_gtk.pm:389 diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:597 diskdrake/interactive.pm:1075
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
@@ -1356,7 +1356,7 @@ msgid "Toggle to expert mode"
 msgstr "切换到专家模式"
 
 #: diskdrake/interactive.pm:269 diskdrake/interactive.pm:279
-#: diskdrake/interactive.pm:1171
+#: diskdrake/interactive.pm:1153
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1407,7 +1407,7 @@ msgstr "全部清除"
 msgid "Auto allocate"
 msgstr "自动分配"
 
-#: diskdrake/interactive.pm:306 diskdrake/interactive.pm:360
+#: diskdrake/interactive.pm:306 diskdrake/interactive.pm:354
 #: interactive/curses.pm:512
 #, c-format
 msgid "More"
@@ -1435,52 +1435,27 @@ msgid ""
 "partition"
 msgstr "如果需要更多的分区, 请删除一个主分区以创建扩展分区"
 
-#: diskdrake/interactive.pm:354
-#, c-format
-msgid "No supermount"
-msgstr "无 supermount"
-
-#: diskdrake/interactive.pm:355
-#, c-format
-msgid "Supermount"
-msgstr "Supermount"
-
 #: diskdrake/interactive.pm:356
 #, c-format
-msgid "Supermount except for CDROM drives"
-msgstr "除 CDROM 驱动器以外都为 Supermount"
-
-#: diskdrake/interactive.pm:362
-#, c-format
 msgid "Save partition table"
 msgstr "保存分区表"
 
-#: diskdrake/interactive.pm:363
+#: diskdrake/interactive.pm:357
 #, c-format
 msgid "Restore partition table"
 msgstr "恢复分区表"
 
-#: diskdrake/interactive.pm:364
-#, c-format
-msgid "Rescue partition table"
-msgstr "抢救分区表"
-
-#: diskdrake/interactive.pm:366
+#: diskdrake/interactive.pm:359
 #, c-format
 msgid "Reload partition table"
 msgstr "重新读取分区表"
 
-#: diskdrake/interactive.pm:368
-#, c-format
-msgid "Removable media automounting"
-msgstr "自动装载可移动介质"
-
-#: diskdrake/interactive.pm:381 diskdrake/interactive.pm:407
+#: diskdrake/interactive.pm:369 diskdrake/interactive.pm:395
 #, c-format
 msgid "Select file"
 msgstr "选择文件"
 
-#: diskdrake/interactive.pm:393
+#: diskdrake/interactive.pm:381
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1489,97 +1464,92 @@ msgstr ""
 "备份分区表的大小和原来的有所不同\n"
 "仍然继续吗?"
 
-#: diskdrake/interactive.pm:422
-#, c-format
-msgid "Trying to rescue partition table"
-msgstr "正在尝试恢复分区表"
-
-#: diskdrake/interactive.pm:428
+#: diskdrake/interactive.pm:410
 #, c-format
 msgid "Detailed information"
 msgstr "详细信息"
 
-#: diskdrake/interactive.pm:444 diskdrake/interactive.pm:774
+#: diskdrake/interactive.pm:426 diskdrake/interactive.pm:756
 #, c-format
 msgid "Resize"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:445
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:447 diskdrake/interactive.pm:860
+#: diskdrake/interactive.pm:429 diskdrake/interactive.pm:842
 #, c-format
 msgid "Add to RAID"
 msgstr "加入 RAID"
 
-#: diskdrake/interactive.pm:448 diskdrake/interactive.pm:877
+#: diskdrake/interactive.pm:430 diskdrake/interactive.pm:859
 #, c-format
 msgid "Add to LVM"
 msgstr "加入 LVM"
 
-#: diskdrake/interactive.pm:450
+#: diskdrake/interactive.pm:432
 #, c-format
 msgid "Delete"
 msgstr "删除"
 
-#: diskdrake/interactive.pm:451
+#: diskdrake/interactive.pm:433
 #, c-format
 msgid "Remove from RAID"
 msgstr "从 RAID 中移除"
 
-#: diskdrake/interactive.pm:452
+#: diskdrake/interactive.pm:434
 #, c-format
 msgid "Remove from LVM"
 msgstr "从 LVM 中移除"
 
-#: diskdrake/interactive.pm:453
+#: diskdrake/interactive.pm:435
 #, c-format
 msgid "Modify RAID"
 msgstr "修改 RAID"
 
-#: diskdrake/interactive.pm:454
+#: diskdrake/interactive.pm:436
 #, c-format
 msgid "Use for loopback"
 msgstr "用于回环"
 
-#: diskdrake/interactive.pm:465
+#: diskdrake/interactive.pm:447
 #, c-format
 msgid "Create"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:509 diskdrake/interactive.pm:511
+#: diskdrake/interactive.pm:491 diskdrake/interactive.pm:493
 #, c-format
 msgid "Create a new partition"
 msgstr "创建一个新分区"
 
-#: diskdrake/interactive.pm:513
+#: diskdrake/interactive.pm:495
 #, c-format
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:516 diskdrake/interactive.pm:947
+#: diskdrake/interactive.pm:498 diskdrake/interactive.pm:929
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:518 diskdrake/interactive.pm:948
+#: diskdrake/interactive.pm:500 diskdrake/interactive.pm:930
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
 
-#: diskdrake/interactive.pm:524
+#: diskdrake/interactive.pm:506
 #, c-format
 msgid "Preference: "
 msgstr "首选项: "
 
-#: diskdrake/interactive.pm:527
+#: diskdrake/interactive.pm:509
 #, c-format
 msgid "Logical volume name "
 msgstr "逻辑卷标"
 
-#: diskdrake/interactive.pm:547
+#: diskdrake/interactive.pm:529
 #, c-format
 msgid ""
 "You can not create a new partition\n"
@@ -1590,53 +1560,53 @@ msgstr ""
 "(您超过了允许的主分区数量)。\n"
 "请先删除一个主分区, 然后创建一个扩展分区。"
 
-#: diskdrake/interactive.pm:577
+#: diskdrake/interactive.pm:559
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "删除回环(loopback)文件?"
 
-#: diskdrake/interactive.pm:599
+#: diskdrake/interactive.pm:581
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "在改变分区表 %s 的类型之后, 在这个分区上的所有资料将要被清除"
 
-#: diskdrake/interactive.pm:612
+#: diskdrake/interactive.pm:594
 #, c-format
 msgid "Change partition type"
 msgstr "更改分区类型"
 
-#: diskdrake/interactive.pm:614 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:596 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "您希望使用哪种文件系统?"
 
-#: diskdrake/interactive.pm:621
+#: diskdrake/interactive.pm:603
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "把 ext2 升级到 ext3"
 
-#: diskdrake/interactive.pm:647 diskdrake/interactive.pm:650
+#: diskdrake/interactive.pm:629 diskdrake/interactive.pm:632
 #, c-format
 msgid "Which volume label?"
 msgstr "哪个卷标？"
 
-#: diskdrake/interactive.pm:651
+#: diskdrake/interactive.pm:633
 #, c-format
 msgid "Label:"
 msgstr "标签:"
 
-#: diskdrake/interactive.pm:665
+#: diskdrake/interactive.pm:647
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:666
+#: diskdrake/interactive.pm:648
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您想把设备 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:671
+#: diskdrake/interactive.pm:653
 #, c-format
 msgid ""
 "Can not unset mount point as this partition is used for loop back.\n"
@@ -1645,58 +1615,58 @@ msgstr ""
 "无法取消设定的挂载点, 因为该分区正用于回环。\n"
 "请先删除回环"
 
-#: diskdrake/interactive.pm:701
+#: diskdrake/interactive.pm:683
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "您想把 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:725 diskdrake/interactive.pm:808
+#: diskdrake/interactive.pm:707 diskdrake/interactive.pm:790
 #: fs/partitioning_wizard.pm:141 fs/partitioning_wizard.pm:173
 #, c-format
 msgid "Resizing"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:725
+#: diskdrake/interactive.pm:707
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "计算 FAT 文件系统的边界"
 
-#: diskdrake/interactive.pm:761
+#: diskdrake/interactive.pm:743
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "无法更改此分区的大小"
 
-#: diskdrake/interactive.pm:766
+#: diskdrake/interactive.pm:748
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "应该先备份在这个分区上的所有数据"
 
-#: diskdrake/interactive.pm:768
+#: diskdrake/interactive.pm:750
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
 
-#: diskdrake/interactive.pm:775
+#: diskdrake/interactive.pm:757
 #, c-format
 msgid "Choose the new size"
 msgstr "选择新的大小"
 
-#: diskdrake/interactive.pm:776
+#: diskdrake/interactive.pm:758
 #, c-format
 msgid "New size in MB: "
 msgstr "新大小(MB): "
 
-#: diskdrake/interactive.pm:777
+#: diskdrake/interactive.pm:759
 #, c-format
 msgid "Minimum size: %s MB"
 msgstr "最小大小：%s MB"
 
-#: diskdrake/interactive.pm:778
+#: diskdrake/interactive.pm:760
 #, c-format
 msgid "Maximum size: %s MB"
 msgstr "最大大小：%s MB"
 
-#: diskdrake/interactive.pm:819 fs/partitioning_wizard.pm:181
+#: diskdrake/interactive.pm:801 fs/partitioning_wizard.pm:181
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -1705,27 +1675,27 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
 "可能会自动运行文件系统检查。"
 
-#: diskdrake/interactive.pm:860
+#: diskdrake/interactive.pm:842
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:862 diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:844 diskdrake/interactive.pm:861
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:877
+#: diskdrake/interactive.pm:859
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:866
 #, c-format
 msgid "LVM name?"
 msgstr "LVM 名称?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:894
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -1734,107 +1704,107 @@ msgstr ""
 "物理卷 %s 仍在使用中。\n"
 "您是否想要将此卷上已用的物理扩展分区移动到其它卷上？"
 
-#: diskdrake/interactive.pm:914
+#: diskdrake/interactive.pm:896
 #, c-format
 msgid "Moving physical extents"
 msgstr "移动物理扩展分区"
 
-#: diskdrake/interactive.pm:932
+#: diskdrake/interactive.pm:914
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:945
+#: diskdrake/interactive.pm:927
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:946
+#: diskdrake/interactive.pm:928
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:951
+#: diskdrake/interactive.pm:933
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:954
+#: diskdrake/interactive.pm:936
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:955
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:984 diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:966 diskdrake/interactive.pm:969
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:994
+#: diskdrake/interactive.pm:976
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1059
+#: diskdrake/interactive.pm:1041
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1060
+#: diskdrake/interactive.pm:1042
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1043
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1078
+#: diskdrake/interactive.pm:1060
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1093
+#: diskdrake/interactive.pm:1075
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1131
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1140
+#: diskdrake/interactive.pm:1122
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1166
+#: diskdrake/interactive.pm:1148
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1171 fs/partitioning.pm:49
+#: diskdrake/interactive.pm:1153 fs/partitioning.pm:49
 #, c-format
 msgid "Check bad blocks?"
 msgstr "是否检查坏磁块?"
 
-#: diskdrake/interactive.pm:1185
+#: diskdrake/interactive.pm:1167
 #, c-format
 msgid "Move files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1185
+#: diskdrake/interactive.pm:1167
 #, c-format
 msgid "Hide files"
 msgstr "隐藏文件"
 
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1168
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -1850,103 +1820,103 @@ msgstr ""
 "您可以选择将文件移动到即将挂载到该目录的分区，或者将其保留在原地(这将导致这些"
 "文件因为其它分区被挂载被隐藏)"
 
-#: diskdrake/interactive.pm:1201
+#: diskdrake/interactive.pm:1183
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1205
+#: diskdrake/interactive.pm:1187
 #, c-format
 msgid "Copying %s"
 msgstr "复制 %s"
 
-#: diskdrake/interactive.pm:1209
+#: diskdrake/interactive.pm:1191
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1205
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "分区 %s 现在被识别为 %s"
 
-#: diskdrake/interactive.pm:1224
+#: diskdrake/interactive.pm:1206
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "分区已被重新编号: "
 
-#: diskdrake/interactive.pm:1244 diskdrake/interactive.pm:1306
+#: diskdrake/interactive.pm:1226 diskdrake/interactive.pm:1288
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: diskdrake/interactive.pm:1245
+#: diskdrake/interactive.pm:1227
 #, c-format
 msgid "Volume label: "
 msgstr "卷标: "
 
-#: diskdrake/interactive.pm:1246
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 下的盘符: %s(只是猜测)\n"
 
-#: diskdrake/interactive.pm:1250 diskdrake/interactive.pm:1259
-#: diskdrake/interactive.pm:1324
+#: diskdrake/interactive.pm:1232 diskdrake/interactive.pm:1241
+#: diskdrake/interactive.pm:1306
 #, c-format
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1254
+#: diskdrake/interactive.pm:1236
 #, c-format
 msgid "Name: "
 msgstr "名称: "
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1243
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "开始: 第 %s 扇区\n"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1244
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1264
+#: diskdrake/interactive.pm:1246
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇区"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1248
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "柱面 %d 到 %d\n"
 
-#: diskdrake/interactive.pm:1267
+#: diskdrake/interactive.pm:1249
 #, c-format
 msgid "Number of logical extents: %d\n"
 msgstr "逻辑分区数：%d\n"
 
-#: diskdrake/interactive.pm:1268
+#: diskdrake/interactive.pm:1250
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1269
+#: diskdrake/interactive.pm:1251
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1270
+#: diskdrake/interactive.pm:1252
 #, c-format
 msgid "Mounted\n"
 msgstr "已挂载\n"
 
-#: diskdrake/interactive.pm:1271
+#: diskdrake/interactive.pm:1253
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1276
+#: diskdrake/interactive.pm:1258
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1955,7 +1925,7 @@ msgstr ""
 "回环文件: \n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1277
+#: diskdrake/interactive.pm:1259
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -1964,27 +1934,27 @@ msgstr ""
 "预设的启动分区\n"
 "    (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
 
-#: diskdrake/interactive.pm:1279
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "Level %s\n"
 msgstr "级别 %s\n"
 
-#: diskdrake/interactive.pm:1280
+#: diskdrake/interactive.pm:1262
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "组块大小 %d KB\n"
 
-#: diskdrake/interactive.pm:1281
+#: diskdrake/interactive.pm:1263
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1283
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "回环文件名称: %s"
 
-#: diskdrake/interactive.pm:1286
+#: diskdrake/interactive.pm:1268
 #, c-format
 msgid ""
 "\n"
@@ -1996,7 +1966,7 @@ msgstr ""
 "此分区很可能是驱动器分区。\n"
 "您最好请不要更改它。\n"
 
-#: diskdrake/interactive.pm:1289
+#: diskdrake/interactive.pm:1271
 #, c-format
 msgid ""
 "\n"
@@ -2008,77 +1978,77 @@ msgstr ""
 "该 Bootstrap 分区特别\n"
 "是保留给双重启动系统。\n"
 
-#: diskdrake/interactive.pm:1298
+#: diskdrake/interactive.pm:1280
 #, c-format
 msgid "Free space on %s (%s)"
 msgstr "%s (%s) 上的空闲空间"
 
-#: diskdrake/interactive.pm:1307
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid "Read-only"
 msgstr "只读"
 
-#: diskdrake/interactive.pm:1308
+#: diskdrake/interactive.pm:1290
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1309
+#: diskdrake/interactive.pm:1291
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
 
-#: diskdrake/interactive.pm:1310
+#: diskdrake/interactive.pm:1292
 #, c-format
 msgid "Info: "
 msgstr "信息: "
 
-#: diskdrake/interactive.pm:1311
+#: diskdrake/interactive.pm:1293
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1312
+#: diskdrake/interactive.pm:1294
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "分区表类型: %s\n"
 
-#: diskdrake/interactive.pm:1313
+#: diskdrake/interactive.pm:1295
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1356
+#: diskdrake/interactive.pm:1338
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "文件系统加密密钥"
 
-#: diskdrake/interactive.pm:1357
+#: diskdrake/interactive.pm:1339
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
 
-#: diskdrake/interactive.pm:1360
+#: diskdrake/interactive.pm:1342
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 
-#: diskdrake/interactive.pm:1361
+#: diskdrake/interactive.pm:1343
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:1364
+#: diskdrake/interactive.pm:1346
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:1365
+#: diskdrake/interactive.pm:1347
 #, c-format
 msgid "Encryption key (again)"
 msgstr "加密密钥(再输入一次)"
 
-#: diskdrake/interactive.pm:1367
+#: diskdrake/interactive.pm:1349
 #, c-format
 msgid "Encryption algorithm"
 msgstr "加密算法"
@@ -2230,11 +2200,16 @@ msgstr "卸载 %s 出错: %s"
 msgid "Enabling swap partition %s"
 msgstr "正在启用 swap 分区 %s"
 
-#: fs/mount_options.pm:113
+#: fs/mount_options.pm:111
 #, c-format
 msgid "Use an encrypted file system"
 msgstr "使用加密的文件系统"
 
+#: fs/mount_options.pm:113
+#, c-format
+msgid "Flush write cache on file close"
+msgstr ""
+
 #: fs/mount_options.pm:115
 #, c-format
 msgid "Enable group disk quota accounting and optionally enforce limits"
@@ -2250,6 +2225,15 @@ msgstr ""
 "(例如, 为了加速对新闻服务器的新闻池的访问)"
 
 #: fs/mount_options.pm:120
+#, fuzzy, c-format
+msgid ""
+"Do not update directory inode access times on this filesystem\n"
+"(e.g, for faster access on the news spool to speed up news servers)."
+msgstr ""
+"不在此文件系统更新 inode 访问次数\n"
+"(例如, 为了加速对新闻服务器的新闻池的访问)"
+
+#: fs/mount_options.pm:123
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2258,12 +2242,12 @@ msgstr ""
 "只能显式装载。\n"
 "(即, -a 选项将不会装载文件系统)"
 
-#: fs/mount_options.pm:123
+#: fs/mount_options.pm:126
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr "不解释文件系统中的字符或特殊块设备。"
 
-#: fs/mount_options.pm:125
+#: fs/mount_options.pm:128
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2274,7 +2258,7 @@ msgstr ""
 "此选项对于特定服务器可能非常有用, 比如服务器所包含的文件系统中包含其它\n"
 "架构的二进制文件。"
 
-#: fs/mount_options.pm:129
+#: fs/mount_options.pm:132
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2284,42 +2268,42 @@ msgstr ""
 "不允许 set-user-identifier 或 set-group-identifier 位生效。\n"
 "(这可能比较安全, 如果您安装了 suidperl(1) 则不太安全。)"
 
-#: fs/mount_options.pm:133
+#: fs/mount_options.pm:136
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "以只读装载文件系统。"
 
-#: fs/mount_options.pm:135
+#: fs/mount_options.pm:138
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "所有到文件系统的输入/输出都应该是同步完成的。"
 
-#: fs/mount_options.pm:139
+#: fs/mount_options.pm:140
 #, c-format
 msgid "Allow every user to mount and umount the file system."
 msgstr "允许每个用户挂载和卸载文件系统。"
 
-#: fs/mount_options.pm:141
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Allow an ordinary user to mount the file system."
 msgstr "允许普通用户挂载文件系统。"
 
-#: fs/mount_options.pm:143
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Enable user disk quota accounting, and optionally enforce limits"
 msgstr "启用用户磁盘配额记账及可选强制限制"
 
-#: fs/mount_options.pm:145
+#: fs/mount_options.pm:146
 #, c-format
 msgid "Support \"user.\" extended attributes"
 msgstr "支持“user.”扩展属性"
 
-#: fs/mount_options.pm:147
+#: fs/mount_options.pm:148
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "给普通用户以写权限"
 
-#: fs/mount_options.pm:149
+#: fs/mount_options.pm:150
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "给普通用户以只读权限"
@@ -4510,7 +4494,7 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1154
+#: lang.pm:1144
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
@@ -5835,6 +5819,17 @@ msgstr ""
 #: services.pm:28
 #, c-format
 msgid ""
+"Common UNIX Printing System (CUPS) is an advanced printer spooling system"
+msgstr ""
+
+#: services.pm:29
+#, c-format
+msgid "Launches the graphical display manager"
+msgstr ""
+
+#: services.pm:30
+#, c-format
+msgid ""
 "FAM is a file monitoring daemon. It is used to get reports when files "
 "change.\n"
 "It is used by GNOME and KDE"
@@ -5842,7 +5837,7 @@ msgstr ""
 "FAM 是文件监视守护程序。它可在文件发生变化时给出报告。\n"
 "GNOME 和 KDE 都要使用它"
 
-#: services.pm:30
+#: services.pm:32
 #, c-format
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
@@ -5854,20 +5849,25 @@ msgstr ""
 "它同时提供了利用鼠标的控制台复制并粘贴操作, 还支持控制台上的弹出式\n"
 "菜单。"
 
-#: services.pm:33
+#: services.pm:35
+#, c-format
+msgid "HAL is a daemon that collects and maintains information about hardware"
+msgstr ""
+
+#: services.pm:36
 #, c-format
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr "HardDrake 进行硬件检测, 还可以配置新增/变化的硬件。"
 
-#: services.pm:35
+#: services.pm:38
 #, c-format
 msgid ""
 "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr "Apache 是一台万维网服务器。它提供 HTML 文件和 CGI 等服务。"
 
-#: services.pm:36
+#: services.pm:39
 #, c-format
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
@@ -5881,7 +5881,7 @@ msgstr ""
 "它负责响应多种服务, 包括 telnet、ftp、rsh 和 rlogin。\n"
 "禁止 inetd 就同时禁止了它负责的所有服务。"
 
-#: services.pm:40
+#: services.pm:43
 #, c-format
 msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
@@ -5890,7 +5890,7 @@ msgstr ""
 "启动内核 2.2 的数据包过滤功能, 设置防火墙\n"
 "以保护您的机器不受网络攻击。"
 
-#: services.pm:42
+#: services.pm:45
 #, c-format
 msgid ""
 "This package loads the selected keyboard map as set in\n"
@@ -5900,7 +5900,7 @@ msgstr ""
 "这个程序按照 /etc/sysconfig/keyboard 的设定加载选择的键盘映射。\n"
 "您可以使用 kbdconfig 工具修改这个设定。对大多数机器, 应该开启这个服务。"
 
-#: services.pm:45
+#: services.pm:48
 #, c-format
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
@@ -5909,19 +5909,19 @@ msgstr ""
 "自动重新生成 /boot 下的\n"
 "/usr/include/linux/{autoconf,version}.h 头文件"
 
-#: services.pm:47
+#: services.pm:50
 #, c-format
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr "启动时自动监测和配置硬件。"
 
-#: services.pm:48
+#: services.pm:51
 #, c-format
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr "Linuxconf 在开机时会执行一些任务来维护系统配置。"
 
-#: services.pm:50
+#: services.pm:53
 #, c-format
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
@@ -5930,21 +5930,28 @@ msgstr ""
 "lpd 是保证 lpr 正常工作的后台打印服务。这个服务器的基本功能是\n"
 "把打印服务指引到相应的打印机。"
 
-#: services.pm:52
+#: services.pm:55
 #, c-format
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr "Linux 虚拟服务器, 用来构架高效和高可用系统。"
 
-#: services.pm:54
+#: services.pm:57
+#, c-format
+msgid ""
+"DBUS is a daemon which broadcasts notifications of system events and other "
+"messages"
+msgstr ""
+
+#: services.pm:58
 #, c-format
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
 "names to IP addresses."
 msgstr "named(BIND) 是一个域名服务器(DNS), 用来把主机名解析成 IP 地址。"
 
-#: services.pm:55
+#: services.pm:59
 #, c-format
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
@@ -5953,14 +5960,14 @@ msgstr ""
 "加载和卸载所有网络文件系统(NFS), SMB(Lan\n"
 "Manager/Windows), 和 NCP(NetWare)加载点。"
 
-#: services.pm:57
+#: services.pm:61
 #, c-format
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr "激活/禁止所有配置为开机就启动的网络接口。"
 
-#: services.pm:59
+#: services.pm:63
 #, c-format
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
@@ -5971,7 +5978,7 @@ msgstr ""
 "这个服务提供了 NFS 服务器功能, 可以通过\n"
 "/etc/exports 文件配置。"
 
-#: services.pm:62
+#: services.pm:66
 #, c-format
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
@@ -5980,19 +5987,24 @@ msgstr ""
 "NFS 是常用的通过 TCP/IP 网络共享文件的协议。\n"
 "这个服务提供了 NFS 文件锁定功能。"
 
-#: services.pm:64
+#: services.pm:68
+#, c-format
+msgid "Synchronizes system time using the Network Time Protocol (NTP)"
+msgstr ""
+
+#: services.pm:69
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and Xorg at boot."
 msgstr "开机时为控制台和 Xorg 自动设置 NumLock。"
 
-#: services.pm:66
+#: services.pm:71
 #, c-format
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "支持 OKI 4w 及其兼容的视窗打印机。"
 
-#: services.pm:67
+#: services.pm:72
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
@@ -6004,7 +6016,7 @@ msgstr ""
 "以太网卡或者调制解调器。如果没有配置它不会启动, \n"
 "所以不必担心它。"
 
-#: services.pm:70
+#: services.pm:75
 #, c-format
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
@@ -6015,7 +6027,7 @@ msgstr ""
 "portmapper 管理各种 RPC 连接, 像 NFS 和 NIS 这些协议会用到它。\n"
 "如果您的电脑将要提供利用用 RPC 机制协议的服务, 就必须运行 portmap 服务器。"
 
-#: services.pm:73
+#: services.pm:78
 #, c-format
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that moves mail from "
@@ -6024,14 +6036,14 @@ msgstr ""
 "Postfix 是一个邮件传递代理, 这个程序帮助您把电子邮件从\n"
 "一台机器送到另一台。"
 
-#: services.pm:74
+#: services.pm:79
 #, c-format
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr "保存和恢复系统的熵池, 可以产生更高品质的随机数。"
 
-#: services.pm:76
+#: services.pm:81
 #, c-format
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
@@ -6040,7 +6052,7 @@ msgstr ""
 "将 RAW 设备指定为块设备(如硬盘分区), \n"
 "以便供 Oracle 或 DVD 播放机之类的程序使用"
 
-#: services.pm:78
+#: services.pm:83
 #, c-format
 msgid ""
 "The routed daemon allows for automatic IP router table updated via\n"
@@ -6050,21 +6062,21 @@ msgstr ""
 "后台服务 routed 允许通过 RIP 协议自动更新的 IP 路由表。在小型网络上广泛的\n"
 "采用 RIP, 然而在更复杂的网络上需要更复杂的路由协议。"
 
-#: services.pm:81
+#: services.pm:86
 #, c-format
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr "rstat 协议允许网络上的用户获取网络上任何机器的性能指标。"
 
-#: services.pm:83
+#: services.pm:88
 #, c-format
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr "rusers 协议允许网络上的用户确认在其它作出应答的机器上有哪些用户登录。"
 
-#: services.pm:85
+#: services.pm:90
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
@@ -6073,12 +6085,32 @@ msgstr ""
 "rwho 协议使远程的用户可以得到运行了 rwho 后台服务的\n"
 "机器上所有登录用户的清单(类似 finger)。"
 
-#: services.pm:87
+#: services.pm:92
+#, c-format
+msgid ""
+"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
+msgstr ""
+
+#: services.pm:93
+#, c-format
+msgid ""
+"The SMB/CIFS protocol enables to shar access to files & printers and also "
+"integrates with a Windows Server domain"
+msgstr ""
+
+#: services.pm:94
 #, c-format
 msgid "Launch the sound system on your machine"
 msgstr "启动计算机上的声音系统"
 
-#: services.pm:88
+#: services.pm:95
+#, c-format
+msgid ""
+"Secure Shell is a network protocol that allows data to be exchanged over a "
+"secure channel between two computers"
+msgstr ""
+
+#: services.pm:96
 #, c-format
 msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
@@ -6087,104 +6119,109 @@ msgstr ""
 "Syslog 是这样一个设施, 很多其它的后台服务利用它在各种系统日志文件\n"
 "中记录日志消息。一直运行 syslog 是个好主意。"
 
-#: services.pm:90
+#: services.pm:98
 #, c-format
 msgid "Load the drivers for your usb devices."
 msgstr "装入您 USB 设备的驱动程序。"
 
-#: services.pm:91
+#: services.pm:99
 #, c-format
 msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr "启动 X 字体服务器(Xorg 所需)。"
 
-#: services.pm:114
+#: services.pm:100
+#, c-format
+msgid "Starts other deamons on demand.."
+msgstr ""
+
+#: services.pm:123
 #, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: services.pm:115
+#: services.pm:124
 #, c-format
 msgid "Internet"
 msgstr "互联网"
 
-#: services.pm:118
+#: services.pm:127
 #, c-format
 msgid "File sharing"
 msgstr "文件共享"
 
-#: services.pm:120
+#: services.pm:129
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: services.pm:125
+#: services.pm:134
 #, c-format
 msgid "Remote Administration"
 msgstr "远程管理"
 
-#: services.pm:133
+#: services.pm:142
 #, c-format
 msgid "Database Server"
 msgstr "数据库服务器"
 
-#: services.pm:144 services.pm:180
+#: services.pm:153 services.pm:189
 #, c-format
 msgid "Services"
 msgstr "服务"
 
-#: services.pm:144
+#: services.pm:153
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
 msgstr "选择开机时自动启动的服务"
 
-#: services.pm:162
+#: services.pm:171
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "服务: %2$d 项已注册, %1$d 项已激活"
 
-#: services.pm:196
+#: services.pm:205
 #, c-format
 msgid "running"
 msgstr "运行中"
 
-#: services.pm:196
+#: services.pm:205
 #, c-format
 msgid "stopped"
 msgstr "已停止"
 
-#: services.pm:201
+#: services.pm:210
 #, c-format
 msgid "Services and daemons"
 msgstr "服务和守护程序"
 
-#: services.pm:207
+#: services.pm:216
 #, c-format
 msgid ""
 "No additional information\n"
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:212 ugtk2.pm:901
+#: services.pm:221 ugtk2.pm:901
 #, c-format
 msgid "Info"
 msgstr "信息"
 
-#: services.pm:215
+#: services.pm:224
 #, c-format
 msgid "Start when requested"
 msgstr "请求时启动"
 
-#: services.pm:215
+#: services.pm:224
 #, c-format
 msgid "On boot"
 msgstr "启动时"
 
-#: services.pm:233
+#: services.pm:242
 #, c-format
 msgid "Start"
 msgstr "启动"
 
-#: services.pm:233
+#: services.pm:242
 #, c-format
 msgid "Stop"
 msgstr "停止"
@@ -6422,7 +6459,7 @@ msgstr ""
 "       XFdrake [--noauto] 显示器\n"
 "       XFdrake 分辨率"
 
-#: standalone.pm:149
+#: standalone.pm:152
 #, c-format
 msgid ""
 "\n"
@@ -6547,6 +6584,24 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid "No supermount"
+#~ msgstr "无 supermount"
+
+#~ msgid "Supermount"
+#~ msgstr "Supermount"
+
+#~ msgid "Supermount except for CDROM drives"
+#~ msgstr "除 CDROM 驱动器以外都为 Supermount"
+
+#~ msgid "Rescue partition table"
+#~ msgstr "抢救分区表"
+
+#~ msgid "Removable media automounting"
+#~ msgstr "自动装载可移动介质"
+
+#~ msgid "Trying to rescue partition table"
+#~ msgstr "正在尝试恢复分区表"
+
 #~ msgid ""
 #~ "Use local for all authentication and information user tell in local file"
 #~ msgstr "使用本地进行全部身份验证并在本地文件中存储关于用户的信息"