sync with code

1 files changed, 403 insertions, 369 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 0e6f848ba..547368766 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: 2008-09-19 15:04+0200\n"
+"POT-Creation-Date: 2009-01-16 11:40+0100\n"
 "PO-Revision-Date: 2008-03-29 21:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: any.pm:252 any.pm:855 diskdrake/interactive.pm:580
-#: diskdrake/interactive.pm:767 diskdrake/interactive.pm:811
-#: diskdrake/interactive.pm:897 diskdrake/interactive.pm:1151
-#: diskdrake/interactive.pm:1203 do_pkgs.pm:221 do_pkgs.pm:267
-#: harddrake/sound.pm:285 interactive.pm:584 pkgs.pm:258
+#: any.pm:252 any.pm:862 diskdrake/interactive.pm:580
+#: diskdrake/interactive.pm:775 diskdrake/interactive.pm:819
+#: diskdrake/interactive.pm:905 diskdrake/interactive.pm:1159
+#: diskdrake/interactive.pm:1211 do_pkgs.pm:221 do_pkgs.pm:267
+#: harddrake/sound.pm:285 interactive.pm:587 pkgs.pm:265
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -101,7 +101,7 @@ msgstr "根分区的第一扇区"
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:354 pkgs.pm:254
+#: any.pm:354 pkgs.pm:261 ugtk2.pm:526
 #, c-format
 msgid "Skip"
 msgstr "跳过"
@@ -116,234 +116,239 @@ msgstr "引导程序安装"
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:388
+#: any.pm:389
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:398 any.pm:427 any.pm:428
+#: any.pm:399 any.pm:429 any.pm:430
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
-#: any.pm:402
+#: any.pm:403
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:403 any.pm:431
+#: any.pm:404 any.pm:433
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:405 any.pm:433
+#: any.pm:406 any.pm:435
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
 
-#: any.pm:407
+#: any.pm:408
 #, c-format
 msgid "Main options"
 msgstr "主选项"
 
-#: any.pm:408
+#: any.pm:409
 #, c-format
 msgid "Delay before booting default image"
 msgstr "启动默认映像前的延迟"
 
-#: any.pm:409
+#: any.pm:410
 #, c-format
 msgid "Enable ACPI"
 msgstr "启用 ACPI"
 
-#: any.pm:410
+#: any.pm:411
+#, fuzzy, c-format
+msgid "Enable SMP"
+msgstr "启用 ACPI"
+
+#: any.pm:412
 #, c-format
 msgid "Enable APIC"
 msgstr "启用 APIC"
 
-#: any.pm:411
+#: any.pm:413
 #, c-format
 msgid "Enable Local APIC"
 msgstr "启用本地 APIC"
 
-#: any.pm:413 any.pm:802 any.pm:817 authentication.pm:245
+#: any.pm:415 any.pm:809 any.pm:824 authentication.pm:245
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "密码"
 
-#: any.pm:415 authentication.pm:256
+#: any.pm:417 authentication.pm:256
 #, c-format
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:415 authentication.pm:256 diskdrake/interactive.pm:1375
+#: any.pm:417 authentication.pm:256 diskdrake/interactive.pm:1383
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
 
-#: any.pm:416
+#: any.pm:418
 #, c-format
 msgid "You can not use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:419 any.pm:804 any.pm:819 authentication.pm:246
+#: any.pm:421 any.pm:811 any.pm:826 authentication.pm:246
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: any.pm:420
+#: any.pm:422
 #, c-format
 msgid "Restrict command line options"
 msgstr "限制命令行选项"
 
-#: any.pm:420
+#: any.pm:422
 #, c-format
 msgid "restrict"
 msgstr "限制"
 
-#: any.pm:421
+#: any.pm:423
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "没有密码不能使用“限定命令行选项”"
 
-#: any.pm:423
+#: any.pm:425
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次启动时清除 /tmp"
 
-#: any.pm:432
+#: any.pm:434
 #, c-format
 msgid "Init Message"
 msgstr "初始信息"
 
-#: any.pm:434
+#: any.pm:436
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "开放固件延迟"
 
-#: any.pm:435
+#: any.pm:437
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心启动超时"
 
-#: any.pm:436
+#: any.pm:438
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允许 CD 启动?"
 
-#: any.pm:437
+#: any.pm:439
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "启用 OF 启动?"
 
-#: any.pm:438
+#: any.pm:440
 #, c-format
 msgid "Default OS?"
 msgstr "默认操作系统?"
 
-#: any.pm:506
+#: any.pm:513
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:507 any.pm:520
+#: any.pm:514 any.pm:527
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:508 any.pm:533
+#: any.pm:515 any.pm:540
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:510
+#: any.pm:517
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:513
+#: any.pm:520
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:515
+#: any.pm:522
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:516
+#: any.pm:523
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:525 any.pm:530 any.pm:532 diskdrake/interactive.pm:400
+#: any.pm:532 any.pm:537 any.pm:539 diskdrake/interactive.pm:400
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:527 any.pm:535 harddrake/v4l.pm:438
+#: any.pm:534 any.pm:542 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:534
+#: any.pm:541
 #, c-format
 msgid "NoVideo"
 msgstr "无视频"
 
-#: any.pm:545
+#: any.pm:552
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:546
+#: any.pm:553
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:546
+#: any.pm:553
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:547
+#: any.pm:554
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:565
+#: any.pm:572
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:566
+#: any.pm:573
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:566
+#: any.pm:573
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其它操作系统(SunOS...)"
 
-#: any.pm:567
+#: any.pm:574
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其它操作系统(MacOS...)"
 
-#: any.pm:567
+#: any.pm:574
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:594
+#: any.pm:601
 #, c-format
 msgid "Bootloader Configuration"
 msgstr "引导程序配置"
 
-#: any.pm:595
+#: any.pm:602
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -352,188 +357,188 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:763
+#: any.pm:770
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:764
+#: any.pm:771
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:765
+#: any.pm:772
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:766
+#: any.pm:773
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:767
+#: any.pm:774
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:768
+#: any.pm:775
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:774
+#: any.pm:781
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:780
+#: any.pm:787
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:781
+#: any.pm:788
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "用户名只能包含小写字母、数字、“-”和“_”"
 
-#: any.pm:782
+#: any.pm:789
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:783
+#: any.pm:790
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:789 any.pm:821
+#: any.pm:796 any.pm:828
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:789 any.pm:822
+#: any.pm:796 any.pm:829
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:790
+#: any.pm:797
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:791
+#: any.pm:798
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s 应该大于 500。仍然接受吗？"
 
-#: any.pm:795
+#: any.pm:802
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:801 authentication.pm:232
+#: any.pm:808 authentication.pm:232
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:806
+#: any.pm:813
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:808
+#: any.pm:815
 #, c-format
 msgid "Icon"
 msgstr "图标"
 
-#: any.pm:811
+#: any.pm:818
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:815
+#: any.pm:822
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:820
+#: any.pm:827
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:855
+#: any.pm:862
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: any.pm:883 security/l10n.pm:14
+#: any.pm:890 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:884
+#: any.pm:891
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:885
+#: any.pm:892
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:886
+#: any.pm:893
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:887
+#: any.pm:894
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:898 any.pm:918 any.pm:979
+#: any.pm:905 any.pm:925 any.pm:986
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:925 any.pm:1271 interactive/gtk.pm:797
+#: any.pm:932 any.pm:1278 interactive/gtk.pm:808
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:965
+#: any.pm:972
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:967 diskdrake/dav.pm:26
+#: any.pm:974 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:974
+#: any.pm:981
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "您接受此许可协议吗?"
 
-#: any.pm:975
+#: any.pm:982
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:975
+#: any.pm:982
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:1001 any.pm:1067
+#: any.pm:1008 any.pm:1074
 #, c-format
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
-#: any.pm:1030
+#: any.pm:1037
 #, c-format
 msgid ""
 "Mandriva Linux can support multiple languages. Select\n"
@@ -543,77 +548,77 @@ msgstr ""
 "Mandriva Linux 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:1033
+#: any.pm:1040
 #, c-format
 msgid "Multi languages"
 msgstr "多语言"
 
-#: any.pm:1044 any.pm:1076
+#: any.pm:1051 any.pm:1083
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:1046
+#: any.pm:1053
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1068
+#: any.pm:1075
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:1122
+#: any.pm:1129
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1123
+#: any.pm:1130
 #, c-format
 msgid "Please choose your country"
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1125
+#: any.pm:1132
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1126
+#: any.pm:1133
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1126 interactive.pm:485 interactive/gtk.pm:445
+#: any.pm:1133 interactive.pm:488 interactive/gtk.pm:445
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1132
+#: any.pm:1139
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1135
+#: any.pm:1142
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1216
+#: any.pm:1223
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1216
+#: any.pm:1223
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1216
+#: any.pm:1223
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1220
+#: any.pm:1227
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -626,32 +631,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1232
+#: any.pm:1239
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1235
+#: any.pm:1242
 #, 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:1243
+#: any.pm:1250
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1271
+#: any.pm:1278
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1273
+#: any.pm:1280
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -660,52 +665,52 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1366
+#: any.pm:1380
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "请注销, 然后同时按 Ctrl-Alt-BackSpace"
 
-#: any.pm:1370
+#: any.pm:1384
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1405
+#: any.pm:1419
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1405
+#: any.pm:1419
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1428 any.pm:1430
+#: any.pm:1442 any.pm:1444
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1431
+#: any.pm:1445
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1435
+#: any.pm:1449
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1436
+#: any.pm:1450
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1438
+#: any.pm:1452
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1439
+#: any.pm:1453
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -1021,7 +1026,7 @@ msgid "Domain Admin Password"
 msgstr "域管理员密码"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:925
+#: bootloader.pm:953
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1036,56 +1041,56 @@ msgstr ""
 "wait for default boot.\n"
 "\n"
 
-#: bootloader.pm:1093
+#: bootloader.pm:1122
 #, c-format
 msgid "LILO with text menu"
 msgstr "文本菜单 LILO"
 
-#: bootloader.pm:1094
+#: bootloader.pm:1123
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1095
+#: bootloader.pm:1124
 #, c-format
 msgid "GRUB with text menu"
 msgstr "文本菜单 GRUB"
 
-#: bootloader.pm:1096
+#: bootloader.pm:1125
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1097
+#: bootloader.pm:1126
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1208
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:1826
+#: bootloader.pm:1864
 #, c-format
 msgid "You can not install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:1947
+#: bootloader.pm:1985
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:1960
+#: bootloader.pm:1998
 #, c-format
 msgid ""
 "The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:1961
+#: bootloader.pm:1999
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -1168,15 +1173,15 @@ msgid "Server"
 msgstr "服务器"
 
 #: diskdrake/dav.pm:64 diskdrake/interactive.pm:397
-#: diskdrake/interactive.pm:639 diskdrake/interactive.pm:657
-#: diskdrake/interactive.pm:661 diskdrake/removable.pm:23
+#: diskdrake/interactive.pm:647 diskdrake/interactive.pm:665
+#: diskdrake/interactive.pm:669 diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "挂载点"
 
 #: diskdrake/dav.pm:65 diskdrake/interactive.pm:399
-#: diskdrake/interactive.pm:1045 diskdrake/removable.pm:24
+#: diskdrake/interactive.pm:1053 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
@@ -1191,11 +1196,11 @@ msgstr "完成"
 #: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:123 diskdrake/hd_gtk.pm:290
 #: diskdrake/interactive.pm:244 diskdrake/interactive.pm:257
 #: diskdrake/interactive.pm:506 diskdrake/interactive.pm:511
-#: diskdrake/interactive.pm:629 diskdrake/interactive.pm:915
-#: diskdrake/interactive.pm:1091 diskdrake/interactive.pm:1104
-#: diskdrake/interactive.pm:1107 diskdrake/interactive.pm:1375
+#: diskdrake/interactive.pm:637 diskdrake/interactive.pm:923
+#: diskdrake/interactive.pm:1099 diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1115 diskdrake/interactive.pm:1383
 #: 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 fsedit.pm:237 interactive/http.pm:117
+#: do_pkgs.pm:60 do_pkgs.pm:65 fsedit.pm:245 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 wizards.pm:99
 #: wizards.pm:121
@@ -1219,12 +1224,12 @@ msgid "Server: "
 msgstr "服务器: "
 
 #: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
-#: diskdrake/interactive.pm:1250 diskdrake/interactive.pm:1335
+#: diskdrake/interactive.pm:1258 diskdrake/interactive.pm:1343
 #, c-format
 msgid "Mount point: "
 msgstr "挂载点: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1342
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1350
 #, c-format
 msgid "Options: %s"
 msgstr "选项: %s"
@@ -1243,8 +1248,8 @@ msgstr "分区"
 msgid "Click on a partition, choose a filesystem type then choose an action"
 msgstr "点击分区，选择文件系统类型，然后选择操作"
 
-#: diskdrake/hd_gtk.pm:105 diskdrake/interactive.pm:1066
-#: diskdrake/interactive.pm:1076 diskdrake/interactive.pm:1129
+#: diskdrake/hd_gtk.pm:105 diskdrake/interactive.pm:1074
+#: diskdrake/interactive.pm:1084 diskdrake/interactive.pm:1137
 #, c-format
 msgid "Read carefully"
 msgstr "请仔细阅读！"
@@ -1264,8 +1269,8 @@ msgstr "退出"
 msgid "Continue"
 msgstr "继续"
 
-#: diskdrake/hd_gtk.pm:178 interactive.pm:650 interactive/gtk.pm:789
-#: interactive/gtk.pm:807 interactive/gtk.pm:828 ugtk2.pm:938
+#: diskdrake/hd_gtk.pm:178 interactive.pm:653 interactive/gtk.pm:800
+#: interactive/gtk.pm:818 interactive/gtk.pm:839 ugtk2.pm:936
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -1336,7 +1341,7 @@ msgstr "Windows"
 msgid "Other"
 msgstr "其它"
 
-#: diskdrake/hd_gtk.pm:380 diskdrake/interactive.pm:1265
+#: diskdrake/hd_gtk.pm:380 diskdrake/interactive.pm:1273
 #, c-format
 msgid "Empty"
 msgstr "空"
@@ -1348,10 +1353,10 @@ msgstr "文件系统类型: "
 
 #: diskdrake/hd_gtk.pm:408 diskdrake/interactive.pm:300
 #: diskdrake/interactive.pm:385 diskdrake/interactive.pm:536
-#: diskdrake/interactive.pm:720 diskdrake/interactive.pm:778
-#: diskdrake/interactive.pm:895 diskdrake/interactive.pm:937
-#: diskdrake/interactive.pm:938 diskdrake/interactive.pm:1188
-#: diskdrake/interactive.pm:1226 diskdrake/interactive.pm:1374 do_pkgs.pm:19
+#: diskdrake/interactive.pm:728 diskdrake/interactive.pm:786
+#: diskdrake/interactive.pm:903 diskdrake/interactive.pm:945
+#: diskdrake/interactive.pm:946 diskdrake/interactive.pm:1196
+#: diskdrake/interactive.pm:1234 diskdrake/interactive.pm:1382 do_pkgs.pm:19
 #: do_pkgs.pm:39 do_pkgs.pm:57 harddrake/sound.pm:422
 #, c-format
 msgid "Warning"
@@ -1396,7 +1401,7 @@ msgid "More"
 msgstr "更多"
 
 #: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
-#: diskdrake/interactive.pm:1173
+#: diskdrake/interactive.pm:1181
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1489,7 +1494,7 @@ msgstr "重新读取分区表"
 msgid "Detailed information"
 msgstr "详细信息"
 
-#: diskdrake/interactive.pm:401 diskdrake/interactive.pm:733
+#: diskdrake/interactive.pm:401 diskdrake/interactive.pm:741
 #, c-format
 msgid "Resize"
 msgstr "改变大小"
@@ -1499,12 +1504,12 @@ msgstr "改变大小"
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:404 diskdrake/interactive.pm:843
+#: diskdrake/interactive.pm:404 diskdrake/interactive.pm:851
 #, c-format
 msgid "Add to RAID"
 msgstr "加入 RAID"
 
-#: diskdrake/interactive.pm:405 diskdrake/interactive.pm:861
+#: diskdrake/interactive.pm:405 diskdrake/interactive.pm:869
 #, c-format
 msgid "Add to LVM"
 msgstr "加入 LVM"
@@ -1559,12 +1564,12 @@ msgstr "创建一个新分区"
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:475 diskdrake/interactive.pm:930
+#: diskdrake/interactive.pm:475 diskdrake/interactive.pm:938
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:931
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:939
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
@@ -1616,27 +1621,37 @@ msgstr "您希望使用哪种文件系统?"
 msgid "Switching from %s to %s"
 msgstr "从 %s 切换到 %s"
 
-#: diskdrake/interactive.pm:606 diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:608
+#, fuzzy, c-format
+msgid "Set volume label"
+msgstr "哪个卷标？"
+
+#: diskdrake/interactive.pm:608
+#, c-format
+msgid "Beware, this will be written to disk as soon as you validate!"
+msgstr ""
+
+#: diskdrake/interactive.pm:610
 #, c-format
 msgid "Which volume label?"
 msgstr "哪个卷标？"
 
-#: diskdrake/interactive.pm:610
+#: diskdrake/interactive.pm:611
 #, c-format
 msgid "Label:"
 msgstr "标签:"
 
-#: diskdrake/interactive.pm:624
+#: diskdrake/interactive.pm:632
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:625
+#: diskdrake/interactive.pm:633
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您想把设备 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:630
+#: diskdrake/interactive.pm:638
 #, c-format
 msgid ""
 "Can not unset mount point as this partition is used for loop back.\n"
@@ -1645,107 +1660,107 @@ msgstr ""
 "无法取消设定的挂载点, 因为该分区正用于回环。\n"
 "请先删除回环"
 
-#: diskdrake/interactive.pm:660
+#: diskdrake/interactive.pm:668
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "您想把 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:684 diskdrake/interactive.pm:767
+#: diskdrake/interactive.pm:692 diskdrake/interactive.pm:775
 #: fs/partitioning_wizard.pm:146 fs/partitioning_wizard.pm:178
 #, c-format
 msgid "Resizing"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:684
+#: diskdrake/interactive.pm:692
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "计算 FAT 文件系统的边界"
 
-#: diskdrake/interactive.pm:720
+#: diskdrake/interactive.pm:728
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "无法更改此分区的大小"
 
-#: diskdrake/interactive.pm:725
+#: diskdrake/interactive.pm:733
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "应该先备份在这个分区上的所有数据"
 
-#: diskdrake/interactive.pm:727
+#: diskdrake/interactive.pm:735
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
 
-#: diskdrake/interactive.pm:734
+#: diskdrake/interactive.pm:742
 #, c-format
 msgid "Choose the new size"
 msgstr "选择新的大小"
 
-#: diskdrake/interactive.pm:735
+#: diskdrake/interactive.pm:743
 #, c-format
 msgid "New size in MB: "
 msgstr "新大小(MB): "
 
-#: diskdrake/interactive.pm:736
+#: diskdrake/interactive.pm:744
 #, c-format
 msgid "Minimum size: %s MB"
 msgstr "最小大小：%s MB"
 
-#: diskdrake/interactive.pm:737
+#: diskdrake/interactive.pm:745
 #, c-format
 msgid "Maximum size: %s MB"
 msgstr "最大大小：%s MB"
 
-#: diskdrake/interactive.pm:778 fs/partitioning_wizard.pm:186
-#, c-format
+#: diskdrake/interactive.pm:786
+#, fuzzy, c-format
 msgid ""
-"To ensure data integrity after resizing the partition(s), \n"
+"To ensure data integrity after resizing the partition(s),\n"
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
 "可能会自动运行文件系统检查。"
 
-#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#: diskdrake/interactive.pm:834 diskdrake/interactive.pm:1378
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "文件系统加密密钥"
 
-#: diskdrake/interactive.pm:827
+#: diskdrake/interactive.pm:835
 #, c-format
 msgid "Enter your filesystem encryption key"
 msgstr "输入您的文件系统加密密钥"
 
-#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#: diskdrake/interactive.pm:836 diskdrake/interactive.pm:1386
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:835
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Invalid key"
 msgstr "无效的密钥"
 
-#: diskdrake/interactive.pm:843
+#: diskdrake/interactive.pm:851
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:845 diskdrake/interactive.pm:863
+#: diskdrake/interactive.pm:853 diskdrake/interactive.pm:871
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:861
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:868
+#: diskdrake/interactive.pm:876
 #, c-format
 msgid "LVM name?"
 msgstr "LVM 名称?"
 
-#: diskdrake/interactive.pm:895
+#: diskdrake/interactive.pm:903
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -1754,117 +1769,117 @@ msgstr ""
 "物理卷 %s 仍在使用中。\n"
 "您是否想要将此卷上已用的物理扩展分区移动到其它卷上？"
 
-#: diskdrake/interactive.pm:897
+#: diskdrake/interactive.pm:905
 #, c-format
 msgid "Moving physical extents"
 msgstr "移动物理扩展分区"
 
-#: diskdrake/interactive.pm:915
+#: diskdrake/interactive.pm:923
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:928
+#: diskdrake/interactive.pm:936
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:929
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:934
+#: diskdrake/interactive.pm:942
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:937
+#: diskdrake/interactive.pm:945
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:938
+#: diskdrake/interactive.pm:946
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:970 diskdrake/interactive.pm:973
+#: diskdrake/interactive.pm:978 diskdrake/interactive.pm:981
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:980
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1047
+#: diskdrake/interactive.pm:1055
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1048
+#: diskdrake/interactive.pm:1056
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1049
+#: diskdrake/interactive.pm:1057
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1067
+#: diskdrake/interactive.pm:1075
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1082
+#: diskdrake/interactive.pm:1090
 #, c-format
 msgid "Partitioning Type"
 msgstr "分区类型"
 
-#: diskdrake/interactive.pm:1082
+#: diskdrake/interactive.pm:1090
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1128
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1129
+#: diskdrake/interactive.pm:1137
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#: diskdrake/interactive.pm:1159 fs/format.pm:96 fs/format.pm:103
 #, c-format
 msgid "Formatting partition %s"
 msgstr "正在格式化分区 %s"
 
-#: diskdrake/interactive.pm:1164
+#: diskdrake/interactive.pm:1172
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1173 fs/partitioning.pm:48
+#: diskdrake/interactive.pm:1181 fs/partitioning.pm:48
 #, c-format
 msgid "Check bad blocks?"
 msgstr "是否检查坏磁块?"
 
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1195
 #, c-format
 msgid "Move files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1195
 #, c-format
 msgid "Hide files"
 msgstr "隐藏文件"
 
-#: diskdrake/interactive.pm:1188
+#: diskdrake/interactive.pm:1196
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -1880,128 +1895,128 @@ msgstr ""
 "您可以选择将文件移动到即将挂载到该目录的分区，或者将其保留在原地(这将导致这些"
 "文件因为其它分区被挂载被隐藏)"
 
-#: diskdrake/interactive.pm:1203
+#: diskdrake/interactive.pm:1211
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1207
+#: diskdrake/interactive.pm:1215
 #, c-format
 msgid "Copying %s"
 msgstr "复制 %s"
 
-#: diskdrake/interactive.pm:1211
+#: diskdrake/interactive.pm:1219
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: diskdrake/interactive.pm:1225
+#: diskdrake/interactive.pm:1233
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "分区 %s 现在被识别为 %s"
 
-#: diskdrake/interactive.pm:1226
+#: diskdrake/interactive.pm:1234
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "分区已被重新编号: "
 
-#: diskdrake/interactive.pm:1251 diskdrake/interactive.pm:1319
+#: diskdrake/interactive.pm:1259 diskdrake/interactive.pm:1327
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: diskdrake/interactive.pm:1252
+#: diskdrake/interactive.pm:1260
 #, c-format
 msgid "Volume label: "
 msgstr "卷标: "
 
-#: diskdrake/interactive.pm:1253
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "UUID: "
 msgstr "UUDI: "
 
-#: diskdrake/interactive.pm:1254
+#: diskdrake/interactive.pm:1262
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 下的盘符: %s(只是猜测)\n"
 
-#: diskdrake/interactive.pm:1258 diskdrake/interactive.pm:1267
-#: diskdrake/interactive.pm:1338
+#: diskdrake/interactive.pm:1266 diskdrake/interactive.pm:1275
+#: diskdrake/interactive.pm:1346
 #, c-format
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1262 diskdrake/interactive.pm:1323
+#: diskdrake/interactive.pm:1270 diskdrake/interactive.pm:1331
 #, c-format
 msgid "Name: "
 msgstr "名称: "
 
-#: diskdrake/interactive.pm:1269
+#: diskdrake/interactive.pm:1277
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "开始: 第 %s 扇区\n"
 
-#: diskdrake/interactive.pm:1270
+#: diskdrake/interactive.pm:1278
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1272
+#: diskdrake/interactive.pm:1280
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇区"
 
-#: diskdrake/interactive.pm:1274
+#: diskdrake/interactive.pm:1282
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "柱面 %d 到 %d\n"
 
-#: diskdrake/interactive.pm:1275
+#: diskdrake/interactive.pm:1283
 #, c-format
 msgid "Number of logical extents: %d\n"
 msgstr "逻辑分区数：%d\n"
 
-#: diskdrake/interactive.pm:1276
+#: diskdrake/interactive.pm:1284
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1277
+#: diskdrake/interactive.pm:1285
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1278
+#: diskdrake/interactive.pm:1286
 #, c-format
 msgid "Mounted\n"
 msgstr "已挂载\n"
 
-#: diskdrake/interactive.pm:1279
+#: diskdrake/interactive.pm:1287
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1281
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid "Encrypted"
 msgstr "已加密"
 
-#: diskdrake/interactive.pm:1281
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid " (mapped on %s)"
 msgstr " (已映射为 %s)"
 
-#: diskdrake/interactive.pm:1282
+#: diskdrake/interactive.pm:1290
 #, c-format
 msgid " (to map on %s)"
 msgstr "  (应映射为 %s)"
 
-#: diskdrake/interactive.pm:1283
+#: diskdrake/interactive.pm:1291
 #, c-format
 msgid " (inactive)"
 msgstr " (交互)"
 
-#: diskdrake/interactive.pm:1289
+#: diskdrake/interactive.pm:1297
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2010,7 +2025,7 @@ msgstr ""
 "回环文件: \n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1290
+#: diskdrake/interactive.pm:1298
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2019,27 +2034,27 @@ msgstr ""
 "预设的启动分区\n"
 "    (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
 
-#: diskdrake/interactive.pm:1292
+#: diskdrake/interactive.pm:1300
 #, c-format
 msgid "Level %s\n"
 msgstr "级别 %s\n"
 
-#: diskdrake/interactive.pm:1293
+#: diskdrake/interactive.pm:1301
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "组块大小 %d KB\n"
 
-#: diskdrake/interactive.pm:1294
+#: diskdrake/interactive.pm:1302
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1304
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "回环文件名称: %s"
 
-#: diskdrake/interactive.pm:1299
+#: diskdrake/interactive.pm:1307
 #, c-format
 msgid ""
 "\n"
@@ -2051,7 +2066,7 @@ msgstr ""
 "此分区很可能是驱动器分区。\n"
 "您最好请不要更改它。\n"
 
-#: diskdrake/interactive.pm:1302
+#: diskdrake/interactive.pm:1310
 #, c-format
 msgid ""
 "\n"
@@ -2063,67 +2078,67 @@ msgstr ""
 "该 Bootstrap 分区特别\n"
 "是保留给双重启动系统。\n"
 
-#: diskdrake/interactive.pm:1311
+#: diskdrake/interactive.pm:1319
 #, c-format
 msgid "Free space on %s (%s)"
 msgstr "%s (%s) 上的空闲空间"
 
-#: diskdrake/interactive.pm:1320
+#: diskdrake/interactive.pm:1328
 #, c-format
 msgid "Read-only"
 msgstr "只读"
 
-#: diskdrake/interactive.pm:1321
+#: diskdrake/interactive.pm:1329
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1322
+#: diskdrake/interactive.pm:1330
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
 
-#: diskdrake/interactive.pm:1324
+#: diskdrake/interactive.pm:1332
 #, c-format
 msgid "Medium type: "
 msgstr "介质类型: "
 
-#: diskdrake/interactive.pm:1325
+#: diskdrake/interactive.pm:1333
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1326
+#: diskdrake/interactive.pm:1334
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "分区表类型: %s\n"
 
-#: diskdrake/interactive.pm:1327
+#: diskdrake/interactive.pm:1335
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1371
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
 
-#: diskdrake/interactive.pm:1374
+#: diskdrake/interactive.pm:1382
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 
-#: diskdrake/interactive.pm:1375
+#: diskdrake/interactive.pm:1383
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:1379
+#: diskdrake/interactive.pm:1387
 #, c-format
 msgid "Encryption key (again)"
 msgstr "加密密钥(再输入一次)"
 
-#: diskdrake/interactive.pm:1381
+#: diskdrake/interactive.pm:1389
 #, c-format
 msgid "Encryption algorithm"
 msgstr "加密算法"
@@ -2133,10 +2148,10 @@ msgstr "加密算法"
 msgid "Change type"
 msgstr "更改类型"
 
-#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:129 interactive.pm:547
+#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:129 interactive.pm:550
 #: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:417 ugtk2.pm:519
-#: ugtk2.pm:528 ugtk2.pm:814
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:802 ugtk2.pm:415
+#: ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -2212,7 +2227,7 @@ msgstr "下列软件包需要安装: \n"
 msgid "Installing packages..."
 msgstr "正在安装软件包..."
 
-#: do_pkgs.pm:267 pkgs.pm:258
+#: do_pkgs.pm:267 pkgs.pm:265
 #, c-format
 msgid "Removing packages..."
 msgstr "正在删除软件包..."
@@ -2230,17 +2245,27 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "您必须有一个FAT分区载入 /boot/efi"
 
-#: fs/format.pm:67
+#: fs/format.pm:100
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "正在创建和格式化文件 %s"
 
-#: fs/format.pm:122
+#: fs/format.pm:119
+#, fuzzy, c-format
+msgid "I do not know how to set label on %s with type %s"
+msgstr "不知道如何将 %s 格式化成 %s 类型"
+
+#: fs/format.pm:126
+#, fuzzy, c-format
+msgid "setting label on %s failed"
+msgstr "%s 格式化 %s 失败"
+
+#: fs/format.pm:161
 #, c-format
 msgid "I do not know how to format %s in type %s"
 msgstr "不知道如何将 %s 格式化成 %s 类型"
 
-#: fs/format.pm:127 fs/format.pm:129
+#: fs/format.pm:166 fs/format.pm:168
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s 格式化 %s 失败"
@@ -2560,8 +2585,8 @@ msgstr ""
 "一切就绪后, 请按“%s”。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:165 interactive.pm:546 interactive/curses.pm:263
-#: ugtk2.pm:521
+#: fs/partitioning_wizard.pm:165 interactive.pm:549 interactive/curses.pm:263
+#: ugtk2.pm:519
 #, c-format
 msgid "Next"
 msgstr "下一步"
@@ -2591,6 +2616,15 @@ msgstr "改变 Microsoft Windows® 分区大小"
 msgid "FAT resizing failed: %s"
 msgstr "FAT 调整大小失败: %s"
 
+#: fs/partitioning_wizard.pm:186
+#, c-format
+msgid ""
+"To ensure data integrity after resizing the partition(s), \n"
+"filesystem checks will be run on your next boot into Microsoft Windows®"
+msgstr ""
+"为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
+"可能会自动运行文件系统检查。"
+
 #: fs/partitioning_wizard.pm:198
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
@@ -2611,7 +2645,7 @@ msgstr "清除并使用整个磁盘"
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
 
-#: fs/partitioning_wizard.pm:210 fsedit.pm:590
+#: fs/partitioning_wizard.pm:210 fsedit.pm:598
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "磁盘 %s 上现存的所有分区及其资料将被清除"
@@ -2650,12 +2684,12 @@ msgstr "DrakX 分区向导找到下列解决办法:"
 msgid "Partitioning failed: %s"
 msgstr "分区失败: %s"
 
-#: fs/type.pm:378
+#: fs/type.pm:379
 #, c-format
 msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
 
-#: fs/type.pm:379
+#: fs/type.pm:380
 #, c-format
 msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
@@ -2675,12 +2709,12 @@ msgstr "有 /usr"
 msgid "server"
 msgstr "服务器"
 
-#: fsedit.pm:131
+#: fsedit.pm:136
 #, c-format
 msgid "BIOS software RAID detected on disks %s. Activate it?"
 msgstr "磁盘 %s 检测到了 BIOS 软件 RAID。激活吗?"
 
-#: fsedit.pm:238
+#: fsedit.pm:246
 #, c-format
 msgid ""
 "I can not read the partition table of device %s, it's too corrupted for me :"
@@ -2698,22 +2732,22 @@ msgstr ""
 "\n"
 "您同意清除所有分区吗?\n"
 
-#: fsedit.pm:415
+#: fsedit.pm:423
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "挂载点必需要以 / 为开头"
 
-#: fsedit.pm:416
+#: fsedit.pm:424
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "挂载点只能包含字母和数字"
 
-#: fsedit.pm:417
+#: fsedit.pm:425
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "已经有一个分区的挂载点是 %s\n"
 
-#: fsedit.pm:421
+#: fsedit.pm:429
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2724,14 +2758,14 @@ msgstr ""
 "如果没有一个 /boot 分区, 各种启动引导程序都无法处理这种情况。\n"
 "所以, 请增加一个 /boot 分区。"
 
-#: fsedit.pm:427
+#: fsedit.pm:435
 #, 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:429
+#: fsedit.pm:437
 #, c-format
 msgid ""
 "You've selected the LVM Logical Volume as root (/).\n"
@@ -2743,270 +2777,270 @@ msgstr ""
 "引导程序无法识别跨越多个物理卷的卷。\n"
 "您应该先创建 /boot 分区"
 
-#: fsedit.pm:433 fsedit.pm:435
+#: fsedit.pm:441 fsedit.pm:443
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "这个目录应该保留在根文件系统中"
 
-#: fsedit.pm:437 fsedit.pm:439
+#: fsedit.pm:445 fsedit.pm:447
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
 "point\n"
 msgstr "这个挂载点需要一个真正的文件系统(ext2/ext3、reiserfs、xfs 或 jfs)\n"
 
-#: fsedit.pm:441
+#: fsedit.pm:449
 #, c-format
 msgid "You can not use an encrypted file system for mount point %s"
 msgstr "挂载点 %s 不能使用用加密的文件系统"
 
-#: fsedit.pm:506
+#: fsedit.pm:514
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "没有足够的空闲空间供自动分配"
 
-#: fsedit.pm:508
+#: fsedit.pm:516
 #, c-format
 msgid "Nothing to do"
 msgstr "不做任何事"
 
-#: harddrake/data.pm:64
+#: harddrake/data.pm:73
 #, c-format
 msgid "SATA controllers"
 msgstr "SATA 控制器"
 
-#: harddrake/data.pm:73
+#: harddrake/data.pm:82
 #, c-format
 msgid "RAID controllers"
 msgstr "RAID 控制器"
 
-#: harddrake/data.pm:83
+#: harddrake/data.pm:92
 #, c-format
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATA 控制器"
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:103
 #, c-format
 msgid "Card readers"
 msgstr "读卡器"
 
-#: harddrake/data.pm:102
+#: harddrake/data.pm:112
 #, c-format
 msgid "Firewire controllers"
 msgstr "火线控制器"
 
-#: harddrake/data.pm:111
+#: harddrake/data.pm:121
 #, c-format
 msgid "PCMCIA controllers"
 msgstr "PCMCIA 控制器"
 
-#: harddrake/data.pm:120
+#: harddrake/data.pm:130
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI 控制器"
 
-#: harddrake/data.pm:129
+#: harddrake/data.pm:139
 #, c-format
 msgid "USB controllers"
 msgstr "USB 控制器"
 
-#: harddrake/data.pm:138
+#: harddrake/data.pm:148
 #, c-format
 msgid "USB ports"
 msgstr "USB 端口"
 
-#: harddrake/data.pm:147
+#: harddrake/data.pm:157
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus 控制器"
 
-#: harddrake/data.pm:156
+#: harddrake/data.pm:166
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "桥接和系统控制器"
 
-#: harddrake/data.pm:168
+#: harddrake/data.pm:178
 #, c-format
 msgid "Floppy"
 msgstr "软盘"
 
-#: harddrake/data.pm:178
+#: harddrake/data.pm:188
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:194
+#: harddrake/data.pm:204
 #, c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
-#: harddrake/data.pm:204
+#: harddrake/data.pm:214
 #, c-format
 msgid "USB Mass Storage Devices"
 msgstr "USB 大容量存储设备"
 
-#: harddrake/data.pm:213
+#: harddrake/data.pm:223
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
 
-#: harddrake/data.pm:223
+#: harddrake/data.pm:233
 #, c-format
 msgid "CD/DVD burners"
 msgstr "CD/DVD 刻录机"
 
-#: harddrake/data.pm:233
+#: harddrake/data.pm:243
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:243
+#: harddrake/data.pm:253
 #, c-format
 msgid "Tape"
 msgstr "磁带机"
 
-#: harddrake/data.pm:254
+#: harddrake/data.pm:264
 #, c-format
 msgid "AGP controllers"
 msgstr "AGP 控制器"
 
-#: harddrake/data.pm:263
+#: harddrake/data.pm:273
 #, c-format
 msgid "Videocard"
 msgstr "显示卡"
 
-#: harddrake/data.pm:272
+#: harddrake/data.pm:282
 #, c-format
 msgid "DVB card"
 msgstr "DVB 卡"
 
-#: harddrake/data.pm:280
+#: harddrake/data.pm:290
 #, c-format
 msgid "Tvcard"
 msgstr "电视卡"
 
-#: harddrake/data.pm:290
+#: harddrake/data.pm:300
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "其它多媒体设备"
 
-#: harddrake/data.pm:299
+#: harddrake/data.pm:309
 #, c-format
 msgid "Soundcard"
 msgstr "声卡"
 
-#: harddrake/data.pm:312
+#: harddrake/data.pm:323
 #, c-format
 msgid "Webcam"
 msgstr "摄像头"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:337
 #, c-format
 msgid "Processors"
 msgstr "处理器"
 
-#: harddrake/data.pm:336
+#: harddrake/data.pm:347
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN 适配器"
 
-#: harddrake/data.pm:347
+#: harddrake/data.pm:358
 #, c-format
 msgid "USB sound devices"
 msgstr "USB 声音设备"
 
-#: harddrake/data.pm:356
+#: harddrake/data.pm:367
 #, c-format
 msgid "Radio cards"
 msgstr "无线电卡"
 
-#: harddrake/data.pm:365
+#: harddrake/data.pm:376
 #, c-format
 msgid "ATM network cards"
 msgstr "ATM 网卡"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:385
 #, c-format
 msgid "WAN network cards"
 msgstr "WAN 网卡"
 
-#: harddrake/data.pm:383
+#: harddrake/data.pm:394
 #, c-format
 msgid "Bluetooth devices"
 msgstr "蓝牙设备"
 
-#: harddrake/data.pm:392
+#: harddrake/data.pm:403
 #, c-format
 msgid "Ethernetcard"
 msgstr "以太网卡"
 
-#: harddrake/data.pm:409
+#: harddrake/data.pm:420
 #, c-format
 msgid "Modem"
 msgstr "调制解调器"
 
-#: harddrake/data.pm:419
+#: harddrake/data.pm:430
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL 适配器"
 
-#: harddrake/data.pm:431
+#: harddrake/data.pm:442
 #, c-format
 msgid "Memory"
 msgstr "内存"
 
-#: harddrake/data.pm:440
+#: harddrake/data.pm:451
 #, c-format
 msgid "Printer"
 msgstr "打印机"
 
 #. -PO: these are joysticks controllers:
-#: harddrake/data.pm:454
+#: harddrake/data.pm:465
 #, c-format
 msgid "Game port controllers"
 msgstr "游戏控制器"
 
-#: harddrake/data.pm:463
+#: harddrake/data.pm:474
 #, c-format
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: harddrake/data.pm:473
+#: harddrake/data.pm:484
 #, c-format
 msgid "Keyboard"
 msgstr "键盘"
 
-#: harddrake/data.pm:486
+#: harddrake/data.pm:498
 #, c-format
 msgid "Tablet and touchscreen"
 msgstr "手写板和触摸屏"
 
-#: harddrake/data.pm:495
+#: harddrake/data.pm:507
 #, c-format
 msgid "Mouse"
 msgstr "鼠标"
 
-#: harddrake/data.pm:509
+#: harddrake/data.pm:522
 #, c-format
 msgid "Biometry"
 msgstr "生物统计"
 
-#: harddrake/data.pm:517
+#: harddrake/data.pm:530
 #, c-format
 msgid "UPS"
 msgstr "UPS"
 
-#: harddrake/data.pm:526
+#: harddrake/data.pm:539
 #, c-format
 msgid "Scanner"
 msgstr "扫描仪"
 
-#: harddrake/data.pm:537
+#: harddrake/data.pm:550
 #, c-format
 msgid "Unknown/Others"
 msgstr "未知/其它"
 
-#: harddrake/data.pm:565
+#: harddrake/data.pm:580
 #, c-format
 msgid "cpu # "
 msgstr "CPU # "
@@ -3275,20 +3309,20 @@ msgstr "卡的型号: "
 msgid "Tuner type:"
 msgstr "调谐器类型: "
 
-#: interactive.pm:128 interactive.pm:546 interactive/curses.pm:263
+#: interactive.pm:128 interactive.pm:549 interactive/curses.pm:263
 #: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
-#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:423 ugtk2.pm:521
-#: ugtk2.pm:814 ugtk2.pm:837
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 mygtk2.pm:802
+#: ugtk2.pm:421 ugtk2.pm:519 ugtk2.pm:812 ugtk2.pm:835
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: interactive.pm:228 modules/interactive.pm:71 ugtk2.pm:813 wizards.pm:156
+#: interactive.pm:228 modules/interactive.pm:71 ugtk2.pm:811 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: interactive.pm:228 modules/interactive.pm:71 ugtk2.pm:813 wizards.pm:156
+#: interactive.pm:228 modules/interactive.pm:71 ugtk2.pm:811 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "否"
@@ -3313,12 +3347,12 @@ msgstr "修改"
 msgid "Remove"
 msgstr "删除"
 
-#: interactive.pm:546 interactive/curses.pm:263 ugtk2.pm:521
+#: interactive.pm:549 interactive/curses.pm:263 ugtk2.pm:519
 #, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: interactive.pm:547 interactive/curses.pm:260 ugtk2.pm:519
+#: interactive.pm:550 interactive/curses.pm:260 ugtk2.pm:517
 #, c-format
 msgid "Previous"
 msgstr "上一步"
@@ -4600,7 +4634,7 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1209
+#: lang.pm:1221
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
@@ -4755,8 +4789,8 @@ msgstr ""
 "简介\n"
 "\n"
 "Mandriva Linux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"
-"产品包括但不限于 Mandriva 许可商或供应商提供的与 Mandriva Linux 发行版的操作系统和各个部分有关的程序、方"
-"法、规则和文档。\n"
+"产品包括但不限于 Mandriva 许可商或供应商提供的与 Mandriva Linux 发行版的操作"
+"系统和各个部分有关的程序、方法、规则和文档。\n"
 "\n"
 "\n"
 "1. 许可协议\n"
@@ -4788,12 +4822,11 @@ msgstr ""
 "\n"
 "3. GPL 许可协议和其它有关协议\n"
 "\n"
-"本软件产品由不同个人或组织所创作的各部分组成。%s"
-"这些许可协议大多允许您使用、复制、修改或重新发表协议所覆盖的部"
-"分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"
-"可协议有疑问, 应该与该部分的作者联系, Mandriva 无法解答这些问题。由 Mandriva "
-"S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandriva S.A. 创作的文档采用一个特"
-"别的许可协议。详情见有关的文档。\n"
+"本软件产品由不同个人或组织所创作的各部分组成。%s这些许可协议大多允许您使用、"
+"复制、修改或重新发表协议所覆盖的部分。使用这些软件之前, 请仔细阅读有关许可协"
+"议的条款和条件。如果对任何部分的许可协议有疑问, 应该与该部分的作者联系, "
+"Mandriva 无法解答这些问题。由 Mandriva S.A. 开发的各个程序受 GPL 许可协议保"
+"护。由 Mandriva S.A. 创作的文档采用一个特别的许可协议。详情见有关的文档。\n"
 "\n"
 "\n"
 "4. 知识产权\n"
@@ -4850,7 +4883,8 @@ msgid ""
 "conditions of the GNU \n"
 "General Public Licence, hereafter called \"GPL\", or of similar licenses."
 msgstr ""
-"除 Goolge Inc 及其子公司所提供的应用软件和软件之外，这些组件中的绝大多数以 GNU GPL 许可协议(以后简称“GPL”)或类似的协议发布。"
+"除 Goolge Inc 及其子公司所提供的应用软件和软件之外，这些组件中的绝大多数以 "
+"GNU GPL 许可协议(以后简称“GPL”)或类似的协议发布。"
 
 #: messages.pm:107
 #, c-format
@@ -5095,12 +5129,12 @@ msgstr ""
 msgid "mount failed: "
 msgstr "挂载失败: "
 
-#: partition_table.pm:519
+#: partition_table.pm:522
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "这个平台上不支持扩展分区"
 
-#: partition_table.pm:537
+#: partition_table.pm:540
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can not use it.\n"
@@ -5122,39 +5156,39 @@ msgstr ""
 "一次数据完整性检查失败了。\n"
 "这意味着, 如果继续往硬盘里写入任何东西, 硬盘将可能随时坏掉, 损坏数据"
 
-#: pkgs.pm:229 pkgs.pm:232 pkgs.pm:241
+#: pkgs.pm:236 pkgs.pm:239 pkgs.pm:248
 #, c-format
 msgid "Unused packages removal"
 msgstr "删除不需要的软件包"
 
-#: pkgs.pm:229
+#: pkgs.pm:236
 #, c-format
 msgid "Finding unused hardware packages..."
 msgstr "正在查找不需要的硬件软件包..."
 
-#: pkgs.pm:232
+#: pkgs.pm:239
 #, c-format
 msgid "Finding unused localization packages..."
 msgstr "正在查找不需要的本地化软件包..."
 
-#: pkgs.pm:242
+#: pkgs.pm:249
 #, c-format
 msgid ""
 "We have detected that some packages are not needed for your system "
 "configuration."
 msgstr "我们检测到您的系统配置无需下列软件包。"
 
-#: pkgs.pm:243
+#: pkgs.pm:250
 #, c-format
 msgid "We will remove the following packages, unless you choose otherwise:"
 msgstr "我们将会删除这些软件包，而您可以在进行之前对其微调:"
 
-#: pkgs.pm:246 pkgs.pm:247
+#: pkgs.pm:253 pkgs.pm:254
 #, c-format
 msgid "Unused hardware support"
 msgstr "未使用的硬件支持"
 
-#: pkgs.pm:250 pkgs.pm:251
+#: pkgs.pm:257 pkgs.pm:258
 #, c-format
 msgid "Unused localization"
 msgstr "未使用的本地化"
@@ -5189,17 +5223,17 @@ msgstr "无法将固件文件 %s 复制到 /usr/share/sane/firmware!"
 msgid "Could not set permissions of firmware file %s!"
 msgstr "无法设定固件文件 %s 的权限!"
 
-#: scanner.pm:200
+#: scanner.pm:199
 #, c-format
 msgid "Scannerdrake"
 msgstr "Drak 扫描仪"
 
-#: scanner.pm:201
+#: scanner.pm:200
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr "无法安装共享您的扫描仪所需的软件包。"
 
-#: scanner.pm:202
+#: scanner.pm:201
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr "您的扫描仪将无法被非 root 用户使用。"
@@ -6337,7 +6371,7 @@ msgstr "远程管理"
 msgid "Database Server"
 msgstr "数据库服务器"
 
-#: services.pm:153 services.pm:190
+#: services.pm:153 services.pm:192
 #, c-format
 msgid "Services"
 msgstr "服务"
@@ -6352,49 +6386,49 @@ msgstr "选择开机时自动启动的服务"
 msgid "Services: %d activated for %d registered"
 msgstr "服务: %2$d 项已注册, %1$d 项已激活"
 
-#: services.pm:206
+#: services.pm:208
 #, c-format
 msgid "running"
 msgstr "运行中"
 
-#: services.pm:206
+#: services.pm:208
 #, c-format
 msgid "stopped"
 msgstr "已停止"
 
-#: services.pm:211
+#: services.pm:213
 #, c-format
 msgid "Services and daemons"
 msgstr "服务和守护程序"
 
-#: services.pm:217
+#: services.pm:219
 #, c-format
 msgid ""
 "No additional information\n"
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:222 ugtk2.pm:926
+#: services.pm:224 ugtk2.pm:924
 #, c-format
 msgid "Info"
 msgstr "信息"
 
-#: services.pm:225
+#: services.pm:227
 #, c-format
 msgid "Start when requested"
 msgstr "请求时启动"
 
-#: services.pm:225
+#: services.pm:227
 #, c-format
 msgid "On boot"
 msgstr "启动时"
 
-#: services.pm:243
+#: services.pm:245
 #, c-format
 msgid "Start"
 msgstr "启动"
 
-#: services.pm:243
+#: services.pm:245
 #, c-format
 msgid "Stop"
 msgstr "停止"
@@ -6698,32 +6732,32 @@ msgstr "俄联邦"
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: ugtk2.pm:814
+#: ugtk2.pm:812
 #, c-format
 msgid "Is this correct?"
 msgstr "这样正确吗?"
 
-#: ugtk2.pm:874
+#: ugtk2.pm:872
 #, c-format
 msgid "No file chosen"
 msgstr "未选择文件"
 
-#: ugtk2.pm:876
+#: ugtk2.pm:874
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "您选择了文件，而非目录"
 
-#: ugtk2.pm:878
+#: ugtk2.pm:876
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "您选择了目录，而非文件"
 
-#: ugtk2.pm:880
+#: ugtk2.pm:878
 #, c-format
 msgid "No such directory"
 msgstr "无此目录"
 
-#: ugtk2.pm:880
+#: ugtk2.pm:878
 #, c-format
 msgid "No such file"
 msgstr "非本地文件"