1 files changed, 393 insertions, 369 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index f4697251c..34ffb70d8 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: 2010-03-28 14:46+0200\n"
+"POT-Creation-Date: 2010-05-01 16:46+0200\n"
 "PO-Revision-Date: 2009-04-09 11: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:252 any.pm:953 diskdrake/interactive.pm:597
-#: diskdrake/interactive.pm:802 diskdrake/interactive.pm:846
-#: diskdrake/interactive.pm:950 diskdrake/interactive.pm:1204
-#: diskdrake/interactive.pm:1256 do_pkgs.pm:241 do_pkgs.pm:287
+#: any.pm:252 any.pm:947 diskdrake/interactive.pm:647
+#: diskdrake/interactive.pm:864 diskdrake/interactive.pm:924
+#: diskdrake/interactive.pm:1026 diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1308 do_pkgs.pm:241 do_pkgs.pm:287
 #: harddrake/sound.pm:303 interactive.pm:587 pkgs.pm:281
 #, c-format
 msgid "Please wait"
@@ -121,7 +121,7 @@ msgstr "跳过"
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:412 any.pm:452 any.pm:453
+#: any.pm:412 any.pm:445 any.pm:446
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
@@ -131,12 +131,12 @@ msgstr "引导程序的主要选项"
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:417 any.pm:456
+#: any.pm:417 any.pm:449
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:420 any.pm:459
+#: any.pm:420 any.pm:452
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
@@ -176,7 +176,7 @@ msgstr "启用本地 APIC"
 msgid "Security"
 msgstr "安全"
 
-#: any.pm:431 any.pm:891 any.pm:907 authentication.pm:250
+#: any.pm:431 any.pm:885 any.pm:901 authentication.pm:250
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
@@ -187,7 +187,7 @@ msgstr "密码"
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:434 authentication.pm:261 diskdrake/interactive.pm:1428
+#: any.pm:434 authentication.pm:261 diskdrake/interactive.pm:1483
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
@@ -197,163 +197,152 @@ msgstr "请再试一次"
 msgid "You can not use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:440 any.pm:893 any.pm:909 authentication.pm:251
+#: any.pm:440 any.pm:887 any.pm:903 authentication.pm:251
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
 #: any.pm:441
 #, c-format
-msgid "Restrict command line options"
-msgstr "限制命令行选项"
-
-#: any.pm:442
-#, c-format
-msgid "restrict"
-msgstr "限制"
-
-#: any.pm:445
-#, c-format
-msgid ""
-"Option ``Restrict command line options'' is of no use without a password"
-msgstr "没有密码不能使用“限定命令行选项”"
-
-#: any.pm:448
-#, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次启动时清除 /tmp"
 
-#: any.pm:458
+#: any.pm:451
 #, c-format
 msgid "Init Message"
 msgstr "初始信息"
 
-#: any.pm:460
+#: any.pm:453
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "开放固件延迟"
 
-#: any.pm:461
+#: any.pm:454
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心启动超时"
 
-#: any.pm:462
+#: any.pm:455
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允许 CD 启动?"
 
-#: any.pm:463
+#: any.pm:456
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "启用 OF 启动?"
 
-#: any.pm:464
+#: any.pm:457
 #, c-format
 msgid "Default OS?"
 msgstr "默认操作系统?"
 
-#: any.pm:537
+#: any.pm:530
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:538 any.pm:551
+#: any.pm:531 any.pm:545
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:539 any.pm:564
+#: any.pm:532 any.pm:558
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:541
+#: any.pm:534
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:544
+#: any.pm:536
+#, c-format
+msgid "Requires password to boot"
+msgstr ""
+
+#: any.pm:538
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:546
+#: any.pm:540
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:547
+#: any.pm:541
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:556 any.pm:561 any.pm:563 diskdrake/interactive.pm:407
+#: any.pm:550 any.pm:555 any.pm:557 diskdrake/interactive.pm:407
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:558 any.pm:566 harddrake/v4l.pm:438
+#: any.pm:552 any.pm:560 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:565
+#: any.pm:559
 #, c-format
 msgid "NoVideo"
 msgstr "无视频"
 
-#: any.pm:576
+#: any.pm:570
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:577
+#: any.pm:571
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:577
+#: any.pm:571
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:578
+#: any.pm:572
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:596
+#: any.pm:590
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:597
+#: any.pm:591
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:597
+#: any.pm:591
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其它操作系统(SunOS...)"
 
-#: any.pm:598
+#: any.pm:592
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其它操作系统(MacOS...)"
 
-#: any.pm:598
+#: any.pm:592
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:645
+#: any.pm:639
 #, c-format
 msgid "Bootloader Configuration"
 msgstr "引导程序配置"
 
-#: any.pm:646
+#: any.pm:640
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -362,194 +351,194 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:851
+#: any.pm:845
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:852
+#: any.pm:846
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:853
+#: any.pm:847
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:854
+#: any.pm:848
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:855
+#: any.pm:849
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:856
+#: any.pm:850
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:862
+#: any.pm:856
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:868
+#: any.pm:862
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:869
+#: any.pm:863
 #, 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:864
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:871
+#: any.pm:865
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:877 any.pm:911
+#: any.pm:871 any.pm:905
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:877 any.pm:912
+#: any.pm:871 any.pm:906
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:878
+#: any.pm:872
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:879
+#: any.pm:873
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s 应该大于 500。仍然接受吗？"
 
-#: any.pm:883
+#: any.pm:877
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:889
+#: any.pm:883
 #, c-format
 msgid "Enable guest account"
 msgstr ""
 
-#: any.pm:890 authentication.pm:237
+#: any.pm:884 authentication.pm:237
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:895
+#: any.pm:889
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:897
+#: any.pm:891
 #, c-format
 msgid "Icon"
 msgstr "图标"
 
-#: any.pm:900
+#: any.pm:894
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:905
+#: any.pm:899
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:910
+#: any.pm:904
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:953
+#: any.pm:947
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: any.pm:983 security/l10n.pm:14
+#: any.pm:977 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:984
+#: any.pm:978
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:985
+#: any.pm:979
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:986
+#: any.pm:980
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:987
+#: any.pm:981
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:998 any.pm:1018 any.pm:1091
+#: any.pm:992 any.pm:1012 any.pm:1085
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:1025 any.pm:1379 interactive/gtk.pm:819
+#: any.pm:1019 any.pm:1373 interactive/gtk.pm:819
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:1077
+#: any.pm:1071
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:1079 diskdrake/dav.pm:26
+#: any.pm:1073 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:1086
+#: any.pm:1080
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "您接受此许可协议吗?"
 
-#: any.pm:1087
+#: any.pm:1081
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:1087
+#: any.pm:1081
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:1113 any.pm:1175
+#: any.pm:1107 any.pm:1169
 #, c-format
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
-#: any.pm:1141
+#: any.pm:1135
 #, c-format
 msgid ""
 "Mandriva Linux can support multiple languages. Select\n"
@@ -559,77 +548,77 @@ msgstr ""
 "Mandriva Linux 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:1144
+#: any.pm:1138
 #, c-format
 msgid "Multi languages"
 msgstr "多语言"
 
-#: any.pm:1153 any.pm:1184
+#: any.pm:1147 any.pm:1178
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:1154
+#: any.pm:1148
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1176
+#: any.pm:1170
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:1230
+#: any.pm:1224
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1231
+#: any.pm:1225
 #, c-format
 msgid "Please choose your country"
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1233
+#: any.pm:1227
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1234
+#: any.pm:1228
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1234 interactive.pm:488 interactive/gtk.pm:445
+#: any.pm:1228 interactive.pm:488 interactive/gtk.pm:445
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1240
+#: any.pm:1234
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1243
+#: any.pm:1237
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1324
+#: any.pm:1318
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1324
+#: any.pm:1318
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1324
+#: any.pm:1318
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1328
+#: any.pm:1322
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -642,32 +631,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1340
+#: any.pm:1334
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1343
+#: any.pm:1337
 #, 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:1351
+#: any.pm:1345
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1379
+#: any.pm:1373
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1381
+#: any.pm:1375
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -676,54 +665,54 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1487
+#: any.pm:1481
 #, c-format
 msgid ""
 "You need to logout and back in again for changes to take effect. Press OK to "
 "logout now."
 msgstr "您需要注销后重新登录才能让更改生效。单击确定立即注销。"
 
-#: any.pm:1491
+#: any.pm:1485
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1526
+#: any.pm:1520
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1526
+#: any.pm:1520
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1549 any.pm:1551
+#: any.pm:1543 any.pm:1545
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1552
+#: any.pm:1546
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1556
+#: any.pm:1550
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1557
+#: any.pm:1551
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1559
+#: any.pm:1553
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1560
+#: any.pm:1554
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -1094,26 +1083,26 @@ msgstr "SILO"
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:1923
+#: bootloader.pm:1932
 #, c-format
 msgid "You can not install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:2044
+#: bootloader.pm:2053
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:2057
+#: bootloader.pm:2066
 #, c-format
 msgid ""
 "The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:2058
+#: bootloader.pm:2067
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -1196,15 +1185,15 @@ msgid "Server"
 msgstr "服务器"
 
 #: diskdrake/dav.pm:66 diskdrake/interactive.pm:404
-#: diskdrake/interactive.pm:674 diskdrake/interactive.pm:692
-#: diskdrake/interactive.pm:696 diskdrake/removable.pm:23
+#: diskdrake/interactive.pm:724 diskdrake/interactive.pm:742
+#: diskdrake/interactive.pm:746 diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "挂载点"
 
 #: diskdrake/dav.pm:67 diskdrake/interactive.pm:406
-#: diskdrake/interactive.pm:1098 diskdrake/removable.pm:24
+#: diskdrake/interactive.pm:1153 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
@@ -1221,18 +1210,18 @@ msgstr "删除"
 msgid "Done"
 msgstr "完成"
 
-#: diskdrake/dav.pm:78 diskdrake/hd_gtk.pm:128 diskdrake/hd_gtk.pm:294
+#: diskdrake/dav.pm:78 diskdrake/hd_gtk.pm:128 diskdrake/hd_gtk.pm:292
 #: diskdrake/interactive.pm:247 diskdrake/interactive.pm:260
 #: diskdrake/interactive.pm:453 diskdrake/interactive.pm:523
-#: diskdrake/interactive.pm:528 diskdrake/interactive.pm:664
-#: diskdrake/interactive.pm:917 diskdrake/interactive.pm:968
-#: diskdrake/interactive.pm:1144 diskdrake/interactive.pm:1157
-#: diskdrake/interactive.pm:1160 diskdrake/interactive.pm:1428
-#: diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23 do_pkgs.pm:28 do_pkgs.pm:44
-#: do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:82 fsedit.pm:246
-#: interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19
-#: scanner.pm:95 scanner.pm:106 scanner.pm:113 scanner.pm:120 wizards.pm:95
-#: wizards.pm:99 wizards.pm:121
+#: diskdrake/interactive.pm:541 diskdrake/interactive.pm:546
+#: diskdrake/interactive.pm:714 diskdrake/interactive.pm:993
+#: diskdrake/interactive.pm:1044 diskdrake/interactive.pm:1199
+#: diskdrake/interactive.pm:1212 diskdrake/interactive.pm:1215
+#: diskdrake/interactive.pm:1483 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23
+#: do_pkgs.pm:28 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:82
+#: fsedit.pm:246 interactive/http.pm:117 interactive/http.pm:118
+#: modules/interactive.pm:19 scanner.pm:95 scanner.pm:106 scanner.pm:113
+#: scanner.pm:120 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -1247,12 +1236,12 @@ msgstr "请输入 WebDAV 服务器的 URL"
 msgid "The URL must begin with http:// or https://"
 msgstr "URL 应该是以 http:// 或 https:// 开头"
 
-#: diskdrake/dav.pm:106 diskdrake/hd_gtk.pm:412 diskdrake/interactive.pm:306
-#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:553
-#: diskdrake/interactive.pm:755 diskdrake/interactive.pm:813
-#: diskdrake/interactive.pm:948 diskdrake/interactive.pm:990
-#: diskdrake/interactive.pm:991 diskdrake/interactive.pm:1241
-#: diskdrake/interactive.pm:1279 diskdrake/interactive.pm:1427 do_pkgs.pm:19
+#: diskdrake/dav.pm:106 diskdrake/hd_gtk.pm:417 diskdrake/interactive.pm:306
+#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:594
+#: diskdrake/interactive.pm:817 diskdrake/interactive.pm:875
+#: diskdrake/interactive.pm:1024 diskdrake/interactive.pm:1066
+#: diskdrake/interactive.pm:1067 diskdrake/interactive.pm:1293
+#: diskdrake/interactive.pm:1331 diskdrake/interactive.pm:1482 do_pkgs.pm:19
 #: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:77 harddrake/sound.pm:442
 #, c-format
 msgid "Warning"
@@ -1268,23 +1257,23 @@ msgstr "您确定想要删除此挂载点吗?"
 msgid "Server: "
 msgstr "服务器: "
 
-#: diskdrake/dav.pm:125 diskdrake/interactive.pm:496
-#: diskdrake/interactive.pm:1303 diskdrake/interactive.pm:1388
+#: diskdrake/dav.pm:125 diskdrake/interactive.pm:498
+#: diskdrake/interactive.pm:1355 diskdrake/interactive.pm:1443
 #, c-format
 msgid "Mount point: "
 msgstr "挂载点: "
 
-#: diskdrake/dav.pm:126 diskdrake/interactive.pm:1395
+#: diskdrake/dav.pm:126 diskdrake/interactive.pm:1450
 #, c-format
 msgid "Options: %s"
 msgstr "选项: %s"
 
 #: diskdrake/hd_gtk.pm:61 diskdrake/interactive.pm:301
 #: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:106
-#: fs/partitioning_wizard.pm:53 fs/partitioning_wizard.pm:235
-#: fs/partitioning_wizard.pm:243 fs/partitioning_wizard.pm:282
-#: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:495
-#: fs/partitioning_wizard.pm:571 fs/partitioning_wizard.pm:574
+#: fs/partitioning_wizard.pm:53 fs/partitioning_wizard.pm:236
+#: fs/partitioning_wizard.pm:244 fs/partitioning_wizard.pm:283
+#: fs/partitioning_wizard.pm:432 fs/partitioning_wizard.pm:496
+#: fs/partitioning_wizard.pm:572 fs/partitioning_wizard.pm:575
 #, c-format
 msgid "Partitioning"
 msgstr "分区"
@@ -1294,8 +1283,8 @@ msgstr "分区"
 msgid "Click on a partition, choose a filesystem type then choose an action"
 msgstr "点击分区，选择文件系统类型，然后选择操作"
 
-#: diskdrake/hd_gtk.pm:110 diskdrake/interactive.pm:1119
-#: diskdrake/interactive.pm:1129 diskdrake/interactive.pm:1182
+#: diskdrake/hd_gtk.pm:110 diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1184 diskdrake/interactive.pm:1237
 #, c-format
 msgid "Read carefully"
 msgstr "请仔细阅读！"
@@ -1315,7 +1304,7 @@ msgstr "退出"
 msgid "Continue"
 msgstr "继续"
 
-#: diskdrake/hd_gtk.pm:182 fs/partitioning_wizard.pm:547 interactive.pm:653
+#: diskdrake/hd_gtk.pm:182 fs/partitioning_wizard.pm:548 interactive.pm:653
 #: interactive/gtk.pm:811 interactive/gtk.pm:829 interactive/gtk.pm:850
 #: ugtk2.pm:936
 #, c-format
@@ -1343,79 +1332,79 @@ msgstr "请单击一个分区"
 msgid "Details"
 msgstr "细节"
 
-#: diskdrake/hd_gtk.pm:294
+#: diskdrake/hd_gtk.pm:292
 #, c-format
 msgid "No hard drives found"
 msgstr "没有发现硬盘"
 
-#: diskdrake/hd_gtk.pm:321
+#: diskdrake/hd_gtk.pm:323
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: diskdrake/hd_gtk.pm:383
+#: diskdrake/hd_gtk.pm:388
 #, fuzzy, c-format
 msgid "Ext4"
 msgstr "退出"
 
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
 #, c-format
 msgid "XFS"
 msgstr "XFS"
 
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
 #, c-format
 msgid "Swap"
 msgstr "交换"
 
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:384 fs/partitioning_wizard.pm:402 services.pm:184
+#: diskdrake/hd_gtk.pm:389 fs/partitioning_wizard.pm:403 services.pm:184
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: diskdrake/hd_gtk.pm:384 diskdrake/interactive.pm:1318
-#: fs/partitioning_wizard.pm:402
+#: diskdrake/hd_gtk.pm:389 diskdrake/interactive.pm:1370
+#: fs/partitioning_wizard.pm:403
 #, c-format
 msgid "Empty"
 msgstr "空"
 
-#: diskdrake/hd_gtk.pm:391
+#: diskdrake/hd_gtk.pm:396
 #, c-format
 msgid "Filesystem types:"
 msgstr "文件系统类型: "
 
-#: diskdrake/hd_gtk.pm:412
+#: diskdrake/hd_gtk.pm:417
 #, c-format
 msgid "This partition is already empty"
 msgstr "此分区已经为空"
 
-#: diskdrake/hd_gtk.pm:421
+#: diskdrake/hd_gtk.pm:426
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "请先“Unmount”"
 
-#: diskdrake/hd_gtk.pm:421
+#: diskdrake/hd_gtk.pm:426
 #, c-format
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "用“%s”代替(在专家模式中)"
 
-#: diskdrake/hd_gtk.pm:421 diskdrake/interactive.pm:405
-#: diskdrake/interactive.pm:591 diskdrake/removable.pm:25
+#: diskdrake/hd_gtk.pm:426 diskdrake/interactive.pm:405
+#: diskdrake/interactive.pm:641 diskdrake/removable.pm:25
 #: diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
@@ -1438,7 +1427,7 @@ msgid "More"
 msgstr "更多"
 
 #: diskdrake/interactive.pm:281 diskdrake/interactive.pm:294
-#: diskdrake/interactive.pm:1226
+#: diskdrake/interactive.pm:568 diskdrake/interactive.pm:1278
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1463,7 +1452,7 @@ msgstr "退出而不保存分区表吗?"
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "您想要保存 /etc/fstab 修改吗?"
 
-#: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:282
+#: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:283
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "对分区表的更改要等到重新启动后才能生效"
@@ -1536,7 +1525,7 @@ msgstr "详细信息"
 msgid "View"
 msgstr "查看"
 
-#: diskdrake/interactive.pm:408 diskdrake/interactive.pm:768
+#: diskdrake/interactive.pm:408 diskdrake/interactive.pm:830
 #, c-format
 msgid "Resize"
 msgstr "改变大小"
@@ -1546,12 +1535,12 @@ msgstr "改变大小"
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:878
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:956
 #, c-format
 msgid "Add to RAID"
 msgstr "加入 RAID"
 
-#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:899
+#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:975
 #, c-format
 msgid "Add to LVM"
 msgstr "加入 LVM"
@@ -1601,37 +1590,62 @@ msgstr "新建"
 msgid "Failed to mount partition"
 msgstr "挂载分区失败"
 
-#: diskdrake/interactive.pm:485 diskdrake/interactive.pm:487
+#: diskdrake/interactive.pm:487 diskdrake/interactive.pm:489
 #, c-format
 msgid "Create a new partition"
 msgstr "创建一个新分区"
 
-#: diskdrake/interactive.pm:489
+#: diskdrake/interactive.pm:491
 #, c-format
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:492 diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:494 diskdrake/interactive.pm:1059
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:494 diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:496 diskdrake/interactive.pm:1060
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
 
-#: diskdrake/interactive.pm:500
+#: diskdrake/interactive.pm:502
 #, c-format
 msgid "Preference: "
 msgstr "首选项: "
 
-#: diskdrake/interactive.pm:503
+#: diskdrake/interactive.pm:505
 #, c-format
 msgid "Logical volume name "
 msgstr "逻辑卷标"
 
-#: diskdrake/interactive.pm:523
+#: diskdrake/interactive.pm:507
+#, fuzzy, c-format
+msgid "Encrypt partition"
+msgstr "加密算法"
+
+#: diskdrake/interactive.pm:508
+#, fuzzy, c-format
+msgid "Encryption key "
+msgstr "加密密钥"
+
+#: diskdrake/interactive.pm:509 diskdrake/interactive.pm:1487
+#, c-format
+msgid "Encryption key (again)"
+msgstr "加密密钥(再输入一次)"
+
+#: diskdrake/interactive.pm:520 diskdrake/interactive.pm:1483
+#, c-format
+msgid "The encryption keys do not match"
+msgstr "两次加密密钥不符"
+
+#: diskdrake/interactive.pm:521
+#, fuzzy, c-format
+msgid "Missing encryption key"
+msgstr "文件系统加密密钥"
+
+#: diskdrake/interactive.pm:541
 #, c-format
 msgid ""
 "You can not create a new partition\n"
@@ -1642,68 +1656,74 @@ msgstr ""
 "(您超过了允许的主分区数量)。\n"
 "请先删除一个主分区, 然后创建一个扩展分区。"
 
-#: diskdrake/interactive.pm:553
+#: diskdrake/interactive.pm:568 diskdrake/interactive.pm:1278
+#: fs/partitioning.pm:48
+#, c-format
+msgid "Check bad blocks?"
+msgstr "是否检查坏磁块?"
+
+#: diskdrake/interactive.pm:594
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "删除回环(loopback)文件?"
 
-#: diskdrake/interactive.pm:575
+#: diskdrake/interactive.pm:622
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "在改变分区表 %s 的类型之后, 在这个分区上的所有资料将要被清除"
 
-#: diskdrake/interactive.pm:588
+#: diskdrake/interactive.pm:638
 #, c-format
 msgid "Change partition type"
 msgstr "更改分区类型"
 
-#: diskdrake/interactive.pm:590 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:640 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "您希望使用哪种文件系统?"
 
-#: diskdrake/interactive.pm:597
+#: diskdrake/interactive.pm:647
 #, c-format
 msgid "Switching from %s to %s"
 msgstr "从 %s 切换到 %s"
 
-#: diskdrake/interactive.pm:632
+#: diskdrake/interactive.pm:682
 #, c-format
 msgid "Set volume label"
 msgstr "设定卷标"
 
-#: diskdrake/interactive.pm:634
+#: diskdrake/interactive.pm:684
 #, c-format
 msgid "Beware, this will be written to disk as soon as you validate!"
 msgstr "小心，当您确定之后，这一内容将会立即写入磁盘！"
 
-#: diskdrake/interactive.pm:635
+#: diskdrake/interactive.pm:685
 #, c-format
 msgid "Beware, this will be written to disk only after formatting!"
 msgstr "小心，格式化之后这一内容将会立即写入磁盘！"
 
-#: diskdrake/interactive.pm:637
+#: diskdrake/interactive.pm:687
 #, c-format
 msgid "Which volume label?"
 msgstr "哪个卷标？"
 
-#: diskdrake/interactive.pm:638
+#: diskdrake/interactive.pm:688
 #, c-format
 msgid "Label:"
 msgstr "标签:"
 
-#: diskdrake/interactive.pm:659
+#: diskdrake/interactive.pm:709
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:660
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您想把设备 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:665
+#: diskdrake/interactive.pm:715
 #, c-format
 msgid ""
 "Can not unset mount point as this partition is used for loop back.\n"
@@ -1712,58 +1732,58 @@ msgstr ""
 "无法取消设定的挂载点, 因为该分区正用于回环。\n"
 "请先删除回环"
 
-#: diskdrake/interactive.pm:695
+#: diskdrake/interactive.pm:745
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "您想把 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:719 diskdrake/interactive.pm:802
-#: fs/partitioning_wizard.pm:128 fs/partitioning_wizard.pm:204
+#: diskdrake/interactive.pm:775 diskdrake/interactive.pm:864
+#: fs/partitioning_wizard.pm:129 fs/partitioning_wizard.pm:205
 #, c-format
 msgid "Resizing"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:719
+#: diskdrake/interactive.pm:775
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "计算 FAT 文件系统的边界"
 
-#: diskdrake/interactive.pm:755
+#: diskdrake/interactive.pm:817
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "无法更改此分区的大小"
 
-#: diskdrake/interactive.pm:760
+#: diskdrake/interactive.pm:822
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "应该先备份在这个分区上的所有数据"
 
-#: diskdrake/interactive.pm:762
+#: diskdrake/interactive.pm:824
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
 
-#: diskdrake/interactive.pm:769
+#: diskdrake/interactive.pm:831
 #, c-format
 msgid "Choose the new size"
 msgstr "选择新的大小"
 
-#: diskdrake/interactive.pm:770
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "New size in MB: "
 msgstr "新大小(MB): "
 
-#: diskdrake/interactive.pm:771
+#: diskdrake/interactive.pm:833
 #, c-format
 msgid "Minimum size: %s MB"
 msgstr "最小大小：%s MB"
 
-#: diskdrake/interactive.pm:772
+#: diskdrake/interactive.pm:834
 #, c-format
 msgid "Maximum size: %s MB"
 msgstr "最大大小：%s MB"
 
-#: diskdrake/interactive.pm:813 fs/partitioning_wizard.pm:212
+#: diskdrake/interactive.pm:875 fs/partitioning_wizard.pm:213
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s),\n"
@@ -1772,57 +1792,57 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
 "可能会自动运行文件系统检查"
 
-#: diskdrake/interactive.pm:861 diskdrake/interactive.pm:1423
+#: diskdrake/interactive.pm:939 diskdrake/interactive.pm:1478
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "文件系统加密密钥"
 
-#: diskdrake/interactive.pm:862
+#: diskdrake/interactive.pm:940
 #, c-format
 msgid "Enter your filesystem encryption key"
 msgstr "输入您的文件系统加密密钥"
 
-#: diskdrake/interactive.pm:863 diskdrake/interactive.pm:1431
+#: diskdrake/interactive.pm:941 diskdrake/interactive.pm:1486
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:870
+#: diskdrake/interactive.pm:948
 #, c-format
 msgid "Invalid key"
 msgstr "无效的密钥"
 
-#: diskdrake/interactive.pm:878
+#: diskdrake/interactive.pm:956
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:880 diskdrake/interactive.pm:901
+#: diskdrake/interactive.pm:958 diskdrake/interactive.pm:977
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:899
+#: diskdrake/interactive.pm:975
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:911 diskdrake/interactive.pm:920
+#: diskdrake/interactive.pm:987 diskdrake/interactive.pm:996
 #, c-format
 msgid "LVM name"
 msgstr "LVM 名称"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "Enter a name for the new LVM volume group"
 msgstr "输入新 LVM 卷组的名称"
 
-#: diskdrake/interactive.pm:917
+#: diskdrake/interactive.pm:993
 #, c-format
 msgid "\"%s\" already exists"
 msgstr "“%s”已经存在"
 
-#: diskdrake/interactive.pm:948
+#: diskdrake/interactive.pm:1024
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -1831,117 +1851,112 @@ msgstr ""
 "物理卷 %s 仍在使用中。\n"
 "您是否想要将此卷上已用的物理扩展分区移动到其它卷上？"
 
-#: diskdrake/interactive.pm:950
+#: diskdrake/interactive.pm:1026
 #, c-format
 msgid "Moving physical extents"
 msgstr "移动物理扩展分区"
 
-#: diskdrake/interactive.pm:968
+#: diskdrake/interactive.pm:1044
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:981
+#: diskdrake/interactive.pm:1057
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:982
+#: diskdrake/interactive.pm:1058
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:1063
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:990
+#: diskdrake/interactive.pm:1066
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:991
+#: diskdrake/interactive.pm:1067
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:1023 diskdrake/interactive.pm:1026
+#: diskdrake/interactive.pm:1099 diskdrake/interactive.pm:1102
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:1033
+#: diskdrake/interactive.pm:1109
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1155
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1156
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1175
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1190
 #, c-format
 msgid "Partitioning Type"
 msgstr "分区类型"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1190
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1173
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1237
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1204 fs/format.pm:99 fs/format.pm:106
+#: diskdrake/interactive.pm:1256 fs/format.pm:102 fs/format.pm:109
 #, c-format
 msgid "Formatting partition %s"
 msgstr "正在格式化分区 %s"
 
-#: diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1269
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1226 fs/partitioning.pm:48
-#, c-format
-msgid "Check bad blocks?"
-msgstr "是否检查坏磁块?"
-
-#: diskdrake/interactive.pm:1240
+#: diskdrake/interactive.pm:1292
 #, c-format
 msgid "Move files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1240
+#: diskdrake/interactive.pm:1292
 #, c-format
 msgid "Hide files"
 msgstr "隐藏文件"
 
-#: diskdrake/interactive.pm:1241
+#: diskdrake/interactive.pm:1293
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -1957,128 +1972,128 @@ msgstr ""
 "您可以选择将文件移动到即将挂载到该目录的分区，或者将其保留在原地(这将导致这些"
 "文件因为其它分区被挂载被隐藏)"
 
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1308
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1312
 #, c-format
 msgid "Copying %s"
 msgstr "复制 %s"
 
-#: diskdrake/interactive.pm:1264
+#: diskdrake/interactive.pm:1316
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: diskdrake/interactive.pm:1278
+#: diskdrake/interactive.pm:1330
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "分区 %s 现在被识别为 %s"
 
-#: diskdrake/interactive.pm:1279
+#: diskdrake/interactive.pm:1331
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "分区已被重新编号: "
 
-#: diskdrake/interactive.pm:1304 diskdrake/interactive.pm:1372
+#: diskdrake/interactive.pm:1356 diskdrake/interactive.pm:1427
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: diskdrake/interactive.pm:1305
+#: diskdrake/interactive.pm:1357
 #, c-format
 msgid "Volume label: "
 msgstr "卷标: "
 
-#: diskdrake/interactive.pm:1306
+#: diskdrake/interactive.pm:1358
 #, c-format
 msgid "UUID: "
 msgstr "UUDI: "
 
-#: diskdrake/interactive.pm:1307
+#: diskdrake/interactive.pm:1359
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 下的盘符: %s(只是猜测)\n"
 
-#: diskdrake/interactive.pm:1311 diskdrake/interactive.pm:1320
-#: diskdrake/interactive.pm:1391
+#: diskdrake/interactive.pm:1363 diskdrake/interactive.pm:1372
+#: diskdrake/interactive.pm:1446
 #, c-format
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1315 diskdrake/interactive.pm:1376
+#: diskdrake/interactive.pm:1367 diskdrake/interactive.pm:1431
 #, c-format
 msgid "Name: "
 msgstr "名称: "
 
-#: diskdrake/interactive.pm:1322
+#: diskdrake/interactive.pm:1374
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "开始: 第 %s 扇区\n"
 
-#: diskdrake/interactive.pm:1323
+#: diskdrake/interactive.pm:1375
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1325
+#: diskdrake/interactive.pm:1377
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇区"
 
-#: diskdrake/interactive.pm:1327
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "柱面 %d 到 %d\n"
 
-#: diskdrake/interactive.pm:1328
+#: diskdrake/interactive.pm:1380
 #, c-format
 msgid "Number of logical extents: %d\n"
 msgstr "逻辑分区数：%d\n"
 
-#: diskdrake/interactive.pm:1329
+#: diskdrake/interactive.pm:1381
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1330
+#: diskdrake/interactive.pm:1382
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1331
+#: diskdrake/interactive.pm:1383
 #, c-format
 msgid "Mounted\n"
 msgstr "已挂载\n"
 
-#: diskdrake/interactive.pm:1332
+#: diskdrake/interactive.pm:1384
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1334
+#: diskdrake/interactive.pm:1386
 #, c-format
 msgid "Encrypted"
 msgstr "已加密"
 
-#: diskdrake/interactive.pm:1334
+#: diskdrake/interactive.pm:1388
 #, c-format
 msgid " (mapped on %s)"
 msgstr " (已映射为 %s)"
 
-#: diskdrake/interactive.pm:1335
+#: diskdrake/interactive.pm:1389
 #, c-format
 msgid " (to map on %s)"
 msgstr "  (应映射为 %s)"
 
-#: diskdrake/interactive.pm:1336
+#: diskdrake/interactive.pm:1390
 #, c-format
 msgid " (inactive)"
 msgstr " (交互)"
 
-#: diskdrake/interactive.pm:1342
+#: diskdrake/interactive.pm:1397
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2087,7 +2102,7 @@ msgstr ""
 "回环文件: \n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1343
+#: diskdrake/interactive.pm:1398
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2096,27 +2111,27 @@ msgstr ""
 "预设的启动分区\n"
 "    (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
 
-#: diskdrake/interactive.pm:1345
+#: diskdrake/interactive.pm:1400
 #, c-format
 msgid "Level %s\n"
 msgstr "级别 %s\n"
 
-#: diskdrake/interactive.pm:1346
+#: diskdrake/interactive.pm:1401
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "组块大小 %d KB\n"
 
-#: diskdrake/interactive.pm:1347
+#: diskdrake/interactive.pm:1402
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1349
+#: diskdrake/interactive.pm:1404
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "回环文件名称: %s"
 
-#: diskdrake/interactive.pm:1352
+#: diskdrake/interactive.pm:1407
 #, c-format
 msgid ""
 "\n"
@@ -2128,7 +2143,7 @@ msgstr ""
 "此分区很可能是驱动器分区。\n"
 "您最好请不要更改它。\n"
 
-#: diskdrake/interactive.pm:1355
+#: diskdrake/interactive.pm:1410
 #, c-format
 msgid ""
 "\n"
@@ -2140,67 +2155,57 @@ msgstr ""
 "该 Bootstrap 分区特别\n"
 "是保留给双重启动系统。\n"
 
-#: diskdrake/interactive.pm:1364
+#: diskdrake/interactive.pm:1419
 #, c-format
 msgid "Free space on %s (%s)"
 msgstr "%s (%s) 上的空闲空间"
 
-#: diskdrake/interactive.pm:1373
+#: diskdrake/interactive.pm:1428
 #, c-format
 msgid "Read-only"
 msgstr "只读"
 
-#: diskdrake/interactive.pm:1374
+#: diskdrake/interactive.pm:1429
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1375
+#: diskdrake/interactive.pm:1430
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
 
-#: diskdrake/interactive.pm:1377
+#: diskdrake/interactive.pm:1432
 #, c-format
 msgid "Medium type: "
 msgstr "介质类型: "
 
-#: diskdrake/interactive.pm:1378
+#: diskdrake/interactive.pm:1433
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1379
+#: diskdrake/interactive.pm:1434
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "分区表类型: %s\n"
 
-#: diskdrake/interactive.pm:1380
+#: diskdrake/interactive.pm:1435
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1424
+#: diskdrake/interactive.pm:1479
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
 
-#: diskdrake/interactive.pm:1427
+#: diskdrake/interactive.pm:1482
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 
-#: diskdrake/interactive.pm:1428
-#, c-format
-msgid "The encryption keys do not match"
-msgstr "两次加密密钥不符"
-
-#: diskdrake/interactive.pm:1432
-#, c-format
-msgid "Encryption key (again)"
-msgstr "加密密钥(再输入一次)"
-
-#: diskdrake/interactive.pm:1434
+#: diskdrake/interactive.pm:1489
 #, c-format
 msgid "Encryption algorithm"
 msgstr "加密算法"
@@ -2302,32 +2307,32 @@ msgid ""
 msgstr ""
 "发生错误！新建文件系统时找不到可用的设备。请检查您的硬件以确定问题的原因"
 
-#: fs/any.pm:75 fs/partitioning_wizard.pm:61
+#: fs/any.pm:75 fs/partitioning_wizard.pm:62
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "您必须有一个FAT分区载入 /boot/efi"
 
-#: fs/format.pm:103
+#: fs/format.pm:106
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "正在创建和格式化文件 %s"
 
-#: fs/format.pm:122
+#: fs/format.pm:125
 #, c-format
 msgid "I do not know how to set label on %s with type %s"
 msgstr "不知道如何设定 %2$s 类型的 %1$s 卷标"
 
-#: fs/format.pm:131
+#: fs/format.pm:134
 #, c-format
 msgid "setting label on %s failed, is it formatted?"
 msgstr "设定 %s 的卷标失败，该卷是否已格式化？"
 
-#: fs/format.pm:172
+#: fs/format.pm:175
 #, c-format
 msgid "I do not know how to format %s in type %s"
 msgstr "不知道如何将 %s 格式化成 %s 类型"
 
-#: fs/format.pm:177 fs/format.pm:179
+#: fs/format.pm:180 fs/format.pm:182
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s 格式化 %s 失败"
@@ -2362,22 +2367,17 @@ msgstr "卸载 %s 出错: %s"
 msgid "Enabling swap partition %s"
 msgstr "正在启用 swap 分区 %s"
 
-#: fs/mount_options.pm:114
-#, c-format
-msgid "Use an encrypted file system"
-msgstr "使用加密的文件系统"
-
-#: fs/mount_options.pm:116
+#: fs/mount_options.pm:113
 #, c-format
 msgid "Flush write cache on file close"
 msgstr "关闭文件时清空缓存"
 
-#: fs/mount_options.pm:118
+#: fs/mount_options.pm:115
 #, c-format
 msgid "Enable group disk quota accounting and optionally enforce limits"
 msgstr "启用群组磁盘配额记账及可选强制限制"
 
-#: fs/mount_options.pm:120
+#: fs/mount_options.pm:117
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2386,7 +2386,7 @@ msgstr ""
 "不在此文件系统更新 inode 访问次数\n"
 "(例如, 为了加速对新闻服务器的新闻池的访问)"
 
-#: fs/mount_options.pm:123
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Update inode access times on this filesystem in a more efficient way\n"
@@ -2395,7 +2395,7 @@ msgstr ""
 "以更有效的方式更新文件系统中的 inode 访问次数\n"
 "(例如, 为了加速对新闻服务器的新闻池的访问)。"
 
-#: fs/mount_options.pm:126
+#: fs/mount_options.pm:123
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2404,12 +2404,12 @@ msgstr ""
 "只能显式装载。\n"
 "(即, -a 选项将不会装载文件系统)"
 
-#: fs/mount_options.pm:129
+#: 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:131
+#: fs/mount_options.pm:128
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2420,7 +2420,7 @@ msgstr ""
 "此选项对于特定服务器可能非常有用, 比如服务器所包含的文件系统中包含其它\n"
 "架构的二进制文件。"
 
-#: fs/mount_options.pm:135
+#: fs/mount_options.pm:132
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2430,42 +2430,42 @@ msgstr ""
 "不允许 set-user-identifier 或 set-group-identifier 位生效。\n"
 "(这可能比较安全, 如果您安装了 suidperl(1) 则不太安全。)"
 
-#: fs/mount_options.pm:139
+#: fs/mount_options.pm:136
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "以只读装载文件系统。"
 
-#: fs/mount_options.pm:141
+#: fs/mount_options.pm:138
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "所有到文件系统的输入/输出都应该是同步完成的。"
 
-#: fs/mount_options.pm:143
+#: fs/mount_options.pm:140
 #, c-format
 msgid "Allow every user to mount and umount the file system."
 msgstr "允许每个用户挂载和卸载文件系统。"
 
-#: fs/mount_options.pm:145
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Allow an ordinary user to mount the file system."
 msgstr "允许普通用户挂载文件系统。"
 
-#: fs/mount_options.pm:147
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Enable user disk quota accounting, and optionally enforce limits"
 msgstr "启用用户磁盘配额记账及可选强制限制"
 
-#: fs/mount_options.pm:149
+#: fs/mount_options.pm:146
 #, c-format
 msgid "Support \"user.\" extended attributes"
 msgstr "支持“user.”扩展属性"
 
-#: fs/mount_options.pm:151
+#: fs/mount_options.pm:148
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "给普通用户以写权限"
 
-#: fs/mount_options.pm:153
+#: fs/mount_options.pm:150
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "给普通用户以只读权限"
@@ -2518,7 +2518,7 @@ msgstr ""
 "请先创建一个 Linux 分区(或在图中单击现有的一个)。\n"
 "然后在列表里选择“挂载点”, 设为“/”。"
 
-#: fs/partitioning_wizard.pm:58
+#: fs/partitioning_wizard.pm:59
 #, c-format
 msgid ""
 "You do not have a swap partition.\n"
@@ -2529,42 +2529,42 @@ msgstr ""
 "\n"
 "要继续吗?"
 
-#: fs/partitioning_wizard.pm:92
+#: fs/partitioning_wizard.pm:93
 #, c-format
 msgid "Use free space"
 msgstr "使用空闲空间"
 
-#: fs/partitioning_wizard.pm:94
+#: fs/partitioning_wizard.pm:95
 #, c-format
 msgid "Not enough free space to allocate new partitions"
 msgstr "没有足够空闲空间分配给新分区"
 
-#: fs/partitioning_wizard.pm:102
+#: fs/partitioning_wizard.pm:103
 #, c-format
 msgid "Use existing partitions"
 msgstr "使用现存的分区"
 
-#: fs/partitioning_wizard.pm:104
+#: fs/partitioning_wizard.pm:105
 #, c-format
 msgid "There is no existing partition to use"
 msgstr "没有可使用的现存分区"
 
-#: fs/partitioning_wizard.pm:128
+#: fs/partitioning_wizard.pm:129
 #, c-format
 msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "正在计算 Microsoft Windows® 分区的大小"
 
-#: fs/partitioning_wizard.pm:164
+#: fs/partitioning_wizard.pm:165
 #, c-format
 msgid "Use the free space on a Microsoft Windows® partition"
 msgstr "使用在 Microsoft Windows® 分区上的空闲空间"
 
-#: fs/partitioning_wizard.pm:168
+#: fs/partitioning_wizard.pm:169
 #, c-format
 msgid "Which partition do you want to resize?"
 msgstr "您需要改变哪个分区的大小?"
 
-#: fs/partitioning_wizard.pm:171
+#: fs/partitioning_wizard.pm:172
 #, c-format
 msgid ""
 "Your Microsoft Windows® partition is too fragmented. Please reboot your "
@@ -2574,7 +2574,7 @@ msgstr ""
 "您的 Microsoft Windows® 分区有太多碎片, 请重新启动, 进入 Microsoft Windows®, "
 "运行磁盘碎片整理程序, 然后重新开始安装 Mandriva Linux"
 
-#: fs/partitioning_wizard.pm:179
+#: fs/partitioning_wizard.pm:180
 #, c-format
 msgid ""
 "WARNING!\n"
@@ -2608,73 +2608,73 @@ msgstr ""
 "一切就绪后, 请按“%s”。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:188 fs/partitioning_wizard.pm:551
+#: fs/partitioning_wizard.pm:189 fs/partitioning_wizard.pm:552
 #: interactive.pm:549 interactive/curses.pm:263 ugtk2.pm:519
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: fs/partitioning_wizard.pm:194
+#: fs/partitioning_wizard.pm:195
 #, c-format
 msgid "Partitionning"
 msgstr "分区"
 
-#: fs/partitioning_wizard.pm:194
+#: fs/partitioning_wizard.pm:195
 #, c-format
 msgid "Which size do you want to keep for Microsoft Windows® on partition %s?"
 msgstr "您将保留多少空间给 Microsoft Windows® 分区 %s?"
 
-#: fs/partitioning_wizard.pm:195
+#: fs/partitioning_wizard.pm:196
 #, c-format
 msgid "Size"
 msgstr "大小"
 
-#: fs/partitioning_wizard.pm:204
+#: fs/partitioning_wizard.pm:205
 #, c-format
 msgid "Resizing Microsoft Windows® partition"
 msgstr "改变 Microsoft Windows® 分区大小"
 
-#: fs/partitioning_wizard.pm:209
+#: fs/partitioning_wizard.pm:210
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT 调整大小失败: %s"
 
-#: fs/partitioning_wizard.pm:225
+#: fs/partitioning_wizard.pm:226
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr "没有 FAT 分区用来调整大小(或者没有足够剩余空间)"
 
-#: fs/partitioning_wizard.pm:230
+#: fs/partitioning_wizard.pm:231
 #, c-format
 msgid "Remove Microsoft Windows®"
 msgstr "删除 Microsoft Windows®"
 
-#: fs/partitioning_wizard.pm:230
+#: fs/partitioning_wizard.pm:231
 #, c-format
 msgid "Erase and use entire disk"
 msgstr "清除并使用整个磁盘"
 
-#: fs/partitioning_wizard.pm:234
+#: fs/partitioning_wizard.pm:235
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
 
-#: fs/partitioning_wizard.pm:242 fsedit.pm:600
+#: fs/partitioning_wizard.pm:243 fsedit.pm:610
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "磁盘 %s 上现存的所有分区及其资料将被清除"
 
-#: fs/partitioning_wizard.pm:252
+#: fs/partitioning_wizard.pm:253
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "自定义磁盘分区"
 
-#: fs/partitioning_wizard.pm:258
+#: fs/partitioning_wizard.pm:259
 #, c-format
 msgid "Use fdisk"
 msgstr "使用 fdisk"
 
-#: fs/partitioning_wizard.pm:261
+#: fs/partitioning_wizard.pm:262
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -2683,37 +2683,37 @@ msgstr ""
 "您现在可以在 %s 上分区。\n"
 "做完之后, 不要忘记用“w”命令保存您的修改"
 
-#: fs/partitioning_wizard.pm:401
+#: fs/partitioning_wizard.pm:402
 #, fuzzy, c-format
 msgid "Ext2/3/4"
 msgstr "Ext3"
 
-#: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:571
+#: fs/partitioning_wizard.pm:432 fs/partitioning_wizard.pm:572
 #, c-format
 msgid "I can not find any room for installing"
 msgstr "我无法找到安装需要的空间"
 
-#: fs/partitioning_wizard.pm:440 fs/partitioning_wizard.pm:578
+#: fs/partitioning_wizard.pm:441 fs/partitioning_wizard.pm:579
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX 分区向导找到下列解决办法:"
 
-#: fs/partitioning_wizard.pm:511
+#: fs/partitioning_wizard.pm:512
 #, c-format
 msgid "Here is the content of your disk drive "
 msgstr "这是您硬盘驱动器的内容 "
 
-#: fs/partitioning_wizard.pm:588
+#: fs/partitioning_wizard.pm:589
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "分区失败: %s"
 
-#: fs/type.pm:390
+#: fs/type.pm:393
 #, c-format
 msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
 
-#: fs/type.pm:391
+#: fs/type.pm:394
 #, c-format
 msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
@@ -2783,13 +2783,29 @@ msgstr ""
 "所以, 请增加一个 /boot 分区。"
 
 #: fsedit.pm:437
+#, fuzzy, c-format
+msgid ""
+"You've selected an encrypted partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
+msgstr ""
+"您选择了把软件 RAID 分区作为根(/)。\n"
+"如果没有一个 /boot 分区, 各种启动引导程序都无法处理这种情况。\n"
+"所以, 请增加一个 /boot 分区。"
+
+#: fsedit.pm:443 fsedit.pm:461
+#, c-format
+msgid "You can not use an encrypted file system for mount point %s"
+msgstr "挂载点 %s 不能使用用加密的文件系统"
+
+#: fsedit.pm:447
 #, c-format
 msgid ""
 "You can not use the LVM Logical Volume for mount point %s since it spans "
 "physical volumes"
 msgstr "您不能为挂载点 %s 使用 LVM 逻辑卷，因为该卷跨越了多个物理卷"
 
-#: fsedit.pm:439
+#: fsedit.pm:449
 #, c-format
 msgid ""
 "You've selected the LVM Logical Volume as root (/).\n"
@@ -2801,29 +2817,24 @@ msgstr ""
 "引导程序无法识别跨越多个物理卷的卷。\n"
 "您应该先创建 /boot 分区"
 
-#: fsedit.pm:443 fsedit.pm:445
+#: fsedit.pm:453 fsedit.pm:455
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "这个目录应该保留在根文件系统中"
 
-#: fsedit.pm:447 fsedit.pm:449
+#: fsedit.pm:457 fsedit.pm:459
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount "
 "point\n"
 msgstr "这个挂载点需要一个真正的文件系统(ext2/ext3、reiserfs、xfs 或 jfs)\n"
 
-#: fsedit.pm:451
-#, c-format
-msgid "You can not use an encrypted file system for mount point %s"
-msgstr "挂载点 %s 不能使用用加密的文件系统"
-
-#: fsedit.pm:516
+#: fsedit.pm:526
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "没有足够的空闲空间供自动分配"
 
-#: fsedit.pm:518
+#: fsedit.pm:528
 #, c-format
 msgid "Nothing to do"
 msgstr "不做任何事"
@@ -6891,6 +6902,19 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid "Restrict command line options"
+#~ msgstr "限制命令行选项"
+
+#~ msgid "restrict"
+#~ msgstr "限制"
+
+#~ msgid ""
+#~ "Option ``Restrict command line options'' is of no use without a password"
+#~ msgstr "没有密码不能使用“限定命令行选项”"
+
+#~ msgid "Use an encrypted file system"
+#~ msgstr "使用加密的文件系统"
+
 #~ msgid ""
 #~ "To ensure data integrity after resizing the partition(s), \n"
 #~ "filesystem checks will be run on your next boot into Microsoft Windows®"