1 files changed, 873 insertions, 900 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index d48bd8a45..1f052d5be 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: 2013-11-30 19:21+0100\n"
+"POT-Creation-Date: 2014-11-19 20:51+0100\n"
 "PO-Revision-Date: 2009-04-09 11:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -16,21 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: any.pm:255 any.pm:966 diskdrake/interactive.pm:645
-#: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931
-#: diskdrake/interactive.pm:1049 diskdrake/interactive.pm:1279
-#: diskdrake/interactive.pm:1337 do_pkgs.pm:242 do_pkgs.pm:287
-#: harddrake/sound.pm:270 interactive.pm:588 pkgs.pm:287
+#: any.pm:257 any.pm:924 diskdrake/interactive.pm:640
+#: diskdrake/interactive.pm:864 diskdrake/interactive.pm:926
+#: diskdrake/interactive.pm:1044 diskdrake/interactive.pm:1274
+#: diskdrake/interactive.pm:1332 do_pkgs.pm:341 do_pkgs.pm:386
+#: harddrake/sound.pm:77 interactive.pm:712 pkgs.pm:288
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: any.pm:255
+#: any.pm:257
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "启动引导程序安装中"
 
-#: any.pm:266
+#: any.pm:268
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -46,28 +46,12 @@ msgstr ""
 "\n"
 "要指定新卷 ID 吗?"
 
-#: any.pm:277
+#: any.pm:279
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "安装系统引导程序失败。出现下列错误:"
 
-#: any.pm:283
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you do not see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-"您可能得改变开放固件引导设备来使能启动引导程序。\n"
-"如果开机时没有引导程序提示, 按 Command-Option-O-F 然后输入: \n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" 然后输入: shut-down\n"
-"您将在下次开机时看到引导程序提示。"
-
-#: any.pm:323
+#: any.pm:319
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -82,263 +66,218 @@ msgstr ""
 "\n"
 "您要用哪个硬盘启动?"
 
-#: any.pm:334
+#: any.pm:330
 #, c-format
 msgid "Bootloader Installation"
 msgstr "引导程序安装"
 
-#: any.pm:338
+#: any.pm:334
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:362
+#: any.pm:350
 #, c-format
 msgid "First sector (MBR) of drive %s"
 msgstr "驱动器 %s 的第一扇区(MBR)"
 
-#: any.pm:364
+#: any.pm:352
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "驱动器的第一扇区(MBR)"
 
-#: any.pm:366
+#: any.pm:354
 #, c-format
 msgid "First sector of the root partition"
 msgstr "根分区的第一扇区"
 
-#: any.pm:368
+#: any.pm:356
 #, c-format
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:370 pkgs.pm:283 ugtk2.pm:526
+#: any.pm:358 pkgs.pm:284 ugtk2.pm:526 ugtk3.pm:602
 #, c-format
 msgid "Skip"
 msgstr "跳过"
 
-#: any.pm:405
+#: any.pm:386
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:420 any.pm:453 any.pm:454
+#: any.pm:400
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
-#: any.pm:424
+#: any.pm:404
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:425 any.pm:457
+#: any.pm:405
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:428 any.pm:460
+#: any.pm:408
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
 
-#: any.pm:431
+#: any.pm:411
 #, c-format
 msgid "Main options"
 msgstr "主选项"
 
-#: any.pm:432
+#: any.pm:412
 #, c-format
 msgid "Delay before booting default image"
 msgstr "启动默认映像前的延迟"
 
-#: any.pm:433
+#: any.pm:413
 #, c-format
 msgid "Enable ACPI"
 msgstr "启用 ACPI"
 
-#: any.pm:434
+#: any.pm:414
 #, c-format
 msgid "Enable SMP"
 msgstr "启用 SMP"
 
-#: any.pm:435
+#: any.pm:415
 #, c-format
 msgid "Enable APIC"
 msgstr "启用 APIC"
 
-#: any.pm:437
+#: any.pm:417
 #, c-format
 msgid "Enable Local APIC"
 msgstr "启用本地 APIC"
 
-#: any.pm:438 security/level.pm:63
+#: any.pm:418 security/level.pm:63
 #, c-format
 msgid "Security"
 msgstr "安全"
 
-#: any.pm:439 any.pm:901 any.pm:920 authentication.pm:249
+#: any.pm:419 any.pm:852 any.pm:871 authentication.pm:249
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "密码"
 
-#: any.pm:442 authentication.pm:260
+#: any.pm:422 authentication.pm:260
 #, c-format
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:442 authentication.pm:260 diskdrake/interactive.pm:1512
+#: any.pm:422 authentication.pm:260 diskdrake/interactive.pm:1498
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
 
-#: any.pm:444
+#: any.pm:424
 #, c-format
 msgid "You cannot use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:448 any.pm:904 any.pm:922 authentication.pm:250
+#: any.pm:428 any.pm:855 any.pm:873 authentication.pm:250
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: any.pm:459
-#, c-format
-msgid "Init Message"
-msgstr "初始信息"
-
-#: any.pm:461
-#, c-format
-msgid "Open Firmware Delay"
-msgstr "开放固件延迟"
-
-#: any.pm:462
-#, c-format
-msgid "Kernel Boot Timeout"
-msgstr "核心启动超时"
-
-#: any.pm:463
-#, c-format
-msgid "Enable CD Boot?"
-msgstr "允许 CD 启动?"
-
-#: any.pm:464
-#, c-format
-msgid "Enable OF Boot?"
-msgstr "启用 OF 启动?"
-
-#: any.pm:465
-#, c-format
-msgid "Default OS?"
-msgstr "默认操作系统?"
-
-#: any.pm:539
+#: any.pm:493
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:540 any.pm:554
+#: any.pm:494 any.pm:506
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:541 any.pm:567
+#: any.pm:495
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:543
+#: any.pm:497
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:545
+#: any.pm:499
 #, c-format
 msgid "Requires password to boot"
 msgstr ""
 
-#: any.pm:547
+#: any.pm:500
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:549
+#: any.pm:501
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:550
+#: any.pm:502
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:559 any.pm:564 any.pm:566 diskdrake/interactive.pm:411
+#: any.pm:510 diskdrake/interactive.pm:409
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:561 any.pm:569 harddrake/v4l.pm:438
+#: any.pm:512 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:568
-#, c-format
-msgid "NoVideo"
-msgstr "无视频"
-
-#: any.pm:579
+#: any.pm:520
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:580
+#: any.pm:521
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:580
+#: any.pm:521
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:581
+#: any.pm:522
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:599
+#: any.pm:540
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:600
+#: any.pm:541
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:600
-#, c-format
-msgid "Other OS (SunOS...)"
-msgstr "其它操作系统(SunOS...)"
-
-#: any.pm:601
-#, c-format
-msgid "Other OS (MacOS...)"
-msgstr "其它操作系统(MacOS...)"
-
-#: any.pm:601
+#: any.pm:541
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:648
+#: any.pm:588
 #, c-format
 msgid "Bootloader Configuration"
 msgstr "引导程序配置"
 
-#: any.pm:649
+#: any.pm:589
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -347,194 +286,194 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:860
+#: any.pm:811
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:861
+#: any.pm:812
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:862
+#: any.pm:813
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:863
+#: any.pm:814
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:864
+#: any.pm:815
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:865
+#: any.pm:816
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:871
+#: any.pm:822
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:877
+#: any.pm:828
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:878
+#: any.pm:829
 #, c-format
 msgid ""
 "The user name must start with a lower case letter followed by only lower "
 "cased letters, numbers, `-' and `_'"
 msgstr "用户名只能包含小写字母、数字、“-”和“_”"
 
-#: any.pm:879
+#: any.pm:830
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:880
+#: any.pm:831
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:886 any.pm:924
+#: any.pm:837 any.pm:875
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:886 any.pm:925
+#: any.pm:837 any.pm:876
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:887
+#: any.pm:838
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:888
+#: any.pm:839
 #, c-format
 msgid "%s should be above 1000. Accept anyway?"
 msgstr "%s 应该大于 1000。仍然接受吗？"
 
-#: any.pm:892
+#: any.pm:843
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:898
+#: any.pm:849
 #, c-format
 msgid "Enable guest account"
 msgstr ""
 
-#: any.pm:900 authentication.pm:236
+#: any.pm:851 authentication.pm:236
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:906
+#: any.pm:857
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:908
+#: any.pm:859
 #, c-format
 msgid "Icon"
 msgstr "图标"
 
-#: any.pm:911
+#: any.pm:862
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:918
+#: any.pm:869
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:923
+#: any.pm:874
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:966
+#: any.pm:924
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: any.pm:1011 security/l10n.pm:14
+#: any.pm:957 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:1012
+#: any.pm:958
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:1013
+#: any.pm:959
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:1014
+#: any.pm:960
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:1015
+#: any.pm:961
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:1026 any.pm:1040 any.pm:1108
+#: any.pm:972 any.pm:986 any.pm:1055
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:1047 any.pm:1397 interactive/gtk.pm:821
+#: any.pm:993 any.pm:1344 interactive/gtk.pm:820
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:1094
+#: any.pm:1041
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:1096 diskdrake/dav.pm:26 mygtk2.pm:1229
+#: any.pm:1043 diskdrake/dav.pm:26 mygtk2.pm:1229 mygtk3.pm:1282
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:1103
+#: any.pm:1050
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "您接受此许可协议吗?"
 
-#: any.pm:1104
+#: any.pm:1051
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:1104
+#: any.pm:1051
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:1130 any.pm:1193
+#: any.pm:1077 any.pm:1140
 #, c-format
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
-#: any.pm:1158
+#: any.pm:1105
 #, c-format
 msgid ""
 "%s can support multiple languages. Select\n"
@@ -544,87 +483,87 @@ msgstr ""
 "%s 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:1160 fs/partitioning_wizard.pm:180
+#: any.pm:1107 fs/partitioning_wizard.pm:178
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: any.pm:1161
+#: any.pm:1108
 #, c-format
 msgid "Multiple languages"
 msgstr "多语言"
 
-#: any.pm:1162
+#: any.pm:1109
 #, c-format
 msgid "Select Additional Languages"
 msgstr ""
 
-#: any.pm:1171 any.pm:1202
+#: any.pm:1118 any.pm:1149
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:1172
+#: any.pm:1119
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1194
+#: any.pm:1141
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:1248
+#: any.pm:1195
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1249
+#: any.pm:1196
 #, c-format
 msgid "Please choose your country"
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1251
+#: any.pm:1198
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1252
+#: any.pm:1199
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1252 interactive.pm:489 interactive/gtk.pm:445
+#: any.pm:1199 interactive.pm:491 interactive/gtk.pm:444
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1258
+#: any.pm:1205
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1261
+#: any.pm:1208
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1342
+#: any.pm:1289
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1342
+#: any.pm:1289
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1342
+#: any.pm:1289
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1346
+#: any.pm:1293
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -637,32 +576,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1358
+#: any.pm:1305
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1361
+#: any.pm:1308
 #, 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:1369
+#: any.pm:1316
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1397
+#: any.pm:1344
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1399
+#: any.pm:1346
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -671,54 +610,54 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1506
+#: any.pm:1453
 #, c-format
 msgid ""
 "You need to logout and back in again for changes to take effect. Press OK to "
 "logout now."
 msgstr "您需要注销后重新登录才能让更改生效。单击确定立即注销。"
 
-#: any.pm:1510
+#: any.pm:1457
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1545
+#: any.pm:1492
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1545
+#: any.pm:1492
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1568 any.pm:1570
+#: any.pm:1515 any.pm:1517
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1571
+#: any.pm:1518
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1575
+#: any.pm:1522
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1576
+#: any.pm:1523
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1578
+#: any.pm:1525
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1579
+#: any.pm:1526
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -1044,7 +983,7 @@ msgid "Domain Admin Password"
 msgstr "域管理员密码"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:1019
+#: bootloader.pm:1080
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1059,101 +998,91 @@ msgstr ""
 "wait for default boot.\n"
 "\n"
 
-#: bootloader.pm:1211
+#: bootloader.pm:1244
 #, c-format
 msgid "LILO with text menu"
 msgstr "文本菜单 LILO"
 
-#: bootloader.pm:1212
+#: bootloader.pm:1245
 #, fuzzy, c-format
 msgid "GRUB2 with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1213
+#: bootloader.pm:1246
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1247
 #, c-format
 msgid "GRUB with text menu"
 msgstr "文本菜单 GRUB"
 
-#: bootloader.pm:1215
-#, c-format
-msgid "Yaboot"
-msgstr "Yaboot"
-
-#: bootloader.pm:1216
-#, c-format
-msgid "SILO"
-msgstr "SILO"
-
 #: bootloader.pm:1302
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:2089
+#: bootloader.pm:2048
 #, c-format
 msgid "You cannot install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:2258
+#: bootloader.pm:2223
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:2271
+#: bootloader.pm:2236
 #, c-format
 msgid ""
 "The bootloader cannot be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:2272
+#: bootloader.pm:2237
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
 
-#: common.pm:142
+#: common.pm:271
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: common.pm:142
+#: common.pm:271
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: common.pm:142
+#: common.pm:271
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: common.pm:142
+#: common.pm:271
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: common.pm:142 common.pm:151
+#: common.pm:271 common.pm:280
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: common.pm:159
+#: common.pm:288
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分钟"
 
-#: common.pm:161
+#: common.pm:290
 #, c-format
 msgid "1 minute"
 msgstr "1 分钟"
 
-#: common.pm:163
+#: common.pm:292
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒钟"
@@ -1175,12 +1104,12 @@ msgstr ""
 msgid "New"
 msgstr "新建"
 
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:418 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:63 diskdrake/interactive.pm:416 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "卸载"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:414 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:412 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "挂载"
@@ -1190,44 +1119,44 @@ msgstr "挂载"
 msgid "Server"
 msgstr "服务器"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:408
-#: diskdrake/interactive.pm:722 diskdrake/interactive.pm:740
-#: diskdrake/interactive.pm:744 diskdrake/removable.pm:23
+#: diskdrake/dav.pm:66 diskdrake/interactive.pm:406
+#: diskdrake/interactive.pm:717 diskdrake/interactive.pm:735
+#: diskdrake/interactive.pm:739 diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "挂载点"
 
-#: diskdrake/dav.pm:67 diskdrake/interactive.pm:410
-#: diskdrake/interactive.pm:1176 diskdrake/removable.pm:24
+#: diskdrake/dav.pm:67 diskdrake/interactive.pm:408
+#: diskdrake/interactive.pm:1171 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
 msgstr "选项"
 
-#: diskdrake/dav.pm:68 interactive.pm:388 interactive/gtk.pm:457
+#: diskdrake/dav.pm:68 interactive.pm:390 interactive/gtk.pm:456
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: diskdrake/dav.pm:69 diskdrake/hd_gtk.pm:203 diskdrake/removable.pm:26
+#: diskdrake/dav.pm:69 diskdrake/hd_gtk.pm:213 diskdrake/removable.pm:26
 #: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
 #, c-format
 msgid "Done"
 msgstr "完成"
 
-#: diskdrake/dav.pm:78 diskdrake/hd_gtk.pm:135 diskdrake/hd_gtk.pm:309
-#: diskdrake/interactive.pm:247 diskdrake/interactive.pm:260
-#: diskdrake/interactive.pm:456 diskdrake/interactive.pm:527
-#: diskdrake/interactive.pm:545 diskdrake/interactive.pm:550
-#: diskdrake/interactive.pm:712 diskdrake/interactive.pm:1015
-#: diskdrake/interactive.pm:1067 diskdrake/interactive.pm:1222
-#: diskdrake/interactive.pm:1235 diskdrake/interactive.pm:1238
-#: diskdrake/interactive.pm:1512 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:83
+#: diskdrake/dav.pm:78 diskdrake/hd_gtk.pm:145 diskdrake/hd_gtk.pm:319
+#: diskdrake/interactive.pm:245 diskdrake/interactive.pm:258
+#: diskdrake/interactive.pm:454 diskdrake/interactive.pm:525
+#: diskdrake/interactive.pm:543 diskdrake/interactive.pm:548
+#: diskdrake/interactive.pm:707 diskdrake/interactive.pm:1010
+#: diskdrake/interactive.pm:1062 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1230 diskdrake/interactive.pm:1233
+#: diskdrake/interactive.pm:1498 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:49
+#: do_pkgs.pm:54 do_pkgs.pm:79 do_pkgs.pm:103 do_pkgs.pm:108 do_pkgs.pm:142
 #: fsedit.pm: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:96 wizards.pm:100 wizards.pm:122
+#: 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
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -1242,13 +1171,13 @@ msgstr "请输入 WebDAV 服务器的 URL"
 msgid "The URL must begin with http:// or https://"
 msgstr "URL 应该是以 http:// 或 https:// 开头"
 
-#: diskdrake/dav.pm:106 diskdrake/hd_gtk.pm:434 diskdrake/interactive.pm:306
-#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:597
-#: diskdrake/interactive.pm:815 diskdrake/interactive.pm:880
-#: diskdrake/interactive.pm:1047 diskdrake/interactive.pm:1089
-#: diskdrake/interactive.pm:1090 diskdrake/interactive.pm:1322
-#: diskdrake/interactive.pm:1360 diskdrake/interactive.pm:1511 do_pkgs.pm:19
-#: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:78 harddrake/sound.pm:399
+#: diskdrake/dav.pm:106 diskdrake/hd_gtk.pm:452 diskdrake/interactive.pm:304
+#: diskdrake/interactive.pm:389 diskdrake/interactive.pm:595
+#: diskdrake/interactive.pm:810 diskdrake/interactive.pm:875
+#: diskdrake/interactive.pm:1042 diskdrake/interactive.pm:1084
+#: diskdrake/interactive.pm:1085 diskdrake/interactive.pm:1317
+#: diskdrake/interactive.pm:1355 diskdrake/interactive.pm:1497 do_pkgs.pm:45
+#: do_pkgs.pm:74 do_pkgs.pm:100 do_pkgs.pm:137
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -1263,61 +1192,61 @@ msgstr "您确定想要删除此挂载点吗?"
 msgid "Server: "
 msgstr "服务器: "
 
-#: diskdrake/dav.pm:125 diskdrake/interactive.pm:501
-#: diskdrake/interactive.pm:1384 diskdrake/interactive.pm:1472
+#: diskdrake/dav.pm:125 diskdrake/interactive.pm:499
+#: diskdrake/interactive.pm:1379 diskdrake/interactive.pm:1458
 #, c-format
 msgid "Mount point: "
 msgstr "挂载点: "
 
-#: diskdrake/dav.pm:126 diskdrake/interactive.pm:1479
+#: diskdrake/dav.pm:126 diskdrake/interactive.pm:1465
 #, 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:108
-#: fs/partitioning_wizard.pm:61 fs/partitioning_wizard.pm:244
-#: fs/partitioning_wizard.pm:252 fs/partitioning_wizard.pm:291
-#: fs/partitioning_wizard.pm:439 fs/partitioning_wizard.pm:502
-#: fs/partitioning_wizard.pm:585 fs/partitioning_wizard.pm:588
+#: diskdrake/hd_gtk.pm:61 diskdrake/interactive.pm:299
+#: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:111
+#: fs/partitioning_wizard.pm:59 fs/partitioning_wizard.pm:242
+#: fs/partitioning_wizard.pm:250 fs/partitioning_wizard.pm:285
+#: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:494
+#: fs/partitioning_wizard.pm:577 fs/partitioning_wizard.pm:580
 #, c-format
 msgid "Partitioning"
 msgstr "分区"
 
-#: diskdrake/hd_gtk.pm:73
+#: diskdrake/hd_gtk.pm:74
 #, c-format
 msgid "Click on a partition, choose a filesystem type then choose an action"
 msgstr "点击分区，选择文件系统类型，然后选择操作"
 
-#: diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:1197
-#: diskdrake/interactive.pm:1207 diskdrake/interactive.pm:1260
+#: diskdrake/hd_gtk.pm:124 diskdrake/interactive.pm:1192
+#: diskdrake/interactive.pm:1202 diskdrake/interactive.pm:1255
 #, c-format
 msgid "Read carefully"
 msgstr "请仔细阅读！"
 
-#: diskdrake/hd_gtk.pm:116
+#: diskdrake/hd_gtk.pm:124
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "请事先备份您的数据"
 
-#: diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:240
+#: diskdrake/hd_gtk.pm:125 diskdrake/interactive.pm:238
 #, c-format
 msgid "Exit"
 msgstr "退出"
 
-#: diskdrake/hd_gtk.pm:117
+#: diskdrake/hd_gtk.pm:125
 #, c-format
 msgid "Continue"
 msgstr "继续"
 
-#: diskdrake/hd_gtk.pm:198 fs/partitioning_wizard.pm:561 interactive.pm:654
-#: interactive/gtk.pm:813 interactive/gtk.pm:831 interactive/gtk.pm:862
-#: ugtk2.pm:936
+#: diskdrake/hd_gtk.pm:208 fs/partitioning_wizard.pm:553 interactive.pm:778
+#: interactive/gtk.pm:812 interactive/gtk.pm:830 interactive/gtk.pm:862
+#: ugtk2.pm:936 ugtk3.pm:1034
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: diskdrake/hd_gtk.pm:244
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1328,142 +1257,132 @@ msgstr ""
 "我建议您先重新设置这个分区的大小\n"
 "(点中它, 然后按“改变大小”)"
 
-#: diskdrake/hd_gtk.pm:246
+#: diskdrake/hd_gtk.pm:256
 #, c-format
 msgid "Please click on a partition"
 msgstr "请单击一个分区"
 
-#: diskdrake/hd_gtk.pm:260 diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:270 diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr "细节"
 
-#: diskdrake/hd_gtk.pm:309
+#: diskdrake/hd_gtk.pm:319
 #, c-format
 msgid "No hard disk drives found"
 msgstr "没有发现硬盘"
 
-#: diskdrake/hd_gtk.pm:340
+#: diskdrake/hd_gtk.pm:356
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: diskdrake/hd_gtk.pm:405
+#: diskdrake/hd_gtk.pm:423
 #, c-format
 msgid "Ext4"
 msgstr "Ext4"
 
-#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409
+#: diskdrake/hd_gtk.pm:423 fs/partitioning_wizard.pm:401
 #, c-format
 msgid "XFS"
 msgstr "XFS"
 
-#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409
+#: diskdrake/hd_gtk.pm:423 fs/partitioning_wizard.pm:401
 #, c-format
 msgid "Swap"
 msgstr "交换"
 
-#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409
-#, c-format
-msgid "SunOS"
-msgstr "SunOS"
-
-#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409
-#, c-format
-msgid "HFS"
-msgstr "HFS"
-
-#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409
+#: diskdrake/hd_gtk.pm:423 fs/partitioning_wizard.pm:401
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:406 fs/partitioning_wizard.pm:410 services.pm:193
+#: diskdrake/hd_gtk.pm:424 fs/partitioning_wizard.pm:402 services.pm:194
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: diskdrake/hd_gtk.pm:406 diskdrake/interactive.pm:1399
-#: fs/partitioning_wizard.pm:410
+#: diskdrake/hd_gtk.pm:424 diskdrake/interactive.pm:1385
+#: fs/partitioning_wizard.pm:402
 #, c-format
 msgid "Empty"
 msgstr "空"
 
-#: diskdrake/hd_gtk.pm:413
+#: diskdrake/hd_gtk.pm:431
 #, c-format
 msgid "Filesystem types:"
 msgstr "文件系统类型: "
 
-#: diskdrake/hd_gtk.pm:434
+#: diskdrake/hd_gtk.pm:452
 #, c-format
 msgid "This partition is already empty"
 msgstr "此分区已经为空"
 
-#: diskdrake/hd_gtk.pm:443
+#: diskdrake/hd_gtk.pm:461
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "请先“Unmount”"
 
-#: diskdrake/hd_gtk.pm:443
+#: diskdrake/hd_gtk.pm:461
 #, c-format
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "用“%s”代替(在专家模式中)"
 
-#: diskdrake/hd_gtk.pm:443 diskdrake/interactive.pm:409
-#: diskdrake/interactive.pm:639 diskdrake/removable.pm:25
+#: diskdrake/hd_gtk.pm:461 diskdrake/interactive.pm:407
+#: diskdrake/interactive.pm:634 diskdrake/removable.pm:25
 #: diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
 msgstr "类型"
 
-#: diskdrake/interactive.pm:211
+#: diskdrake/interactive.pm:209
 #, c-format
 msgid "Choose another partition"
 msgstr "选择其它分区"
 
-#: diskdrake/interactive.pm:211
+#: diskdrake/interactive.pm:209
 #, c-format
 msgid "Choose a partition"
 msgstr "选择分区"
 
-#: diskdrake/interactive.pm:273 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:271 diskdrake/interactive.pm:380
 #: interactive/curses.pm:532
 #, c-format
 msgid "More"
 msgstr "更多"
 
-#: diskdrake/interactive.pm:281 diskdrake/interactive.pm:294
-#: diskdrake/interactive.pm:1306 mygtk2.pm:1228
+#: diskdrake/interactive.pm:279 diskdrake/interactive.pm:292
+#: diskdrake/interactive.pm:1301 mygtk2.pm:1228 mygtk3.pm:1281
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
 
-#: diskdrake/interactive.pm:281
+#: diskdrake/interactive.pm:279
 #, c-format
 msgid "Continue anyway?"
 msgstr "仍然继续吗?"
 
-#: diskdrake/interactive.pm:286
+#: diskdrake/interactive.pm:284
 #, c-format
 msgid "Quit without saving"
 msgstr "退出而不保存更改"
 
-#: diskdrake/interactive.pm:286
+#: diskdrake/interactive.pm:284
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "退出而不保存分区表吗?"
 
-#: diskdrake/interactive.pm:294
+#: diskdrake/interactive.pm:292
 #, c-format
 msgid "Do you want to save the /etc/fstab modifications?"
 msgstr "您想要保存 /etc/fstab 修改吗?"
 
-#: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:291
+#: diskdrake/interactive.pm:299 fs/partitioning_wizard.pm:285
 #, c-format
 msgid "You need to reboot for the partition table modifications to take effect"
 msgstr "对分区表的更改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:306
+#: diskdrake/interactive.pm:304
 #, c-format
 msgid ""
 "You should format partition %s.\n"
@@ -1474,184 +1393,184 @@ msgstr ""
 "否则, 将无法在 fstab 中写入挂载点 %s 的任何信息。\n"
 "仍然退出吗?"
 
-#: diskdrake/interactive.pm:319
+#: diskdrake/interactive.pm:317
 #, c-format
 msgid "Clear all"
 msgstr "全部清除"
 
-#: diskdrake/interactive.pm:320
+#: diskdrake/interactive.pm:318
 #, c-format
 msgid "Auto allocate"
 msgstr "自动分配"
 
-#: diskdrake/interactive.pm:326
+#: diskdrake/interactive.pm:324
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "切换到正常模式"
 
-#: diskdrake/interactive.pm:326
+#: diskdrake/interactive.pm:324
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "切换到专家模式"
 
-#: diskdrake/interactive.pm:338
+#: diskdrake/interactive.pm:336
 #, c-format
 msgid "Hard disk drive information"
 msgstr "硬盘信息"
 
-#: diskdrake/interactive.pm:371
+#: diskdrake/interactive.pm:369
 #, c-format
 msgid "All primary partitions are used"
 msgstr "主分区数目已经满了"
 
-#: diskdrake/interactive.pm:372
+#: diskdrake/interactive.pm:370
 #, c-format
 msgid "I cannot add any more partitions"
 msgstr "我无法再添加任何分区了"
 
-#: diskdrake/interactive.pm:373
+#: diskdrake/interactive.pm:371
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr "如果需要更多的分区, 请删除一个主分区以创建扩展分区"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:382
 #, c-format
 msgid "Reload partition table"
 msgstr "重新读取分区表"
 
-#: diskdrake/interactive.pm:391
+#: diskdrake/interactive.pm:389
 #, c-format
 msgid "Detailed information"
 msgstr "详细信息"
 
-#: diskdrake/interactive.pm:407
+#: diskdrake/interactive.pm:405
 #, c-format
 msgid "View"
 msgstr "查看"
 
-#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:828
+#: diskdrake/interactive.pm:410 diskdrake/interactive.pm:823
 #, c-format
 msgid "Resize"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:413
+#: diskdrake/interactive.pm:411
 #, c-format
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:415 diskdrake/interactive.pm:978
+#: diskdrake/interactive.pm:413 diskdrake/interactive.pm:973
 #, c-format
 msgid "Add to RAID"
 msgstr "加入 RAID"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:997
+#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:992
 #, c-format
 msgid "Add to LVM"
 msgstr "加入 LVM"
 
-#: diskdrake/interactive.pm:417
+#: diskdrake/interactive.pm:415
 #, c-format
 msgid "Use"
 msgstr "使用"
 
-#: diskdrake/interactive.pm:419
+#: diskdrake/interactive.pm:417
 #, c-format
 msgid "Delete"
 msgstr "删除"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:418
 #, c-format
 msgid "Remove from RAID"
 msgstr "从 RAID 中移除"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:419
 #, c-format
 msgid "Remove from LVM"
 msgstr "从 LVM 中移除"
 
-#: diskdrake/interactive.pm:422
+#: diskdrake/interactive.pm:420
 #, c-format
 msgid "Remove from dm"
 msgstr "从 dm 中移除"
 
-#: diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Modify RAID"
 msgstr "修改 RAID"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:422
 #, c-format
 msgid "Use for loopback"
 msgstr "用于回环"
 
-#: diskdrake/interactive.pm:434
+#: diskdrake/interactive.pm:432
 #, c-format
 msgid "Create"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:456
+#: diskdrake/interactive.pm:454
 #, c-format
 msgid "Failed to mount partition"
 msgstr "挂载分区失败"
 
-#: diskdrake/interactive.pm:490 diskdrake/interactive.pm:492
+#: diskdrake/interactive.pm:488 diskdrake/interactive.pm:490
 #, c-format
 msgid "Create a new partition"
 msgstr "创建一个新分区"
 
-#: diskdrake/interactive.pm:494
+#: diskdrake/interactive.pm:492
 #, c-format
 msgid "Start sector: "
 msgstr "开始扇区: "
 
-#: diskdrake/interactive.pm:497 diskdrake/interactive.pm:1082
+#: diskdrake/interactive.pm:495 diskdrake/interactive.pm:1077
 #, c-format
 msgid "Size in MB: "
 msgstr "大小(MB): "
 
-#: diskdrake/interactive.pm:499 diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:497 diskdrake/interactive.pm:1078
 #, c-format
 msgid "Filesystem type: "
 msgstr "文件系统类型: "
 
-#: diskdrake/interactive.pm:505
+#: diskdrake/interactive.pm:503
 #, c-format
 msgid "Preference: "
 msgstr "首选项: "
 
-#: diskdrake/interactive.pm:508
+#: diskdrake/interactive.pm:506
 #, c-format
 msgid "Logical volume name "
 msgstr "逻辑卷标"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:508
 #, c-format
 msgid "Encrypt partition"
 msgstr "加密分区"
 
-#: diskdrake/interactive.pm:511
+#: diskdrake/interactive.pm:509
 #, c-format
 msgid "Encryption key "
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:512 diskdrake/interactive.pm:1516
+#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:1502
 #, c-format
 msgid "Encryption key (again)"
 msgstr "加密密钥(再输入一次)"
 
-#: diskdrake/interactive.pm:524 diskdrake/interactive.pm:1512
+#: diskdrake/interactive.pm:522 diskdrake/interactive.pm:1498
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:525
+#: diskdrake/interactive.pm:523
 #, c-format
 msgid "Missing encryption key"
 msgstr "缺少加密密钥"
 
-#: diskdrake/interactive.pm:545
+#: diskdrake/interactive.pm:543
 #, c-format
 msgid ""
 "You cannot create a new partition\n"
@@ -1662,68 +1581,68 @@ msgstr ""
 "(您超过了允许的主分区数量)。\n"
 "请先删除一个主分区, 然后创建一个扩展分区。"
 
-#: diskdrake/interactive.pm:597
+#: diskdrake/interactive.pm:595
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "删除回环(loopback)文件?"
 
-#: diskdrake/interactive.pm:620
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "在改变分区表 %s 的类型之后, 在这个分区上的所有资料将要被清除"
 
-#: diskdrake/interactive.pm:636
+#: diskdrake/interactive.pm:631
 #, c-format
 msgid "Change partition type"
 msgstr "更改分区类型"
 
-#: diskdrake/interactive.pm:638 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:633 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "您希望使用哪种文件系统?"
 
-#: diskdrake/interactive.pm:645
+#: diskdrake/interactive.pm:640
 #, c-format
 msgid "Switching from %s to %s"
 msgstr "从 %s 切换到 %s"
 
-#: diskdrake/interactive.pm:680
+#: diskdrake/interactive.pm:675
 #, c-format
 msgid "Set volume label"
 msgstr "设定卷标"
 
-#: diskdrake/interactive.pm:682
+#: diskdrake/interactive.pm:677
 #, c-format
 msgid "Beware, this will be written to disk as soon as you validate!"
 msgstr "小心，当您确定之后，这一内容将会立即写入磁盘！"
 
-#: diskdrake/interactive.pm:683
+#: diskdrake/interactive.pm:678
 #, c-format
 msgid "Beware, this will be written to disk only after formatting!"
 msgstr "小心，格式化之后这一内容将会立即写入磁盘！"
 
-#: diskdrake/interactive.pm:685
+#: diskdrake/interactive.pm:680
 #, c-format
 msgid "Which volume label?"
 msgstr "哪个卷标？"
 
-#: diskdrake/interactive.pm:686
+#: diskdrake/interactive.pm:681
 #, c-format
 msgid "Label:"
 msgstr "标签:"
 
-#: diskdrake/interactive.pm:707
+#: diskdrake/interactive.pm:702
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:708
+#: diskdrake/interactive.pm:703
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您想把设备 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:713
+#: diskdrake/interactive.pm:708
 #, c-format
 msgid ""
 "Cannot unset mount point as this partition is used for loop back.\n"
@@ -1732,58 +1651,58 @@ msgstr ""
 "无法取消设定的挂载点, 因为该分区正用于回环。\n"
 "请先删除回环"
 
-#: diskdrake/interactive.pm:743
+#: diskdrake/interactive.pm:738
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "您想把 %s 挂载到哪里?"
 
-#: diskdrake/interactive.pm:773 diskdrake/interactive.pm:869
-#: fs/partitioning_wizard.pm:137 fs/partitioning_wizard.pm:213
+#: diskdrake/interactive.pm:768 diskdrake/interactive.pm:864
+#: fs/partitioning_wizard.pm:135 fs/partitioning_wizard.pm:211
 #, c-format
 msgid "Resizing"
 msgstr "改变大小"
 
-#: diskdrake/interactive.pm:773
+#: diskdrake/interactive.pm:768
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "计算 FAT 文件系统的边界"
 
-#: diskdrake/interactive.pm:815
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "无法更改此分区的大小"
 
-#: diskdrake/interactive.pm:820
+#: diskdrake/interactive.pm:815
 #, c-format
 msgid "All data on this partition should be backed up"
 msgstr "应该先备份在这个分区上的所有数据"
 
-#: diskdrake/interactive.pm:822
+#: diskdrake/interactive.pm:817
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:824
 #, c-format
 msgid "Choose the new size"
 msgstr "选择新的大小"
 
-#: diskdrake/interactive.pm:830
+#: diskdrake/interactive.pm:825
 #, c-format
 msgid "New size in MB: "
 msgstr "新大小(MB): "
 
-#: diskdrake/interactive.pm:831
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Minimum size: %s MB"
 msgstr "最小大小：%s MB"
 
-#: diskdrake/interactive.pm:832
+#: diskdrake/interactive.pm:827
 #, c-format
 msgid "Maximum size: %s MB"
 msgstr "最大大小：%s MB"
 
-#: diskdrake/interactive.pm:880 fs/partitioning_wizard.pm:221
+#: diskdrake/interactive.pm:875 fs/partitioning_wizard.pm:219
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s),\n"
@@ -1792,57 +1711,57 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
 "可能会自动运行文件系统检查"
 
-#: diskdrake/interactive.pm:946 diskdrake/interactive.pm:1507
+#: diskdrake/interactive.pm:941 diskdrake/interactive.pm:1493
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "文件系统加密密钥"
 
-#: diskdrake/interactive.pm:947
+#: diskdrake/interactive.pm:942
 #, c-format
 msgid "Enter your filesystem encryption key"
 msgstr "输入您的文件系统加密密钥"
 
-#: diskdrake/interactive.pm:948 diskdrake/interactive.pm:1515
+#: diskdrake/interactive.pm:943 diskdrake/interactive.pm:1501
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: diskdrake/interactive.pm:955
+#: diskdrake/interactive.pm:950
 #, c-format
 msgid "Invalid key"
 msgstr "无效的密钥"
 
-#: diskdrake/interactive.pm:978
+#: diskdrake/interactive.pm:973
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
 
-#: diskdrake/interactive.pm:980 diskdrake/interactive.pm:999
+#: diskdrake/interactive.pm:975 diskdrake/interactive.pm:994
 #, c-format
 msgid "new"
 msgstr "新建"
 
-#: diskdrake/interactive.pm:997
+#: diskdrake/interactive.pm:992
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "选择加入一个已存在的 LVM"
 
-#: diskdrake/interactive.pm:1009 diskdrake/interactive.pm:1018
+#: diskdrake/interactive.pm:1004 diskdrake/interactive.pm:1013
 #, c-format
 msgid "LVM name"
 msgstr "LVM 名称"
 
-#: diskdrake/interactive.pm:1010
+#: diskdrake/interactive.pm:1005
 #, c-format
 msgid "Enter a name for the new LVM volume group"
 msgstr "输入新 LVM 卷组的名称"
 
-#: diskdrake/interactive.pm:1015
+#: diskdrake/interactive.pm:1010
 #, c-format
 msgid "\"%s\" already exists"
 msgstr "“%s”已经存在"
 
-#: diskdrake/interactive.pm:1047
+#: diskdrake/interactive.pm:1042
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -1851,117 +1770,117 @@ msgstr ""
 "物理卷 %s 仍在使用中。\n"
 "您是否想要将此卷上已用的物理扩展分区移动到其它卷上？"
 
-#: diskdrake/interactive.pm:1049
+#: diskdrake/interactive.pm:1044
 #, c-format
 msgid "Moving physical extents"
 msgstr "移动物理扩展分区"
 
-#: diskdrake/interactive.pm:1067
+#: diskdrake/interactive.pm:1062
 #, c-format
 msgid "This partition cannot be used for loopback"
 msgstr "这个分区不能被用于回环"
 
-#: diskdrake/interactive.pm:1080
+#: diskdrake/interactive.pm:1075
 #, c-format
 msgid "Loopback"
 msgstr "回环"
 
-#: diskdrake/interactive.pm:1081
+#: diskdrake/interactive.pm:1076
 #, c-format
 msgid "Loopback file name: "
 msgstr "回环文件名: "
 
-#: diskdrake/interactive.pm:1086
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "Give a file name"
 msgstr "给一个文件名"
 
-#: diskdrake/interactive.pm:1089
+#: diskdrake/interactive.pm:1084
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "文件已经被另一个回环使用, 请另外选择一个"
 
-#: diskdrake/interactive.pm:1090
+#: diskdrake/interactive.pm:1085
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "文件已经存在。使用现有的文件吗?"
 
-#: diskdrake/interactive.pm:1122 diskdrake/interactive.pm:1125
+#: diskdrake/interactive.pm:1117 diskdrake/interactive.pm:1120
 #, c-format
 msgid "Mount options"
 msgstr "挂载选项"
 
-#: diskdrake/interactive.pm:1132
+#: diskdrake/interactive.pm:1127
 #, c-format
 msgid "Various"
 msgstr "杂项"
 
-#: diskdrake/interactive.pm:1178
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "device"
 msgstr "设备"
 
-#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1174
 #, c-format
 msgid "level"
 msgstr "级别"
 
-#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1175
 #, c-format
 msgid "chunk size in KiB"
 msgstr "组块大小(KB)"
 
-#: diskdrake/interactive.pm:1198
+#: diskdrake/interactive.pm:1193
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "小心: 该操作有危险。"
 
-#: diskdrake/interactive.pm:1213
+#: diskdrake/interactive.pm:1208
 #, c-format
 msgid "Partitioning Type"
 msgstr "分区类型"
 
-#: diskdrake/interactive.pm:1213
+#: diskdrake/interactive.pm:1208
 #, c-format
 msgid "What type of partitioning?"
 msgstr "何种分区类型?"
 
-#: diskdrake/interactive.pm:1251
+#: diskdrake/interactive.pm:1246
 #, c-format
 msgid "You'll need to reboot before the modification can take effect"
 msgstr "修改要等到重新启动后才能生效"
 
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1255
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1279 fs/format.pm:107 fs/format.pm:114
+#: diskdrake/interactive.pm:1274 fs/format.pm:107 fs/format.pm:114
 #, c-format
 msgid "Formatting partition %s"
 msgstr "正在格式化分区 %s"
 
-#: diskdrake/interactive.pm:1292
+#: diskdrake/interactive.pm:1287
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1306 fs/partitioning.pm:48
+#: diskdrake/interactive.pm:1301 fs/partitioning.pm:48
 #, c-format
 msgid "Check for bad blocks?"
 msgstr "是否检查坏磁块?"
 
-#: diskdrake/interactive.pm:1321
+#: diskdrake/interactive.pm:1316
 #, c-format
 msgid "Move files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1321
+#: diskdrake/interactive.pm:1316
 #, c-format
 msgid "Hide files"
 msgstr "隐藏文件"
 
-#: diskdrake/interactive.pm:1322
+#: diskdrake/interactive.pm:1317
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -1977,128 +1896,122 @@ msgstr ""
 "您可以选择将文件移动到即将挂载到该目录的分区，或者将其保留在原地(这将导致这些"
 "文件因为其它分区被挂载被隐藏)"
 
-#: diskdrake/interactive.pm:1337
+#: diskdrake/interactive.pm:1332
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "移动文件到新分区"
 
-#: diskdrake/interactive.pm:1341
+#: diskdrake/interactive.pm:1336
 #, c-format
 msgid "Copying %s"
 msgstr "复制 %s"
 
-#: diskdrake/interactive.pm:1345
+#: diskdrake/interactive.pm:1340
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: diskdrake/interactive.pm:1359
+#: diskdrake/interactive.pm:1354
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "分区 %s 现在被识别为 %s"
 
-#: diskdrake/interactive.pm:1360
+#: diskdrake/interactive.pm:1355
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "分区已被重新编号: "
 
-#: diskdrake/interactive.pm:1385 diskdrake/interactive.pm:1456
+#: diskdrake/interactive.pm:1380 diskdrake/interactive.pm:1442
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: diskdrake/interactive.pm:1386
+#: diskdrake/interactive.pm:1381
 #, c-format
 msgid "Volume label: "
 msgstr "卷标: "
 
-#: diskdrake/interactive.pm:1387
+#: diskdrake/interactive.pm:1382
 #, c-format
 msgid "UUID: "
 msgstr "UUDI: "
 
-#: diskdrake/interactive.pm:1388
+#: diskdrake/interactive.pm:1383
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 下的盘符: %s(只是猜测)\n"
 
-#: diskdrake/interactive.pm:1392 diskdrake/interactive.pm:1401
-#: diskdrake/interactive.pm:1475
+#: diskdrake/interactive.pm:1387 diskdrake/interactive.pm:1461
 #, c-format
 msgid "Type: "
 msgstr "类型: "
 
-#: diskdrake/interactive.pm:1396 diskdrake/interactive.pm:1460
-#, c-format
-msgid "Name: "
-msgstr "名称: "
-
-#: diskdrake/interactive.pm:1403
+#: diskdrake/interactive.pm:1389
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "开始: 第 %s 扇区\n"
 
-#: diskdrake/interactive.pm:1404
+#: diskdrake/interactive.pm:1390
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1406
+#: diskdrake/interactive.pm:1392
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇区"
 
-#: diskdrake/interactive.pm:1408
+#: diskdrake/interactive.pm:1394
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "柱面 %d 到 %d\n"
 
-#: diskdrake/interactive.pm:1409
+#: diskdrake/interactive.pm:1395
 #, c-format
 msgid "Number of logical extents: %d\n"
 msgstr "逻辑分区数：%d\n"
 
-#: diskdrake/interactive.pm:1410
+#: diskdrake/interactive.pm:1396
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1411
+#: diskdrake/interactive.pm:1397
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1412
+#: diskdrake/interactive.pm:1398
 #, c-format
 msgid "Mounted\n"
 msgstr "已挂载\n"
 
-#: diskdrake/interactive.pm:1413
+#: diskdrake/interactive.pm:1399
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1415
+#: diskdrake/interactive.pm:1401
 #, c-format
 msgid "Encrypted"
 msgstr "已加密"
 
-#: diskdrake/interactive.pm:1417
+#: diskdrake/interactive.pm:1403
 #, c-format
 msgid " (mapped on %s)"
 msgstr " (已映射为 %s)"
 
-#: diskdrake/interactive.pm:1418
+#: diskdrake/interactive.pm:1404
 #, c-format
 msgid " (to map on %s)"
 msgstr "  (应映射为 %s)"
 
-#: diskdrake/interactive.pm:1419
+#: diskdrake/interactive.pm:1405
 #, c-format
 msgid " (inactive)"
 msgstr " (交互)"
 
-#: diskdrake/interactive.pm:1426
+#: diskdrake/interactive.pm:1412
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2107,7 +2020,7 @@ msgstr ""
 "回环文件: \n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1427
+#: diskdrake/interactive.pm:1413
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2116,27 +2029,27 @@ msgstr ""
 "预设的启动分区\n"
 "    (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
 
-#: diskdrake/interactive.pm:1429
+#: diskdrake/interactive.pm:1415
 #, c-format
 msgid "Level %s\n"
 msgstr "级别 %s\n"
 
-#: diskdrake/interactive.pm:1430
+#: diskdrake/interactive.pm:1416
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "组块大小 %d KB\n"
 
-#: diskdrake/interactive.pm:1431
+#: diskdrake/interactive.pm:1417
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1433
+#: diskdrake/interactive.pm:1419
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "回环文件名称: %s"
 
-#: diskdrake/interactive.pm:1436
+#: diskdrake/interactive.pm:1422
 #, c-format
 msgid ""
 "\n"
@@ -2148,7 +2061,7 @@ msgstr ""
 "此分区很可能是驱动器分区。\n"
 "您最好请不要更改它。\n"
 
-#: diskdrake/interactive.pm:1439
+#: diskdrake/interactive.pm:1425
 #, c-format
 msgid ""
 "\n"
@@ -2160,57 +2073,62 @@ msgstr ""
 "该 Bootstrap 分区特别\n"
 "是保留给双重启动系统。\n"
 
-#: diskdrake/interactive.pm:1448
+#: diskdrake/interactive.pm:1434
 #, c-format
 msgid "Free space on %s (%s)"
 msgstr "%s (%s) 上的空闲空间"
 
-#: diskdrake/interactive.pm:1457
+#: diskdrake/interactive.pm:1443
 #, c-format
 msgid "Read-only"
 msgstr "只读"
 
-#: diskdrake/interactive.pm:1458
+#: diskdrake/interactive.pm:1444
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1459
+#: diskdrake/interactive.pm:1445
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
 
-#: diskdrake/interactive.pm:1461
+#: diskdrake/interactive.pm:1446
+#, c-format
+msgid "Name: "
+msgstr "名称: "
+
+#: diskdrake/interactive.pm:1447
 #, c-format
 msgid "Medium type: "
 msgstr "介质类型: "
 
-#: diskdrake/interactive.pm:1462
+#: diskdrake/interactive.pm:1448
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM 磁盘 %s\n"
 
-#: diskdrake/interactive.pm:1463
+#: diskdrake/interactive.pm:1449
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "分区表类型: %s\n"
 
-#: diskdrake/interactive.pm:1464
+#: diskdrake/interactive.pm:1450
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1508
+#: diskdrake/interactive.pm:1494
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
 
-#: diskdrake/interactive.pm:1511
+#: diskdrake/interactive.pm:1497
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 
-#: diskdrake/interactive.pm:1518
+#: diskdrake/interactive.pm:1504
 #, c-format
 msgid "Encryption algorithm"
 msgstr "加密算法"
@@ -2220,10 +2138,12 @@ msgstr "加密算法"
 msgid "Change type"
 msgstr "更改类型"
 
-#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:130 interactive.pm:551
+#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:120 interactive.pm:675
 #: interactive/curses.pm:267 interactive/http.pm:104 interactive/http.pm:160
 #: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:846
-#: mygtk2.pm:1229 ugtk2.pm:415 ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812
+#: mygtk2.pm:1229 mygtk3.pm:898 mygtk3.pm:1282 ugtk2.pm:415 ugtk2.pm:517
+#: ugtk2.pm:526 ugtk2.pm:812 ugtk3.pm:503 ugtk3.pm:593 ugtk3.pm:602
+#: ugtk3.pm:910
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -2274,32 +2194,32 @@ msgstr "搜索服务器"
 msgid "Search for new servers"
 msgstr "搜索新服务器"
 
-#: do_pkgs.pm:19 do_pkgs.pm:57
+#: do_pkgs.pm:45 do_pkgs.pm:100
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "需要安装软件包 %s。您同意安装吗?"
 
-#: do_pkgs.pm:23 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:83
+#: do_pkgs.pm:49 do_pkgs.pm:79 do_pkgs.pm:103 do_pkgs.pm:142
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "无法安装 %s 软件包!"
 
-#: do_pkgs.pm:28 do_pkgs.pm:65
+#: do_pkgs.pm:54 do_pkgs.pm:108
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "无法找到必需的软件包 %s"
 
-#: do_pkgs.pm:39 do_pkgs.pm:78
+#: do_pkgs.pm:74 do_pkgs.pm:137
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "下列软件包需要安装: \n"
 
-#: do_pkgs.pm:242
+#: do_pkgs.pm:341
 #, c-format
 msgid "Installing packages..."
 msgstr "正在安装软件包..."
 
-#: do_pkgs.pm:287 pkgs.pm:287
+#: do_pkgs.pm:386 pkgs.pm:288
 #, c-format
 msgid "Removing packages..."
 msgstr "正在删除软件包..."
@@ -2312,7 +2232,7 @@ msgid ""
 msgstr ""
 "发生错误！新建文件系统时找不到可用的设备。请检查您的硬件以确定问题的原因"
 
-#: fs/any.pm:75 fs/partitioning_wizard.pm:70
+#: fs/any.pm:71 fs/partitioning_wizard.pm:68
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "您必须有一个FAT分区载入 /boot/efi"
@@ -2362,7 +2282,7 @@ msgstr "将分区 %s 挂载于目录 %s 失败"
 msgid "Checking %s"
 msgstr "正在检查 %s"
 
-#: fs/mount.pm:126 partition_table.pm:422
+#: fs/mount.pm:126 partition_table.pm:398
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "卸载 %s 出错: %s"
@@ -2480,22 +2400,22 @@ msgstr "给普通用户以写权限"
 msgid "Give read-only access to ordinary users"
 msgstr "给普通用户以只读权限"
 
-#: fs/mount_point.pm:82
+#: fs/mount_point.pm:85
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "重复的挂载点 %s"
 
-#: fs/mount_point.pm:97
+#: fs/mount_point.pm:100
 #, c-format
 msgid "No partition available"
 msgstr "没有可用的硬盘分区"
 
-#: fs/mount_point.pm:100
+#: fs/mount_point.pm:103
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "正在扫描各个分区以查找挂载点"
 
-#: fs/mount_point.pm:107
+#: fs/mount_point.pm:110
 #, c-format
 msgid "Choose the mount points"
 msgstr "选择挂载点"
@@ -2517,7 +2437,7 @@ msgstr "检查文件系统 %s 失败。您想修复错误吗?(注意, 有可能�
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "交换空间太少, 无法完成安装, 请扩大交换分区。"
 
-#: fs/partitioning_wizard.pm:61
+#: fs/partitioning_wizard.pm:59
 #, c-format
 msgid ""
 "You must have a root partition.\n"
@@ -2528,7 +2448,7 @@ msgstr ""
 "请先创建一个 Linux 分区(或在图中单击现有的一个)。\n"
 "然后在列表里选择“挂载点”, 设为“/”。"
 
-#: fs/partitioning_wizard.pm:67
+#: fs/partitioning_wizard.pm:65
 #, c-format
 msgid ""
 "You do not have a swap partition.\n"
@@ -2539,42 +2459,42 @@ msgstr ""
 "\n"
 "要继续吗?"
 
-#: fs/partitioning_wizard.pm:101
+#: fs/partitioning_wizard.pm:99
 #, c-format
 msgid "Use free space"
 msgstr "使用空闲空间"
 
-#: fs/partitioning_wizard.pm:103
+#: fs/partitioning_wizard.pm:101
 #, c-format
 msgid "Not enough free space to allocate new partitions"
 msgstr "没有足够空闲空间分配给新分区"
 
-#: fs/partitioning_wizard.pm:111
+#: fs/partitioning_wizard.pm:109
 #, c-format
 msgid "Use existing partitions"
 msgstr "使用现存的分区"
 
-#: fs/partitioning_wizard.pm:113
+#: fs/partitioning_wizard.pm:111
 #, c-format
 msgid "There is no existing partition to use"
 msgstr "没有可使用的现存分区"
 
-#: fs/partitioning_wizard.pm:137
+#: fs/partitioning_wizard.pm:135
 #, c-format
 msgid "Computing the size of the Microsoft Windows® partition"
 msgstr "正在计算 Microsoft Windows® 分区的大小"
 
-#: fs/partitioning_wizard.pm:173
+#: fs/partitioning_wizard.pm:171
 #, c-format
 msgid "Use the free space on a Microsoft Windows® partition"
 msgstr "使用在 Microsoft Windows® 分区上的空闲空间"
 
-#: fs/partitioning_wizard.pm:177
+#: fs/partitioning_wizard.pm:175
 #, c-format
 msgid "Which partition do you want to resize?"
 msgstr "您需要改变哪个分区的大小?"
 
-#: fs/partitioning_wizard.pm:180
+#: fs/partitioning_wizard.pm:178
 #, c-format
 msgid ""
 "Your Microsoft Windows® partition is too fragmented. Please reboot your "
@@ -2584,7 +2504,7 @@ msgstr ""
 "您的 Microsoft Windows® 分区有太多碎片, 请重新启动, 进入 Microsoft Windows®, "
 "运行磁盘碎片整理程序, 然后重新开始安装 %s"
 
-#: fs/partitioning_wizard.pm:188
+#: fs/partitioning_wizard.pm:186
 #, c-format
 msgid ""
 "WARNING!\n"
@@ -2618,75 +2538,75 @@ msgstr ""
 "一切就绪后, 请按“%s”。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:197 fs/partitioning_wizard.pm:565
-#: interactive.pm:550 interactive/curses.pm:270 ugtk2.pm:519
+#: fs/partitioning_wizard.pm:195 fs/partitioning_wizard.pm:557
+#: interactive.pm:674 interactive/curses.pm:270 ugtk2.pm:519 ugtk3.pm:595
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: fs/partitioning_wizard.pm:203
+#: fs/partitioning_wizard.pm:201
 #, c-format
 msgid "Partitionning"
 msgstr "分区"
 
-#: fs/partitioning_wizard.pm:203
+#: fs/partitioning_wizard.pm:201
 #, c-format
 msgid "Which size do you want to keep for Microsoft Windows® on partition %s?"
 msgstr "您将保留多少空间给 Microsoft Windows® 分区 %s?"
 
-#: fs/partitioning_wizard.pm:204
+#: fs/partitioning_wizard.pm:202
 #, c-format
 msgid "Size"
 msgstr "大小"
 
-#: fs/partitioning_wizard.pm:213
+#: fs/partitioning_wizard.pm:211
 #, c-format
 msgid "Resizing Microsoft Windows® partition"
 msgstr "改变 Microsoft Windows® 分区大小"
 
-#: fs/partitioning_wizard.pm:218
+#: fs/partitioning_wizard.pm:216
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT 调整大小失败: %s"
 
-#: fs/partitioning_wizard.pm:234
+#: fs/partitioning_wizard.pm:232
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr "没有 FAT 分区用来调整大小(或者没有足够剩余空间)"
 
-#: fs/partitioning_wizard.pm:239
+#: fs/partitioning_wizard.pm:237
 #, c-format
 msgid "Remove Microsoft Windows®"
 msgstr "删除 Microsoft Windows®"
 
-#: fs/partitioning_wizard.pm:239
+#: fs/partitioning_wizard.pm:237
 #, c-format
 msgid "Erase and use entire disk"
 msgstr "清除并使用整个磁盘"
 
-#: fs/partitioning_wizard.pm:243
+#: fs/partitioning_wizard.pm:241
 #, c-format
 msgid ""
 "You have more than one hard disk drive, which one do you want the installer "
 "to use?"
 msgstr "您有不只一个硬盘, 您要在哪个上面安装系统?"
 
-#: fs/partitioning_wizard.pm:251 fsedit.pm:634
+#: fs/partitioning_wizard.pm:249 fsedit.pm:632
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "磁盘 %s 上现存的所有分区及其资料将被清除"
 
-#: fs/partitioning_wizard.pm:261
+#: fs/partitioning_wizard.pm:259
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "自定义磁盘分区"
 
-#: fs/partitioning_wizard.pm:267
+#: fs/partitioning_wizard.pm:265
 #, c-format
 msgid "Use fdisk"
 msgstr "使用 fdisk"
 
-#: fs/partitioning_wizard.pm:270
+#: fs/partitioning_wizard.pm:268
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -2695,37 +2615,37 @@ msgstr ""
 "您现在可以在 %s 上分区。\n"
 "做完之后, 不要忘记用“w”命令保存您的修改"
 
-#: fs/partitioning_wizard.pm:409
+#: fs/partitioning_wizard.pm:401
 #, c-format
 msgid "Ext2/3/4"
 msgstr "Ext2/3/4"
 
-#: fs/partitioning_wizard.pm:439 fs/partitioning_wizard.pm:585
+#: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:577
 #, c-format
 msgid "I cannot find any room for installing"
 msgstr "我无法找到安装需要的空间"
 
-#: fs/partitioning_wizard.pm:448 fs/partitioning_wizard.pm:592
+#: fs/partitioning_wizard.pm:440 fs/partitioning_wizard.pm:584
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX 分区向导找到下列解决办法:"
 
-#: fs/partitioning_wizard.pm:518
+#: fs/partitioning_wizard.pm:510
 #, c-format
 msgid "Here is the content of your disk drive "
 msgstr "这是您硬盘驱动器的内容 "
 
-#: fs/partitioning_wizard.pm:602
+#: fs/partitioning_wizard.pm:595
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "分区失败: %s"
 
-#: fs/type.pm:390
+#: fs/type.pm:369
 #, c-format
 msgid "You cannot use JFS for partitions smaller than 16MB"
 msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
 
-#: fs/type.pm:391
+#: fs/type.pm:370
 #, c-format
 msgid "You cannot use ReiserFS for partitions smaller than 32MB"
 msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
@@ -2829,7 +2749,7 @@ msgstr ""
 "如果没有一个 /boot 分区, 各种启动引导程序都无法处理这种情况。\n"
 "所以, 请增加一个 /boot 分区。"
 
-#: fsedit.pm:465 fsedit.pm:485
+#: fsedit.pm:465 fsedit.pm:483
 #, c-format
 msgid "You cannot use an encrypted filesystem for mount point %s"
 msgstr "挂载点 %s 不能使用用加密的文件系统"
@@ -2858,19 +2778,19 @@ msgstr ""
 msgid "This directory should remain within the root filesystem"
 msgstr "这个目录应该保留在根文件系统中"
 
-#: fsedit.pm:479 fsedit.pm:481 fsedit.pm:483
+#: fsedit.pm:479 fsedit.pm:481
 #, 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:550
+#: fsedit.pm:548
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "没有足够的空闲空间供自动分配"
 
-#: fsedit.pm:552
+#: fsedit.pm:550
 #, c-format
 msgid "Nothing to do"
 msgstr "不做任何事"
@@ -3116,70 +3036,62 @@ msgstr "未知/其它"
 msgid "cpu # "
 msgstr "CPU # "
 
-#: harddrake/sound.pm:270
+#: harddrake/sound.pm:77
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "请稍候...正在应用配置"
 
-#: harddrake/sound.pm:133
+#: harddrake/sound.pm:98
 #, c-format
 msgid "No known driver"
 msgstr "没有已知驱动程序"
 
-#: harddrake/sound.pm:134
+#: harddrake/sound.pm:99
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "没有已知的驱动程序可以用在您的声卡(%s)上"
 
-#: harddrake/sound.pm:166
+#: harddrake/sound.pm:130
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "启用 PulseAudio"
 
-#: harddrake/sound.pm:336
+#: harddrake/sound.pm:135
 #, c-format
 msgid "Use Glitch-Free mode"
 msgstr "使用无干扰模式"
 
-#: harddrake/sound.pm:342
+#: harddrake/sound.pm:141
 #, c-format
 msgid "Reset sound mixer to default values"
 msgstr "将混音器重置为默认值"
 
-#: harddrake/sound.pm:347
+#: harddrake/sound.pm:146
 #, c-format
 msgid "Troubleshooting"
 msgstr "疑难解答"
 
-#: harddrake/sound.pm:354
+#: harddrake/sound.pm:153
 #, c-format
 msgid "No alternative driver"
 msgstr "没有替代的驱动程序"
 
-#: harddrake/sound.pm:355
+#: harddrake/sound.pm:154
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr "没有已知的 OSS/ALSA 替代驱动程序可以用在您的声卡(%s)上, 现正使用“%s”"
 
-#: harddrake/sound.pm:362
+#: harddrake/sound.pm:161
 #, c-format
 msgid "Sound configuration"
 msgstr "声音配置"
 
-#: harddrake/sound.pm:364
-#, c-format
-msgid ""
-"Here you can select an alternative driver (either OSS or ALSA) for your "
-"sound card (%s)."
-msgstr ""
-"您可以在这里配置可以用在您的声卡(%s)上的替代驱动程序(可以选择 OSS 或 ALSA)。"
-
-#. -PO: here the first %s is either "OSS" or "ALSA", 
+#. -PO: here the first %s is either "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
-#: harddrake/sound.pm:369
+#: harddrake/sound.pm:167
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3191,7 +3103,7 @@ msgstr ""
 "\n"
 "您的声卡现在正在使用 %s“%s”驱动程序(其默认驱动程序为“%s”)"
 
-#: harddrake/sound.pm:371
+#: harddrake/sound.pm:169
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3223,18 +3135,18 @@ msgstr ""
 "- 与旧的 OSS 兼容的 API\n"
 "- 新的 ALSA API 带来许多增强特性, 但这需要使用 ALSA 库。\n"
 
-#: harddrake/sound.pm:385 harddrake/sound.pm:487
+#: harddrake/sound.pm:184 harddrake/sound.pm:266
 #, c-format
 msgid "Driver:"
 msgstr "驱动程序: "
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:206
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "声音疑难解决"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:430
+#: harddrake/sound.pm:209
 #, c-format
 msgid ""
 "Below are some basic tips to help debug audio problems, but for accurate and "
@@ -3293,23 +3205,23 @@ msgid ""
 "PulseAudio)\n"
 msgstr ""
 
-#: harddrake/sound.pm:476
+#: harddrake/sound.pm:255
 #, c-format
 msgid "Let me pick any driver"
 msgstr "让我挑选任意驱动"
 
-#: harddrake/sound.pm:479
+#: harddrake/sound.pm:258
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "选择其它驱动"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:482
-#, c-format
+#: harddrake/sound.pm:261
+#, fuzzy, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
 "card\n"
-"you can pick one from the above list.\n"
+"you can pick one from the list below.\n"
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
@@ -3360,65 +3272,68 @@ msgstr "卡的型号: "
 msgid "Tuner type:"
 msgstr "调谐器类型: "
 
-#: interactive.pm:129 interactive.pm:550 interactive/curses.pm:270
+#: interactive.pm:119 interactive.pm:674 interactive/curses.pm:270
 #: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
 #: interactive/stdio.pm:148 interactive/stdio.pm:149 mygtk2.pm:846
-#: ugtk2.pm:421 ugtk2.pm:519 ugtk2.pm:812 ugtk2.pm:835
+#: mygtk3.pm:898 ugtk2.pm:421 ugtk2.pm:519 ugtk2.pm:812 ugtk2.pm:835
+#: ugtk3.pm:509 ugtk3.pm:595 ugtk3.pm:910 ugtk3.pm:933
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: interactive.pm:229 modules/interactive.pm:72 ugtk2.pm:811 wizards.pm:157
+#: interactive.pm:219 modules/interactive.pm:72 ugtk2.pm:811 ugtk3.pm:909
+#: wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: interactive.pm:229 modules/interactive.pm:72 ugtk2.pm:811 wizards.pm:157
+#: interactive.pm:219 modules/interactive.pm:72 ugtk2.pm:811 ugtk3.pm:909
+#: wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: interactive.pm:263
+#: interactive.pm:253
 #, c-format
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: interactive.pm:388 interactive/gtk.pm:457
+#: interactive.pm:390 interactive/gtk.pm:456
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: interactive.pm:388 interactive/gtk.pm:457
+#: interactive.pm:390 interactive/gtk.pm:456
 #, c-format
 msgid "Modify"
 msgstr "修改"
 
-#: interactive.pm:550 interactive/curses.pm:270 ugtk2.pm:519
+#: interactive.pm:674 interactive/curses.pm:270 ugtk2.pm:519 ugtk3.pm:595
 #, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: interactive.pm:551 interactive/curses.pm:267 ugtk2.pm:517
+#: interactive.pm:675 interactive/curses.pm:267 ugtk2.pm:517 ugtk3.pm:593
 #, c-format
 msgid "Previous"
 msgstr "上一步"
 
-#: interactive/curses.pm:576 ugtk2.pm:872
+#: interactive/curses.pm:576 ugtk2.pm:872 ugtk3.pm:970
 #, c-format
 msgid "No file chosen"
 msgstr "未选择文件"
 
-#: interactive/curses.pm:580 ugtk2.pm:876
+#: interactive/curses.pm:580 ugtk2.pm:876 ugtk3.pm:974
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "您选择了目录，而非文件"
 
-#: interactive/curses.pm:582 ugtk2.pm:878
+#: interactive/curses.pm:582 ugtk2.pm:878 ugtk3.pm:976
 #, c-format
 msgid "No such directory"
 msgstr "无此目录"
 
-#: interactive/curses.pm:582 ugtk2.pm:878
+#: interactive/curses.pm:582 ugtk2.pm:878 ugtk3.pm:976
 #, c-format
 msgid "No such file"
 msgstr "非本地文件"
@@ -3505,1222 +3420,1222 @@ msgstr "重新提交"
 #. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
 #. -PO: or as "default:RTL", depending if your language is written from
 #. -PO: left to right, or from right to left; any other string is wrong.
-#: lang.pm:203
+#: lang.pm:247
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:220
+#: lang.pm:301
 #, c-format
 msgid "Andorra"
 msgstr "安道尔"
 
-#: lang.pm:221 timezone.pm:228
+#: lang.pm:302 timezone.pm:235
 #, c-format
 msgid "United Arab Emirates"
 msgstr "阿拉伯联合酋长国"
 
-#: lang.pm:222
+#: lang.pm:303
 #, c-format
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: lang.pm:223
+#: lang.pm:304
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "安提瓜和巴布达"
 
-#: lang.pm:224
+#: lang.pm:305
 #, c-format
 msgid "Anguilla"
 msgstr "安圭拉"
 
-#: lang.pm:225
+#: lang.pm:306
 #, c-format
 msgid "Albania"
 msgstr "阿尔巴尼亚"
 
-#: lang.pm:226
+#: lang.pm:307
 #, c-format
 msgid "Armenia"
 msgstr "亚美尼亚"
 
-#: lang.pm:227
+#: lang.pm:308
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "荷属安的列斯"
 
-#: lang.pm:228
+#: lang.pm:309
 #, c-format
 msgid "Angola"
 msgstr "安哥拉"
 
-#: lang.pm:229
+#: lang.pm:310
 #, c-format
 msgid "Antarctica"
 msgstr "南极洲"
 
-#: lang.pm:230 timezone.pm:273
+#: lang.pm:311 timezone.pm:280
 #, c-format
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: lang.pm:231
+#: lang.pm:312
 #, c-format
 msgid "American Samoa"
 msgstr "美属萨摩亚"
 
-#: lang.pm:232 mirror.pm:12 timezone.pm:231
+#: lang.pm:313 mirror.pm:22 timezone.pm:238
 #, c-format
 msgid "Austria"
 msgstr "奥地利"
 
-#: lang.pm:233 mirror.pm:11 timezone.pm:269
+#: lang.pm:314 mirror.pm:21 timezone.pm:276
 #, c-format
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: lang.pm:234
+#: lang.pm:315
 #, c-format
 msgid "Aruba"
 msgstr "阿鲁巴"
 
-#: lang.pm:235
+#: lang.pm:316
 #, c-format
 msgid "Azerbaijan"
 msgstr "阿塞拜疆"
 
-#: lang.pm:236
+#: lang.pm:317
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "波黑"
 
-#: lang.pm:237
+#: lang.pm:318
 #, c-format
 msgid "Barbados"
 msgstr "巴巴多斯"
 
-#: lang.pm:238 timezone.pm:213
+#: lang.pm:319 timezone.pm:220
 #, c-format
 msgid "Bangladesh"
 msgstr "孟加拉"
 
-#: lang.pm:239 mirror.pm:13 timezone.pm:233
+#: lang.pm:320 mirror.pm:23 timezone.pm:240
 #, c-format
 msgid "Belgium"
 msgstr "比利时"
 
-#: lang.pm:240
+#: lang.pm:321
 #, c-format
 msgid "Burkina Faso"
 msgstr "布基纳法索"
 
-#: lang.pm:241 timezone.pm:234
+#: lang.pm:322 timezone.pm:241
 #, c-format
 msgid "Bulgaria"
 msgstr "保加利亚"
 
-#: lang.pm:242
+#: lang.pm:323
 #, c-format
 msgid "Bahrain"
 msgstr "巴林"
 
-#: lang.pm:243
+#: lang.pm:324
 #, c-format
 msgid "Burundi"
 msgstr "布隆迪"
 
-#: lang.pm:244
+#: lang.pm:325
 #, c-format
 msgid "Benin"
 msgstr "贝宁"
 
-#: lang.pm:245
+#: lang.pm:326
 #, c-format
 msgid "Bermuda"
 msgstr "百慕大"
 
-#: lang.pm:246
+#: lang.pm:327
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "文莱达鲁萨兰国"
 
-#: lang.pm:247
+#: lang.pm:328
 #, c-format
 msgid "Bolivia"
 msgstr "玻利维亚"
 
-#: lang.pm:248 mirror.pm:14 timezone.pm:274
+#: lang.pm:329 mirror.pm:24 timezone.pm:281
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: lang.pm:249
+#: lang.pm:330
 #, c-format
 msgid "Bahamas"
 msgstr "巴哈马"
 
-#: lang.pm:250
+#: lang.pm:331
 #, c-format
 msgid "Bhutan"
 msgstr "不丹"
 
-#: lang.pm:251
+#: lang.pm:332
 #, c-format
 msgid "Bouvet Island"
 msgstr "布维岛"
 
-#: lang.pm:252
+#: lang.pm:333
 #, c-format
 msgid "Botswana"
 msgstr "博茨瓦纳"
 
-#: lang.pm:253 timezone.pm:232
+#: lang.pm:334 timezone.pm:239
 #, c-format
 msgid "Belarus"
 msgstr "白俄罗斯"
 
-#: lang.pm:254
+#: lang.pm:335
 #, c-format
 msgid "Belize"
 msgstr "伯利兹"
 
-#: lang.pm:255 mirror.pm:15 timezone.pm:263
+#: lang.pm:336 mirror.pm:25 timezone.pm:270
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: lang.pm:256
+#: lang.pm:337
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "科科斯群岛"
 
-#: lang.pm:257
+#: lang.pm:338
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "刚果(金沙萨)"
 
-#: lang.pm:258
+#: lang.pm:339
 #, c-format
 msgid "Central African Republic"
 msgstr "中非共和国"
 
-#: lang.pm:259
+#: lang.pm:340
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "刚果(布拉柴维尔)"
 
-#: lang.pm:260 mirror.pm:39 timezone.pm:257
+#: lang.pm:341 mirror.pm:49 timezone.pm:264
 #, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: lang.pm:261
+#: lang.pm:342
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "科特迪瓦"
 
-#: lang.pm:262
+#: lang.pm:343
 #, c-format
 msgid "Cook Islands"
 msgstr "库克群岛"
 
-#: lang.pm:263 timezone.pm:275
+#: lang.pm:344 timezone.pm:282
 #, c-format
 msgid "Chile"
 msgstr "智利"
 
-#: lang.pm:264
+#: lang.pm:345
 #, c-format
 msgid "Cameroon"
 msgstr "喀麦隆"
 
-#: lang.pm:265 timezone.pm:214
+#: lang.pm:346 timezone.pm:221
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: lang.pm:266
+#: lang.pm:347
 #, c-format
 msgid "Colombia"
 msgstr "哥伦比亚"
 
-#: lang.pm:267 mirror.pm:16
+#: lang.pm:348 mirror.pm:26
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: lang.pm:268
+#: lang.pm:349
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr "塞尔维亚和黑山"
 
-#: lang.pm:269
+#: lang.pm:350
 #, c-format
 msgid "Cuba"
 msgstr "古巴"
 
-#: lang.pm:270
+#: lang.pm:351
 #, c-format
 msgid "Cape Verde"
 msgstr "佛得角"
 
-#: lang.pm:271
+#: lang.pm:352
 #, c-format
 msgid "Christmas Island"
 msgstr "圣诞岛"
 
-#: lang.pm:272
+#: lang.pm:353
 #, c-format
 msgid "Cyprus"
 msgstr "塞浦路斯"
 
-#: lang.pm:273 mirror.pm:17 timezone.pm:235
+#: lang.pm:354 mirror.pm:27 timezone.pm:242
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: lang.pm:274 mirror.pm:22 timezone.pm:240
+#: lang.pm:355 mirror.pm:32 timezone.pm:247
 #, c-format
 msgid "Germany"
 msgstr "德国"
 
-#: lang.pm:275
+#: lang.pm:356
 #, c-format
 msgid "Djibouti"
 msgstr "吉布提"
 
-#: lang.pm:276 mirror.pm:18 timezone.pm:236
+#: lang.pm:357 mirror.pm:28 timezone.pm:243
 #, c-format
 msgid "Denmark"
 msgstr "丹麦"
 
-#: lang.pm:277
+#: lang.pm:358
 #, c-format
 msgid "Dominica"
 msgstr "多米尼加"
 
-#: lang.pm:278
+#: lang.pm:359
 #, c-format
 msgid "Dominican Republic"
 msgstr "多米尼加共和国"
 
-#: lang.pm:279
+#: lang.pm:360
 #, c-format
 msgid "Algeria"
 msgstr "阿尔及利亚"
 
-#: lang.pm:280
+#: lang.pm:361
 #, c-format
 msgid "Ecuador"
 msgstr "厄瓜多尔"
 
-#: lang.pm:281 mirror.pm:19 timezone.pm:237
+#: lang.pm:362 mirror.pm:29 timezone.pm:244
 #, c-format
 msgid "Estonia"
 msgstr "爱沙尼亚"
 
-#: lang.pm:282
+#: lang.pm:363
 #, c-format
 msgid "Egypt"
 msgstr "埃及"
 
-#: lang.pm:283
+#: lang.pm:364
 #, c-format
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: lang.pm:284
+#: lang.pm:365
 #, c-format
 msgid "Eritrea"
 msgstr "厄立特里亚"
 
-#: lang.pm:285 mirror.pm:37 timezone.pm:255
+#: lang.pm:366 mirror.pm:47 timezone.pm:262
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: lang.pm:286
+#: lang.pm:367
 #, c-format
 msgid "Ethiopia"
 msgstr "埃塞俄比亚"
 
-#: lang.pm:287 mirror.pm:20 timezone.pm:238
+#: lang.pm:368 mirror.pm:30 timezone.pm:245
 #, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: lang.pm:288
+#: lang.pm:369
 #, c-format
 msgid "Fiji"
 msgstr "斐济"
 
-#: lang.pm:289
+#: lang.pm:370
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "福克兰群岛(马尔维纳斯)"
 
-#: lang.pm:290
+#: lang.pm:371
 #, c-format
 msgid "Micronesia"
 msgstr "密克罗尼西亚"
 
-#: lang.pm:291
+#: lang.pm:372
 #, c-format
 msgid "Faroe Islands"
 msgstr "法罗群岛"
 
-#: lang.pm:292 mirror.pm:21 timezone.pm:239
+#: lang.pm:373 mirror.pm:31 timezone.pm:246
 #, c-format
 msgid "France"
 msgstr "法国"
 
-#: lang.pm:293
+#: lang.pm:374
 #, c-format
 msgid "Gabon"
 msgstr "加蓬"
 
-#: lang.pm:294 timezone.pm:259
+#: lang.pm:375 timezone.pm:266
 #, c-format
 msgid "United Kingdom"
 msgstr "英国"
 
-#: lang.pm:295
+#: lang.pm:376
 #, c-format
 msgid "Grenada"
 msgstr "格林纳达"
 
-#: lang.pm:296
+#: lang.pm:377
 #, c-format
 msgid "Georgia"
 msgstr "乔治亚"
 
-#: lang.pm:297
+#: lang.pm:378
 #, c-format
 msgid "French Guiana"
 msgstr "法属圭亚那"
 
-#: lang.pm:298
+#: lang.pm:379
 #, c-format
 msgid "Ghana"
 msgstr "加纳"
 
-#: lang.pm:299
+#: lang.pm:380
 #, c-format
 msgid "Gibraltar"
 msgstr "直布罗陀"
 
-#: lang.pm:300
+#: lang.pm:381
 #, c-format
 msgid "Greenland"
 msgstr "格陵兰"
 
-#: lang.pm:301
+#: lang.pm:382
 #, c-format
 msgid "Gambia"
 msgstr "冈比亚"
 
-#: lang.pm:302
+#: lang.pm:383
 #, c-format
 msgid "Guinea"
 msgstr "几内亚"
 
-#: lang.pm:303
+#: lang.pm:384
 #, c-format
 msgid "Guadeloupe"
 msgstr "瓜德洛普"
 
-#: lang.pm:304
+#: lang.pm:385
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "赤道几内亚"
 
-#: lang.pm:305 mirror.pm:23 timezone.pm:241
+#: lang.pm:386 mirror.pm:33 timezone.pm:248
 #, c-format
 msgid "Greece"
 msgstr "希腊"
 
-#: lang.pm:306
+#: lang.pm:387
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "南乔治亚岛和南桑德韦奇岛"
 
-#: lang.pm:307 timezone.pm:264
+#: lang.pm:388 timezone.pm:271
 #, c-format
 msgid "Guatemala"
 msgstr "危地马拉"
 
-#: lang.pm:308
+#: lang.pm:389
 #, c-format
 msgid "Guam"
 msgstr "关岛"
 
-#: lang.pm:309
+#: lang.pm:390
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "几内亚比绍"
 
-#: lang.pm:310
+#: lang.pm:391
 #, c-format
 msgid "Guyana"
 msgstr "圭亚那"
 
-#: lang.pm:311
+#: lang.pm:392
 #, c-format
 msgid "Hong Kong SAR (China)"
 msgstr "中国香港"
 
-#: lang.pm:312
+#: lang.pm:393
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "赫德和麦克唐纳群岛"
 
-#: lang.pm:313
+#: lang.pm:394
 #, c-format
 msgid "Honduras"
 msgstr "洪都拉斯"
 
-#: lang.pm:314
+#: lang.pm:395
 #, c-format
 msgid "Croatia"
 msgstr "克罗地亚"
 
-#: lang.pm:315
+#: lang.pm:396
 #, c-format
 msgid "Haiti"
 msgstr "海地"
 
-#: lang.pm:316 mirror.pm:24 timezone.pm:242
+#: lang.pm:397 mirror.pm:34 timezone.pm:249
 #, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: lang.pm:317 timezone.pm:217
+#: lang.pm:398 timezone.pm:224
 #, c-format
 msgid "Indonesia"
 msgstr "印度尼西亚"
 
-#: lang.pm:318 mirror.pm:25 timezone.pm:243
+#: lang.pm:399 mirror.pm:35 timezone.pm:250
 #, c-format
 msgid "Ireland"
 msgstr "爱尔兰"
 
-#: lang.pm:319 mirror.pm:26 timezone.pm:219
+#: lang.pm:400 mirror.pm:36 timezone.pm:226
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: lang.pm:320 timezone.pm:216
+#: lang.pm:401 timezone.pm:223
 #, c-format
 msgid "India"
 msgstr "印度"
 
-#: lang.pm:321
+#: lang.pm:402
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "英属印度洋地区"
 
-#: lang.pm:322
+#: lang.pm:403
 #, c-format
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: lang.pm:323 timezone.pm:218
+#: lang.pm:404 timezone.pm:225
 #, c-format
 msgid "Iran"
 msgstr "伊朗"
 
-#: lang.pm:324
+#: lang.pm:405
 #, c-format
 msgid "Iceland"
 msgstr "冰岛"
 
-#: lang.pm:325 mirror.pm:27 timezone.pm:244
+#: lang.pm:406 mirror.pm:37 timezone.pm:251
 #, c-format
 msgid "Italy"
 msgstr "意大利"
 
-#: lang.pm:326
+#: lang.pm:407
 #, c-format
 msgid "Jamaica"
 msgstr "牙买加"
 
-#: lang.pm:327
+#: lang.pm:408
 #, c-format
 msgid "Jordan"
 msgstr "约旦"
 
-#: lang.pm:328 mirror.pm:28 timezone.pm:220
+#: lang.pm:409 mirror.pm:38 timezone.pm:227
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: lang.pm:329
+#: lang.pm:410
 #, c-format
 msgid "Kenya"
 msgstr "肯尼亚"
 
-#: lang.pm:330
+#: lang.pm:411
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "吉尔吉斯斯坦"
 
-#: lang.pm:331
+#: lang.pm:412
 #, c-format
 msgid "Cambodia"
 msgstr "柬埔寨"
 
-#: lang.pm:332
+#: lang.pm:413
 #, c-format
 msgid "Kiribati"
 msgstr "基里巴斯"
 
-#: lang.pm:333
+#: lang.pm:414
 #, c-format
 msgid "Comoros"
 msgstr "科摩罗"
 
-#: lang.pm:334
+#: lang.pm:415
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "圣基茨和尼维斯"
 
-#: lang.pm:335
+#: lang.pm:416
 #, c-format
 msgid "Korea (North)"
 msgstr "朝鲜"
 
-#: lang.pm:336 timezone.pm:221
+#: lang.pm:417 timezone.pm:228
 #, c-format
 msgid "Korea"
 msgstr "韩国"
 
-#: lang.pm:337
+#: lang.pm:418
 #, c-format
 msgid "Kuwait"
 msgstr "科威特"
 
-#: lang.pm:338
+#: lang.pm:419
 #, c-format
 msgid "Cayman Islands"
 msgstr "开曼群岛"
 
-#: lang.pm:339
+#: lang.pm:420
 #, c-format
 msgid "Kazakhstan"
 msgstr "哈萨克斯坦"
 
-#: lang.pm:340
+#: lang.pm:421
 #, c-format
 msgid "Laos"
 msgstr "老挝"
 
-#: lang.pm:341
+#: lang.pm:422
 #, c-format
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: lang.pm:342
+#: lang.pm:423
 #, c-format
 msgid "Saint Lucia"
 msgstr "圣卢西亚"
 
-#: lang.pm:343
+#: lang.pm:424
 #, c-format
 msgid "Liechtenstein"
 msgstr "列支敦士登"
 
-#: lang.pm:344
+#: lang.pm:425
 #, c-format
 msgid "Sri Lanka"
 msgstr "斯里兰卡"
 
-#: lang.pm:345
+#: lang.pm:426
 #, c-format
 msgid "Liberia"
 msgstr "利比里亚"
 
-#: lang.pm:346
+#: lang.pm:427
 #, c-format
 msgid "Lesotho"
 msgstr "莱索托"
 
-#: lang.pm:347 timezone.pm:245
+#: lang.pm:428 timezone.pm:252
 #, c-format
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: lang.pm:348 timezone.pm:246
+#: lang.pm:429 timezone.pm:253
 #, c-format
 msgid "Luxembourg"
 msgstr "卢森堡"
 
-#: lang.pm:349
+#: lang.pm:430
 #, c-format
 msgid "Latvia"
 msgstr "拉脱维亚"
 
-#: lang.pm:350
+#: lang.pm:431
 #, c-format
 msgid "Libya"
 msgstr "利比亚"
 
-#: lang.pm:351
+#: lang.pm:432
 #, c-format
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: lang.pm:352
+#: lang.pm:433
 #, c-format
 msgid "Monaco"
 msgstr "摩纳哥"
 
-#: lang.pm:353
+#: lang.pm:434
 #, c-format
 msgid "Moldova"
 msgstr "摩尔多瓦"
 
-#: lang.pm:354
+#: lang.pm:435
 #, c-format
 msgid "Madagascar"
 msgstr "马达加斯加"
 
-#: lang.pm:355
+#: lang.pm:436
 #, c-format
 msgid "Marshall Islands"
 msgstr "马绍尔群岛"
 
-#: lang.pm:356
+#: lang.pm:437
 #, c-format
 msgid "Macedonia"
 msgstr "马其顿"
 
-#: lang.pm:357
+#: lang.pm:438
 #, c-format
 msgid "Mali"
 msgstr "马里"
 
-#: lang.pm:358
+#: lang.pm:439
 #, c-format
 msgid "Myanmar"
 msgstr "缅甸"
 
-#: lang.pm:359
+#: lang.pm:440
 #, c-format
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: lang.pm:360
+#: lang.pm:441
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "北马里亚那岛"
 
-#: lang.pm:361
+#: lang.pm:442
 #, c-format
 msgid "Martinique"
 msgstr "马提尼克"
 
-#: lang.pm:362
+#: lang.pm:443
 #, c-format
 msgid "Mauritania"
 msgstr "毛里塔尼亚"
 
-#: lang.pm:363
+#: lang.pm:444
 #, c-format
 msgid "Montserrat"
 msgstr "蒙特塞拉特"
 
-#: lang.pm:364
+#: lang.pm:445
 #, c-format
 msgid "Malta"
 msgstr "马耳他"
 
-#: lang.pm:365
+#: lang.pm:446
 #, c-format
 msgid "Mauritius"
 msgstr "毛里求斯"
 
-#: lang.pm:366
+#: lang.pm:447
 #, c-format
 msgid "Maldives"
 msgstr "马尔代夫"
 
-#: lang.pm:367
+#: lang.pm:448
 #, c-format
 msgid "Malawi"
 msgstr "马拉维"
 
-#: lang.pm:368 timezone.pm:265
+#: lang.pm:449 timezone.pm:272
 #, c-format
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: lang.pm:369 timezone.pm:222
+#: lang.pm:450 timezone.pm:229
 #, c-format
 msgid "Malaysia"
 msgstr "马来西亚"
 
-#: lang.pm:370
+#: lang.pm:451
 #, c-format
 msgid "Mozambique"
 msgstr "莫桑比克"
 
-#: lang.pm:371
+#: lang.pm:452
 #, c-format
 msgid "Namibia"
 msgstr "纳米比亚"
 
-#: lang.pm:372
+#: lang.pm:453
 #, c-format
 msgid "New Caledonia"
 msgstr "新喀里多尼亚"
 
-#: lang.pm:373
+#: lang.pm:454
 #, c-format
 msgid "Niger"
 msgstr "尼日尔"
 
-#: lang.pm:374
+#: lang.pm:455
 #, c-format
 msgid "Norfolk Island"
 msgstr "诺福克岛"
 
-#: lang.pm:375
+#: lang.pm:456
 #, c-format
 msgid "Nigeria"
 msgstr "尼日利亚"
 
-#: lang.pm:376
+#: lang.pm:457
 #, c-format
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: lang.pm:377 mirror.pm:29 timezone.pm:247
+#: lang.pm:458 mirror.pm:39 timezone.pm:254
 #, c-format
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: lang.pm:378 mirror.pm:31 timezone.pm:248
+#: lang.pm:459 mirror.pm:41 timezone.pm:255
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: lang.pm:379
+#: lang.pm:460
 #, c-format
 msgid "Nepal"
 msgstr "尼泊尔"
 
-#: lang.pm:380
+#: lang.pm:461
 #, c-format
 msgid "Nauru"
 msgstr "瑙鲁"
 
-#: lang.pm:381
+#: lang.pm:462
 #, c-format
 msgid "Niue"
 msgstr "纽埃"
 
-#: lang.pm:382 mirror.pm:30 timezone.pm:270
+#: lang.pm:463 mirror.pm:40 timezone.pm:277
 #, c-format
 msgid "New Zealand"
 msgstr "新西兰"
 
-#: lang.pm:383
+#: lang.pm:464
 #, c-format
 msgid "Oman"
 msgstr "阿曼"
 
-#: lang.pm:384
+#: lang.pm:465
 #, c-format
 msgid "Panama"
 msgstr "巴拿马"
 
-#: lang.pm:385
+#: lang.pm:466
 #, c-format
 msgid "Peru"
 msgstr "秘鲁"
 
-#: lang.pm:386
+#: lang.pm:467
 #, c-format
 msgid "French Polynesia"
 msgstr "法属玻利尼西亚"
 
-#: lang.pm:387
+#: lang.pm:468
 #, c-format
 msgid "Papua New Guinea"
 msgstr "巴布亚新几内亚"
 
-#: lang.pm:388 timezone.pm:223
+#: lang.pm:469 timezone.pm:230
 #, c-format
 msgid "Philippines"
 msgstr "菲律宾"
 
-#: lang.pm:389
+#: lang.pm:470
 #, c-format
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: lang.pm:390 mirror.pm:32 timezone.pm:249
+#: lang.pm:471 mirror.pm:42 timezone.pm:256
 #, c-format
 msgid "Poland"
 msgstr "波兰"
 
-#: lang.pm:391
+#: lang.pm:472
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "圣皮埃尔岛及密克隆岛"
 
-#: lang.pm:392
+#: lang.pm:473
 #, c-format
 msgid "Pitcairn"
 msgstr "皮特克恩"
 
-#: lang.pm:393
+#: lang.pm:474
 #, c-format
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
-#: lang.pm:394
+#: lang.pm:475
 #, c-format
 msgid "Palestine"
 msgstr "巴勒斯坦"
 
-#: lang.pm:395 mirror.pm:33 timezone.pm:250
+#: lang.pm:476 mirror.pm:43 timezone.pm:257
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: lang.pm:396
+#: lang.pm:477
 #, c-format
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-#: lang.pm:397
+#: lang.pm:478
 #, c-format
 msgid "Palau"
 msgstr "帕劳"
 
-#: lang.pm:398
+#: lang.pm:479
 #, c-format
 msgid "Qatar"
 msgstr "卡塔尔"
 
-#: lang.pm:399
+#: lang.pm:480
 #, c-format
 msgid "Reunion"
 msgstr "留尼旺"
 
-#: lang.pm:400 timezone.pm:251
+#: lang.pm:481 timezone.pm:258
 #, c-format
 msgid "Romania"
 msgstr "罗马尼亚"
 
-#: lang.pm:401 mirror.pm:34
+#: lang.pm:482 mirror.pm:44
 #, c-format
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: lang.pm:402
+#: lang.pm:483
 #, c-format
 msgid "Rwanda"
 msgstr "卢旺达"
 
-#: lang.pm:403
+#: lang.pm:484
 #, c-format
 msgid "Saudi Arabia"
 msgstr "沙特阿拉伯"
 
-#: lang.pm:404
+#: lang.pm:485
 #, c-format
 msgid "Solomon Islands"
 msgstr "所罗门群岛"
 
-#: lang.pm:405
+#: lang.pm:486
 #, c-format
 msgid "Seychelles"
 msgstr "塞舌尔"
 
-#: lang.pm:406
+#: lang.pm:487
 #, c-format
 msgid "Sudan"
 msgstr "苏丹"
 
-#: lang.pm:407 mirror.pm:38 timezone.pm:256
+#: lang.pm:488 mirror.pm:48 timezone.pm:263
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: lang.pm:408 timezone.pm:224
+#: lang.pm:489 timezone.pm:231
 #, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: lang.pm:409
+#: lang.pm:490
 #, c-format
 msgid "Saint Helena"
 msgstr "圣·海伦娜"
 
-#: lang.pm:410 timezone.pm:254
+#: lang.pm:491 timezone.pm:261
 #, c-format
 msgid "Slovenia"
 msgstr "斯洛文尼亚"
 
-#: lang.pm:411
+#: lang.pm:492
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "斯马尔巴特和扬马延岛"
 
-#: lang.pm:412 mirror.pm:35 timezone.pm:253
+#: lang.pm:493 mirror.pm:45 timezone.pm:260
 #, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: lang.pm:413
+#: lang.pm:494
 #, c-format
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
-#: lang.pm:414
+#: lang.pm:495
 #, c-format
 msgid "San Marino"
 msgstr "圣马力诺"
 
-#: lang.pm:415
+#: lang.pm:496
 #, c-format
 msgid "Senegal"
 msgstr "塞内加尔"
 
-#: lang.pm:416
+#: lang.pm:497
 #, c-format
 msgid "Somalia"
 msgstr "索马里"
 
-#: lang.pm:417
+#: lang.pm:498
 #, c-format
 msgid "Suriname"
 msgstr "苏里南"
 
-#: lang.pm:418
+#: lang.pm:499
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "圣多美和普林西比"
 
-#: lang.pm:419
+#: lang.pm:500
 #, c-format
 msgid "El Salvador"
 msgstr "萨尔瓦多"
 
-#: lang.pm:420
+#: lang.pm:501
 #, c-format
 msgid "Syria"
 msgstr "叙利亚"
 
-#: lang.pm:421
+#: lang.pm:502
 #, c-format
 msgid "Swaziland"
 msgstr "斯威士兰"
 
-#: lang.pm:422
+#: lang.pm:503
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "特克斯和凯科斯群岛"
 
-#: lang.pm:423
+#: lang.pm:504
 #, c-format
 msgid "Chad"
 msgstr "乍得"
 
-#: lang.pm:424
+#: lang.pm:505
 #, c-format
 msgid "French Southern Territories"
 msgstr "法国南方属地"
 
-#: lang.pm:425
+#: lang.pm:506
 #, c-format
 msgid "Togo"
 msgstr "多哥"
 
-#: lang.pm:426 mirror.pm:41 timezone.pm:226
+#: lang.pm:507 mirror.pm:51 timezone.pm:233
 #, c-format
 msgid "Thailand"
 msgstr "泰国"
 
-#: lang.pm:427
+#: lang.pm:508
 #, c-format
 msgid "Tajikistan"
 msgstr "塔吉克斯坦"
 
-#: lang.pm:428
+#: lang.pm:509
 #, c-format
 msgid "Tokelau"
 msgstr "托克劳群岛"
 
-#: lang.pm:429
+#: lang.pm:510
 #, c-format
 msgid "East Timor"
 msgstr "东帝汶"
 
-#: lang.pm:430
+#: lang.pm:511
 #, c-format
 msgid "Turkmenistan"
 msgstr "土库曼斯坦"
 
-#: lang.pm:431
+#: lang.pm:512
 #, c-format
 msgid "Tunisia"
 msgstr "突尼斯"
 
-#: lang.pm:432
+#: lang.pm:513
 #, c-format
 msgid "Tonga"
 msgstr "汤加"
 
-#: lang.pm:433 timezone.pm:227
+#: lang.pm:514 timezone.pm:234
 #, c-format
 msgid "Turkey"
 msgstr "土耳其"
 
-#: lang.pm:434
+#: lang.pm:515
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "特立尼达和多巴哥岛"
 
-#: lang.pm:435
+#: lang.pm:516
 #, c-format
 msgid "Tuvalu"
 msgstr "图瓦卢"
 
-#: lang.pm:436 mirror.pm:40 timezone.pm:225
+#: lang.pm:517 mirror.pm:50 timezone.pm:232
 #, c-format
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: lang.pm:437 timezone.pm:210
+#: lang.pm:518 timezone.pm:217
 #, c-format
 msgid "Tanzania"
 msgstr "坦桑尼亚"
 
-#: lang.pm:438 timezone.pm:258
+#: lang.pm:519 timezone.pm:265
 #, c-format
 msgid "Ukraine"
 msgstr "乌克兰"
 
-#: lang.pm:439
+#: lang.pm:520
 #, c-format
 msgid "Uganda"
 msgstr "乌干达"
 
-#: lang.pm:440
+#: lang.pm:521
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "美属本土外岛屿"
 
-#: lang.pm:441 mirror.pm:42 timezone.pm:266
+#: lang.pm:522 mirror.pm:52 timezone.pm:273
 #, c-format
 msgid "United States"
 msgstr "美国"
 
-#: lang.pm:442
+#: lang.pm:523
 #, c-format
 msgid "Uruguay"
 msgstr "乌拉圭"
 
-#: lang.pm:443
+#: lang.pm:524
 #, c-format
 msgid "Uzbekistan"
 msgstr "乌兹别克斯坦"
 
-#: lang.pm:444
+#: lang.pm:525
 #, c-format
 msgid "Vatican"
 msgstr "梵蒂冈"
 
-#: lang.pm:445
+#: lang.pm:526
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "圣文森特和格林纳丁斯"
 
-#: lang.pm:446
+#: lang.pm:527
 #, c-format
 msgid "Venezuela"
 msgstr "委内瑞拉"
 
-#: lang.pm:447
+#: lang.pm:528
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "英属维京群岛"
 
-#: lang.pm:448
+#: lang.pm:529
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "美属维京群岛"
 
-#: lang.pm:449
+#: lang.pm:530
 #, c-format
 msgid "Vietnam"
 msgstr "越南"
 
-#: lang.pm:450
+#: lang.pm:531
 #, c-format
 msgid "Vanuatu"
 msgstr "瓦努阿图"
 
-#: lang.pm:451
+#: lang.pm:532
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "瓦利斯和富图纳群岛"
 
-#: lang.pm:452
+#: lang.pm:533
 #, c-format
 msgid "Samoa"
 msgstr "萨摩亚"
 
-#: lang.pm:453
+#: lang.pm:534
 #, c-format
 msgid "Yemen"
 msgstr "也门"
 
-#: lang.pm:454
+#: lang.pm:535
 #, c-format
 msgid "Mayotte"
 msgstr "马约特岛"
 
-#: lang.pm:455 mirror.pm:36 timezone.pm:209
+#: lang.pm:536 mirror.pm:46 timezone.pm:216
 #, c-format
 msgid "South Africa"
 msgstr "南非"
 
-#: lang.pm:456
+#: lang.pm:537
 #, c-format
 msgid "Zambia"
 msgstr "赞比亚"
 
-#: lang.pm:457
+#: lang.pm:538
 #, c-format
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1191
+#: lang.pm:1484
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
 
-#: lvm.pm:92
+#: lvm.pm:128
 #, c-format
 msgid "Moving used physical extents to other physical volumes failed"
 msgstr "将已用的物理卷扩展分区移动到其它物理卷失败"
 
-#: lvm.pm:152
+#: lvm.pm:194
 #, c-format
 msgid "Physical volume %s is still in use"
 msgstr "物理卷 %s 仍在使用中"
 
-#: lvm.pm:162
+#: lvm.pm:204
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "请先删除逻辑卷\n"
 
-#: lvm.pm:205
+#: lvm.pm:247
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
 msgstr "引导程序无法识别多个物理卷上的 /boot"
@@ -5097,37 +5012,32 @@ msgstr ""
 "模块 %s 加载失败。\n"
 "您要尝试其它的参数吗?"
 
-#: mygtk2.pm:1229
+#: mygtk2.pm:1229 mygtk3.pm:1282
 #, fuzzy, c-format
 msgid "Are you sure you want to quit?"
 msgstr "您确定想要删除此挂载点吗?"
 
-#: mygtk2.pm:1570 mygtk2.pm:1571
+#: mygtk2.pm:1570 mygtk2.pm:1571 mygtk3.pm:1649 mygtk3.pm:1650
 #, c-format
 msgid "Password is trivial to guess"
 msgstr "密码很容易猜到"
 
-#: mygtk2.pm:1572
+#: mygtk2.pm:1572 mygtk3.pm:1651
 #, c-format
 msgid "Password should be resistant to basic attacks"
 msgstr "密码可抵御常见攻击"
 
-#: mygtk2.pm:1573 mygtk2.pm:1574
+#: mygtk2.pm:1573 mygtk2.pm:1574 mygtk3.pm:1652 mygtk3.pm:1653
 #, c-format
 msgid "Password seems secure"
 msgstr "密码好像安全"
 
-#: partition_table.pm:428
+#: partition_table.pm:404
 #, c-format
 msgid "mount failed: "
 msgstr "挂载失败: "
 
-#: partition_table.pm:540
-#, c-format
-msgid "Extended partition not supported on this platform"
-msgstr "这个平台上不支持扩展分区"
-
-#: partition_table.pm:558
+#: partition_table.pm:530
 #, c-format
 msgid ""
 "You have a hole in your partition table but I cannot use it.\n"
@@ -5137,7 +5047,7 @@ msgstr ""
 "分区表里有一段是空的, 可是我没法使用它。\n"
 "唯一的办法是移动您的主分区, 把空闲部分换到与扩展分区相邻的位置。"
 
-#: partition_table/raw.pm:296
+#: partition_table/raw.pm:292
 #, c-format
 msgid ""
 "Something bad is happening on your hard disk drive. \n"
@@ -5149,84 +5059,84 @@ msgstr ""
 "一次数据完整性检查失败了。\n"
 "这意味着, 如果继续往硬盘里写入任何东西, 硬盘将可能随时坏掉, 损坏数据"
 
-#: pkgs.pm:254 pkgs.pm:257 pkgs.pm:270
+#: pkgs.pm:255 pkgs.pm:258 pkgs.pm:271
 #, c-format
 msgid "Unused packages removal"
 msgstr "删除不需要的软件包"
 
-#: pkgs.pm:254
+#: pkgs.pm:255
 #, c-format
 msgid "Finding unused hardware packages..."
 msgstr "正在查找不需要的硬件软件包..."
 
-#: pkgs.pm:257
+#: pkgs.pm:258
 #, c-format
 msgid "Finding unused localization packages..."
 msgstr "正在查找不需要的本地化软件包..."
 
-#: pkgs.pm:271
+#: pkgs.pm:272
 #, c-format
 msgid ""
 "We have detected that some packages are not needed for your system "
 "configuration."
 msgstr "我们检测到您的系统配置无需下列软件包。"
 
-#: pkgs.pm:272
+#: pkgs.pm:273
 #, c-format
 msgid "We will remove the following packages, unless you choose otherwise:"
 msgstr "我们将会删除这些软件包，而您可以在进行之前对其微调:"
 
-#: pkgs.pm:275 pkgs.pm:276
+#: pkgs.pm:276 pkgs.pm:277
 #, c-format
 msgid "Unused hardware support"
 msgstr "未使用的硬件支持"
 
-#: pkgs.pm:279 pkgs.pm:280
+#: pkgs.pm:280 pkgs.pm:281
 #, c-format
 msgid "Unused localization"
 msgstr "未使用的本地化"
 
-#: raid.pm:43
+#: raid.pm:59
 #, c-format
 msgid "Cannot add a partition to _formatted_ RAID %s"
 msgstr "无法加入一个分区到已经格式化的硬盘阵列 %s"
 
-#: raid.pm:166
+#: raid.pm:200
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "没有足够的分区建立 %d 级的硬盘阵列\n"
 
-#: scanner.pm:96
+#: scanner.pm:95
 #, c-format
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr "无法创建目录 /usr/share/sane/firmware!"
 
-#: scanner.pm:107
+#: scanner.pm:106
 #, c-format
 msgid "Could not create link /usr/share/sane/%s!"
 msgstr "无法创建链接 /usr/share/sane/%s!"
 
-#: scanner.pm:114
+#: scanner.pm:113
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr "无法将固件文件 %s 复制到 /usr/share/sane/firmware!"
 
-#: scanner.pm:121
+#: scanner.pm:120
 #, c-format
 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 用户使用。"
@@ -5995,18 +5905,18 @@ msgstr ""
 "vixie cron 在基本的 UNIX cron 上增加了一些特性, 包括改进的安全性, \n"
 "和更强大的配置选项。"
 
-#: services.pm:30
+#: services.pm:31
 #, c-format
 msgid ""
 "Common UNIX Printing System (CUPS) is an advanced printer spooling system"
 msgstr "CUPS 是高级打印机管理系统"
 
-#: services.pm:31
+#: services.pm:32
 #, c-format
 msgid "Launches the graphical display manager"
 msgstr "调用图形化显示服务器"
 
-#: services.pm:32
+#: services.pm:33
 #, c-format
 msgid ""
 "FAM is a file monitoring daemon. It is used to get reports when files "
@@ -6016,7 +5926,7 @@ msgstr ""
 "FAM 是文件监视守护程序。它可在文件发生变化时给出报告。\n"
 "GNOME 和 KDE 都要使用它"
 
-#: services.pm:34
+#: services.pm:35
 #, c-format
 msgid ""
 "G15Daemon allows users access to all extra keys by decoding them and \n"
@@ -6029,7 +5939,7 @@ msgid ""
 "scripts can access the LCD via a simple API."
 msgstr ""
 
-#: services.pm:39
+#: services.pm:40
 #, c-format
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
@@ -6041,25 +5951,25 @@ msgstr ""
 "它同时提供了利用鼠标的控制台复制并粘贴操作, 还支持控制台上的弹出式\n"
 "菜单。"
 
-#: services.pm:42
+#: services.pm:43
 #, c-format
 msgid "HAL is a daemon that collects and maintains information about hardware"
 msgstr "HAL 守护程序将收集并维护关于硬件的信息"
 
-#: services.pm:43
+#: services.pm:44
 #, c-format
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr "HardDrake 进行硬件检测, 还可以配置新增/变化的硬件。"
 
-#: services.pm:45
+#: services.pm:46
 #, c-format
 msgid ""
 "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr "Apache 是一台万维网服务器。它提供 HTML 文件和 CGI 等服务。"
 
-#: services.pm:46
+#: services.pm:47
 #, c-format
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
@@ -6073,23 +5983,23 @@ msgstr ""
 "它负责响应多种服务, 包括 telnet、ftp、rsh 和 rlogin。\n"
 "禁止 inetd 就同时禁止了它负责的所有服务。"
 
-#: services.pm:50
+#: services.pm:51
 #, c-format
 msgid "Automates a packet filtering firewall with ip6tables"
 msgstr ""
 
-#: services.pm:51
+#: services.pm:52
 #, c-format
 msgid "Automates a packet filtering firewall with iptables"
 msgstr ""
 
-#: services.pm:52
+#: services.pm:53
 #, c-format
 msgid ""
 "Evenly distributes IRQ load across multiple CPUs for enhanced performance"
 msgstr ""
 
-#: services.pm:53
+#: services.pm:54
 #, c-format
 msgid ""
 "This package loads the selected keyboard map as set in\n"
@@ -6099,7 +6009,7 @@ msgstr ""
 "这个程序按照 /etc/sysconfig/keyboard 的设定加载选择的键盘映射。\n"
 "您可以使用 kbdconfig 工具修改这个设定。对大多数机器, 应该开启这个服务。"
 
-#: services.pm:56
+#: services.pm:57
 #, c-format
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
@@ -6108,24 +6018,24 @@ msgstr ""
 "自动重新生成 /boot 下的\n"
 "/usr/include/linux/{autoconf,version}.h 头文件"
 
-#: services.pm:58
+#: services.pm:59
 #, c-format
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr "启动时自动监测和配置硬件。"
 
-#: services.pm:59
+#: services.pm:60
 #, c-format
 msgid "Tweaks system behavior to extend battery life"
 msgstr ""
 
-#: services.pm:60
+#: services.pm:61
 #, c-format
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr "Linuxconf 在开机时会执行一些任务来维护系统配置。"
 
-#: services.pm:62
+#: services.pm:63
 #, c-format
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
@@ -6134,48 +6044,48 @@ msgstr ""
 "lpd 是保证 lpr 正常工作的后台打印服务。这个服务器的基本功能是\n"
 "把打印服务指引到相应的打印机。"
 
-#: services.pm:64
+#: services.pm:65
 #, c-format
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr "Linux 虚拟服务器, 用来构架高效和高可用系统。"
 
-#: services.pm:66
+#: services.pm:67
 #, c-format
 msgid "Monitors the network (Interactive Firewall and wireless"
 msgstr ""
 
-#: services.pm:67
+#: services.pm:68
 #, c-format
 msgid "Software RAID monitoring and management"
 msgstr ""
 
-#: services.pm:68
+#: services.pm:69
 #, c-format
 msgid ""
 "DBUS is a daemon which broadcasts notifications of system events and other "
 "messages"
 msgstr "DBUS 守护程序将广播通知系统事件以及其它消息"
 
-#: services.pm:69
+#: services.pm:70
 #, c-format
 msgid "Enables MSEC security policy on system startup"
 msgstr ""
 
-#: services.pm:70
+#: services.pm:71
 #, c-format
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
 "names to IP addresses."
 msgstr "named(BIND) 是一个域名服务器(DNS), 用来把主机名解析成 IP 地址。"
 
-#: services.pm:71
+#: services.pm:72
 #, c-format
 msgid "Initializes network console logging"
 msgstr ""
 
-#: services.pm:72
+#: services.pm:73
 #, c-format
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
@@ -6184,24 +6094,24 @@ msgstr ""
 "加载和卸载所有网络文件系统(NFS), SMB(Lan\n"
 "Manager/Windows), 和 NCP(NetWare)加载点。"
 
-#: services.pm:74
+#: services.pm:75
 #, c-format
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr "激活/禁止所有配置为开机就启动的网络接口。"
 
-#: services.pm:76
+#: services.pm:77
 #, c-format
 msgid "Requires network to be up if enabled"
 msgstr ""
 
-#: services.pm:77
+#: services.pm:78
 #, c-format
 msgid "Wait for the hotplugged network to be up"
 msgstr ""
 
-#: services.pm:78
+#: services.pm:79
 #, c-format
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
@@ -6212,7 +6122,7 @@ msgstr ""
 "这个服务提供了 NFS 服务器功能, 可以通过\n"
 "/etc/exports 文件配置。"
 
-#: services.pm:81
+#: services.pm:82
 #, c-format
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
@@ -6221,29 +6131,29 @@ msgstr ""
 "NFS 是常用的通过 TCP/IP 网络共享文件的协议。\n"
 "这个服务提供了 NFS 文件锁定功能。"
 
-#: services.pm:83
+#: services.pm:84
 #, c-format
 msgid "Synchronizes system time using the Network Time Protocol (NTP)"
 msgstr "使用网络时间协议(NTP)同步系统时间"
 
-#: services.pm:84
+#: services.pm:85
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and Xorg at boot."
 msgstr "开机时为控制台和 Xorg 自动设置 NumLock。"
 
-#: services.pm:86
+#: services.pm:87
 #, c-format
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "支持 OKI 4w 及其兼容的视窗打印机。"
 
-#: services.pm:87
+#: services.pm:88
 #, c-format
 msgid "Checks if a partition is close to full up"
 msgstr ""
 
-#: services.pm:88
+#: services.pm:89
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
@@ -6255,7 +6165,7 @@ msgstr ""
 "以太网卡或者调制解调器。如果没有配置它不会启动, \n"
 "所以不必担心它。"
 
-#: services.pm:91
+#: services.pm:92
 #, c-format
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
@@ -6266,12 +6176,12 @@ msgstr ""
 "portmapper 管理各种 RPC 连接, 像 NFS 和 NIS 这些协议会用到它。\n"
 "如果您的电脑将要提供利用用 RPC 机制协议的服务, 就必须运行 portmap 服务器。"
 
-#: services.pm:94
+#: services.pm:95
 #, c-format
 msgid "Reserves some TCP ports"
 msgstr ""
 
-#: services.pm:95
+#: services.pm:96
 #, c-format
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that moves mail from "
@@ -6280,14 +6190,14 @@ msgstr ""
 "Postfix 是一个邮件传递代理, 这个程序帮助您把电子邮件从\n"
 "一台机器送到另一台。"
 
-#: services.pm:96
+#: services.pm:97
 #, c-format
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr "保存和恢复系统的熵池, 可以产生更高品质的随机数。"
 
-#: services.pm:98
+#: services.pm:99
 #, c-format
 msgid ""
 "Assign raw devices to block devices (such as hard disk drive\n"
@@ -6296,12 +6206,12 @@ msgstr ""
 "将 RAW 设备指定为块设备(如硬盘分区), \n"
 "以便供 Oracle 或 DVD 播放机之类的程序使用"
 
-#: services.pm:100
+#: services.pm:101
 #, fuzzy, c-format
 msgid "Nameserver information manager"
 msgstr "硬盘信息"
 
-#: services.pm:101
+#: services.pm:102
 #, c-format
 msgid ""
 "The routed daemon allows for automatic IP router table updated via\n"
@@ -6311,14 +6221,14 @@ msgstr ""
 "后台服务 routed 允许通过 RIP 协议自动更新的 IP 路由表。在小型网络上广泛的\n"
 "采用 RIP, 然而在更复杂的网络上需要更复杂的路由协议。"
 
-#: services.pm:104
+#: services.pm:105
 #, c-format
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr "rstat 协议允许网络上的用户获取网络上任何机器的性能指标。"
 
-#: services.pm:106
+#: services.pm:107
 #, fuzzy, c-format
 msgid ""
 "Syslog is the facility by which many daemons use to log messages to various "
@@ -6327,14 +6237,14 @@ msgstr ""
 "Syslog 是这样一个设施, 很多其它的后台服务利用它在各种系统日志文件\n"
 "中记录日志消息。一直运行 syslog 是个好主意。"
 
-#: services.pm:107
+#: services.pm:108
 #, c-format
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr "rusers 协议允许网络上的用户确认在其它作出应答的机器上有哪些用户登录。"
 
-#: services.pm:109
+#: services.pm:110
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
@@ -6343,42 +6253,42 @@ msgstr ""
 "rwho 协议使远程的用户可以得到运行了 rwho 后台服务的\n"
 "机器上所有登录用户的清单(类似 finger)。"
 
-#: services.pm:111
+#: services.pm:112
 #, c-format
 msgid ""
 "SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
 msgstr "SANE 允许访问扫描仪、摄像头等设备。"
 
-#: services.pm:112
+#: services.pm:113
 #, c-format
 msgid "Packet filtering firewall"
 msgstr ""
 
-#: services.pm:113
+#: services.pm:114
 #, c-format
 msgid ""
 "The SMB/CIFS protocol enables to share access to files & printers and also "
 "integrates with a Windows Server domain"
 msgstr "SMB/CIFS 协议用户访问共享的文件和打印机，并且与 Windows Server 域集成"
 
-#: services.pm:114
+#: services.pm:115
 #, c-format
 msgid "Launch the sound system on your machine"
 msgstr "启动计算机上的声音系统"
 
-#: services.pm:115
+#: services.pm:116
 #, c-format
 msgid "layer for speech analysis"
 msgstr ""
 
-#: services.pm:116
+#: services.pm:117
 #, c-format
 msgid ""
 "Secure Shell is a network protocol that allows data to be exchanged over a "
 "secure channel between two computers"
 msgstr "安全 Shell (SSH)网络协议允许在两台计算机之间通过安全通道交换数据"
 
-#: services.pm:117
+#: services.pm:118
 #, c-format
 msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
@@ -6387,121 +6297,116 @@ msgstr ""
 "Syslog 是这样一个设施, 很多其它的后台服务利用它在各种系统日志文件\n"
 "中记录日志消息。一直运行 syslog 是个好主意。"
 
-#: services.pm:119
+#: services.pm:120
 #, c-format
 msgid "Moves the generated persistent udev rules to /etc/udev/rules.d"
 msgstr ""
 
-#: services.pm:120
+#: services.pm:121
 #, c-format
 msgid "Load the drivers for your usb devices."
 msgstr "装入您 USB 设备的驱动程序。"
 
-#: services.pm:121
+#: services.pm:122
 #, c-format
 msgid "A lightweight network traffic monitor"
 msgstr ""
 
-#: services.pm:122
+#: services.pm:123
 #, c-format
 msgid "Starts the X Font Server."
 msgstr "启动 X 字体服务器。"
 
-#: services.pm:123
+#: services.pm:124
 #, c-format
 msgid "Starts other deamons on demand."
 msgstr "按需启动其它守护程序。"
 
-#: services.pm:152
+#: services.pm:153
 #, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: services.pm:155
+#: services.pm:156
 #, c-format
 msgid "Internet"
 msgstr "互联网"
 
-#: services.pm:160
+#: services.pm:161
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Networking"
 msgstr "联网"
 
-#: services.pm:162
+#: services.pm:163
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: services.pm:168
+#: services.pm:169
 #, c-format
 msgid "Remote Administration"
 msgstr "远程管理"
 
-#: services.pm:177
+#: services.pm:178
 #, c-format
 msgid "Database Server"
 msgstr "数据库服务器"
 
-#: services.pm:188 services.pm:225
+#: services.pm:189 services.pm:226
 #, c-format
 msgid "Services"
 msgstr "服务"
 
-#: services.pm:188
+#: services.pm:189
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
 msgstr "选择开机时自动启动的服务"
 
-#: services.pm:206
+#: services.pm:207
 #, c-format
 msgid "%d activated for %d registered"
 msgstr "%2$d 项已注册, %1$d 项已激活"
 
-#: services.pm:241
+#: services.pm:230
 #, c-format
 msgid "running"
 msgstr "运行中"
 
-#: services.pm:241
+#: services.pm:230
 #, c-format
 msgid "stopped"
 msgstr "已停止"
 
-#: services.pm:246
+#: services.pm:235
 #, c-format
 msgid "Services and daemons"
 msgstr "服务和守护程序"
 
-#: services.pm:252
+#: services.pm:241
 #, c-format
 msgid ""
 "No additional information\n"
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:257 ugtk2.pm:924
-#, c-format
-msgid "Info"
-msgstr "信息"
-
-#: services.pm:260
+#: services.pm:248
 #, c-format
 msgid "Start when requested"
 msgstr "请求时启动"
 
-#: services.pm:260
+#: services.pm:248
 #, c-format
 msgid "On boot"
 msgstr "启动时"
 
-#: services.pm:278
+#: services.pm:265
 #, c-format
 msgid "Start"
 msgstr "启动"
 
-#: services.pm:278
+#: services.pm:265
 #, c-format
 msgid "Stop"
 msgstr "停止"
@@ -6737,7 +6642,7 @@ msgstr ""
 "       XFdrake [--noauto] 显示器\n"
 "       XFdrake 分辨率"
 
-#: standalone.pm:154
+#: standalone.pm:155
 #, c-format
 msgid ""
 "\n"
@@ -6748,72 +6653,77 @@ msgstr ""
 "用法:%s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] "
 "[-v|--version] "
 
-#: timezone.pm:161 timezone.pm:162
+#: timezone.pm:168 timezone.pm:169
 #, c-format
 msgid "All servers"
 msgstr "全部服务器"
 
-#: timezone.pm:198
+#: timezone.pm:205
 #, c-format
 msgid "Global"
 msgstr "全球"
 
-#: timezone.pm:201
+#: timezone.pm:208
 #, c-format
 msgid "Africa"
 msgstr "非洲"
 
-#: timezone.pm:202
+#: timezone.pm:209
 #, c-format
 msgid "Asia"
 msgstr "亚洲"
 
-#: timezone.pm:203
+#: timezone.pm:210
 #, c-format
 msgid "Europe"
 msgstr "欧洲"
 
-#: timezone.pm:204
+#: timezone.pm:211
 #, c-format
 msgid "North America"
 msgstr "北美洲"
 
-#: timezone.pm:205
+#: timezone.pm:212
 #, c-format
 msgid "Oceania"
 msgstr "大洋洲"
 
-#: timezone.pm:206
+#: timezone.pm:213
 #, c-format
 msgid "South America"
 msgstr "南美洲"
 
-#: timezone.pm:215
+#: timezone.pm:222
 #, c-format
 msgid "Hong Kong"
 msgstr "香港"
 
-#: timezone.pm:252
+#: timezone.pm:259
 #, c-format
 msgid "Russian Federation"
 msgstr "俄联邦"
 
-#: timezone.pm:260
+#: timezone.pm:267
 #, c-format
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: ugtk2.pm:812
+#: ugtk2.pm:812 ugtk3.pm:910
 #, c-format
 msgid "Is this correct?"
 msgstr "这样正确吗?"
 
-#: ugtk2.pm:874
+#: ugtk2.pm:874 ugtk3.pm:972
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "您选择了文件，而非目录"
 
-#: wizards.pm:96
+#: ugtk2.pm:924 ugtk3.pm:1022
+#, c-format
+msgid "Info"
+msgstr "信息"
+
+#: wizards.pm:95
 #, c-format
 msgid ""
 "%s is not installed\n"
@@ -6822,11 +6732,74 @@ msgstr ""
 "%s 未安装\n"
 "请点击“下一步”进行安装, 或者点击“取消”退出"
 
-#: wizards.pm:100
+#: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid ""
+#~ "You may need to change your Open Firmware boot-device to\n"
+#~ " enable the bootloader.  If you do not see the bootloader prompt at\n"
+#~ " reboot, hold down Command-Option-O-F at reboot and enter:\n"
+#~ " setenv boot-device %s,\\\\:tbxi\n"
+#~ " Then type: shut-down\n"
+#~ "At your next boot you should see the bootloader prompt."
+#~ msgstr ""
+#~ "您可能得改变开放固件引导设备来使能启动引导程序。\n"
+#~ "如果开机时没有引导程序提示, 按 Command-Option-O-F 然后输入: \n"
+#~ " setenv boot-device %s,\\\\:tbxi\n"
+#~ " 然后输入: shut-down\n"
+#~ "您将在下次开机时看到引导程序提示。"
+
+#~ msgid "Init Message"
+#~ msgstr "初始信息"
+
+#~ msgid "Open Firmware Delay"
+#~ msgstr "开放固件延迟"
+
+#~ msgid "Kernel Boot Timeout"
+#~ msgstr "核心启动超时"
+
+#~ msgid "Enable CD Boot?"
+#~ msgstr "允许 CD 启动?"
+
+#~ msgid "Enable OF Boot?"
+#~ msgstr "启用 OF 启动?"
+
+#~ msgid "Default OS?"
+#~ msgstr "默认操作系统?"
+
+#~ msgid "NoVideo"
+#~ msgstr "无视频"
+
+#~ msgid "Other OS (SunOS...)"
+#~ msgstr "其它操作系统(SunOS...)"
+
+#~ msgid "Other OS (MacOS...)"
+#~ msgstr "其它操作系统(MacOS...)"
+
+#~ msgid "Yaboot"
+#~ msgstr "Yaboot"
+
+#~ msgid "SILO"
+#~ msgstr "SILO"
+
+#~ msgid "SunOS"
+#~ msgstr "SunOS"
+
+#~ msgid "HFS"
+#~ msgstr "HFS"
+
+#~ msgid ""
+#~ "Here you can select an alternative driver (either OSS or ALSA) for your "
+#~ "sound card (%s)."
+#~ msgstr ""
+#~ "您可以在这里配置可以用在您的声卡(%s)上的替代驱动程序(可以选择 OSS 或 "
+#~ "ALSA)。"
+
+#~ msgid "Extended partition not supported on this platform"
+#~ msgstr "这个平台上不支持扩展分区"
+
 #~ msgid "Clean /tmp at each boot"
 #~ msgstr "每次启动时清除 /tmp"