summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2008-08-27 21:28:14 -0400
committerJeremy Katz <katzj@redhat.com>2008-08-27 21:28:14 -0400
commita116ab9919d8d69e127003012951c426ea73bba7 (patch)
tree27416edb5b520c7fd4b3e4bd8cf1b5de18bd1b87 /po/zh_CN.po
parent968253c2ff491e048565cfcfb63f1fd12e39f0ec (diff)
downloadanaconda-a116ab9919d8d69e127003012951c426ea73bba7.tar.gz
anaconda-a116ab9919d8d69e127003012951c426ea73bba7.tar.xz
anaconda-a116ab9919d8d69e127003012951c426ea73bba7.zip
Update the pot file and refresh the pos
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3420
1 files changed, 1932 insertions, 1488 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 96deae2a6..41bfd61f7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,31 +14,32 @@
# Wu Yu <kiluawuyu@gmail.com>, 2007.
# Leah Liu <lliu@redhat.com>, 2008.
# Guokai Han <dev.hgk@gmail.com>, 2008
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: anaconda.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-28 10:06-0400\n"
+"POT-Creation-Date: 2008-08-27 21:19-0400\n"
"PO-Revision-Date: 2008-04-04 17:13+0800\n"
"Last-Translator: Leah Liu <lliu@redhat.com>\n"
"Language-Team: Simplified Chinese <zh@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
-#: ../anaconda:289
+#: ../anaconda:288 ../anaconda:334
#, c-format
msgid "Error processing %%ksappend lines: %s"
msgstr "执行 %%k sappend 行时出错:%s"
-#: ../anaconda:292
+#: ../anaconda:291 ../anaconda:337
#, c-format
msgid "Unknown error processing %%ksappend lines: %s"
msgstr "执行 %%k sappend 行时出现未知错误:%s"
-#: ../anaconda:306 ../cmdline.py:78 ../gui.py:1187 ../text.py:509
+#: ../anaconda:305 ../anaconda:349 ../cmdline.py:85 ../gui.py:1279
+#: ../text.py:561
#, c-format, python-format
msgid ""
"The following error was found while parsing your kickstart configuration:\n"
@@ -49,85 +50,85 @@ msgstr ""
"\n"
"%s"
-#: ../anaconda:423
+#: ../anaconda:471
msgid "Press <enter> for a shell"
msgstr "按<回车>键执行一个shell命令"
-#: ../anaconda:438 ../gui.py:234 ../rescue.py:271 ../rescue.py:339
-#: ../rescue.py:366 ../rescue.py:376 ../rescue.py:452 ../rescue.py:458
-#: ../text.py:537 ../text.py:699 ../textw/constants_text.py:42
-#: ../textw/network_text.py:44 ../textw/network_text.py:54
-#: ../textw/network_text.py:76 ../textw/network_text.py:82
-#: ../textw/network_text.py:230 ../textw/network_text.py:815
-#: ../textw/network_text.py:823 ../loader/cdinstall.c:145
-#: ../loader/cdinstall.c:146 ../loader/cdinstall.c:200
-#: ../loader/cdinstall.c:203 ../loader/cdinstall.c:342
-#: ../loader/cdinstall.c:347 ../loader/cdinstall.c:351
-#: ../loader/cdinstall.c:421 ../loader/dirbrowser.c:145
-#: ../loader/driverdisk.c:98 ../loader/driverdisk.c:235
-#: ../loader/driverdisk.c:266 ../loader/driverdisk.c:299
-#: ../loader/driverdisk.c:337 ../loader/driverdisk.c:351
-#: ../loader/driverdisk.c:365 ../loader/driverdisk.c:375
-#: ../loader/driverdisk.c:535 ../loader/driverdisk.c:572
-#: ../loader/driverselect.c:75 ../loader/driverselect.c:199
-#: ../loader/hdinstall.c:141 ../loader/hdinstall.c:252
-#: ../loader/hdinstall.c:388 ../loader/hdinstall.c:438
-#: ../loader/hdinstall.c:470 ../loader/hdinstall.c:540
-#: ../loader/hdinstall.c:583 ../loader/hdinstall.c:596 ../loader/kbd.c:138
+#: ../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
+#: ../loader/cdinstall.c:223 ../loader/cdinstall.c:239
+#: ../loader/cdinstall.c:242 ../loader/cdinstall.c:431
+#: ../loader/cdinstall.c:438 ../loader/cdinstall.c:503
+#: ../loader/dirbrowser.c:145 ../loader/driverdisk.c:100
+#: ../loader/driverdisk.c:245 ../loader/driverdisk.c:276
+#: ../loader/driverdisk.c:307 ../loader/driverdisk.c:342
+#: ../loader/driverdisk.c:361 ../loader/driverdisk.c:373
+#: ../loader/driverdisk.c:381 ../loader/driverdisk.c:541
+#: ../loader/driverdisk.c:578 ../loader/driverselect.c:81
+#: ../loader/driverselect.c:205 ../loader/hdinstall.c:143
+#: ../loader/hdinstall.c:289 ../loader/hdinstall.c:352
+#: ../loader/hdinstall.c:384 ../loader/hdinstall.c:454
+#: ../loader/hdinstall.c:497 ../loader/hdinstall.c:510 ../loader/kbd.c:138
#: ../loader/kickstart.c:132 ../loader/kickstart.c:142
#: ../loader/kickstart.c:185 ../loader/kickstart.c:284
-#: ../loader/kickstart.c:372 ../loader/kickstart.c:529 ../loader/lang.c:115
-#: ../loader/lang.c:376 ../loader/loader.c:344 ../loader/loader.c:379
-#: ../loader/loader.c:414 ../loader/loader.c:431 ../loader/loader.c:445
-#: ../loader/loader.c:480 ../loader/loader.c:997 ../loader/loader.c:1159
+#: ../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/mediacheck.c:62 ../loader/mediacheck.c:101
#: ../loader/mediacheck.c:108 ../loader/mediacheck.c:117
-#: ../loader/method.c:120 ../loader/method.c:346 ../loader/method.c:420
-#: ../loader/modules.c:336 ../loader/modules.c:348 ../loader/net.c:277
-#: ../loader/net.c:320 ../loader/net.c:750 ../loader/net.c:1094
-#: ../loader/net.c:1647 ../loader/net.c:1670 ../loader/net.c:1863
-#: ../loader/nfsinstall.c:68 ../loader/nfsinstall.c:153
-#: ../loader/nfsinstall.c:283 ../loader/nfsinstall.c:301
-#: ../loader/nfsinstall.c:342 ../loader/telnetd.c:93
-#: ../loader/urlinstall.c:78 ../loader/urlinstall.c:101
-#: ../loader/urlinstall.c:185 ../loader/urlinstall.c:196
-#: ../loader/urlinstall.c:437 ../loader/urlinstall.c:446
-#: ../loader/urlinstall.c:455 ../loader/urls.c:280 ../loader/urls.c:315
-#: ../loader/urls.c:321 ../loader/urls.c:333 ../loader/urls.c:405
+#: ../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
msgid "OK"
msgstr "确定"
-#: ../anaconda:445
+#: ../anaconda:493
msgid ""
"You do not have enough RAM to use the graphical installer. Starting text "
"mode."
msgstr "您没有足够的内存来使用图形化安装程序。开始使用文本方式安装。"
-#: ../anaconda:460
-msgid "No video hardware found, assuming headless"
-msgstr "没有找到视频硬件,假定为无头机器"
-
-#: ../anaconda:467 ../anaconda:958
-msgid "Unable to instantiate a X hardware state object."
-msgstr "无法实例化 X 硬件状态对象。"
-
-#: ../anaconda:517
+#: ../anaconda:544
msgid "Starting graphical installation..."
msgstr "正在启动图形化安装..."
-#: ../anaconda:838
+#: ../anaconda:821
+#, fuzzy
+msgid "Would you like to use VNC?"
+msgstr "您想怎么办?"
+
+#: ../anaconda:822
+msgid ""
+"The VNC mode installation offers more functionality than the text mode, "
+"would you like to use it instead?"
+msgstr ""
+
+#: ../anaconda:847
msgid "Install class forcing text mode installation"
msgstr "安装类别强制使用文本模式安装"
-#: ../anaconda:878
+#: ../anaconda:866
msgid "Graphical installation not available... Starting text mode."
msgstr "没有可用的图形化安装... 开始文本方式安装。"
-#: ../anaconda:886
+#: ../anaconda:874
msgid "DISPLAY variable not set. Starting text mode!"
msgstr "DISPLAY 变量未设定,启动文本模式!"
-#: ../autopart.py:888
+#: ../autopart.py:892
#, python-format
msgid ""
"Error resizing partition %s.\n"
@@ -138,24 +139,24 @@ msgstr ""
"\n"
"%s"
-#: ../autopart.py:891
+#: ../autopart.py:895
#, python-format
msgid "Start of partition %s was moved when resizing"
msgstr "重新定义分区大小时分区起点 %s 移动"
-#: ../autopart.py:983
+#: ../autopart.py:987
msgid "Could not allocate cylinder-based partitions as primary partitions.\n"
msgstr "无法将基于柱面的分区作为主分区。\n"
-#: ../autopart.py:988
+#: ../autopart.py:992
msgid "Could not allocate partitions as primary partitions.\n"
msgstr "无法将分区划为主分区。\n"
-#: ../autopart.py:993
+#: ../autopart.py:997
msgid "Could not allocate cylinder-based partitions.\n"
msgstr "无法分配基于柱面的分区。\n"
-#: ../autopart.py:1058
+#: ../autopart.py:1062
#, python-format
msgid ""
"Boot partition %s doesn't belong to a BSD disk label. SRM won't be able to "
@@ -165,7 +166,7 @@ msgstr ""
"引导分区 %s 不属于 BSD 磁盘标签。SRM 无法从该分区引导。请使用一个属于 BSD 磁"
"盘标签的分区或将该设备磁盘标为 BSD。"
-#: ../autopart.py:1060
+#: ../autopart.py:1064
#, python-format
msgid ""
"Boot partition %s doesn't belong to a disk with enough free space at its "
@@ -175,44 +176,44 @@ msgstr ""
"引导分区 %s 所属磁盘在前端没有足够的空间来容纳引导装载程序。请确定在磁盘起始"
"处至少有 5MB 空闲空间来容纳 /boot"
-#: ../autopart.py:1062
+#: ../autopart.py:1066
#, python-format
msgid ""
"Boot partition %s isn't a VFAT partition. EFI won't be able to boot from "
"this partition."
msgstr "引导分区 %s 不是 VFAT 分区。EFI 无法从该分区引导。"
-#: ../autopart.py:1064
+#: ../autopart.py:1068
msgid ""
"The boot partition must entirely be in the first 4GB of the disk. "
"OpenFirmware won't be able to boot this installation."
msgstr "引导分区在磁盘上的位置不够靠前。OpenFirmware 无法引导该安装。"
-#: ../autopart.py:1066
+#: ../autopart.py:1070
#, python-format
msgid ""
"Boot partition %s is not a Linux filesystem, such as ext3. The system won't "
"be able to boot from this partition."
msgstr "引导分区 %s 不是 Linux 文件系统,比如 ext3。该系统无法从这个分区引导。"
-#: ../autopart.py:1069
+#: ../autopart.py:1073
#, python-format
msgid ""
"Boot partition %s may not meet booting constraints for your architecture."
msgstr "引导分区 %s 可能没有满足您的体系的引导制约参数。"
-#: ../autopart.py:1094
+#: ../autopart.py:1098
#, python-format
msgid ""
"Adding this partition would not leave enough disk space for already "
"allocated logical volumes in %s."
msgstr "若添加该分区,已分配在 %s 的逻辑卷将没有足够的磁盘空间。"
-#: ../autopart.py:1286
+#: ../autopart.py:1295
msgid "Requested Partition Does Not Exist"
msgstr "所申请的分区不存在"
-#: ../autopart.py:1287
+#: ../autopart.py:1296
#, python-format
msgid ""
"Unable to locate partition %s to use for %s.\n"
@@ -223,11 +224,11 @@ msgstr ""
"\n"
"按确定来退出安装."
-#: ../autopart.py:1312
+#: ../autopart.py:1321
msgid "Requested Raid Device Does Not Exist"
msgstr "所申请的 RAID 设备不存在"
-#: ../autopart.py:1313
+#: ../autopart.py:1322
#, python-format
msgid ""
"Unable to locate raid device %s to use for %s.\n"
@@ -238,11 +239,11 @@ msgstr ""
"\n"
"按确定退出安装."
-#: ../autopart.py:1342
+#: ../autopart.py:1351
msgid "Requested Volume Group Does Not Exist"
msgstr "所申请的卷组不存在"
-#: ../autopart.py:1343
+#: ../autopart.py:1352
#, python-format
msgid ""
"Unable to locate volume group %s to use for %s.\n"
@@ -253,11 +254,11 @@ msgstr ""
"\n"
"按确定退出安装."
-#: ../autopart.py:1380
+#: ../autopart.py:1389
msgid "Requested Logical Volume Does Not Exist"
msgstr "所申请的逻辑卷不存在"
-#: ../autopart.py:1381
+#: ../autopart.py:1390
#, python-format
msgid ""
"Unable to locate logical volume %s to use for %s.\n"
@@ -268,11 +269,11 @@ msgstr ""
"\n"
"按确定退出安装."
-#: ../autopart.py:1516 ../autopart.py:1563
+#: ../autopart.py:1525 ../autopart.py:1572
msgid "Automatic Partitioning Errors"
msgstr "自动分区错误"
-#: ../autopart.py:1517
+#: ../autopart.py:1526
#, python-format
msgid ""
"The following errors occurred with your partitioning:\n"
@@ -287,11 +288,11 @@ msgstr ""
"\n"
"请按确定退出安装."
-#: ../autopart.py:1527
+#: ../autopart.py:1536
msgid "Warnings During Automatic Partitioning"
msgstr "进行自动分区时出现警告"
-#: ../autopart.py:1528
+#: ../autopart.py:1537
#, python-format
msgid ""
"Following warnings occurred during automatic partitioning:\n"
@@ -302,7 +303,7 @@ msgstr ""
"\n"
"%s"
-#: ../autopart.py:1542 ../autopart.py:1559
+#: ../autopart.py:1551 ../autopart.py:1568
msgid ""
"\n"
"\n"
@@ -312,12 +313,12 @@ msgstr ""
"\n"
"按确定退出安装."
-#: ../autopart.py:1543 ../iw/partition_gui.py:1023
-#: ../textw/partition_text.py:246
+#: ../autopart.py:1552 ../iw/partition_gui.py:1027
+#: ../textw/partition_text.py:247
msgid "Error Partitioning"
msgstr "分区出错"
-#: ../autopart.py:1544
+#: ../autopart.py:1553
#, python-format
msgid ""
"Could not allocate requested partitions: \n"
@@ -328,7 +329,7 @@ msgstr ""
"\n"
"%s.%s"
-#: ../autopart.py:1561
+#: ../autopart.py:1570
msgid ""
"\n"
"\n"
@@ -338,7 +339,7 @@ msgstr ""
"\n"
"点“确定”,选择不同的分区选项"
-#: ../autopart.py:1564
+#: ../autopart.py:1573
#, python-format
msgid ""
"The following errors occurred with your partitioning:\n"
@@ -354,15 +355,15 @@ msgstr ""
"\n"
"这些错误在安装所需的硬盘驱动器空间不够时会发生.%s"
-#: ../autopart.py:1575
+#: ../autopart.py:1584
msgid "Unrecoverable Error"
msgstr "无法恢复的错误"
-#: ../autopart.py:1576
+#: ../autopart.py:1585
msgid "Your system will now be rebooted."
msgstr "您的系统现在将会被重新引导。"
-#: ../autopart.py:1700
+#: ../autopart.py:1709
msgid ""
"Automatic Partitioning sets partitions based on the selected installation "
"type. You also can customize the partitions once they have been created.\n"
@@ -376,42 +377,93 @@ msgstr ""
"Disk Druid 是手工分区的工具。它允许您在交互的环境中建立分区。您可以用它来设置"
"文件系统类型、挂载点、分区大小等。"
-#: ../autopart.py:1711
+#: ../autopart.py:1720
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:1716
+#: ../autopart.py:1725
msgid "Remove all partitions on this system"
msgstr "删除系统内的所有分区"
-#: ../autopart.py:1717
+#: ../autopart.py:1726
msgid "Remove all Linux partitions on this system"
msgstr "删除系统内所有的 Linux 分区"
-#: ../autopart.py:1718
+#: ../autopart.py:1727
msgid "Keep all partitions and use existing free space"
msgstr "保存所有分区,使用现有的空闲空间"
-#: ../backend.py:126
+#: ../backend.py:129
#, python-format
msgid "Upgrading %s\n"
msgstr "升级 %s\n"
-#: ../backend.py:128
+#: ../backend.py:131
#, python-format
msgid "Installing %s\n"
msgstr "安装 %s\n"
-#: ../bootloader.py:44 ../bootloader.py:236 ../image.py:87
-#: ../partedUtils.py:365 ../partedUtils.py:395 ../partedUtils.py:1106
-#: ../partedUtils.py:1259 ../upgrade.py:432 ../yuminstall.py:1463
-#: ../yuminstall.py:1490 ../iw/autopart_type.py:180 ../iw/blpasswidget.py:149
-#: ../iw/task_gui.py:53 ../iw/upgrade_swap_gui.py:192
-#: ../iw/upgrade_swap_gui.py:200 ../iw/upgrade_swap_gui.py:207
-#: ../textw/bootloader_text.py:127 ../textw/bootloader_text.py:452
-#: ../textw/partition_text.py:250 ../textw/upgrade_text.py:186
+#: ../backend.py:150
+msgid "Copying File"
+msgstr "正在复制文件"
+
+#: ../backend.py:151
+msgid "Transferring install image to hard drive..."
+msgstr "正在将安装映像传输到硬盘..."
+
+#: ../backend.py:161
+msgid ""
+"An error occurred transferring the install image to your hard drive. This "
+"is probably due to bad media."
+msgstr "将安装映像传送到您的硬盘时出错,很可能是由介质损坏造成的。"
+
+#: ../backend.py:165
+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
+#: ../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
+#: ../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
+#: ../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
+#: ../loader/cdinstall.c:503 ../loader/driverdisk.c:100
+#: ../loader/driverdisk.c:307 ../loader/driverdisk.c:342
+#: ../loader/driverdisk.c:373 ../loader/driverdisk.c:381
+#: ../loader/driverdisk.c:445 ../loader/hdinstall.c:143
+#: ../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/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
+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
+#: ../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
+#: ../textw/upgrade_text.py:186
msgid "Warning"
msgstr "警告"
@@ -426,54 +478,55 @@ msgstr ""
"\n"
"您想继续安装吗?"
-#: ../bootloader.py:49 ../exception.py:348 ../exception.py:363
-#: ../exception.py:381 ../fsset.py:1715 ../fsset.py:1972 ../fsset.py:2711
-#: ../fsset.py:2718 ../gui.py:1192 ../gui.py:1326 ../gui.py:1403
-#: ../image.py:96 ../livecd.py:361 ../packages.py:152 ../upgrade.py:113
-#: ../upgrade.py:133 ../yuminstall.py:718 ../yuminstall.py:793
-#: ../yuminstall.py:799 ../yuminstall.py:970 ../yuminstall.py:1018
-#: ../yuminstall.py:1251 ../yuminstall.py:1288
+#: ../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
msgid "_Exit installer"
msgstr "(_E)退出安装程序"
-#: ../bootloader.py:49 ../fsset.py:1973 ../image.py:97 ../image.py:250
-#: ../kickstart.py:985 ../kickstart.py:1023 ../partedUtils.py:1262
-#: ../upgrade.py:113 ../upgrade.py:133 ../yuminstall.py:975
-#: ../iw/partition_gui.py:1037
+#: ../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
+#: ../iw/partition_gui.py:1041
msgid "_Continue"
msgstr "继续(_C)"
-#: ../bootloader.py:167
+#: ../bootloader.py:163
msgid "Bootloader"
msgstr "引导装载程序"
-#: ../bootloader.py:167
+#: ../bootloader.py:163
msgid "Installing bootloader..."
msgstr "正在安装引导装载程序..."
-#: ../bootloader.py:237
+#: ../bootloader.py:231
msgid ""
"No kernel packages were installed on your system. Your boot loader "
"configuration will not be changed."
msgstr "您的系统上没有安装任何内核软件包。引导装载程序的配置不变。"
-#: ../cmdline.py:53
+#: ../cmdline.py:54
msgid "Completed"
msgstr "已完成"
-#: ../cmdline.py:61
+#: ../cmdline.py:62
msgid "In progress... "
msgstr "进程中..."
-#: ../cmdline.py:90
+#: ../cmdline.py:97
msgid "Can't have a question in command line mode!"
msgstr "无法在命令行模式中提问!"
-#: ../cmdline.py:109
+#: ../cmdline.py:116
msgid "Parted exceptions can't be handled in command line mode!"
msgstr "命令行模式中无法处理分开例外!"
-#: ../constants.py:75
+#: ../constants.py:74
msgid ""
"An unhandled exception has occurred. This is most likely a bug. Please "
"save a copy of the detailed exception and file a bug report"
@@ -481,94 +534,156 @@ msgstr ""
"出现了一个无法处理的例外。这极可能是一个程序错误。请将此例外的详情以及报告程"
"序错误的文件复制下"
-#: ../constants.py:81
+#: ../constants.py:80
msgid " with the provider of this software."
msgstr " 连同这个软件的供应商。"
-#: ../constants.py:85
+#: ../constants.py:84
#, python-format
msgid " against anaconda at %s"
msgstr " 在 %s 根据 anaconda"
-#: ../exception.py:344 ../exception.py:359 ../exception.py:377
+#: ../exception.py:364
+#, python-format
+msgid ""
+"Your bug could not be filed due to the following error when communicating "
+"with bugzilla:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../exception.py:367
+#, python-format
+msgid ""
+"Your bug could not be filed due to bad information in the bug fields. This "
+"is most likely an error in anaconda:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../exception.py:371
+#, fuzzy
+msgid "Unable To File Bug"
+msgstr "无法删除"
+
+#: ../exception.py:377
+#, fuzzy
+msgid "Bug Filing Not Supported"
+msgstr "不支持"
+
+#: ../exception.py:378
+msgid ""
+"Your distribution does not provide a supported bug filing system, so you "
+"cannot save your exception this way."
+msgstr ""
+
+#: ../exception.py:384
+#, fuzzy
+msgid "Invalid Bug Information"
+msgstr "IP 信息无效"
+
+#: ../exception.py:385
+msgid "Please provide a valid username, password, and short bug description."
+msgstr ""
+
+#: ../exception.py:395
+#, fuzzy
+msgid "Unable To Login"
+msgstr "无法编辑"
+
+#: ../exception.py:396
+#, python-format
+msgid ""
+"There was an error logging into %s using the provided username and password."
+msgstr ""
+
+#: ../exception.py:433
+msgid "Bug Created"
+msgstr ""
+
+#: ../exception.py:434
+#, python-format
+msgid ""
+"A new bug has been created with your traceback attached. Please add "
+"additional information such as what you were doing when you encountered the "
+"bug, screenshots, and whatever else is appropriate to the following bug:\n"
+"\n"
+"%s/%s"
+msgstr ""
+
+#: ../exception.py:450
+#, fuzzy
+msgid "Bug Updated"
+msgstr "更新"
+
+#: ../exception.py:451
+#, python-format
+msgid ""
+"A bug with your information already exists. Your account has been added to "
+"the CC list and your traceback added as a comment. Please add additional "
+"descriptive information to the following bug:\n"
+"\n"
+"%s/%s"
+msgstr ""
+
+#: ../exception.py:475 ../exception.py:490 ../exception.py:515
msgid "Dump Written"
msgstr "已写完转储信息"
-#: ../exception.py:345 ../exception.py:360
+#: ../exception.py:476 ../exception.py:491
msgid ""
"Your system's state has been successfully written to the disk. The installer "
"will now exit."
msgstr "您的系统状态已被成功地写入软盘,将退出安装程序。"
-#: ../exception.py:351 ../exception.py:368 ../exception.py:384
+#: ../exception.py:482 ../exception.py:499 ../exception.py:522
msgid "Dump Not Written"
msgstr "未写完转储信息"
-#: ../exception.py:352 ../exception.py:369
+#: ../exception.py:483 ../exception.py:500
msgid "There was a problem writing the system state to the disk."
msgstr "将系统状态写入软盘时出现问题。"
-#: ../exception.py:378
+#: ../exception.py:506 ../exception.py:529
+#, fuzzy
+msgid "No Network Available"
+msgstr "网络设备"
+
+#: ../exception.py:507 ../exception.py:530
+msgid ""
+"Cannot save a bug report since there is no active networking device "
+"available."
+msgstr ""
+
+#: ../exception.py:516
msgid ""
"Your system's state has been successfully written to the remote host. The "
"installer will now exit."
msgstr "您的系统状态已被成功地写入远程主机。将退出安装."
-#: ../exception.py:385
+#: ../exception.py:523
msgid "There was a problem writing the system state to the remote host."
msgstr "将系统状态存入远程主机时出现问题。"
-#: ../fsset.py:548
+#: ../fsset.py:514
msgid "Checking"
msgstr "正在检查"
-#: ../fsset.py:549
+#: ../fsset.py:515
#, python-format
msgid "Checking filesystem on %s..."
msgstr "正在检查 %s 中的文件系统..."
-#: ../fsset.py:560 ../fsset.py:1015
+#: ../fsset.py:526 ../fsset.py:984
msgid "Resizing"
msgstr "重新定义大小"
-#: ../fsset.py:561 ../fsset.py:1016
+#: ../fsset.py:527 ../fsset.py:985
#, python-format
msgid "Resizing filesystem on %s..."
msgstr "正在 %s 中重新定义文件系统大小..."
-#: ../fsset.py:704 ../fsset.py:1685 ../fsset.py:1716 ../fsset.py:1792
-#: ../fsset.py:1860 ../fsset.py:1910 ../fsset.py:1995 ../fsset.py:2008
-#: ../image.py:267 ../livecd.py:354 ../partIntfHelpers.py:412 ../text.py:445
-#: ../yuminstall.py:374 ../yuminstall.py:438 ../yuminstall.py:609
-#: ../yuminstall.py:714 ../yuminstall.py:981 ../yuminstall.py:1022
-#: ../yuminstall.py:1256 ../yuminstall.py:1281 ../iw/autopart_type.py:95
-#: ../iw/autopart_type.py:170 ../iw/autopart_type.py:314
-#: ../iw/netconfig_dialog.py:265 ../iw/osbootwidget.py:214
-#: ../iw/osbootwidget.py:223 ../iw/raid_dialog_gui.py:671
-#: ../iw/raid_dialog_gui.py:710 ../iw/task_gui.py:43 ../iw/task_gui.py:231
-#: ../textw/grpselect_text.py:123 ../textw/partition_text.py:1651
-#: ../textw/partition_text.py:1657 ../textw/partition_text.py:1679
-#: ../textw/upgrade_text.py:174 ../textw/upgrade_text.py:181
-#: ../loader/cdinstall.c:146 ../loader/cdinstall.c:421
-#: ../loader/driverdisk.c:98 ../loader/driverdisk.c:299
-#: ../loader/driverdisk.c:337 ../loader/driverdisk.c:365
-#: ../loader/driverdisk.c:375 ../loader/driverdisk.c:439
-#: ../loader/hdinstall.c:141 ../loader/hdinstall.c:252
-#: ../loader/hdinstall.c:438 ../loader/hdinstall.c:540
-#: ../loader/hdinstall.c:583 ../loader/hdinstall.c:596
-#: ../loader/kickstart.c:284 ../loader/lang.c:115 ../loader/loader.c:344
-#: ../loader/loader.c:445 ../loader/loader.c:997 ../loader/mediacheck.c:62
-#: ../loader/mediacheck.c:101 ../loader/mediacheck.c:108
-#: ../loader/method.c:120 ../loader/method.c:346 ../loader/method.c:420
-#: ../loader/nfsinstall.c:153 ../loader/nfsinstall.c:283
-#: ../loader/nfsinstall.c:301 ../loader/telnetd.c:93
-#: ../loader/urlinstall.c:78 ../loader/urlinstall.c:101
-#: ../loader/urlinstall.c:185 ../loader/urlinstall.c:196
-#: ../loader/urls.c:315 ../loader/urls.c:321
-msgid "Error"
-msgstr "错误"
-
-#: ../fsset.py:705
+#: ../fsset.py:671
#, python-format
msgid ""
"An error occurred migrating %s to ext3. It is possible to continue without "
@@ -581,31 +696,31 @@ msgstr ""
"\n"
"您想不迁移 %s 而继续吗?"
-#: ../fsset.py:1538
+#: ../fsset.py:1530
msgid "EFI System Partition"
msgstr "EFI 系统分区"
-#: ../fsset.py:1542
+#: ../fsset.py:1534
msgid "RAID Device"
msgstr "RAID 设备"
-#: ../fsset.py:1546 ../fsset.py:1552
+#: ../fsset.py:1538 ../fsset.py:1544
msgid "Apple Bootstrap"
msgstr "Apple 自展程序"
-#: ../fsset.py:1557 ../partitions.py:1121
+#: ../fsset.py:1549 ../partitions.py:1245
msgid "PPC PReP Boot"
msgstr "PPC PReP 引导"
-#: ../fsset.py:1560
+#: ../fsset.py:1552
msgid "First sector of boot partition"
msgstr "引导分区的第一个扇区"
-#: ../fsset.py:1561
+#: ../fsset.py:1553
msgid "Master Boot Record (MBR)"
msgstr "主引导记录(MBR)"
-#: ../fsset.py:1686
+#: ../fsset.py:1684
#, python-format
msgid ""
"An error occurred trying to initialize swap on device %s. This problem is "
@@ -617,13 +732,13 @@ msgstr ""
"\n"
"请按 <Enter> 键退出安装."
-#: ../fsset.py:1715 ../packages.py:368 ../rescue.py:305 ../rescue.py:307
-#: ../textw/upgrade_text.py:132 ../loader/cdinstall.c:200
-#: ../loader/cdinstall.c:203 ../loader/method.c:393
+#: ../fsset.py:1713 ../packages.py:349 ../rescue.py:312 ../rescue.py:314
+#: ../textw/upgrade_text.py:132 ../loader/cdinstall.c:239
+#: ../loader/cdinstall.c:242 ../loader/method.c:327
msgid "Skip"
msgstr "跳过"
-#: ../fsset.py:1736
+#: ../fsset.py:1734
#, python-format
msgid ""
"The swap device:\n"
@@ -641,11 +756,11 @@ msgstr ""
"是 0 版本的 Linux 交换分区。如果您想使用此设备,您必须用 1 版本的Linux 交换分"
"区进行格式化。如果跳过,安装将在安装过程中忽略它。"
-#: ../fsset.py:1743
+#: ../fsset.py:1741
msgid "Reformat"
msgstr "重新格式化"
-#: ../fsset.py:1747
+#: ../fsset.py:1745
#, python-format
msgid ""
"The swap device:\n"
@@ -663,7 +778,7 @@ msgstr ""
"在 /etc/fstab 文件中的当前状态是睡眠状态。如果要进行升级,请关闭您的系统,而"
"不是使系统进入睡眠状态。"
-#: ../fsset.py:1755
+#: ../fsset.py:1753
#, python-format
msgid ""
"The swap device:\n"
@@ -681,7 +796,7 @@ msgstr ""
"在 /etc/fstab 中文件用作软件延缓分区.如果要进行全新的安装,请确认安装程序被设"
"置为格式化所有交换分区."
-#: ../fsset.py:1765
+#: ../fsset.py:1763
msgid ""
"\n"
"\n"
@@ -693,11 +808,11 @@ msgstr ""
"如果您想在升级过程中忽略这个分区,请选择跳过.选择格式化将使这个分区被重新格式"
"化为交换分区."
-#: ../fsset.py:1770 ../iw/partition_gui.py:373
+#: ../fsset.py:1768 ../iw/partition_gui.py:375
msgid "Format"
msgstr "格式化"
-#: ../fsset.py:1776
+#: ../fsset.py:1774
#, python-format
msgid ""
"Error enabling swap device %s: %s\n"
@@ -712,7 +827,7 @@ msgstr ""
"\n"
"请按确定退出安装程序。"
-#: ../fsset.py:1781
+#: ../fsset.py:1779
#, python-format
msgid ""
"Error enabling swap device %s: %s\n"
@@ -728,7 +843,7 @@ msgstr ""
"\n"
"请按确定退出安装程序。"
-#: ../fsset.py:1787
+#: ../fsset.py:1785
#, python-format
msgid ""
"Error enabling swap device %s: %s\n"
@@ -743,7 +858,7 @@ msgstr ""
"\n"
"请按确定退出安装."
-#: ../fsset.py:1861
+#: ../fsset.py:1859
#, python-format
msgid ""
"An error occurred trying to format %s. This problem is serious, and the "
@@ -755,7 +870,7 @@ msgstr ""
"\n"
"请按 <Enter> 退出安装."
-#: ../fsset.py:1911
+#: ../fsset.py:1909
#, python-format
msgid ""
"An error occurred trying to migrate %s. This problem is serious, and the "
@@ -767,11 +882,11 @@ msgstr ""
"\n"
"请按 <Enter> 键退出安装."
-#: ../fsset.py:1940 ../fsset.py:1949
+#: ../fsset.py:1945 ../fsset.py:1954
msgid "Invalid mount point"
msgstr "挂载点无效"
-#: ../fsset.py:1941
+#: ../fsset.py:1946
#, python-format
msgid ""
"An error occurred when trying to create %s. Some element of this path is "
@@ -783,7 +898,7 @@ msgstr ""
"\n"
"请按 <Enter> 退出安装."
-#: ../fsset.py:1950
+#: ../fsset.py:1955
#, python-format
msgid ""
"An error occurred when trying to create %s: %s. This is a fatal error and "
@@ -795,23 +910,24 @@ msgstr ""
"\n"
"请按 <Enter>退出安装."
-#: ../fsset.py:1964
+#: ../fsset.py:1969
msgid "Unable to mount filesystem"
msgstr "无法载入文件系统!"
-#: ../fsset.py:1965
+#: ../fsset.py:1970
#, python-format
msgid ""
"An error occurred mounting device %s as %s. You may continue installation, "
"but there may be problems."
msgstr "配置硬件%s 为 %s时出错。您仍可继续安装,但可能无法正常运行。"
-#: ../fsset.py:1981
-#, python-format
+#: ../fsset.py:1986
+#, fuzzy, python-format
msgid ""
"Error mounting device %s as %s: %s\n"
"\n"
-"Devices in /etc/fstab should be specified by label, not by device name.\n"
+"Devices in /etc/fstab should be specified by label or UUID, not by device "
+"name.\n"
"\n"
"Press OK to exit the installer."
msgstr ""
@@ -821,22 +937,18 @@ msgstr ""
"\n"
"请按确定退出安装."
-#: ../fsset.py:1988
-#, python-format
+#: ../fsset.py:1993
+#, fuzzy, python-format
msgid ""
"Error mounting device %s as %s: %s\n"
"\n"
-"This most likely means this partition has not been formatted.\n"
-"\n"
"Press OK to exit the installer."
msgstr ""
-"将 %s 设备挂载成 %s 时出错:%s\n"
-"\n"
-"最可能的原因是这个分区还没有被格式化.\n"
+"找不到 RAID 设备 %s 以便为 %s 使用.\n"
"\n"
-"请按确定退出安装。"
+"按确定退出安装."
-#: ../fsset.py:2009
+#: ../fsset.py:2011
msgid ""
"Error finding / entry.\n"
"\n"
@@ -850,11 +962,11 @@ msgstr ""
"\n"
"请按确定退出安装."
-#: ../fsset.py:2703
+#: ../fsset.py:2720
msgid "Duplicate Labels"
msgstr "标签重复"
-#: ../fsset.py:2704
+#: ../fsset.py:2721
#, python-format
msgid ""
"Multiple devices on your system are labelled %s. Labels across devices must "
@@ -866,35 +978,24 @@ msgstr ""
"\n"
"请解决这个问题后重新启动安装过程。"
-#: ../fsset.py:2713
-msgid "Invalid Label"
-msgstr "标签无效"
-
-#: ../fsset.py:2714
-#, python-format
-msgid ""
-"An invalid label was found on device %s. Please fix this problem and "
-"restart the installation process."
-msgstr "驱动器%s上发现一个无效标签.请解决这个问题后重新启动安装过程。"
-
-#: ../fsset.py:2877
+#: ../fsset.py:2886
msgid "Formatting"
msgstr "正在格式化"
-#: ../fsset.py:2878
+#: ../fsset.py:2887
#, python-format
msgid "Formatting %s file system..."
msgstr "正在格式化 %s 文件系统..."
-#: ../gui.py:106
+#: ../gui.py:108
msgid "An error occurred copying the screenshots over."
msgstr "复制屏幕快照时出错。"
-#: ../gui.py:117
+#: ../gui.py:119
msgid "Screenshots Copied"
msgstr "屏幕快照被复制"
-#: ../gui.py:118
+#: ../gui.py:120
msgid ""
"The screenshots have been saved into the directory:\n"
"\n"
@@ -908,79 +1009,85 @@ msgstr ""
"\n"
"重新引导后再以根用户的身份登录,您便可以存取它们。"
-#: ../gui.py:161
+#: ../gui.py:163
msgid "Saving Screenshot"
msgstr "保存屏幕快照"
-#: ../gui.py:162
+#: ../gui.py:164
#, python-format
msgid "A screenshot named '%s' has been saved."
msgstr "名为“%s”的屏幕快照已被保存。"
-#: ../gui.py:165
+#: ../gui.py:167
msgid "Error Saving Screenshot"
msgstr "保存屏幕快照时出错"
-#: ../gui.py:166
+#: ../gui.py:168
msgid ""
"An error occurred while saving the screenshot. If this occurred during "
"package installation, you may need to try several times for it to succeed."
msgstr ""
"保存屏幕快照时出错。如果它在软件包安装过程中出现,您可能要多试几次才能成功。"
-#: ../gui.py:231 ../text.py:534
+#: ../gui.py:233 ../text.py:586
msgid "Fix"
msgstr "修复"
-#: ../gui.py:232 ../rescue.py:228 ../text.py:535
-#: ../textw/bootloader_text.py:72 ../textw/constants_text.py:54
-#: ../loader/driverdisk.c:479 ../loader/driverdisk.c:489
-#: ../loader/hdinstall.c:334
+#: ../gui.py:234 ../rescue.py:222 ../text.py:587
+#: ../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:233 ../rescue.py:228 ../rescue.py:230 ../text.py:536
-#: ../textw/bootloader_text.py:72 ../textw/constants_text.py:58
-#: ../loader/driverdisk.c:479 ../loader/driverdisk.c:489
+#: ../gui.py:235 ../rescue.py:222 ../rescue.py:224 ../text.py:588
+#: ../textw/bootloader_text.py:72 ../textw/constants_text.py:60
+#: ../loader/driverdisk.c:485 ../loader/driverdisk.c:495
msgid "No"
msgstr "否"
-#: ../gui.py:235 ../text.py:538 ../text.py:669 ../loader/net.c:92
-#: ../loader/net.c:338 ../loader/net.c:589 ../loader/net.c:695
-#: ../loader/net.c:820 ../loader/net.c:828 ../loader/net.c:1224
-#: ../loader/net.c:1230
+#: ../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
msgid "Retry"
msgstr "重试"
-#: ../gui.py:236 ../text.py:539
+#: ../gui.py:238 ../text.py:591
msgid "Ignore"
msgstr "忽略"
-#: ../gui.py:237 ../gui.py:856 ../gui.py:1403 ../partIntfHelpers.py:244
-#: ../partIntfHelpers.py:535 ../text.py:108 ../text.py:109 ../text.py:540
-#: ../textw/bootloader_text.py:202 ../textw/constants_text.py:46
-#: ../loader/dirbrowser.c:145 ../loader/driverdisk.c:236
-#: ../loader/kickstart.c:372 ../loader/loader.c:379 ../loader/loader.c:480
+#: ../gui.py:239 ../gui.py:910 ../gui.py:1495 ../partIntfHelpers.py:245
+#: ../partIntfHelpers.py:536 ../text.py:109 ../text.py:110 ../text.py:592
+#: ../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:582 ../text.py:466
+#: ../gui.py:581 ../text.py:518
msgid "Installation Key"
msgstr "安装码"
-#: ../gui.py:656 ../gui.py:664
+#: ../gui.py:660 ../text.py:323
+#, fuzzy, python-format
+msgid ""
+"Choose a passphrase for this encrypted device%s. You will be prompted for "
+"the passphrase during system boot."
+msgstr "为这个加密分区选择密码句。在系统引导时会提示您输入密码句。"
+
+#: ../gui.py:679 ../gui.py:687 ../text.py:367 ../text.py:377
msgid "Error with passphrase"
msgstr "密码错误"
-#: ../gui.py:657
+#: ../gui.py:680 ../text.py:368
msgid "The passphrases you entered were different. Please try again."
msgstr "您输入的密码不匹配,请重新输入。"
-#: ../gui.py:665
+#: ../gui.py:688
msgid "The passphrase must be at least eight characters long."
msgstr "密码至少应包含八个字符。"
-#: ../gui.py:691 ../text.py:276
+#: ../gui.py:723 ../text.py:400
#, python-format
msgid ""
"Device %s is encrypted. In order to access the device's contents during "
@@ -988,36 +1095,41 @@ msgid ""
msgstr ""
"设备 %s 是加密的。为了要在安装过程中访问设备的内容,您必须输入以下设备密码。"
-#: ../gui.py:868 ../gui.py:869 ../gui.py:981 ../gui.py:982
+#: ../gui.py:780
+#, python-format
+msgid "Bugzilla (%s)"
+msgstr ""
+
+#: ../gui.py:922 ../gui.py:923 ../gui.py:1035 ../gui.py:1036
#: tmp/anaconda.glade.h:2
msgid "_Debug"
msgstr "调试(_D)"
-#: ../gui.py:1025 ../gui.py:1027 ../gui.py:1400 ../livecd.py:112
+#: ../gui.py:1079 ../gui.py:1081 ../gui.py:1492 ../livecd.py:113
msgid "Exit installer"
msgstr "退出安装程序"
-#: ../gui.py:1027 ../text.py:254 ../text.py:262
+#: ../gui.py:1081 ../text.py:294 ../text.py:302
msgid "Debug"
msgstr "调试"
-#: ../gui.py:1029 ../text.py:258
+#: ../gui.py:1083 ../text.py:298
msgid "Exception Occurred"
msgstr "出现例外"
-#: ../gui.py:1189 ../text.py:511
+#: ../gui.py:1281 ../text.py:563
msgid "Error Parsing Kickstart Config"
msgstr "解析 kickstart 配置时出错"
-#: ../gui.py:1235
+#: ../gui.py:1327
msgid "default:LTR"
msgstr "默认:LTR"
-#: ../gui.py:1315 ../text.py:664
+#: ../gui.py:1407 ../text.py:711
msgid "Error!"
msgstr "错误!"
-#: ../gui.py:1316 ../text.py:665
+#: ../gui.py:1408 ../text.py:712
#, python-format
msgid ""
"An error occurred when attempting to load an installer interface component.\n"
@@ -1027,51 +1139,52 @@ msgstr ""
"试图载入安装程序界面部件时出现错误。\n"
"className = %s"
-#: ../gui.py:1321 ../image.py:165 ../image.py:191 ../packages.py:417
-#: ../packages.py:422
+#: ../gui.py:1413 ../image.py:164 ../image.py:194 ../packages.py:398
+#: ../packages.py:403
msgid "_Exit"
msgstr "退出(_E)"
-#: ../gui.py:1322 ../image.py:191 ../yuminstall.py:606 ../yuminstall.py:970
-#: ../yuminstall.py:1018 ../yuminstall.py:1251
+#: ../gui.py:1414 ../image.py:164 ../image.py:194 ../livecd.py:203
+#: ../yuminstall.py:653 ../yuminstall.py:1041 ../yuminstall.py:1089
+#: ../yuminstall.py:1294
msgid "_Retry"
msgstr "重试(_R)"
-#: ../gui.py:1325 ../packages.py:189 ../packages.py:421
+#: ../gui.py:1417 ../packages.py:168 ../packages.py:402
msgid "The installer will now exit..."
msgstr "安装程序现在退出..."
-#: ../gui.py:1328 ../packages.py:424
+#: ../gui.py:1420 ../packages.py:405
msgid "Your system will now be rebooted..."
msgstr "您的系统现在将会被重新引导..."
-#: ../gui.py:1329 ../image.py:250 ../packages.py:190 ../packages.py:425
-#: ../partedUtils.py:1261 ../yuminstall.py:1304
+#: ../gui.py:1421 ../image.py:253 ../packages.py:169 ../packages.py:406
+#: ../partedUtils.py:1286 ../yuminstall.py:1345
msgid "_Reboot"
msgstr "重新引导(_R)"
-#: ../gui.py:1331
+#: ../gui.py:1423
msgid "Exiting"
msgstr "退出中"
-#: ../gui.py:1401
+#: ../gui.py:1493
msgid "Are you sure you wish to exit the installation?"
msgstr "你确定你想要退出安装吗?"
-#: ../gui.py:1410
+#: ../gui.py:1502
#, python-format
msgid "%s Installer"
msgstr "%s 安装程序"
-#: ../gui.py:1417
+#: ../gui.py:1509
msgid "Unable to load title bar"
msgstr "无法载入标题栏"
-#: ../gui.py:1470
+#: ../gui.py:1562
msgid "Install Window"
msgstr "安装窗口"
-#: ../image.py:88
+#: ../image.py:83
#, python-format
msgid ""
"The ISO image %s has a size which is not a multiple of 2048 bytes. This may "
@@ -1085,11 +1198,11 @@ msgstr ""
"\n"
"建议您重新启动,取消安装.但是您也可以选择继续."
-#: ../image.py:157
+#: ../image.py:156
msgid "Couldn't Mount ISO Source"
msgstr "无法挂载ISO镜像"
-#: ../image.py:158
+#: ../image.py:157
#, python-format
msgid ""
"An error occurred mounting the source device %s. This may happen if your "
@@ -1100,28 +1213,28 @@ msgstr ""
"挂载源设备%s时出现了错误。这可能是由于你的ISO镜像在诸如LVM或者RAID这样的高层"
"存储设备上,或者在分区挂载的时候产生了错误。点击退出来退出安装。"
-#: ../image.py:182
+#: ../image.py:185
msgid "Missing ISO 9660 Image"
msgstr "缺少 ISO 9660图像"
-#: ../image.py:183
-#, python-format
+#: ../image.py:186
+#, fuzzy, python-format
msgid ""
"The installer has tried to mount image #%s, but cannot find it on the hard "
"drive.\n"
"\n"
-"Please copy this image to the drive and click Retry. Click Exit to abort "
+"Please copy this image to the drive and click Retry. Click Exit to abort "
"the installation."
msgstr ""
"安装程序试图加载映像#%s,但在硬盘上无法找到该映像。\n"
"\n"
"请将此图像复制到硬盘中,并点击重试。点击退出来终止安装。"
-#: ../image.py:241
+#: ../image.py:244
msgid "Required Install Media"
msgstr "需要的安装介质"
-#: ../image.py:242
+#: ../image.py:245
#, python-format
msgid ""
"The software you have selected to install will require the following discs:\n"
@@ -1136,13 +1249,13 @@ msgstr ""
"请在继续安装前准备好这些光盘。如果您需要中止安装并重新引导,请选择“重新引"
"导”。"
-#: ../image.py:250 ../livecd.py:360 ../packages.py:371 ../packages.py:422
-#: ../packages.py:425 ../yuminstall.py:718 ../yuminstall.py:799
-#: ../yuminstall.py:1288 ../yuminstall.py:1304
+#: ../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
msgid "_Back"
msgstr "上一步(_B)"
-#: ../image.py:268
+#: ../image.py:292
#, python-format
msgid ""
"An error occurred unmounting the disc. Please make sure you're not "
@@ -1150,15 +1263,15 @@ msgid ""
msgstr ""
"卸载光盘时出错。请确定您不是从 tty2 上的命令行访问 %s,然后点击确定来重试。"
-#: ../installclass.py:71
+#: ../installclass.py:73
msgid "Install on System"
msgstr "在系统上安装"
-#: ../iscsi.py:205 ../iscsi.py:206
+#: ../iscsi.py:208 ../iscsi.py:209
msgid "Initializing iSCSI initiator"
msgstr "初始化iSCSI initiator"
-#: ../kickstart.py:86
+#: ../kickstart.py:93
#, python-format
msgid ""
"There was an error running the kickstart script at line %s. You may examine "
@@ -1168,42 +1281,42 @@ msgstr ""
"运行 %s 行的 kickstart 脚本时出错。您可以在 %s 上检查它的输出。这是一个致命错"
"误,安装将会中止。请按确定按钮来退出安装程序。"
-#: ../kickstart.py:101 ../kickstart.py:103
+#: ../kickstart.py:108 ../kickstart.py:110
msgid "Scriptlet Failure"
msgstr "Scriptlet 失败"
-#: ../kickstart.py:928 ../kickstart.py:945
+#: ../kickstart.py:1027 ../kickstart.py:1044
msgid "Running..."
msgstr "正在运行..."
-#: ../kickstart.py:929
+#: ../kickstart.py:1028
msgid "Running post-install scripts"
msgstr "运行安装后脚本"
-#: ../kickstart.py:946
+#: ../kickstart.py:1045
msgid "Running pre-install scripts"
msgstr "运行安装前脚本"
-#: ../kickstart.py:977
+#: ../kickstart.py:1076
msgid "Missing Package"
msgstr "缺少软件包"
-#: ../kickstart.py:978
+#: ../kickstart.py:1077
#, 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:984 ../kickstart.py:1022
+#: ../kickstart.py:1083 ../kickstart.py:1121
msgid "_Abort"
msgstr "中止(_A)"
-#: ../kickstart.py:1014
+#: ../kickstart.py:1113
msgid "Missing Group"
msgstr "缺少软件包组"
-#: ../kickstart.py:1015
+#: ../kickstart.py:1114
#, python-format
msgid ""
"You have specified that the group '%s' should be installed. This group does "
@@ -1211,99 +1324,129 @@ msgid ""
msgstr ""
"您已指定要安装 '%s' 软件包组。该软件包组不存在。您想要继续还是中止安装?"
-#: ../livecd.py:107
+#: ../livecd.py:108
msgid "Unable to find image"
msgstr "找不到安装映像"
-#: ../livecd.py:108
+#: ../livecd.py:109
#, python-format
msgid ""
"The given location isn't a valid %s live CD to use as an installation source."
msgstr "给出的位置不是一个有效的%s liveCD使用的安装源。"
-#: ../livecd.py:167
+#: ../livecd.py:171
msgid "Copying live image to hard drive."
msgstr "正在将安装映像传输到硬盘."
-#: ../livecd.py:203
+#: ../livecd.py:197
+#, fuzzy
+msgid ""
+"There was an error installing the live image to your hard drive. This could "
+"be due to bad media. Please verify your installation media.\n"
+"\n"
+"If you exit, your system will be left in an inconsistent state that will "
+"require reinstallation."
+msgstr ""
+"无法打开 %s 文件。这是由于文件遗失、软件包损坏或者介质损坏造成的。请检查您的"
+"安装源。\n"
+"\n"
+"您如果现在退出,您的系统会不稳定需要重新安装。\n"
+"\n"
+
+#: ../livecd.py:226
msgid "Doing post-installation"
msgstr "正在后安装"
-#: ../livecd.py:204
+#: ../livecd.py:227
msgid ""
"Performing post-installation filesystem changes. This may take several "
"minutes..."
msgstr "进行安装后文件系统改变,可能要等一会..."
-#: ../livecd.py:355
+#: ../livecd.py:380
#, python-format
msgid ""
"The root filesystem you created is not large enough for this live image "
"(%.2f MB required)."
msgstr "您创建的根文件系统不够大,无法容纳这个实时映像(需要 %.2f MB)。"
-#: ../network.py:57
-msgid "Hostname must be 64 or less characters in length."
+#: ../network.py:64
+#, fuzzy
+msgid "Hostname must be 64 or fewer characters in length."
msgstr "主机名的长度必须小于等于64个字符。"
-#: ../network.py:60
-msgid "Hostname must start with a valid character in the range 'a-z' or 'A-Z'"
+#: ../network.py:70
+#, fuzzy
+msgid ""
+"Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or '0-"
+"9'"
msgstr "主机名只能以“a-z”或“A-Z”范围内的字符开头"
-#: ../network.py:65
-msgid "Hostnames can only contain the characters 'a-z', 'A-Z', '-', or '.'"
+#: ../network.py:75
+#, fuzzy
+msgid ""
+"Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.'"
msgstr "主机名只能包含字符:“a-z”、“A-Z”、“-”、或“.”。"
-#: ../network.py:95
+#: ../network.py:132
msgid "IP address is missing."
msgstr "缺少IP地址"
-#: ../network.py:99
+#: ../network.py:136
msgid ""
"IPv4 addresses must contain four numbers between 0 and 255, separated by "
"periods."
msgstr "IPv4 地址必须包含4个从 0 到 255 之间的数字,中间有间隔。"
-#: ../network.py:102
+#: ../network.py:139
#, python-format
msgid "'%s' is not a valid IPv6 address."
msgstr "'%s' 不是有效的IPv6地址。"
-#: ../network.py:104
+#: ../network.py:141
#, python-format
msgid "'%s' is an invalid IP address."
msgstr "'%s' 不是有效的IP地址。"
-#: ../packages.py:147
+#: ../packages.py:112
msgid "Resizing Failed"
msgstr "调整大小失败"
-#: ../packages.py:148
+#: ../packages.py:113
#, python-format
msgid "There was an error encountered resizing the device %s."
msgstr "调整设备 %s 大小时遇到错误。"
-#: ../packages.py:188
+#: ../packages.py:146
+#, fuzzy
+msgid "Activating"
+msgstr "引导时激活"
+
+#: ../packages.py:146
+msgid "Activating new partitions. Please wait..."
+msgstr ""
+
+#: ../packages.py:167
msgid "LVM operation failed"
msgstr "LVM 操作失败"
-#: ../packages.py:342
+#: ../packages.py:323
msgid "Invalid Key"
msgstr "无效密码"
-#: ../packages.py:343
+#: ../packages.py:324
msgid "The key you entered is invalid."
msgstr "您所输入的密码无效."
-#: ../packages.py:371
+#: ../packages.py:352
msgid "_Skip"
msgstr "(_s)跳过"
-#: ../packages.py:403 ../packages.py:426
+#: ../packages.py:384 ../packages.py:407
msgid "Warning! This is pre-release software!"
msgstr "警告!这是预发行软件!"
-#: ../packages.py:404
+#: ../packages.py:385
#, python-format
msgid ""
"Thank you for downloading this pre-release of %s.\n"
@@ -1329,15 +1472,15 @@ msgstr ""
"\n"
"然后向“%s”提交报告。\n"
-#: ../packages.py:417
+#: ../packages.py:398
msgid "_Install anyway"
msgstr "强行安装(_I)"
-#: ../partedUtils.py:238 ../textw/partition_text.py:577
+#: ../partedUtils.py:240 ../textw/partition_text.py:578
msgid "Foreign"
msgstr "外来"
-#: ../partedUtils.py:366
+#: ../partedUtils.py:368
#, python-format
msgid ""
"The device %s is LDL formatted instead of CDL formatted. LDL formatted "
@@ -1353,7 +1496,7 @@ msgstr ""
"\n"
"您想使用 CDL 格式来重新格式化这个 DASD 吗?"
-#: ../partedUtils.py:396
+#: ../partedUtils.py:398
#, python-format
msgid ""
"/dev/%s currently has a %s partition layout. To use this drive for the "
@@ -1367,24 +1510,24 @@ msgstr ""
"\n"
"您想重新初始化这个驱动器吗?"
-#: ../partedUtils.py:405
+#: ../partedUtils.py:407
msgid "_Ignore drive"
msgstr "忽略驱动器(_I)"
-#: ../partedUtils.py:406
+#: ../partedUtils.py:408
msgid "_Re-initialize drive"
msgstr "重新初始化驱动"
-#: ../partedUtils.py:994
+#: ../partedUtils.py:1023
msgid "Initializing"
msgstr "初始化"
-#: ../partedUtils.py:995
+#: ../partedUtils.py:1024
#, python-format
msgid "Please wait while formatting drive %s...\n"
msgstr "正在格式化驱动器 %s ...请稍候...\n"
-#: ../partedUtils.py:1083
+#: ../partedUtils.py:1108
#, python-format
msgid ""
"The partition table on device %s was unreadable. To create new partitions it "
@@ -1402,12 +1545,12 @@ msgstr ""
"\n"
"您想要初始化这个驱动器并删除所有数据吗?"
-#: ../partedUtils.py:1097
-#, python-format
+#: ../partedUtils.py:1129
+#, fuzzy, python-format
msgid ""
-"The partition table on device %s (%s) was unreadable. To create new "
-"partitions it must be initialized, causing the loss of ALL DATA on this "
-"drive.\n"
+"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"
@@ -1421,7 +1564,7 @@ msgstr ""
"\n"
"您想要初始化这个驱动器并删除所有数据吗?"
-#: ../partedUtils.py:1251
+#: ../partedUtils.py:1277
#, python-format
msgid ""
"The drive /dev/%s has more than 15 partitions on it. The SCSI subsystem in "
@@ -1432,11 +1575,11 @@ msgstr ""
"驱动器/dev/%s 有超过15个分区.这时Linux内核的SCSI子系统不允许超过15个分区. 您"
"将无法改变此硬盘的分区,或在 %s中使用任何超出/dev/%s15的分区"
-#: ../partedUtils.py:1342
+#: ../partedUtils.py:1361
msgid "No Drives Found"
msgstr "未找到任何驱动器"
-#: ../partedUtils.py:1343
+#: ../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."
@@ -1444,47 +1587,47 @@ msgstr ""
"出现错误 - 未找到要在其中创建新文件系统的有效设备。请检查您的硬件以找到问题的"
"起因。"
-#: ../partIntfHelpers.py:42
+#: ../partIntfHelpers.py:43
msgid "Please enter a volume group name."
msgstr "请输入卷组名称。"
-#: ../partIntfHelpers.py:46
+#: ../partIntfHelpers.py:47
msgid "Volume Group Names must be less than 128 characters"
msgstr "卷组名称必须小于 128 个字符"
-#: ../partIntfHelpers.py:49
+#: ../partIntfHelpers.py:50
#, python-format
msgid "Error - the volume group name %s is not valid."
msgstr "错误 - 卷组名 %s 无效。"
-#: ../partIntfHelpers.py:54
+#: ../partIntfHelpers.py:55
msgid ""
"Error - the volume group name contains illegal characters or spaces. "
"Acceptable characters are letters, digits, '.' or '_'."
msgstr ""
"错误 - 卷组名包含不合法字符或空格。可被使用的字符是字母、数字、“.”或“_”。"
-#: ../partIntfHelpers.py:64
+#: ../partIntfHelpers.py:65
msgid "Please enter a logical volume name."
msgstr "请输入逻辑卷名称。"
-#: ../partIntfHelpers.py:68
+#: ../partIntfHelpers.py:69
msgid "Logical Volume Names must be less than 128 characters"
msgstr "逻辑卷名称必须小于 128 个字符"
-#: ../partIntfHelpers.py:72
+#: ../partIntfHelpers.py:73
#, python-format
msgid "Error - the logical volume name %s is not valid."
msgstr "错误 - 逻辑卷名称 %s 无效。"
-#: ../partIntfHelpers.py:78
+#: ../partIntfHelpers.py:79
msgid ""
"Error - the logical volume name contains illegal characters or spaces. "
"Acceptable characters are letters, digits, '.' or '_'."
msgstr ""
"错误 - 逻辑卷名包含不合法字符或空格。可使用的字符是字母、数字、“.”或“_”。"
-#: ../partIntfHelpers.py:102
+#: ../partIntfHelpers.py:103
#, python-format
msgid ""
"The mount point %s is invalid. Mount points must start with '/' and cannot "
@@ -1493,58 +1636,58 @@ msgstr ""
"挂载点%s无效。挂载点必须以“/”开始,但不能以“/”结束,并且必须使用可打印字符,"
"并不能包含空格。"
-#: ../partIntfHelpers.py:109
+#: ../partIntfHelpers.py:110
msgid "Please specify a mount point for this partition."
msgstr "请为该分区指定一个挂载点。"
-#: ../partIntfHelpers.py:119
+#: ../partIntfHelpers.py:120
#, python-format
msgid "This partition is part of the RAID device /dev/md%s."
msgstr "该分区是 RAID 设备/dev/md%s 的一部分。"
-#: ../partIntfHelpers.py:122
+#: ../partIntfHelpers.py:123
msgid "This partition is part of a RAID device."
msgstr "该分区是 RAID 设备的一部分。"
-#: ../partIntfHelpers.py:127
+#: ../partIntfHelpers.py:128
#, python-format
msgid "This partition is part of the LVM volume group '%s'."
msgstr "该分区是 LVM 卷组“%s”的一部分。"
-#: ../partIntfHelpers.py:130
+#: ../partIntfHelpers.py:131
msgid "This partition is part of a LVM volume group."
msgstr "该分区是 LVM 卷组的一部分。"
-#: ../partIntfHelpers.py:145 ../partIntfHelpers.py:153
-#: ../partIntfHelpers.py:160 ../partIntfHelpers.py:170
-#: ../partIntfHelpers.py:194
+#: ../partIntfHelpers.py:146 ../partIntfHelpers.py:154
+#: ../partIntfHelpers.py:161 ../partIntfHelpers.py:171
+#: ../partIntfHelpers.py:195
msgid "Unable To Delete"
msgstr "无法删除"
-#: ../partIntfHelpers.py:146
+#: ../partIntfHelpers.py:147
msgid "You must first select a partition to delete."
msgstr "您必须首先选择一个要删除的分区。"
-#: ../partIntfHelpers.py:154
+#: ../partIntfHelpers.py:155
msgid "You cannot delete free space."
msgstr "您不能删除空闲空间。"
-#: ../partIntfHelpers.py:161
+#: ../partIntfHelpers.py:162
msgid "You cannot delete a partition of a LDL formatted DASD."
msgstr "您不能删除 LDL 格式的 DASD 上的分区。"
-#: ../partIntfHelpers.py:171
+#: ../partIntfHelpers.py:172
#, python-format
msgid ""
"You cannot delete this partition, as it is an extended partition which "
"contains %s"
msgstr "您不能删除该分区,因为它是一个包含 %s 的扩展分区"
-#: ../partIntfHelpers.py:189 ../iw/raid_dialog_gui.py:607
+#: ../partIntfHelpers.py:190 ../iw/raid_dialog_gui.py:637
msgid "This partition is holding the data for the hard drive install."
msgstr "该分区含有硬盘安装的信息。"
-#: ../partIntfHelpers.py:195
+#: ../partIntfHelpers.py:196
msgid ""
"You cannot delete this partition:\n"
"\n"
@@ -1552,27 +1695,27 @@ msgstr ""
"您不能删除该分区:\n"
"\n"
-#: ../partIntfHelpers.py:240 ../partIntfHelpers.py:534
-#: ../iw/lvm_dialog_gui.py:800
+#: ../partIntfHelpers.py:241 ../partIntfHelpers.py:535
+#: ../iw/lvm_dialog_gui.py:817
msgid "Confirm Delete"
msgstr "确认删除"
-#: ../partIntfHelpers.py:241
+#: ../partIntfHelpers.py:242
#, python-format
msgid "You are about to delete all partitions on the device '/dev/%s'."
msgstr "要删除'/dev/%s'设备上的所有分区。"
-#: ../partIntfHelpers.py:244 ../partIntfHelpers.py:535
-#: ../iw/lvm_dialog_gui.py:803 ../iw/lvm_dialog_gui.py:1152
-#: ../iw/osbootwidget.py:103 ../iw/partition_gui.py:1380
+#: ../partIntfHelpers.py:245 ../partIntfHelpers.py:536
+#: ../iw/lvm_dialog_gui.py:820 ../iw/lvm_dialog_gui.py:1168
+#: ../iw/osbootwidget.py:104 ../iw/partition_gui.py:1384
msgid "_Delete"
msgstr "删除(_D)"
-#: ../partIntfHelpers.py:301
+#: ../partIntfHelpers.py:302
msgid "Notice"
msgstr "注意"
-#: ../partIntfHelpers.py:302
+#: ../partIntfHelpers.py:303
#, python-format
msgid ""
"The following partitions were not deleted because they are in use:\n"
@@ -1583,16 +1726,16 @@ msgstr ""
"\n"
"%s"
-#: ../partIntfHelpers.py:318 ../partIntfHelpers.py:331
-#: ../partIntfHelpers.py:357 ../partIntfHelpers.py:368
+#: ../partIntfHelpers.py:319 ../partIntfHelpers.py:332
+#: ../partIntfHelpers.py:358 ../partIntfHelpers.py:369
msgid "Unable To Edit"
msgstr "无法编辑"
-#: ../partIntfHelpers.py:319
+#: ../partIntfHelpers.py:320
msgid "You must select a partition to edit"
msgstr "您必须选择一个要编辑的分区"
-#: ../partIntfHelpers.py:331 ../partIntfHelpers.py:369
+#: ../partIntfHelpers.py:332 ../partIntfHelpers.py:370
msgid ""
"You cannot edit this partition:\n"
"\n"
@@ -1600,18 +1743,18 @@ msgstr ""
"您不能编辑该分区:\n"
"\n"
-#: ../partIntfHelpers.py:358
+#: ../partIntfHelpers.py:359
#, python-format
msgid ""
"You cannot edit this partition, as it is an extended partition which "
"contains %s"
msgstr "您不能编辑该分区,因为它是一个包含 %s 的扩展分区。"
-#: ../partIntfHelpers.py:390
+#: ../partIntfHelpers.py:391
msgid "Format as Swap?"
msgstr "格式化成交换区?"
-#: ../partIntfHelpers.py:391
+#: ../partIntfHelpers.py:392
#, python-format
msgid ""
"/dev/%s has a partition type of 0x82 (Linux swap) but does not appear to be "
@@ -1624,12 +1767,12 @@ msgstr ""
"\n"
"您想把该分区格式化成交换分区吗?"
-#: ../partIntfHelpers.py:411
+#: ../partIntfHelpers.py:412
#, python-format
msgid "You need to select at least one hard drive to install %s."
msgstr "您至少需要选择一个硬盘驱动器来安装 %s。"
-#: ../partIntfHelpers.py:416
+#: ../partIntfHelpers.py:417
msgid ""
"You have chosen to use a pre-existing partition for this installation "
"without formatting it. We recommend that you format this partition to make "
@@ -1642,23 +1785,23 @@ msgstr ""
"确保以前安装的操作系统文件不会在这次 Linux 安装中引发问题。可是,如果该分区包"
"含您需要保留的文件,例如主目录,那么您应该继续安装,而不要格式化该分区。"
-#: ../partIntfHelpers.py:424
+#: ../partIntfHelpers.py:425
msgid "Format?"
msgstr "格式化?"
-#: ../partIntfHelpers.py:424 ../iw/partition_gui.py:1035
+#: ../partIntfHelpers.py:425 ../iw/partition_gui.py:1039
msgid "_Modify Partition"
msgstr "修改分区(_M)"
-#: ../partIntfHelpers.py:424
+#: ../partIntfHelpers.py:425
msgid "Do _Not Format"
msgstr "不要格式化(_N)"
-#: ../partIntfHelpers.py:432
+#: ../partIntfHelpers.py:433
msgid "Error with Partitioning"
msgstr "分区出错"
-#: ../partIntfHelpers.py:433
+#: ../partIntfHelpers.py:434
#, python-format
msgid ""
"The following critical errors exist with your requested partitioning scheme. "
@@ -1670,11 +1813,11 @@ msgstr ""
"\n"
"%s"
-#: ../partIntfHelpers.py:447
+#: ../partIntfHelpers.py:448
msgid "Partitioning Warning"
msgstr "分区警告"
-#: ../partIntfHelpers.py:448
+#: ../partIntfHelpers.py:449
#, python-format
msgid ""
"The following warnings exist with your requested partition scheme.\n"
@@ -1689,23 +1832,23 @@ msgstr ""
"\n"
"您想继续使用申请的分区方案吗?"
-#: ../partIntfHelpers.py:462 ../iw/partition_gui.py:669
+#: ../partIntfHelpers.py:463 ../iw/partition_gui.py:671
msgid ""
"The following pre-existing partitions have been selected to be formatted, "
"destroying all data."
msgstr "下列存在的分区将被格式化,这会破坏所有数据。"
-#: ../partIntfHelpers.py:465
+#: ../partIntfHelpers.py:466
msgid ""
"Select 'Yes' to continue and format these partitions, or 'No' to go back and "
"change these settings."
msgstr "选择“是”来继续并格式化这些分区,或选择“否”返回修改这些设置。"
-#: ../partIntfHelpers.py:471
+#: ../partIntfHelpers.py:472
msgid "Format Warning"
msgstr "格式化警告"
-#: ../partIntfHelpers.py:519
+#: ../partIntfHelpers.py:520
#, python-format
msgid ""
"You are about to delete the volume group \"%s\".\n"
@@ -1716,29 +1859,29 @@ msgstr ""
"\n"
"该卷组内的所有逻辑卷将会丢失!"
-#: ../partIntfHelpers.py:523
+#: ../partIntfHelpers.py:524
#, python-format
msgid "You are about to delete the logical volume \"%s\"."
msgstr "您即将删除逻辑卷\"%s\"。"
-#: ../partIntfHelpers.py:526
+#: ../partIntfHelpers.py:527
msgid "You are about to delete a RAID device."
msgstr "您即将删除一个 RAID 设备。"
-#: ../partIntfHelpers.py:529
+#: ../partIntfHelpers.py:530
#, python-format
msgid "You are about to delete the /dev/%s partition."
msgstr "即将删除 /dev/%s 分区。"
-#: ../partIntfHelpers.py:532
+#: ../partIntfHelpers.py:533
msgid "The partition you selected will be deleted."
msgstr "您选择的分区将会被删除。"
-#: ../partIntfHelpers.py:542
+#: ../partIntfHelpers.py:543
msgid "Confirm Reset"
msgstr "确认重设"
-#: ../partIntfHelpers.py:543
+#: ../partIntfHelpers.py:544
msgid ""
"Are you sure you want to reset the partition table to its original state?"
msgstr "是否确定要将分区表还原至其最初状态?"
@@ -1754,50 +1897,69 @@ msgid ""
"with the installation process?"
msgstr "您选择的分区选项已被激活,您将无法返回到磁盘编辑屏幕。您想继续安装吗?"
-#: ../partitions.py:113
+#: ../partitions.py:130
+#, fuzzy, python-format
+msgid " for device %s"
+msgstr "RAID 设备 %s"
+
+#: ../partitions.py:133
+#, fuzzy
+msgid "Encrypt device?"
+msgstr "加密密钥"
+
+#: ../partitions.py:134
+#, python-format
+msgid ""
+"You specified block device encryption should be enabled%s, 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 ""
+
+#: ../partitions.py:141 ../partitions.py:260 ../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
+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
+msgid "Continue"
+msgstr "继续"
+
+#: ../partitions.py:160
msgid "Writing partitioning to disk"
msgstr "将分区写入磁盘"
-#: ../partitions.py:114
+#: ../partitions.py:161
+#, fuzzy
msgid ""
"The partitioning options you have selected will now be written to disk. Any "
-"data on deleted or reformatted partitions will be lost"
+"data on deleted or reformatted partitions will be lost."
msgstr ""
"现在您选择的分区选项将写入磁盘。所有在被删除或者被重新格式化的分区中的时间都"
"会丢失。"
-#: ../partitions.py:119
+#: ../partitions.py:166
msgid "Go _back"
msgstr "上一步(_b)"
-#: ../partitions.py:120
+#: ../partitions.py:167
msgid "_Write changes to disk"
msgstr "将修改写入磁盘(_W)"
-#: ../partitions.py:200 ../textw/constants_text.py:50
-#: ../loader/cdinstall.c:351 ../loader/driverdisk.c:236
-#: ../loader/driverdisk.c:267 ../loader/driverdisk.c:351
-#: ../loader/driverselect.c:75 ../loader/driverselect.c:173
-#: ../loader/driverselect.c:199 ../loader/hdinstall.c:334
-#: ../loader/hdinstall.c:388 ../loader/kbd.c:138 ../loader/loader.c:415
-#: ../loader/loader.c:431 ../loader/loader.c:1159 ../loader/loader.c:1181
-#: ../loader/net.c:277 ../loader/net.c:320 ../loader/net.c:750
-#: ../loader/net.c:1094 ../loader/net.c:1863 ../loader/nfsinstall.c:68
-#: ../loader/urls.c:280 ../loader/urls.c:405
-msgid "Back"
-msgstr "上一步"
-
-#: ../partitions.py:200 ../rescue.py:305 ../iw/partition_gui.py:572
-#: ../textw/network_text.py:60 ../loader/cdinstall.c:117
-#: ../loader/cdinstall.c:125 ../loader/driverdisk.c:440
-msgid "Continue"
-msgstr "继续"
-
-#: ../partitions.py:204
+#: ../partitions.py:265
msgid "Confirm"
msgstr "确认"
-#: ../partitions.py:205
+#: ../partitions.py:266
#, python-format
msgid ""
"Are you sure you want to skip entering a passphrase for device %s?\n"
@@ -1809,80 +1971,79 @@ msgstr ""
"\n"
"如果您跳过这一步,那么将无法安装过程中使用设备内容。"
-#: ../partitions.py:1026
+#: ../partitions.py:1146
#, python-format
msgid ""
"You have not defined a root partition (/), which is required for "
"installation of %s to continue."
msgstr "您还没有指定继续安装 %s 所需的根分区(/)。"
-#: ../partitions.py:1031
+#: ../partitions.py:1151
#, 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:1053
-msgid ""
-"You must create an EFI System Partition of type FAT and a size of 50 "
-"megabytes."
+#: ../partitions.py:1177
+#, fuzzy
+msgid "You must create an EFI System Partition of at least 10 megabytes."
msgstr "您必须创建一个 FAT 类型的 EFI 系统分区,大小为 50MB。"
-#: ../partitions.py:1067
+#: ../partitions.py:1191
msgid ""
"Your boot partition isn't on one of the first four partitions and thus won't "
"be bootable."
msgstr "您的引导区不是最初的四个分区之一,因此无法引导驱动器。"
-#: ../partitions.py:1088
+#: ../partitions.py:1212
msgid "You must create an Apple Bootstrap partition."
msgstr "您必须创建一个 Apple 引导分区。"
-#: ../partitions.py:1110
+#: ../partitions.py:1234
msgid "You must create a PPC PReP Boot partition."
msgstr "您必须创建一个 PPC PReP 引导分区。"
-#: ../partitions.py:1118 ../partitions.py:1129
+#: ../partitions.py:1242 ../partitions.py:1253
#, 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:1163
+#: ../partitions.py:1287
msgid ""
"Installing on a USB device. This may or may not produce a working system."
msgstr "正在一个 USB 设备上安装。不能保证可以成功安装。"
-#: ../partitions.py:1166
+#: ../partitions.py:1290
msgid ""
"Installing on a FireWire device. This may or may not produce a working "
"system."
msgstr "正在一个 FireWire 设备上安装。不能保证可以成功安装。"
-#: ../partitions.py:1176
+#: ../partitions.py:1300
msgid "Bootable partitions can only be on RAID1 devices."
msgstr "可引导分区仅允许在 RAID1 设备上。"
-#: ../partitions.py:1181
+#: ../partitions.py:1305
msgid "Bootable partitions cannot be on a logical volume."
msgstr "可引导分区不能位于逻辑卷上。"
-#: ../partitions.py:1187
+#: ../partitions.py:1311
msgid "Bootable partitions cannot be on a RAID device."
msgstr "RAID 设备中不能有可引导分区。"
-#: ../partitions.py:1194
+#: ../partitions.py:1316 ../partitions.py:1322
#, python-format
msgid "Bootable partitions cannot be on an %s filesystem."
msgstr "%s 文件系统中不能有可引导分区。"
-#: ../partitions.py:1198
+#: ../partitions.py:1326
msgid "Bootable partitions cannot be on an encrypted block device"
msgstr "加密的块设备中不能有可引导分区。"
-#: ../partitions.py:1204
+#: ../partitions.py:1330
msgid ""
"You have not specified a swap partition. Although not strictly required in "
"all cases, it will significantly improve performance for most installations."
@@ -1890,44 +2051,44 @@ msgstr ""
"您还没有指定一个交换分区。虽然在大多情况下这并非必不可少,但若有一个交换分区"
"的话,系统性能会显著提高。"
-#: ../partitions.py:1211
+#: ../partitions.py:1337
#, 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:1222
+#: ../partitions.py:1348
#, 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:1517
+#: ../partitions.py:1655
msgid "the partition in use by the installer."
msgstr "安装程序正在使用该分区。"
-#: ../partitions.py:1520
+#: ../partitions.py:1658
msgid "a partition which is a member of a RAID array."
msgstr "RAID 阵列中的一个分区。"
-#: ../partitions.py:1523
+#: ../partitions.py:1661
msgid "a partition which is a member of a LVM Volume Group."
msgstr "一个是 LVM 卷组成员之一的分区。"
-#: ../partRequests.py:273
+#: ../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:278
+#: ../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:281
+#: ../partRequests.py:287
#, python-format
msgid ""
"The mount point %s cannot be used. It must be a symbolic link for proper "
@@ -1935,54 +2096,54 @@ msgid ""
msgstr ""
"挂载点 %s 无法被使用。它必须是符号链接才能使系统正确运行。请另选一个挂载点。"
-#: ../partRequests.py:290
+#: ../partRequests.py:296
msgid "This mount point must be on a linux file system."
msgstr "该挂载点必须位于 Linux 文件系统上。"
-#: ../partRequests.py:311
+#: ../partRequests.py:317
#, python-format
msgid ""
"The mount point \"%s\" is already in use, please choose a different mount "
"point."
msgstr "挂载点\"%s\" 已被使用,请另选一个。"
-#: ../partRequests.py:325
+#: ../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:533
+#: ../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:538
+#: ../partRequests.py:544
#, python-format
msgid "The size of the requested partition is negative! (size = %s MB)"
msgstr "所申请的分区大小是负数(%sMB)!"
-#: ../partRequests.py:542
+#: ../partRequests.py:548
msgid "Partitions can't start below the first cylinder."
msgstr "分区不能从第一个柱面前开始。"
-#: ../partRequests.py:545
+#: ../partRequests.py:551
msgid "Partitions can't end on a negative cylinder."
msgstr "分区不能以负柱面结束。"
-#: ../partRequests.py:746
+#: ../partRequests.py:753
msgid "No members in RAID request, or not RAID level specified."
msgstr "没有 RAID 成员,或者不是 RAID 级别中指定的。"
-#: ../partRequests.py:751
+#: ../partRequests.py:758
#, python-format
msgid "A RAID device of type %s requires at least %s members."
msgstr "%s 类型的 RAID 设备至少需要 %s 个成员。"
-#: ../partRequests.py:760
+#: ../partRequests.py:767
#, python-format
msgid ""
"This RAID device can have a maximum of %s spares. To have more spares you "
@@ -1990,46 +2151,50 @@ msgid ""
msgstr ""
"该 RAID 设备至多可有 %s 个备件。要增加备件,您需要增加 RAID 设备的成员。"
-#: ../partRequests.py:1026
+#: ../partRequests.py:1033
msgid ""
"Logical volume size must be larger than the volume group's physical extent "
"size."
msgstr "逻辑卷大小一定要比卷组的物理扩展分区大。"
-#: ../rescue.py:157
+#: ../rescue.py:151
msgid "Starting Interface"
msgstr "启动接口"
-#: ../rescue.py:158
+#: ../rescue.py:152
#, python-format
msgid "Attempting to start %s"
msgstr "试图启动 %s"
-#: ../rescue.py:200
+#: ../rescue.py:194
msgid "When finished please exit from the shell and your system will reboot."
msgstr "结束后请退出 shell,您的系统将会被重新启动。"
-#: ../rescue.py:226
+#: ../rescue.py:201
+msgid "Unable to find /bin/sh to execute! Not starting shell"
+msgstr ""
+
+#: ../rescue.py:220
msgid "Setup Networking"
msgstr "设置网络"
-#: ../rescue.py:227
+#: ../rescue.py:221
msgid "Do you want to start the network interfaces on this system?"
msgstr "您想在这个系统上启动网络接口吗?"
-#: ../rescue.py:267 ../text.py:695
+#: ../rescue.py:261 ../text.py:742
msgid "Cancelled"
msgstr "已取消"
-#: ../rescue.py:268 ../text.py:696
+#: ../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:294 ../rescue.py:361 ../rescue.py:369 ../rescue.py:447
+#: ../rescue.py:301 ../rescue.py:371 ../rescue.py:382 ../rescue.py:463
msgid "Rescue"
msgstr "救援"
-#: ../rescue.py:295
+#: ../rescue.py:302
#, python-format
msgid ""
"The rescue environment will now attempt to find your Linux installation and "
@@ -2050,23 +2215,23 @@ msgstr ""
"直接进入一个命令行 shell。\n"
"\n"
-#: ../rescue.py:305 ../rescue.py:310
+#: ../rescue.py:312 ../rescue.py:317
msgid "Read-Only"
msgstr "只读"
-#: ../rescue.py:336
+#: ../rescue.py:343
msgid "System to Rescue"
msgstr "要援救的系统"
-#: ../rescue.py:337
+#: ../rescue.py:344
msgid "What partition holds the root partition of your installation?"
msgstr "哪个分区包含安装的根分区?"
-#: ../rescue.py:339 ../rescue.py:343 ../text.py:669 ../text.py:671
+#: ../rescue.py:346 ../rescue.py:350 ../text.py:716 ../text.py:718
msgid "Exit"
msgstr "退出"
-#: ../rescue.py:362
+#: ../rescue.py:372
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. "
@@ -2075,7 +2240,7 @@ msgstr ""
"系统中存在您选择不挂载的有问题的文件系统,按回车键进入 shell,您便可以执行 "
"fsck 命令并挂载分区。当您退出 shell 后,系统会自动被重新引导。"
-#: ../rescue.py:370
+#: ../rescue.py:383
#, python-format
msgid ""
"Your system has been mounted under %s.\n"
@@ -2095,7 +2260,7 @@ msgstr ""
"\n"
"当您退出 shell 后,系统将会自动被重新引导。"
-#: ../rescue.py:448
+#: ../rescue.py:464
#, python-format
msgid ""
"An error occurred trying to mount some or all of your system. Some of it may "
@@ -2108,11 +2273,11 @@ msgstr ""
"\n"
"请按 <return> 键进入 shell,当您退出 shell 时,系统将会自动被重新引导。"
-#: ../rescue.py:454
+#: ../rescue.py:473
msgid "Rescue Mode"
msgstr "救援模式"
-#: ../rescue.py:455
+#: ../rescue.py:474
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."
@@ -2120,95 +2285,108 @@ msgstr ""
"您没有任何 Linux 分区,请按 <return> 键进入 shell。当您退出 shell 时,系统将"
"会自动被重新引导。"
-#: ../rescue.py:468
+#: ../rescue.py:487
#, python-format
msgid "Your system is mounted under the %s directory."
msgstr "您的系统被挂载在 %s 目录之下。"
-#: ../text.py:185 ../text.py:251 ../text.py:264 tmp/exnSave.glade.h:1
+#: ../text.py:207 ../text.py:291 ../text.py:304 tmp/exnSave.glade.h:6
msgid "Save"
msgstr "保存"
-#: ../text.py:188
-msgid "Save to Disk"
+#: ../text.py:210
+#, fuzzy
+msgid "Save to local disk"
msgstr "保存到磁盘"
-#: ../text.py:189
-msgid "Save to Remote"
-msgstr "保存到远程主机"
-
-#: ../text.py:203
-msgid "Host"
-msgstr "主机"
+#: ../text.py:211
+#, python-format
+msgid "Send to bugzilla (%s)"
+msgstr ""
-#: ../text.py:205
-msgid "Remote path"
-msgstr "远程主机目录"
+#: ../text.py:212
+msgid "Send to remote server (scp)"
+msgstr ""
-#: ../text.py:207
+#: ../text.py:226 ../text.py:239
msgid "User name"
msgstr "用户名"
-#: ../text.py:209
+#: ../text.py:228 ../text.py:241
msgid "Password"
msgstr "密码"
-#: ../text.py:283 tmp/lukspassphrase.glade.h:5
+#: ../text.py:230
+msgid "Bug Description"
+msgstr ""
+
+#: ../text.py:243
+msgid "Host (host:port)"
+msgstr ""
+
+#: ../text.py:245
+#, fuzzy
+msgid "Destination file"
+msgstr "LVM 操作失败"
+
+#: ../text.py:329
+#, fuzzy
+msgid "Passphrase for encrypted device"
+msgstr "为加密分区输入密码句"
+
+#: ../text.py:347 tmp/lukspassphrase.glade.h:7
+#, fuzzy
+msgid "Use this passphrase for all new encrypted devices"
+msgstr "为加密分区输入密码句"
+
+#: ../text.py:378
+#, fuzzy, python-format
+msgid "The passphrase must be at least %d characters long."
+msgstr "密码至少应包含八个字符。"
+
+#: ../text.py:407 tmp/lukspassphrase.glade.h:5
msgid "Passphrase"
msgstr "密码"
-#: ../text.py:291 tmp/lukspassphrase.glade.h:6
+#: ../text.py:415 tmp/lukspassphrase.glade.h:6
msgid "This is a global passphrase"
msgstr "这是一个全局密码"
-#: ../text.py:347
-msgid "Help not available"
-msgstr "无帮助信息"
-
-#: ../text.py:348
-msgid "No help is available for this step of the install."
-msgstr "这一安装步骤没有帮助信息。"
-
-#: ../text.py:446
+#: ../text.py:481 ../text.py:485
msgid "Repository editing is not available in text mode."
msgstr "无法在文本模式中进行库编辑。"
-#: ../text.py:471
+#: ../text.py:523
#, python-format
msgid "Please enter your %(instkey)s"
msgstr "请输入您的%(instkey)s"
-#: ../text.py:488 tmp/instkey.glade.h:6
+#: ../text.py:540 tmp/instkey.glade.h:6
#, no-c-format, python-format
msgid "Skip entering %(instkey)s"
msgstr "跳过输入 %(instkey)s"
-#: ../text.py:564 ../loader/lang.c:63
+#: ../text.py:616 ../loader/lang.c:63 ../loader/loader.c:212
#, c-format, python-format
msgid "Welcome to %s for %s"
msgstr "欢迎为 %s 进入 %s"
-#: ../text.py:566
+#: ../text.py:618
#, python-format
msgid "Welcome to %s"
msgstr "欢迎使用 %s"
-#: ../text.py:569
-msgid ""
-" <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen"
-msgstr "<F1>求助 | <Tab> 元素间切换 | <Space> 选择 | <F12> 下一屏幕"
-
-#: ../text.py:571
+#: ../text.py:620
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next "
"screen"
msgstr "<Tab>/<Alt-Tab> 元素间切换 | <Space> 选择 | <F12> 下一屏幕"
-#: ../upgrade.py:105 ../upgrade.py:126
+#: ../upgrade.py:91 ../upgrade.py:112
msgid "Proceed with upgrade?"
msgstr "继续升级吗?"
-#: ../upgrade.py:106
+#: ../upgrade.py:92
#, python-format
msgid ""
"You have choosen the upgrade for %s architecture, but the installed system "
@@ -2218,12 +2396,12 @@ msgstr ""
"您已经选择了为 %s 构架进行升级,但安装的系统使用的是 %s 构架。\n"
"\n"
-#: ../upgrade.py:110
+#: ../upgrade.py:96
#, python-format
msgid "Would you like to upgrade the installed system to the %s architecture?"
msgstr "您想将安装的系统升级到 %s 构架吗?"
-#: ../upgrade.py:127
+#: ../upgrade.py:113
msgid ""
"The file systems of the Linux installation you have chosen to upgrade have "
"already been mounted. You cannot go back past this point. \n"
@@ -2232,15 +2410,15 @@ msgstr ""
"您所选择要升级的 Linux 文件系统已经被挂载,过了该步骤便不能返回。\n"
"\n"
-#: ../upgrade.py:131
+#: ../upgrade.py:117
msgid "Would you like to continue with the upgrade?"
msgstr "是否要继续升级?"
-#: ../upgrade.py:229 ../upgrade.py:237
+#: ../upgrade.py:215 ../upgrade.py:223
msgid "Dirty File Systems"
msgstr "有问题的文件系统"
-#: ../upgrade.py:230
+#: ../upgrade.py:216
#, python-format
msgid ""
"The following file systems for your Linux system were not unmounted "
@@ -2252,7 +2430,7 @@ msgstr ""
"查验文件系统,正常关机后再进行系统升级。\n"
"%s"
-#: ../upgrade.py:238
+#: ../upgrade.py:224
#, python-format
msgid ""
"The following file systems for your Linux system were not unmounted "
@@ -2262,18 +2440,18 @@ msgstr ""
"您的 Linux 系统中下列文件系统没有被完整地卸载下来,您仍要挂载它们吗?\n"
"%s"
-#: ../upgrade.py:379 ../upgrade.py:385
+#: ../upgrade.py:365 ../upgrade.py:371
msgid "Mount failed"
msgstr "挂载失败"
-#: ../upgrade.py:380
+#: ../upgrade.py:366
msgid ""
"One or more of the file systems listed in the /etc/fstab on your Linux "
"system cannot be mounted. Please fix this problem and try to upgrade again."
msgstr ""
"在 /etc/fstab 中列出的文件系统中至少有一个无法挂载,请解决这一问题后再升级。"
-#: ../upgrade.py:386
+#: ../upgrade.py:372
msgid ""
"One or more of the file systems listed in the /etc/fstab of your Linux "
"system are inconsistent and cannot be mounted. Please fix this problem and "
@@ -2281,7 +2459,7 @@ msgid ""
msgstr ""
"/etc/fstab 中列出的文件系统间发生矛盾而无法被挂载,请解决这一问题后再升级。"
-#: ../upgrade.py:403
+#: ../upgrade.py:389
msgid ""
"The following files are absolute symbolic links, which we do not support "
"during an upgrade. Please change them to relative symbolic links and restart "
@@ -2292,11 +2470,11 @@ msgstr ""
"新开始升级。\n"
"\n"
-#: ../upgrade.py:409
+#: ../upgrade.py:395
msgid "Absolute Symlinks"
msgstr "绝对符号链接"
-#: ../upgrade.py:420
+#: ../upgrade.py:406
msgid ""
"The following are directories which should instead be symbolic links, which "
"will cause problems with the upgrade. Please return them to their original "
@@ -2307,61 +2485,61 @@ msgstr ""
"符号链接状态,然后重新开始升级。\n"
"\n"
-#: ../upgrade.py:426
+#: ../upgrade.py:412
msgid "Invalid Directories"
msgstr "无效目录"
-#: ../upgrade.py:433
+#: ../upgrade.py:419
#, python-format
msgid "%s not found"
msgstr "没有发现 %s"
-#: ../vnc.py:145
+#: ../vnc.py:148
#, python-format
msgid "%s %s installation on host %s"
msgstr "%s %s 安装在主机 %s 上"
-#: ../vnc.py:147
+#: ../vnc.py:150
#, python-format
msgid "%s %s installation"
msgstr "%s %s 的安装"
-#: ../vnc.py:174
+#: ../vnc.py:177
#, python-format
msgid "Attempting to connect to vnc client on host %s..."
msgstr "试图在主机 %s 上连接 vnc..."
-#: ../vnc.py:188
+#: ../vnc.py:191
msgid "Connected!"
msgstr "已连接!"
-#: ../vnc.py:191
+#: ../vnc.py:194
msgid "Will try to connect again in 15 seconds..."
msgstr "将在15秒后试图重新连接..."
-#: ../vnc.py:197
+#: ../vnc.py:200
#, python-format
msgid "Giving up attempting to connect after %d tries!\n"
msgstr "尝试连接 %d 次后放弃!\n"
-#: ../vnc.py:206
+#: ../vnc.py:209
#, python-format
msgid "Please manually connect your vnc client to %s to begin the install."
msgstr "请手工把您的 vnc 客户连接到 %s 来开始安装。"
-#: ../vnc.py:208
+#: ../vnc.py:211
msgid "Please manually connect your vnc client to begin the install."
msgstr "请手动连接您的 vnc 客户来开始安装。"
-#: ../vnc.py:211
+#: ../vnc.py:214
msgid "Starting VNC..."
msgstr "启动 VNC..."
-#: ../vnc.py:236
+#: ../vnc.py:239
msgid "The VNC server is now running."
msgstr "VNC 服务器现正运行。"
-#: ../vnc.py:249
+#: ../vnc.py:252
msgid ""
"\n"
"\n"
@@ -2379,7 +2557,7 @@ msgstr ""
" vncviewer 失败时使用。\n"
"\n"
-#: ../vnc.py:254
+#: ../vnc.py:257
msgid ""
"\n"
"\n"
@@ -2395,7 +2573,7 @@ msgstr ""
"来保证服务器的安全。\n"
"\n"
-#: ../vnc.py:258
+#: ../vnc.py:261
msgid ""
"\n"
"\n"
@@ -2407,7 +2585,7 @@ msgstr ""
"您选择执行 vnc 时使用密码。\n"
"\n"
-#: ../vnc.py:260
+#: ../vnc.py:263
msgid ""
"\n"
"\n"
@@ -2419,50 +2597,50 @@ msgstr ""
"未知错误,中止。\n"
"\n"
-#: ../vnc.py:285 ../vnc.py:374
+#: ../vnc.py:285 ../vnc.py:378
msgid "VNC Configuration"
msgstr "VNC 配置"
-#: ../vnc.py:288 ../vnc.py:378
+#: ../vnc.py:288 ../vnc.py:382
msgid "No password"
msgstr "无密码"
-#: ../vnc.py:290 ../vnc.py:381
+#: ../vnc.py:290 ../vnc.py:385
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:389 ../textw/userauth_text.py:44
+#: ../vnc.py:298 ../vnc.py:393 ../textw/userauth_text.py:47
msgid "Password:"
msgstr "密码:"
-#: ../vnc.py:299 ../vnc.py:390 ../textw/userauth_text.py:46
+#: ../vnc.py:299 ../vnc.py:394 ../textw/userauth_text.py:49
msgid "Password (confirm):"
msgstr "密码(确认):"
-#: ../vnc.py:317 ../vnc.py:412 ../textw/userauth_text.py:67
+#: ../vnc.py:317 ../vnc.py:416 ../textw/userauth_text.py:70
msgid "Password Mismatch"
msgstr "密码不匹配"
-#: ../vnc.py:318 ../vnc.py:413 ../textw/userauth_text.py:68
+#: ../vnc.py:318 ../vnc.py:417 ../textw/userauth_text.py:71
msgid "The passwords you entered were different. Please try again."
msgstr "输入的密码不匹配,请重新输入。"
-#: ../vnc.py:323 ../vnc.py:418 ../textw/userauth_text.py:63
+#: ../vnc.py:323 ../vnc.py:422 ../textw/userauth_text.py:66
msgid "Password Length"
msgstr "密码长度"
-#: ../vnc.py:324 ../vnc.py:419
+#: ../vnc.py:324 ../vnc.py:423
msgid "The password must be at least six characters long."
msgstr "密码至少应包含六个字符。"
-#: ../vnc.py:355
+#: ../vnc.py:346
msgid "Unable to Start X"
msgstr "无法启动 X"
-#: ../vnc.py:356
+#: ../vnc.py:348
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 "
@@ -2471,111 +2649,113 @@ msgstr ""
"X 无法在您的机器上运行。您打算从另一台计算机上运行 VNC 连接到此计算机以执行图"
"形化安装,还是继续进行文本模式安装?"
-#: ../vnc.py:363 ../vnc.py:366
+#: ../vnc.py:367 ../vnc.py:370
msgid "Use text mode"
msgstr "使用文本模式"
-#: ../vnc.py:364
+#: ../vnc.py:368
msgid "Start VNC"
msgstr "启动 VNC"
-#: ../yuminstall.py:72
+#: ../yuminstall.py:76
#, python-format
msgid "%s MB"
msgstr "%s 兆字节"
-#: ../yuminstall.py:75
+#: ../yuminstall.py:79
#, python-format
msgid "%s KB"
msgstr "%s 千字节"
-#: ../yuminstall.py:78
+#: ../yuminstall.py:82
#, python-format
msgid "%s Byte"
msgstr "%s 字节"
-#: ../yuminstall.py:80
+#: ../yuminstall.py:84
#, python-format
msgid "%s Bytes"
msgstr "%s 字节"
-#: ../yuminstall.py:128
+#: ../yuminstall.py:123 ../yuminstall.py:213
msgid "Processing"
msgstr "正在处理"
-#: ../yuminstall.py:129
+#: ../yuminstall.py:124
msgid "Preparing transaction from installation source..."
msgstr "正在处理安装文件..."
-#: ../yuminstall.py:160
+#: ../yuminstall.py:155
#, python-format
msgid "<b>Installing %s</b> (%s)\n"
msgstr "<b>安装%s</b> (%s)\n"
-#: ../yuminstall.py:205
+#: ../yuminstall.py:202
#, python-format
msgid "%s of %s packages completed"
msgstr "%s of %s 软件包安装完成"
-#: ../yuminstall.py:217
-msgid "Finishing upgrade"
+#: ../yuminstall.py:214
+#, fuzzy
+msgid "Finishing upgrade process..."
msgstr "完成升级"
-#: ../yuminstall.py:218
-msgid "Finishing upgrade process. This may take a little while..."
-msgstr "终止升级进程,可能要等一小会..."
-
-#: ../yuminstall.py:355
-msgid "Copying File"
-msgstr "正在复制文件"
-
-#: ../yuminstall.py:356
-msgid "Transferring install image to hard drive..."
-msgstr "正在将安装映像传输到硬盘..."
-
-#: ../yuminstall.py:366
-msgid ""
-"An error occurred transferring the install image to your hard drive. This "
-"is probably due to bad media."
-msgstr "将安装映像传送到您的硬盘时出错,很可能是由介质损坏造成的。"
+#: ../yuminstall.py:308 ../iw/task_gui.py:275
+#, fuzzy
+msgid "Error Setting Up Repository"
+msgstr "编辑库"
-#: ../yuminstall.py:370
+#: ../yuminstall.py:309 ../iw/task_gui.py:276
+#, fuzzy, python-format
msgid ""
-"An error occurred transferring the install image to your hard drive. You are "
-"probably out of disk space."
-msgstr "将安装映像传输到硬盘时出错,很可能是磁盘空间不够。"
+"The following error occurred while setting up the installation repository:\n"
+"\n"
+"%s\n"
+"\n"
+"Please provide the correct information for installing %s."
+msgstr ""
+"分区时发生了下列错误:\n"
+"\n"
+"%s\n"
+"\n"
+"请按确定退出安装."
-#: ../yuminstall.py:417
+#: ../yuminstall.py:366
msgid "Change Disc"
msgstr "更换光盘"
-#: ../yuminstall.py:418
+#: ../yuminstall.py:367
#, python-format
msgid "Please insert %s disc %d to continue."
msgstr "请插入 %s 光盘 %d 以继续。"
-#: ../yuminstall.py:432
+#: ../yuminstall.py:378
msgid "Wrong Disc"
msgstr "光盘不对"
-#: ../yuminstall.py:433
+#: ../yuminstall.py:379
#, python-format
msgid "That's not the correct %s disc."
msgstr "那不是正确的 %s 光盘。"
-#: ../yuminstall.py:439
+#: ../yuminstall.py:385
msgid "Unable to access the disc."
msgstr "无法读取光盘。"
-#: ../yuminstall.py:604 ../yuminstall.py:606
+#: ../yuminstall.py:533
+#, python-format
+msgid "Repository %r is missing name in configuration, using id"
+msgstr ""
+
+#: ../yuminstall.py:651 ../yuminstall.py:653
msgid "Re_boot"
msgstr "重新引导(_b)"
-#: ../yuminstall.py:604
+#: ../yuminstall.py:651
msgid "_Eject"
msgstr "弹出光盘(_E)"
-#: ../yuminstall.py:610
+#: ../yuminstall.py:660
#, python-format
msgid ""
"The file %s cannot be opened. This is due to a missing file, a corrupt "
@@ -2591,61 +2771,62 @@ msgstr ""
"您如果现在退出,您的系统会不稳定需要重新安装。\n"
"\n"
-#: ../yuminstall.py:650
+#: ../yuminstall.py:700
msgid "Retrying"
msgstr "重试中"
-#: ../yuminstall.py:650
-msgid "Retrying package download..."
+#: ../yuminstall.py:700
+#, fuzzy
+msgid "Retrying download..."
msgstr "重试软件包下载..."
-#: ../yuminstall.py:715
+#: ../yuminstall.py:772
#, python-format
msgid ""
"There was an error running your transaction for the following reason: %s\n"
msgstr "在执行处理时出现错误,原因如下:%s\n"
-#: ../yuminstall.py:748 ../yuminstall.py:749
+#: ../yuminstall.py:807 ../yuminstall.py:808
msgid "file conflicts"
msgstr "文件冲突"
-#: ../yuminstall.py:750
+#: ../yuminstall.py:809
msgid "older package(s)"
msgstr "旧的软件包"
-#: ../yuminstall.py:751
+#: ../yuminstall.py:810
msgid "insufficient disk space"
msgstr "磁盘空间不足"
-#: ../yuminstall.py:752
+#: ../yuminstall.py:811
msgid "insufficient disk inodes"
msgstr "不足的磁盘节点"
-#: ../yuminstall.py:753
+#: ../yuminstall.py:812
msgid "package conflicts"
msgstr "软件包冲突"
-#: ../yuminstall.py:754
+#: ../yuminstall.py:813
msgid "package already installed"
msgstr "软件包已安装"
-#: ../yuminstall.py:755
+#: ../yuminstall.py:814
msgid "required package"
msgstr "需要的软件包"
-#: ../yuminstall.py:756
+#: ../yuminstall.py:815
msgid "package for incorrect arch"
msgstr "与硬件体系结构不兼容的软件包"
-#: ../yuminstall.py:757
+#: ../yuminstall.py:816
msgid "package for incorrect os"
msgstr "与操作系统不兼容的软件包"
-#: ../yuminstall.py:771
+#: ../yuminstall.py:830
msgid "You need more space on the following file systems:\n"
msgstr "您在以下文件系统中需要更多空间:\n"
-#: ../yuminstall.py:784
+#: ../yuminstall.py:843
#, python-format
msgid ""
"There were file conflicts when checking the packages to be installed:\n"
@@ -2654,36 +2835,32 @@ msgstr ""
"在检查要安装的软件包时有文件冲突:\n"
"%s\n"
-#: ../yuminstall.py:787
+#: ../yuminstall.py:846
#, python-format
msgid ""
"There was an error running your transaction for the following reason(s): %"
"s.\n"
msgstr "在执行处理时出现错误,原因如下:%s\n"
-#: ../yuminstall.py:791
+#: ../yuminstall.py:856 ../yuminstall.py:861
msgid "Error Running Transaction"
msgstr "执行处理时出错"
-#: ../yuminstall.py:796
-msgid "Error running transaction"
-msgstr "执行处理时出错"
-
-#: ../yuminstall.py:956
+#: ../yuminstall.py:1021
msgid "Retrieving installation information..."
msgstr "获取安装信息..."
-#: ../yuminstall.py:958
+#: ../yuminstall.py:1023
#, python-format
msgid "Retrieving installation information for %s..."
msgstr "重新获取%s安装信息..."
-#: ../yuminstall.py:970 ../textw/bootloader_text.py:277
-#: ../textw/constants_text.py:62 ../textw/partition_text.py:1428
+#: ../yuminstall.py:1041 ../textw/bootloader_text.py:277
+#: ../textw/constants_text.py:64 ../textw/partition_text.py:1429
msgid "Edit"
msgstr "编辑"
-#: ../yuminstall.py:982 ../yuminstall.py:1257
+#: ../yuminstall.py:1053 ../yuminstall.py:1300
#, python-format
msgid ""
"Unable to read package metadata. This may be due to a missing repodata "
@@ -2697,17 +2874,17 @@ msgstr ""
"\n"
"%s"
-#: ../yuminstall.py:1023
+#: ../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:1056 ../iw/GroupSelector.py:545
+#: ../yuminstall.py:1127 ../iw/GroupSelector.py:505
msgid "Uncategorized"
msgstr "未分类的"
-#: ../yuminstall.py:1282
+#: ../yuminstall.py:1323
#, python-format
msgid ""
"Your selected packages require %d MB of free space for installation, but you "
@@ -2717,15 +2894,15 @@ msgstr ""
"您选择的软件包共需要 %d MB 大小的磁盘安装空间,但是您没有足够的磁盘空间。您可"
"以改变选择或者退出安装。"
-#: ../yuminstall.py:1301
+#: ../yuminstall.py:1342
msgid "Reboot?"
msgstr "重新引导?"
-#: ../yuminstall.py:1302
+#: ../yuminstall.py:1343
msgid "The system will be rebooted now."
msgstr "系统现在将会被重新引导。"
-#: ../yuminstall.py:1464
+#: ../yuminstall.py:1505
#, python-format
msgid ""
"You appear to be upgrading from a system which is too old to upgrade to this "
@@ -2734,7 +2911,7 @@ msgstr ""
"您所升级的系统版本似乎太老,它不适合于升级到该版本的 %s。您肯定要继续升级进程"
"吗?"
-#: ../yuminstall.py:1491
+#: ../yuminstall.py:1532
#, python-format
msgid ""
"The arch of the release of %s you are upgrading to appears to be %s which "
@@ -2744,90 +2921,90 @@ msgstr ""
"您所升级的发行版本 %s 构架显示为 %s,这与您之前安装的构架 %s 不匹配。升级将无"
"法成功,您确定要继续升级过程吗?"
-#: ../yuminstall.py:1538
+#: ../yuminstall.py:1579
msgid "Post Upgrade"
msgstr "升级后"
-#: ../yuminstall.py:1539
+#: ../yuminstall.py:1580
msgid "Performing post upgrade configuration..."
msgstr "正在执行升级后配置..."
-#: ../yuminstall.py:1541
+#: ../yuminstall.py:1582
msgid "Post Install"
msgstr "安装后"
-#: ../yuminstall.py:1542
+#: ../yuminstall.py:1583
msgid "Performing post install configuration..."
msgstr "正在执行安装后配置..."
-#: ../yuminstall.py:1764
+#: ../yuminstall.py:1788
msgid "Installation Progress"
msgstr "安装过程"
-#: ../yuminstall.py:1799
+#: ../yuminstall.py:1823
msgid "Install Starting"
msgstr "安装开始"
-#: ../yuminstall.py:1800
+#: ../yuminstall.py:1824
msgid "Starting install process. This may take several minutes..."
msgstr "正在开启安装进程,可能会花几分钟时间..."
-#: ../yuminstall.py:1837
+#: ../yuminstall.py:1862
msgid "Dependency Check"
msgstr "依赖关系检查"
-#: ../yuminstall.py:1838
+#: ../yuminstall.py:1863
msgid "Checking dependencies in packages selected for installation..."
msgstr "在所选定要安装的软件包中检查依赖关系..."
-#: ../zfcp.py:49
+#: ../zfcp.py:52
msgid "You have not specified a device number or the number is invalid"
msgstr "您没有指定设备号码或号码无效"
-#: ../zfcp.py:51
+#: ../zfcp.py:54
msgid "You have not specified a worldwide port name or the name is invalid."
msgstr "您没有指定全局端口号或号码无效。"
-#: ../zfcp.py:53
+#: ../zfcp.py:56
msgid "You have not specified a FCP LUN or the number is invalid."
msgstr "您没有指定 FCP LUN 或号码无效。"
-#: ../iw/account_gui.py:48
+#: ../iw/account_gui.py:52
msgid "Root _Password:"
msgstr "根密码(_P):"
-#: ../iw/account_gui.py:50
+#: ../iw/account_gui.py:54
msgid "_Confirm:"
msgstr "确认(_C):"
-#: ../iw/account_gui.py:87
+#: ../iw/account_gui.py:97
msgid "Caps Lock is on."
msgstr "大写锁定开。"
-#: ../iw/account_gui.py:97 ../iw/account_gui.py:105 ../iw/account_gui.py:112
-#: ../iw/account_gui.py:132 ../textw/userauth_text.py:71
+#: ../iw/account_gui.py:107 ../iw/account_gui.py:115 ../iw/account_gui.py:122
+#: ../iw/account_gui.py:143 ../textw/userauth_text.py:74
msgid "Error with Password"
msgstr "密码错误"
-#: ../iw/account_gui.py:98
+#: ../iw/account_gui.py:108
msgid ""
"You must enter your root password and confirm it by typing it a second time "
"to continue."
msgstr "您必须输入根密码并再键入一次来确认以继续。"
-#: ../iw/account_gui.py:106
+#: ../iw/account_gui.py:116
msgid "The passwords you entered were different. Please try again."
msgstr "输入的密码不匹配,请重新输入。"
-#: ../iw/account_gui.py:113
+#: ../iw/account_gui.py:123
msgid "The root password must be at least six characters long."
msgstr "根密码最少应包含六个字符。"
-#: ../iw/account_gui.py:120 ../textw/userauth_text.py:78
+#: ../iw/account_gui.py:131 ../textw/userauth_text.py:81
msgid "Weak Password"
msgstr "脆弱密码"
-#: ../iw/account_gui.py:121 ../textw/userauth_text.py:79
+#: ../iw/account_gui.py:132 ../textw/userauth_text.py:82
#, python-format
msgid ""
"Weak password provided: %s\n"
@@ -2838,73 +3015,75 @@ msgstr ""
"\n"
"是否要继续使用此密码?"
-#: ../iw/account_gui.py:133 ../textw/userauth_text.py:72
+#: ../iw/account_gui.py:144 ../textw/userauth_text.py:75
msgid ""
"Requested password contains non-ASCII characters, which are not allowed."
msgstr "所要求的密码包含非 ASCII 字符,它们不允许被用在密码中。"
-#: ../iw/autopart_type.py:96
+#: ../iw/autopart_type.py:97
msgid ""
"No partitions are available to resize. Only physical partitions with "
"specific filesystems can be resized."
msgstr ""
"没有可以重新定义大小的分区。只有带特定文件系统的物理分区可重新定义大小。"
-#: ../iw/autopart_type.py:179
-msgid "Do you really want to boot from disk which is not used for instalation?"
+#: ../iw/autopart_type.py:180
+#, fuzzy
+msgid ""
+"Do you really want to boot from a disk which is not used for installation?"
msgstr "您确实希望从不进行安装的磁盘中引导吗?"
-#: ../iw/autopart_type.py:260
+#: ../iw/autopart_type.py:261
msgid "Invalid Initiator Name"
msgstr "无效启动器名称:"
-#: ../iw/autopart_type.py:261
+#: ../iw/autopart_type.py:262
msgid "You must provide an initiator name."
msgstr "您必须提供一个初始名。"
-#: ../iw/autopart_type.py:283
+#: ../iw/autopart_type.py:284
msgid "Error with Data"
msgstr "数据错误"
-#: ../iw/autopart_type.py:403 ../textw/partition_text.py:1517
+#: ../iw/autopart_type.py:405 ../textw/partition_text.py:1518
msgid "Remove all partitions on selected drives and create default layout"
msgstr "在选定磁盘上删除所有分区并创建默认分区结构"
-#: ../iw/autopart_type.py:404 ../textw/partition_text.py:1518
+#: ../iw/autopart_type.py:406 ../textw/partition_text.py:1519
msgid "Remove Linux partitions on selected drives and create default layout"
msgstr "在选定驱动上删除 linux 分区并创建默认的分区结构"
-#: ../iw/autopart_type.py:405
+#: ../iw/autopart_type.py:407
msgid "Resize existing partition and create default layout in free space"
msgstr "重新定义现有分区大小并在剩余空间中创建默认布局"
-#: ../iw/autopart_type.py:406 ../textw/partition_text.py:1519
+#: ../iw/autopart_type.py:408 ../textw/partition_text.py:1520
msgid "Use free space on selected drives and create default layout"
msgstr "使用选定驱动器中的空余空间并创建默认的分区结构"
-#: ../iw/autopart_type.py:407 ../textw/partition_text.py:1520
+#: ../iw/autopart_type.py:409 ../textw/partition_text.py:1521
msgid "Create custom layout"
msgstr "建立自定义的分区结构"
-#: ../iw/blpasswidget.py:45
+#: ../iw/blpasswidget.py:47
msgid "_Use a boot loader password"
msgstr "使用引导装载程序密码(_U)"
-#: ../iw/blpasswidget.py:46
+#: ../iw/blpasswidget.py:48
msgid ""
"A boot loader password prevents users from changing kernel options, "
"increasing security."
msgstr "引导装载程序密码可以防止用户改变内核选项,提高安全性。"
-#: ../iw/blpasswidget.py:77
+#: ../iw/blpasswidget.py:79
msgid "Change _password"
msgstr "改变密码(_p)"
-#: ../iw/blpasswidget.py:100
+#: ../iw/blpasswidget.py:102
msgid "Enter Boot Loader Password"
msgstr "输入引导装载程序密码"
-#: ../iw/blpasswidget.py:106
+#: ../iw/blpasswidget.py:108
msgid ""
"Enter a boot loader password and then confirm it. (Note that your BIOS "
"keymap may be different than the actual keymap you are used to.)"
@@ -2912,23 +3091,23 @@ msgstr ""
"输入引导装载程序密码,然后确认它。(注意,您的 BIOS 键映射可能和实际使用的键"
"映射不同。)"
-#: ../iw/blpasswidget.py:113
+#: ../iw/blpasswidget.py:115
msgid "_Password:"
msgstr "密码(_P):"
-#: ../iw/blpasswidget.py:119
+#: ../iw/blpasswidget.py:121
msgid "Con_firm:"
msgstr "确认(_f):"
-#: ../iw/blpasswidget.py:140
+#: ../iw/blpasswidget.py:142
msgid "Passwords don't match"
msgstr "密码不匹配"
-#: ../iw/blpasswidget.py:141 ../textw/bootloader_text.py:443
+#: ../iw/blpasswidget.py:143 ../textw/bootloader_text.py:443
msgid "Passwords do not match"
msgstr "密码不匹配"
-#: ../iw/blpasswidget.py:150 ../textw/bootloader_text.py:453
+#: ../iw/blpasswidget.py:152 ../textw/bootloader_text.py:453
msgid ""
"Your boot loader password is shorter than six characters. We recommend a "
"longer boot loader password.\n"
@@ -2939,35 +3118,41 @@ msgstr ""
"\n"
"您想继续使用这一密码吗?"
-#: ../iw/bootloader_main_gui.py:34 ../textw/bootloader_text.py:46
+#: ../iw/bootloader_main_gui.py:37 ../textw/bootloader_text.py:46
#: ../textw/bootloader_text.py:111 ../textw/bootloader_text.py:168
#: ../textw/bootloader_text.py:286 ../textw/bootloader_text.py:395
msgid "Boot Loader Configuration"
msgstr "引导装载程序配置"
-#: ../iw/bootloader_main_gui.py:170 ../iw/bootloader_main_gui.py:175
-#: ../iw/bootloader_main_gui.py:212
+#: ../iw/bootloader_main_gui.py:174 ../iw/bootloader_main_gui.py:179
+#: ../iw/bootloader_main_gui.py:216
#, python-format
msgid "_Install boot loader on /dev/%s."
msgstr "在 /dev/%s 中安装引导装载程序(_I)。"
-#: ../iw/bootloader_main_gui.py:218
+#: ../iw/bootloader_main_gui.py:222
msgid "_Change device"
msgstr "更换设备(_C)"
-#: ../iw/congrats_gui.py:31
+#: ../iw/congrats_gui.py:33
msgid "Congratulations"
msgstr "祝贺您"
#: ../iw/congrats_gui.py:71
msgid ""
+"Please reboot the system to use the installed system.\n"
+"\n"
+msgstr ""
+
+#: ../iw/congrats_gui.py:74
+msgid ""
"Press the \"Reboot\" button to reboot your system.\n"
"\n"
msgstr ""
"按重启按钮来重新引导您的系统.\n"
"\n"
-#: ../iw/congrats_gui.py:75
+#: ../iw/congrats_gui.py:78
#, python-format
msgid ""
"Congratulations, the installation is complete.\n"
@@ -2978,27 +3163,27 @@ msgstr ""
"\n"
"%s%s"
-#: ../iw/examine_gui.py:35
+#: ../iw/examine_gui.py:37
msgid "Upgrade Examine"
msgstr "升级检查"
-#: ../iw/examine_gui.py:57
+#: ../iw/examine_gui.py:59
#, python-format
msgid "_Install %s"
msgstr "安装 %s(_I)"
-#: ../iw/examine_gui.py:59
+#: ../iw/examine_gui.py:61
msgid ""
"Choose this option to freshly install your system. Existing software and "
"data may be overwritten depending on your configuration choices."
msgstr ""
"选择该选项来重新安装系统。根据您的配置选择而定,现存软件和数据可能会被覆盖。"
-#: ../iw/examine_gui.py:63
+#: ../iw/examine_gui.py:65
msgid "_Upgrade an existing installation"
msgstr "升级现有安装(_U)"
-#: ../iw/examine_gui.py:65
+#: ../iw/examine_gui.py:67
#, python-format
msgid ""
"Choose this option if you would like to upgrade your existing %s system. "
@@ -3006,46 +3191,48 @@ msgid ""
msgstr ""
"如果您想升级现有的 %s 系统,选择该选项。该选项会保留您的驱动器上的数据。"
-#: ../iw/examine_gui.py:112 ../iw/pixmapRadioButtonGroup_gui.py:203
+#: ../iw/examine_gui.py:116
msgid "The following installed system will be upgraded:"
msgstr "下列安装的系统将会被升级:"
-#: ../iw/examine_gui.py:125
+#: ../iw/examine_gui.py:129
msgid "Unknown Linux system"
msgstr "未知的 Linux 系统"
-#: ../iw/GroupSelector.py:210
+#: ../iw/GroupSelector.py:165
#, python-format
msgid "Packages in %s"
msgstr "%s 中的软件包"
-#: ../iw/GroupSelector.py:482
-#, python-format
+#: ../iw/GroupSelector.py:442
+#, fuzzy, python-format
msgid "%d of %d optional package selected"
-msgstr "%d个 (共 %d 个)可选包被选中"
+msgid_plural "%d of %d optional packages selected"
+msgstr[0] "%d个 (共 %d 个)可选包被选中"
+msgstr[1] "%d个 (共 %d 个)可选包被选中"
-#: ../iw/GroupSelector.py:485
+#: ../iw/GroupSelector.py:445
#, python-format
msgid "<i>%s</i>"
msgstr "<i>%s</i>"
-#: ../iw/language_gui.py:30 ../textw/language_text.py:44
+#: ../iw/language_gui.py:33 ../textw/language_text.py:46
msgid "Language Selection"
msgstr "语言选择"
-#: ../iw/language_gui.py:76 ../textw/language_text.py:45 ../loader/lang.c:374
+#: ../iw/language_gui.py:79 ../textw/language_text.py:47 ../loader/lang.c:376
msgid "What language would you like to use during the installation process?"
msgstr "您在安装过程中想使用何种语言?"
-#: ../iw/lvm_dialog_gui.py:123 ../iw/lvm_dialog_gui.py:170
-#: ../iw/lvm_dialog_gui.py:181 ../iw/lvm_dialog_gui.py:221
-#: ../iw/lvm_dialog_gui.py:295 ../iw/lvm_dialog_gui.py:624
-#: ../iw/lvm_dialog_gui.py:706 ../iw/lvm_dialog_gui.py:925
-#: ../textw/partition_text.py:1275 ../textw/partition_text.py:1294
+#: ../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
+#: ../textw/partition_text.py:1276 ../textw/partition_text.py:1295
msgid "Not enough space"
msgstr "空间不够"
-#: ../iw/lvm_dialog_gui.py:124
+#: ../iw/lvm_dialog_gui.py:125
msgid ""
"The physical extent size cannot be changed because otherwise the space "
"required by the currently defined logical volumes will be increased to more "
@@ -3054,11 +3241,11 @@ msgstr ""
"物理范围的大小不能被改变,否则,当前已定义的逻辑卷所要求的空间将有可能超过可"
"用空间。"
-#: ../iw/lvm_dialog_gui.py:133
+#: ../iw/lvm_dialog_gui.py:134
msgid "Confirm Physical Extent Change"
msgstr "确认物理范围改变"
-#: ../iw/lvm_dialog_gui.py:134
+#: ../iw/lvm_dialog_gui.py:135
msgid ""
"This change in the value of the physical extent will require the sizes of "
"the current logical volume requests to be rounded up in size to an integer "
@@ -3071,12 +3258,12 @@ msgstr ""
"\n"
"这项改变会立即生效。"
-#: ../iw/lvm_dialog_gui.py:143 ../iw/lvm_dialog_gui.py:203
-#: ../iw/network_gui.py:142 ../iw/network_gui.py:146 ../iw/network_gui.py:166
+#: ../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)"
-#: ../iw/lvm_dialog_gui.py:171
+#: ../iw/lvm_dialog_gui.py:172
#, python-format
msgid ""
"The physical extent size cannot be changed because the value selected (%"
@@ -3086,7 +3273,7 @@ msgstr ""
"物理范围大小无法被改变,因为选定的值(%10.2f MB)大于该卷组中最小的物理卷(%"
"10.2f MB)。"
-#: ../iw/lvm_dialog_gui.py:182
+#: ../iw/lvm_dialog_gui.py:183
#, python-format
msgid ""
"The physical extent size cannot be changed because the value selected (%"
@@ -3096,17 +3283,17 @@ msgstr ""
"物理范围大小无法被改变,因为选定的值(%10.2f MB)大于该卷组中最小的物理卷(%"
"10.2f MB)。"
-#: ../iw/lvm_dialog_gui.py:196
+#: ../iw/lvm_dialog_gui.py:197
msgid "Too small"
msgstr "太小"
-#: ../iw/lvm_dialog_gui.py:197
+#: ../iw/lvm_dialog_gui.py:198
msgid ""
"This change in the value of the physical extent will waste substantial space "
"on one or more of the physical volumes in the volume group."
msgstr "改变物理范围的值会在卷组中一个或多个物理卷上浪费大量空间。"
-#: ../iw/lvm_dialog_gui.py:222
+#: ../iw/lvm_dialog_gui.py:223
#, python-format
msgid ""
"The physical extent size cannot be changed because the resulting maximum "
@@ -3116,106 +3303,106 @@ msgstr ""
"物理范围大小无法被改变,因为改变的结果会导致最大的逻辑卷大小(%10.2f MB)小于"
"一个或多个当前已定义的逻辑卷。"
-#: ../iw/lvm_dialog_gui.py:296
+#: ../iw/lvm_dialog_gui.py:297
msgid ""
"You cannot remove this physical volume because otherwise the volume group "
"will be too small to hold the currently defined logical volumes."
msgstr "您不能删除该物理卷,否则,该卷组就会小得不能容纳目前已定义的逻辑卷。"
-#: ../iw/lvm_dialog_gui.py:376 ../textw/partition_text.py:1114
+#: ../iw/lvm_dialog_gui.py:377 ../textw/partition_text.py:1115
msgid "Make Logical Volume"
msgstr "制作逻辑卷"
-#: ../iw/lvm_dialog_gui.py:379
+#: ../iw/lvm_dialog_gui.py:380
#, python-format
msgid "Edit Logical Volume: %s"
msgstr "编辑逻辑卷:%s"
-#: ../iw/lvm_dialog_gui.py:381 ../textw/partition_text.py:1112
+#: ../iw/lvm_dialog_gui.py:382 ../textw/partition_text.py:1113
msgid "Edit Logical Volume"
msgstr "编辑逻辑卷"
-#: ../iw/lvm_dialog_gui.py:394 ../iw/partition_dialog_gui.py:322
-#: ../iw/raid_dialog_gui.py:321
+#: ../iw/lvm_dialog_gui.py:395 ../iw/partition_dialog_gui.py:346
+#: ../iw/raid_dialog_gui.py:351
msgid "_Mount Point:"
msgstr "挂载点(_M):"
-#: ../iw/lvm_dialog_gui.py:402 ../iw/raid_dialog_gui.py:334
+#: ../iw/lvm_dialog_gui.py:403 ../iw/raid_dialog_gui.py:364
msgid "_File System Type:"
msgstr "文件系统类型(_F):"
-#: ../iw/lvm_dialog_gui.py:412 ../iw/raid_dialog_gui.py:344
+#: ../iw/lvm_dialog_gui.py:413 ../iw/raid_dialog_gui.py:374
msgid "Original File System Type:"
msgstr "原始文件系统类型:"
-#: ../iw/lvm_dialog_gui.py:417 ../iw/raid_dialog_gui.py:349
+#: ../iw/lvm_dialog_gui.py:418 ../iw/raid_dialog_gui.py:379
msgid "Unknown"
msgstr "未知"
-#: ../iw/lvm_dialog_gui.py:423 ../iw/partition_dialog_gui.py:374
-#: ../iw/raid_dialog_gui.py:355
+#: ../iw/lvm_dialog_gui.py:424 ../iw/partition_dialog_gui.py:396
+#: ../iw/raid_dialog_gui.py:385
msgid "Original File System Label:"
msgstr "原始文件系统标签:"
-#: ../iw/lvm_dialog_gui.py:432
+#: ../iw/lvm_dialog_gui.py:433
msgid "_Logical Volume Name:"
msgstr "逻辑卷名称(_L):"
-#: ../iw/lvm_dialog_gui.py:440 ../textw/partition_text.py:305
+#: ../iw/lvm_dialog_gui.py:441 ../textw/partition_text.py:306
msgid "Logical Volume Name:"
msgstr "逻辑卷名称:"
-#: ../iw/lvm_dialog_gui.py:448 ../iw/partition_dialog_gui.py:386
+#: ../iw/lvm_dialog_gui.py:449 ../iw/partition_dialog_gui.py:408
msgid "_Size (MB):"
msgstr "大小(MB)(_S):"
-#: ../iw/lvm_dialog_gui.py:454 ../iw/partition_dialog_gui.py:403
-#: ../textw/partition_text.py:320 ../textw/partition_text.py:397
-#: ../textw/partition_text.py:480 ../textw/partition_text.py:588
+#: ../iw/lvm_dialog_gui.py:455 ../iw/partition_dialog_gui.py:425
+#: ../textw/partition_text.py:321 ../textw/partition_text.py:398
+#: ../textw/partition_text.py:481 ../textw/partition_text.py:589
msgid "Size (MB):"
msgstr "大小(MB):"
-#: ../iw/lvm_dialog_gui.py:469
+#: ../iw/lvm_dialog_gui.py:470
#, python-format
msgid "(Max size is %s MB)"
msgstr "(最大大小是 %s MB)"
-#: ../iw/lvm_dialog_gui.py:478 ../iw/partition_dialog_gui.py:334
-#: ../iw/partition_ui_helpers_gui.py:300 ../iw/raid_dialog_gui.py:329
+#: ../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
msgid "_Encrypt"
msgstr "加密(_E)"
-#: ../iw/lvm_dialog_gui.py:543 ../textw/partition_text.py:1264
+#: ../iw/lvm_dialog_gui.py:544 ../textw/partition_text.py:1265
msgid "Illegal size"
msgstr "大小无效"
-#: ../iw/lvm_dialog_gui.py:544 ../textw/partition_text.py:1265
+#: ../iw/lvm_dialog_gui.py:545 ../textw/partition_text.py:1266
msgid "The requested size as entered is not a valid number greater than 0."
msgstr "您所申请的大小值不是一个大于0的有效数字。"
-#: ../iw/lvm_dialog_gui.py:579
+#: ../iw/lvm_dialog_gui.py:580
msgid "Mount point in use"
msgstr "挂载点已被使用"
-#: ../iw/lvm_dialog_gui.py:580
+#: ../iw/lvm_dialog_gui.py:581
#, python-format
msgid "The mount point \"%s\" is in use. Please pick another."
msgstr "挂载点 \"%s\" 已被使用,请另选一个。"
-#: ../iw/lvm_dialog_gui.py:591 ../textw/partition_text.py:1235
+#: ../iw/lvm_dialog_gui.py:592 ../textw/partition_text.py:1236
msgid "Illegal Logical Volume Name"
msgstr "逻辑卷名称无效"
-#: ../iw/lvm_dialog_gui.py:610 ../textw/partition_text.py:1252
+#: ../iw/lvm_dialog_gui.py:611 ../textw/partition_text.py:1253
msgid "Illegal logical volume name"
msgstr "逻辑卷名称无效"
-#: ../iw/lvm_dialog_gui.py:611 ../textw/partition_text.py:1253
+#: ../iw/lvm_dialog_gui.py:612 ../textw/partition_text.py:1254
#, python-format
msgid "The logical volume name \"%s\" is already in use. Please pick another."
msgstr "逻辑卷名 \"%s\" 已被使用,请另选一个。"
-#: ../iw/lvm_dialog_gui.py:625
+#: ../iw/lvm_dialog_gui.py:627
#, python-format
msgid ""
"The current requested size (%10.2f MB) is larger than the maximum logical "
@@ -3225,15 +3412,15 @@ msgstr ""
"目前设定的磁盘空间(%10.2f MB)大于逻辑卷磁盘空间的最大值(%10.2f MB)。要提"
"高上限,您可以从未分区的磁盘空间中生成更多物理逻辑卷,并将其加入该逻辑卷组。"
-#: ../iw/lvm_dialog_gui.py:683 ../iw/partition_dialog_gui.py:197
-#: ../iw/partition_dialog_gui.py:209 ../iw/partition_dialog_gui.py:268
-#: ../iw/raid_dialog_gui.py:248 ../textw/partition_text.py:888
-#: ../textw/partition_text.py:909 ../textw/partition_text.py:1082
-#: ../textw/partition_text.py:1313
+#: ../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
+#: ../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:707 ../iw/lvm_dialog_gui.py:926
+#: ../iw/lvm_dialog_gui.py:724 ../iw/lvm_dialog_gui.py:942
#, python-format
msgid ""
"The logical volumes you have configured require %d MB, but the volume group "
@@ -3242,20 +3429,20 @@ msgid ""
msgstr ""
"您配置的逻辑卷需要 %dMB,但是该卷组只有 %d MB。请扩大该卷组,或缩小该逻辑卷。"
-#: ../iw/lvm_dialog_gui.py:765
+#: ../iw/lvm_dialog_gui.py:782
msgid "No free slots"
msgstr "无空闲插槽"
-#: ../iw/lvm_dialog_gui.py:766
+#: ../iw/lvm_dialog_gui.py:783
#, python-format
msgid "You cannot create more than %s logical volumes per volume group."
msgstr "在每个卷组中,您不能创建多于 %s 个逻辑卷。"
-#: ../iw/lvm_dialog_gui.py:772
+#: ../iw/lvm_dialog_gui.py:789
msgid "No free space"
msgstr "无空闲空间"
-#: ../iw/lvm_dialog_gui.py:773
+#: ../iw/lvm_dialog_gui.py:790
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 "
@@ -3264,29 +3451,29 @@ msgstr ""
"卷组中没有创建新逻辑卷的空间。要添加逻辑卷,您需要缩小一个或多个现存逻辑卷的"
"大小。"
-#: ../iw/lvm_dialog_gui.py:801
+#: ../iw/lvm_dialog_gui.py:818
#, python-format
msgid "Are you sure you want to delete the logical volume \"%s\"?"
msgstr "是否确定要删除该逻辑卷\"%s\"?"
-#: ../iw/lvm_dialog_gui.py:937
+#: ../iw/lvm_dialog_gui.py:953
msgid "Invalid Volume Group Name"
msgstr "卷组名称无效"
-#: ../iw/lvm_dialog_gui.py:948
+#: ../iw/lvm_dialog_gui.py:964
msgid "Name in use"
msgstr "名称已被使用"
-#: ../iw/lvm_dialog_gui.py:949
+#: ../iw/lvm_dialog_gui.py:965
#, python-format
msgid "The volume group name \"%s\" is already in use. Please pick another."
msgstr "卷组名称\"%s\" 已被使用,请另选一个。"
-#: ../iw/lvm_dialog_gui.py:992
+#: ../iw/lvm_dialog_gui.py:1008
msgid "Not enough physical volumes"
msgstr "没有足够的物理卷"
-#: ../iw/lvm_dialog_gui.py:993
+#: ../iw/lvm_dialog_gui.py:1009
msgid ""
"At least one unused physical volume partition is needed to create an LVM "
"Volume Group.\n"
@@ -3298,75 +3485,75 @@ msgstr ""
"\n"
"首先创建类型为“物理卷(LVM)”的分区或 RAID 阵列,然后再选择 \"LVM\" 选项。"
-#: ../iw/lvm_dialog_gui.py:1004
+#: ../iw/lvm_dialog_gui.py:1020
msgid "Make LVM Volume Group"
msgstr "制作 LVM 卷组"
-#: ../iw/lvm_dialog_gui.py:1007
+#: ../iw/lvm_dialog_gui.py:1023
#, python-format
msgid "Edit LVM Volume Group: %s"
msgstr "编辑 LVM 卷组:%s"
-#: ../iw/lvm_dialog_gui.py:1009
+#: ../iw/lvm_dialog_gui.py:1025
msgid "Edit LVM Volume Group"
msgstr "编辑 LVM 卷组"
-#: ../iw/lvm_dialog_gui.py:1025
+#: ../iw/lvm_dialog_gui.py:1041
msgid "_Volume Group Name:"
msgstr "卷组名称(_V):"
-#: ../iw/lvm_dialog_gui.py:1033
+#: ../iw/lvm_dialog_gui.py:1049
msgid "Volume Group Name:"
msgstr "卷组名称:"
-#: ../iw/lvm_dialog_gui.py:1041
+#: ../iw/lvm_dialog_gui.py:1057
msgid "_Physical Extent:"
msgstr "物理范围(_P):"
-#: ../iw/lvm_dialog_gui.py:1056
+#: ../iw/lvm_dialog_gui.py:1072
msgid "Physical Volumes to _Use:"
msgstr "要使用的物理卷(_U):"
-#: ../iw/lvm_dialog_gui.py:1062
+#: ../iw/lvm_dialog_gui.py:1078
msgid "Used Space:"
msgstr "已用空间:"
-#: ../iw/lvm_dialog_gui.py:1079
+#: ../iw/lvm_dialog_gui.py:1095
msgid "Free Space:"
msgstr "空闲空间:"
-#: ../iw/lvm_dialog_gui.py:1097
+#: ../iw/lvm_dialog_gui.py:1113
msgid "Total Space:"
msgstr "总计空间:"
-#: ../iw/lvm_dialog_gui.py:1126
+#: ../iw/lvm_dialog_gui.py:1142
msgid "Logical Volume Name"
msgstr "逻辑卷名称"
-#: ../iw/lvm_dialog_gui.py:1129 ../iw/partition_gui.py:369
-#: ../iw/upgrade_swap_gui.py:140 ../textw/partition_text.py:1423
+#: ../iw/lvm_dialog_gui.py:1145 ../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:1132 ../iw/partition_gui.py:374
+#: ../iw/lvm_dialog_gui.py:1148 ../iw/partition_gui.py:376
msgid "Size (MB)"
msgstr "大小(MB)"
-#: ../iw/lvm_dialog_gui.py:1146 ../iw/osbootwidget.py:95
+#: ../iw/lvm_dialog_gui.py:1162 ../iw/osbootwidget.py:96
msgid "_Add"
msgstr "添加(_A)"
-#: ../iw/lvm_dialog_gui.py:1149 ../iw/network_gui.py:457
-#: ../iw/osbootwidget.py:99 ../iw/partition_gui.py:1379
+#: ../iw/lvm_dialog_gui.py:1165 ../iw/network_gui.py:453
+#: ../iw/osbootwidget.py:100 ../iw/partition_gui.py:1383
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../iw/lvm_dialog_gui.py:1164
+#: ../iw/lvm_dialog_gui.py:1180
msgid "_Logical Volumes"
msgstr "逻辑卷(_L)"
-#: ../iw/netconfig_dialog.py:143
+#: ../iw/netconfig_dialog.py:158 ../textw/netconfig_text.py:36
#, python-format
msgid ""
"An error occurred converting the value entered for \"%s\":\n"
@@ -3375,98 +3562,103 @@ msgstr ""
"转换为\"%s\"输入的值时出错:\n"
"%s"
-#: ../iw/netconfig_dialog.py:145 ../iw/netconfig_dialog.py:154
-#: ../iw/network_gui.py:141 ../iw/network_gui.py:145 ../iw/network_gui.py:149
-#: ../iw/network_gui.py:153 ../iw/network_gui.py:161 ../iw/network_gui.py:166
-#: ../textw/network_text.py:52 ../textw/network_text.py:57
-#: ../textw/network_text.py:63
+#: ../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
+#: ../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:153 ../iw/network_gui.py:154
-#: ../textw/network_text.py:53
+#: ../iw/netconfig_dialog.py:168 ../iw/network_gui.py:162
+#: ../textw/network_text.py:55
#, python-format
msgid "A value is required for the field %s."
msgstr "%s字段需要输入值。"
-#: ../iw/netconfig_dialog.py:176
+#: ../iw/netconfig_dialog.py:190 ../textw/netconfig_text.py:180
msgid "Dynamic IP"
msgstr "动态 IP"
-#: ../iw/netconfig_dialog.py:177 ../loader/net.c:416 ../loader/net.c:860
-#, c-format, python-format
+#: ../iw/netconfig_dialog.py:191 ../textw/netconfig_text.py:181
+#, python-format
msgid "Sending request for IP information for %s..."
msgstr "正在为 %s 发送 IP 信息请求..."
-#: ../iw/netconfig_dialog.py:198 ../iw/netconfig_dialog.py:201
-#: ../textw/network_text.py:93 tmp/netpostconfig.glade.h:12
+#: ../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
msgid "IP Address"
msgstr "IP 地址"
-#: ../iw/netconfig_dialog.py:208
+#: ../iw/netconfig_dialog.py:222 ../textw/netconfig_text.py:213
msgid "IPv4 CIDR prefix must be between 0 and 32."
msgstr "IPv4 CIDR 前缀必须在0和32之间。"
-#: ../iw/netconfig_dialog.py:209 ../iw/netconfig_dialog.py:215
-#: ../iw/netconfig_dialog.py:223 ../iw/netconfig_dialog.py:226
+#: ../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
msgid "IPv4 Network Mask"
msgstr "IPv4/子网掩码"
-#: ../iw/netconfig_dialog.py:233 ../iw/netconfig_dialog.py:236
-#: ../iw/network_gui.py:34 ../iw/network_gui.py:533
+#: ../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
msgid "Gateway"
msgstr "网关"
-#: ../iw/netconfig_dialog.py:243
+#: ../iw/netconfig_dialog.py:257 ../textw/netconfig_text.py:248
msgid "Nameserver"
msgstr "名称服务器"
-#: ../iw/netconfig_dialog.py:253
+#: ../iw/netconfig_dialog.py:267
msgid "Error configuring network device:"
msgstr "配置网络界面时出错:"
-#: ../iw/netconfig_dialog.py:266
+#: ../iw/netconfig_dialog.py:280
msgid "Error configuring network device"
msgstr "配置网络界面时出错"
-#: ../iw/network_gui.py:34 ../iw/network_gui.py:535
+#: ../iw/network_gui.py:37 ../iw/network_gui.py:530
msgid "Primary DNS"
msgstr "主 DNS"
-#: ../iw/network_gui.py:34 ../iw/network_gui.py:537
+#: ../iw/network_gui.py:37 ../iw/network_gui.py:532
msgid "Secondary DNS"
msgstr "从 DNS"
-#: ../iw/network_gui.py:35
+#: ../iw/network_gui.py:38
msgid "_Gateway"
msgstr "网关(_G)"
-#: ../iw/network_gui.py:35
+#: ../iw/network_gui.py:38
msgid "_Primary DNS"
msgstr "主 DNS(_P)"
-#: ../iw/network_gui.py:35
+#: ../iw/network_gui.py:38
msgid "_Secondary DNS"
msgstr "从 DNS(_S)"
-#: ../iw/network_gui.py:38 ../textw/network_text.py:532
+#: ../iw/network_gui.py:41 ../textw/network_text.py:534
msgid "Network Configuration"
msgstr "网络配置"
-#: ../iw/network_gui.py:142
+#: ../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:146
+#: ../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:150 ../textw/network_text.py:820
+#: ../iw/network_gui.py:158 ../textw/network_text.py:824
#, python-format
msgid ""
"The hostname \"%s\" is not valid for the following reason:\n"
@@ -3477,16 +3669,16 @@ msgstr ""
"\n"
"%s"
-#: ../iw/network_gui.py:157 ../textw/network_text.py:43
+#: ../iw/network_gui.py:165 ../textw/network_text.py:45
#, python-format
msgid "Error With %s Data"
msgstr "%s数据错误"
-#: ../iw/network_gui.py:162 ../textw/network_text.py:64
+#: ../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:166
+#: ../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."
@@ -3494,110 +3686,110 @@ msgstr ""
"您没有活跃的网络设备。至少需要一个活跃的网络设备,您的系统才能默认使用网络交"
"换数据。"
-#: ../iw/network_gui.py:291 ../iw/network_gui.py:305
+#: ../iw/network_gui.py:299 ../iw/network_gui.py:313
msgid "Disabled"
msgstr "禁用"
-#: ../iw/network_gui.py:398
+#: ../iw/network_gui.py:394
msgid "Active on Boot"
msgstr "引导时激活"
-#: ../iw/network_gui.py:400 ../iw/osbootwidget.py:66
-#: ../iw/partition_gui.py:367 ../textw/bootloader_text.py:196
-#: ../textw/bootloader_text.py:262 ../textw/partition_text.py:1423
+#: ../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:402
+#: ../iw/network_gui.py:398
msgid "IPv4/Netmask"
msgstr "IPv4/子网掩码"
-#: ../iw/network_gui.py:404
+#: ../iw/network_gui.py:400
msgid "IPv6/Prefix"
msgstr "IPv6/前缀"
-#: ../iw/network_gui.py:464
+#: ../iw/network_gui.py:460
msgid "Network Devices"
msgstr "网络设备"
-#: ../iw/network_gui.py:475
+#: ../iw/network_gui.py:471
msgid "Set the hostname:"
msgstr "设置主机名:"
-#: ../iw/network_gui.py:480
+#: ../iw/network_gui.py:476
msgid "_automatically via DHCP"
msgstr "通过 DHCP 自动配置(_a)"
-#: ../iw/network_gui.py:487
+#: ../iw/network_gui.py:483
msgid "_manually"
msgstr "手工设置(_m)"
-#: ../iw/network_gui.py:492
+#: ../iw/network_gui.py:488
msgid "(e.g., host.domain.com)"
msgstr "(例如:host.domain.com)"
-#: ../iw/network_gui.py:498
+#: ../iw/network_gui.py:494
msgid "Hostname"
msgstr "主机名"
-#: ../iw/network_gui.py:542
+#: ../iw/network_gui.py:537
msgid "Miscellaneous Settings"
msgstr "各种设置"
-#: ../iw/network_gui.py:630
+#: ../iw/network_gui.py:626
msgid "Edit Device "
msgstr "编辑设备"
-#: ../iw/network_gui.py:634
+#: ../iw/network_gui.py:630
msgid "Unknown Ethernet Device"
msgstr "未知以太网设备"
-#: ../iw/network_gui.py:640
+#: ../iw/network_gui.py:636
msgid "unknown"
msgstr "未知"
-#: ../iw/network_gui.py:642
+#: ../iw/network_gui.py:638
msgid "Hardware address: "
msgstr "硬件地址:"
-#: ../iw/network_gui.py:778 ../textw/network_text.py:228 ../loader/net.c:820
+#: ../iw/network_gui.py:774 ../textw/network_text.py:230 ../loader/net.c:584
msgid "Missing Protocol"
msgstr "缺少网络协议"
-#: ../iw/network_gui.py:779 ../textw/network_text.py:229
+#: ../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:802 ../iw/network_gui.py:843 ../iw/network_gui.py:849
-#: ../textw/network_text.py:74 ../loader/net.c:92
+#: ../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:803
+#: ../iw/network_gui.py:799
msgid "IPv4 prefix must be between 0 and 32."
msgstr "IPv4 的前缀必须在0和32之间。"
-#: ../iw/network_gui.py:844 ../iw/network_gui.py:850
+#: ../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:50
+#: ../iw/osbootwidget.py:51
msgid "Boot loader operating system list"
msgstr "引导装载程序操作系统列表"
-#: ../iw/osbootwidget.py:66 ../textw/bootloader_text.py:262
+#: ../iw/osbootwidget.py:67 ../textw/bootloader_text.py:262
msgid "Default"
msgstr "默认"
-#: ../iw/osbootwidget.py:66 ../iw/partition_gui.py:368
+#: ../iw/osbootwidget.py:67 ../iw/partition_gui.py:370
msgid "Label"
msgstr "标签"
-#: ../iw/osbootwidget.py:129
+#: ../iw/osbootwidget.py:130
msgid "Image"
msgstr "映像"
-#: ../iw/osbootwidget.py:136
+#: ../iw/osbootwidget.py:137
msgid ""
"Enter a label for the boot loader menu to display. The device (or hard drive "
"and partition number) is the device from which it boots."
@@ -3605,47 +3797,47 @@ msgstr ""
"输入要在引导装载程序菜单中显示的标签。该设备(或硬盘驱动器和分区号码)是它引"
"导的设备。"
-#: ../iw/osbootwidget.py:144
+#: ../iw/osbootwidget.py:145
msgid "_Label"
msgstr "标签(_L)"
-#: ../iw/osbootwidget.py:152
+#: ../iw/osbootwidget.py:153
msgid "_Device"
msgstr "设备(_D)"
-#: ../iw/osbootwidget.py:186
+#: ../iw/osbootwidget.py:187
msgid "Default Boot _Target"
msgstr "默认引导目标(_T)"
-#: ../iw/osbootwidget.py:215
+#: ../iw/osbootwidget.py:216
msgid "You must specify a label for the entry"
msgstr "您必须为该项目指定标签"
-#: ../iw/osbootwidget.py:224
+#: ../iw/osbootwidget.py:225
msgid "Boot label contains illegal characters"
msgstr "引导标签包含不合法字符"
-#: ../iw/osbootwidget.py:248
+#: ../iw/osbootwidget.py:249
msgid "Duplicate Label"
msgstr "标签重复"
-#: ../iw/osbootwidget.py:249
+#: ../iw/osbootwidget.py:250
msgid "This label is already in use for another boot entry."
msgstr "该标签已被另一个引导项目使用。"
-#: ../iw/osbootwidget.py:262
+#: ../iw/osbootwidget.py:263
msgid "Duplicate Device"
msgstr "设备重复"
-#: ../iw/osbootwidget.py:263
+#: ../iw/osbootwidget.py:264
msgid "This device is already being used for another boot entry."
msgstr "该设备已被另一个引导项目使用。"
-#: ../iw/osbootwidget.py:327 ../textw/bootloader_text.py:345
+#: ../iw/osbootwidget.py:328 ../textw/bootloader_text.py:345
msgid "Cannot Delete"
msgstr "无法删除"
-#: ../iw/osbootwidget.py:328 ../textw/bootloader_text.py:346
+#: ../iw/osbootwidget.py:329 ../textw/bootloader_text.py:346
#, python-format
msgid ""
"This boot target cannot be deleted because it is for the %s system you are "
@@ -3668,70 +3860,70 @@ msgstr "指定空间大小(MB)(_u):"
msgid "Fill to maximum _allowable size"
msgstr "使用全部可用空间(_a)"
-#: ../iw/partition_dialog_gui.py:198
+#: ../iw/partition_dialog_gui.py:212
msgid "The end cylinder must be greater than the start cylinder."
msgstr "结束柱面必须大于起始柱面。"
-#: ../iw/partition_dialog_gui.py:299 ../textw/partition_text.py:712
+#: ../iw/partition_dialog_gui.py:323 ../textw/partition_text.py:713
msgid "Add Partition"
msgstr "添加分区"
-#: ../iw/partition_dialog_gui.py:302
+#: ../iw/partition_dialog_gui.py:326
#, python-format
msgid "Edit Partition: /dev/%s"
msgstr "编辑分区:/dev/%s"
-#: ../iw/partition_dialog_gui.py:304
+#: ../iw/partition_dialog_gui.py:328
msgid "Edit Partition"
msgstr "编辑分区"
-#: ../iw/partition_dialog_gui.py:331
+#: ../iw/partition_dialog_gui.py:355
msgid "File System _Type:"
msgstr "文件系统类型(_T):"
-#: ../iw/partition_dialog_gui.py:350
+#: ../iw/partition_dialog_gui.py:372
msgid "Allowable _Drives:"
msgstr "允许的驱动器(_D):"
-#: ../iw/partition_dialog_gui.py:365
+#: ../iw/partition_dialog_gui.py:387
msgid "Drive:"
msgstr "驱动器:"
-#: ../iw/partition_dialog_gui.py:409
+#: ../iw/partition_dialog_gui.py:431
msgid "_Start Cylinder:"
msgstr "起始柱面(_S):"
-#: ../iw/partition_dialog_gui.py:427
+#: ../iw/partition_dialog_gui.py:449
msgid "_End Cylinder:"
msgstr "结束柱面(_E):"
-#: ../iw/partition_dialog_gui.py:475
+#: ../iw/partition_dialog_gui.py:497
msgid "Force to be a _primary partition"
msgstr "强制为主分区(_p)"
-#: ../iw/partition_gui.py:318
+#: ../iw/partition_gui.py:320
#, python-format
msgid "Drive %s (Geom: %s/%s/%s) (Model: %s)"
msgstr "Drive %s (Geom: %s/%s/%s) (Model: %s)"
-#: ../iw/partition_gui.py:325
+#: ../iw/partition_gui.py:327
#, python-format
msgid "Drive %s (%-0.f MB) (Model: %s)"
msgstr "Drive %s (%-0.f MB) (Model: %s)"
-#: ../iw/partition_gui.py:370 ../textw/partition_text.py:1423
+#: ../iw/partition_gui.py:372 ../textw/partition_text.py:1424
msgid "Type"
msgstr "类型"
-#: ../iw/partition_gui.py:375 ../textw/partition_text.py:1423
+#: ../iw/partition_gui.py:377 ../textw/partition_text.py:1424
msgid "Start"
msgstr "开始"
-#: ../iw/partition_gui.py:376 ../textw/partition_text.py:1423
+#: ../iw/partition_gui.py:378 ../textw/partition_text.py:1424
msgid "End"
msgstr "结束"
-#: ../iw/partition_gui.py:413
+#: ../iw/partition_gui.py:415
msgid ""
"Mount Point/\n"
"RAID/Volume"
@@ -3739,7 +3931,7 @@ msgstr ""
"挂载点/\n"
"RAID/Volume"
-#: ../iw/partition_gui.py:415
+#: ../iw/partition_gui.py:417
msgid ""
"Size\n"
"(MB)"
@@ -3747,116 +3939,116 @@ msgstr ""
"大小\n"
"(MB)"
-#: ../iw/partition_gui.py:547 ../textw/partition_text.py:1417
+#: ../iw/partition_gui.py:549 ../textw/partition_text.py:1418
msgid "Partitioning"
msgstr "分区"
-#: ../iw/partition_gui.py:638
+#: ../iw/partition_gui.py:640
msgid ""
"The partitioning scheme you requested caused the following critical errors."
msgstr "您的分区方法产生了如下关键错误。"
-#: ../iw/partition_gui.py:640
+#: ../iw/partition_gui.py:642
#, python-format
msgid ""
"You must correct these errors before you continue your installation of %s."
msgstr "在继续安装 %s 前您必须更正这些错误。"
-#: ../iw/partition_gui.py:646
+#: ../iw/partition_gui.py:648
msgid "Partitioning Errors"
msgstr "分区错误"
-#: ../iw/partition_gui.py:652
+#: ../iw/partition_gui.py:654
msgid "The partitioning scheme you requested generated the following warnings."
msgstr "您的分区方法产生了如下的警告。"
-#: ../iw/partition_gui.py:654
+#: ../iw/partition_gui.py:656
msgid "Would you like to continue with your requested partitioning scheme?"
msgstr "是否要继续执行您所申请的分区方案?"
-#: ../iw/partition_gui.py:659
+#: ../iw/partition_gui.py:661
msgid "Partitioning Warnings"
msgstr "分区警告"
-#: ../iw/partition_gui.py:681
+#: ../iw/partition_gui.py:683
msgid "Format Warnings"
msgstr "格式化警告"
-#: ../iw/partition_gui.py:686
+#: ../iw/partition_gui.py:688
msgid "_Format"
msgstr "格式化(_F)"
-#: ../iw/partition_gui.py:723
+#: ../iw/partition_gui.py:725
msgid "LVM Volume Groups"
msgstr "LVM 卷组"
-#: ../iw/partition_gui.py:764
+#: ../iw/partition_gui.py:766
msgid "RAID Devices"
msgstr "RAID 设备"
-#: ../iw/partition_gui.py:794 ../iw/partition_gui.py:928
-#: ../textw/partition_text.py:114 ../textw/partition_text.py:178
+#: ../iw/partition_gui.py:796 ../iw/partition_gui.py:933
+#: ../textw/partition_text.py:115 ../textw/partition_text.py:179
msgid "None"
msgstr "无"
-#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
+#: ../iw/partition_gui.py:818 ../loader/hdinstall.c:231
msgid "Hard Drives"
msgstr "硬盘驱动器"
-#: ../iw/partition_gui.py:889 ../textw/partition_text.py:160
-#: ../textw/partition_text.py:199
+#: ../iw/partition_gui.py:891 ../textw/partition_text.py:161
+#: ../textw/partition_text.py:200
msgid "Free space"
msgstr "空闲空间"
-#: ../iw/partition_gui.py:891 ../textw/partition_text.py:162
+#: ../iw/partition_gui.py:893 ../textw/partition_text.py:163
msgid "Extended"
msgstr "扩展分区"
-#: ../iw/partition_gui.py:893 ../textw/partition_text.py:164
+#: ../iw/partition_gui.py:895 ../textw/partition_text.py:165
msgid "software RAID"
msgstr "软件 RAID"
-#: ../iw/partition_gui.py:930
+#: ../iw/partition_gui.py:935
msgid "Free"
msgstr "空闲"
-#: ../iw/partition_gui.py:1024 ../textw/partition_text.py:247
+#: ../iw/partition_gui.py:1028 ../textw/partition_text.py:248
#, python-format
msgid "Could not allocate requested partitions: %s."
msgstr "无法拨发所申请分区:%s。"
-#: ../iw/partition_gui.py:1033
+#: ../iw/partition_gui.py:1037
#, python-format
msgid "Warning: %s."
msgstr "警告:%s。"
-#: ../iw/partition_gui.py:1215 ../iw/partition_gui.py:1229
+#: ../iw/partition_gui.py:1219 ../iw/partition_gui.py:1233
msgid "Not supported"
msgstr "不支持"
-#: ../iw/partition_gui.py:1216
+#: ../iw/partition_gui.py:1220
msgid "LVM is NOT supported on this platform."
msgstr "该平台不支持 LVM。"
-#: ../iw/partition_gui.py:1230
+#: ../iw/partition_gui.py:1234
msgid "Software RAID is NOT supported on this platform."
msgstr "该平台不支持软件 RAID。"
-#: ../iw/partition_gui.py:1237
+#: ../iw/partition_gui.py:1241
msgid "No RAID minor device numbers available"
msgstr "无可用的 RAID 次设备号码"
-#: ../iw/partition_gui.py:1238
+#: ../iw/partition_gui.py:1242
msgid ""
"A software RAID device cannot be created because all of the available RAID "
"minor device numbers have been used."
msgstr "无法创建软件 RAID 设备,因为所有可用的次设备号码已被使用。"
-#: ../iw/partition_gui.py:1252
+#: ../iw/partition_gui.py:1256
msgid "RAID Options"
msgstr "RAID 选项"
-#: ../iw/partition_gui.py:1263
+#: ../iw/partition_gui.py:1267
#, python-format
msgid ""
"Software RAID allows you to combine several disks into a larger RAID "
@@ -3873,7 +4065,7 @@ msgstr ""
"\n"
"您目前有 %s 个可使用的空闲软件 RAID 分区。\n"
-#: ../iw/partition_gui.py:1274
+#: ../iw/partition_gui.py:1278
msgid ""
"To use RAID you must first create at least two partitions of type 'software "
"RAID'. Then you can create a RAID device that can be formatted and "
@@ -3884,72 +4076,72 @@ msgstr ""
"创建能被格式化并挂载的 RAID 设备。\n"
"\n"
-#: ../iw/partition_gui.py:1280
+#: ../iw/partition_gui.py:1284
msgid "What do you want to do now?"
msgstr "您现在想怎么办?"
-#: ../iw/partition_gui.py:1289
+#: ../iw/partition_gui.py:1293
msgid "Create a software RAID _partition."
msgstr "创建软件 RAID 分区(_p)。"
-#: ../iw/partition_gui.py:1292
+#: ../iw/partition_gui.py:1296
#, python-format
msgid "Create a RAID _device [default=/dev/md%s]."
msgstr "创建 RAID 设备(_d) [default=/dev/md%s]。"
-#: ../iw/partition_gui.py:1296
+#: ../iw/partition_gui.py:1300
#, python-format
msgid "Clone a _drive to create a RAID device [default=/dev/md%s]."
msgstr "克隆驱动器来创建 RAID 设备(_d) [default=/dev/md%s]。"
-#: ../iw/partition_gui.py:1335
+#: ../iw/partition_gui.py:1339
msgid "Couldn't Create Drive Clone Editor"
msgstr "无法创建驱动器克隆编辑器"
-#: ../iw/partition_gui.py:1336
+#: ../iw/partition_gui.py:1340
msgid "The drive clone editor could not be created for some reason."
msgstr "由于某种原因,驱动器克隆编辑器无法被创建。"
-#: ../iw/partition_gui.py:1378
+#: ../iw/partition_gui.py:1382
msgid "Ne_w"
msgstr "新建(_w)"
-#: ../iw/partition_gui.py:1381
+#: ../iw/partition_gui.py:1385
msgid "Re_set"
msgstr "重设(_s)"
-#: ../iw/partition_gui.py:1382
+#: ../iw/partition_gui.py:1386
msgid "R_AID"
msgstr "RAID(_A)"
-#: ../iw/partition_gui.py:1383
+#: ../iw/partition_gui.py:1387
msgid "_LVM"
msgstr "LVM(_L)"
-#: ../iw/partition_gui.py:1424
+#: ../iw/partition_gui.py:1428
msgid "Hide RAID device/LVM Volume _Group members"
msgstr "隐藏 RAID 设备/LVM 卷组成员(_G)"
#: ../iw/partition_ui_helpers_gui.py:102 ../iw/partition_ui_helpers_gui.py:123
-#: ../iw/partition_ui_helpers_gui.py:125 ../textw/partition_text.py:270
-#: ../textw/partition_text.py:272 ../textw/partition_text.py:274
-#: ../textw/partition_text.py:299
+#: ../iw/partition_ui_helpers_gui.py:125 ../textw/partition_text.py:271
+#: ../textw/partition_text.py:273 ../textw/partition_text.py:275
+#: ../textw/partition_text.py:300
msgid "<Not Applicable>"
msgstr "<不适用>"
-#: ../iw/partition_ui_helpers_gui.py:284
+#: ../iw/partition_ui_helpers_gui.py:285
msgid "_Format as:"
msgstr "格式化成(_F):"
-#: ../iw/partition_ui_helpers_gui.py:307
+#: ../iw/partition_ui_helpers_gui.py:308
msgid "Mi_grate filesystem to:"
msgstr "迁移文件系统至(_g):"
-#: ../iw/partition_ui_helpers_gui.py:327 tmp/autopart.glade.h:9
+#: ../iw/partition_ui_helpers_gui.py:328 tmp/autopart.glade.h:9
msgid "_Resize"
msgstr "重新定义大小(_R)"
-#: ../iw/partition_ui_helpers_gui.py:381
+#: ../iw/partition_ui_helpers_gui.py:384
#, python-format
msgid ""
"Partitions of type '%s' must be constrained to a single drive. To do this, "
@@ -3958,23 +4150,23 @@ msgstr ""
"类型为'%s' 的分区必须局限于一个驱动器上。您可在“允许的驱动器”检查表上选择该驱"
"动器来达到这个目的。"
-#: ../iw/partmethod_gui.py:31 ../textw/partmethod_text.py:30
+#: ../iw/partmethod_gui.py:34 ../textw/partmethod_text.py:32
msgid "Disk Partitioning Setup"
msgstr "磁盘分区设置"
-#: ../iw/partmethod_gui.py:56
+#: ../iw/partmethod_gui.py:59
msgid "_Automatically partition"
msgstr "自动分区(_A)"
-#: ../iw/partmethod_gui.py:59
+#: ../iw/partmethod_gui.py:62
msgid "Manually partition with _Disk Druid"
msgstr "用 Disk Druid 手工分区(_D)"
-#: ../iw/progress_gui.py:38
+#: ../iw/progress_gui.py:37
msgid "Installing Packages"
msgstr "安装软件包"
-#: ../iw/raid_dialog_gui.py:288
+#: ../iw/raid_dialog_gui.py:318
msgid ""
"At least two unused software RAID partitions are needed to create a RAID "
"device.\n"
@@ -3986,41 +4178,41 @@ msgstr ""
"\n"
"首先,至少创建两个类型为“软件 RAID”的分区,然后再选择“RAID”选项。"
-#: ../iw/raid_dialog_gui.py:302 ../iw/raid_dialog_gui.py:735
-#: ../textw/partition_text.py:944
+#: ../iw/raid_dialog_gui.py:332 ../iw/raid_dialog_gui.py:765
+#: ../textw/partition_text.py:945
msgid "Make RAID Device"
msgstr "创建 RAID 设备"
-#: ../iw/raid_dialog_gui.py:305
+#: ../iw/raid_dialog_gui.py:335
#, python-format
msgid "Edit RAID Device: /dev/md%s"
msgstr "编辑 RAID 设备:/dev/md%s"
-#: ../iw/raid_dialog_gui.py:307 ../textw/partition_text.py:942
+#: ../iw/raid_dialog_gui.py:337 ../textw/partition_text.py:943
msgid "Edit RAID Device"
msgstr "编辑 RAID 设备"
-#: ../iw/raid_dialog_gui.py:363
+#: ../iw/raid_dialog_gui.py:393
msgid "RAID _Device:"
msgstr "RAID 设备(_D):"
-#: ../iw/raid_dialog_gui.py:381
+#: ../iw/raid_dialog_gui.py:411
msgid "RAID _Level:"
msgstr "RAID 级别(_L):"
-#: ../iw/raid_dialog_gui.py:422
+#: ../iw/raid_dialog_gui.py:452
msgid "_RAID Members:"
msgstr "RAID 成员(_R):"
-#: ../iw/raid_dialog_gui.py:439
+#: ../iw/raid_dialog_gui.py:469
msgid "Number of _spares:"
msgstr "备件数量(_s):"
-#: ../iw/raid_dialog_gui.py:449
+#: ../iw/raid_dialog_gui.py:479
msgid "_Format partition?"
msgstr "格式化分区吗(_F)?"
-#: ../iw/raid_dialog_gui.py:536
+#: ../iw/raid_dialog_gui.py:566
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."
@@ -4028,12 +4220,12 @@ msgstr ""
"源驱动器上没有要克隆的分区。在它能被克隆前,您必须首先把该驱动器上的分区类型"
"定义为“软件 RAID”。"
-#: ../iw/raid_dialog_gui.py:540 ../iw/raid_dialog_gui.py:546
-#: ../iw/raid_dialog_gui.py:558 ../iw/raid_dialog_gui.py:571
+#: ../iw/raid_dialog_gui.py:570 ../iw/raid_dialog_gui.py:576
+#: ../iw/raid_dialog_gui.py:588 ../iw/raid_dialog_gui.py:601
msgid "Source Drive Error"
msgstr "源驱动器错误"
-#: ../iw/raid_dialog_gui.py:547
+#: ../iw/raid_dialog_gui.py:577
msgid ""
"The source drive you selected has partitions which are not of type 'software "
"RAID'.\n"
@@ -4044,7 +4236,7 @@ msgstr ""
"\n"
"这些分区在该驱动器被克隆前必须被删除。"
-#: ../iw/raid_dialog_gui.py:559
+#: ../iw/raid_dialog_gui.py:589
#, python-format
msgid ""
"The source drive you selected has partitions which are not constrained to "
@@ -4057,7 +4249,7 @@ msgstr ""
"\n"
"这些分区在该驱动器被克隆前必须被删除或被限定于该驱动器之内。"
-#: ../iw/raid_dialog_gui.py:572
+#: ../iw/raid_dialog_gui.py:602
msgid ""
"The source drive you selected has software RAID partition(s) which are "
"members of an active software RAID device.\n"
@@ -4068,21 +4260,21 @@ msgstr ""
"\n"
"这些分区在该驱动器被克隆前必须被删除。"
-#: ../iw/raid_dialog_gui.py:585 ../iw/raid_dialog_gui.py:591
-#: ../iw/raid_dialog_gui.py:610
+#: ../iw/raid_dialog_gui.py:615 ../iw/raid_dialog_gui.py:621
+#: ../iw/raid_dialog_gui.py:640
msgid "Target Drive Error"
msgstr "目标驱动器错误"
-#: ../iw/raid_dialog_gui.py:586
+#: ../iw/raid_dialog_gui.py:616
msgid "Please select the target drives for the clone operation."
msgstr "请选择克隆操作的目标驱动器。"
-#: ../iw/raid_dialog_gui.py:592
+#: ../iw/raid_dialog_gui.py:622
#, 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:611
+#: ../iw/raid_dialog_gui.py:641
#, python-format
msgid ""
"The target drive /dev/%s has a partition which cannot be removed for the "
@@ -4098,11 +4290,11 @@ msgstr ""
"\n"
"该分区必须在驱动器成为目标之前被删除。"
-#: ../iw/raid_dialog_gui.py:672
+#: ../iw/raid_dialog_gui.py:702
msgid "Please select a source drive."
msgstr "请选择源驱动器。"
-#: ../iw/raid_dialog_gui.py:692
+#: ../iw/raid_dialog_gui.py:722
#, python-format
msgid ""
"The drive /dev/%s will now be cloned to the following drives:\n"
@@ -4111,7 +4303,7 @@ msgstr ""
"驱动器 /dev/%s 现在将会被克隆到下列驱动器上:\n"
"\n"
-#: ../iw/raid_dialog_gui.py:697
+#: ../iw/raid_dialog_gui.py:727
msgid ""
"\n"
"\n"
@@ -4121,19 +4313,19 @@ msgstr ""
"\n"
"警告!目标驱动器上的所有数据将会被破坏。"
-#: ../iw/raid_dialog_gui.py:700
+#: ../iw/raid_dialog_gui.py:730
msgid "Final Warning"
msgstr "最后警告"
-#: ../iw/raid_dialog_gui.py:702
+#: ../iw/raid_dialog_gui.py:732
msgid "Clone Drives"
msgstr "克隆驱动器"
-#: ../iw/raid_dialog_gui.py:711
+#: ../iw/raid_dialog_gui.py:741
msgid "There was an error clearing the target drives. Cloning failed."
msgstr "清除目标驱动器时出错。克隆失败。"
-#: ../iw/raid_dialog_gui.py:745
+#: ../iw/raid_dialog_gui.py:775
msgid ""
"Clone Drive Tool\n"
"\n"
@@ -4159,19 +4351,19 @@ msgstr ""
"\n"
"目标驱动器上的一切将会被该进程破坏。"
-#: ../iw/raid_dialog_gui.py:765
+#: ../iw/raid_dialog_gui.py:795
msgid "Source Drive:"
msgstr "源驱动器:"
-#: ../iw/raid_dialog_gui.py:773
+#: ../iw/raid_dialog_gui.py:803
msgid "Target Drive(s):"
msgstr "目标驱动器:"
-#: ../iw/raid_dialog_gui.py:781
+#: ../iw/raid_dialog_gui.py:811
msgid "Drives"
msgstr "驱动器"
-#: ../iw/task_gui.py:44
+#: ../iw/task_gui.py:46
#, python-format
msgid ""
"Unable to read package metadata from repository. This may be due to a "
@@ -4183,91 +4375,122 @@ msgstr ""
"无法读取数据库的元数据。这可能是因为缺少 repodata 目录。请确定您已经正确建立"
"了安装树。%s"
-#: ../iw/task_gui.py:54
+#: ../iw/task_gui.py:56
#, 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 找到组群文件。这会使手工从存储库中选择软件包无法正常工作。"
-#: ../iw/task_gui.py:80
+#: ../iw/task_gui.py:155
msgid "Edit Repository"
msgstr "编辑库"
-#: ../iw/task_gui.py:155
-msgid "Invalid Repository Name"
-msgstr "无效主机名"
-
-#: ../iw/task_gui.py:156
-msgid "You must provide a repository name."
-msgstr "您必须输入存储库名称。"
-
-#: ../iw/task_gui.py:167
+#: ../iw/task_gui.py:213
msgid "Invalid Proxy URL"
msgstr "无效代理服务器 URL"
-#: ../iw/task_gui.py:168
+#: ../iw/task_gui.py:214
msgid "You must provide an HTTP, HTTPS, or FTP URL to a proxy."
msgstr "您必须为代理服务器提供一个 HTTP、HTTPS 或者或 FTP 链接(URL)。"
-#: ../iw/task_gui.py:187
+#: ../iw/task_gui.py:224 ../iw/task_gui.py:350
msgid "Invalid Repository URL"
msgstr "无效主机地址"
-#: ../iw/task_gui.py:188
+#: ../iw/task_gui.py:225 ../iw/task_gui.py:351
msgid "You must provide an HTTP, HTTPS, or FTP URL to a repository."
msgstr "您必须为库提供一个 HTTP、HTTPS 或者或 FTP 链接(URL)。"
-#: ../iw/task_gui.py:232
+#: ../iw/task_gui.py:247 ../iw/task_gui.py:360
+#, fuzzy
+msgid "No Media Found"
+msgstr "未找到任何驱动器"
+
+#: ../iw/task_gui.py:248 ../iw/task_gui.py:361
+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
+#, fuzzy
+msgid "Please enter an NFS server and path."
+msgstr "请输入服务器名称以及到您的 %s 映像的路径。"
+
+#: ../iw/task_gui.py:299
+msgid "Invalid Repository Name"
+msgstr "无效主机名"
+
+#: ../iw/task_gui.py:300
+msgid "You must provide a repository name."
+msgstr "您必须输入存储库名称。"
+
+#: ../iw/task_gui.py:412 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/timezone_gui.py:62 ../textw/timezone_text.py:95
+#: ../iw/task_gui.py:431
+msgid "No Software Repos Enabled"
+msgstr ""
+
+#: ../iw/task_gui.py:432
+#, fuzzy
+msgid ""
+"You must have at least one software repository enabled to continue "
+"installation."
+msgstr "在继续安装 %s 前您必须更正这些错误。"
+
+#: ../iw/timezone_gui.py:63 ../textw/timezone_text.py:96
msgid "Time Zone Selection"
msgstr "时区选择"
-#: ../iw/upgrade_bootloader_gui.py:33 ../textw/upgrade_bootloader_text.py:132
+#: ../iw/upgrade_bootloader_gui.py:36 ../textw/upgrade_bootloader_text.py:135
msgid "Upgrade Boot Loader Configuration"
msgstr "升级引导装载程序配置"
-#: ../iw/upgrade_bootloader_gui.py:119
+#: ../iw/upgrade_bootloader_gui.py:122
msgid "_Update boot loader configuration"
msgstr "更新引导装载程序配置(_U)"
-#: ../iw/upgrade_bootloader_gui.py:120
+#: ../iw/upgrade_bootloader_gui.py:123
msgid "This will update your current boot loader."
msgstr "这将会更新您目前的引导装载程序。"
-#: ../iw/upgrade_bootloader_gui.py:124 ../textw/upgrade_bootloader_text.py:104
+#: ../iw/upgrade_bootloader_gui.py:127 ../textw/upgrade_bootloader_text.py:107
msgid ""
"Due to system changes, your boot loader configuration can not be "
"automatically updated."
msgstr "因系统改变,您的启动配置不能自动更新."
-#: ../iw/upgrade_bootloader_gui.py:127 ../textw/upgrade_bootloader_text.py:108
+#: ../iw/upgrade_bootloader_gui.py:130 ../textw/upgrade_bootloader_text.py:111
msgid ""
"The installer is unable to detect the boot loader currently in use on your "
"system."
msgstr "安装程序无法在您的系统上检测到目前使用的引导装载程序。"
-#: ../iw/upgrade_bootloader_gui.py:134 ../textw/upgrade_bootloader_text.py:117
+#: ../iw/upgrade_bootloader_gui.py:137 ../textw/upgrade_bootloader_text.py:120
#, python-format
msgid ""
"The installer has detected the %s boot loader currently installed on %s."
msgstr "安装程序检测到 %s 引导装载程序目前安装在 %s 上。"
-#: ../iw/upgrade_bootloader_gui.py:138
+#: ../iw/upgrade_bootloader_gui.py:141
msgid "This is the recommended option."
msgstr "这是一个推荐的选项。"
-#: ../iw/upgrade_bootloader_gui.py:143
+#: ../iw/upgrade_bootloader_gui.py:146
msgid "_Create new boot loader configuration"
msgstr "创建新的引导装载程序配置(_C)"
-#: ../iw/upgrade_bootloader_gui.py:145
+#: ../iw/upgrade_bootloader_gui.py:148
msgid ""
"This option creates a new boot loader configuration. If you wish to switch "
"boot loaders, you should choose this."
@@ -4275,11 +4498,11 @@ msgstr ""
"这将会创建一个新的引导装载程序配置。如果您想更换引导装载程序,应该选择该选"
"项。"
-#: ../iw/upgrade_bootloader_gui.py:152
+#: ../iw/upgrade_bootloader_gui.py:155
msgid "_Skip boot loader updating"
msgstr "跳过引导装载程序的更新(_S)"
-#: ../iw/upgrade_bootloader_gui.py:153
+#: ../iw/upgrade_bootloader_gui.py:156
msgid ""
"This option makes no changes to boot loader configuration. If you are using "
"a third party boot loader, you should choose this."
@@ -4287,18 +4510,18 @@ msgstr ""
"这将不会对您的引导装载程序做任何改变。如果您使用的是第三方引导装载程序,您应"
"该选择该选项。"
-#: ../iw/upgrade_bootloader_gui.py:164
+#: ../iw/upgrade_bootloader_gui.py:167
msgid "What would you like to do?"
msgstr "您想怎么办?"
-#: ../iw/upgrade_migratefs_gui.py:32 ../textw/upgrade_text.py:37
+#: ../iw/upgrade_migratefs_gui.py:34 ../textw/upgrade_text.py:37
msgid "Migrate File Systems"
msgstr "迁移文件系统"
-#: ../iw/upgrade_migratefs_gui.py:62 ../textw/upgrade_text.py:39
-#, python-format
+#: ../iw/upgrade_migratefs_gui.py:64
+#, fuzzy, python-format
msgid ""
-"This release of %s supports the an updated file system, which has several "
+"This release of %s supports an updated file system, which has several "
"benefits over the file system traditionally shipped in %s. This "
"installation program can migrate formatted partitions without data loss.\n"
"\n"
@@ -4309,11 +4532,11 @@ msgstr ""
"\n"
"您想迁移哪些分区?"
-#: ../iw/upgrade_swap_gui.py:33
+#: ../iw/upgrade_swap_gui.py:35
msgid "Upgrade Swap Partition"
msgstr "升级交换分区"
-#: ../iw/upgrade_swap_gui.py:93 ../textw/upgrade_text.py:103
+#: ../iw/upgrade_swap_gui.py:95 ../textw/upgrade_text.py:103
#, python-format
msgid ""
"Recent kernels (2.4 or newer) need significantly more swap than older "
@@ -4324,7 +4547,7 @@ msgstr ""
"2.4 以上内核所需交换区要比老版内核大得多,大至您系统内存的两倍。您目前配置了 "
"%dMB 交换区,但现在您可以在任何一个文件系统中创建额外的交换区。"
-#: ../iw/upgrade_swap_gui.py:100
+#: ../iw/upgrade_swap_gui.py:102
#, python-format
msgid ""
"\n"
@@ -4335,62 +4558,62 @@ msgstr ""
"\n"
"安装程序检测到 %sMB 内存。\n"
-#: ../iw/upgrade_swap_gui.py:112
+#: ../iw/upgrade_swap_gui.py:114
msgid "I _want to create a swap file"
msgstr "我想创建一个交换文件(_w)"
-#: ../iw/upgrade_swap_gui.py:121
+#: ../iw/upgrade_swap_gui.py:123
msgid "Select the _partition to put the swap file on:"
msgstr "选择存放交换文件的分区(_p):"
-#: ../iw/upgrade_swap_gui.py:140 ../textw/upgrade_text.py:121
+#: ../iw/upgrade_swap_gui.py:142 ../textw/upgrade_text.py:121
msgid "Partition"
msgstr "分区"
-#: ../iw/upgrade_swap_gui.py:140
+#: ../iw/upgrade_swap_gui.py:142
msgid "Free Space (MB)"
msgstr "空闲磁盘空间(MB)"
-#: ../iw/upgrade_swap_gui.py:158
+#: ../iw/upgrade_swap_gui.py:160
#, python-format
msgid ""
"A minimum swap file size of %d MB is recommended. Please enter a size for "
"the swap file:"
msgstr "推荐您将交换文件至少定为 %dMB。请输入交换文件的大小:"
-#: ../iw/upgrade_swap_gui.py:173
+#: ../iw/upgrade_swap_gui.py:175
msgid "Swap file _size (MB):"
msgstr "交换文件大小(MB)(_s):"
-#: ../iw/upgrade_swap_gui.py:183
+#: ../iw/upgrade_swap_gui.py:185
msgid "I _don't want to create a swap file"
msgstr "我不想创建交换文件(_d)"
-#: ../iw/upgrade_swap_gui.py:193
+#: ../iw/upgrade_swap_gui.py:195
msgid ""
"A swap file is strongly recommended. Failure to create one could cause the "
"installer to abort abnormally. Are you sure you wish to continue?"
msgstr ""
"强烈建议您创建一个交换文件,否则会导致安装程序非正常中止。您确定要继续么?"
-#: ../iw/upgrade_swap_gui.py:201 ../textw/upgrade_text.py:187
+#: ../iw/upgrade_swap_gui.py:203 ../textw/upgrade_text.py:187
msgid "The swap file must be between 1 and 2000 MB in size."
msgstr "交换文件的大小必须在 1MB 到 2000MB 之间。"
-#: ../iw/upgrade_swap_gui.py:208 ../textw/upgrade_text.py:182
+#: ../iw/upgrade_swap_gui.py:210 ../textw/upgrade_text.py:182
msgid ""
"There is not enough space on the device you selected for the swap partition."
msgstr "您所选的交换分区在该设备上空间不够。"
-#: ../iw/zipl_gui.py:35
+#: ../iw/zipl_gui.py:37
msgid "z/IPL Boot Loader Configuration"
msgstr "z/IPL 引导装载程序配置"
-#: ../iw/zipl_gui.py:59
+#: ../iw/zipl_gui.py:61
msgid "The z/IPL boot loader will be installed on your system."
msgstr "z/IPL 引导装载程序将会被安装在您的系统上。"
-#: ../iw/zipl_gui.py:61
+#: ../iw/zipl_gui.py:63
msgid ""
"The z/IPL Boot Loader will now be installed on your system.\n"
"\n"
@@ -4416,11 +4639,11 @@ msgstr ""
"\n"
"现在您可以输入任何您的机器或设置所需的额外内核参数。"
-#: ../iw/zipl_gui.py:88 ../textw/zipl_text.py:68
+#: ../iw/zipl_gui.py:90 ../textw/zipl_text.py:71
msgid "Kernel Parameters"
msgstr "内核参数"
-#: ../iw/zipl_gui.py:91 ../iw/zipl_gui.py:94
+#: ../iw/zipl_gui.py:93 ../iw/zipl_gui.py:96
msgid "Chandev Parameters"
msgstr "Chandev 参数"
@@ -4556,7 +4779,7 @@ msgstr "密码太短"
msgid "Boot loader password is too short"
msgstr "引导装载程序密码太短"
-#: ../textw/complete_text.py:31
+#: ../textw/complete_text.py:32
msgid ""
"Press <Enter> to end the installation process.\n"
"\n"
@@ -4564,11 +4787,11 @@ msgstr ""
"按 <Enter> 键来结束安装进程。\n"
"\n"
-#: ../textw/complete_text.py:32
+#: ../textw/complete_text.py:33
msgid "<Enter> to exit"
msgstr "按 <Enter> 键退出"
-#: ../textw/complete_text.py:36
+#: ../textw/complete_text.py:37
#, python-format
msgid ""
"Congratulations, your %s installation is complete.\n"
@@ -4579,7 +4802,7 @@ msgstr ""
"\n"
"%s%s"
-#: ../textw/complete_text.py:39
+#: ../textw/complete_text.py:40
#, python-format
msgid ""
"For information on errata (updates and bug fixes), visit http://www.redhat."
@@ -4593,56 +4816,126 @@ msgstr ""
"有关使用系统的信息,则可到 http://www.redhat.com/docs 网页上 %s 指南手册中查"
"阅。"
-#: ../textw/complete_text.py:45
+#: ../textw/complete_text.py:46
msgid "Complete"
msgstr "完成"
-#: ../textw/complete_text.py:46
+#: ../textw/complete_text.py:47
msgid "Reboot"
msgstr "重新引导"
-#: ../textw/grpselect_text.py:94
+#: ../textw/grpselect_text.py:71
msgid "Please select the package groups you would like to install."
msgstr "请选择您想安装的软件包."
-#: ../textw/grpselect_text.py:112
+#: ../textw/grpselect_text.py:89
msgid ""
"<Space>,<+>,<-> selection | <F2> Group Details | <F12> next screen"
msgstr "<Space>,<+>,<-> 选择 | <F2> 软件包组详情 | <F12> 下一屏幕"
-#: ../textw/grpselect_text.py:124
+#: ../textw/grpselect_text.py:101
msgid "No optional packages to select"
msgstr "没有可选的软件包"
-#: ../textw/grpselect_text.py:146
+#: ../textw/grpselect_text.py:123
msgid "Package Group Details"
msgstr "软件包组详情"
-#: ../textw/keyboard_text.py:46
+#: ../textw/keyboard_text.py:48
msgid "Keyboard Selection"
msgstr "选择键盘"
-#: ../textw/keyboard_text.py:47
+#: ../textw/keyboard_text.py:49
msgid "Which model keyboard is attached to this computer?"
msgstr "与计算机连接的键盘属于何种型号?"
-#: ../textw/network_text.py:58
+#: ../textw/netconfig_text.py:41
+#, fuzzy, python-format
+msgid "A value is required for the field %s"
+msgstr "%s字段需要输入值。"
+
+#: ../textw/netconfig_text.py:86 tmp/netconfig.glade.h:9
+msgid "Enable network interface"
+msgstr "启动网络界面"
+
+#: ../textw/netconfig_text.py:89 tmp/netconfig.glade.h:10
+msgid ""
+"This requires that you have an active network connection during the "
+"installation process. Please configure a network interface."
+msgstr "您在安装的过程中需要激活网络连接,请配置网络界面。"
+
+#: ../textw/netconfig_text.py:111
+#, fuzzy
+msgid "Use dynamic IP configuration (DHCP)"
+msgstr "使用(_d)动态 IP 配置(DHCP)"
+
+#: ../textw/netconfig_text.py:114 ../textw/network_text.py:151
+#: ../loader/net.c:494 tmp/netpostconfig.glade.h:9
+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
+#, fuzzy
+msgid "IPv4 Address:"
+msgstr "IPv4 地址:"
+
+#: ../textw/netconfig_text.py:131
+#, fuzzy
+msgid "IPv6 Address:"
+msgstr "IPv6地址:"
+
+#: ../textw/netconfig_text.py:141 ../textw/network_text.py:682
+#: ../loader/net.c:828
+msgid "Gateway:"
+msgstr "网关:"
+
+#: ../textw/netconfig_text.py:144
+#, fuzzy
+msgid "Nameserver:"
+msgstr "名称服务器"
+
+#: ../textw/netconfig_text.py:171
+#, fuzzy
+msgid "Missing Device"
+msgstr "缺少软件包"
+
+#: ../textw/netconfig_text.py:172
+#, fuzzy
+msgid "You must select a network device"
+msgstr "您必须选择一个要编辑的分区"
+
+#: ../textw/netconfig_text.py:231
+#, fuzzy
+msgid "IPv4 Network Mask "
+msgstr "IPv4/子网掩码"
+
+#: ../textw/netconfig_text.py:257
+#, fuzzy
+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:75
+#: ../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:79
+#: ../textw/network_text.py:81
msgid "Integer Required for Prefix"
msgstr "前缀必需是整数"
-#: ../textw/network_text.py:80
+#: ../textw/network_text.py:82
#, python-format
msgid ""
"You must enter a valid integer for the %s. For IPv4, the value can be "
@@ -4651,112 +4944,102 @@ msgstr ""
"您必须为%s输入一个有效的整数.对于IPv4,其值介于0到32.如果是IPv6,其值应介于0到"
"128."
-#: ../textw/network_text.py:87 tmp/netpostconfig.glade.h:16
+#: ../textw/network_text.py:89 tmp/netpostconfig.glade.h:16
msgid "Prefix (Netmask)"
msgstr "前缀(子网掩码)"
-#: ../textw/network_text.py:89 tmp/netpostconfig.glade.h:15
+#: ../textw/network_text.py:91 tmp/netpostconfig.glade.h:15
msgid "Prefix"
msgstr "前缀"
-#: ../textw/network_text.py:142
+#: ../textw/network_text.py:144
msgid "Activate on boot"
msgstr "引导时激活"
-#: ../textw/network_text.py:149 ../loader/net.c:730
-#: tmp/netpostconfig.glade.h:9
-msgid "Enable IPv4 support"
-msgstr "启动IPv4支持"
-
-#: ../textw/network_text.py:156 ../loader/net.c:743
-#: tmp/netpostconfig.glade.h:10
-msgid "Enable IPv6 support"
-msgstr "启动IPV6支持"
-
-#: ../textw/network_text.py:169
+#: ../textw/network_text.py:171
msgid "P-to-P:"
msgstr "点到点"
-#: ../textw/network_text.py:187 tmp/netpostconfig.glade.h:7
+#: ../textw/network_text.py:189 tmp/netpostconfig.glade.h:7
msgid "ESSID:"
msgstr "ESSID:"
-#: ../textw/network_text.py:196
+#: ../textw/network_text.py:198
msgid "WEP Key:"
msgstr "WEP密码:"
-#: ../textw/network_text.py:209
+#: ../textw/network_text.py:211
#, python-format
msgid "Network Configuration for %s"
msgstr "%s 的网络配置"
-#: ../textw/network_text.py:246 ../textw/network_text.py:249
+#: ../textw/network_text.py:248 ../textw/network_text.py:251
msgid "point-to-point IP address"
msgstr "点到点IP地址"
-#: ../textw/network_text.py:272 tmp/netpostconfig.glade.h:5
+#: ../textw/network_text.py:274 tmp/netpostconfig.glade.h:5
msgid "Dynamic IP configuration (DHCP)"
msgstr "动态 IP 配置(DHCP)"
-#: ../textw/network_text.py:275 ../textw/network_text.py:406
+#: ../textw/network_text.py:277 ../textw/network_text.py:408
msgid "Manual address configuration"
msgstr "手动配置地址"
-#: ../textw/network_text.py:295
+#: ../textw/network_text.py:297
#, python-format
msgid "IPv4 Configuration for %s"
msgstr "%s 的IPv4配置"
-#: ../textw/network_text.py:325 ../textw/network_text.py:337
-#: ../textw/network_text.py:340
+#: ../textw/network_text.py:327 ../textw/network_text.py:339
+#: ../textw/network_text.py:342
msgid "IPv4 address"
msgstr "IPv4 地址"
-#: ../textw/network_text.py:329
+#: ../textw/network_text.py:331
msgid "IPv4 network mask"
msgstr "IPv4子网掩码"
-#: ../textw/network_text.py:355 ../textw/network_text.py:358
-#: ../textw/network_text.py:361
+#: ../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:400 tmp/netpostconfig.glade.h:4
+#: ../textw/network_text.py:402 tmp/netpostconfig.glade.h:4
msgid "Automatic neighbor discovery"
msgstr "自动侦测网络邻居"
-#: ../textw/network_text.py:403 tmp/netpostconfig.glade.h:6
+#: ../textw/network_text.py:405 tmp/netpostconfig.glade.h:6
msgid "Dynamic IP configuration (DHCPv6)"
msgstr "动态 IP 配置(DHCPv6)"
-#: ../textw/network_text.py:430
+#: ../textw/network_text.py:432
#, python-format
msgid "IPv6 Configuration for %s"
msgstr "%s 的IPv6网络配置"
-#: ../textw/network_text.py:460 ../textw/network_text.py:471
-#: ../textw/network_text.py:474
+#: ../textw/network_text.py:462 ../textw/network_text.py:473
+#: ../textw/network_text.py:476
msgid "IPv6 address"
msgstr "IPv6地址"
-#: ../textw/network_text.py:464 ../textw/network_text.py:483
+#: ../textw/network_text.py:466 ../textw/network_text.py:485
msgid "IPv6 prefix"
msgstr "IPv6前缀"
-#: ../textw/network_text.py:509
+#: ../textw/network_text.py:511
msgid "Configure Network Interface"
msgstr "配置网络界面"
-#: ../textw/network_text.py:510
+#: ../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:524 ../textw/network_text.py:526
+#: ../textw/network_text.py:526 ../textw/network_text.py:528
msgid "UNCONFIGURED"
msgstr "未配置(UNCONFIGURED)"
-#: ../textw/network_text.py:535
+#: ../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 "
@@ -4766,67 +5049,63 @@ msgstr ""
"每个接口的现有配置列在设备名称旁。没有配置的接口被标记为UNCONFIGURED。选择接"
"口然后选择Edit可以对接口进行配置。当您完成配置,点击OK进行下一步。"
-#: ../textw/network_text.py:567
+#: ../textw/network_text.py:571
msgid "Active on boot"
msgstr "引导时激活"
-#: ../textw/network_text.py:569
+#: ../textw/network_text.py:573
msgid "Inactive on boot"
msgstr "引导时不激活"
-#: ../textw/network_text.py:572
+#: ../textw/network_text.py:576
msgid "DHCP"
msgstr "动态主机配置协议(DHCP)"
-#: ../textw/network_text.py:577
+#: ../textw/network_text.py:581
msgid "Auto IPv6"
msgstr "自动 IPv6"
-#: ../textw/network_text.py:579
+#: ../textw/network_text.py:583
msgid "DHCPv6"
msgstr "DHCPv6"
-#: ../textw/network_text.py:678 ../loader/net.c:1055
-msgid "Gateway:"
-msgstr "网关:"
-
-#: ../textw/network_text.py:687
+#: ../textw/network_text.py:691
msgid "Primary DNS:"
msgstr "主 DNS:"
-#: ../textw/network_text.py:692
+#: ../textw/network_text.py:696
msgid "Secondary DNS:"
msgstr "从 DNS:"
-#: ../textw/network_text.py:699
+#: ../textw/network_text.py:703
msgid "Miscellaneous Network Settings"
msgstr "其它网络设置"
-#: ../textw/network_text.py:716 ../textw/network_text.py:719
+#: ../textw/network_text.py:720 ../textw/network_text.py:723
msgid "gateway"
msgstr "网关"
-#: ../textw/network_text.py:726 ../textw/network_text.py:729
+#: ../textw/network_text.py:730 ../textw/network_text.py:733
msgid "primary DNS"
msgstr "主 DNS"
-#: ../textw/network_text.py:738
+#: ../textw/network_text.py:742
msgid "secondary DNS"
msgstr "从 DNS"
-#: ../textw/network_text.py:762
+#: ../textw/network_text.py:766
msgid "automatically via DHCP"
msgstr "通过 DHCP 自动配置"
-#: ../textw/network_text.py:765
+#: ../textw/network_text.py:769
msgid "manually"
msgstr "手工设置"
-#: ../textw/network_text.py:784
+#: ../textw/network_text.py:788
msgid "Hostname Configuration"
msgstr "主机名配置"
-#: ../textw/network_text.py:787
+#: ../textw/network_text.py:791
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 "
@@ -4837,269 +5116,269 @@ msgstr ""
"动配置。否则,选择手工配置,并为您的系统输入一个主机名。如果您不这么做,您的"
"系统就会被称为“本地主机”。"
-#: ../textw/network_text.py:813 ../textw/network_text.py:819
+#: ../textw/network_text.py:817 ../textw/network_text.py:823
msgid "Invalid Hostname"
msgstr "无效主机名"
-#: ../textw/network_text.py:814
+#: ../textw/network_text.py:818
msgid "You have not specified a hostname."
msgstr "您还没有指定一个主机名。"
-#: ../textw/partition_text.py:50
+#: ../textw/partition_text.py:51
msgid "Must specify a value"
msgstr "必须指定一个值"
-#: ../textw/partition_text.py:53
+#: ../textw/partition_text.py:54
msgid "Requested value is not an integer"
msgstr "申请值不是整数"
-#: ../textw/partition_text.py:55
+#: ../textw/partition_text.py:56
msgid "Requested value is too large"
msgstr "申请值太大"
-#: ../textw/partition_text.py:122
+#: ../textw/partition_text.py:123
#, python-format
msgid "RAID Device %s"
msgstr "RAID 设备 %s"
-#: ../textw/partition_text.py:250
+#: ../textw/partition_text.py:251
#, python-format
msgid "Warning: %s"
msgstr "警告:%s"
-#: ../textw/partition_text.py:251
+#: ../textw/partition_text.py:252
msgid "Modify Partition"
msgstr "修改分区"
-#: ../textw/partition_text.py:251
+#: ../textw/partition_text.py:252
msgid "Add anyway"
msgstr "强行添加"
-#: ../textw/partition_text.py:289
+#: ../textw/partition_text.py:290
msgid "Mount Point:"
msgstr "挂载点:"
-#: ../textw/partition_text.py:341
+#: ../textw/partition_text.py:342
msgid "File System type:"
msgstr "文件系统类型:"
-#: ../textw/partition_text.py:375
+#: ../textw/partition_text.py:376
msgid "Allowable Drives:"
msgstr "允许的驱动器:"
-#: ../textw/partition_text.py:431
+#: ../textw/partition_text.py:432
msgid "Fixed Size:"
msgstr "固定大小:"
-#: ../textw/partition_text.py:433
+#: ../textw/partition_text.py:434
msgid "Fill maximum size of (MB):"
msgstr "使用全部空间(MB):"
-#: ../textw/partition_text.py:437
+#: ../textw/partition_text.py:438
msgid "Fill all available space:"
msgstr "使用全部可用空间:"
-#: ../textw/partition_text.py:460
+#: ../textw/partition_text.py:461
msgid "Start Cylinder:"
msgstr "起始柱面:"
-#: ../textw/partition_text.py:473
+#: ../textw/partition_text.py:474
msgid "End Cylinder:"
msgstr "结束柱面:"
-#: ../textw/partition_text.py:496
+#: ../textw/partition_text.py:497
msgid "Volume Group:"
msgstr "卷组:"
-#: ../textw/partition_text.py:518
+#: ../textw/partition_text.py:519
msgid "RAID Level:"
msgstr "RAID 级别:"
-#: ../textw/partition_text.py:536
+#: ../textw/partition_text.py:537
msgid "RAID Members:"
msgstr "RAID 成员:"
-#: ../textw/partition_text.py:555
+#: ../textw/partition_text.py:556
msgid "Number of spares?"
msgstr "备件数量?"
-#: ../textw/partition_text.py:569
+#: ../textw/partition_text.py:570
msgid "File System Type:"
msgstr "文件系统类型:"
-#: ../textw/partition_text.py:582
+#: ../textw/partition_text.py:583
msgid "File System Label:"
msgstr "文件系统标签:"
-#: ../textw/partition_text.py:593
+#: ../textw/partition_text.py:594
msgid "File System Option:"
msgstr "文件系统选项:"
-#: ../textw/partition_text.py:596 ../textw/partition_text.py:803
-#: ../textw/partition_text.py:1028 ../textw/partition_text.py:1198
+#: ../textw/partition_text.py:597 ../textw/partition_text.py:804
+#: ../textw/partition_text.py:1029 ../textw/partition_text.py:1199
#, python-format
msgid "Format as %s"
msgstr "格式化成 %s"
-#: ../textw/partition_text.py:598 ../textw/partition_text.py:805
-#: ../textw/partition_text.py:1030 ../textw/partition_text.py:1200
+#: ../textw/partition_text.py:599 ../textw/partition_text.py:806
+#: ../textw/partition_text.py:1031 ../textw/partition_text.py:1201
#, python-format
msgid "Migrate to %s"
msgstr "迁移到 %s"
-#: ../textw/partition_text.py:600 ../textw/partition_text.py:807
-#: ../textw/partition_text.py:1032 ../textw/partition_text.py:1202
+#: ../textw/partition_text.py:601 ../textw/partition_text.py:808
+#: ../textw/partition_text.py:1033 ../textw/partition_text.py:1203
msgid "Leave unchanged"
msgstr "保持不变"
-#: ../textw/partition_text.py:613 ../textw/partition_text.py:783
-#: ../textw/partition_text.py:1008 ../textw/partition_text.py:1178
+#: ../textw/partition_text.py:614 ../textw/partition_text.py:784
+#: ../textw/partition_text.py:1009 ../textw/partition_text.py:1179
msgid "File System Options"
msgstr "文件系统选项"
-#: ../textw/partition_text.py:616
+#: ../textw/partition_text.py:617
msgid ""
"Please choose how you would like to prepare the file system on this "
"partition."
msgstr "请选择您想如何在该分区上筹备文件系统。"
-#: ../textw/partition_text.py:623
+#: ../textw/partition_text.py:624
msgid "Leave unchanged (preserve data)"
msgstr "保持不变(保留信息)"
-#: ../textw/partition_text.py:632
+#: ../textw/partition_text.py:633
msgid "Format as:"
msgstr "格式化成:"
-#: ../textw/partition_text.py:652
+#: ../textw/partition_text.py:653
msgid "Migrate to:"
msgstr "迁移到:"
-#: ../textw/partition_text.py:753
+#: ../textw/partition_text.py:754
msgid "Force to be a primary partition"
msgstr "强制为主分区"
-#: ../textw/partition_text.py:762
+#: ../textw/partition_text.py:763
msgid "Not Supported"
msgstr "不支持"
-#: ../textw/partition_text.py:763
+#: ../textw/partition_text.py:764
msgid "You can only edit LVM Volume Groups in the graphical installer."
msgstr "您只能在图形化安装程序中编辑LVM 卷组."
-#: ../textw/partition_text.py:830 ../textw/partition_text.py:878
+#: ../textw/partition_text.py:831 ../textw/partition_text.py:879
msgid "Invalid Entry for Partition Size"
msgstr "分区大小项目无效"
-#: ../textw/partition_text.py:842
+#: ../textw/partition_text.py:843
msgid "Invalid Entry for Maximum Size"
msgstr "最大值项目无效"
-#: ../textw/partition_text.py:861
+#: ../textw/partition_text.py:862
msgid "Invalid Entry for Starting Cylinder"
msgstr "起始柱面项目无效"
-#: ../textw/partition_text.py:870
+#: ../textw/partition_text.py:871
msgid "Invalid Entry for End Cylinder"
msgstr "结束柱面项目无效"
-#: ../textw/partition_text.py:981
+#: ../textw/partition_text.py:982
msgid "No RAID partitions"
msgstr "无 RAID 分区"
-#: ../textw/partition_text.py:982
+#: ../textw/partition_text.py:983
msgid "At least two software RAID partitions are needed."
msgstr "至少需要两个软件 RAID 分区。"
-#: ../textw/partition_text.py:994 ../textw/partition_text.py:1165
+#: ../textw/partition_text.py:995 ../textw/partition_text.py:1166
msgid "Format partition?"
msgstr "格式化分区?"
-#: ../textw/partition_text.py:1056
+#: ../textw/partition_text.py:1057
msgid "Invalid Entry for RAID Spares"
msgstr "RAID 备件项目无效"
-#: ../textw/partition_text.py:1071
+#: ../textw/partition_text.py:1072
msgid "Too many spares"
msgstr "剩余太多"
-#: ../textw/partition_text.py:1072
+#: ../textw/partition_text.py:1073
msgid "You may not use any spares with a RAID0 array."
msgstr "RAID0 阵列不能有任何多余。"
-#: ../textw/partition_text.py:1151
+#: ../textw/partition_text.py:1152
msgid "No Volume Groups"
msgstr "没有卷组"
-#: ../textw/partition_text.py:1152
+#: ../textw/partition_text.py:1153
msgid "No volume groups exist in which to create a logical volume"
msgstr "没有卷组可用于创建逻辑卷"
-#: ../textw/partition_text.py:1276
+#: ../textw/partition_text.py:1277
#, python-format
msgid ""
"The current requested size (%10.2f MB) is larger than the maximum logical "
"volume size (%10.2f MB). "
msgstr "目前申请的大小(%10.2f MB)大于逻辑卷大小的最大值(%10.2f MB)。"
-#: ../textw/partition_text.py:1295
+#: ../textw/partition_text.py:1296
#, python-format
msgid ""
"The current requested size (%10.2f MB) is larger than the available size in "
"the volume group (%10.2f MB)."
msgstr "当前所请求的容量(%10.2f MB)比卷组现存的容量(%10.2f MB)要大。"
-#: ../textw/partition_text.py:1348
+#: ../textw/partition_text.py:1349
msgid "New Partition or Logical Volume?"
msgstr "是否新建分区或逻辑卷?"
-#: ../textw/partition_text.py:1349
+#: ../textw/partition_text.py:1350
msgid "Would you like to create a new partition or a new logical volume?"
msgstr "您是否要新建逻辑卷或新建分区?"
-#: ../textw/partition_text.py:1351
+#: ../textw/partition_text.py:1352
msgid "partition"
msgstr "分区"
-#: ../textw/partition_text.py:1351
+#: ../textw/partition_text.py:1352
msgid "logical volume"
msgstr "逻辑卷"
-#: ../textw/partition_text.py:1423
+#: ../textw/partition_text.py:1424
msgid "Size"
msgstr "大小"
-#: ../textw/partition_text.py:1427
+#: ../textw/partition_text.py:1428
msgid "New"
msgstr "新建"
-#: ../textw/partition_text.py:1429
+#: ../textw/partition_text.py:1430
msgid "Delete"
msgstr "删除"
-#: ../textw/partition_text.py:1430
+#: ../textw/partition_text.py:1431
msgid "RAID"
msgstr "RAID"
-#: ../textw/partition_text.py:1433
+#: ../textw/partition_text.py:1434
msgid ""
" F1-Help F2-New F3-Edit F4-Delete F5-Reset F12-OK "
msgstr ""
" F1-帮助 F2-新建 F3-编辑 F4-删除 F5-重设 F12-确定 "
-#: ../textw/partition_text.py:1465
+#: ../textw/partition_text.py:1466
msgid "No Root Partition"
msgstr "无根分区"
-#: ../textw/partition_text.py:1466
+#: ../textw/partition_text.py:1467
msgid "Installation requires a / partition."
msgstr "安装需要 a /分区."
-#: ../textw/partition_text.py:1508
+#: ../textw/partition_text.py:1509
msgid "Partitioning Type"
msgstr "分区类型"
-#: ../textw/partition_text.py:1510
+#: ../textw/partition_text.py:1511
msgid ""
"Installation requires partitioning of your hard drive. The default layout "
"is reasonable for most users. You can either choose to use this or create "
@@ -5108,35 +5387,35 @@ msgstr ""
"安装需要对您的硬盘进行分区。默认分区方案适合大多数用户。您可以选择默认的分"
"区,也可以创建您自己的分区。"
-#: ../textw/partition_text.py:1534
+#: ../textw/partition_text.py:1535
msgid "Which drive(s) do you want to use for this installation?"
msgstr "本次安装,您想使用哪些驱动器?"
-#: ../textw/partition_text.py:1549
+#: ../textw/partition_text.py:1550
msgid "<Space>,<+>,<-> selection | <F2> Add drive | <F12> next screen"
msgstr "<Space>,<+>,<-> 选择 | <F2> 添加驱动器 | <F12> 下一屏幕"
-#: ../textw/partition_text.py:1616
+#: ../textw/partition_text.py:1617
msgid "Review Partition Layout"
msgstr "检验分区方案"
-#: ../textw/partition_text.py:1617
+#: ../textw/partition_text.py:1618
msgid "Review and modify partitioning layout?"
msgstr "检验和修改分区方案?"
-#: ../textw/partition_text.py:1638 tmp/adddrive.glade.h:3
+#: ../textw/partition_text.py:1639 tmp/adddrive.glade.h:3
msgid "Advanced Storage Options"
msgstr "高级存储选项"
-#: ../textw/partition_text.py:1639 tmp/adddrive.glade.h:5
+#: ../textw/partition_text.py:1640 tmp/adddrive.glade.h:5
msgid "How would you like to modify your drive configuration?"
msgstr "您想如何修改驱动配置?"
-#: ../textw/partition_text.py:1662
+#: ../textw/partition_text.py:1663
msgid "Add FCP Device"
msgstr "添加 FCP 设备"
-#: ../textw/partition_text.py:1663 tmp/zfcp-config.glade.h:5
+#: ../textw/partition_text.py:1664 tmp/zfcp-config.glade.h:5
msgid ""
"zSeries machines can access industry-standard SCSI devices via Fibre Channel "
"(FCP). You need to provide a 16 bit device number, a 64 bit World Wide Port "
@@ -5146,42 +5425,42 @@ msgstr ""
"提供5个参数:一个16位设备号、一个16位 SCSI ID、一个64位全局端口名(WWPN)、一"
"个16位 SCSI LUN 和一个64位 FCP LUN。"
-#: ../textw/partition_text.py:1686 tmp/iscsi-config.glade.h:5
+#: ../textw/partition_text.py:1687 tmp/iscsi-config.glade.h:5
msgid "Configure iSCSI Parameters"
msgstr "配置iSCSI参数"
-#: ../textw/partition_text.py:1687 tmp/iscsi-config.glade.h:6
+#: ../textw/partition_text.py:1688 tmp/iscsi-config.glade.h:6
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."
msgstr ""
"使用iSCSI磁盘时,您必须提供您在主机上设置的iSCSI目标及iSCSI启动器名称的地址。"
-#: ../textw/partition_text.py:1688
+#: ../textw/partition_text.py:1689
msgid "Target IP Address"
msgstr "目标 IP 地址"
-#: ../textw/partition_text.py:1689
+#: ../textw/partition_text.py:1690
msgid "iSCSI Initiator Name"
msgstr "iSCSI 启动器名称"
-#: ../textw/partmethod_text.py:32
+#: ../textw/partmethod_text.py:34
msgid "Autopartition"
msgstr "自动分区"
-#: ../textw/partmethod_text.py:33
+#: ../textw/partmethod_text.py:35
msgid "Disk Druid"
msgstr "Disk Druid"
-#: ../textw/progress_text.py:59
+#: ../textw/progress_text.py:61
msgid "Package Installation"
msgstr "安装软件包"
-#: ../textw/task_text.py:51
+#: ../textw/task_text.py:53
msgid "Package selection"
msgstr "选择软件包"
-#: ../textw/task_text.py:57 tmp/tasksel.glade.h:4
+#: ../textw/task_text.py:59 tmp/tasksel.glade.h:4
#, no-c-format, python-format
msgid ""
"The default installation of %s includes a set of software applicable for "
@@ -5191,31 +5470,45 @@ msgstr ""
"%s 的默认安装包括一系列用于一般互联网应用的软件。您希望您的系统可以支持的额外"
"功能是什么?"
-#: ../textw/task_text.py:72
+#: ../textw/task_text.py:74
msgid "Customize software selection"
msgstr "定制软件选择"
-#: ../textw/timezone_text.py:74
+#: ../textw/timezone_text.py:75
msgid "In which time zone are you located?"
msgstr "您位于哪一个时区?"
-#: ../textw/timezone_text.py:92
+#: ../textw/timezone_text.py:93
msgid "System clock uses UTC"
msgstr "系统时钟使用 UTC"
-#: ../textw/upgrade_bootloader_text.py:112
-#: ../textw/upgrade_bootloader_text.py:121
+#: ../textw/upgrade_bootloader_text.py:115
+#: ../textw/upgrade_bootloader_text.py:124
msgid "Update boot loader configuration"
msgstr "更新引导装载程序配置"
-#: ../textw/upgrade_bootloader_text.py:124
+#: ../textw/upgrade_bootloader_text.py:127
msgid "Skip boot loader updating"
msgstr "跳过引导装载程序的更新"
-#: ../textw/upgrade_bootloader_text.py:126
+#: ../textw/upgrade_bootloader_text.py:129
msgid "Create new boot loader configuration"
msgstr "创建新的引导装载程序配置"
+#: ../textw/upgrade_text.py:39
+#, python-format
+msgid ""
+"This release of %s supports the an updated file system, which has several "
+"benefits over the file system traditionally shipped in %s. This "
+"installation program can migrate formatted partitions without data loss.\n"
+"\n"
+"Which of these partitions would you like to migrate?"
+msgstr ""
+"%s 的本次发行版支持更新的文件系统,该文件系统和之前通常在 %s 中使用的文件系统"
+"相比有几个有点。这个安装程序可在不丢失数据的情况下迁移格式化的分区。\n"
+"\n"
+"您想迁移哪些分区?"
+
#: ../textw/upgrade_text.py:121
msgid "Free Space"
msgstr "空闲空间"
@@ -5259,26 +5552,26 @@ msgstr ""
"\n"
"请选择一个来升级,或选择“重新安装系统”来全新安装您的系统。"
-#: ../textw/userauth_text.py:27
+#: ../textw/userauth_text.py:30
msgid "Root Password"
msgstr "根密码"
-#: ../textw/userauth_text.py:30
+#: ../textw/userauth_text.py:33
msgid ""
"Pick a root password. You must type it twice to ensure you know it and do "
"not make a typing mistake. "
msgstr "选择一个根密码。您必须键入两次以保证您记住了它且没有输入错误。"
-#: ../textw/userauth_text.py:64
+#: ../textw/userauth_text.py:67
msgid "The root password must be at least 6 characters long."
msgstr "根密码最少应有六个字符。"
-#: ../textw/welcome_text.py:27
+#: ../textw/welcome_text.py:28
#, python-format
msgid "%s"
msgstr "%s"
-#: ../textw/welcome_text.py:28
+#: ../textw/welcome_text.py:29
#, python-format
msgid ""
"Welcome to %s!\n"
@@ -5287,7 +5580,7 @@ msgstr ""
"欢迎使用 %s!\n"
"\n"
-#: ../textw/zipl_text.py:32
+#: ../textw/zipl_text.py:35
msgid ""
"The z/IPL Boot Loader will be installed on your system after installation is "
"complete. You can now enter any additional kernel and chandev parameters "
@@ -5296,19 +5589,19 @@ msgstr ""
"z/IPL 引导装载程序将会在安装完成后在您的系统上被安装。您现在可以输入您的机器"
"或设置可能需要的附加内核和 chandev 参数。"
-#: ../textw/zipl_text.py:64
+#: ../textw/zipl_text.py:67
msgid "z/IPL Configuration"
msgstr "z/IPL 配置"
-#: ../textw/zipl_text.py:72 ../textw/zipl_text.py:76
+#: ../textw/zipl_text.py:75 ../textw/zipl_text.py:79
msgid "Chandev line "
msgstr "Chandev 行"
-#: ../installclasses/fedora.py:34
+#: ../installclasses/fedora.py:38
msgid "_Fedora"
msgstr "Fedora(_F)"
-#: ../installclasses/fedora.py:35 ../installclasses/rhel.py:42
+#: ../installclasses/fedora.py:39 ../installclasses/rhel.py:44
#, python-format
msgid ""
"The default installation of %s includes a set of software applicable for "
@@ -5318,55 +5611,55 @@ msgstr ""
"%s 的默认安装包括一系列用于一般互联网应用的软件。您希望您的系统可以支持的额外"
"功能是什么?"
-#: ../installclasses/fedora.py:44
+#: ../installclasses/fedora.py:48
msgid "Office and Productivity"
msgstr "办公"
-#: ../installclasses/fedora.py:45 ../installclasses/rhel.py:54
-#: ../installclasses/rhel.py:59
+#: ../installclasses/fedora.py:49 ../installclasses/rhel.py:56
+#: ../installclasses/rhel.py:61
msgid "Software Development"
msgstr "软件开发"
-#: ../installclasses/fedora.py:46 ../installclasses/rhel.py:58
+#: ../installclasses/fedora.py:50 ../installclasses/rhel.py:60
msgid "Web server"
msgstr "网络服务器"
-#: ../installclasses/rhel.py:41
+#: ../installclasses/rhel.py:43
msgid "Red Hat Enterprise Linux"
msgstr "红帽企业 Linux"
-#: ../installclasses/rhel.py:51
+#: ../installclasses/rhel.py:53
msgid "Office"
msgstr "办公"
-#: ../installclasses/rhel.py:52
+#: ../installclasses/rhel.py:54
msgid "Multimedia"
msgstr "多媒体"
-#: ../installclasses/rhel.py:63
+#: ../installclasses/rhel.py:65
msgid "Virtualization"
msgstr "虚拟化"
-#: ../installclasses/rhel.py:64
+#: ../installclasses/rhel.py:66
msgid "Clustering"
msgstr "建立集群"
-#: ../installclasses/rhel.py:65
+#: ../installclasses/rhel.py:67
msgid "Storage Clustering"
msgstr "存储器 集群"
-#: ../installclasses/rhel.py:69
+#: ../installclasses/rhel.py:71
msgid "Installation Number"
msgstr "安装号码"
-#: ../installclasses/rhel.py:70
+#: ../installclasses/rhel.py:72
msgid ""
"To install the full set of supported packages included in your subscription, "
"please enter your Installation Number"
msgstr ""
"如果您希望安装你选择的所有选择的软件包,请输入您的Installation Number。"
-#: ../installclasses/rhel.py:73
+#: ../installclasses/rhel.py:75
msgid ""
"If you're unable to locate the Installation Number, consult http://www."
"redhat.com/apps/support/in.html.\n"
@@ -5386,22 +5679,21 @@ msgstr ""
"*您的Red Hat Enterprise Linux 将得不到支持和保护。\n"
"*您将不能获得更多的关于软件和安全升级"
-#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:117
+#: ../loader/cdinstall.c:177 ../loader/cdinstall.c:198
#: ../loader/mediacheck.c:76
msgid "Media Check"
msgstr "检查介质"
-#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:99
-#: ../loader/cdinstall.c:117 ../loader/cdinstall.c:125
-#: ../loader/method.c:393
+#: ../loader/cdinstall.c:177 ../loader/cdinstall.c:180
+#: ../loader/cdinstall.c:198 ../loader/cdinstall.c:206 ../loader/method.c:327
msgid "Test"
msgstr "测试"
-#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
+#: ../loader/cdinstall.c:177 ../loader/cdinstall.c:181
msgid "Eject Disc"
msgstr "弹出光盘"
-#: ../loader/cdinstall.c:97
+#: ../loader/cdinstall.c:178
#, c-format
msgid ""
"Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5410,7 +5702,7 @@ msgstr ""
"选择\"%s\" 来测试当前驱动器内的光盘,或\"%s\" 来弹出光盘,然后另插入一张来测"
"试。"
-#: ../loader/cdinstall.c:118
+#: ../loader/cdinstall.c:199
#, c-format
msgid ""
"If you would like to test additional media, insert the next disc and press "
@@ -5422,18 +5714,18 @@ msgstr ""
"如果您想测试附带的媒体,请放入下一张CD,并按\"%s\"。建议测试每一张CD,但并非"
"严格要求这么做。至少在CD在第一次使用前要进行测试,之后就不必再测试了。"
-#: ../loader/cdinstall.c:142
+#: ../loader/cdinstall.c:220
#, c-format
msgid ""
"The %s disc was not found in any of your drives. Please insert the %s disc "
"and press %s to retry."
msgstr "在您所有驱动器中均无法找到 %s 光盘。请插入 %s 光盘,然后按 %s 来重试。"
-#: ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:239
msgid "Disc Found"
msgstr "找到光盘"
-#: ../loader/cdinstall.c:201
+#: ../loader/cdinstall.c:240
#, c-format
msgid ""
"To begin testing the media before installation press %s.\n"
@@ -5444,100 +5736,103 @@ msgstr ""
"\n"
"选择 %s 跳过介质测试并开始安装。"
-#: ../loader/cdinstall.c:339
+#: ../loader/cdinstall.c:331
+#, fuzzy
+msgid "Scanning"
+msgstr "警告"
+
+#: ../loader/cdinstall.c:331 ../loader/cdinstall.c:333
#, c-format
-msgid ""
-"No %s disc was found which matches your boot media. Please insert the %s "
-"disc and press %s to retry."
-msgstr "没有找到%s 光盘匹配您的引导介质 。请插入 %s 光盘,然后按 %s 来重试。"
+msgid "Looking for installation images on CD device %s"
+msgstr ""
-#: ../loader/cdinstall.c:344
+#: ../loader/cdinstall.c:428
#, c-format
msgid ""
"The %s disc was not found in any of your CDROM drives. Please insert the %s "
"disc and press %s to retry."
msgstr "您所有光驱中均无法找到 %s 光盘。请插入 %s 光盘,然后按 %s 来重试。"
-#: ../loader/cdinstall.c:350
+#: ../loader/cdinstall.c:437
msgid "Disc Not Found"
msgstr "没找到光盘"
-#: ../loader/cdinstall.c:422
+#: ../loader/cdinstall.c:504
msgid "Cannot find kickstart file on CDROM."
msgstr "在光盘上找不到 kickstart 文件。"
-#: ../loader/copy.c:51 ../loader/method.c:121 ../loader/method.c:347
-#, c-format
-msgid "Failed to read directory %s: %s"
+#: ../loader/copy.c:51 ../loader/method.c:281
+#, fuzzy, c-format
+msgid "Failed to read directory %s: %m"
msgstr "读取目录 %s 失败:%s"
-#: ../loader/driverdisk.c:138
+#: ../loader/driverdisk.c:141
msgid "Loading"
msgstr "载入"
-#: ../loader/driverdisk.c:138
+#: ../loader/driverdisk.c:141
msgid "Reading driver disk..."
msgstr "正在读取驱动程序盘..."
-#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
+#: ../loader/driverdisk.c:240 ../loader/driverdisk.c:272
msgid "Driver Disk Source"
msgstr "驱动程序盘源"
-#: ../loader/driverdisk.c:231
+#: ../loader/driverdisk.c:241
msgid ""
"You have multiple devices which could serve as sources for a driver disk. "
"Which would you like to use?"
msgstr "您的系统上具有多种可作为驱动程序盘源的设备。您想使用哪一个?"
-#: ../loader/driverdisk.c:263
+#: ../loader/driverdisk.c:273
msgid ""
"There are multiple partitions on this device which could contain the driver "
"disk image. Which would you like to use?"
msgstr "您的系统上具有多种可作为驱动程序盘映像来源的分区。您想使用哪一个?"
-#: ../loader/driverdisk.c:300
+#: ../loader/driverdisk.c:308
msgid "Failed to mount partition."
msgstr "挂载分区失败。"
-#: ../loader/driverdisk.c:308
+#: ../loader/driverdisk.c:313
msgid "Select driver disk image"
msgstr "选择驱动盘映像"
-#: ../loader/driverdisk.c:309
+#: ../loader/driverdisk.c:314
msgid "Select the file which is your driver disk image."
msgstr "选择您的驱动盘映像文件。"
-#: ../loader/driverdisk.c:338
+#: ../loader/driverdisk.c:343
msgid "Failed to load driver disk from file."
msgstr "从文件挂载驱动程序盘失败。"
-#: ../loader/driverdisk.c:349
+#: ../loader/driverdisk.c:355
#, c-format
msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
msgstr "在 /dev/%s 中插入驱动程序盘,然后按“确定”来继续。"
-#: ../loader/driverdisk.c:351
+#: ../loader/driverdisk.c:361
msgid "Insert Driver Disk"
msgstr "插入驱动程序盘"
-#: ../loader/driverdisk.c:366
+#: ../loader/driverdisk.c:374
msgid "Failed to mount driver disk."
msgstr "挂载驱动程序盘失败。"
-#: ../loader/driverdisk.c:376
+#: ../loader/driverdisk.c:382
#, c-format
msgid "Driver disk is invalid for this release of %s."
msgstr "驱动程序盘无效%s 的这个发行版本。"
-#: ../loader/driverdisk.c:439
+#: ../loader/driverdisk.c:445
msgid "Manually choose"
msgstr "手工选择"
-#: ../loader/driverdisk.c:440
+#: ../loader/driverdisk.c:446
msgid "Load another disk"
msgstr "载入另一张磁盘"
-#: ../loader/driverdisk.c:441
+#: ../loader/driverdisk.c:447
msgid ""
"No devices of the appropriate type were found on this driver disk. Would "
"you like to manually select the driver, continue anyway, or load another "
@@ -5546,45 +5841,45 @@ msgstr ""
"在驱动程序盘上没有找到恰当类型的设备。您想手工选择驱动程序、继续、还是载入另"
"一张磁盘?"
-#: ../loader/driverdisk.c:479
+#: ../loader/driverdisk.c:485
msgid "Driver disk"
msgstr "驱动程序盘"
-#: ../loader/driverdisk.c:480
+#: ../loader/driverdisk.c:486
msgid "Do you have a driver disk?"
msgstr "您有驱动程序盘吗?"
-#: ../loader/driverdisk.c:489
+#: ../loader/driverdisk.c:495
msgid "More Driver Disks?"
msgstr "更多驱动程序盘?"
-#: ../loader/driverdisk.c:490
+#: ../loader/driverdisk.c:496
msgid "Do you wish to load any more driver disks?"
msgstr "您想载入更多驱动程序盘吗?"
-#: ../loader/driverdisk.c:535 ../loader/driverdisk.c:572
-#: ../loader/hdinstall.c:470 ../loader/kickstart.c:132
+#: ../loader/driverdisk.c:541 ../loader/driverdisk.c:578
+#: ../loader/hdinstall.c:384 ../loader/kickstart.c:132
#: ../loader/kickstart.c:142 ../loader/kickstart.c:185
-#: ../loader/kickstart.c:529 ../loader/modules.c:336
-#: ../loader/modules.c:348 ../loader/net.c:1647 ../loader/net.c:1670
-#: ../loader/nfsinstall.c:342 ../loader/urlinstall.c:437
-#: ../loader/urlinstall.c:446 ../loader/urlinstall.c:455
+#: ../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
msgid "Kickstart Error"
msgstr "Kickstart 错误"
-#: ../loader/driverdisk.c:536
+#: ../loader/driverdisk.c:542
#, c-format
msgid "Unknown driver disk kickstart source: %s"
msgstr "未知驱动程序盘的 kickstart 源:%s"
-#: ../loader/driverdisk.c:573
+#: ../loader/driverdisk.c:579
#, c-format
msgid ""
"The following invalid argument was specified for the kickstart driver disk "
"command: %s:%s"
msgstr "以下为 kickstart 驱动程序盘命令 %s 指定的参数无效:%s"
-#: ../loader/driverselect.c:65
+#: ../loader/driverselect.c:67
#, c-format
msgid ""
"Please enter any parameters which you wish to pass to the %s module "
@@ -5594,25 +5889,25 @@ msgstr ""
"请输入您想传递给 %s 模块的任何参数,用空格间隔。如果不知道要提供哪些参数,按"
"\"确定\"按钮即可跳过。"
-#: ../loader/driverselect.c:85
+#: ../loader/driverselect.c:91
msgid "Enter Module Parameters"
msgstr "输入模块参数"
-#: ../loader/driverselect.c:172
+#: ../loader/driverselect.c:178
msgid "No drivers found"
msgstr "未找到任何驱动程序"
-#: ../loader/driverselect.c:172
+#: ../loader/driverselect.c:178
msgid "Load driver disk"
msgstr "载入驱动程序盘"
-#: ../loader/driverselect.c:173
+#: ../loader/driverselect.c:179
msgid ""
"No drivers were found to manually insert. Would you like to use a driver "
"disk?"
msgstr "没有找到任何驱动程序来手工插入。您想要使用驱动程序盘吗?"
-#: ../loader/driverselect.c:191
+#: ../loader/driverselect.c:197
msgid ""
"Please select the driver below which you wish to load. If it does not "
"appear and you have a driver disk, press F2."
@@ -5620,77 +5915,61 @@ msgstr ""
"请在下面选择您想载入的驱动程序。如果它没有被包括,并且您另外备有驱动程序盘,"
"请按 F2 键。"
-#: ../loader/driverselect.c:200
+#: ../loader/driverselect.c:206
msgid "Specify optional module arguments"
msgstr "指定可选模块参数"
-#: ../loader/driverselect.c:225
+#: ../loader/driverselect.c:234
msgid "Select Device Driver to Load"
msgstr "选择要载入的设备驱动程序"
-#: ../loader/hdinstall.c:80 ../loader/nfsinstall.c:168
-#: ../loader/urlinstall.c:274
-msgid "Media Detected"
-msgstr "检测到介质"
-
-#: ../loader/hdinstall.c:81 ../loader/nfsinstall.c:169
-#: ../loader/urlinstall.c:275
-msgid "Local installation media detected..."
-msgstr "检测到本地安装介质..."
-
-#: ../loader/hdinstall.c:137 ../loader/nfsinstall.c:293
-#: ../loader/urlinstall.c:192
-#, c-format
-msgid ""
-"The %s installation tree in that directory does not seem to match your boot "
-"media."
-msgstr "该目录中的 %s 安装树似乎和您的引导介质不符。"
-
-#: ../loader/hdinstall.c:253
+#: ../loader/hdinstall.c:144
+#, fuzzy
msgid ""
-"An error occured reading the install from the ISO images. Please check your "
-"ISO images and try again."
+"An error occured finding the installation image on your hard drive. Please "
+"check your images and try again."
msgstr "从 ISO 映像中读取安装时出错。请检查您的 ISO 映像后重试。"
-#: ../loader/hdinstall.c:335
+#: ../loader/hdinstall.c:232
msgid ""
"You don't seem to have any hard drives on your system! Would you like to "
"configure additional devices?"
msgstr "您的系统似乎未配备任何硬盘驱动器!是否要配置附加设备?"
-#: ../loader/hdinstall.c:349
-#, c-format
+#: ../loader/hdinstall.c:246
+#, fuzzy, c-format
msgid ""
-"What partition and directory on that partition hold the CD (iso9660) images "
-"for %s? If you don't see the disk drive you're using listed here, press F2 "
+"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 的光盘(iso9660)映像?如果您所用的"
"磁盘驱动器在这里没有被列出,按 F2 键来配置附加的设备。"
-#: ../loader/hdinstall.c:372
-msgid "Directory holding images:"
+#: ../loader/hdinstall.c:273
+#, fuzzy
+msgid "Directory holding image:"
msgstr "包含映像的目录:"
-#: ../loader/hdinstall.c:400
+#: ../loader/hdinstall.c:301
msgid "Select Partition"
msgstr "选择分区"
-#: ../loader/hdinstall.c:439
-#, c-format
-msgid "Device %s does not appear to contain %s CDROM images."
+#: ../loader/hdinstall.c:353
+#, fuzzy, c-format
+msgid "Device %s does not appear to contain an installation image."
msgstr "设备 %s 似乎不包含 %s 光盘映像。"
-#: ../loader/hdinstall.c:471
+#: ../loader/hdinstall.c:385
#, c-format
msgid "Bad argument to HD kickstart method command %s: %s"
msgstr "硬盘 kickstart 方法命令 %s 的参数不对:%s"
-#: ../loader/hdinstall.c:541 ../loader/hdinstall.c:597
+#: ../loader/hdinstall.c:455 ../loader/hdinstall.c:511
msgid "Cannot find kickstart file on hard drive."
msgstr "在硬盘驱动器上找不到 kickstart 文件。"
-#: ../loader/hdinstall.c:584
+#: ../loader/hdinstall.c:498
#, c-format
msgid "Cannot find hard drive for BIOS disk %s"
msgstr "无法找到与 BIOS 对应的硬盘 %s"
@@ -5704,13 +5983,13 @@ msgid "What type of keyboard do you have?"
msgstr "您使用哪一种类型的键盘?"
#: ../loader/kickstart.c:133
-#, c-format
-msgid "Error opening kickstart file %s: %s"
+#, fuzzy, c-format
+msgid "Error opening kickstart file %s: %m"
msgstr "打开 kickstart 文件 %s 时出错:%s"
#: ../loader/kickstart.c:143
-#, c-format
-msgid "Error reading contents of kickstart file %s: %s"
+#, fuzzy, c-format
+msgid "Error reading contents of kickstart file %s: %m"
msgstr "读取 kickstart 文件 %s 的内容时出现错误:%s"
#: ../loader/kickstart.c:186
@@ -5722,7 +6001,7 @@ msgstr "%s 处出错,第 %d 行的 kickstart 文件 %s。"
msgid "Cannot find ks.cfg on removable media."
msgstr "无法在可移动介质中找到 ks.cfg。"
-#: ../loader/kickstart.c:377
+#: ../loader/kickstart.c:380
msgid ""
"Unable to download the kickstart file. Please modify the kickstart "
"parameter below or press Cancel to proceed as an interactive installation."
@@ -5730,11 +6009,11 @@ msgstr ""
"无法下载kickstart文件。请使用交互式安装方法:修改下边的kickstart参数或者 点击"
"Cancel。"
-#: ../loader/kickstart.c:386
+#: ../loader/kickstart.c:389
msgid "Error downloading kickstart file"
msgstr "下载点击开始文件时出错"
-#: ../loader/kickstart.c:530
+#: ../loader/kickstart.c:533
#, c-format
msgid "Bad argument to shutdown kickstart method command %s: %s"
msgstr "关闭 kickstart 方法命令 %s 的参数不对:%s"
@@ -5744,114 +6023,118 @@ msgstr "关闭 kickstart 方法命令 %s 的参数不对:%s"
msgid "Welcome to %s for %s - Rescue Mode"
msgstr "欢迎为 %s 使用 %s - 援救模式"
-#: ../loader/lang.c:65 ../loader/loader.c:166
+#: ../loader/lang.c:65 ../loader/loader.c:223
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr "<Tab>/<Alt-Tab> 元素间切换 | <Space> 选择 | <F12> 下一屏幕 "
-#: ../loader/lang.c:373
+#: ../loader/lang.c:375
msgid "Choose a Language"
msgstr "选择一种语言"
-#: ../loader/loader.c:123
+#: ../loader/loader.c:125
msgid "Local CD/DVD"
msgstr "本地光盘"
-#: ../loader/loader.c:125
+#: ../loader/loader.c:126
msgid "Hard drive"
msgstr "硬盘驱动器"
-#: ../loader/loader.c:126
+#: ../loader/loader.c:127
msgid "NFS directory"
msgstr "NFS目录"
-#: ../loader/loader.c:156
-#, c-format
-msgid "Welcome to %s%n for %s"
-msgstr "欢迎到%s%n 做 %s"
-
-#: ../loader/loader.c:374 ../loader/loader.c:410
+#: ../loader/loader.c:429 ../loader/loader.c:468
msgid "Update Disk Source"
msgstr "更新盘源"
-#: ../loader/loader.c:375
+#: ../loader/loader.c:430
msgid ""
"You have multiple devices which could serve as sources for an update disk. "
"Which would you like to use?"
msgstr "您的系统上具有多种可作为更新盘源的设备。您想使用哪一个?"
-#: ../loader/loader.c:411
+#: ../loader/loader.c:469
msgid ""
"There are multiple partitions on this device which could contain the update "
"disk image. Which would you like to use?"
msgstr "这个设备中有多个可能包含更新磁盘映像的分区。您想使用哪一个?"
-#: ../loader/loader.c:429
-#, c-format
-msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
+#: ../loader/loader.c:487
+#, fuzzy, c-format
+msgid "Insert your updates disk into %s and press \"OK\" to continue."
msgstr "在 /dev/%s 中插入更新盘,然后按“确定”来继续。"
-#: ../loader/loader.c:431
+#: ../loader/loader.c:493
msgid "Updates Disk"
msgstr "更新盘"
-#: ../loader/loader.c:446
+#: ../loader/loader.c:510
msgid "Failed to mount updates disk"
msgstr "挂载更新盘失败。"
-#: ../loader/loader.c:449
+#: ../loader/loader.c:515
msgid "Updates"
msgstr "更新"
-#: ../loader/loader.c:449
+#: ../loader/loader.c:515
msgid "Reading anaconda updates..."
msgstr "正在读取 anaconda 更新..."
-#: ../loader/loader.c:485
+#: ../loader/loader.c:551
msgid ""
"Unable to download the updates image. Please modify the updates location "
"below or press Cancel to proceed without updates.."
msgstr ""
"无法下载更新映像。请修改以下更新位置,或者按取消键在不更新的情况下进行..."
-#: ../loader/loader.c:494
+#: ../loader/loader.c:560
msgid "Error downloading updates image"
msgstr "下载更新映像时出错"
-#: ../loader/loader.c:994
+#: ../loader/loader.c:1171
#, c-format
msgid "You do not have enough RAM to install %s on this machine."
msgstr "在本机上安装 %s 所需内存不够。"
-#: ../loader/loader.c:1151
+#: ../loader/loader.c:1231
+msgid "Media Detected"
+msgstr "检测到介质"
+
+#: ../loader/loader.c:1232
+msgid "Local installation media detected..."
+msgstr "检测到本地安装介质..."
+
+#: ../loader/loader.c:1353
msgid "Rescue Method"
msgstr "救援方法"
-#: ../loader/loader.c:1152
+#: ../loader/loader.c:1354
msgid "Installation Method"
msgstr "安装方法"
-#: ../loader/loader.c:1154
+#: ../loader/loader.c:1356
msgid "What type of media contains the rescue image?"
msgstr "哪一类介质包含救援映像?"
-#: ../loader/loader.c:1156
-msgid "What type of media contains the packages to be installed?"
-msgstr "哪一类介质包含要安装的软件包?"
+#: ../loader/loader.c:1358
+#, fuzzy
+msgid "What type of media contains the installation image?"
+msgstr "哪一类介质包含救援映像?"
-#: ../loader/loader.c:1180
+#: ../loader/loader.c:1389
msgid "No driver found"
msgstr "未找到任何驱动程序"
-#: ../loader/loader.c:1180
+#: ../loader/loader.c:1389
msgid "Select driver"
msgstr "选择驱动程序"
-#: ../loader/loader.c:1181
+#: ../loader/loader.c:1390
msgid "Use a driver disk"
msgstr "使用驱动程序盘"
-#: ../loader/loader.c:1182
+#: ../loader/loader.c:1391
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?"
@@ -5859,39 +6142,39 @@ msgstr ""
"找不到这种安装类型所需的任何设备。您想手工选择驱动程序或使用一张驱动程序盘"
"吗?"
-#: ../loader/loader.c:1415
+#: ../loader/loader.c:1652
msgid "The following devices have been found on your system."
msgstr "在系统中发现以下设备。"
-#: ../loader/loader.c:1417
+#: ../loader/loader.c:1654
msgid ""
"No device drivers have been loaded for your system. Would you like to load "
"any now?"
msgstr "没有为您的系统载入任何设备驱动程序。现在是否需要载入?"
-#: ../loader/loader.c:1421
+#: ../loader/loader.c:1658
msgid "Devices"
msgstr "设备"
-#: ../loader/loader.c:1422
+#: ../loader/loader.c:1659
msgid "Done"
msgstr "完成"
-#: ../loader/loader.c:1423
+#: ../loader/loader.c:1660
msgid "Add Device"
msgstr "添加设备"
-#: ../loader/loader.c:1600
+#: ../loader/loader.c:1847
#, c-format
msgid "loader has already been run. Starting shell.\n"
msgstr "装载程序已经被运行。正在启动 shell。\n"
-#: ../loader/loader.c:1946
+#: ../loader/loader.c:2186
#, c-format
msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
msgstr "正在运行 anaconda %s、%s 救援模式 - 请稍候...\n"
-#: ../loader/loader.c:1948
+#: ../loader/loader.c:2188
#, c-format
msgid "Running anaconda %s, the %s system installer - please wait...\n"
msgstr "正在运行 anaconda %s、%s 系统安装程序 - 请稍候...\n"
@@ -5939,7 +6222,7 @@ msgstr ""
"刚刚测试的映像成功通过检验,可从这个介质中进行安装。请注意:介质检查无法查出"
"所有介质/驱动器错误。"
-#: ../loader/method.c:390
+#: ../loader/method.c:324
#, c-format
msgid ""
"Would you like to perform a checksum test of the ISO image:\n"
@@ -5950,114 +6233,67 @@ msgstr ""
"\n"
" %s?"
-#: ../loader/method.c:393
+#: ../loader/method.c:327
msgid "Checksum Test"
msgstr "校验和测试"
-#: ../loader/modules.c:337
+#: ../loader/modules.c:336
#, c-format
msgid "Bad argument to device kickstart method command %s: %s"
msgstr "设备 kickstart 方法命令 %s 的参数不对:%s"
-#: ../loader/modules.c:349
+#: ../loader/modules.c:348
msgid "A module name must be specified for the kickstart device command."
msgstr "必须为 kickstart 设备命令指定模块名称。"
-#: ../loader/net.c:93
+#: ../loader/net.c:106
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:266
-#, c-format
-msgid ""
-"%s is a wireless network adapter. Please provide the ESSID and encryption "
-"key needed to access your wireless network. If no key is needed, leave this "
-"field blank and the install will continue."
-msgstr ""
-"%s 是无线网络适配器。请提供进入您的无线网络所需的 ESSID 和加密钥匙。如果不需"
-"要钥匙,请把该字段留为空白,安装将会继续。"
-
-#: ../loader/net.c:272
-msgid "ESSID"
-msgstr "ESSID"
-
-#: ../loader/net.c:273
-msgid "Encryption Key"
-msgstr "加密密钥"
-
-#: ../loader/net.c:276
-msgid "Wireless Settings"
-msgstr "无线设置"
-
-#: ../loader/net.c:311
-msgid "Nameserver IP"
-msgstr "名称服务器(DNS) IP"
-
-#: ../loader/net.c:315
-msgid "Missing Nameserver"
-msgstr "缺失名称服务器"
-
-#: ../loader/net.c:316
-msgid ""
-"Your IP address request returned configuration information, but it did not "
-"include a nameserver address. If you do not have this information, you can "
-"leave the field blank and the install will continue."
-msgstr ""
-"您的IP请求返回了IP配置信息,但该信息没有包括 DNS 名称服务器地址.您若不知道此信"
-"息,可将该字段留空,安装将继续."
-
-#: ../loader/net.c:338
-msgid "Invalid IP Information"
-msgstr "IP 信息无效"
-
-#: ../loader/net.c:339
-msgid "You entered an invalid IP address."
-msgstr "您输入的 IP 地址无效。"
-
-#: ../loader/net.c:589 ../loader/net.c:695
+#: ../loader/net.c:413 ../loader/net.c:467
msgid "Network Error"
msgstr "网络错误"
-#: ../loader/net.c:590 ../loader/net.c:696
+#: ../loader/net.c:414 ../loader/net.c:468
msgid "There was an error configuring your network interface."
msgstr "配置网络界面时出错。"
-#: ../loader/net.c:776
+#: ../loader/net.c:540
msgid "Configure TCP/IP"
msgstr "配置 TCP/IP"
-#: ../loader/net.c:821
+#: ../loader/net.c:585
msgid "You must select at least one protocol (IPv4 or IPv6)."
msgstr "您必须至少选择一项网络协议(IPv4或IPv6)。"
-#: ../loader/net.c:828
+#: ../loader/net.c:592
msgid "IPv4 Needed for NFS"
msgstr "NFS 需要 IPv4"
-#: ../loader/net.c:829
+#: ../loader/net.c:593
msgid "NFS installation method requires IPv4 support."
msgstr "NFS 安装需要 IPv4 的支持。"
-#: ../loader/net.c:950
+#: ../loader/net.c:697
msgid "IPv4 address:"
msgstr "IPv4 地址:"
-#: ../loader/net.c:962 ../loader/net.c:1014 tmp/netconfig.glade.h:1
+#: ../loader/net.c:709 ../loader/net.c:775 tmp/netconfig.glade.h:1
#: tmp/netpostconfig.glade.h:1
msgid "/"
msgstr "/"
-#: ../loader/net.c:1002
+#: ../loader/net.c:763
msgid "IPv6 address:"
msgstr "IPv6地址:"
-#: ../loader/net.c:1063
+#: ../loader/net.c:836
msgid "Name Server:"
msgstr "域名服务器(DNS):"
-#: ../loader/net.c:1099
+#: ../loader/net.c:875
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 "
@@ -6067,88 +6303,122 @@ msgstr ""
"掩码或CIDR形式的前缀是可接受的。网关和域名服务器域必须是有效的IPv4或IPv6的地"
"址。"
-#: ../loader/net.c:1115
+#: ../loader/net.c:895
msgid "Manual TCP/IP Configuration"
msgstr "手动配置TCP/IP"
-#: ../loader/net.c:1224 ../loader/net.c:1230
+#: ../loader/net.c:1009 ../loader/net.c:1015
msgid "Missing Information"
msgstr "缺少信息"
-#: ../loader/net.c:1225
+#: ../loader/net.c:1010
msgid ""
"You must enter both a valid IPv4 address and a network mask or CIDR prefix."
msgstr "必须输入有效的 IPv4 地址和子网掩码或CIDR代码。"
-#: ../loader/net.c:1231
+#: ../loader/net.c:1016
msgid "You must enter both a valid IPv6 address and a CIDR prefix."
msgstr "您必须输入有效的 IPv6 地址和一个 CIDR 前缀。"
-#: ../loader/net.c:1552
-msgid "Determining host name and domain..."
-msgstr "正在确定主机的名称和域..."
-
-#: ../loader/net.c:1648
+#: ../loader/net.c:1331
#, c-format
msgid "Bad argument to kickstart network command %s: %s"
msgstr "kickstart 网络命令 %s 的参数不对:%s"
-#: ../loader/net.c:1671
+#: ../loader/net.c:1354
#, c-format
msgid "Bad bootproto %s specified in network command"
msgstr "网络命令中指定的 bootproto %s 不对"
-#: ../loader/net.c:1859
+#: ../loader/net.c:1423
+#, fuzzy
+msgid "Seconds:"
+msgstr "从 DNS:"
+
+#: ../loader/net.c:1537
msgid "Networking Device"
msgstr "网络设备"
-#: ../loader/net.c:1860
+#: ../loader/net.c:1538
msgid ""
"You have multiple network devices on this system. Which would you like to "
"install through?"
msgstr "您的系统上具有多种网络设备。您想通过哪一种设备来安装?"
-#: ../loader/nfsinstall.c:57
+#: ../loader/net.c:1542
+msgid "Identify"
+msgstr ""
+
+#: ../loader/net.c:1551
+msgid "You can identify the physical port for"
+msgstr ""
+
+#: ../loader/net.c:1553
+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 ""
+
+#: ../loader/net.c:1563
+msgid "Identify NIC"
+msgstr ""
+
+#: ../loader/net.c:1576
+#, fuzzy
+msgid "Invalid Duration"
+msgstr "IP 信息无效"
+
+#: ../loader/net.c:1577
+msgid "You must enter the number of seconds as an integer between 1 and 30."
+msgstr ""
+
+#: ../loader/net.c:1589
+#, c-format
+msgid "Flashing %s port lights for %d seconds..."
+msgstr ""
+
+#: ../loader/net.c:1740 ../loader/net.c:1744
+#, fuzzy, c-format
+msgid "Waiting for NetworkManager to configure %s...\n"
+msgstr "正在等待 telnet 连接..."
+
+#: ../loader/nfsinstall.c:63
msgid "NFS server name:"
msgstr "NFS 服务器名称:"
-#: ../loader/nfsinstall.c:60
+#: ../loader/nfsinstall.c:67
#, c-format
msgid "%s directory:"
msgstr "%s 目录:"
-#: ../loader/nfsinstall.c:65
-#, c-format
-msgid "Please enter the server name and path to your %s images."
+#: ../loader/nfsinstall.c:78
+#, fuzzy, c-format
+msgid "Please enter the server name and path to your %s installation image."
msgstr "请输入服务器名称以及到您的 %s 映像的路径。"
-#: ../loader/nfsinstall.c:67
+#: ../loader/nfsinstall.c:85
msgid "NFS Setup"
msgstr "NFS 设置"
-#: ../loader/nfsinstall.c:154
+#: ../loader/nfsinstall.c:190
msgid "Hostname specified with no DNS configured"
msgstr "无需设置DNS指定主机名"
-#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
-msgid "Retrieving"
-msgstr "检索"
-
-#: ../loader/nfsinstall.c:284
+#: ../loader/nfsinstall.c:251
msgid "That directory could not be mounted from the server."
msgstr "无法从服务器中挂载该目录。"
-#: ../loader/nfsinstall.c:297
-#, c-format
-msgid "That directory does not seem to contain a %s installation tree."
+#: ../loader/nfsinstall.c:262
+#, fuzzy, c-format
+msgid "That directory does not seem to contain a %s installation image."
msgstr "该目录似乎不包含 %s 安装树。"
-#: ../loader/nfsinstall.c:343
+#: ../loader/nfsinstall.c:338
#, c-format
msgid "Bad argument to NFS kickstart method command %s: %s"
msgstr "NFS kickstart 命令 %s 的参数不对:%s"
-#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:128
msgid "Telnet"
msgstr "Telnet"
@@ -6156,86 +6426,69 @@ msgstr "Telnet"
msgid "Waiting for telnet connection..."
msgstr "正在等待 telnet 连接..."
-#: ../loader/telnetd.c:131
+#: ../loader/telnetd.c:128
msgid "Running anaconda via telnet..."
msgstr "通过 telnet 运行 anaconda ..."
-#: ../loader/urlinstall.c:79
-#, c-format
-msgid "Unable to retrieve %s://%s/%s."
+#: ../loader/urlinstall.c:84
+#, fuzzy, c-format
+msgid "Unable to retrieve %s://%s%s."
msgstr "无法获取 %s://%s/%s。"
-#: ../loader/urlinstall.c:186
+#: ../loader/urlinstall.c:176
msgid "Unable to retrieve the install image."
msgstr "无法获取安装映像。"
-#: ../loader/urlinstall.c:438
+#: ../loader/urlinstall.c:422
#, c-format
msgid "Bad argument to Url kickstart method command %s: %s"
msgstr "URL kickstart 方法命令 %s 的参数不对:%s"
-#: ../loader/urlinstall.c:447
+#: ../loader/urlinstall.c:431
msgid "Must supply a --url argument to Url kickstart method."
msgstr "必须给 URL kickstart 方法提供一个 --url 参数。"
-#: ../loader/urlinstall.c:456
+#: ../loader/urlinstall.c:440
#, c-format
msgid "Unknown Url method %s"
msgstr "未知 URL 方法 %s"
-#: ../loader/urls.c:282
-#, c-format
-msgid "Please enter the URL containing the %s images on your server."
-msgstr "请在您的服务器中输入包含 %s 映像的 URL。"
+#: ../loader/urls.c:235 ../loader/urls.c:237 ../loader/urls.c:240
+msgid "Retrieving"
+msgstr "检索"
-#: ../loader/urls.c:293
-msgid "Configure proxy"
-msgstr "配置代理服务器"
+#: ../loader/urls.c:295
+#, fuzzy, c-format
+msgid ""
+"Please enter the URL containing the %s installation image on your server."
+msgstr "请在您的服务器中输入包含 %s 映像的 URL。"
-#: ../loader/urls.c:308
+#: ../loader/urls.c:321
msgid "URL Setup"
msgstr "URL 设置"
-#: ../loader/urls.c:316
+#: ../loader/urls.c:329
msgid "You must enter a URL."
msgstr "您必须输入一个 URL。"
-#: ../loader/urls.c:322
+#: ../loader/urls.c:335
msgid "URL must be either an ftp or http URL"
msgstr "URL 必须是 ftp 或者 http URL"
-#: ../loader/urls.c:333
+#: ../loader/urls.c:346
msgid "Unknown Host"
msgstr "未知主机"
-#: ../loader/urls.c:334
+#: ../loader/urls.c:347
#, c-format
msgid "%s is not a valid hostname."
msgstr "%s 不是有效的主机名。"
-#: ../loader/urls.c:380
-msgid ""
-"If you are using a HTTP proxy server enter the name of the HTTP proxy server "
-"to use."
-msgstr "如果要使用的是 HTTP 代理服务器,请输入要使用的 HTTP 代理服务器名称。"
-
-#: ../loader/urls.c:395
-msgid "Proxy Name:"
-msgstr "代理服务器名称:"
-
-#: ../loader/urls.c:400
-msgid "Proxy Port:"
-msgstr "代理服务器端口:"
-
-#: ../loader/urls.c:416
-msgid "Further Setup"
-msgstr "更多设置"
-
-#: ../loader/windows.c:63
+#: ../loader/windows.c:65
msgid "Loading SCSI driver"
msgstr "载入 SCSI 驱动程序"
-#: ../loader/windows.c:64
+#: ../loader/windows.c:66
#, c-format
msgid "Loading %s driver..."
msgstr "正在载入 %s 驱动程序..."
@@ -6271,38 +6524,80 @@ msgid "<b>Repository _name:</b>"
msgstr "<b>主机(_n)名称:</b>"
#: tmp/addrepo.glade.h:2
-msgid "Add Repository"
-msgstr "添加主机"
+#, fuzzy
+msgid "<b>Repository _type:</b>"
+msgstr "<b>主机(_n)名称:</b>"
+
+#: tmp/addrepo.glade.h:4
+#, fuzzy
+msgid "Configure _proxy"
+msgstr "配置代理服务器"
-#: tmp/addrepo.glade.h:3
+#: tmp/addrepo.glade.h:5
+msgid ""
+"HTTP/FTP\n"
+"CD/DVD\n"
+"NFS\n"
+"Hard Drive"
+msgstr ""
+
+#: tmp/addrepo.glade.h:9
+#, fuzzy
msgid ""
-"Please provide the location where your additional software can be installed "
-"from."
+"Please provide the configuration information for this software repository."
msgstr "请指定安装附加软件的位置。"
-#: tmp/addrepo.glade.h:4
-msgid "Proxy U_RL:"
+#: tmp/addrepo.glade.h:10
+#, fuzzy
+msgid "Proxy U_RL"
msgstr "代理服务器 URL(_R):"
-#: tmp/addrepo.glade.h:5
-msgid "Proxy pass_word:"
+#: tmp/addrepo.glade.h:11
+#, fuzzy
+msgid "Proxy pass_word"
msgstr "代理服务器密码(_w):"
-#: tmp/addrepo.glade.h:6
-msgid "Proxy u_sername:"
+#: tmp/addrepo.glade.h:12
+#, fuzzy
+msgid "Proxy u_sername"
msgstr "代理服务器名称(_s):"
-#: tmp/addrepo.glade.h:7
-msgid "Repository _Mirror"
-msgstr "库镜像(_M)"
-
-#: tmp/addrepo.glade.h:8
+#: tmp/addrepo.glade.h:13
msgid "Repository _URL"
msgstr "库 URL(_U)"
-#: tmp/addrepo.glade.h:9
-msgid "_Proxy configuration"
-msgstr "代理服务器配置(_P)"
+#: tmp/addrepo.glade.h:14
+#, fuzzy
+msgid "Select A Directory"
+msgstr "选择一个文件"
+
+#: tmp/addrepo.glade.h:15
+msgid "URL is a _mirror list"
+msgstr ""
+
+#: tmp/addrepo.glade.h:16
+#, fuzzy
+msgid "_Directory"
+msgstr "NFS目录"
+
+#: tmp/addrepo.glade.h:17
+#, fuzzy
+msgid "_Options"
+msgstr "RAID 选项"
+
+#: tmp/addrepo.glade.h:18
+#, fuzzy
+msgid "_Partition"
+msgstr "分区"
+
+#: tmp/addrepo.glade.h:19
+msgid "_Path"
+msgstr ""
+
+#: tmp/addrepo.glade.h:20
+#, fuzzy
+msgid "_Server"
+msgstr "域名服务器(DNS):"
#: tmp/anaconda.glade.h:1
msgid "Reboo_t"
@@ -6398,21 +6693,41 @@ msgstr "Info"
msgid "_Details"
msgstr "详情(_D)"
+#: tmp/exnSave.glade.h:1
+msgid "Bug _description"
+msgstr ""
+
#: tmp/exnSave.glade.h:2
+msgid "Destination _file"
+msgstr ""
+
+#: tmp/exnSave.glade.h:3
+msgid ""
+"Local disk\n"
+"Remote server (scp)"
+msgstr ""
+
+#: tmp/exnSave.glade.h:5
+msgid "Please choose a destination for saving your traceback."
+msgstr ""
+
+#: tmp/exnSave.glade.h:7
msgid "Select A File"
msgstr "选择一个文件"
-#: tmp/exnSave.glade.h:3
-msgid "Select a destination for the exception information."
-msgstr "为例外信息选择目的地。"
+#: tmp/exnSave.glade.h:8
+msgid "_Host (host:port)"
+msgstr ""
-#: tmp/exnSave.glade.h:4
-msgid "_Disk"
-msgstr "磁盘(_D)"
+#: tmp/exnSave.glade.h:9
+#, fuzzy
+msgid "_Password"
+msgstr "密码(_P):"
-#: tmp/exnSave.glade.h:5
-msgid "_Remote"
-msgstr "远程(_R)"
+#: tmp/exnSave.glade.h:10
+#, fuzzy
+msgid "_User name"
+msgstr "用户名"
#: tmp/GroupSelector.glade.h:1
msgid ""
@@ -6535,16 +6850,6 @@ msgstr "启动IPv_4支持"
msgid "Enable IPv_6 support"
msgstr "启动IPv_6支持"
-#: tmp/netconfig.glade.h:9
-msgid "Enable network interface"
-msgstr "启动网络界面"
-
-#: tmp/netconfig.glade.h:10
-msgid ""
-"This requires that you have an active network connection during the "
-"installation process. Please configure a network interface."
-msgstr "您在安装的过程中需要激活网络连接,请配置网络界面。"
-
#: tmp/netconfig.glade.h:11
msgid "Use _dynamic IP configuration (DHCP)"
msgstr "使用(_d)动态 IP 配置(DHCP)"
@@ -6698,6 +7003,10 @@ msgid "Gujarati"
msgstr "古吉拉特语"
#. generated from lang-table
+msgid "Hebrew"
+msgstr ""
+
+#. generated from lang-table
msgid "Hindi"
msgstr "印地语"
@@ -6750,7 +7059,8 @@ msgid "Marathi"
msgstr "马拉地语"
#. generated from lang-table
-msgid "Norwegian"
+#, fuzzy
+msgid "Norwegian(Bokmål)"
msgstr "挪威语"
#. generated from lang-table
@@ -6845,6 +7155,140 @@ msgstr "威尔士语"
msgid "Zulu"
msgstr "祖鲁语"
+#~ msgid "No video hardware found, assuming headless"
+#~ msgstr "没有找到视频硬件,假定为无头机器"
+
+#~ msgid "Unable to instantiate a X hardware state object."
+#~ msgstr "无法实例化 X 硬件状态对象。"
+
+#~ msgid ""
+#~ "Error mounting device %s as %s: %s\n"
+#~ "\n"
+#~ "This most likely means this partition has not been formatted.\n"
+#~ "\n"
+#~ "Press OK to exit the installer."
+#~ msgstr ""
+#~ "将 %s 设备挂载成 %s 时出错:%s\n"
+#~ "\n"
+#~ "最可能的原因是这个分区还没有被格式化.\n"
+#~ "\n"
+#~ "请按确定退出安装。"
+
+#~ msgid "Invalid Label"
+#~ msgstr "标签无效"
+
+#~ msgid ""
+#~ "An invalid label was found on device %s. Please fix this problem and "
+#~ "restart the installation process."
+#~ msgstr "驱动器%s上发现一个无效标签.请解决这个问题后重新启动安装过程。"
+
+#~ msgid "Save to Remote"
+#~ msgstr "保存到远程主机"
+
+#~ msgid "Host"
+#~ msgstr "主机"
+
+#~ msgid "Remote path"
+#~ msgstr "远程主机目录"
+
+#~ msgid "Help not available"
+#~ msgstr "无帮助信息"
+
+#~ msgid "No help is available for this step of the install."
+#~ msgstr "这一安装步骤没有帮助信息。"
+
+#~ msgid ""
+#~ " <F1> for help | <Tab> between elements | <Space> selects | <F12> next "
+#~ "screen"
+#~ msgstr "<F1>求助 | <Tab> 元素间切换 | <Space> 选择 | <F12> 下一屏幕"
+
+#~ msgid "Finishing upgrade process. This may take a little while..."
+#~ msgstr "终止升级进程,可能要等一小会..."
+
+#~ msgid "Error running transaction"
+#~ msgstr "执行处理时出错"
+
+#~ msgid ""
+#~ "No %s disc was found which matches your boot media. Please insert the %s "
+#~ "disc and press %s to retry."
+#~ msgstr ""
+#~ "没有找到%s 光盘匹配您的引导介质 。请插入 %s 光盘,然后按 %s 来重试。"
+
+#~ msgid ""
+#~ "The %s installation tree in that directory does not seem to match your "
+#~ "boot media."
+#~ msgstr "该目录中的 %s 安装树似乎和您的引导介质不符。"
+
+#~ msgid "Welcome to %s%n for %s"
+#~ msgstr "欢迎到%s%n 做 %s"
+
+#~ msgid "What type of media contains the packages to be installed?"
+#~ msgstr "哪一类介质包含要安装的软件包?"
+
+#~ msgid ""
+#~ "%s is a wireless network adapter. Please provide the ESSID and "
+#~ "encryption key needed to access your wireless network. If no key is "
+#~ "needed, leave this field blank and the install will continue."
+#~ msgstr ""
+#~ "%s 是无线网络适配器。请提供进入您的无线网络所需的 ESSID 和加密钥匙。如果不"
+#~ "需要钥匙,请把该字段留为空白,安装将会继续。"
+
+#~ msgid "ESSID"
+#~ msgstr "ESSID"
+
+#~ msgid "Wireless Settings"
+#~ msgstr "无线设置"
+
+#~ msgid "Nameserver IP"
+#~ msgstr "名称服务器(DNS) IP"
+
+#~ msgid "Missing Nameserver"
+#~ msgstr "缺失名称服务器"
+
+#~ msgid ""
+#~ "Your IP address request returned configuration information, but it did "
+#~ "not include a nameserver address. If you do not have this information, "
+#~ "you can leave the field blank and the install will continue."
+#~ msgstr ""
+#~ "您的IP请求返回了IP配置信息,但该信息没有包括 DNS 名称服务器地址.您若不知道"
+#~ "此信息,可将该字段留空,安装将继续."
+
+#~ msgid "You entered an invalid IP address."
+#~ msgstr "您输入的 IP 地址无效。"
+
+#~ msgid "Determining host name and domain..."
+#~ msgstr "正在确定主机的名称和域..."
+
+#~ msgid ""
+#~ "If you are using a HTTP proxy server enter the name of the HTTP proxy "
+#~ "server to use."
+#~ msgstr ""
+#~ "如果要使用的是 HTTP 代理服务器,请输入要使用的 HTTP 代理服务器名称。"
+
+#~ msgid "Proxy Name:"
+#~ msgstr "代理服务器名称:"
+
+#~ msgid "Proxy Port:"
+#~ msgstr "代理服务器端口:"
+
+#~ msgid "Further Setup"
+#~ msgstr "更多设置"
+
+#~ msgid "Repository _Mirror"
+#~ msgstr "库镜像(_M)"
+
+#~ msgid "_Proxy configuration"
+#~ msgstr "代理服务器配置(_P)"
+
+#~ msgid "Select a destination for the exception information."
+#~ msgstr "为例外信息选择目的地。"
+
+#~ msgid "_Disk"
+#~ msgstr "磁盘(_D)"
+
+#~ msgid "_Remote"
+#~ msgstr "远程(_R)"
+
#~ msgid "Mouse Configuration"
#~ msgstr "鼠标配置"