updated zh-CN translation.

Transmitted-via: Transifex (translate.fedoraproject.org)

1 files changed, 932 insertions, 1201 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2d4717590..e43cf4724 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: anaconda.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 21:19-0400\n"
-"PO-Revision-Date: 2008-09-03 14:28+1000\n"
+"POT-Creation-Date: 2008-10-13 10:57-0400\n"
+"PO-Revision-Date: 2008-10-20 11:05+1000\n"
 "Last-Translator: Leah Liu <lliu@redhat.com>\n"
 "Language-Team: Simplified Chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,18 +29,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../anaconda:288 ../anaconda:334
+#: ../anaconda:262 ../anaconda:308
 #, c-format
 msgid "Error processing %%ksappend lines: %s"
 msgstr "执行 %%k sappend 行时出错：%s"
 
-#: ../anaconda:291 ../anaconda:337
+#: ../anaconda:265 ../anaconda:311
 #, c-format
 msgid "Unknown error processing %%ksappend lines: %s"
 msgstr "执行 %%k sappend 行时出现未知错误：%s"
 
-#: ../anaconda:305 ../anaconda:349 ../cmdline.py:85 ../gui.py:1279
-#: ../text.py:561
+#: ../anaconda:279 ../anaconda:323 ../cmdline.py:85 ../gui.py:1280
+#: ../text.py:551
 #, c-format, python-format
 msgid ""
 "The following error was found while parsing your kickstart configuration:\n"
@@ -51,17 +51,14 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../anaconda:471
+#: ../anaconda:445
 msgid "Press <enter> for a shell"
 msgstr "按 <enter> 键执行一个 shell 命令"
 
-#: ../anaconda:486 ../gui.py:236 ../rescue.py:265 ../rescue.py:346
-#: ../rescue.py:376 ../rescue.py:389 ../rescue.py:468 ../rescue.py:477
-#: ../text.py:589 ../text.py:746 ../textw/constants_text.py:44
-#: ../textw/network_text.py:46 ../textw/network_text.py:56
-#: ../textw/network_text.py:78 ../textw/network_text.py:84
-#: ../textw/network_text.py:232 ../textw/network_text.py:819
-#: ../textw/network_text.py:827 ../loader/cdinstall.c:219
+#: ../anaconda:460 ../gui.py:236 ../rescue.py:276 ../rescue.py:306
+#: ../rescue.py:319 ../rescue.py:398 ../rescue.py:407 ../text.py:579
+#: ../text.py:736 ../textw/constants_text.py:44 ../textw/network_text.py:77
+#: ../textw/network_text.py:86 ../loader/cdinstall.c:219
 #: ../loader/cdinstall.c:223 ../loader/cdinstall.c:239
 #: ../loader/cdinstall.c:242 ../loader/cdinstall.c:431
 #: ../loader/cdinstall.c:438 ../loader/cdinstall.c:503
@@ -80,51 +77,51 @@ msgstr "按 <enter> 键执行一个 shell 命令"
 #: ../loader/kickstart.c:375 ../loader/kickstart.c:532 ../loader/lang.c:115
 #: ../loader/lang.c:378 ../loader/loader.c:399 ../loader/loader.c:434
 #: ../loader/loader.c:472 ../loader/loader.c:493 ../loader/loader.c:509
-#: ../loader/loader.c:546 ../loader/loader.c:1178 ../loader/loader.c:1361
+#: ../loader/loader.c:546 ../loader/loader.c:1182 ../loader/loader.c:1365
 #: ../loader/mediacheck.c:62 ../loader/mediacheck.c:101
 #: ../loader/mediacheck.c:108 ../loader/mediacheck.c:117
 #: ../loader/method.c:280 ../loader/method.c:354 ../loader/modules.c:335
-#: ../loader/modules.c:347 ../loader/net.c:514 ../loader/net.c:869
-#: ../loader/net.c:1330 ../loader/net.c:1353 ../loader/net.c:1542
-#: ../loader/net.c:1564 ../loader/net.c:1576 ../loader/nfsinstall.c:86
-#: ../loader/nfsinstall.c:189 ../loader/nfsinstall.c:250
-#: ../loader/nfsinstall.c:269 ../loader/nfsinstall.c:337
-#: ../loader/telnetd.c:92 ../loader/urlinstall.c:83 ../loader/urlinstall.c:107
-#: ../loader/urlinstall.c:175 ../loader/urlinstall.c:421
-#: ../loader/urlinstall.c:430 ../loader/urlinstall.c:439 ../loader/urls.c:292
-#: ../loader/urls.c:328 ../loader/urls.c:334 ../loader/urls.c:346
+#: ../loader/modules.c:347 ../loader/net.c:515 ../loader/net.c:891
+#: ../loader/net.c:1414 ../loader/net.c:1437 ../loader/net.c:1628
+#: ../loader/net.c:1650 ../loader/net.c:1662 ../loader/nfsinstall.c:87
+#: ../loader/nfsinstall.c:244 ../loader/nfsinstall.c:263
+#: ../loader/nfsinstall.c:331 ../loader/telnetd.c:92 ../loader/urlinstall.c:83
+#: ../loader/urlinstall.c:107 ../loader/urlinstall.c:175
+#: ../loader/urlinstall.c:423 ../loader/urlinstall.c:432
+#: ../loader/urlinstall.c:441 ../loader/urls.c:292 ../loader/urls.c:328
+#: ../loader/urls.c:334 ../loader/urls.c:346
 msgid "OK"
 msgstr "确定"
 
-#: ../anaconda:493
+#: ../anaconda:467
 msgid ""
 "You do not have enough RAM to use the graphical installer.  Starting text "
 "mode."
 msgstr "您没有足够的内存来使用图形化安装程序。开始使用文本方式安装。"
 
-#: ../anaconda:544
+#: ../anaconda:518
 msgid "Starting graphical installation..."
 msgstr "正在启动图形化安装..."
 
-#: ../anaconda:821
+#: ../anaconda:764
 msgid "Would you like to use VNC?"
 msgstr "您想使用 VNC 吗？"
 
-#: ../anaconda:822
+#: ../anaconda:765
 msgid ""
 "The VNC mode installation offers more functionality than the text mode, "
 "would you like to use it instead?"
 msgstr "VNC 安装模式可为您提供比文本模式更多的功能，您是否要使用这个模式呢？"
 
-#: ../anaconda:847
+#: ../anaconda:790
 msgid "Install class forcing text mode installation"
 msgstr "安装类别强制使用文本模式安装"
 
-#: ../anaconda:866
+#: ../anaconda:809
 msgid "Graphical installation not available...  Starting text mode."
 msgstr "没有可用的图形化安装...  开始文本方式安装。"
 
-#: ../anaconda:874
+#: ../anaconda:817
 msgid "DISPLAY variable not set. Starting text mode!"
 msgstr "DISPLAY 变量未设定，启动文本模式！"
 
@@ -268,11 +265,11 @@ msgstr ""
 "\n"
 "按确定退出安装."
 
-#: ../autopart.py:1525 ../autopart.py:1572
+#: ../autopart.py:1524 ../autopart.py:1571
 msgid "Automatic Partitioning Errors"
 msgstr "自动分区错误"
 
-#: ../autopart.py:1526
+#: ../autopart.py:1525
 #, python-format
 msgid ""
 "The following errors occurred with your partitioning:\n"
@@ -287,11 +284,11 @@ msgstr ""
 "\n"
 "请按确定退出安装."
 
-#: ../autopart.py:1536
+#: ../autopart.py:1535
 msgid "Warnings During Automatic Partitioning"
 msgstr "进行自动分区时出现警告"
 
-#: ../autopart.py:1537
+#: ../autopart.py:1536
 #, python-format
 msgid ""
 "Following warnings occurred during automatic partitioning:\n"
@@ -302,7 +299,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../autopart.py:1551 ../autopart.py:1568
+#: ../autopart.py:1550 ../autopart.py:1567
 msgid ""
 "\n"
 "\n"
@@ -312,12 +309,12 @@ msgstr ""
 "\n"
 "按确定退出安装."
 
-#: ../autopart.py:1552 ../iw/partition_gui.py:1027
+#: ../autopart.py:1551 ../iw/partition_gui.py:1027
 #: ../textw/partition_text.py:247
 msgid "Error Partitioning"
 msgstr "分区出错"
 
-#: ../autopart.py:1553
+#: ../autopart.py:1552
 #, python-format
 msgid ""
 "Could not allocate requested partitions: \n"
@@ -328,7 +325,7 @@ msgstr ""
 "\n"
 "%s.%s"
 
-#: ../autopart.py:1570
+#: ../autopart.py:1569
 msgid ""
 "\n"
 "\n"
@@ -338,7 +335,7 @@ msgstr ""
 "\n"
 "点“确定”，选择不同的分区选项"
 
-#: ../autopart.py:1573
+#: ../autopart.py:1572
 #, python-format
 msgid ""
 "The following errors occurred with your partitioning:\n"
@@ -354,15 +351,15 @@ msgstr ""
 "\n"
 "这些错误在安装所需的硬盘驱动器空间不够时会发生.%s"
 
-#: ../autopart.py:1584
+#: ../autopart.py:1583
 msgid "Unrecoverable Error"
 msgstr "无法恢复的错误"
 
-#: ../autopart.py:1585
+#: ../autopart.py:1584
 msgid "Your system will now be rebooted."
 msgstr "您的系统现在将会被重新引导。"
 
-#: ../autopart.py:1709
+#: ../autopart.py:1707
 msgid ""
 "Automatic Partitioning sets partitions based on the selected installation "
 "type. You also can customize the partitions once they have been created.\n"
@@ -376,66 +373,66 @@ msgstr ""
 "Disk Druid 是手工分区的工具。它允许您在交互的环境中建立分区。您可以用它来设置"
 "文件系统类型、挂载点、分区大小等。"
 
-#: ../autopart.py:1720
+#: ../autopart.py:1718
 msgid ""
 "Before automatic partitioning can be set up by the installation program, you "
 "must choose how to use the space on your hard drives."
 msgstr "在安装程序建立自动分区之前，您必须选择要如何使用硬盘驱动器上的空间。"
 
-#: ../autopart.py:1725
+#: ../autopart.py:1723
 msgid "Remove all partitions on this system"
 msgstr "删除系统内的所有分区"
 
-#: ../autopart.py:1726
+#: ../autopart.py:1724
 msgid "Remove all Linux partitions on this system"
 msgstr "删除系统内所有的 Linux 分区"
 
-#: ../autopart.py:1727
+#: ../autopart.py:1725
 msgid "Keep all partitions and use existing free space"
 msgstr "保存所有分区，使用现有的空闲空间"
 
-#: ../backend.py:129
+#: ../backend.py:130
 #, python-format
 msgid "Upgrading %s\n"
 msgstr "升级 %s\n"
 
-#: ../backend.py:131
+#: ../backend.py:132
 #, python-format
 msgid "Installing %s\n"
 msgstr "安装 %s\n"
 
-#: ../backend.py:150
+#: ../backend.py:151
 msgid "Copying File"
 msgstr "正在复制文件"
 
-#: ../backend.py:151
+#: ../backend.py:152
 msgid "Transferring install image to hard drive..."
 msgstr "正在将安装映像传输到硬盘..."
 
-#: ../backend.py:161
+#: ../backend.py:162
 msgid ""
 "An error occurred transferring the install image to your hard drive.  This "
 "is probably due to bad media."
 msgstr "将安装映像传送到您的硬盘时出错，很可能是由介质损坏造成的。"
 
-#: ../backend.py:165
+#: ../backend.py:166
 msgid ""
 "An error occurred transferring the install image to your hard drive. You are "
 "probably out of disk space."
 msgstr "将安装映像传输到硬盘时出错，很可能是磁盘空间不够。"
 
-#: ../backend.py:169 ../fsset.py:670 ../fsset.py:1683 ../fsset.py:1714
+#: ../backend.py:170 ../fsset.py:670 ../fsset.py:1683 ../fsset.py:1714
 #: ../fsset.py:1790 ../fsset.py:1858 ../fsset.py:1908 ../fsset.py:1997
-#: ../fsset.py:2010 ../image.py:291 ../livecd.py:196 ../livecd.py:379
-#: ../partIntfHelpers.py:413 ../text.py:480 ../text.py:484
-#: ../yuminstall.py:384 ../yuminstall.py:659 ../yuminstall.py:771
-#: ../yuminstall.py:1052 ../yuminstall.py:1093 ../yuminstall.py:1299
-#: ../yuminstall.py:1322 ../iw/autopart_type.py:96 ../iw/autopart_type.py:171
-#: ../iw/autopart_type.py:315 ../iw/netconfig_dialog.py:279
+#: ../fsset.py:2010 ../image.py:291 ../livecd.py:196 ../livecd.py:377
+#: ../partIntfHelpers.py:413 ../text.py:470 ../text.py:474
+#: ../yuminstall.py:366 ../yuminstall.py:642 ../yuminstall.py:754
+#: ../yuminstall.py:991 ../yuminstall.py:1059 ../yuminstall.py:1288
+#: ../yuminstall.py:1311 ../iw/autopart_type.py:96 ../iw/autopart_type.py:174
+#: ../iw/autopart_type.py:349 ../iw/netconfig_dialog.py:283
 #: ../iw/osbootwidget.py:215 ../iw/osbootwidget.py:224
-#: ../iw/raid_dialog_gui.py:701 ../iw/raid_dialog_gui.py:740
-#: ../iw/task_gui.py:45 ../iw/task_gui.py:266 ../iw/task_gui.py:376
-#: ../iw/task_gui.py:417 ../textw/grpselect_text.py:100
+#: ../iw/raid_dialog_gui.py:655 ../iw/raid_dialog_gui.py:694
+#: ../iw/task_gui.py:47 ../iw/task_gui.py:145 ../iw/task_gui.py:274
+#: ../iw/task_gui.py:396 ../textw/grpselect_text.py:100
 #: ../textw/partition_text.py:1652 ../textw/partition_text.py:1658
 #: ../textw/partition_text.py:1680 ../textw/upgrade_text.py:174
 #: ../textw/upgrade_text.py:181 ../loader/cdinstall.c:219
@@ -446,19 +443,19 @@ msgstr "将安装映像传输到硬盘时出错，很可能是磁盘空间不够
 #: ../loader/hdinstall.c:352 ../loader/hdinstall.c:454
 #: ../loader/hdinstall.c:497 ../loader/hdinstall.c:510
 #: ../loader/kickstart.c:284 ../loader/lang.c:115 ../loader/loader.c:399
-#: ../loader/loader.c:509 ../loader/loader.c:1178 ../loader/mediacheck.c:62
+#: ../loader/loader.c:509 ../loader/loader.c:1182 ../loader/mediacheck.c:62
 #: ../loader/mediacheck.c:101 ../loader/mediacheck.c:108
-#: ../loader/method.c:280 ../loader/method.c:354 ../loader/nfsinstall.c:189
-#: ../loader/nfsinstall.c:250 ../loader/nfsinstall.c:269
-#: ../loader/telnetd.c:92 ../loader/urlinstall.c:83 ../loader/urlinstall.c:107
-#: ../loader/urlinstall.c:175 ../loader/urls.c:328 ../loader/urls.c:334
+#: ../loader/method.c:280 ../loader/method.c:354 ../loader/nfsinstall.c:244
+#: ../loader/nfsinstall.c:263 ../loader/telnetd.c:92 ../loader/urlinstall.c:83
+#: ../loader/urlinstall.c:107 ../loader/urlinstall.c:175 ../loader/urls.c:328
+#: ../loader/urls.c:334
 msgid "Error"
 msgstr "错误"
 
 #: ../bootloader.py:44 ../bootloader.py:230 ../image.py:82
-#: ../partedUtils.py:367 ../partedUtils.py:397 ../partedUtils.py:1284
-#: ../upgrade.py:418 ../yuminstall.py:1504 ../yuminstall.py:1531
-#: ../iw/autopart_type.py:181 ../iw/blpasswidget.py:151 ../iw/task_gui.py:55
+#: ../partedUtils.py:367 ../partedUtils.py:397 ../partedUtils.py:1110
+#: ../partedUtils.py:1258 ../upgrade.py:418 ../yuminstall.py:1493
+#: ../yuminstall.py:1520 ../iw/autopart_type.py:184 ../iw/blpasswidget.py:151
 #: ../iw/upgrade_swap_gui.py:194 ../iw/upgrade_swap_gui.py:202
 #: ../iw/upgrade_swap_gui.py:209 ../textw/bootloader_text.py:127
 #: ../textw/bootloader_text.py:452 ../textw/partition_text.py:251
@@ -479,18 +476,18 @@ msgstr ""
 
 #: ../bootloader.py:49 ../exception.py:439 ../exception.py:456
 #: ../exception.py:479 ../exception.py:494 ../exception.py:519
-#: ../fsset.py:1713 ../fsset.py:1977 ../fsset.py:2728 ../gui.py:1284
-#: ../gui.py:1418 ../gui.py:1495 ../image.py:91 ../livecd.py:203
-#: ../livecd.py:386 ../packages.py:117 ../upgrade.py:99 ../upgrade.py:119
-#: ../yuminstall.py:775 ../yuminstall.py:858 ../yuminstall.py:864
-#: ../yuminstall.py:1041 ../yuminstall.py:1089 ../yuminstall.py:1294
-#: ../yuminstall.py:1329
+#: ../fsset.py:1713 ../fsset.py:1977 ../fsset.py:2730 ../gui.py:1285
+#: ../gui.py:1419 ../gui.py:1496 ../image.py:91 ../instdata.py:122
+#: ../livecd.py:203 ../livecd.py:384 ../packages.py:119 ../upgrade.py:99
+#: ../upgrade.py:119 ../yuminstall.py:758 ../yuminstall.py:841
+#: ../yuminstall.py:847 ../yuminstall.py:987 ../yuminstall.py:1047
+#: ../yuminstall.py:1283 ../yuminstall.py:1318
 msgid "_Exit installer"
 msgstr "(_E)退出安装程序"
 
 #: ../bootloader.py:49 ../fsset.py:1978 ../image.py:92 ../image.py:253
-#: ../kickstart.py:1084 ../kickstart.py:1122 ../partedUtils.py:1287
-#: ../upgrade.py:99 ../upgrade.py:119 ../yuminstall.py:1046
+#: ../kickstart.py:1113 ../kickstart.py:1151 ../partedUtils.py:1261
+#: ../upgrade.py:99 ../upgrade.py:119 ../yuminstall.py:1052
 #: ../iw/partition_gui.py:1041
 msgid "_Continue"
 msgstr "继续(_C)"
@@ -518,8 +515,8 @@ msgid "In progress...   "
 msgstr "进程中..."
 
 #: ../cmdline.py:97
-msgid "Can't have a question in command line mode!"
-msgstr "无法在命令行模式中提问！"
+msgid "an't have a question in command line mode!"
+msgstr "不能在命令行模式中提问！"
 
 #: ../cmdline.py:116
 msgid "Parted exceptions can't be handled in command line mode!"
@@ -562,7 +559,8 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"无法提交您的 bug，因为在 bug 字段中出现坏信息。很可能是在 anaconda 中出现错误：\n"
+"无法提交您的 bug，因为在 bug 字段中出现坏信息。很可能是在 anaconda 中出现错"
+"误：\n"
 "\n"
 "%s"
 
@@ -610,7 +608,8 @@ msgid ""
 "\n"
 "%s/%s"
 msgstr ""
-"生成了一个新的 bug 并附有您的追述文件。请添加如下附加信息，比如您在遇到这个 bug 时正在做什么、屏幕截图或者其它任由有关以下 bug 的信息：\n"
+"生成了一个新的 bug 并附有您的追述文件。请添加如下附加信息，比如您在遇到这个 "
+"bug 时正在做什么、屏幕截图或者其它任由有关以下 bug 的信息：\n"
 "\n"
 "%s/%s"
 
@@ -627,7 +626,8 @@ msgid ""
 "\n"
 "%s/%s"
 msgstr ""
-"带有您所提供信息的 bug 已经存在。您的帐户已经被添加到 CC 列表中，且您的追述记录已经作为注释添加到 bug 中。请为以下 bug 添加额外描述：\n"
+"带有您所提供信息的 bug 已经存在。您的帐户已经被添加到 CC 列表中，且您的追述记"
+"录已经作为注释添加到 bug 中。请为以下 bug 添加额外描述：\n"
 "\n"
 "%s/%s"
 
@@ -649,7 +649,7 @@ msgstr "未写完转储信息"
 msgid "There was a problem writing the system state to the disk."
 msgstr "将系统状态写入软盘时出现问题。"
 
-#: ../exception.py:506 ../exception.py:529
+#: ../exception.py:506 ../exception.py:529 ../rescue.py:196
 msgid "No Network Available"
 msgstr "没有可用网络"
 
@@ -712,7 +712,7 @@ msgstr "RAID 设备"
 msgid "Apple Bootstrap"
 msgstr "Apple 自展程序"
 
-#: ../fsset.py:1549 ../partitions.py:1245
+#: ../fsset.py:1549 ../partitions.py:1288
 msgid "PPC PReP Boot"
 msgstr "PPC PReP 引导"
 
@@ -736,7 +736,7 @@ msgstr ""
 "\n"
 "请按 <Enter> 键退出安装程序。"
 
-#: ../fsset.py:1713 ../packages.py:349 ../rescue.py:312 ../rescue.py:314
+#: ../fsset.py:1713 ../packages.py:353 ../rescue.py:242 ../rescue.py:244
 #: ../textw/upgrade_text.py:132 ../loader/cdinstall.c:239
 #: ../loader/cdinstall.c:242 ../loader/method.c:327
 msgid "Skip"
@@ -898,7 +898,8 @@ msgid ""
 "\n"
 "Press <Enter> to exit the installer."
 msgstr ""
-"在创建 %s 时出错。这个路径中的一些元素不是目录。这是一个严重错误，无法继续安装。\n"
+"在创建 %s 时出错。这个路径中的一些元素不是目录。这是一个严重错误，无法继续安"
+"装。\n"
 "\n"
 "请按 <Enter> 退出安装程序。"
 
@@ -966,11 +967,11 @@ msgstr ""
 "\n"
 "请按确定退出安装."
 
-#: ../fsset.py:2720
+#: ../fsset.py:2722
 msgid "Duplicate Labels"
 msgstr "标签重复"
 
-#: ../fsset.py:2721
+#: ../fsset.py:2723
 #, python-format
 msgid ""
 "Multiple devices on your system are labelled %s.  Labels across devices must "
@@ -982,11 +983,11 @@ msgstr ""
 "\n"
 "请解决这个问题后重新启动安装过程。"
 
-#: ../fsset.py:2886
+#: ../fsset.py:2888
 msgid "Formatting"
 msgstr "正在格式化"
 
-#: ../fsset.py:2887
+#: ../fsset.py:2889
 #, python-format
 msgid "Formatting %s file system..."
 msgstr "正在格式化 %s 文件系统..."
@@ -1032,106 +1033,109 @@ msgid ""
 "package installation, you may need to try several times for it to succeed."
 msgstr "保存屏幕快照时出错。如果它在软件包安装过程中出现，您可能要多试几次才能成功。"
 
-#: ../gui.py:233 ../text.py:586
+#: ../gui.py:233 ../text.py:576
 msgid "Fix"
 msgstr "修复"
 
-#: ../gui.py:234 ../rescue.py:222 ../text.py:587
+#: ../gui.py:234 ../rescue.py:190 ../text.py:577
 #: ../textw/bootloader_text.py:72 ../textw/constants_text.py:56
 #: ../loader/driverdisk.c:485 ../loader/driverdisk.c:495
 #: ../loader/hdinstall.c:231
 msgid "Yes"
 msgstr "是"
 
-#: ../gui.py:235 ../rescue.py:222 ../rescue.py:224 ../text.py:588
+#: ../gui.py:235 ../rescue.py:190 ../rescue.py:192 ../text.py:578
 #: ../textw/bootloader_text.py:72 ../textw/constants_text.py:60
 #: ../loader/driverdisk.c:485 ../loader/driverdisk.c:495
 msgid "No"
 msgstr "否"
 
-#: ../gui.py:237 ../text.py:590 ../text.py:716 ../loader/net.c:105
-#: ../loader/net.c:413 ../loader/net.c:467 ../loader/net.c:584
-#: ../loader/net.c:592 ../loader/net.c:1009 ../loader/net.c:1015
+#: ../gui.py:237 ../text.py:580 ../text.py:706 ../loader/net.c:108
+#: ../loader/net.c:409 ../loader/net.c:463 ../loader/net.c:606
+#: ../loader/net.c:614 ../loader/net.c:1040 ../loader/net.c:1047
 msgid "Retry"
 msgstr "重试"
 
-#: ../gui.py:238 ../text.py:591
+#: ../gui.py:238 ../text.py:581
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../gui.py:239 ../gui.py:910 ../gui.py:1495 ../partIntfHelpers.py:245
-#: ../partIntfHelpers.py:536 ../text.py:109 ../text.py:110 ../text.py:592
+#: ../gui.py:239 ../gui.py:908 ../gui.py:1496 ../partIntfHelpers.py:245
+#: ../partIntfHelpers.py:536 ../text.py:108 ../text.py:109 ../text.py:582
 #: ../textw/bootloader_text.py:202 ../textw/constants_text.py:48
 #: ../loader/dirbrowser.c:145 ../loader/driverdisk.c:246
 #: ../loader/kickstart.c:375 ../loader/loader.c:434 ../loader/loader.c:546
 msgid "Cancel"
 msgstr "取消"
 
-#: ../gui.py:581 ../text.py:518
+#: ../gui.py:581 ../text.py:508
 msgid "Installation Key"
 msgstr "安装码"
 
-#: ../gui.py:660 ../text.py:323
-#, python-format
+#: ../gui.py:652 ../text.py:318
 msgid ""
-"Choose a passphrase for this encrypted device%s. You will be prompted for "
-"the passphrase during system boot."
-msgstr "为这个加密设备 %s 选择密码短语。在系统引导时会提示您输入密码短语。"
+"Choose a passphrase for your encrypted devices. You will be prompted for the "
+"passphrase during system boot."
+msgstr "请为您加密的设备选择密码短语。在系统引导时会提示您输入密码短语。"
 
-#: ../gui.py:679 ../gui.py:687 ../text.py:367 ../text.py:377
+#: ../gui.py:671 ../gui.py:679 ../text.py:356 ../text.py:366
 msgid "Error with passphrase"
 msgstr "密码错误"
 
-#: ../gui.py:680 ../text.py:368
+#: ../gui.py:672 ../text.py:357
 msgid "The passphrases you entered were different.  Please try again."
 msgstr "您输入的密码不匹配，请重新输入。"
 
-#: ../gui.py:688
+#: ../gui.py:680
 msgid "The passphrase must be at least eight characters long."
 msgstr "密码至少应包含八个字符。"
 
-#: ../gui.py:723 ../text.py:400
+#: ../gui.py:714 ../text.py:390
 #, python-format
 msgid ""
 "Device %s is encrypted. In order to access the device's contents during "
 "installation you must enter the device's passphrase below."
 msgstr "设备 %s 是加密的。为了要在安装过程中访问设备的内容，您必须输入以下设备密码。"
 
-#: ../gui.py:780
+#: ../gui.py:771
 #, python-format
 msgid "Bugzilla (%s)"
 msgstr "Bugzilla (%s)"
 
-#: ../gui.py:922 ../gui.py:923 ../gui.py:1035 ../gui.py:1036
+#: ../gui.py:801
+msgid "No devices found"
+msgstr "未找到任何设备"
+
+#: ../gui.py:920 ../gui.py:921 ../gui.py:1033 ../gui.py:1034
 #: tmp/anaconda.glade.h:2
 msgid "_Debug"
 msgstr "调试(_D)"
 
-#: ../gui.py:1079 ../gui.py:1081 ../gui.py:1492 ../livecd.py:113
+#: ../gui.py:1080 ../gui.py:1082 ../gui.py:1493 ../livecd.py:113
 msgid "Exit installer"
 msgstr "退出安装程序"
 
-#: ../gui.py:1081 ../text.py:294 ../text.py:302
+#: ../gui.py:1082 ../text.py:293 ../text.py:301
 msgid "Debug"
 msgstr "调试"
 
-#: ../gui.py:1083 ../text.py:298
+#: ../gui.py:1084 ../text.py:297
 msgid "Exception Occurred"
 msgstr "出现例外"
 
-#: ../gui.py:1281 ../text.py:563
+#: ../gui.py:1282 ../text.py:553
 msgid "Error Parsing Kickstart Config"
 msgstr "解析 kickstart 配置时出错"
 
-#: ../gui.py:1327
+#: ../gui.py:1328
 msgid "default:LTR"
 msgstr "默认：LTR"
 
-#: ../gui.py:1407 ../text.py:711
+#: ../gui.py:1408 ../text.py:701
 msgid "Error!"
 msgstr "错误！"
 
-#: ../gui.py:1408 ../text.py:712
+#: ../gui.py:1409 ../text.py:702
 #, python-format
 msgid ""
 "An error occurred when attempting to load an installer interface component.\n"
@@ -1141,48 +1145,48 @@ msgstr ""
 "试图载入安装程序界面部件时出现错误。\n"
 "className = %s"
 
-#: ../gui.py:1413 ../image.py:164 ../image.py:194 ../packages.py:398
-#: ../packages.py:403
+#: ../gui.py:1414 ../image.py:164 ../image.py:194 ../packages.py:402
+#: ../packages.py:407
 msgid "_Exit"
 msgstr "退出(_E)"
 
-#: ../gui.py:1414 ../image.py:164 ../image.py:194 ../livecd.py:203
-#: ../yuminstall.py:653 ../yuminstall.py:1041 ../yuminstall.py:1089
-#: ../yuminstall.py:1294
+#: ../gui.py:1415 ../image.py:164 ../image.py:194 ../livecd.py:203
+#: ../yuminstall.py:636 ../yuminstall.py:987 ../yuminstall.py:1047
+#: ../yuminstall.py:1283
 msgid "_Retry"
 msgstr "重试(_R)"
 
-#: ../gui.py:1417 ../packages.py:168 ../packages.py:402
+#: ../gui.py:1418 ../packages.py:172 ../packages.py:406
 msgid "The installer will now exit..."
 msgstr "安装程序现在退出..."
 
-#: ../gui.py:1420 ../packages.py:405
+#: ../gui.py:1421 ../packages.py:409
 msgid "Your system will now be rebooted..."
 msgstr "您的系统现在将会被重新引导..."
 
-#: ../gui.py:1421 ../image.py:253 ../packages.py:169 ../packages.py:406
-#: ../partedUtils.py:1286 ../yuminstall.py:1345
+#: ../gui.py:1422 ../image.py:253 ../packages.py:173 ../packages.py:410
+#: ../partedUtils.py:1260 ../yuminstall.py:1334
 msgid "_Reboot"
 msgstr "重新引导(_R)"
 
-#: ../gui.py:1423
+#: ../gui.py:1424
 msgid "Exiting"
 msgstr "退出中"
 
-#: ../gui.py:1493
+#: ../gui.py:1494
 msgid "Are you sure you wish to exit the installation?"
 msgstr "你确定你想要退出安装吗?"
 
-#: ../gui.py:1502
+#: ../gui.py:1503
 #, python-format
 msgid "%s Installer"
 msgstr "%s 安装程序"
 
-#: ../gui.py:1509
+#: ../gui.py:1510
 msgid "Unable to load title bar"
 msgstr "无法载入标题栏"
 
-#: ../gui.py:1562
+#: ../gui.py:1566
 msgid "Install Window"
 msgstr "安装窗口"
 
@@ -1251,9 +1255,9 @@ msgstr ""
 "请在继续安装前准备好这些光盘。如果您需要中止安装并重新引导，请选择“重新引"
 "导”。"
 
-#: ../image.py:253 ../livecd.py:385 ../packages.py:352 ../packages.py:403
-#: ../packages.py:406 ../yuminstall.py:775 ../yuminstall.py:864
-#: ../yuminstall.py:1329 ../yuminstall.py:1345
+#: ../image.py:253 ../livecd.py:383 ../packages.py:356 ../packages.py:407
+#: ../packages.py:410 ../yuminstall.py:758 ../yuminstall.py:847
+#: ../yuminstall.py:1318 ../yuminstall.py:1334
 msgid "_Back"
 msgstr "上一步(_B)"
 
@@ -1268,7 +1272,18 @@ msgstr "卸载光盘时出错。请确定您不是从 tty2 上的命令行访问
 msgid "Install on System"
 msgstr "在系统上安装"
 
-#: ../iscsi.py:208 ../iscsi.py:209
+#: ../instdata.py:118
+msgid "Unknown Device"
+msgstr "未知设备"
+
+#: ../instdata.py:119
+#, python-format
+msgid ""
+"The installation source given by device %s could not be found.  Please check "
+"your parameters and try again."
+msgstr "没有找到设备 %s 给定的安装源。请检查您的参数然后再试一次。"
+
+#: ../iscsi.py:449 ../iscsi.py:450
 msgid "Initializing iSCSI initiator"
 msgstr "初始化iSCSI initiator"
 
@@ -1286,38 +1301,38 @@ msgstr ""
 msgid "Scriptlet Failure"
 msgstr "Scriptlet 失败"
 
-#: ../kickstart.py:1027 ../kickstart.py:1044
+#: ../kickstart.py:1056 ../kickstart.py:1073
 msgid "Running..."
 msgstr "正在运行..."
 
-#: ../kickstart.py:1028
+#: ../kickstart.py:1057
 msgid "Running post-install scripts"
 msgstr "运行安装后脚本"
 
-#: ../kickstart.py:1045
+#: ../kickstart.py:1074
 msgid "Running pre-install scripts"
 msgstr "运行安装前脚本"
 
-#: ../kickstart.py:1076
+#: ../kickstart.py:1105
 msgid "Missing Package"
 msgstr "缺少软件包"
 
-#: ../kickstart.py:1077
+#: ../kickstart.py:1106
 #, python-format
 msgid ""
 "You have specified that the package '%s' should be installed.  This package "
 "does not exist. Would you like to continue or abort your installation?"
 msgstr "您已指定要安装'%s' 软件包。该软件包不存在。您想要继续还是中止安装？"
 
-#: ../kickstart.py:1083 ../kickstart.py:1121
+#: ../kickstart.py:1112 ../kickstart.py:1150
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../kickstart.py:1113
+#: ../kickstart.py:1142
 msgid "Missing Group"
 msgstr "缺少软件包组"
 
-#: ../kickstart.py:1114
+#: ../kickstart.py:1143
 #, python-format
 msgid ""
 "You have specified that the group '%s' should be installed. This group does "
@@ -1345,8 +1360,8 @@ msgid ""
 "If you exit, your system will be left in an inconsistent state that will "
 "require reinstallation."
 msgstr ""
-"在将即时映像安装到您硬盘中时出错。这是由介质损坏造成的。请检查您的"
-"安装介质。\n"
+"在将即时映像安装到您硬盘中时出错。这是由介质损坏造成的。请检查您的安装介"
+"质。\n"
 "\n"
 "您如果现在退出，您的系统会不稳定需要重新安装。"
 
@@ -1360,85 +1375,85 @@ msgid ""
 "minutes..."
 msgstr "进行安装后文件系统改变，可能要等一会..."
 
-#: ../livecd.py:380
+#: ../livecd.py:378
 #, python-format
 msgid ""
 "The root filesystem you created is not large enough for this live image "
 "(%.2f MB required)."
 msgstr "您创建的根文件系统不够大，无法容纳这个实时映像（需要 %.2f MB）。"
 
-#: ../network.py:64
-msgid "Hostname must be 64 or fewer characters in length."
-msgstr "主机名的长度必须小于等于 64 个字符。"
+#: ../network.py:56
+msgid "Hostname must be 255 or fewer characters in length."
+msgstr "主机名的长度必须小于 255 个字符。"
 
-#: ../network.py:70
+#: ../network.py:62
 msgid ""
 "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or '0-"
 "9'"
 msgstr "主机名只能以“a-z”、“A-Z”或者“0-9”范围内的有效字符开头"
 
-#: ../network.py:75
+#: ../network.py:67
 msgid "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.'"
 msgstr "主机名只能包含字符“a-z”、“A-Z”、“0-9”、“-”、或“.”。"
 
-#: ../network.py:132
+#: ../network.py:166
 msgid "IP address is missing."
 msgstr "缺少IP地址"
 
-#: ../network.py:136
+#: ../network.py:170
 msgid ""
 "IPv4 addresses must contain four numbers between 0 and 255, separated by "
 "periods."
 msgstr "IPv4 地址必须包含4个从 0 到 255 之间的数字，中间有间隔。"
 
-#: ../network.py:139
+#: ../network.py:173
 #, python-format
 msgid "'%s' is not a valid IPv6 address."
 msgstr "'%s' 不是有效的IPv6地址。"
 
-#: ../network.py:141
+#: ../network.py:175
 #, python-format
 msgid "'%s' is an invalid IP address."
 msgstr "'%s' 不是有效的IP地址。"
 
-#: ../packages.py:112
+#: ../packages.py:114
 msgid "Resizing Failed"
 msgstr "调整大小失败"
 
-#: ../packages.py:113
+#: ../packages.py:115
 #, python-format
 msgid "There was an error encountered resizing the device %s."
 msgstr "调整设备 %s 大小时遇到错误。"
 
-#: ../packages.py:146
+#: ../packages.py:148
 msgid "Activating"
 msgstr "激活"
 
-#: ../packages.py:146
+#: ../packages.py:148
 msgid "Activating new partitions.  Please wait..."
 msgstr "正在激活新分区，请等待......"
 
-#: ../packages.py:167
+#: ../packages.py:171
 msgid "LVM operation failed"
 msgstr "LVM 操作失败"
 
-#: ../packages.py:323
+#: ../packages.py:327
 msgid "Invalid Key"
 msgstr "无效密码"
 
-#: ../packages.py:324
+#: ../packages.py:328
 msgid "The key you entered is invalid."
 msgstr "您所输入的密码无效."
 
-#: ../packages.py:352
+#: ../packages.py:356
 msgid "_Skip"
 msgstr "(_s)跳过"
 
-#: ../packages.py:384 ../packages.py:407
+#: ../packages.py:388 ../packages.py:411
 msgid "Warning! This is pre-release software!"
 msgstr "警告！这是预发行软件！"
 
-#: ../packages.py:385
+#: ../packages.py:389
 #, python-format
 msgid ""
 "Thank you for downloading this pre-release of %s.\n"
@@ -1464,122 +1479,10 @@ msgstr ""
 "\n"
 "然后向“%s”提交报告。\n"
 
-#: ../packages.py:398
+#: ../packages.py:402
 msgid "_Install anyway"
 msgstr "强行安装(_I)"
 
-#: ../partedUtils.py:240 ../textw/partition_text.py:578
-msgid "Foreign"
-msgstr "外来"
-
-#: ../partedUtils.py:368
-#, python-format
-msgid ""
-"The device %s is LDL formatted instead of CDL formatted.  LDL formatted "
-"DASDs are not supported for usage during an install of %s.  If you wish to "
-"use this disk for installation, it must be re-initialized causing the loss "
-"of ALL DATA on this drive.\n"
-"\n"
-"Would you like to reformat this DASD using CDL format?"
-msgstr ""
-"设备 %s 是 LDL 格式的，而不是 CDL 格式的。LDL 格式的 DASD 在 %s 的安装中不被"
-"支持。如果您想使用这个磁盘来安装，它一定要被重新初始化，从而导致所有数据丢"
-"失。\n"
-"\n"
-"您想使用 CDL 格式来重新格式化这个 DASD 吗？"
-
-#: ../partedUtils.py:398
-#, python-format
-msgid ""
-"/dev/%s currently has a %s partition layout.  To use this drive for the "
-"installation of %s, it must be re-initialized, causing the loss of ALL DATA "
-"on this drive.\n"
-"\n"
-"Would you like to re-initialize this drive?"
-msgstr ""
-"/dev/%s 上的分区表类型为 %s。若要使用该磁盘安装 %s，它一定要被重新初始化，这"
-"将会导致该驱动器上的所有数据丢失。\n"
-"\n"
-"您想重新初始化这个驱动器吗？"
-
-#: ../partedUtils.py:407
-msgid "_Ignore drive"
-msgstr "忽略驱动器(_I)"
-
-#: ../partedUtils.py:408
-msgid "_Re-initialize drive"
-msgstr "重新初始化驱动"
-
-#: ../partedUtils.py:1023
-msgid "Initializing"
-msgstr "初始化"
-
-#: ../partedUtils.py:1024
-#, python-format
-msgid "Please wait while formatting drive %s...\n"
-msgstr "正在格式化驱动器 %s ...请稍候...\n"
-
-#: ../partedUtils.py:1108
-#, python-format
-msgid ""
-"The partition table on device %s was unreadable. To create new partitions it "
-"must be initialized, causing the loss of ALL DATA on this drive.\n"
-"\n"
-"This operation will override any previous installation choices about which "
-"drives to ignore.\n"
-"\n"
-"Would you like to initialize this drive, erasing ALL DATA?"
-msgstr ""
-"设备 %s 上的分区表无法被读取。创建新分区时必须对其执行初始化，从而会导致该驱"
-"动器中的所有数据丢失。\n"
-"\n"
-"该操作会覆盖所有先前关于要忽略的驱动器的安装选择。\n"
-"\n"
-"您想要初始化这个驱动器并删除所有数据吗？"
-
-#: ../partedUtils.py:1129
-#, python-format
-msgid ""
-"The partition table on device %s (%s %-0.f MB) was unreadable.\n"
-"To create new partitions it must be initialized, causing the loss of ALL "
-"DATA on this drive.\n"
-"\n"
-"This operation will override any previous installation choices about which "
-"drives to ignore.\n"
-"\n"
-"Would you like to initialize this drive, erasing ALL DATA?"
-msgstr ""
-"无法读取设备 %s（%s %-0.f MB）中的分区表。\n"
-"要创建新分区时必须对其执行初始化，从而会导致"
-"该驱动器中的所有数据丢失。\n"
-"\n"
-"该操作会覆盖所有先前关于要忽略的驱动器的安装选择。\n"
-"\n"
-"您想要初始化这个驱动器并删除所有数据吗？"
-
-#: ../partedUtils.py:1277
-#, python-format
-msgid ""
-"The drive /dev/%s has more than 15 partitions on it.  The SCSI subsystem in "
-"the Linux kernel does not allow for more than 15 partitons at this time.  "
-"You will not be able to make changes to the partitioning of this disk or use "
-"any partitions beyond /dev/%s15 in %s"
-msgstr ""
-"驱动器/dev/%s 有超过15个分区.这时Linux内核的SCSI子系统不允许超过15个分区. 您"
-"将无法改变此硬盘的分区,或在 %s中使用任何超出/dev/%s15的分区"
-
-#: ../partedUtils.py:1361
-msgid "No Drives Found"
-msgstr "未找到任何驱动器"
-
-#: ../partedUtils.py:1362
-msgid ""
-"An error has occurred - no valid devices were found on which to create new "
-"file systems. Please check your hardware for the cause of this problem."
-msgstr ""
-"出现错误 - 未找到要在其中创建新文件系统的有效设备。请检查您的硬件以找到问题的"
-"起因。"
-
 #: ../partIntfHelpers.py:43
 msgid "Please enter a volume group name."
 msgstr "请输入卷组名称。"
@@ -1674,7 +1577,7 @@ msgid ""
 "contains %s"
 msgstr "您不能删除该分区，因为它是一个包含 %s 的扩展分区"
 
-#: ../partIntfHelpers.py:190 ../iw/raid_dialog_gui.py:637
+#: ../partIntfHelpers.py:190 ../iw/raid_dialog_gui.py:591
 msgid "This partition is holding the data for the hard drive install."
 msgstr "该分区含有硬盘安装的信息。"
 
@@ -1687,7 +1590,7 @@ msgstr ""
 "\n"
 
 #: ../partIntfHelpers.py:241 ../partIntfHelpers.py:535
-#: ../iw/lvm_dialog_gui.py:817
+#: ../iw/lvm_dialog_gui.py:794
 msgid "Confirm Delete"
 msgstr "确认删除"
 
@@ -1697,7 +1600,7 @@ msgid "You are about to delete all partitions on the device '/dev/%s'."
 msgstr "要删除'/dev/%s'设备上的所有分区。"
 
 #: ../partIntfHelpers.py:245 ../partIntfHelpers.py:536
-#: ../iw/lvm_dialog_gui.py:820 ../iw/lvm_dialog_gui.py:1168
+#: ../iw/lvm_dialog_gui.py:797 ../iw/lvm_dialog_gui.py:1145
 #: ../iw/osbootwidget.py:104 ../iw/partition_gui.py:1384
 msgid "_Delete"
 msgstr "删除(_D)"
@@ -1876,6 +1779,177 @@ msgstr "确认重设"
 msgid "Are you sure you want to reset the partition table to its original state?"
 msgstr "是否确定要将分区表还原至其最初状态？"
 
+#: ../partRequests.py:275 ../partRequests.py:278
+#, python-format
+msgid "The mount point %s must be formatted during live CD installs."
+msgstr "在实时 CD 安装的过程中必须将挂载点 %s 格式化。"
+
+#: ../partRequests.py:284
+#, python-format
+msgid "This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "该挂载点无效，%s 目录必须位于  / file 系统上。"
+
+#: ../partRequests.py:287
+#, python-format
+msgid ""
+"The mount point %s cannot be used.  It must be a symbolic link for proper "
+"system operation.  Please select a different mount point."
+msgstr "挂载点 %s 无法被使用。它必须是符号链接才能使系统正确运行。请另选一个挂载点。"
+
+#: ../partRequests.py:296
+msgid "This mount point must be on a linux file system."
+msgstr "该挂载点必须位于 Linux 文件系统上。"
+
+#: ../partRequests.py:317
+#, python-format
+msgid ""
+"The mount point \"%s\" is already in use, please choose a different mount "
+"point."
+msgstr "挂载点\"%s\" 已被使用，请另选一个。"
+
+#: ../partRequests.py:331
+#, python-format
+msgid ""
+"The size of the %s partition (%10.2f MB) exceeds the maximum size of %10.2f "
+"MB."
+msgstr "%s 分区的大小（%10.2f MB）已超过了最大值 %10.2f MB。"
+
+#: ../partRequests.py:539
+#, python-format
+msgid ""
+"The size of the requested partition (size = %s MB) exceeds the maximum size "
+"of %s MB."
+msgstr "所申请分区的大小（%sMB）超过最大值 %sMB。"
+
+#: ../partRequests.py:544
+#, python-format
+msgid "The size of the requested partition is negative! (size = %s MB)"
+msgstr "所申请的分区大小是负数（%sMB）！"
+
+#: ../partRequests.py:548
+msgid "Partitions can't start below the first cylinder."
+msgstr "分区不能从第一个柱面前开始。"
+
+#: ../partRequests.py:551
+msgid "Partitions can't end on a negative cylinder."
+msgstr "分区不能以负柱面结束。"
+
+#: ../partRequests.py:753
+msgid "No members in RAID request, or not RAID level specified."
+msgstr "没有 RAID 成员，或者不是 RAID 级别中指定的。"
+
+#: ../partRequests.py:758
+#, python-format
+msgid "A RAID device of type %s requires at least %s members."
+msgstr "%s 类型的 RAID 设备至少需要 %s 个成员。"
+
+#: ../partRequests.py:767
+#, python-format
+msgid ""
+"This RAID device can have a maximum of %s spares. To have more spares you "
+"will need to add members to the RAID device."
+msgstr "该 RAID 设备至多可有 %s 个备件。要增加备件，您需要增加 RAID 设备的成员。"
+
+#: ../partRequests.py:1033
+msgid ""
+"Logical volume size must be larger than the volume group's physical extent "
+"size."
+msgstr "逻辑卷大小一定要比卷组的物理扩展分区大。"
+
+#: ../partedUtils.py:240 ../textw/partition_text.py:578
+msgid "Foreign"
+msgstr "外来"
+
+#: ../partedUtils.py:368
+#, python-format
+msgid ""
+"The device %s is LDL formatted instead of CDL formatted.  LDL formatted "
+"DASDs are not supported for usage during an install of %s.  If you wish to "
+"use this disk for installation, it must be re-initialized causing the loss "
+"of ALL DATA on this drive.\n"
+"\n"
+"Would you like to reformat this DASD using CDL format?"
+msgstr ""
+"设备 %s 是 LDL 格式的，而不是 CDL 格式的。LDL 格式的 DASD 在 %s 的安装中不被"
+"支持。如果您想使用这个磁盘来安装，它一定要被重新初始化，从而导致所有数据丢"
+"失。\n"
+"\n"
+"您想使用 CDL 格式来重新格式化这个 DASD 吗？"
+
+#: ../partedUtils.py:398
+#, python-format
+msgid ""
+"/dev/%s currently has a %s partition layout.  To use this drive for the "
+"installation of %s, it must be re-initialized, causing the loss of ALL DATA "
+"on this drive.\n"
+"\n"
+"Would you like to re-initialize this drive?"
+msgstr ""
+"/dev/%s 上的分区表类型为 %s。若要使用该磁盘安装 %s，它一定要被重新初始化，这"
+"将会导致该驱动器上的所有数据丢失。\n"
+"\n"
+"您想重新初始化这个驱动器吗？"
+
+#: ../partedUtils.py:407
+msgid "_Ignore drive"
+msgstr "忽略驱动器(_I)"
+
+#: ../partedUtils.py:408
+msgid "_Re-initialize drive"
+msgstr "重新初始化驱动"
+
+#: ../partedUtils.py:1015
+msgid "Initializing"
+msgstr "初始化"
+
+#: ../partedUtils.py:1016
+#, python-format
+msgid "Please wait while formatting drive %s...\n"
+msgstr "正在格式化驱动器 %s ...请稍候...\n"
+
+#: ../partedUtils.py:1101
+#, python-format
+msgid ""
+"The partition table on device %s (%s %-0.f MB) was unreadable.\n"
+"\n"
+"To create new partitions it must be initialized, causing the loss of ALL "
+"DATA on this drive.\n"
+"\n"
+"This operation will override any previous installation choices about which "
+"drives to ignore.\n"
+"\n"
+"Would you like to initialize this drive, erasing ALL DATA?"
+msgstr ""
+"无法读取设备 %s（%s %-0.f MB）中的分区表。\n"
+"要创建新分区必须对其执行初始化，这样会会导致丢失该驱动器中的所有数据。\n"
+"\n"
+"该操作会覆盖所有先前关于要忽略的驱动器的安装选择。\n"
+"\n"
+"您想要初始化这个驱动器并删除所有数据吗？"
+
+#: ../partedUtils.py:1251
+#, python-format
+msgid ""
+"The drive /dev/%s has more than 15 partitions on it.  The SCSI subsystem in "
+"the Linux kernel does not allow for more than 15 partitons at this time.  "
+"You will not be able to make changes to the partitioning of this disk or use "
+"any partitions beyond /dev/%s15 in %s"
+msgstr ""
+"驱动器/dev/%s 有超过15个分区.这时Linux内核的SCSI子系统不允许超过15个分区. 您"
+"将无法改变此硬盘的分区,或在 %s中使用任何超出/dev/%s15的分区"
+
+#: ../partedUtils.py:1335
+msgid "No Drives Found"
+msgstr "未找到任何驱动器"
+
+#: ../partedUtils.py:1336
+msgid ""
+"An error has occurred - no valid devices were found on which to create new "
+"file systems. Please check your hardware for the cause of this problem."
+msgstr ""
+"出现错误 - 未找到要在其中创建新文件系统的有效设备。请检查您的硬件以找到问题的"
+"起因。"
+
 #: ../partitions.py:84
 msgid "Installation cannot continue."
 msgstr "安装无法继续。"
@@ -1887,65 +1961,62 @@ msgid ""
 "with the installation process?"
 msgstr "您选择的分区选项已被激活，您将无法返回到磁盘编辑屏幕。您想继续安装吗？"
 
-#: ../partitions.py:130
-#, python-format
-msgid " for device %s"
-msgstr "设备 %s"
-
-#: ../partitions.py:133
+#: ../partitions.py:125
 msgid "Encrypt device?"
 msgstr "加密设备？"
 
-#: ../partitions.py:134
-#, python-format
+#: ../partitions.py:126
 msgid ""
-"You specified block device encryption should be enabled%s, but you have not "
+"You specified block device encryption should be enabled, but you have not "
 "supplied a passphrase. If you do not go back and provide a passphrase, block "
-"device encryption%s will be disabled."
-msgstr "您指定的块设备加密法应该启用 %s，但您还没有提供密码短语。如果您不在上一步提供密码短语，则会禁用块设备加密法 %s。"
+"device encryption will be disabled."
+msgstr ""
+"您指定的块设备加密应该启用，但您还没有提供密码短语。如果您不返回上一步并提供"
+"密码短语，则会禁用块设备加密。"
 
-#: ../partitions.py:141 ../partitions.py:260 ../textw/constants_text.py:52
+#: ../partitions.py:133 ../partitions.py:263 ../textw/constants_text.py:52
 #: ../loader/cdinstall.c:438 ../loader/driverdisk.c:246
 #: ../loader/driverdisk.c:277 ../loader/driverdisk.c:361
 #: ../loader/driverselect.c:81 ../loader/driverselect.c:179
 #: ../loader/driverselect.c:205 ../loader/hdinstall.c:231
 #: ../loader/hdinstall.c:289 ../loader/kbd.c:138 ../loader/loader.c:473
-#: ../loader/loader.c:493 ../loader/loader.c:1361 ../loader/loader.c:1390
-#: ../loader/net.c:514 ../loader/net.c:869 ../loader/net.c:1542
-#: ../loader/net.c:1564 ../loader/nfsinstall.c:86 ../loader/urls.c:292
+#: ../loader/loader.c:493 ../loader/loader.c:1365 ../loader/loader.c:1394
+#: ../loader/net.c:515 ../loader/net.c:891 ../loader/net.c:1628
+#: ../loader/net.c:1650 ../loader/nfsinstall.c:87 ../loader/urls.c:292
 msgid "Back"
 msgstr "上一步"
 
-#: ../partitions.py:141 ../partitions.py:260 ../rescue.py:312
-#: ../iw/partition_gui.py:574 ../textw/network_text.py:62
-#: ../loader/cdinstall.c:198 ../loader/cdinstall.c:206
-#: ../loader/driverdisk.c:446
+#: ../partitions.py:133 ../partitions.py:263 ../rescue.py:242
+#: ../iw/partition_gui.py:574 ../loader/cdinstall.c:198
+#: ../loader/cdinstall.c:206 ../loader/driverdisk.c:446
 msgid "Continue"
 msgstr "继续"
 
-#: ../partitions.py:160
+#: ../partitions.py:154
 msgid "Writing partitioning to disk"
 msgstr "将分区写入磁盘"
 
-#: ../partitions.py:161
+#: ../partitions.py:155
 msgid ""
 "The partitioning options you have selected will now be written to disk.  Any "
 "data on deleted or reformatted partitions will be lost."
-msgstr "现在会将您选择的分区选项写入磁盘。所有在被删除或者被重新格式化的分区中的数据都会丢失。"
+msgstr ""
+"现在会将您选择的分区选项写入磁盘。所有在被删除或者被重新格式化的分区中的数据"
+"都会丢失。"
 
-#: ../partitions.py:166
+#: ../partitions.py:160
 msgid "Go _back"
 msgstr "上一步（_b）"
 
-#: ../partitions.py:167
+#: ../partitions.py:161
 msgid "_Write changes to disk"
 msgstr "将修改写入磁盘（_W）"
 
-#: ../partitions.py:265
+#: ../partitions.py:268
 msgid "Confirm"
 msgstr "确认"
 
-#: ../partitions.py:266
+#: ../partitions.py:269
 #, python-format
 msgid ""
 "Are you sure you want to skip entering a passphrase for device %s?\n"
@@ -1957,77 +2028,77 @@ msgstr ""
 "\n"
 "如果您跳过这一步，那么将无法安装过程中使用设备内容。"
 
-#: ../partitions.py:1146
+#: ../partitions.py:1189
 #, python-format
 msgid ""
 "You have not defined a root partition (/), which is required for "
 "installation of %s to continue."
 msgstr "您还没有指定继续安装 %s 所需的根分区（/）。"
 
-#: ../partitions.py:1151
+#: ../partitions.py:1194
 #, python-format
 msgid ""
 "Your root partition is less than 250 megabytes which is usually too small to "
 "install %s."
 msgstr "您的根分区小于 250 MB，这个空间通常太小，不足以安装 %s。"
 
-#: ../partitions.py:1177
+#: ../partitions.py:1220
 msgid "You must create an EFI System Partition of at least 10 megabytes."
 msgstr "您必须创建一个至少有 10MB 大小的 EFI 系统分区。"
 
-#: ../partitions.py:1191
+#: ../partitions.py:1234
 msgid ""
 "Your boot partition isn't on one of the first four partitions and thus won't "
 "be bootable."
 msgstr "您的引导区不是最初的四个分区之一，因此无法引导驱动器。"
 
-#: ../partitions.py:1212
+#: ../partitions.py:1255
 msgid "You must create an Apple Bootstrap partition."
 msgstr "您必须创建一个 Apple 引导分区。"
 
-#: ../partitions.py:1234
+#: ../partitions.py:1277
 msgid "You must create a PPC PReP Boot partition."
 msgstr "您必须创建一个 PPC PReP 引导分区。"
 
-#: ../partitions.py:1242 ../partitions.py:1253
+#: ../partitions.py:1285 ../partitions.py:1296
 #, python-format
 msgid ""
 "Your %s partition is less than %s megabytes which is lower than recommended "
 "for a normal %s install."
 msgstr "您的 %s 分区小于 %s MB，小于正常安装 %s 的建议值。"
 
-#: ../partitions.py:1287
+#: ../partitions.py:1330
 msgid "Installing on a USB device.  This may or may not produce a working system."
 msgstr "正在一个 USB 设备上安装。不能保证可以成功安装。"
 
-#: ../partitions.py:1290
+#: ../partitions.py:1333
 msgid ""
 "Installing on a FireWire device.  This may or may not produce a working "
 "system."
 msgstr "正在一个 FireWire 设备上安装。不能保证可以成功安装。"
 
-#: ../partitions.py:1300
+#: ../partitions.py:1343
 msgid "Bootable partitions can only be on RAID1 devices."
 msgstr "可引导分区仅允许在 RAID1 设备上。"
 
-#: ../partitions.py:1305
+#: ../partitions.py:1348
 msgid "Bootable partitions cannot be on a logical volume."
 msgstr "可引导分区不能位于逻辑卷上。"
 
-#: ../partitions.py:1311
+#: ../partitions.py:1354
 msgid "Bootable partitions cannot be on a RAID device."
 msgstr "RAID 设备中不能有可引导分区。"
 
-#: ../partitions.py:1316 ../partitions.py:1322
+#: ../partitions.py:1359 ../partitions.py:1365
 #, python-format
 msgid "Bootable partitions cannot be on an %s filesystem."
 msgstr "%s 文件系统中不能有可引导分区。"
 
-#: ../partitions.py:1326
+#: ../partitions.py:1369
 msgid "Bootable partitions cannot be on an encrypted block device"
 msgstr "加密的块设备中不能有可引导分区。"
 
-#: ../partitions.py:1330
+#: ../partitions.py:1373
 msgid ""
 "You have not specified a swap partition.  Although not strictly required in "
 "all cases, it will significantly improve performance for most installations."
@@ -2035,147 +2106,59 @@ msgstr ""
 "您还没有指定一个交换分区。虽然在大多情况下这并非必不可少，但若有一个交换分区"
 "的话，系统性能会显著提高。"
 
-#: ../partitions.py:1337
+#: ../partitions.py:1380
 #, python-format
 msgid ""
 "You have specified more than 32 swap devices.  The kernel for %s only "
 "supports 32 swap devices."
 msgstr "您指定的交换分区设备已超过32个。%s 的内核只支持32个交换分区设备。"
 
-#: ../partitions.py:1348
+#: ../partitions.py:1391
 #, python-format
 msgid ""
 "You have allocated less swap space (%dM) than available RAM (%dM) on your "
 "system.  This could negatively impact performance."
 msgstr "您分配的交换空间(%dM)小于系统内的可用内存(%dM)，这可能会影响性能。"
 
-#: ../partitions.py:1655
+#: ../partitions.py:1698
 msgid "the partition in use by the installer."
 msgstr "安装程序正在使用该分区。"
 
-#: ../partitions.py:1658
+#: ../partitions.py:1701
 msgid "a partition which is a member of a RAID array."
 msgstr "RAID 阵列中的一个分区。"
 
-#: ../partitions.py:1661
+#: ../partitions.py:1704
 msgid "a partition which is a member of a LVM Volume Group."
 msgstr "一个是 LVM 卷组成员之一的分区。"
 
-#: ../partRequests.py:275 ../partRequests.py:278
-#, python-format
-msgid "The mount point %s must be formatted during live CD installs."
-msgstr "在实时 CD 安装的过程中必须将挂载点 %s 格式化。"
-
-#: ../partRequests.py:284
-#, python-format
-msgid "This mount point is invalid.  The %s directory must be on the / file system."
-msgstr "该挂载点无效，%s 目录必须位于  / file 系统上。"
-
-#: ../partRequests.py:287
-#, python-format
-msgid ""
-"The mount point %s cannot be used.  It must be a symbolic link for proper "
-"system operation.  Please select a different mount point."
-msgstr "挂载点 %s 无法被使用。它必须是符号链接才能使系统正确运行。请另选一个挂载点。"
-
-#: ../partRequests.py:296
-msgid "This mount point must be on a linux file system."
-msgstr "该挂载点必须位于 Linux 文件系统上。"
-
-#: ../partRequests.py:317
-#, python-format
-msgid ""
-"The mount point \"%s\" is already in use, please choose a different mount "
-"point."
-msgstr "挂载点\"%s\" 已被使用，请另选一个。"
-
-#: ../partRequests.py:331
-#, python-format
-msgid ""
-"The size of the %s partition (%10.2f MB) exceeds the maximum size of %10.2f "
-"MB."
-msgstr "%s 分区的大小（%10.2f MB）已超过了最大值 %10.2f MB。"
-
-#: ../partRequests.py:539
-#, python-format
-msgid ""
-"The size of the requested partition (size = %s MB) exceeds the maximum size "
-"of %s MB."
-msgstr "所申请分区的大小（%sMB）超过最大值 %sMB。"
-
-#: ../partRequests.py:544
-#, python-format
-msgid "The size of the requested partition is negative! (size = %s MB)"
-msgstr "所申请的分区大小是负数（%sMB）！"
-
-#: ../partRequests.py:548
-msgid "Partitions can't start below the first cylinder."
-msgstr "分区不能从第一个柱面前开始。"
-
-#: ../partRequests.py:551
-msgid "Partitions can't end on a negative cylinder."
-msgstr "分区不能以负柱面结束。"
-
-#: ../partRequests.py:753
-msgid "No members in RAID request, or not RAID level specified."
-msgstr "没有 RAID 成员，或者不是 RAID 级别中指定的。"
-
-#: ../partRequests.py:758
-#, python-format
-msgid "A RAID device of type %s requires at least %s members."
-msgstr "%s 类型的 RAID 设备至少需要 %s 个成员。"
-
-#: ../partRequests.py:767
-#, python-format
-msgid ""
-"This RAID device can have a maximum of %s spares. To have more spares you "
-"will need to add members to the RAID device."
-msgstr "该 RAID 设备至多可有 %s 个备件。要增加备件，您需要增加 RAID 设备的成员。"
-
-#: ../partRequests.py:1033
-msgid ""
-"Logical volume size must be larger than the volume group's physical extent "
-"size."
-msgstr "逻辑卷大小一定要比卷组的物理扩展分区大。"
-
-#: ../rescue.py:151
-msgid "Starting Interface"
-msgstr "启动接口"
-
-#: ../rescue.py:152
-#, python-format
-msgid "Attempting to start %s"
-msgstr "试图启动 %s"
-
-#: ../rescue.py:194
+#: ../rescue.py:162
 msgid "When finished please exit from the shell and your system will reboot."
 msgstr "结束后请退出 shell，您的系统将会被重新启动。"
 
-#: ../rescue.py:201
+#: ../rescue.py:169
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "无法找到要执行的 /bin/sh！没有启动 shell"
 
-#: ../rescue.py:220
+#: ../rescue.py:188
 msgid "Setup Networking"
 msgstr "设置网络"
 
-#: ../rescue.py:221
+#: ../rescue.py:189
 msgid "Do you want to start the network interfaces on this system?"
 msgstr "您想在这个系统上启动网络接口吗？"
 
-#: ../rescue.py:261 ../text.py:742
-msgid "Cancelled"
-msgstr "已取消"
-
-#: ../rescue.py:262 ../text.py:743
-msgid "I can't go to the previous step from here. You will have to try again."
-msgstr "无法从这里返回到上一步，您只能重试。"
+#: ../rescue.py:197
+msgid ""
+"Unable to activate a networking device.  Networking will not be available in "
+"rescue mode."
+msgstr "无法激活联网设备。联网在救援模式下不可用。"
 
-#: ../rescue.py:301 ../rescue.py:371 ../rescue.py:382 ../rescue.py:463
+#: ../rescue.py:231 ../rescue.py:301 ../rescue.py:312 ../rescue.py:393
 msgid "Rescue"
 msgstr "救援"
 
-#: ../rescue.py:302
+#: ../rescue.py:232
 #, python-format
 msgid ""
 "The rescue environment will now attempt to find your Linux installation and "
@@ -2196,23 +2179,23 @@ msgstr ""
 "直接进入一个命令行 shell。\n"
 "\n"
 
-#: ../rescue.py:312 ../rescue.py:317
+#: ../rescue.py:242 ../rescue.py:247
 msgid "Read-Only"
 msgstr "只读"
 
-#: ../rescue.py:343
+#: ../rescue.py:273
 msgid "System to Rescue"
 msgstr "要援救的系统"
 
-#: ../rescue.py:344
+#: ../rescue.py:274
 msgid "What partition holds the root partition of your installation?"
 msgstr "哪个分区包含安装的根分区？"
 
-#: ../rescue.py:346 ../rescue.py:350 ../text.py:716 ../text.py:718
+#: ../rescue.py:276 ../rescue.py:280 ../text.py:706 ../text.py:708
 msgid "Exit"
 msgstr "退出"
 
-#: ../rescue.py:372
+#: ../rescue.py:302
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
 "return to get a shell from which you can fsck and mount your partitions.  "
@@ -2221,7 +2204,7 @@ msgstr ""
 "系统中存在您选择不挂载的有问题的文件系统，按回车键进入 shell，您便可以执行 "
 "fsck 命令并挂载分区。当您退出 shell 后，系统会自动被重新引导。"
 
-#: ../rescue.py:383
+#: ../rescue.py:313
 #, python-format
 msgid ""
 "Your system has been mounted under %s.\n"
@@ -2241,7 +2224,7 @@ msgstr ""
 "\n"
 "当您退出 shell 后，系统将会自动重启。"
 
-#: ../rescue.py:464
+#: ../rescue.py:394
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -2254,11 +2237,11 @@ msgstr ""
 "\n"
 "请按 <return> 键进入 shell，当您退出 shell 时，系统将会自动被重新引导。"
 
-#: ../rescue.py:473
+#: ../rescue.py:403
 msgid "Rescue Mode"
 msgstr "救援模式"
 
-#: ../rescue.py:474
+#: ../rescue.py:404
 msgid ""
 "You don't have any Linux partitions. Press return to get a shell. The system "
 "will reboot automatically when you exit from the shell."
@@ -2266,99 +2249,107 @@ msgstr ""
 "您没有任何 Linux 分区，请按 <return> 键进入 shell。当您退出 shell 时，系统将"
 "会自动被重新引导。"
 
-#: ../rescue.py:487
+#: ../rescue.py:417
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "您的系统被挂载在 %s 目录之下。"
 
-#: ../text.py:207 ../text.py:291 ../text.py:304 tmp/exnSave.glade.h:6
+#: ../text.py:206 ../text.py:290 ../text.py:303 tmp/exnSave.glade.h:7
 msgid "Save"
 msgstr "保存"
 
-#: ../text.py:210
+#: ../text.py:209
 msgid "Save to local disk"
 msgstr "保存到本地磁盘"
 
-#: ../text.py:211
+#: ../text.py:210
 #, python-format
 msgid "Send to bugzilla (%s)"
 msgstr "发送到 bugzilla（%s）"
 
-#: ../text.py:212
+#: ../text.py:211
 msgid "Send to remote server (scp)"
 msgstr "发送到远程服务器（scp）"
 
-#: ../text.py:226 ../text.py:239
+#: ../text.py:225 ../text.py:238
 msgid "User name"
 msgstr "用户名"
 
-#: ../text.py:228 ../text.py:241
+#: ../text.py:227 ../text.py:240
 msgid "Password"
 msgstr "密码"
 
-#: ../text.py:230
+#: ../text.py:229
 msgid "Bug Description"
 msgstr "Bug 描述"
 
-#: ../text.py:243
+#: ../text.py:242
 msgid "Host (host:port)"
 msgstr "主机（主机:端口）"
 
-#: ../text.py:245
+#: ../text.py:244
 msgid "Destination file"
 msgstr "目的地文件"
 
-#: ../text.py:329
+#: ../text.py:323
 msgid "Passphrase for encrypted device"
 msgstr "加密设备的密码短语"
 
-#: ../text.py:347 tmp/lukspassphrase.glade.h:7
-msgid "Use this passphrase for all new encrypted devices"
-msgstr "所有新的加密设备都使用这个密码短语"
+#: ../text.py:336
+msgid "Also add this passphrase to all existing encrypted devices"
+msgstr "为所有当前加密的设备添加这个密码短语"
 
-#: ../text.py:378
+#: ../text.py:367
 #, python-format
 msgid "The passphrase must be at least %d characters long."
 msgstr "密码短语长度至少应有 %d 个字符。"
 
-#: ../text.py:407 tmp/lukspassphrase.glade.h:5
+#: ../text.py:397 tmp/lukspassphrase.glade.h:6
 msgid "Passphrase"
 msgstr "密码"
 
-#: ../text.py:415 tmp/lukspassphrase.glade.h:6
+#: ../text.py:405 tmp/lukspassphrase.glade.h:7
 msgid "This is a global passphrase"
 msgstr "这是一个全局密码"
 
-#: ../text.py:481 ../text.py:485
+#: ../text.py:471 ../text.py:475
 msgid "Repository editing is not available in text mode."
 msgstr "无法在文本模式中进行库编辑。"
 
-#: ../text.py:523
+#: ../text.py:513
 #, python-format
 msgid "Please enter your %(instkey)s"
 msgstr "请输入您的%(instkey)s"
 
-#: ../text.py:540 tmp/instkey.glade.h:6
+#: ../text.py:530 tmp/instkey.glade.h:6
 #, no-c-format, python-format
 msgid "Skip entering %(instkey)s"
 msgstr "跳过输入 %(instkey)s"
 
-#: ../text.py:616 ../loader/lang.c:63 ../loader/loader.c:212
+#: ../text.py:606 ../loader/lang.c:63 ../loader/loader.c:212
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "欢迎为 %s 进入 %s"
 
-#: ../text.py:618
+#: ../text.py:608
 #, python-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
 
-#: ../text.py:620
+#: ../text.py:610
 msgid ""
 "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
 "screen"
 msgstr "<Tab>/<Alt-Tab> 元素间切换   |  <Space> 选择   |  <F12> 下一屏幕"
 
+#: ../text.py:732
+msgid "Cancelled"
+msgstr "已取消"
+
+#: ../text.py:733
+msgid "I can't go to the previous step from here. You will have to try again."
+msgstr "无法从这里返回到上一步，您只能重试。"
+
 #: ../upgrade.py:91 ../upgrade.py:112
 msgid "Proceed with upgrade?"
 msgstr "继续升级吗？"
@@ -2469,52 +2460,52 @@ msgstr "无效目录"
 msgid "%s not found"
 msgstr "没有发现 %s"
 
-#: ../vnc.py:148
+#: ../vnc.py:152
 #, python-format
 msgid "%s %s installation on host %s"
 msgstr "%s %s 安装在主机 %s 上"
 
-#: ../vnc.py:150
+#: ../vnc.py:154
 #, python-format
 msgid "%s %s installation"
 msgstr "%s %s 的安装"
 
-#: ../vnc.py:177
+#: ../vnc.py:181
 #, python-format
 msgid "Attempting to connect to vnc client on host %s..."
 msgstr "试图在主机 %s 上连接 vnc..."
 
-#: ../vnc.py:191
+#: ../vnc.py:195
 msgid "Connected!"
 msgstr "已连接！"
 
-#: ../vnc.py:194
+#: ../vnc.py:198
 msgid "Will try to connect again in 15 seconds..."
 msgstr "将在15秒后试图重新连接..."
 
-#: ../vnc.py:200
+#: ../vnc.py:204
 #, python-format
 msgid "Giving up attempting to connect after %d tries!\n"
 msgstr "尝试连接 %d 次后放弃！\n"
 
-#: ../vnc.py:209
+#: ../vnc.py:213
 #, python-format
 msgid "Please manually connect your vnc client to %s to begin the install."
 msgstr "请手工把您的 vnc 客户连接到 %s 来开始安装。"
 
-#: ../vnc.py:211
+#: ../vnc.py:215
 msgid "Please manually connect your vnc client to begin the install."
 msgstr "请手动连接您的 vnc 客户来开始安装。"
 
-#: ../vnc.py:214
+#: ../vnc.py:218
 msgid "Starting VNC..."
 msgstr "启动 VNC..."
 
-#: ../vnc.py:239
+#: ../vnc.py:243
 msgid "The VNC server is now running."
 msgstr "VNC 服务器现正运行。"
 
-#: ../vnc.py:252
+#: ../vnc.py:256
 msgid ""
 "\n"
 "\n"
@@ -2532,23 +2523,23 @@ msgstr ""
 " vncviewer 失败时使用。\n"
 "\n"
 
-#: ../vnc.py:257
+#: ../vnc.py:261
 msgid ""
 "\n"
 "\n"
 "WARNING!!! VNC server running with NO PASSWORD!\n"
-"You can use the self.password=<password> boot option\n"
+"You can use the vncpassword=<password> boot option\n"
 "if you would like to secure the server.\n"
 "\n"
 msgstr ""
 "\n"
 "\n"
 "警告！！！VNC 服务器在没有密码的情况下运行！\n"
-"您可以使用 self.password=<password> 引导选项\n"
+"您可以使用 vncpassword=<password> 引导选项\n"
 "来保证服务器的安全。\n"
 "\n"
 
-#: ../vnc.py:261
+#: ../vnc.py:265
 msgid ""
 "\n"
 "\n"
@@ -2560,7 +2551,7 @@ msgstr ""
 "您选择执行 vnc 时使用密码。\n"
 "\n"
 
-#: ../vnc.py:263
+#: ../vnc.py:267
 msgid ""
 "\n"
 "\n"
@@ -2572,50 +2563,50 @@ msgstr ""
 "未知错误，中止。\n"
 "\n"
 
-#: ../vnc.py:285 ../vnc.py:378
+#: ../vnc.py:289 ../vnc.py:382
 msgid "VNC Configuration"
 msgstr "VNC 配置"
 
-#: ../vnc.py:288 ../vnc.py:382
+#: ../vnc.py:292 ../vnc.py:386
 msgid "No password"
 msgstr "无密码"
 
-#: ../vnc.py:290 ../vnc.py:385
+#: ../vnc.py:294 ../vnc.py:389
 msgid ""
 "A password will prevent unauthorized listeners connecting and monitoring "
 "your installation progress.  Please enter a password to be used for the "
 "installation"
 msgstr "密码能防止未授权监听者连接和监控您的安装进程。请为此次安装输入一个密码"
 
-#: ../vnc.py:298 ../vnc.py:393 ../textw/userauth_text.py:47
+#: ../vnc.py:302 ../vnc.py:397 ../textw/userauth_text.py:47
 msgid "Password:"
 msgstr "密码："
 
-#: ../vnc.py:299 ../vnc.py:394 ../textw/userauth_text.py:49
+#: ../vnc.py:303 ../vnc.py:398 ../textw/userauth_text.py:49
 msgid "Password (confirm):"
 msgstr "密码（确认）："
 
-#: ../vnc.py:317 ../vnc.py:416 ../textw/userauth_text.py:70
+#: ../vnc.py:321 ../vnc.py:420 ../textw/userauth_text.py:70
 msgid "Password Mismatch"
 msgstr "密码不匹配"
 
-#: ../vnc.py:318 ../vnc.py:417 ../textw/userauth_text.py:71
+#: ../vnc.py:322 ../vnc.py:421 ../textw/userauth_text.py:71
 msgid "The passwords you entered were different. Please try again."
 msgstr "输入的密码不匹配，请重新输入。"
 
-#: ../vnc.py:323 ../vnc.py:422 ../textw/userauth_text.py:66
+#: ../vnc.py:327 ../vnc.py:426 ../textw/userauth_text.py:66
 msgid "Password Length"
 msgstr "密码长度"
 
-#: ../vnc.py:324 ../vnc.py:423
+#: ../vnc.py:328 ../vnc.py:427
 msgid "The password must be at least six characters long."
 msgstr "密码至少应包含六个字符。"
 
-#: ../vnc.py:346
+#: ../vnc.py:350
 msgid "Unable to Start X"
 msgstr "无法启动 X"
 
-#: ../vnc.py:348
+#: ../vnc.py:352
 msgid ""
 "X was unable to start on your machine.  Would you like to start VNC to "
 "connect to this computer from another computer and perform a graphical "
@@ -2624,11 +2615,11 @@ msgstr ""
 "X 无法在您的机器上运行。您打算从另一台计算机上运行 VNC 连接到此计算机以执行图"
 "形化安装，还是继续进行文本模式安装？"
 
-#: ../vnc.py:367 ../vnc.py:370
+#: ../vnc.py:371 ../vnc.py:374
 msgid "Use text mode"
 msgstr "使用文本模式"
 
-#: ../vnc.py:368
+#: ../vnc.py:372
 msgid "Start VNC"
 msgstr "启动 VNC"
 
@@ -2652,33 +2643,37 @@ msgstr "%s 字节"
 msgid "%s Bytes"
 msgstr "%s 字节"
 
-#: ../yuminstall.py:123 ../yuminstall.py:213
+#: ../yuminstall.py:126
 msgid "Processing"
 msgstr "正在处理"
 
-#: ../yuminstall.py:124
+#: ../yuminstall.py:127
 msgid "Preparing transaction from installation source..."
 msgstr "正在处理安装文件..."
 
-#: ../yuminstall.py:155
+#: ../yuminstall.py:158
 #, python-format
 msgid "<b>Installing %s</b> (%s)\n"
 msgstr "<b>安装%s</b> (%s)\n"
 
-#: ../yuminstall.py:202
+#: ../yuminstall.py:209
 #, python-format
 msgid "%s of %s packages completed"
 msgstr "%s of %s 软件包安装完成"
 
-#: ../yuminstall.py:214
-msgid "Finishing upgrade process..."
-msgstr "完成升级过程......"
+#: ../yuminstall.py:219
+msgid "Finishing upgrade"
+msgstr "完成升级"
 
-#: ../yuminstall.py:308 ../iw/task_gui.py:275
+#: ../yuminstall.py:220
+msgid "Finishing upgrade process.  This may take a little while..."
+msgstr "正在完成升级过程，可能会花几分钟时间..."
+
+#: ../yuminstall.py:290 ../iw/task_gui.py:283
 msgid "Error Setting Up Repository"
 msgstr "设置存储库时出错"
 
-#: ../yuminstall.py:309 ../iw/task_gui.py:276
+#: ../yuminstall.py:291 ../iw/task_gui.py:284
 #, python-format
 msgid ""
 "The following error occurred while setting up the installation repository:\n"
@@ -2693,42 +2688,42 @@ msgstr ""
 "\n"
 "请为安装 %s 提供正确的信息。"
 
-#: ../yuminstall.py:366
+#: ../yuminstall.py:348
 msgid "Change Disc"
 msgstr "更换光盘"
 
-#: ../yuminstall.py:367
+#: ../yuminstall.py:349
 #, python-format
 msgid "Please insert %s disc %d to continue."
 msgstr "请插入 %s 光盘 %d 以继续。"
 
-#: ../yuminstall.py:378
+#: ../yuminstall.py:360
 msgid "Wrong Disc"
 msgstr "光盘不对"
 
-#: ../yuminstall.py:379
+#: ../yuminstall.py:361
 #, python-format
 msgid "That's not the correct %s disc."
 msgstr "那不是正确的 %s 光盘。"
 
-#: ../yuminstall.py:385
+#: ../yuminstall.py:367
 msgid "Unable to access the disc."
 msgstr "无法读取光盘。"
 
-#: ../yuminstall.py:533
+#: ../yuminstall.py:515
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr "存储库 %r 在配置中没有名称，请使用 id"
 
-#: ../yuminstall.py:651 ../yuminstall.py:653
+#: ../yuminstall.py:634 ../yuminstall.py:636
 msgid "Re_boot"
 msgstr "重新引导(_b)"
 
-#: ../yuminstall.py:651
+#: ../yuminstall.py:634
 msgid "_Eject"
 msgstr "弹出光盘（_E）"
 
-#: ../yuminstall.py:660
+#: ../yuminstall.py:643
 #, python-format
 msgid ""
 "The file %s cannot be opened.  This is due to a missing file, a corrupt "
@@ -2744,60 +2739,60 @@ msgstr ""
 "您如果现在退出，您的系统会不稳定需要重新安装。\n"
 "\n"
 
-#: ../yuminstall.py:700
+#: ../yuminstall.py:683
 msgid "Retrying"
 msgstr "重试中"
 
-#: ../yuminstall.py:700
+#: ../yuminstall.py:683
 msgid "Retrying download..."
 msgstr "重试下载..."
 
-#: ../yuminstall.py:772
+#: ../yuminstall.py:755
 #, python-format
 msgid "There was an error running your transaction for the following reason: %s\n"
 msgstr "在执行处理时出现错误，原因如下：%s\n"
 
-#: ../yuminstall.py:807 ../yuminstall.py:808
+#: ../yuminstall.py:790 ../yuminstall.py:791
 msgid "file conflicts"
 msgstr "文件冲突"
 
-#: ../yuminstall.py:809
+#: ../yuminstall.py:792
 msgid "older package(s)"
 msgstr "旧的软件包"
 
-#: ../yuminstall.py:810
+#: ../yuminstall.py:793
 msgid "insufficient disk space"
 msgstr "磁盘空间不足"
 
-#: ../yuminstall.py:811
+#: ../yuminstall.py:794
 msgid "insufficient disk inodes"
 msgstr "不足的磁盘节点"
 
-#: ../yuminstall.py:812
+#: ../yuminstall.py:795
 msgid "package conflicts"
 msgstr "软件包冲突"
 
-#: ../yuminstall.py:813
+#: ../yuminstall.py:796
 msgid "package already installed"
 msgstr "软件包已安装"
 
-#: ../yuminstall.py:814
+#: ../yuminstall.py:797
 msgid "required package"
 msgstr "需要的软件包"
 
-#: ../yuminstall.py:815
+#: ../yuminstall.py:798
 msgid "package for incorrect arch"
 msgstr "与硬件体系结构不兼容的软件包"
 
-#: ../yuminstall.py:816
+#: ../yuminstall.py:799
 msgid "package for incorrect os"
 msgstr "与操作系统不兼容的软件包"
 
-#: ../yuminstall.py:830
+#: ../yuminstall.py:813
 msgid "You need more space on the following file systems:\n"
 msgstr "您在以下文件系统中需要更多空间:\n"
 
-#: ../yuminstall.py:843
+#: ../yuminstall.py:826
 #, python-format
 msgid ""
 "There were file conflicts when checking the packages to be installed:\n"
@@ -2806,32 +2801,42 @@ msgstr ""
 "在检查要安装的软件包时有文件冲突：\n"
 "%s\n"
 
-#: ../yuminstall.py:846
+#: ../yuminstall.py:829
 #, python-format
 msgid ""
 "There was an error running your transaction for the following reason(s): %"
 "s.\n"
 msgstr "在执行处理时出现错误，原因如下：%s\n"
 
-#: ../yuminstall.py:856 ../yuminstall.py:861
+#: ../yuminstall.py:839 ../yuminstall.py:844
 msgid "Error Running Transaction"
 msgstr "执行处理时出错"
 
-#: ../yuminstall.py:1021
+#: ../yuminstall.py:992
+msgid ""
+"Unable to read group information from repositories.  This is a problem with "
+"the generation of your install tree."
+msgstr "不能从仓库里读取组信息。这是您安装树的问题。"
+
+#: ../yuminstall.py:1030
 msgid "Retrieving installation information..."
 msgstr "获取安装信息..."
 
-#: ../yuminstall.py:1023
+#: ../yuminstall.py:1032
 #, python-format
 msgid "Retrieving installation information for %s..."
 msgstr "重新获取%s安装信息..."
 
-#: ../yuminstall.py:1041 ../textw/bootloader_text.py:277
+#: ../yuminstall.py:1034
+msgid "Installation Progress"
+msgstr "安装过程"
+
+#: ../yuminstall.py:1047 ../textw/bootloader_text.py:277
 #: ../textw/constants_text.py:64 ../textw/partition_text.py:1429
 msgid "Edit"
 msgstr "编辑"
 
-#: ../yuminstall.py:1053 ../yuminstall.py:1300
+#: ../yuminstall.py:1060 ../yuminstall.py:1289
 #, python-format
 msgid ""
 "Unable to read package metadata. This may be due to a missing repodata "
@@ -2845,17 +2850,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../yuminstall.py:1094
-msgid ""
-"Unable to read group information from repositories.  This is a problem with "
-"the generation of your install tree."
-msgstr "不能从仓库里读取组信息。这是您安装树的问题。"
-
-#: ../yuminstall.py:1127 ../iw/GroupSelector.py:505
+#: ../yuminstall.py:1111 ../iw/GroupSelector.py:503
 msgid "Uncategorized"
 msgstr "未分类的"
 
-#: ../yuminstall.py:1323
+#: ../yuminstall.py:1312
 #, python-format
 msgid ""
 "Your selected packages require %d MB of free space for installation, but you "
@@ -2865,15 +2864,15 @@ msgstr ""
 "您选择的软件包共需要 %d MB 大小的磁盘安装空间，但是您没有足够的磁盘空间。您可"
 "以改变选择或者退出安装。"
 
-#: ../yuminstall.py:1342
+#: ../yuminstall.py:1331
 msgid "Reboot?"
 msgstr "重新引导？"
 
-#: ../yuminstall.py:1343
+#: ../yuminstall.py:1332
 msgid "The system will be rebooted now."
 msgstr "系统现在将会被重新引导。"
 
-#: ../yuminstall.py:1505
+#: ../yuminstall.py:1494
 #, python-format
 msgid ""
 "You appear to be upgrading from a system which is too old to upgrade to this "
@@ -2882,7 +2881,7 @@ msgstr ""
 "您所升级的系统版本似乎太老，它不适合于升级到该版本的 %s。您肯定要继续升级进程"
 "吗？"
 
-#: ../yuminstall.py:1532
+#: ../yuminstall.py:1521
 #, python-format
 msgid ""
 "The arch of the release of %s you are upgrading to appears to be %s which "
@@ -2892,39 +2891,35 @@ msgstr ""
 "您所升级的发行版本 %s 构架显示为 %s，这与您之前安装的构架 %s 不匹配。升级将无"
 "法成功，您确定要继续升级过程吗？"
 
-#: ../yuminstall.py:1579
+#: ../yuminstall.py:1571
 msgid "Post Upgrade"
 msgstr "升级后"
 
-#: ../yuminstall.py:1580
+#: ../yuminstall.py:1572
 msgid "Performing post upgrade configuration..."
 msgstr "正在执行升级后配置..."
 
-#: ../yuminstall.py:1582
+#: ../yuminstall.py:1574
 msgid "Post Install"
 msgstr "安装后"
 
-#: ../yuminstall.py:1583
+#: ../yuminstall.py:1575
 msgid "Performing post install configuration..."
 msgstr "正在执行安装后配置..."
 
-#: ../yuminstall.py:1788
-msgid "Installation Progress"
-msgstr "安装过程"
-
-#: ../yuminstall.py:1823
+#: ../yuminstall.py:1799
 msgid "Install Starting"
 msgstr "安装开始"
 
-#: ../yuminstall.py:1824
+#: ../yuminstall.py:1800
 msgid "Starting install process.  This may take several minutes..."
 msgstr "正在开启安装进程，可能会花几分钟时间..."
 
-#: ../yuminstall.py:1862
+#: ../yuminstall.py:1838
 msgid "Dependency Check"
 msgstr "依赖关系检查"
 
-#: ../yuminstall.py:1863
+#: ../yuminstall.py:1839
 msgid "Checking dependencies in packages selected for installation..."
 msgstr "在所选定要安装的软件包中检查依赖关系..."
 
@@ -2940,6 +2935,21 @@ msgstr "您没有指定全局端口号或号码无效。"
 msgid "You have not specified a FCP LUN or the number is invalid."
 msgstr "您没有指定 FCP LUN 或号码无效。"
 
+#: ../iw/GroupSelector.py:165
+#, python-format
+msgid "Packages in %s"
+msgstr "%s 中的软件包"
+
+#: ../iw/GroupSelector.py:442
+#, python-format
+msgid "Optional packages selected: %d of %d"
+msgstr "选择的可选软件包：%d 的 %d"
+
+#: ../iw/GroupSelector.py:443
+#, python-format
+msgid "<i>%s</i>"
+msgstr "<i>%s</i>"
+
 #: ../iw/account_gui.py:52
 msgid "Root _Password:"
 msgstr "根密码（_P）："
@@ -2996,7 +3006,7 @@ msgid ""
 "specific filesystems can be resized."
 msgstr "没有可以重新定义大小的分区。只有带特定文件系统的物理分区可重新定义大小。"
 
-#: ../iw/autopart_type.py:180
+#: ../iw/autopart_type.py:183
 msgid "Do you really want to boot from a disk which is not used for installation?"
 msgstr "您确实希望从不进行安装的磁盘中引导吗？"
 
@@ -3008,27 +3018,50 @@ msgstr "无效启动器名称："
 msgid "You must provide an initiator name."
 msgstr "您必须提供一个初始名。"
 
-#: ../iw/autopart_type.py:284
+#: ../iw/autopart_type.py:284 ../iw/autopart_type.py:288
+#: ../iw/autopart_type.py:294 ../iw/autopart_type.py:298
+#: ../textw/partition_text.py:1711 ../textw/partition_text.py:1714
+#: ../textw/partition_text.py:1719 ../textw/partition_text.py:1723
+msgid "Missing value"
+msgstr "缺少数值"
+
+#: ../iw/autopart_type.py:285
+msgid "CHAP username is required if CHAP password is defined."
+msgstr "如果定义 CHAP 密码，则需要 CHAP 用户名。"
+
+#: ../iw/autopart_type.py:289
+msgid "CHAP password is required if CHAP username is defined."
+msgstr "如果定义 CHAP 用户名，则需要 CHAP 密码。"
+
+#: ../iw/autopart_type.py:295
+msgid "Reverse CHAP username is required if reverse CHAP password is defined."
+msgstr "如果定义逆向 CHAP 密码，则需要逆向 CHAP 用户名。"
+
+#: ../iw/autopart_type.py:299
+msgid "Reverse CHAP password is required if reverse CHAP username is defined."
+msgstr "如果定义逆向 CHAP 用户名，则需要逆向 CHAP 密码。"
+
+#: ../iw/autopart_type.py:317
 msgid "Error with Data"
 msgstr "数据错误"
 
-#: ../iw/autopart_type.py:405 ../textw/partition_text.py:1518
+#: ../iw/autopart_type.py:440 ../textw/partition_text.py:1518
 msgid "Remove all partitions on selected drives and create default layout"
 msgstr "在选定磁盘上删除所有分区并创建默认分区结构"
 
-#: ../iw/autopart_type.py:406 ../textw/partition_text.py:1519
+#: ../iw/autopart_type.py:441 ../textw/partition_text.py:1519
 msgid "Remove Linux partitions on selected drives and create default layout"
 msgstr "在选定驱动上删除 linux 分区并创建默认的分区结构"
 
-#: ../iw/autopart_type.py:407
+#: ../iw/autopart_type.py:442
 msgid "Resize existing partition and create default layout in free space"
 msgstr "重新定义现有分区大小并在剩余空间中创建默认布局"
 
-#: ../iw/autopart_type.py:408 ../textw/partition_text.py:1520
+#: ../iw/autopart_type.py:443 ../textw/partition_text.py:1520
 msgid "Use free space on selected drives and create default layout"
 msgstr "使用选定驱动器中的空余空间并创建默认的分区结构"
 
-#: ../iw/autopart_type.py:409 ../textw/partition_text.py:1521
+#: ../iw/autopart_type.py:444 ../textw/partition_text.py:1521
 msgid "Create custom layout"
 msgstr "建立自定义的分区结构"
 
@@ -3166,23 +3199,6 @@ msgstr "下列安装的系统将会被升级："
 msgid "Unknown Linux system"
 msgstr "未知的 Linux 系统"
 
-#: ../iw/GroupSelector.py:165
-#, python-format
-msgid "Packages in %s"
-msgstr "%s 中的软件包"
-
-#: ../iw/GroupSelector.py:442
-#, python-format
-msgid "%d of %d optional package selected"
-msgid_plural "%d of %d optional packages selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../iw/GroupSelector.py:445
-#, python-format
-msgid "<i>%s</i>"
-msgstr "<i>%s</i>"
-
 #: ../iw/language_gui.py:33 ../textw/language_text.py:46
 msgid "Language Selection"
 msgstr "语言选择"
@@ -3194,7 +3210,7 @@ msgstr "您在安装过程中想使用何种语言？"
 #: ../iw/lvm_dialog_gui.py:124 ../iw/lvm_dialog_gui.py:171
 #: ../iw/lvm_dialog_gui.py:182 ../iw/lvm_dialog_gui.py:222
 #: ../iw/lvm_dialog_gui.py:296 ../iw/lvm_dialog_gui.py:626
-#: ../iw/lvm_dialog_gui.py:723 ../iw/lvm_dialog_gui.py:941
+#: ../iw/lvm_dialog_gui.py:700 ../iw/lvm_dialog_gui.py:918
 #: ../textw/partition_text.py:1276 ../textw/partition_text.py:1295
 msgid "Not enough space"
 msgstr "空间不够"
@@ -3226,7 +3242,6 @@ msgstr ""
 "这项改变会立即生效。"
 
 #: ../iw/lvm_dialog_gui.py:144 ../iw/lvm_dialog_gui.py:204
-#: ../iw/network_gui.py:150 ../iw/network_gui.py:154 ../iw/network_gui.py:174
 msgid "C_ontinue"
 msgstr "继续(_o)"
 
@@ -3289,25 +3304,25 @@ msgstr "编辑逻辑卷：%s"
 msgid "Edit Logical Volume"
 msgstr "编辑逻辑卷"
 
-#: ../iw/lvm_dialog_gui.py:395 ../iw/partition_dialog_gui.py:346
-#: ../iw/raid_dialog_gui.py:351
+#: ../iw/lvm_dialog_gui.py:395 ../iw/partition_dialog_gui.py:300
+#: ../iw/raid_dialog_gui.py:305
 msgid "_Mount Point:"
 msgstr "挂载点(_M)："
 
-#: ../iw/lvm_dialog_gui.py:403 ../iw/raid_dialog_gui.py:364
+#: ../iw/lvm_dialog_gui.py:403 ../iw/raid_dialog_gui.py:318
 msgid "_File System Type:"
 msgstr "文件系统类型(_F)："
 
-#: ../iw/lvm_dialog_gui.py:413 ../iw/raid_dialog_gui.py:374
+#: ../iw/lvm_dialog_gui.py:413 ../iw/raid_dialog_gui.py:328
 msgid "Original File System Type:"
 msgstr "原始文件系统类型："
 
-#: ../iw/lvm_dialog_gui.py:418 ../iw/raid_dialog_gui.py:379
+#: ../iw/lvm_dialog_gui.py:418 ../iw/raid_dialog_gui.py:333
 msgid "Unknown"
 msgstr "未知"
 
-#: ../iw/lvm_dialog_gui.py:424 ../iw/partition_dialog_gui.py:396
-#: ../iw/raid_dialog_gui.py:385
+#: ../iw/lvm_dialog_gui.py:424 ../iw/partition_dialog_gui.py:350
+#: ../iw/raid_dialog_gui.py:339
 msgid "Original File System Label:"
 msgstr "原始文件系统标签："
 
@@ -3319,11 +3334,11 @@ msgstr "逻辑卷名称(_L)："
 msgid "Logical Volume Name:"
 msgstr "逻辑卷名称："
 
-#: ../iw/lvm_dialog_gui.py:449 ../iw/partition_dialog_gui.py:408
+#: ../iw/lvm_dialog_gui.py:449 ../iw/partition_dialog_gui.py:362
 msgid "_Size (MB):"
 msgstr "大小(MB)(_S)："
 
-#: ../iw/lvm_dialog_gui.py:455 ../iw/partition_dialog_gui.py:425
+#: ../iw/lvm_dialog_gui.py:455 ../iw/partition_dialog_gui.py:379
 #: ../textw/partition_text.py:321 ../textw/partition_text.py:398
 #: ../textw/partition_text.py:481 ../textw/partition_text.py:589
 msgid "Size (MB):"
@@ -3334,8 +3349,8 @@ msgstr "大小(MB)："
 msgid "(Max size is %s MB)"
 msgstr "(最大大小是 %s MB)"
 
-#: ../iw/lvm_dialog_gui.py:479 ../iw/partition_dialog_gui.py:510
-#: ../iw/partition_ui_helpers_gui.py:301 ../iw/raid_dialog_gui.py:359
+#: ../iw/lvm_dialog_gui.py:479 ../iw/partition_dialog_gui.py:464
+#: ../iw/partition_ui_helpers_gui.py:301 ../iw/raid_dialog_gui.py:313
 msgid "_Encrypt"
 msgstr "加密（_E)"
 
@@ -3379,15 +3394,15 @@ msgstr ""
 "目前设定的磁盘空间（%10.2f MB）大于逻辑卷磁盘空间的最大值（%10.2f MB）。要提"
 "高上限，您可以从未分区的磁盘空间中生成更多物理逻辑卷，并将其加入该逻辑卷组。"
 
-#: ../iw/lvm_dialog_gui.py:700 ../iw/partition_dialog_gui.py:211
-#: ../iw/partition_dialog_gui.py:223 ../iw/partition_dialog_gui.py:292
-#: ../iw/raid_dialog_gui.py:278 ../textw/partition_text.py:889
+#: ../iw/lvm_dialog_gui.py:677 ../iw/partition_dialog_gui.py:188
+#: ../iw/partition_dialog_gui.py:200 ../iw/partition_dialog_gui.py:246
+#: ../iw/raid_dialog_gui.py:232 ../textw/partition_text.py:889
 #: ../textw/partition_text.py:910 ../textw/partition_text.py:1083
 #: ../textw/partition_text.py:1314
 msgid "Error With Request"
 msgstr "申请出错"
 
-#: ../iw/lvm_dialog_gui.py:724 ../iw/lvm_dialog_gui.py:942
+#: ../iw/lvm_dialog_gui.py:701 ../iw/lvm_dialog_gui.py:919
 #, python-format
 msgid ""
 "The logical volumes you have configured require %d MB, but the volume group "
@@ -3395,20 +3410,20 @@ msgid ""
 "logical volume(s) smaller."
 msgstr "您配置的逻辑卷需要 %dMB，但是该卷组只有 %d MB。请扩大该卷组，或缩小该逻辑卷。"
 
-#: ../iw/lvm_dialog_gui.py:782
+#: ../iw/lvm_dialog_gui.py:759
 msgid "No free slots"
 msgstr "无空闲插槽"
 
-#: ../iw/lvm_dialog_gui.py:783
+#: ../iw/lvm_dialog_gui.py:760
 #, python-format
 msgid "You cannot create more than %s logical volumes per volume group."
 msgstr "在每个卷组中，您不能创建多于 %s 个逻辑卷。"
 
-#: ../iw/lvm_dialog_gui.py:789
+#: ../iw/lvm_dialog_gui.py:766
 msgid "No free space"
 msgstr "无空闲空间"
 
-#: ../iw/lvm_dialog_gui.py:790
+#: ../iw/lvm_dialog_gui.py:767
 msgid ""
 "There is no room left in the volume group to create new logical volumes. To "
 "add a logical volume you must reduce the size of one or more of the "
@@ -3417,29 +3432,29 @@ msgstr ""
 "卷组中没有创建新逻辑卷的空间。要添加逻辑卷，您需要缩小一个或多个现存逻辑卷的"
 "大小。"
 
-#: ../iw/lvm_dialog_gui.py:818
+#: ../iw/lvm_dialog_gui.py:795
 #, python-format
 msgid "Are you sure you want to delete the logical volume \"%s\"?"
 msgstr "是否确定要删除该逻辑卷\"%s\"?"
 
-#: ../iw/lvm_dialog_gui.py:953
+#: ../iw/lvm_dialog_gui.py:930
 msgid "Invalid Volume Group Name"
 msgstr "卷组名称无效"
 
-#: ../iw/lvm_dialog_gui.py:964
+#: ../iw/lvm_dialog_gui.py:941
 msgid "Name in use"
 msgstr "名称已被使用"
 
-#: ../iw/lvm_dialog_gui.py:965
+#: ../iw/lvm_dialog_gui.py:942
 #, python-format
 msgid "The volume group name \"%s\" is already in use. Please pick another."
 msgstr "卷组名称\"%s\" 已被使用，请另选一个。"
 
-#: ../iw/lvm_dialog_gui.py:1008
+#: ../iw/lvm_dialog_gui.py:985
 msgid "Not enough physical volumes"
 msgstr "没有足够的物理卷"
 
-#: ../iw/lvm_dialog_gui.py:1009
+#: ../iw/lvm_dialog_gui.py:986
 msgid ""
 "At least one unused physical volume partition is needed to create an LVM "
 "Volume Group.\n"
@@ -3451,75 +3466,75 @@ msgstr ""
 "\n"
 "首先创建类型为“物理卷(LVM)”的分区或 RAID 阵列，然后再选择 \"LVM\" 选项。"
 
-#: ../iw/lvm_dialog_gui.py:1020
+#: ../iw/lvm_dialog_gui.py:997
 msgid "Make LVM Volume Group"
 msgstr "制作 LVM 卷组"
 
-#: ../iw/lvm_dialog_gui.py:1023
+#: ../iw/lvm_dialog_gui.py:1000
 #, python-format
 msgid "Edit LVM Volume Group: %s"
 msgstr "编辑 LVM 卷组：%s"
 
-#: ../iw/lvm_dialog_gui.py:1025
+#: ../iw/lvm_dialog_gui.py:1002
 msgid "Edit LVM Volume Group"
 msgstr "编辑 LVM 卷组"
 
-#: ../iw/lvm_dialog_gui.py:1041
+#: ../iw/lvm_dialog_gui.py:1018
 msgid "_Volume Group Name:"
 msgstr "卷组名称(_V)："
 
-#: ../iw/lvm_dialog_gui.py:1049
+#: ../iw/lvm_dialog_gui.py:1026
 msgid "Volume Group Name:"
 msgstr "卷组名称："
 
-#: ../iw/lvm_dialog_gui.py:1057
+#: ../iw/lvm_dialog_gui.py:1034
 msgid "_Physical Extent:"
 msgstr "物理范围(_P)："
 
-#: ../iw/lvm_dialog_gui.py:1072
+#: ../iw/lvm_dialog_gui.py:1049
 msgid "Physical Volumes to _Use:"
 msgstr "要使用的物理卷(_U)："
 
-#: ../iw/lvm_dialog_gui.py:1078
+#: ../iw/lvm_dialog_gui.py:1055
 msgid "Used Space:"
 msgstr "已用空间："
 
-#: ../iw/lvm_dialog_gui.py:1095
+#: ../iw/lvm_dialog_gui.py:1072
 msgid "Free Space:"
 msgstr "空闲空间："
 
-#: ../iw/lvm_dialog_gui.py:1113
+#: ../iw/lvm_dialog_gui.py:1090
 msgid "Total Space:"
 msgstr "总计空间："
 
-#: ../iw/lvm_dialog_gui.py:1142
+#: ../iw/lvm_dialog_gui.py:1119
 msgid "Logical Volume Name"
 msgstr "逻辑卷名称"
 
-#: ../iw/lvm_dialog_gui.py:1145 ../iw/partition_gui.py:371
+#: ../iw/lvm_dialog_gui.py:1122 ../iw/partition_gui.py:371
 #: ../iw/upgrade_swap_gui.py:142 ../textw/partition_text.py:1424
 #: ../textw/upgrade_text.py:120
 msgid "Mount Point"
 msgstr "挂载点"
 
-#: ../iw/lvm_dialog_gui.py:1148 ../iw/partition_gui.py:376
+#: ../iw/lvm_dialog_gui.py:1125 ../iw/partition_gui.py:376
 msgid "Size (MB)"
 msgstr "大小(MB)"
 
-#: ../iw/lvm_dialog_gui.py:1162 ../iw/osbootwidget.py:96
+#: ../iw/lvm_dialog_gui.py:1139 ../iw/osbootwidget.py:96
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../iw/lvm_dialog_gui.py:1165 ../iw/network_gui.py:453
-#: ../iw/osbootwidget.py:100 ../iw/partition_gui.py:1383
+#: ../iw/lvm_dialog_gui.py:1142 ../iw/osbootwidget.py:100
+#: ../iw/partition_gui.py:1383
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../iw/lvm_dialog_gui.py:1180
+#: ../iw/lvm_dialog_gui.py:1157
 msgid "_Logical Volumes"
 msgstr "逻辑卷（_L）"
 
-#: ../iw/netconfig_dialog.py:158 ../textw/netconfig_text.py:36
+#: ../iw/netconfig_dialog.py:174 ../textw/netconfig_text.py:36
 #, python-format
 msgid ""
 "An error occurred converting the value entered for \"%s\":\n"
@@ -3528,103 +3543,66 @@ msgstr ""
 "转换为\"%s\"输入的值时出错：\n"
 "%s"
 
-#: ../iw/netconfig_dialog.py:160 ../iw/netconfig_dialog.py:169
-#: ../iw/network_gui.py:149 ../iw/network_gui.py:153 ../iw/network_gui.py:157
-#: ../iw/network_gui.py:161 ../iw/network_gui.py:169 ../iw/network_gui.py:174
+#: ../iw/netconfig_dialog.py:176 ../iw/netconfig_dialog.py:185
 #: ../textw/netconfig_text.py:35 ../textw/netconfig_text.py:40
-#: ../textw/network_text.py:54 ../textw/network_text.py:59
-#: ../textw/network_text.py:65
 msgid "Error With Data"
 msgstr "数据错误"
 
-#: ../iw/netconfig_dialog.py:168 ../iw/network_gui.py:162
-#: ../textw/network_text.py:55
+#: ../iw/netconfig_dialog.py:184
 #, python-format
 msgid "A value is required for the field %s."
 msgstr "%s字段需要输入值。"
 
-#: ../iw/netconfig_dialog.py:190 ../textw/netconfig_text.py:180
+#: ../iw/netconfig_dialog.py:205
 msgid "Dynamic IP"
 msgstr "动态 IP"
 
-#: ../iw/netconfig_dialog.py:191 ../textw/netconfig_text.py:181
+#: ../iw/netconfig_dialog.py:206
 #, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "正在为 %s 发送 IP 信息请求..."
 
-#: ../iw/netconfig_dialog.py:212 ../iw/netconfig_dialog.py:215
-#: ../textw/netconfig_text.py:203 ../textw/netconfig_text.py:206
-#: ../textw/network_text.py:95 tmp/netpostconfig.glade.h:12
+#: ../iw/netconfig_dialog.py:222 ../iw/netconfig_dialog.py:225
+#: ../textw/netconfig_text.py:213 ../textw/netconfig_text.py:216
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: ../iw/netconfig_dialog.py:222 ../textw/netconfig_text.py:213
+#: ../iw/netconfig_dialog.py:232 ../textw/netconfig_text.py:223
 msgid "IPv4 CIDR prefix must be between 0 and 32."
 msgstr "IPv4 CIDR 前缀必须在0和32之间。"
 
-#: ../iw/netconfig_dialog.py:223 ../iw/netconfig_dialog.py:229
-#: ../iw/netconfig_dialog.py:237 ../iw/netconfig_dialog.py:240
-#: ../textw/netconfig_text.py:214 ../textw/netconfig_text.py:220
-#: ../textw/netconfig_text.py:228
+#: ../iw/netconfig_dialog.py:233 ../iw/netconfig_dialog.py:239
+#: ../iw/netconfig_dialog.py:247 ../iw/netconfig_dialog.py:250
+#: ../textw/netconfig_text.py:224 ../textw/netconfig_text.py:230
+#: ../textw/netconfig_text.py:238
 msgid "IPv4 Network Mask"
 msgstr "IPv4/子网掩码"
 
-#: ../iw/netconfig_dialog.py:247 ../iw/netconfig_dialog.py:250
-#: ../iw/network_gui.py:37 ../iw/network_gui.py:528
-#: ../textw/netconfig_text.py:238 ../textw/netconfig_text.py:241
+#: ../iw/netconfig_dialog.py:260 ../textw/netconfig_text.py:251
 msgid "Gateway"
 msgstr "网关"
 
-#: ../iw/netconfig_dialog.py:257 ../textw/netconfig_text.py:248
+#: ../iw/netconfig_dialog.py:270 ../textw/netconfig_text.py:261
 msgid "Nameserver"
 msgstr "名称服务器"
 
-#: ../iw/netconfig_dialog.py:267
+#: ../iw/netconfig_dialog.py:279
 msgid "Error configuring network device:"
 msgstr "配置网络界面时出错:"
 
-#: ../iw/netconfig_dialog.py:280
+#: ../iw/netconfig_dialog.py:284
 msgid "Error configuring network device"
 msgstr "配置网络界面时出错"
 
-#: ../iw/network_gui.py:37 ../iw/network_gui.py:530
-msgid "Primary DNS"
-msgstr "主 DNS"
+#: ../iw/network_gui.py:61 ../iw/network_gui.py:67
+msgid "Error with Hostname"
+msgstr "主机名错误"
 
-#: ../iw/network_gui.py:37 ../iw/network_gui.py:532
-msgid "Secondary DNS"
-msgstr "从 DNS"
+#: ../iw/network_gui.py:62
+msgid "You must enter a valid hostname for this computer."
+msgstr "您必须为这台计算机输入有效用户名。"
 
-#: ../iw/network_gui.py:38
-msgid "_Gateway"
-msgstr "网关(_G)"
-
-#: ../iw/network_gui.py:38
-msgid "_Primary DNS"
-msgstr "主 DNS(_P)"
-
-#: ../iw/network_gui.py:38
-msgid "_Secondary DNS"
-msgstr "从 DNS(_S)"
-
-#: ../iw/network_gui.py:41 ../textw/network_text.py:534
-msgid "Network Configuration"
-msgstr "网络配置"
-
-#: ../iw/network_gui.py:150
-msgid ""
-"You have not specified a hostname.  Depending on your network environment "
-"this may cause problems later."
-msgstr "您还没有指定主机名。根据您的网络环境情况，这可能会在以后导致问题。"
-
-#: ../iw/network_gui.py:154
-#, python-format
-msgid ""
-"You have not specified the field \"%s\".  Depending on your network "
-"environment this may cause problems later."
-msgstr "您还没有指定\"%s\"字段。根据您的网络环境情况，这可能会在以后导致问题。"
-
-#: ../iw/network_gui.py:158 ../textw/network_text.py:824
+#: ../iw/network_gui.py:68 ../textw/network_text.py:83
 #, python-format
 msgid ""
 "The hostname \"%s\" is not valid for the following reason:\n"
@@ -3635,110 +3613,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../iw/network_gui.py:165 ../textw/network_text.py:45
-#, python-format
-msgid "Error With %s Data"
-msgstr "%s数据错误"
-
-#: ../iw/network_gui.py:170 ../textw/network_text.py:66
-msgid "The IPv4 information you have entered is invalid."
-msgstr "您所输入的 IPv4 信息无效."
-
-#: ../iw/network_gui.py:174
-msgid ""
-"You have no active network devices.  Your system will not be able to "
-"communicate over a network by default without at least one device active."
-msgstr ""
-"您没有活跃的网络设备。至少需要一个活跃的网络设备，您的系统才能默认使用网络交"
-"换数据。"
-
-#: ../iw/network_gui.py:299 ../iw/network_gui.py:313
-msgid "Disabled"
-msgstr "禁用"
-
-#: ../iw/network_gui.py:394
-msgid "Active on Boot"
-msgstr "引导时激活"
-
-#: ../iw/network_gui.py:396 ../iw/osbootwidget.py:67
-#: ../iw/partition_gui.py:369 ../textw/bootloader_text.py:196
-#: ../textw/bootloader_text.py:262 ../textw/partition_text.py:1424
-msgid "Device"
-msgstr "设备"
-
-#: ../iw/network_gui.py:398
-msgid "IPv4/Netmask"
-msgstr "IPv4/子网掩码"
-
-#: ../iw/network_gui.py:400
-msgid "IPv6/Prefix"
-msgstr "IPv6/前缀"
-
-#: ../iw/network_gui.py:460
-msgid "Network Devices"
-msgstr "网络设备"
-
-#: ../iw/network_gui.py:471
-msgid "Set the hostname:"
-msgstr "设置主机名："
-
-#: ../iw/network_gui.py:476
-msgid "_automatically via DHCP"
-msgstr "通过 DHCP 自动配置(_a)"
-
-#: ../iw/network_gui.py:483
-msgid "_manually"
-msgstr "手工设置(_m)"
-
-#: ../iw/network_gui.py:488
-msgid "(e.g., host.domain.com)"
-msgstr "(例如：host.domain.com)"
-
-#: ../iw/network_gui.py:494
-msgid "Hostname"
-msgstr "主机名"
-
-#: ../iw/network_gui.py:537
-msgid "Miscellaneous Settings"
-msgstr "各种设置"
-
-#: ../iw/network_gui.py:626
-msgid "Edit Device "
-msgstr "编辑设备"
-
-#: ../iw/network_gui.py:630
-msgid "Unknown Ethernet Device"
-msgstr "未知以太网设备"
-
-#: ../iw/network_gui.py:636
-msgid "unknown"
-msgstr "未知"
-
-#: ../iw/network_gui.py:638
-msgid "Hardware address: "
-msgstr "硬件地址:"
-
-#: ../iw/network_gui.py:774 ../textw/network_text.py:230 ../loader/net.c:584
-msgid "Missing Protocol"
-msgstr "缺少网络协议"
-
-#: ../iw/network_gui.py:775 ../textw/network_text.py:231
-msgid "You must select at least IPv4 or IPv6 support."
-msgstr "您必须至少选择IPv4或IPv6支持."
-
-#: ../iw/network_gui.py:798 ../iw/network_gui.py:839 ../iw/network_gui.py:845
-#: ../textw/network_text.py:76 ../loader/net.c:105
-msgid "Invalid Prefix"
-msgstr "无效的前缀"
-
-#: ../iw/network_gui.py:799
-msgid "IPv4 prefix must be between 0 and 32."
-msgstr "IPv4 的前缀必须在0和32之间。"
-
-#: ../iw/network_gui.py:840 ../iw/network_gui.py:846
-msgid "IPv6 prefix must be between 0 and 128."
-msgstr "IPv6 的前缀必须在0到128之间。"
-
 #: ../iw/osbootwidget.py:51
 msgid "Boot loader operating system list"
 msgstr "引导装载程序操作系统列表"
@@ -3751,6 +3625,12 @@ msgstr "默认"
 msgid "Label"
 msgstr "标签"
 
+#: ../iw/osbootwidget.py:67 ../iw/partition_gui.py:369
+#: ../textw/bootloader_text.py:196 ../textw/bootloader_text.py:262
+#: ../textw/partition_text.py:1424
+msgid "Device"
+msgstr "设备"
+
 #: ../iw/osbootwidget.py:130
 msgid "Image"
 msgstr "映像"
@@ -3826,44 +3706,44 @@ msgstr "指定空间大小(MB)(_u)："
 msgid "Fill to maximum _allowable size"
 msgstr "使用全部可用空间(_a)"
 
-#: ../iw/partition_dialog_gui.py:212
+#: ../iw/partition_dialog_gui.py:189
 msgid "The end cylinder must be greater than the start cylinder."
 msgstr "结束柱面必须大于起始柱面。"
 
-#: ../iw/partition_dialog_gui.py:323 ../textw/partition_text.py:713
+#: ../iw/partition_dialog_gui.py:277 ../textw/partition_text.py:713
 msgid "Add Partition"
 msgstr "添加分区"
 
-#: ../iw/partition_dialog_gui.py:326
+#: ../iw/partition_dialog_gui.py:280
 #, python-format
 msgid "Edit Partition: /dev/%s"
 msgstr "编辑分区：/dev/%s"
 
-#: ../iw/partition_dialog_gui.py:328
+#: ../iw/partition_dialog_gui.py:282
 msgid "Edit Partition"
 msgstr "编辑分区"
 
-#: ../iw/partition_dialog_gui.py:355
+#: ../iw/partition_dialog_gui.py:309
 msgid "File System _Type:"
 msgstr "文件系统类型(_T)："
 
-#: ../iw/partition_dialog_gui.py:372
+#: ../iw/partition_dialog_gui.py:326
 msgid "Allowable _Drives:"
 msgstr "允许的驱动器(_D)："
 
-#: ../iw/partition_dialog_gui.py:387
+#: ../iw/partition_dialog_gui.py:341
 msgid "Drive:"
 msgstr "驱动器："
 
-#: ../iw/partition_dialog_gui.py:431
+#: ../iw/partition_dialog_gui.py:385
 msgid "_Start Cylinder:"
 msgstr "起始柱面(_S)："
 
-#: ../iw/partition_dialog_gui.py:449
+#: ../iw/partition_dialog_gui.py:403
 msgid "_End Cylinder:"
 msgstr "结束柱面(_E)："
 
-#: ../iw/partition_dialog_gui.py:497
+#: ../iw/partition_dialog_gui.py:451
 msgid "Force to be a _primary partition"
 msgstr "强制为主分区(_p)"
 
@@ -4130,7 +4010,7 @@ msgstr "用 Disk Druid 手工分区(_D)"
 msgid "Installing Packages"
 msgstr "安装软件包"
 
-#: ../iw/raid_dialog_gui.py:318
+#: ../iw/raid_dialog_gui.py:272
 msgid ""
 "At least two unused software RAID partitions are needed to create a RAID "
 "device.\n"
@@ -4142,41 +4022,41 @@ msgstr ""
 "\n"
 "首先，至少创建两个类型为“软件 RAID”的分区，然后再选择“RAID”选项。"
 
-#: ../iw/raid_dialog_gui.py:332 ../iw/raid_dialog_gui.py:765
+#: ../iw/raid_dialog_gui.py:286 ../iw/raid_dialog_gui.py:719
 #: ../textw/partition_text.py:945
 msgid "Make RAID Device"
 msgstr "创建 RAID 设备"
 
-#: ../iw/raid_dialog_gui.py:335
+#: ../iw/raid_dialog_gui.py:289
 #, python-format
 msgid "Edit RAID Device: /dev/md%s"
 msgstr "编辑 RAID 设备：/dev/md%s"
 
-#: ../iw/raid_dialog_gui.py:337 ../textw/partition_text.py:943
+#: ../iw/raid_dialog_gui.py:291 ../textw/partition_text.py:943
 msgid "Edit RAID Device"
 msgstr "编辑 RAID 设备"
 
-#: ../iw/raid_dialog_gui.py:393
+#: ../iw/raid_dialog_gui.py:347
 msgid "RAID _Device:"
 msgstr "RAID 设备(_D)："
 
-#: ../iw/raid_dialog_gui.py:411
+#: ../iw/raid_dialog_gui.py:365
 msgid "RAID _Level:"
 msgstr "RAID 级别(_L)："
 
-#: ../iw/raid_dialog_gui.py:452
+#: ../iw/raid_dialog_gui.py:406
 msgid "_RAID Members:"
 msgstr "RAID 成员(_R)："
 
-#: ../iw/raid_dialog_gui.py:469
+#: ../iw/raid_dialog_gui.py:423
 msgid "Number of _spares:"
 msgstr "备件数量(_s)："
 
-#: ../iw/raid_dialog_gui.py:479
+#: ../iw/raid_dialog_gui.py:433
 msgid "_Format partition?"
 msgstr "格式化分区吗(_F)？"
 
-#: ../iw/raid_dialog_gui.py:566
+#: ../iw/raid_dialog_gui.py:520
 msgid ""
 "The source drive has no partitions to be cloned.  You must first define "
 "partitions of type 'software RAID' on this drive before it can be cloned."
@@ -4184,12 +4064,12 @@ msgstr ""
 "源驱动器上没有要克隆的分区。在它能被克隆前，您必须首先把该驱动器上的分区类型"
 "定义为“软件 RAID”。"
 
-#: ../iw/raid_dialog_gui.py:570 ../iw/raid_dialog_gui.py:576
-#: ../iw/raid_dialog_gui.py:588 ../iw/raid_dialog_gui.py:601
+#: ../iw/raid_dialog_gui.py:524 ../iw/raid_dialog_gui.py:530
+#: ../iw/raid_dialog_gui.py:542 ../iw/raid_dialog_gui.py:555
 msgid "Source Drive Error"
 msgstr "源驱动器错误"
 
-#: ../iw/raid_dialog_gui.py:577
+#: ../iw/raid_dialog_gui.py:531
 msgid ""
 "The source drive you selected has partitions which are not of type 'software "
 "RAID'.\n"
@@ -4200,7 +4080,7 @@ msgstr ""
 "\n"
 "这些分区在该驱动器被克隆前必须被删除。"
 
-#: ../iw/raid_dialog_gui.py:589
+#: ../iw/raid_dialog_gui.py:543
 #, python-format
 msgid ""
 "The source drive you selected has partitions which are not constrained to "
@@ -4213,7 +4093,7 @@ msgstr ""
 "\n"
 "这些分区在该驱动器被克隆前必须被删除或被限定于该驱动器之内。"
 
-#: ../iw/raid_dialog_gui.py:602
+#: ../iw/raid_dialog_gui.py:556
 msgid ""
 "The source drive you selected has software RAID partition(s) which are "
 "members of an active software RAID device.\n"
@@ -4224,21 +4104,21 @@ msgstr ""
 "\n"
 "这些分区在该驱动器被克隆前必须被删除。"
 
-#: ../iw/raid_dialog_gui.py:615 ../iw/raid_dialog_gui.py:621
-#: ../iw/raid_dialog_gui.py:640
+#: ../iw/raid_dialog_gui.py:569 ../iw/raid_dialog_gui.py:575
+#: ../iw/raid_dialog_gui.py:594
 msgid "Target Drive Error"
 msgstr "目标驱动器错误"
 
-#: ../iw/raid_dialog_gui.py:616
+#: ../iw/raid_dialog_gui.py:570
 msgid "Please select the target drives for the clone operation."
 msgstr "请选择克隆操作的目标驱动器。"
 
-#: ../iw/raid_dialog_gui.py:622
+#: ../iw/raid_dialog_gui.py:576
 #, python-format
 msgid "The source drive /dev/%s cannot be selected as a target drive as well."
 msgstr "源驱动器 /dev/%s 不能被选为目标驱动器。"
 
-#: ../iw/raid_dialog_gui.py:641
+#: ../iw/raid_dialog_gui.py:595
 #, python-format
 msgid ""
 "The target drive /dev/%s has a partition which cannot be removed for the "
@@ -4254,11 +4134,11 @@ msgstr ""
 "\n"
 "该分区必须在驱动器成为目标之前被删除。"
 
-#: ../iw/raid_dialog_gui.py:702
+#: ../iw/raid_dialog_gui.py:656
 msgid "Please select a source drive."
 msgstr "请选择源驱动器。"
 
-#: ../iw/raid_dialog_gui.py:722
+#: ../iw/raid_dialog_gui.py:676
 #, python-format
 msgid ""
 "The drive /dev/%s will now be cloned to the following drives:\n"
@@ -4267,7 +4147,7 @@ msgstr ""
 "驱动器 /dev/%s 现在将会被克隆到下列驱动器上：\n"
 "\n"
 
-#: ../iw/raid_dialog_gui.py:727
+#: ../iw/raid_dialog_gui.py:681
 msgid ""
 "\n"
 "\n"
@@ -4277,19 +4157,19 @@ msgstr ""
 "\n"
 "警告！目标驱动器上的所有数据将会被破坏。"
 
-#: ../iw/raid_dialog_gui.py:730
+#: ../iw/raid_dialog_gui.py:684
 msgid "Final Warning"
 msgstr "最后警告"
 
-#: ../iw/raid_dialog_gui.py:732
+#: ../iw/raid_dialog_gui.py:686
 msgid "Clone Drives"
 msgstr "克隆驱动器"
 
-#: ../iw/raid_dialog_gui.py:741
+#: ../iw/raid_dialog_gui.py:695
 msgid "There was an error clearing the target drives.  Cloning failed."
 msgstr "清除目标驱动器时出错。克隆失败。"
 
-#: ../iw/raid_dialog_gui.py:775
+#: ../iw/raid_dialog_gui.py:729
 msgid ""
 "Clone Drive Tool\n"
 "\n"
@@ -4315,19 +4195,19 @@ msgstr ""
 "\n"
 "目标驱动器上的一切将会被该进程破坏。"
 
-#: ../iw/raid_dialog_gui.py:795
+#: ../iw/raid_dialog_gui.py:749
 msgid "Source Drive:"
 msgstr "源驱动器："
 
-#: ../iw/raid_dialog_gui.py:803
+#: ../iw/raid_dialog_gui.py:757
 msgid "Target Drive(s):"
 msgstr "目标驱动器："
 
-#: ../iw/raid_dialog_gui.py:811
+#: ../iw/raid_dialog_gui.py:765
 msgid "Drives"
 msgstr "驱动器"
 
-#: ../iw/task_gui.py:46
+#: ../iw/task_gui.py:48
 #, python-format
 msgid ""
 "Unable to read package metadata from repository.  This may be due to a "
@@ -4339,71 +4219,64 @@ msgstr ""
 "无法读取数据库的元数据。这可能是因为缺少 repodata 目录。请确定您已经正确建立"
 "了安装树。%s"
 
-#: ../iw/task_gui.py:56
+#: ../iw/task_gui.py:146
 #, python-format
 msgid ""
-"Unable to find a group file for %s.  This will prevent manual selection of "
-"packages from the repository from working"
-msgstr "无法为 %s 找到组群文件。这会使手工从存储库中选择软件包无法正常工作。"
+"The repository %s has already been added.  Please choose a different "
+"repository name and URL."
+msgstr "存储库 %s 已被使用，请另选一个存储库名和 URL。"
 
-#: ../iw/task_gui.py:155
+#: ../iw/task_gui.py:159
 msgid "Edit Repository"
 msgstr "编辑库"
 
-#: ../iw/task_gui.py:213
+#: ../iw/task_gui.py:221
 msgid "Invalid Proxy URL"
 msgstr "无效代理服务器 URL"
 
-#: ../iw/task_gui.py:214
+#: ../iw/task_gui.py:222
 msgid "You must provide an HTTP, HTTPS, or FTP URL to a proxy."
 msgstr "您必须为代理服务器提供一个 HTTP、HTTPS 或者或 FTP 链接（URL）。"
 
-#: ../iw/task_gui.py:224 ../iw/task_gui.py:350
+#: ../iw/task_gui.py:232 ../iw/task_gui.py:370
 msgid "Invalid Repository URL"
 msgstr "无效主机地址"
 
-#: ../iw/task_gui.py:225 ../iw/task_gui.py:351
+#: ../iw/task_gui.py:233 ../iw/task_gui.py:371
 msgid "You must provide an HTTP, HTTPS, or FTP URL to a repository."
 msgstr "您必须为库提供一个 HTTP、HTTPS 或者或 FTP 链接（URL）。"
 
-#: ../iw/task_gui.py:247 ../iw/task_gui.py:360
+#: ../iw/task_gui.py:255 ../iw/task_gui.py:380
 msgid "No Media Found"
 msgstr "未找到介质"
 
-#: ../iw/task_gui.py:248 ../iw/task_gui.py:361
+#: ../iw/task_gui.py:256 ../iw/task_gui.py:381
 msgid ""
 "No installation media was found. Please insert a disc into your drive and "
 "try again."
 msgstr "没有找到安装介质。请将磁盘插入您的驱动器中再试一次。"
 
-#: ../iw/task_gui.py:267 ../iw/task_gui.py:377
+#: ../iw/task_gui.py:275 ../iw/task_gui.py:397
 msgid "Please enter an NFS server and path."
 msgstr "请输入 NFS 服务器及路径。"
 
-#: ../iw/task_gui.py:299
+#: ../iw/task_gui.py:307
 msgid "Invalid Repository Name"
 msgstr "无效主机名"
 
-#: ../iw/task_gui.py:300
+#: ../iw/task_gui.py:308
 msgid "You must provide a repository name."
 msgstr "您必须输入存储库名称。"
 
-#: ../iw/task_gui.py:412 tmp/addrepo.glade.h:3
+#: ../iw/task_gui.py:432 tmp/addrepo.glade.h:3
 msgid "Add Repository"
 msgstr "添加主机"
 
-#: ../iw/task_gui.py:418
-#, python-format
-msgid ""
-"The repository %s has already been added.  Please choose a different "
-"repository name and URL."
-msgstr "存储库 %s 已被使用，请另选一个存储库名和 URL。"
-
-#: ../iw/task_gui.py:431
+#: ../iw/task_gui.py:437
 msgid "No Software Repos Enabled"
 msgstr "没有启用软件存储库"
 
-#: ../iw/task_gui.py:432
+#: ../iw/task_gui.py:438
 msgid ""
 "You must have at least one software repository enabled to continue "
 "installation."
@@ -4819,240 +4692,51 @@ msgid ""
 "installation process.  Please configure a network interface."
 msgstr "您在安装的过程中需要激活网络连接，请配置网络界面。"
 
-#: ../textw/netconfig_text.py:111
+#: ../textw/netconfig_text.py:127
 msgid "Use dynamic IP configuration (DHCP)"
 msgstr "请使用动态 IP 配置（DHCP）"
 
-#: ../textw/netconfig_text.py:114 ../textw/network_text.py:151
-#: ../loader/net.c:494 tmp/netpostconfig.glade.h:9
+#: ../textw/netconfig_text.py:130 ../loader/net.c:493
 msgid "Enable IPv4 support"
 msgstr "启动IPv4支持"
 
-#: ../textw/netconfig_text.py:117 ../textw/network_text.py:158
-#: ../loader/net.c:507 tmp/netpostconfig.glade.h:10
-msgid "Enable IPv6 support"
-msgstr "启动IPV6支持"
-
-#: ../textw/netconfig_text.py:121
+#: ../textw/netconfig_text.py:137
 msgid "IPv4 Address:"
 msgstr "IPv4 地址："
 
-#: ../textw/netconfig_text.py:131
-msgid "IPv6 Address:"
-msgstr "IPv6 地址："
-
-#: ../textw/netconfig_text.py:141 ../textw/network_text.py:682
-#: ../loader/net.c:828
+#: ../textw/netconfig_text.py:157 ../loader/net.c:850
 msgid "Gateway:"
 msgstr "网关："
 
-#: ../textw/netconfig_text.py:144
+#: ../textw/netconfig_text.py:160
 msgid "Nameserver:"
 msgstr "名称服务器："
 
-#: ../textw/netconfig_text.py:171
+#: ../textw/netconfig_text.py:189
 msgid "Missing Device"
 msgstr "缺少设备"
 
-#: ../textw/netconfig_text.py:172
+#: ../textw/netconfig_text.py:190
 msgid "You must select a network device"
 msgstr "您必须选择一个网络设备"
 
-#: ../textw/netconfig_text.py:231
+#: ../textw/netconfig_text.py:241
 msgid "IPv4 Network Mask "
 msgstr "IPv4 子网掩码"
 
-#: ../textw/netconfig_text.py:257
-msgid "Error configuring network device: "
-msgstr "配置网络设备时出错："
-
-#: ../textw/network_text.py:60
-#, python-format
-msgid ""
-"You have not specified the field %s.  Depending on your network environment "
-"this may cause problems later."
-msgstr "您还没有指定%s字段.根据您的网络环境可能会在以后导致问题."
-
-#: ../textw/network_text.py:77
-#, python-format
-msgid "IPv%d prefix must be between 0 and %d."
-msgstr "IP%d 前缀必须在0和%d之间."
-
-#: ../textw/network_text.py:81
-msgid "Integer Required for Prefix"
-msgstr "前缀必需是整数"
-
-#: ../textw/network_text.py:82
-#, python-format
-msgid ""
-"You must enter a valid integer for the %s.  For IPv4, the value can be "
-"between 0 and 32.  For IPv6 it can be between 0 and 128."
-msgstr ""
-"您必须为%s输入一个有效的整数.对于IPv4,其值介于0到32.如果是IPv6,其值应介于0到"
-"128."
-
-#: ../textw/network_text.py:89 tmp/netpostconfig.glade.h:16
-msgid "Prefix (Netmask)"
-msgstr "前缀(子网掩码)"
-
-#: ../textw/network_text.py:91 tmp/netpostconfig.glade.h:15
-msgid "Prefix"
-msgstr "前缀"
-
-#: ../textw/network_text.py:144
-msgid "Activate on boot"
-msgstr "引导时激活"
-
-#: ../textw/network_text.py:171
-msgid "P-to-P:"
-msgstr "点到点"
-
-#: ../textw/network_text.py:189 tmp/netpostconfig.glade.h:7
-msgid "ESSID:"
-msgstr "ESSID:"
-
-#: ../textw/network_text.py:198
-msgid "WEP Key:"
-msgstr "WEP密码:"
-
-#: ../textw/network_text.py:211
-#, python-format
-msgid "Network Configuration for %s"
-msgstr "%s 的网络配置"
-
-#: ../textw/network_text.py:248 ../textw/network_text.py:251
-msgid "point-to-point IP address"
-msgstr "点到点IP地址"
-
-#: ../textw/network_text.py:274 tmp/netpostconfig.glade.h:5
-msgid "Dynamic IP configuration (DHCP)"
-msgstr "动态 IP 配置(DHCP)"
-
-#: ../textw/network_text.py:277 ../textw/network_text.py:408
-msgid "Manual address configuration"
-msgstr "手动配置地址"
-
-#: ../textw/network_text.py:297
-#, python-format
-msgid "IPv4 Configuration for %s"
-msgstr "%s 的IPv4配置"
-
-#: ../textw/network_text.py:327 ../textw/network_text.py:339
-#: ../textw/network_text.py:342
-msgid "IPv4 address"
-msgstr "IPv4 地址"
-
-#: ../textw/network_text.py:331
-msgid "IPv4 network mask"
-msgstr "IPv4子网掩码"
-
-#: ../textw/network_text.py:357 ../textw/network_text.py:360
-#: ../textw/network_text.py:363
-msgid "IPv4 prefix (network mask)"
-msgstr "IPv4前缀(子网掩码)"
-
-#: ../textw/network_text.py:402 tmp/netpostconfig.glade.h:4
-msgid "Automatic neighbor discovery"
-msgstr "自动侦测网络邻居"
-
-#: ../textw/network_text.py:405 tmp/netpostconfig.glade.h:6
-msgid "Dynamic IP configuration (DHCPv6)"
-msgstr "动态 IP 配置(DHCPv6)"
-
-#: ../textw/network_text.py:432
-#, python-format
-msgid "IPv6 Configuration for %s"
-msgstr "%s 的IPv6网络配置"
-
-#: ../textw/network_text.py:462 ../textw/network_text.py:473
-#: ../textw/network_text.py:476
-msgid "IPv6 address"
-msgstr "IPv6地址"
-
-#: ../textw/network_text.py:466 ../textw/network_text.py:485
-msgid "IPv6 prefix"
-msgstr "IPv6前缀"
-
-#: ../textw/network_text.py:511
-msgid "Configure Network Interface"
-msgstr "配置网络界面"
-
-#: ../textw/network_text.py:512
-#, python-format
-msgid "Would you like to configure the %s network interface in your system?"
-msgstr "您想配置系统的%s网络界面吗?"
-
-#: ../textw/network_text.py:526 ../textw/network_text.py:528
-msgid "UNCONFIGURED"
-msgstr "未配置(UNCONFIGURED)"
-
-#: ../textw/network_text.py:537
-msgid ""
-"The current configuration settings for each interface are listed next to the "
-"device name.  Unconfigured interfaces are shown as UNCONFIGURED.  To "
-"configure an interface, highlight it and choose Edit.  When you are "
-"finished, press OK to continue."
-msgstr ""
-"每个接口的现有配置列在设备名称旁。没有配置的接口被标记为UNCONFIGURED。选择接"
-"口然后选择Edit可以对接口进行配置。当您完成配置，点击OK进行下一步。"
-
-#: ../textw/network_text.py:571
-msgid "Active on boot"
-msgstr "引导时激活"
-
-#: ../textw/network_text.py:573
-msgid "Inactive on boot"
-msgstr "引导时不激活"
-
-#: ../textw/network_text.py:576
-msgid "DHCP"
-msgstr "动态主机配置协议(DHCP)"
+#: ../textw/netconfig_text.py:264
+msgid "Configuring Network Interfaces"
+msgstr "配置网络接口"
 
-#: ../textw/network_text.py:581
-msgid "Auto IPv6"
-msgstr "自动 IPv6"
+#: ../textw/netconfig_text.py:264
+msgid "Waiting for NetworkManager..."
+msgstr "正在等待 NetworkManager ......"
 
-#: ../textw/network_text.py:583
-msgid "DHCPv6"
-msgstr "DHCPv6"
-
-#: ../textw/network_text.py:691
-msgid "Primary DNS:"
-msgstr "主 DNS："
-
-#: ../textw/network_text.py:696
-msgid "Secondary DNS:"
-msgstr "从 DNS："
-
-#: ../textw/network_text.py:703
-msgid "Miscellaneous Network Settings"
-msgstr "其它网络设置"
-
-#: ../textw/network_text.py:720 ../textw/network_text.py:723
-msgid "gateway"
-msgstr "网关"
-
-#: ../textw/network_text.py:730 ../textw/network_text.py:733
-msgid "primary DNS"
-msgstr "主 DNS"
-
-#: ../textw/network_text.py:742
-msgid "secondary DNS"
-msgstr "从 DNS"
-
-#: ../textw/network_text.py:766
-msgid "automatically via DHCP"
-msgstr "通过 DHCP 自动配置"
-
-#: ../textw/network_text.py:769
-msgid "manually"
-msgstr "手工设置"
-
-#: ../textw/network_text.py:788
+#: ../textw/network_text.py:42
 msgid "Hostname Configuration"
 msgstr "主机名配置"
 
-#: ../textw/network_text.py:791
+#: ../textw/network_text.py:50
 msgid ""
 "If your system is part of a larger network where hostnames are assigned by "
 "DHCP, select automatically via DHCP. Otherwise, select manually and enter a "
@@ -5063,11 +4747,11 @@ msgstr ""
 "动配置。否则，选择手工配置，并为您的系统输入一个主机名。如果您不这么做，您的"
 "系统就会被称为“本地主机”。"
 
-#: ../textw/network_text.py:817 ../textw/network_text.py:823
+#: ../textw/network_text.py:75 ../textw/network_text.py:82
 msgid "Invalid Hostname"
 msgstr "无效主机名"
 
-#: ../textw/network_text.py:818
+#: ../textw/network_text.py:76
 msgid "You have not specified a hostname."
 msgstr "您还没有指定一个主机名。"
 
@@ -5370,11 +5054,11 @@ msgstr ""
 "提供5个参数：一个16位设备号、一个16位 SCSI ID、一个64位全局端口名（WWPN）、一"
 "个16位 SCSI LUN 和一个64位 FCP LUN。"
 
-#: ../textw/partition_text.py:1687 tmp/iscsi-config.glade.h:5
+#: ../textw/partition_text.py:1687 tmp/iscsi-config.glade.h:7
 msgid "Configure iSCSI Parameters"
 msgstr "配置iSCSI参数"
 
-#: ../textw/partition_text.py:1688 tmp/iscsi-config.glade.h:6
+#: ../textw/partition_text.py:1688 tmp/iscsi-config.glade.h:8
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
@@ -5388,6 +5072,38 @@ msgstr "目标 IP 地址"
 msgid "iSCSI Initiator Name"
 msgstr "iSCSI 启动器名称"
 
+#: ../textw/partition_text.py:1691
+msgid "CHAP username"
+msgstr "CHAP 用户名"
+
+#: ../textw/partition_text.py:1692
+msgid "CHAP password"
+msgstr "CHAP 密码"
+
+#: ../textw/partition_text.py:1693
+msgid "Reverse CHAP username"
+msgstr "逆向 CHAP 用户名"
+
+#: ../textw/partition_text.py:1694
+msgid "Reverse CHAP password"
+msgstr "逆向 CHAP 密码"
+
+#: ../textw/partition_text.py:1712
+msgid "Username is required when password is present."
+msgstr "出现密码时需要用户名。"
+
+#: ../textw/partition_text.py:1715
+msgid "Password is required when username is present."
+msgstr "出现用户名时需要密码。"
+
+#: ../textw/partition_text.py:1720
+msgid "Reverse username is required whenreverse password is present."
+msgstr "出现逆向密码时需要逆向用户名。"
+
+#: ../textw/partition_text.py:1724
+msgid "Reverse password is required whenreverse username is present."
+msgstr "出现逆向用户名时需要逆向密码。"
+
 #: ../textw/partmethod_text.py:34
 msgid "Autopartition"
 msgstr "自动分区"
@@ -5400,11 +5116,11 @@ msgstr "Disk Druid"
 msgid "Package Installation"
 msgstr "安装软件包"
 
-#: ../textw/task_text.py:53
+#: ../textw/task_text.py:42
 msgid "Package selection"
 msgstr "选择软件包"
 
-#: ../textw/task_text.py:59 tmp/tasksel.glade.h:4
+#: ../textw/task_text.py:48 tmp/tasksel.glade.h:4
 #, no-c-format, python-format
 msgid ""
 "The default installation of %s includes a set of software applicable for "
@@ -5414,7 +5130,7 @@ msgstr ""
 "%s 的默认安装包括一系列用于一般互联网应用的软件。您希望您的系统可以支持的额外"
 "功能是什么？"
 
-#: ../textw/task_text.py:74
+#: ../textw/task_text.py:63
 msgid "Customize software selection"
 msgstr "定制软件选择"
 
@@ -5564,9 +5280,9 @@ msgstr "办公"
 msgid "Software Development"
 msgstr "软件开发"
 
-#: ../installclasses/fedora.py:50 ../installclasses/rhel.py:60
-msgid "Web server"
-msgstr "网络服务器"
+#: ../installclasses/fedora.py:50
+msgid "Web Server"
+msgstr "网页服务器"
 
 #: ../installclasses/rhel.py:43
 msgid "Red Hat Enterprise Linux"
@@ -5580,6 +5296,10 @@ msgstr "办公"
 msgid "Multimedia"
 msgstr "多媒体"
 
+#: ../installclasses/rhel.py:60
+msgid "Web server"
+msgstr "网络服务器"
+
 #: ../installclasses/rhel.py:65
 msgid "Virtualization"
 msgstr "虚拟化"
@@ -5803,9 +5523,9 @@ msgstr "您想载入更多驱动程序盘吗？"
 #: ../loader/hdinstall.c:384 ../loader/kickstart.c:132
 #: ../loader/kickstart.c:142 ../loader/kickstart.c:185
 #: ../loader/kickstart.c:532 ../loader/modules.c:335 ../loader/modules.c:347
-#: ../loader/net.c:1330 ../loader/net.c:1353 ../loader/nfsinstall.c:337
-#: ../loader/urlinstall.c:421 ../loader/urlinstall.c:430
-#: ../loader/urlinstall.c:439
+#: ../loader/net.c:1414 ../loader/net.c:1437 ../loader/nfsinstall.c:331
+#: ../loader/urlinstall.c:423 ../loader/urlinstall.c:432
+#: ../loader/urlinstall.c:441
 msgid "Kickstart Error"
 msgstr "Kickstart 错误"
 
@@ -5883,7 +5603,9 @@ msgid ""
 "What partition and directory on that partition holds the installation image "
 "for %s?  If you don't see the disk drive you're using listed here, press F2 "
 "to configure additional devices."
-msgstr "那个分区中的什么分区和目录中有 %s 的安装映像？如果您所用的磁盘驱动器在这里没有被列出，按 F2 键来配置附加的设备。"
+msgstr ""
+"那个分区中的什么分区和目录中有 %s 的安装映像？如果您所用的磁盘驱动器在这里没"
+"有被列出，按 F2 键来配置附加的设备。"
 
 #: ../loader/hdinstall.c:273
 msgid "Directory holding image:"
@@ -6028,48 +5750,48 @@ msgstr "无法下载更新映像。请修改以下更新位置，或者按取消
 msgid "Error downloading updates image"
 msgstr "下载更新映像时出错"
 
-#: ../loader/loader.c:1171
+#: ../loader/loader.c:1175
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "在本机上安装 %s 所需内存不够。"
 
-#: ../loader/loader.c:1231
+#: ../loader/loader.c:1235
 msgid "Media Detected"
 msgstr "检测到介质"
 
-#: ../loader/loader.c:1232
+#: ../loader/loader.c:1236
 msgid "Local installation media detected..."
 msgstr "检测到本地安装介质..."
 
-#: ../loader/loader.c:1353
+#: ../loader/loader.c:1357
 msgid "Rescue Method"
 msgstr "救援方法"
 
-#: ../loader/loader.c:1354
+#: ../loader/loader.c:1358
 msgid "Installation Method"
 msgstr "安装方法"
 
-#: ../loader/loader.c:1356
+#: ../loader/loader.c:1360
 msgid "What type of media contains the rescue image?"
 msgstr "哪一类介质包含救援映像？"
 
-#: ../loader/loader.c:1358
+#: ../loader/loader.c:1362
 msgid "What type of media contains the installation image?"
 msgstr "哪一类介质包含安装映像？"
 
-#: ../loader/loader.c:1389
+#: ../loader/loader.c:1393
 msgid "No driver found"
 msgstr "未找到任何驱动程序"
 
-#: ../loader/loader.c:1389
+#: ../loader/loader.c:1393
 msgid "Select driver"
 msgstr "选择驱动程序"
 
-#: ../loader/loader.c:1390
+#: ../loader/loader.c:1394
 msgid "Use a driver disk"
 msgstr "使用驱动程序盘"
 
-#: ../loader/loader.c:1391
+#: ../loader/loader.c:1395
 msgid ""
 "Unable to find any devices of the type needed for this installation type.  "
 "Would you like to manually select your driver or use a driver disk?"
@@ -6077,39 +5799,39 @@ msgstr ""
 "找不到这种安装类型所需的任何设备。您想手工选择驱动程序或使用一张驱动程序盘"
 "吗？"
 
-#: ../loader/loader.c:1652
+#: ../loader/loader.c:1679
 msgid "The following devices have been found on your system."
 msgstr "在系统中发现以下设备。"
 
-#: ../loader/loader.c:1654
+#: ../loader/loader.c:1681
 msgid ""
 "No device drivers have been loaded for your system.  Would you like to load "
 "any now?"
 msgstr "没有为您的系统载入任何设备驱动程序。现在是否需要载入？"
 
-#: ../loader/loader.c:1658
+#: ../loader/loader.c:1685
 msgid "Devices"
 msgstr "设备"
 
-#: ../loader/loader.c:1659
+#: ../loader/loader.c:1686
 msgid "Done"
 msgstr "完成"
 
-#: ../loader/loader.c:1660
+#: ../loader/loader.c:1687
 msgid "Add Device"
 msgstr "添加设备"
 
-#: ../loader/loader.c:1847
+#: ../loader/loader.c:1878
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "装载程序已经被运行。正在启动 shell。\n"
 
-#: ../loader/loader.c:2186
+#: ../loader/loader.c:2248
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "正在运行 anaconda %s、%s 救援模式 - 请稍候...\n"
 
-#: ../loader/loader.c:2188
+#: ../loader/loader.c:2250
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "正在运行 anaconda %s、%s 系统安装程序 - 请稍候...\n"
@@ -6181,54 +5903,65 @@ msgstr "设备 kickstart 方法命令 %s 的参数不对：%s"
 msgid "A module name must be specified for the kickstart device command."
 msgstr "必须为 kickstart 设备命令指定模块名称。"
 
-#: ../loader/net.c:106
+#: ../loader/net.c:108
+msgid "Invalid Prefix"
+msgstr "无效的前缀"
+
+#: ../loader/net.c:109
 msgid ""
 "Prefix must be between 1 and 32 for IPv4 networks or between 1 and 128 for "
 "IPv6 networks"
 msgstr "对于 IPv4网络，前缀值在1到32之间，而对于 IPv6网络则在1到128之间。"
 
-#: ../loader/net.c:413 ../loader/net.c:467
+#: ../loader/net.c:409 ../loader/net.c:463
 msgid "Network Error"
 msgstr "网络错误"
 
-#: ../loader/net.c:414 ../loader/net.c:468
+#: ../loader/net.c:410 ../loader/net.c:464
 msgid "There was an error configuring your network interface."
 msgstr "配置网络界面时出错。"
 
-#: ../loader/net.c:540
+#: ../loader/net.c:507
+msgid "Enable IPv6 support"
+msgstr "启动IPV6支持"
+
+#: ../loader/net.c:547
 msgid "Configure TCP/IP"
 msgstr "配置 TCP/IP"
 
-#: ../loader/net.c:585
+#: ../loader/net.c:606
+msgid "Missing Protocol"
+msgstr "缺少网络协议"
+
+#: ../loader/net.c:607
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "您必须至少选择一项网络协议（IPv4或IPv6)。"
 
-#: ../loader/net.c:592
+#: ../loader/net.c:614
 msgid "IPv4 Needed for NFS"
 msgstr "NFS 需要 IPv4"
 
-#: ../loader/net.c:593
+#: ../loader/net.c:615
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS 安装需要 IPv4 的支持。"
 
-#: ../loader/net.c:697
+#: ../loader/net.c:717
 msgid "IPv4 address:"
 msgstr "IPv4 地址："
 
-#: ../loader/net.c:709 ../loader/net.c:775 tmp/netconfig.glade.h:1
-#: tmp/netpostconfig.glade.h:1
+#: ../loader/net.c:729 ../loader/net.c:796 tmp/netconfig.glade.h:1
 msgid "/"
 msgstr "/"
 
-#: ../loader/net.c:763
+#: ../loader/net.c:784
 msgid "IPv6 address:"
 msgstr "IPv6地址："
 
-#: ../loader/net.c:836
+#: ../loader/net.c:858
 msgid "Name Server:"
 msgstr "域名服务器(DNS)："
 
-#: ../loader/net.c:875
+#: ../loader/net.c:897
 msgid ""
 "Enter the IPv4 and/or the IPv6 address and prefix (address / prefix).  For "
 "IPv4, the dotted-quad netmask or the CIDR-style prefix are acceptable. The "
@@ -6238,114 +5971,110 @@ msgstr ""
 "掩码或CIDR形式的前缀是可接受的。网关和域名服务器域必须是有效的IPv4或IPv6的地"
 "址。"
 
-#: ../loader/net.c:895
+#: ../loader/net.c:917
 msgid "Manual TCP/IP Configuration"
 msgstr "手动配置TCP/IP"
 
-#: ../loader/net.c:1009 ../loader/net.c:1015
+#: ../loader/net.c:1040 ../loader/net.c:1047
 msgid "Missing Information"
 msgstr "缺少信息"
 
-#: ../loader/net.c:1010
+#: ../loader/net.c:1041
 msgid "You must enter both a valid IPv4 address and a network mask or CIDR prefix."
 msgstr "必须输入有效的 IPv4 地址和子网掩码或CIDR代码。"
 
-#: ../loader/net.c:1016
+#: ../loader/net.c:1048
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "您必须输入有效的 IPv6 地址和一个 CIDR 前缀。"
 
-#: ../loader/net.c:1331
+#: ../loader/net.c:1415
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart 网络命令 %s 的参数不对：%s"
 
-#: ../loader/net.c:1354
+#: ../loader/net.c:1438
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "网络命令中指定的 bootproto %s 不对"
 
-#: ../loader/net.c:1423
+#: ../loader/net.c:1509
 msgid "Seconds:"
 msgstr "秒："
 
-#: ../loader/net.c:1537
+#: ../loader/net.c:1623
 msgid "Networking Device"
 msgstr "网络设备"
 
-#: ../loader/net.c:1538
+#: ../loader/net.c:1624
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
 msgstr "您的系统上具有多种网络设备。您想通过哪一种设备来安装？"
 
-#: ../loader/net.c:1542
+#: ../loader/net.c:1628
 msgid "Identify"
 msgstr "确认"
 
-#: ../loader/net.c:1551
+#: ../loader/net.c:1637
 msgid "You can identify the physical port for"
 msgstr "您可确认物理端口"
 
-#: ../loader/net.c:1553
+#: ../loader/net.c:1639
 msgid ""
 "by flashing the LED lights for a number of seconds.  Enter a number between "
 "1 and 30 to set the duration to flash the LED port lights."
 msgstr "通过让 LED 灯闪几秒。输入一个 1-30 之间的数字设定 LED 端口灯闪烁的时间。"
 
-#: ../loader/net.c:1563
+#: ../loader/net.c:1649
 msgid "Identify NIC"
 msgstr "确认 NIC"
 
-#: ../loader/net.c:1576
+#: ../loader/net.c:1662
 msgid "Invalid Duration"
 msgstr "无效持续时间"
 
-#: ../loader/net.c:1577
+#: ../loader/net.c:1663
 msgid "You must enter the number of seconds as an integer between 1 and 30."
 msgstr "您输入的秒数必须是 1-30 之间的一个整数。"
 
-#: ../loader/net.c:1589
+#: ../loader/net.c:1675
 #, c-format
 msgid "Flashing %s port lights for %d seconds..."
 msgstr "让 %s 端口灯闪  %d 秒...... "
 
-#: ../loader/net.c:1740 ../loader/net.c:1744
+#: ../loader/net.c:1841 ../loader/net.c:1845
 #, c-format
 msgid "Waiting for NetworkManager to configure %s...\n"
 msgstr "正在等待 NetworkManager 配置 %s ......\n"
 
-#: ../loader/nfsinstall.c:63
+#: ../loader/nfsinstall.c:64
 msgid "NFS server name:"
 msgstr "NFS 服务器名称："
 
-#: ../loader/nfsinstall.c:67
+#: ../loader/nfsinstall.c:68
 #, c-format
 msgid "%s directory:"
 msgstr "%s 目录："
 
-#: ../loader/nfsinstall.c:78
+#: ../loader/nfsinstall.c:79
 #, c-format
 msgid "Please enter the server name and path to your %s installation image."
 msgstr "请输入服务器名称以及到您的 %s 安装映像的路径。"
 
-#: ../loader/nfsinstall.c:85
+#: ../loader/nfsinstall.c:86
 msgid "NFS Setup"
 msgstr "NFS 设置"
 
-#: ../loader/nfsinstall.c:190
-msgid "Hostname specified with no DNS configured"
-msgstr "无需设置DNS指定主机名"
-
-#: ../loader/nfsinstall.c:251
+#: ../loader/nfsinstall.c:245
 msgid "That directory could not be mounted from the server."
 msgstr "无法从服务器中挂载该目录。"
 
-#: ../loader/nfsinstall.c:262
+#: ../loader/nfsinstall.c:256
 #, c-format
 msgid "That directory does not seem to contain a %s installation image."
 msgstr "该目录似乎不包含 %s 安装映像。"
 
-#: ../loader/nfsinstall.c:338
+#: ../loader/nfsinstall.c:332
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart 命令 %s 的参数不对：%s"
@@ -6371,16 +6100,16 @@ msgstr "无法获取 %s://%s%s。"
 msgid "Unable to retrieve the install image."
 msgstr "无法获取安装映像。"
 
-#: ../loader/urlinstall.c:422
+#: ../loader/urlinstall.c:424
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "URL kickstart 方法命令 %s 的参数不对：%s"
 
-#: ../loader/urlinstall.c:431
+#: ../loader/urlinstall.c:433
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "必须给 URL kickstart 方法提供一个 --url 参数。"
 
-#: ../loader/urlinstall.c:440
+#: ../loader/urlinstall.c:442
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "未知 URL 方法 %s"
@@ -6424,6 +6153,39 @@ msgstr "载入 SCSI 驱动程序"
 msgid "Loading %s driver..."
 msgstr "正在载入 %s 驱动程序..."
 
+#: tmp/GroupSelector.glade.h:1
+msgid ""
+"Some packages associated with this group are not required to be installed "
+"but may provide additional functionality.  Please choose the packages which "
+"you would like to have installed."
+msgstr ""
+"有些与这个组群关联的软件包不需要安装，但它们可能会提供额外的功能。请选择您要"
+"安装的软件包。"
+
+#: tmp/GroupSelector.glade.h:2
+msgid "_Deselect"
+msgstr "取消选择（_D）"
+
+#: tmp/GroupSelector.glade.h:3
+msgid "_Deselect all optional packages"
+msgstr "取消对所有任选软件包的选择（_D）"
+
+#: tmp/GroupSelector.glade.h:4
+msgid "_Optional packages"
+msgstr "任选软件包（_O）"
+
+#: tmp/GroupSelector.glade.h:5
+msgid "_Select"
+msgstr "选择（_S）"
+
+#: tmp/GroupSelector.glade.h:6
+msgid "_Select all optional packages"
+msgstr "选择所有任选软件包（_S）"
+
+#: tmp/GroupSelector.glade.h:7
+msgid "dialog1"
+msgstr "对话 1"
+
 #: tmp/account.glade.h:2
 msgid "Root Password:"
 msgstr "根密码："
@@ -6625,65 +6387,34 @@ msgstr "目的地文件（_f）"
 
 #: tmp/exnSave.glade.h:3
 msgid ""
+"Local storage device\n"
 "Local disk\n"
 "Remote server (scp)"
 msgstr ""
+"本地存储设备\n"
 "本地磁盘\n"
 "远程服务器（scp）"
 
-#: tmp/exnSave.glade.h:5
+#: tmp/exnSave.glade.h:6
 msgid "Please choose a destination for saving your traceback."
 msgstr "请为保存您的追述文件选择一个目的地。"
 
-#: tmp/exnSave.glade.h:7
+#: tmp/exnSave.glade.h:8
 msgid "Select A File"
 msgstr "选择一个文件"
 
-#: tmp/exnSave.glade.h:8
+#: tmp/exnSave.glade.h:9
 msgid "_Host (host:port)"
 msgstr "主机（_H）(主机:端口）"
 
-#: tmp/exnSave.glade.h:9
+#: tmp/exnSave.glade.h:10
 msgid "_Password"
 msgstr "密码（_P）"
 
-#: tmp/exnSave.glade.h:10
+#: tmp/exnSave.glade.h:11
 msgid "_User name"
 msgstr "用户名（_U）"
 
-#: tmp/GroupSelector.glade.h:1
-msgid ""
-"Some packages associated with this group are not required to be installed "
-"but may provide additional functionality.  Please choose the packages which "
-"you would like to have installed."
-msgstr ""
-"有些与这个组群关联的软件包不需要安装，但它们可能会提供额外的功能。请选择您要"
-"安装的软件包。"
-
-#: tmp/GroupSelector.glade.h:2
-msgid "_Deselect"
-msgstr "取消选择（_D）"
-
-#: tmp/GroupSelector.glade.h:3
-msgid "_Deselect all optional packages"
-msgstr "取消对所有任选软件包的选择（_D）"
-
-#: tmp/GroupSelector.glade.h:4
-msgid "_Optional packages"
-msgstr "任选软件包（_O）"
-
-#: tmp/GroupSelector.glade.h:5
-msgid "_Select"
-msgstr "选择（_S）"
-
-#: tmp/GroupSelector.glade.h:6
-msgid "_Select all optional packages"
-msgstr "选择所有任选软件包（_S）"
-
-#: tmp/GroupSelector.glade.h:7
-msgid "dialog1"
-msgstr "对话 1"
-
 #: tmp/instkey.glade.h:2
 #, no-c-format
 msgid "%(instkey)s:"
@@ -6695,22 +6426,30 @@ msgid "Please enter your %(instkey)s."
 msgstr "请输入您的 %(instkey)s."
 
 #: tmp/iscsi-config.glade.h:1
-msgid "<b>_Password:</b>"
-msgstr "<b>（_P）密码:</b>"
+msgid "<b>CHAP _Password:</b>"
+msgstr "<b>CHAP 密码（_P）：</b>"
 
 #: tmp/iscsi-config.glade.h:2
-msgid "<b>_Target IP Address:</b>"
-msgstr "<b>(_T)目标 IP 地址:</b>"
+msgid "<b>CHAP _Username:</b>"
+msgstr "<b>CHAP 用户名（_U）：</b>"
 
 #: tmp/iscsi-config.glade.h:3
-msgid "<b>_Username:</b>"
-msgstr "<b>(_U)用户名:</b>"
+msgid "<b>Reverse CHAP P_assword:</b>"
+msgstr "<b>逆向 CHAP 密码（_P）：</b>"
 
 #: tmp/iscsi-config.glade.h:4
+msgid "<b>Reverse CHAP U_sername:</b>"
+msgstr "<b>逆向 CHAP 用户名（_U）：</b>"
+
+#: tmp/iscsi-config.glade.h:5
+msgid "<b>_Target IP Address:</b>"
+msgstr "<b>(_T)目标 IP 地址:</b>"
+
+#: tmp/iscsi-config.glade.h:6
 msgid "<b>iSCSI Initiator _Name:</b>"
 msgstr "<b>(_N)iSCSI 启动器名称:</b>"
 
-#: tmp/iscsi-config.glade.h:7
+#: tmp/iscsi-config.glade.h:9
 msgid "_Add target"
 msgstr "(_A)添加目标"
 
@@ -6728,19 +6467,25 @@ msgstr "安装到硬盘"
 
 #: tmp/lukspassphrase.glade.h:1
 msgid ""
+"Also add this passphrase to all existing encrypted devices to streamline the "
+"boot process"
+msgstr "还要为所有目前加密的设备都添加这个密码短语以便流畅引导进程"
+
+#: tmp/lukspassphrase.glade.h:2
+msgid ""
 "Choose a passphrase for this encrypted partition. You will be prompted for "
 "the passphrase during system boot."
 msgstr "为这个加密分区选择密码句。在系统引导时会提示您输入密码句。"
 
-#: tmp/lukspassphrase.glade.h:2
+#: tmp/lukspassphrase.glade.h:3
 msgid "Confirm passphrase:"
 msgstr "确认密码句："
 
-#: tmp/lukspassphrase.glade.h:3
+#: tmp/lukspassphrase.glade.h:4
 msgid "Enter passphrase for encrypted partition"
 msgstr "为加密分区输入密码句"
 
-#: tmp/lukspassphrase.glade.h:4
+#: tmp/lukspassphrase.glade.h:5
 msgid "Enter passphrase:"
 msgstr "输入密码句："
 
@@ -6776,29 +6521,15 @@ msgstr "启动IPv_6支持"
 msgid "Use _dynamic IP configuration (DHCP)"
 msgstr "使用(_d）动态 IP 配置(DHCP)"
 
-#: tmp/netpostconfig.glade.h:2
-msgid "<b>Description Goes Here</b>"
-msgstr "<b>描述在此</b>"
+#: tmp/network.glade.h:1
+msgid "Hostname:"
+msgstr "主机名："
 
-#: tmp/netpostconfig.glade.h:3
-msgid "<b>Hardware address: DE:AD:00:BE:EF:00</b>"
-msgstr "MAC地址"
-
-#: tmp/netpostconfig.glade.h:8
-msgid "Edit Interface"
-msgstr "编辑界面"
-
-#: tmp/netpostconfig.glade.h:11
-msgid "Encryption Key:"
-msgstr "加密密钥:"
-
-#: tmp/netpostconfig.glade.h:13
-msgid "Manual configuration"
-msgstr "手动配置"
-
-#: tmp/netpostconfig.glade.h:14
-msgid "Point to Point (IP):"
-msgstr "点对点 (IP)"
+#: tmp/network.glade.h:2
+msgid ""
+"Please name this computer.  The hostname identifies the computer on a "
+"network."
+msgstr "请为这台计算机命名。该主机名会在网络中定义这台计算机。"
 
 #: tmp/tasksel.glade.h:1
 msgid "Customize _later"