From fc7f56f857de64540afe917f83a3fb830bac5de5 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Sun, 16 Mar 2008 13:37:26 -0400 Subject: Refresh pot. This should hopefully be it for string changes for F9 --- po/zh_CN.po | 1270 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 675 insertions(+), 595 deletions(-) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index 32a068b1b..48718de86 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: zh_CN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-02 12:12-0500\n" +"POT-Creation-Date: 2008-03-16 13:31-0400\n" "PO-Revision-Date: 2007-07-13 22:51+0800\n" "Last-Translator: zhangnan \n" "Language-Team: \n" @@ -62,40 +62,40 @@ msgstr "按<回车>键执行一个shell命令" #: ../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 ../loader2/cdinstall.c:145 -#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:196 -#: ../loader2/cdinstall.c:199 ../loader2/cdinstall.c:326 -#: ../loader2/cdinstall.c:331 ../loader2/cdinstall.c:335 -#: ../loader2/cdinstall.c:401 ../loader2/dirbrowser.c:145 +#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:200 +#: ../loader2/cdinstall.c:203 ../loader2/cdinstall.c:342 +#: ../loader2/cdinstall.c:347 ../loader2/cdinstall.c:351 +#: ../loader2/cdinstall.c:421 ../loader2/dirbrowser.c:145 #: ../loader2/driverdisk.c:98 ../loader2/driverdisk.c:235 #: ../loader2/driverdisk.c:266 ../loader2/driverdisk.c:299 #: ../loader2/driverdisk.c:337 ../loader2/driverdisk.c:351 #: ../loader2/driverdisk.c:365 ../loader2/driverdisk.c:375 #: ../loader2/driverdisk.c:535 ../loader2/driverdisk.c:572 #: ../loader2/driverselect.c:75 ../loader2/driverselect.c:199 -#: ../loader2/hdinstall.c:133 ../loader2/hdinstall.c:186 -#: ../loader2/hdinstall.c:344 ../loader2/hdinstall.c:394 -#: ../loader2/hdinstall.c:426 ../loader2/hdinstall.c:496 -#: ../loader2/hdinstall.c:539 ../loader2/hdinstall.c:552 ../loader2/kbd.c:138 +#: ../loader2/hdinstall.c:141 ../loader2/hdinstall.c:252 +#: ../loader2/hdinstall.c:388 ../loader2/hdinstall.c:438 +#: ../loader2/hdinstall.c:470 ../loader2/hdinstall.c:540 +#: ../loader2/hdinstall.c:583 ../loader2/hdinstall.c:596 ../loader2/kbd.c:138 #: ../loader2/kickstart.c:132 ../loader2/kickstart.c:142 #: ../loader2/kickstart.c:185 ../loader2/kickstart.c:284 #: ../loader2/kickstart.c:372 ../loader2/kickstart.c:529 ../loader2/lang.c:115 #: ../loader2/lang.c:376 ../loader2/loader.c:344 ../loader2/loader.c:379 -#: ../loader2/loader.c:414 ../loader2/loader.c:431 ../loader2/loader.c:444 -#: ../loader2/loader.c:479 ../loader2/loader.c:992 ../loader2/loader.c:1154 -#: ../loader2/mediacheck.c:62 ../loader2/mediacheck.c:100 -#: ../loader2/method.c:156 ../loader2/method.c:377 ../loader2/method.c:451 -#: ../loader2/modules.c:336 ../loader2/modules.c:348 ../loader2/net.c:281 -#: ../loader2/net.c:324 ../loader2/net.c:754 ../loader2/net.c:1098 -#: ../loader2/net.c:1653 ../loader2/net.c:1676 ../loader2/net.c:1869 -#: ../loader2/nfsinstall.c:67 ../loader2/nfsinstall.c:139 -#: ../loader2/nfsinstall.c:197 ../loader2/nfsinstall.c:256 -#: ../loader2/nfsinstall.c:264 ../loader2/nfsinstall.c:302 -#: ../loader2/telnetd.c:93 ../loader2/urlinstall.c:81 -#: ../loader2/urlinstall.c:104 ../loader2/urlinstall.c:154 -#: ../loader2/urlinstall.c:167 ../loader2/urlinstall.c:426 -#: ../loader2/urlinstall.c:435 ../loader2/urlinstall.c:444 -#: ../loader2/urls.c:294 ../loader2/urls.c:328 ../loader2/urls.c:339 -#: ../loader2/urls.c:411 +#: ../loader2/loader.c:414 ../loader2/loader.c:431 ../loader2/loader.c:445 +#: ../loader2/loader.c:480 ../loader2/loader.c:997 ../loader2/loader.c:1159 +#: ../loader2/mediacheck.c:62 ../loader2/mediacheck.c:101 +#: ../loader2/mediacheck.c:108 ../loader2/mediacheck.c:117 +#: ../loader2/method.c:112 ../loader2/method.c:333 ../loader2/method.c:407 +#: ../loader2/modules.c:336 ../loader2/modules.c:348 ../loader2/net.c:277 +#: ../loader2/net.c:320 ../loader2/net.c:750 ../loader2/net.c:1094 +#: ../loader2/net.c:1647 ../loader2/net.c:1670 ../loader2/net.c:1863 +#: ../loader2/nfsinstall.c:68 ../loader2/nfsinstall.c:138 +#: ../loader2/nfsinstall.c:261 ../loader2/nfsinstall.c:279 +#: ../loader2/nfsinstall.c:320 ../loader2/telnetd.c:93 +#: ../loader2/urlinstall.c:78 ../loader2/urlinstall.c:101 +#: ../loader2/urlinstall.c:185 ../loader2/urlinstall.c:196 +#: ../loader2/urlinstall.c:465 ../loader2/urlinstall.c:474 +#: ../loader2/urlinstall.c:483 ../loader2/urls.c:278 ../loader2/urls.c:313 +#: ../loader2/urls.c:319 ../loader2/urls.c:331 ../loader2/urls.c:403 msgid "OK" msgstr "确定" @@ -109,27 +109,27 @@ msgstr "您没有足够的内存来使用图形化安装程序。开始使用文 msgid "No video hardware found, assuming headless" msgstr "没有找到视频硬件，假定为无头机器" -#: ../anaconda:468 ../anaconda:977 +#: ../anaconda:468 ../anaconda:955 msgid "Unable to instantiate a X hardware state object." msgstr "无法实例化 X 硬件状态对象。" -#: ../anaconda:523 +#: ../anaconda:518 msgid "Starting graphical installation..." msgstr "正在启动图形化安装..." -#: ../anaconda:851 +#: ../anaconda:832 msgid "Install class forcing text mode installation" msgstr "安装类别强制使用文本模式安装" -#: ../anaconda:891 +#: ../anaconda:872 msgid "Graphical installation not available... Starting text mode." msgstr "没有可用的图形化安装... 开始文本方式安装。" -#: ../anaconda:899 +#: ../anaconda:880 msgid "DISPLAY variable not set. Starting text mode!" msgstr "DISPLAY 变量未设定，启动文本模式！" -#: ../autopart.py:893 +#: ../autopart.py:889 #, python-format msgid "" "Error resizing partition %s.\n" @@ -137,12 +137,12 @@ msgid "" "%s" msgstr "" -#: ../autopart.py:896 +#: ../autopart.py:892 #, python-format msgid "Start of partition %s was moved when resizing" msgstr "" -#: ../autopart.py:988 +#: ../autopart.py:984 #, fuzzy msgid "Could not allocate cylinder-based partitions as primary partitions.\n" msgstr "" @@ -150,7 +150,7 @@ msgstr "" "\n" "%s" -#: ../autopart.py:993 +#: ../autopart.py:989 #, fuzzy msgid "Could not allocate partitions as primary partitions.\n" msgstr "" @@ -158,7 +158,7 @@ msgstr "" "\n" "%s" -#: ../autopart.py:998 +#: ../autopart.py:994 #, fuzzy msgid "Could not allocate cylinder-based partitions.\n" msgstr "" @@ -166,7 +166,7 @@ msgstr "" "\n" "%s" -#: ../autopart.py:1063 +#: ../autopart.py:1059 #, python-format msgid "" "Boot partition %s doesn't belong to a BSD disk label. SRM won't be able to " @@ -176,7 +176,7 @@ msgstr "" "引导分区 %s 不属于 BSD 磁盘标签。SRM 无法从该分区引导。请使用一个属于 BSD 磁" "盘标签的分区或将该设备磁盘标为 BSD。" -#: ../autopart.py:1065 +#: ../autopart.py:1061 #, python-format msgid "" "Boot partition %s doesn't belong to a disk with enough free space at its " @@ -186,37 +186,44 @@ msgstr "" "引导分区 %s 所属磁盘在前端没有足够的空间来容纳引导装载程序。请确定在磁盘起始" "处至少有 5MB 空闲空间来容纳 /boot" -#: ../autopart.py:1067 +#: ../autopart.py:1063 #, 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:1069 +#: ../autopart.py:1065 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:1076 +#: ../autopart.py:1067 +#, fuzzy, 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 不是 VFAT 分区。EFI 无法从该分区引导。" + +#: ../autopart.py:1070 #, python-format msgid "" "Boot partition %s may not meet booting constraints for your architecture." msgstr "引导分区 %s 可能没有满足您的体系的引导制约参数。" -#: ../autopart.py:1102 +#: ../autopart.py:1095 #, python-format msgid "" "Adding this partition would not leave enough disk space for already " "allocated logical volumes in %s." msgstr "若添加该分区，已分配在 %s 的逻辑卷将没有足够的磁盘空间。" -#: ../autopart.py:1299 +#: ../autopart.py:1287 msgid "Requested Partition Does Not Exist" msgstr "所申请的分区不存在" -#: ../autopart.py:1300 +#: ../autopart.py:1288 #, python-format msgid "" "Unable to locate partition %s to use for %s.\n" @@ -227,11 +234,11 @@ msgstr "" "\n" "按确定来退出安装." -#: ../autopart.py:1325 +#: ../autopart.py:1313 msgid "Requested Raid Device Does Not Exist" msgstr "所申请的 RAID 设备不存在" -#: ../autopart.py:1326 +#: ../autopart.py:1314 #, python-format msgid "" "Unable to locate raid device %s to use for %s.\n" @@ -242,11 +249,11 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1355 +#: ../autopart.py:1343 msgid "Requested Volume Group Does Not Exist" msgstr "所申请的卷组不存在" -#: ../autopart.py:1356 +#: ../autopart.py:1344 #, python-format msgid "" "Unable to locate volume group %s to use for %s.\n" @@ -257,11 +264,11 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1393 +#: ../autopart.py:1381 msgid "Requested Logical Volume Does Not Exist" msgstr "所申请的逻辑卷不存在" -#: ../autopart.py:1394 +#: ../autopart.py:1382 #, python-format msgid "" "Unable to locate logical volume %s to use for %s.\n" @@ -272,11 +279,11 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1529 ../autopart.py:1576 +#: ../autopart.py:1517 ../autopart.py:1564 msgid "Automatic Partitioning Errors" msgstr "自动分区错误" -#: ../autopart.py:1530 +#: ../autopart.py:1518 #, python-format msgid "" "The following errors occurred with your partitioning:\n" @@ -291,11 +298,11 @@ msgstr "" "\n" "请按确定退出安装." -#: ../autopart.py:1540 +#: ../autopart.py:1528 msgid "Warnings During Automatic Partitioning" msgstr "进行自动分区时出现警告" -#: ../autopart.py:1541 +#: ../autopart.py:1529 #, python-format msgid "" "Following warnings occurred during automatic partitioning:\n" @@ -306,7 +313,7 @@ msgstr "" "\n" "%s" -#: ../autopart.py:1555 ../autopart.py:1572 +#: ../autopart.py:1543 ../autopart.py:1560 msgid "" "\n" "\n" @@ -316,12 +323,12 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1556 ../iw/partition_gui.py:1023 -#: ../textw/partition_text.py:245 +#: ../autopart.py:1544 ../iw/partition_gui.py:1023 +#: ../textw/partition_text.py:246 msgid "Error Partitioning" msgstr "分区出错" -#: ../autopart.py:1557 +#: ../autopart.py:1545 #, python-format msgid "" "Could not allocate requested partitions: \n" @@ -332,7 +339,7 @@ msgstr "" "\n" "%s.%s" -#: ../autopart.py:1574 +#: ../autopart.py:1562 msgid "" "\n" "\n" @@ -342,7 +349,7 @@ msgstr "" "\n" "点“确定”，选择不同的分区选项" -#: ../autopart.py:1577 +#: ../autopart.py:1565 #, python-format msgid "" "The following errors occurred with your partitioning:\n" @@ -358,15 +365,15 @@ msgstr "" "\n" "这些错误在安装所需的硬盘驱动器空间不够时会发生.%s" -#: ../autopart.py:1588 +#: ../autopart.py:1576 msgid "Unrecoverable Error" msgstr "无法恢复的错误" -#: ../autopart.py:1589 +#: ../autopart.py:1577 msgid "Your system will now be rebooted." msgstr "您的系统现在将会被重新引导。" -#: ../autopart.py:1706 +#: ../autopart.py:1701 msgid "" "Automatic Partitioning sets partitions based on the selected installation " "type. You also can customize the partitions once they have been created.\n" @@ -380,21 +387,21 @@ msgstr "" "Disk Druid 是手工分区的工具。它允许您在交互的环境中建立分区。您可以用它来设置" "文件系统类型、挂载点、分区大小等。" -#: ../autopart.py:1717 +#: ../autopart.py:1712 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:1722 +#: ../autopart.py:1717 msgid "Remove all partitions on this system" msgstr "删除系统内的所有分区" -#: ../autopart.py:1723 +#: ../autopart.py:1718 msgid "Remove all Linux partitions on this system" msgstr "删除系统内所有的 Linux 分区" -#: ../autopart.py:1724 +#: ../autopart.py:1719 msgid "Keep all partitions and use existing free space" msgstr "保存所有分区，使用现有的空闲空间" @@ -408,14 +415,14 @@ msgstr "升级 %s\n" msgid "Installing %s\n" msgstr "安装 %s\n" -#: ../bootloader.py:44 ../bootloader.py:216 ../image.py:87 -#: ../partedUtils.py:353 ../partedUtils.py:383 ../partedUtils.py:1091 -#: ../partedUtils.py:1244 ../upgrade.py:403 ../yuminstall.py:1387 -#: ../yuminstall.py:1414 ../iw/autopart_type.py:178 ../iw/blpasswidget.py:149 +#: ../bootloader.py:44 ../bootloader.py:236 ../image.py:87 +#: ../partedUtils.py:365 ../partedUtils.py:395 ../partedUtils.py:1103 +#: ../partedUtils.py:1256 ../upgrade.py:432 ../yuminstall.py:1417 +#: ../yuminstall.py:1444 ../iw/autopart_type.py:178 ../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:249 ../textw/upgrade_text.py:178 +#: ../textw/partition_text.py:250 ../textw/upgrade_text.py:186 msgid "Warning" msgstr "警告" @@ -429,30 +436,30 @@ msgid "" msgstr "您选择的分区选项已被激活，您将无法返回到磁盘编辑屏幕。您想继续安装吗？" #: ../bootloader.py:49 ../exception.py:348 ../exception.py:364 -#: ../fsset.py:1675 ../fsset.py:1929 ../fsset.py:2660 ../fsset.py:2667 -#: ../gui.py:1179 ../gui.py:1313 ../image.py:96 ../livecd.py:375 -#: ../upgrade.py:84 ../upgrade.py:104 ../yuminstall.py:644 -#: ../yuminstall.py:719 ../yuminstall.py:725 ../yuminstall.py:893 -#: ../yuminstall.py:941 ../yuminstall.py:1173 ../yuminstall.py:1210 +#: ../fsset.py:1700 ../fsset.py:1954 ../fsset.py:2685 ../fsset.py:2692 +#: ../gui.py:1179 ../gui.py:1313 ../image.py:96 ../livecd.py:380 +#: ../upgrade.py:113 ../upgrade.py:133 ../yuminstall.py:671 +#: ../yuminstall.py:746 ../yuminstall.py:752 ../yuminstall.py:920 +#: ../yuminstall.py:968 ../yuminstall.py:1201 ../yuminstall.py:1238 msgid "_Exit installer" msgstr "(_E)退出安装程序" -#: ../bootloader.py:49 ../fsset.py:1930 ../image.py:97 ../image.py:247 -#: ../kickstart.py:978 ../kickstart.py:1016 ../partedUtils.py:1247 -#: ../upgrade.py:84 ../upgrade.py:104 ../yuminstall.py:898 +#: ../bootloader.py:49 ../fsset.py:1955 ../image.py:97 ../image.py:247 +#: ../kickstart.py:982 ../kickstart.py:1020 ../partedUtils.py:1259 +#: ../upgrade.py:113 ../upgrade.py:133 ../yuminstall.py:925 #: ../iw/partition_gui.py:1037 msgid "_Continue" msgstr "继续(_C)" -#: ../bootloader.py:147 +#: ../bootloader.py:167 msgid "Bootloader" msgstr "引导装载程序" -#: ../bootloader.py:147 +#: ../bootloader.py:167 msgid "Installing bootloader..." msgstr "正在安装引导装载程序..." -#: ../bootloader.py:217 +#: ../bootloader.py:237 msgid "" "No kernel packages were installed on your system. Your boot loader " "configuration will not be changed." @@ -522,59 +529,59 @@ msgstr "您的系统状态已被成功地写入远程主机。将退出安装." msgid "There was a problem writing the system state to the remote host." msgstr "将系统状态存入远程主机时出现问题。" -#: ../fsset.py:533 +#: ../fsset.py:545 #, fuzzy msgid "Checking" msgstr "正在检查\"%s\"..." -#: ../fsset.py:534 +#: ../fsset.py:546 #, fuzzy, python-format msgid "Checking filesystem on %s..." msgstr "正在检查 /dev/%s 上的磁盘坏块..." -#: ../fsset.py:544 ../fsset.py:977 +#: ../fsset.py:556 ../fsset.py:1010 #, fuzzy msgid "Resizing" msgstr "检索" -#: ../fsset.py:545 ../fsset.py:978 +#: ../fsset.py:557 ../fsset.py:1011 #, fuzzy, python-format msgid "Resizing filesystem on %s..." msgstr "正在格式化 %s 文件系统..." -#: ../fsset.py:687 ../fsset.py:1645 ../fsset.py:1676 ../fsset.py:1752 -#: ../fsset.py:1820 ../fsset.py:1870 ../fsset.py:1952 ../fsset.py:1965 -#: ../image.py:264 ../livecd.py:368 ../partIntfHelpers.py:412 ../text.py:444 -#: ../yuminstall.py:347 ../yuminstall.py:402 ../yuminstall.py:538 -#: ../yuminstall.py:640 ../yuminstall.py:904 ../yuminstall.py:945 -#: ../yuminstall.py:1178 ../yuminstall.py:1203 ../iw/autopart_type.py:93 +#: ../fsset.py:699 ../fsset.py:1670 ../fsset.py:1701 ../fsset.py:1777 +#: ../fsset.py:1845 ../fsset.py:1895 ../fsset.py:1977 ../fsset.py:1990 +#: ../image.py:264 ../livecd.py:373 ../partIntfHelpers.py:412 ../text.py:444 +#: ../yuminstall.py:356 ../yuminstall.py:411 ../yuminstall.py:562 +#: ../yuminstall.py:667 ../yuminstall.py:931 ../yuminstall.py:972 +#: ../yuminstall.py:1206 ../yuminstall.py:1231 ../iw/autopart_type.py:93 #: ../iw/autopart_type.py:168 ../iw/autopart_type.py:312 #: ../iw/netconfig_dialog.py:264 ../iw/osbootwidget.py:210 -#: ../iw/osbootwidget.py:219 ../iw/raid_dialog_gui.py:669 -#: ../iw/raid_dialog_gui.py:708 ../iw/task_gui.py:43 ../iw/task_gui.py:226 -#: ../textw/grpselect_text.py:123 ../textw/partition_text.py:1650 -#: ../textw/partition_text.py:1656 ../textw/partition_text.py:1678 -#: ../textw/upgrade_text.py:166 ../textw/upgrade_text.py:173 -#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:401 +#: ../iw/osbootwidget.py:219 ../iw/raid_dialog_gui.py:671 +#: ../iw/raid_dialog_gui.py:710 ../iw/task_gui.py:43 ../iw/task_gui.py:226 +#: ../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 +#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:421 #: ../loader2/driverdisk.c:98 ../loader2/driverdisk.c:299 #: ../loader2/driverdisk.c:337 ../loader2/driverdisk.c:365 #: ../loader2/driverdisk.c:375 ../loader2/driverdisk.c:439 -#: ../loader2/hdinstall.c:133 ../loader2/hdinstall.c:186 -#: ../loader2/hdinstall.c:394 ../loader2/hdinstall.c:496 -#: ../loader2/hdinstall.c:539 ../loader2/hdinstall.c:552 +#: ../loader2/hdinstall.c:141 ../loader2/hdinstall.c:252 +#: ../loader2/hdinstall.c:438 ../loader2/hdinstall.c:540 +#: ../loader2/hdinstall.c:583 ../loader2/hdinstall.c:596 #: ../loader2/kickstart.c:284 ../loader2/lang.c:115 ../loader2/loader.c:344 -#: ../loader2/loader.c:444 ../loader2/loader.c:992 ../loader2/mediacheck.c:62 -#: ../loader2/mediacheck.c:100 ../loader2/method.c:156 ../loader2/method.c:377 -#: ../loader2/method.c:451 ../loader2/nfsinstall.c:139 -#: ../loader2/nfsinstall.c:197 ../loader2/nfsinstall.c:256 -#: ../loader2/nfsinstall.c:264 ../loader2/telnetd.c:93 -#: ../loader2/urlinstall.c:81 ../loader2/urlinstall.c:104 -#: ../loader2/urlinstall.c:154 ../loader2/urlinstall.c:167 -#: ../loader2/urls.c:328 +#: ../loader2/loader.c:445 ../loader2/loader.c:997 ../loader2/mediacheck.c:62 +#: ../loader2/mediacheck.c:101 ../loader2/mediacheck.c:108 +#: ../loader2/method.c:112 ../loader2/method.c:333 ../loader2/method.c:407 +#: ../loader2/nfsinstall.c:138 ../loader2/nfsinstall.c:261 +#: ../loader2/nfsinstall.c:279 ../loader2/telnetd.c:93 +#: ../loader2/urlinstall.c:78 ../loader2/urlinstall.c:101 +#: ../loader2/urlinstall.c:185 ../loader2/urlinstall.c:196 +#: ../loader2/urls.c:313 ../loader2/urls.c:319 msgid "Error" msgstr "错误" -#: ../fsset.py:688 +#: ../fsset.py:700 #, python-format msgid "" "An error occurred migrating %s to ext3. It is possible to continue without " @@ -587,27 +594,32 @@ msgstr "" "\n" "您想不迁移 %s 而继续吗？" -#: ../fsset.py:1502 +#: ../fsset.py:1523 +#, fuzzy +msgid "EFI System Partition" +msgstr "编辑分区" + +#: ../fsset.py:1527 msgid "RAID Device" msgstr "RAID 设备" -#: ../fsset.py:1506 ../fsset.py:1512 +#: ../fsset.py:1531 ../fsset.py:1537 msgid "Apple Bootstrap" msgstr "Apple 自展程序" -#: ../fsset.py:1517 ../partitions.py:1130 +#: ../fsset.py:1542 ../partitions.py:1120 msgid "PPC PReP Boot" msgstr "PPC PReP 引导" -#: ../fsset.py:1520 +#: ../fsset.py:1545 msgid "First sector of boot partition" msgstr "引导分区的第一个扇区" -#: ../fsset.py:1521 +#: ../fsset.py:1546 msgid "Master Boot Record (MBR)" msgstr "主引导记录（MBR）" -#: ../fsset.py:1646 +#: ../fsset.py:1671 #, python-format msgid "" "An error occurred trying to initialize swap on device %s. This problem is " @@ -619,13 +631,13 @@ msgstr "" "\n" "请按 键退出安装." -#: ../fsset.py:1675 ../packages.py:304 ../rescue.py:305 ../rescue.py:307 -#: ../textw/upgrade_text.py:124 ../loader2/cdinstall.c:196 -#: ../loader2/cdinstall.c:199 ../loader2/method.c:424 +#: ../fsset.py:1700 ../packages.py:304 ../rescue.py:305 ../rescue.py:307 +#: ../textw/upgrade_text.py:132 ../loader2/cdinstall.c:200 +#: ../loader2/cdinstall.c:203 ../loader2/method.c:380 msgid "Skip" msgstr "跳过" -#: ../fsset.py:1696 +#: ../fsset.py:1721 #, python-format msgid "" "The swap device:\n" @@ -643,11 +655,11 @@ msgstr "" "是 0 版本的 Linux 交换分区。如果您想使用此设备，您必须用 1 版本的Linux 交换分" "区进行格式化。如果跳过，安装将在安装过程中忽略它。" -#: ../fsset.py:1703 +#: ../fsset.py:1728 msgid "Reformat" msgstr "重新格式化" -#: ../fsset.py:1707 +#: ../fsset.py:1732 #, python-format msgid "" "The swap device:\n" @@ -665,7 +677,7 @@ msgstr "" "在 /etc/fstab 文件中的当前状态是睡眠状态。如果要进行升级，请关闭您的系统，而" "不是使系统进入睡眠状态。" -#: ../fsset.py:1715 +#: ../fsset.py:1740 #, python-format msgid "" "The swap device:\n" @@ -683,7 +695,7 @@ msgstr "" "在 /etc/fstab 中文件用作软件延缓分区.如果要进行全新的安装,请确认安装程序被设" "置为格式化所有交换分区." -#: ../fsset.py:1725 +#: ../fsset.py:1750 msgid "" "\n" "\n" @@ -695,11 +707,11 @@ msgstr "" "如果您想在升级过程中忽略这个分区,请选择跳过.选择格式化将使这个分区被重新格式" "化为交换分区." -#: ../fsset.py:1730 ../iw/partition_gui.py:373 +#: ../fsset.py:1755 ../iw/partition_gui.py:373 msgid "Format" msgstr "格式化" -#: ../fsset.py:1736 +#: ../fsset.py:1761 #, fuzzy, python-format msgid "" "Error enabling swap device %s: %s\n" @@ -714,7 +726,7 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:1741 +#: ../fsset.py:1766 #, fuzzy, python-format msgid "" "Error enabling swap device %s: %s\n" @@ -730,7 +742,7 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:1747 +#: ../fsset.py:1772 #, python-format msgid "" "Error enabling swap device %s: %s\n" @@ -745,7 +757,7 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:1821 +#: ../fsset.py:1846 #, python-format msgid "" "An error occurred trying to format %s. This problem is serious, and the " @@ -757,7 +769,7 @@ msgstr "" "\n" "请按 退出安装." -#: ../fsset.py:1871 +#: ../fsset.py:1896 #, python-format msgid "" "An error occurred trying to migrate %s. This problem is serious, and the " @@ -769,11 +781,11 @@ msgstr "" "\n" "请按 键退出安装." -#: ../fsset.py:1897 ../fsset.py:1906 +#: ../fsset.py:1922 ../fsset.py:1931 msgid "Invalid mount point" msgstr "挂载点无效" -#: ../fsset.py:1898 +#: ../fsset.py:1923 #, python-format msgid "" "An error occurred when trying to create %s. Some element of this path is " @@ -785,7 +797,7 @@ msgstr "" "\n" "请按 退出安装." -#: ../fsset.py:1907 +#: ../fsset.py:1932 #, python-format msgid "" "An error occurred when trying to create %s: %s. This is a fatal error and " @@ -797,18 +809,18 @@ msgstr "" "\n" "请按 退出安装." -#: ../fsset.py:1921 +#: ../fsset.py:1946 msgid "Unable to mount filesystem" msgstr "无法载入文件系统！" -#: ../fsset.py:1922 +#: ../fsset.py:1947 #, 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:1938 +#: ../fsset.py:1963 #, python-format msgid "" "Error mounting device %s as %s: %s\n" @@ -823,7 +835,7 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:1945 +#: ../fsset.py:1970 #, python-format msgid "" "Error mounting device %s as %s: %s\n" @@ -838,7 +850,7 @@ msgstr "" "\n" "请按确定退出安装。" -#: ../fsset.py:1966 +#: ../fsset.py:1991 msgid "" "Error finding / entry.\n" "\n" @@ -852,11 +864,11 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:2652 +#: ../fsset.py:2677 msgid "Duplicate Labels" msgstr "标签重复" -#: ../fsset.py:2653 +#: ../fsset.py:2678 #, python-format msgid "" "Multiple devices on your system are labelled %s. Labels across devices must " @@ -868,22 +880,22 @@ msgstr "" "\n" "请解决这个问题后重新启动安装过程。" -#: ../fsset.py:2662 +#: ../fsset.py:2687 msgid "Invalid Label" msgstr "标签无效" -#: ../fsset.py:2663 +#: ../fsset.py:2688 #, python-format msgid "" "An invalid label was found on device %s. Please fix this problem and " "restart the installation process." msgstr "驱动器%s上发现一个无效标签.请解决这个问题后重新启动安装过程。" -#: ../fsset.py:2800 +#: ../fsset.py:2825 msgid "Formatting" msgstr "正在格式化" -#: ../fsset.py:2801 +#: ../fsset.py:2826 #, python-format msgid "Formatting %s file system..." msgstr "正在格式化 %s 文件系统..." @@ -937,7 +949,7 @@ msgstr "修复" #: ../gui.py:233 ../rescue.py:228 ../text.py:534 #: ../textw/bootloader_text.py:72 ../textw/constants_text.py:54 #: ../loader2/driverdisk.c:479 ../loader2/driverdisk.c:489 -#: ../loader2/hdinstall.c:290 +#: ../loader2/hdinstall.c:334 msgid "Yes" msgstr "是" @@ -947,10 +959,10 @@ msgstr "是" msgid "No" msgstr "否" -#: ../gui.py:236 ../text.py:537 ../text.py:668 ../loader2/net.c:96 -#: ../loader2/net.c:342 ../loader2/net.c:593 ../loader2/net.c:699 -#: ../loader2/net.c:824 ../loader2/net.c:832 ../loader2/net.c:1228 -#: ../loader2/net.c:1234 +#: ../gui.py:236 ../text.py:537 ../text.py:668 ../loader2/net.c:92 +#: ../loader2/net.c:338 ../loader2/net.c:589 ../loader2/net.c:695 +#: ../loader2/net.c:820 ../loader2/net.c:828 ../loader2/net.c:1224 +#: ../loader2/net.c:1230 msgid "Retry" msgstr "重试" @@ -962,7 +974,7 @@ msgstr "忽略" #: ../partIntfHelpers.py:535 ../text.py:109 ../text.py:110 ../text.py:539 #: ../textw/bootloader_text.py:202 ../textw/constants_text.py:46 #: ../loader2/dirbrowser.c:145 ../loader2/driverdisk.c:236 -#: ../loader2/kickstart.c:372 ../loader2/loader.c:379 ../loader2/loader.c:479 +#: ../loader2/kickstart.c:372 ../loader2/loader.c:379 ../loader2/loader.c:480 msgid "Cancel" msgstr "取消" @@ -1036,8 +1048,8 @@ msgstr "" msgid "_Exit" msgstr "退出(_E)" -#: ../gui.py:1309 ../image.py:188 ../yuminstall.py:535 ../yuminstall.py:893 -#: ../yuminstall.py:941 ../yuminstall.py:1173 +#: ../gui.py:1309 ../image.py:188 ../yuminstall.py:559 ../yuminstall.py:920 +#: ../yuminstall.py:968 ../yuminstall.py:1201 msgid "_Retry" msgstr "重试(_R)" @@ -1050,7 +1062,7 @@ msgid "Your system will now be rebooted..." msgstr "您的系统现在将会被重新引导..." #: ../gui.py:1316 ../image.py:247 ../packages.py:169 ../packages.py:361 -#: ../partedUtils.py:1246 ../yuminstall.py:1226 +#: ../partedUtils.py:1258 ../yuminstall.py:1254 msgid "_Reboot" msgstr "重新引导(_R)" @@ -1058,16 +1070,16 @@ msgstr "重新引导(_R)" msgid "Exiting" msgstr "退出中" -#: ../gui.py:1384 +#: ../gui.py:1386 #, python-format msgid "%s Installer" msgstr "%s 安装程序" -#: ../gui.py:1391 +#: ../gui.py:1393 msgid "Unable to load title bar" msgstr "无法载入标题栏" -#: ../gui.py:1444 +#: ../gui.py:1446 msgid "Install Window" msgstr "安装窗口" @@ -1136,9 +1148,9 @@ msgstr "" "请在继续安装前准备好这些光盘。如果您需要中止安装并重新引导，请选择“重新引" "导”。" -#: ../image.py:247 ../livecd.py:374 ../packages.py:307 ../packages.py:358 -#: ../packages.py:361 ../yuminstall.py:644 ../yuminstall.py:725 -#: ../yuminstall.py:1210 ../yuminstall.py:1226 +#: ../image.py:247 ../livecd.py:379 ../packages.py:307 ../packages.py:358 +#: ../packages.py:361 ../yuminstall.py:671 ../yuminstall.py:752 +#: ../yuminstall.py:1238 ../yuminstall.py:1254 msgid "_Back" msgstr "上一步(_B)" @@ -1174,38 +1186,38 @@ msgstr "" msgid "Scriptlet Failure" msgstr "Scriptlet 失败" -#: ../kickstart.py:921 ../kickstart.py:938 +#: ../kickstart.py:925 ../kickstart.py:942 msgid "Running..." msgstr "正在运行..." -#: ../kickstart.py:922 +#: ../kickstart.py:926 msgid "Running post-install scripts" msgstr "运行安装后脚本" -#: ../kickstart.py:939 +#: ../kickstart.py:943 msgid "Running pre-install scripts" msgstr "运行安装前脚本" -#: ../kickstart.py:970 +#: ../kickstart.py:974 msgid "Missing Package" msgstr "缺少软件包" -#: ../kickstart.py:971 +#: ../kickstart.py:975 #, 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:977 ../kickstart.py:1015 +#: ../kickstart.py:981 ../kickstart.py:1019 msgid "_Abort" msgstr "中止(_A)" -#: ../kickstart.py:1007 +#: ../kickstart.py:1011 msgid "Missing Group" msgstr "缺少软件包组" -#: ../kickstart.py:1008 +#: ../kickstart.py:1012 #, python-format msgid "" "You have specified that the group '%s' should be installed. This group does " @@ -1237,7 +1249,7 @@ msgid "" "minutes..." msgstr "进行安装后文件系统改变，可能要等一会..." -#: ../livecd.py:369 +#: ../livecd.py:374 #, python-format msgid "" "The root filesystem you created is not large enough for this live image " @@ -1327,11 +1339,11 @@ msgstr "" msgid "_Install anyway" msgstr "强行安装(_I)" -#: ../partedUtils.py:233 ../textw/partition_text.py:576 +#: ../partedUtils.py:238 ../textw/partition_text.py:577 msgid "Foreign" msgstr "外来" -#: ../partedUtils.py:354 +#: ../partedUtils.py:366 #, python-format msgid "" "The device %s is LDL formatted instead of CDL formatted. LDL formatted " @@ -1347,7 +1359,7 @@ msgstr "" "\n" "您想使用 CDL 格式来重新格式化这个 DASD 吗？" -#: ../partedUtils.py:384 +#: ../partedUtils.py:396 #, python-format msgid "" "/dev/%s currently has a %s partition layout. To use this drive for the " @@ -1361,24 +1373,24 @@ msgstr "" "\n" "您想重新初始化这个驱动器吗？" -#: ../partedUtils.py:393 +#: ../partedUtils.py:405 msgid "_Ignore drive" msgstr "忽略驱动器(_I)" -#: ../partedUtils.py:394 +#: ../partedUtils.py:406 msgid "_Re-initialize drive" msgstr "重新初始化驱动" -#: ../partedUtils.py:979 +#: ../partedUtils.py:991 msgid "Initializing" msgstr "初始化" -#: ../partedUtils.py:980 +#: ../partedUtils.py:992 #, python-format msgid "Please wait while formatting drive %s...\n" msgstr "正在格式化驱动器 %s ...请稍候...\n" -#: ../partedUtils.py:1068 +#: ../partedUtils.py:1080 #, python-format msgid "" "The partition table on device %s was unreadable. To create new partitions it " @@ -1396,7 +1408,7 @@ msgstr "" "\n" "您想要初始化这个驱动器并删除所有数据吗？" -#: ../partedUtils.py:1082 +#: ../partedUtils.py:1094 #, python-format msgid "" "The partition table on device %s (%s) was unreadable. To create new " @@ -1415,7 +1427,7 @@ msgstr "" "\n" "您想要初始化这个驱动器并删除所有数据吗？" -#: ../partedUtils.py:1236 +#: ../partedUtils.py:1248 #, python-format msgid "" "The drive /dev/%s has more than 15 partitions on it. The SCSI subsystem in " @@ -1426,11 +1438,11 @@ msgstr "" "驱动器/dev/%s 有超过15个分区.这时Linux内核的SCSI子系统不允许超过15个分区. 您" "将无法改变此硬盘的分区,或在 %s中使用任何超出/dev/%s15的分区" -#: ../partedUtils.py:1327 +#: ../partedUtils.py:1339 msgid "No Drives Found" msgstr "未找到任何驱动器" -#: ../partedUtils.py:1328 +#: ../partedUtils.py:1340 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." @@ -1534,7 +1546,7 @@ msgid "" "contains %s" msgstr "您不能删除该分区，因为它是一个包含 %s 的扩展分区" -#: ../partIntfHelpers.py:189 ../iw/raid_dialog_gui.py:605 +#: ../partIntfHelpers.py:189 ../iw/raid_dialog_gui.py:607 msgid "This partition is holding the data for the hard drive install." msgstr "该分区含有硬盘安装的信息。" @@ -1770,15 +1782,15 @@ msgid "_Write changes to disk" msgstr "" #: ../partitions.py:200 ../textw/constants_text.py:50 -#: ../loader2/cdinstall.c:335 ../loader2/driverdisk.c:236 +#: ../loader2/cdinstall.c:351 ../loader2/driverdisk.c:236 #: ../loader2/driverdisk.c:267 ../loader2/driverdisk.c:351 #: ../loader2/driverselect.c:75 ../loader2/driverselect.c:173 -#: ../loader2/driverselect.c:199 ../loader2/hdinstall.c:290 -#: ../loader2/hdinstall.c:344 ../loader2/kbd.c:138 ../loader2/loader.c:415 -#: ../loader2/loader.c:431 ../loader2/loader.c:1154 ../loader2/loader.c:1176 -#: ../loader2/net.c:281 ../loader2/net.c:324 ../loader2/net.c:754 -#: ../loader2/net.c:1098 ../loader2/net.c:1869 ../loader2/nfsinstall.c:67 -#: ../loader2/urls.c:294 ../loader2/urls.c:411 +#: ../loader2/driverselect.c:199 ../loader2/hdinstall.c:334 +#: ../loader2/hdinstall.c:388 ../loader2/kbd.c:138 ../loader2/loader.c:415 +#: ../loader2/loader.c:431 ../loader2/loader.c:1159 ../loader2/loader.c:1181 +#: ../loader2/net.c:277 ../loader2/net.c:320 ../loader2/net.c:750 +#: ../loader2/net.c:1094 ../loader2/net.c:1863 ../loader2/nfsinstall.c:68 +#: ../loader2/urls.c:278 ../loader2/urls.c:403 msgid "Back" msgstr "上一步" @@ -1802,81 +1814,83 @@ msgid "" "installation." msgstr "" -#: ../partitions.py:1019 +#: ../partitions.py:1025 #, python-format msgid "" "You have not defined a root partition (/), which is required for " "installation of %s to continue." msgstr "您还没有指定继续安装 %s 所需的根分区（/）。" -#: ../partitions.py:1024 +#: ../partitions.py:1030 #, 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:1057 ../partitions.py:1077 +#: ../partitions.py:1052 +#, fuzzy msgid "" -"You must create a /boot/efi partition of type FAT and a size of 50 megabytes." +"You must create an EFI System Partition of type FAT and a size of 50 " +"megabytes." msgstr "您必须创建一个 FAT 类型的 /boot/efl 分区，大小为 50MB。" -#: ../partitions.py:1070 +#: ../partitions.py:1066 msgid "" "Your boot partition isn't on one of the first four partitions and thus won't " "be bootable." msgstr "您的引导区不是最初的四个分区之一，因此无法引导驱动器。" -#: ../partitions.py:1097 +#: ../partitions.py:1087 msgid "You must create an Apple Bootstrap partition." msgstr "您必须创建一个 Apple 引导分区。" -#: ../partitions.py:1119 +#: ../partitions.py:1109 msgid "You must create a PPC PReP Boot partition." msgstr "您必须创建一个 PPC PReP 引导分区。" -#: ../partitions.py:1127 ../partitions.py:1138 +#: ../partitions.py:1117 ../partitions.py:1128 #, 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:1172 +#: ../partitions.py:1162 msgid "" "Installing on a USB device. This may or may not produce a working system." msgstr "正在一个 USB 设备上安装。不能保证可以成功安装。" -#: ../partitions.py:1175 +#: ../partitions.py:1165 msgid "" "Installing on a FireWire device. This may or may not produce a working " "system." msgstr "正在一个 FireWire 设备上安装。不能保证可以成功安装。" -#: ../partitions.py:1185 +#: ../partitions.py:1175 msgid "Bootable partitions can only be on RAID1 devices." msgstr "可引导分区仅允许在 RAID1 设备上。" -#: ../partitions.py:1190 +#: ../partitions.py:1180 msgid "Bootable partitions cannot be on a logical volume." msgstr "可引导分区不能位于逻辑卷上。" -#: ../partitions.py:1196 +#: ../partitions.py:1186 #, fuzzy msgid "Bootable partitions cannot be on a RAID device." msgstr "可引导分区仅允许在 RAID1 设备上。" -#: ../partitions.py:1203 +#: ../partitions.py:1193 #, fuzzy, python-format msgid "Bootable partitions cannot be on an %s filesystem." msgstr "可引导分区不能位于逻辑卷上。" -#: ../partitions.py:1207 +#: ../partitions.py:1197 #, fuzzy msgid "Bootable partitions cannot be on an encrypted block device" msgstr "可引导分区不能位于逻辑卷上。" -#: ../partitions.py:1213 +#: ../partitions.py:1203 msgid "" "You have not specified a swap partition. Although not strictly required in " "all cases, it will significantly improve performance for most installations." @@ -1884,29 +1898,29 @@ msgstr "" "您还没有指定一个交换分区。虽然在大多情况下这并非必不可少，但若有一个交换分区" "的话，系统性能会显著提高。" -#: ../partitions.py:1220 +#: ../partitions.py:1210 #, 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:1231 +#: ../partitions.py:1221 #, 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:1526 +#: ../partitions.py:1516 msgid "the partition in use by the installer." msgstr "安装程序正在使用该分区。" -#: ../partitions.py:1529 +#: ../partitions.py:1519 msgid "a partition which is a member of a RAID array." msgstr "RAID 阵列中的一个分区。" -#: ../partitions.py:1532 +#: ../partitions.py:1522 msgid "a partition which is a member of a LVM Volume Group." msgstr "一个是 LVM 卷组成员之一的分区。" @@ -2200,11 +2214,11 @@ msgid "" "screen" msgstr "/ 元素间切换 | 选择 | 下一屏幕" -#: ../upgrade.py:76 ../upgrade.py:97 +#: ../upgrade.py:105 ../upgrade.py:126 msgid "Proceed with upgrade?" msgstr "继续升级吗？" -#: ../upgrade.py:77 +#: ../upgrade.py:106 #, python-format msgid "" "You have choosen the upgrade for %s architecture, but the installed system " @@ -2212,12 +2226,12 @@ msgid "" "\n" msgstr "" -#: ../upgrade.py:81 +#: ../upgrade.py:110 #, fuzzy, python-format msgid "Would you like to upgrade the installed system to the %s architecture?" msgstr "您想如何在该分区上筹备文件系统？" -#: ../upgrade.py:98 +#: ../upgrade.py:127 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" @@ -2226,15 +2240,15 @@ msgstr "" "您所选择要升级的 Linux 文件系统已经被挂载，过了该步骤便不能返回。\n" "\n" -#: ../upgrade.py:102 +#: ../upgrade.py:131 msgid "Would you like to continue with the upgrade?" msgstr "是否要继续升级？" -#: ../upgrade.py:200 ../upgrade.py:208 +#: ../upgrade.py:229 ../upgrade.py:237 msgid "Dirty File Systems" msgstr "有问题的文件系统" -#: ../upgrade.py:201 +#: ../upgrade.py:230 #, python-format msgid "" "The following file systems for your Linux system were not unmounted " @@ -2246,7 +2260,7 @@ msgstr "" "查验文件系统，正常关机后再进行系统升级。\n" "%s" -#: ../upgrade.py:209 +#: ../upgrade.py:238 #, python-format msgid "" "The following file systems for your Linux system were not unmounted " @@ -2256,18 +2270,18 @@ msgstr "" "您的 Linux 系统中下列文件系统没有被完整地卸载下来，您仍要挂载它们吗？\n" "%s" -#: ../upgrade.py:350 ../upgrade.py:356 +#: ../upgrade.py:379 ../upgrade.py:385 msgid "Mount failed" msgstr "挂载失败" -#: ../upgrade.py:351 +#: ../upgrade.py:380 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:357 +#: ../upgrade.py:386 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 " @@ -2275,7 +2289,7 @@ msgid "" msgstr "" "/etc/fstab 中列出的文件系统间发生矛盾而无法被挂载，请解决这一问题后再升级。" -#: ../upgrade.py:374 +#: ../upgrade.py:403 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 " @@ -2286,11 +2300,11 @@ msgstr "" "新开始升级。\n" "\n" -#: ../upgrade.py:380 +#: ../upgrade.py:409 msgid "Absolute Symlinks" msgstr "绝对符号链接" -#: ../upgrade.py:391 +#: ../upgrade.py:420 msgid "" "The following are directories which should instead be symbolic links, which " "will cause problems with the upgrade. Please return them to their original " @@ -2301,11 +2315,11 @@ msgstr "" "符号链接状态，然后重新开始升级。\n" "\n" -#: ../upgrade.py:397 +#: ../upgrade.py:426 msgid "Invalid Directories" msgstr "无效目录" -#: ../upgrade.py:404 +#: ../upgrade.py:433 #, python-format msgid "%s not found" msgstr "没有发现 %s" @@ -2488,7 +2502,7 @@ msgstr "正在处理" msgid "Preparing transaction from installation source..." msgstr "正在处理安装文件..." -#: ../yuminstall.py:158 +#: ../yuminstall.py:159 #, python-format msgid "Installing %s (%s)\n" msgstr "安装%s (%s)\n" @@ -2506,59 +2520,59 @@ msgstr "完成升级" msgid "Finishing upgrade process. This may take a little while..." msgstr "终止升级进程，可能要等一小会..." -#: ../yuminstall.py:327 +#: ../yuminstall.py:336 msgid "Copying File" msgstr "正在复制文件" -#: ../yuminstall.py:328 +#: ../yuminstall.py:337 msgid "Transferring install image to hard drive..." msgstr "正在将安装映像传输到硬盘..." -#: ../yuminstall.py:339 +#: ../yuminstall.py:348 #, fuzzy msgid "" "An error occurred transferring the install image to your hard drive. This " "is probably due to bad media." msgstr "将安装映像传输到硬盘时出错，很可能是磁盘空间不够。" -#: ../yuminstall.py:343 +#: ../yuminstall.py:352 msgid "" "An error occurred transferring the install image to your hard drive. You are " "probably out of disk space." msgstr "将安装映像传输到硬盘时出错，很可能是磁盘空间不够。" -#: ../yuminstall.py:381 +#: ../yuminstall.py:390 msgid "Change Disc" msgstr "更换光盘" -#: ../yuminstall.py:382 +#: ../yuminstall.py:391 #, python-format msgid "Please insert %s disc %d to continue." msgstr "请插入 %s 光盘 %d 以继续。" -#: ../yuminstall.py:396 +#: ../yuminstall.py:405 msgid "Wrong Disc" msgstr "光盘不对" -#: ../yuminstall.py:397 +#: ../yuminstall.py:406 #, python-format msgid "That's not the correct %s disc." msgstr "那不是正确的 %s 光盘。" -#: ../yuminstall.py:403 +#: ../yuminstall.py:412 msgid "Unable to access the disc." msgstr "无法读取光盘。" -#: ../yuminstall.py:533 ../yuminstall.py:535 +#: ../yuminstall.py:557 ../yuminstall.py:559 msgid "Re_boot" msgstr "重新引导(_b)" -#: ../yuminstall.py:533 +#: ../yuminstall.py:557 #, fuzzy msgid "_Eject" msgstr "弹出光盘" -#: ../yuminstall.py:539 +#: ../yuminstall.py:563 #, fuzzy, python-format msgid "" "The file %s cannot be opened. This is due to a missing file, a corrupt " @@ -2574,94 +2588,99 @@ msgstr "" "您如果现在推出，您的系统会不稳定需要重新安装。\n" "\n" -#: ../yuminstall.py:579 +#: ../yuminstall.py:603 #, fuzzy msgid "Retrying" msgstr "检索" -#: ../yuminstall.py:579 +#: ../yuminstall.py:603 msgid "Retrying package download..." msgstr "" -#: ../yuminstall.py:641 +#: ../yuminstall.py:668 #, fuzzy, python-format msgid "" "There was an error running your transaction for the following reason: %s\n" msgstr "出现错误，原因如下：%s" -#: ../yuminstall.py:674 ../yuminstall.py:675 +#: ../yuminstall.py:701 ../yuminstall.py:702 msgid "file conflicts" msgstr "文件冲突" -#: ../yuminstall.py:676 +#: ../yuminstall.py:703 msgid "older package(s)" msgstr "旧的软件包" -#: ../yuminstall.py:677 +#: ../yuminstall.py:704 msgid "insufficient disk space" msgstr "磁盘空间不足" -#: ../yuminstall.py:678 +#: ../yuminstall.py:705 msgid "insufficient disk inodes" msgstr "不足的磁盘节点" -#: ../yuminstall.py:679 +#: ../yuminstall.py:706 msgid "package conflicts" msgstr "软件包冲突" -#: ../yuminstall.py:680 +#: ../yuminstall.py:707 msgid "package already installed" msgstr "软件包已安装" -#: ../yuminstall.py:681 +#: ../yuminstall.py:708 msgid "required package" msgstr "需要的软件包" -#: ../yuminstall.py:682 +#: ../yuminstall.py:709 msgid "package for incorrect arch" msgstr "与硬件体系结构不兼容的软件包" -#: ../yuminstall.py:683 +#: ../yuminstall.py:710 msgid "package for incorrect os" msgstr "与操作系统不兼容的软件包" -#: ../yuminstall.py:697 +#: ../yuminstall.py:724 msgid "You need more space on the following file systems:\n" msgstr "您在以下文件系统中需要更多空间:\n" -#: ../yuminstall.py:710 +#: ../yuminstall.py:737 #, fuzzy, python-format msgid "" "There were file conflicts when checking the packages to be installed:\n" "%s\n" msgstr "哪一类介质包含要安装的软件包？" -#: ../yuminstall.py:713 +#: ../yuminstall.py:740 #, fuzzy, python-format msgid "" "There was an error running your transaction for the following reason(s): %" "s.\n" msgstr "出现错误，原因如下：%s" -#: ../yuminstall.py:717 +#: ../yuminstall.py:744 #, fuzzy msgid "Error Running Transaction" msgstr "错误运行记录" -#: ../yuminstall.py:722 +#: ../yuminstall.py:749 msgid "Error running transaction" msgstr "错误运行记录" -#: ../yuminstall.py:879 +#: ../yuminstall.py:906 msgid "Retrieving installation information..." msgstr "获取安装信息..." -#: ../yuminstall.py:881 +#: ../yuminstall.py:908 #, python-format msgid "Retrieving installation information for %s..." msgstr "重新获取%s安装信息..." -#: ../yuminstall.py:905 ../yuminstall.py:1179 +#: ../yuminstall.py:920 ../textw/bootloader_text.py:277 +#: ../textw/constants_text.py:62 ../textw/partition_text.py:1428 +msgid "Edit" +msgstr "编辑" + +#: ../yuminstall.py:932 ../yuminstall.py:1207 #, fuzzy, python-format msgid "" "Unable to read package metadata. This may be due to a missing repodata " @@ -2673,17 +2692,17 @@ msgstr "" "无法读取软件包的元数据。这可能是因为缺少 repodata 目录。请确定您已经正确建立" "了安装树。%s" -#: ../yuminstall.py:946 +#: ../yuminstall.py:973 msgid "" "Unable to read group information from repositories. This is a problem with " "the generation of your install tree." msgstr "不能从仓库里读取组信息。这是您安装树的问题。" -#: ../yuminstall.py:979 +#: ../yuminstall.py:1006 ../iw/GroupSelector.py:545 msgid "Uncategorized" msgstr "未分类的" -#: ../yuminstall.py:1204 +#: ../yuminstall.py:1232 #, python-format msgid "" "Your selected packages require %d MB of free space for installation, but you " @@ -2693,15 +2712,15 @@ msgstr "" "您选择的软件包共需要 %d MB 大小的磁盘安装空间，但是您没有足够的磁盘空间。您可" "以改变选择或者退出安装。" -#: ../yuminstall.py:1223 +#: ../yuminstall.py:1251 msgid "Reboot?" msgstr "重新引导？" -#: ../yuminstall.py:1224 +#: ../yuminstall.py:1252 msgid "The system will be rebooted now." msgstr "系统现在将会被重新引导。" -#: ../yuminstall.py:1388 +#: ../yuminstall.py:1418 #, python-format msgid "" "You appear to be upgrading from a system which is too old to upgrade to this " @@ -2710,7 +2729,7 @@ msgstr "" "您所升级的系统版本似乎太老，它不适合于升级到该版本的 %s。您肯定要继续升级进程" "吗？" -#: ../yuminstall.py:1415 +#: ../yuminstall.py:1445 #, fuzzy, python-format msgid "" "The arch of the release of %s you are upgrading to appears to be %s which " @@ -2720,39 +2739,39 @@ msgstr "" "您所升级的系统版本似乎太老，它不适合于升级到该版本的 %s。您肯定要继续升级进程" "吗？" -#: ../yuminstall.py:1448 -msgid "Install Starting" -msgstr "安装开始" - -#: ../yuminstall.py:1449 -msgid "Starting install process. This may take several minutes..." -msgstr "正在开启安装进程，可能会花几分钟时间..." - -#: ../yuminstall.py:1468 +#: ../yuminstall.py:1492 msgid "Post Upgrade" msgstr "升级后" -#: ../yuminstall.py:1469 +#: ../yuminstall.py:1493 msgid "Performing post upgrade configuration..." msgstr "正在执行升级后配置..." -#: ../yuminstall.py:1471 +#: ../yuminstall.py:1495 msgid "Post Install" msgstr "安装后" -#: ../yuminstall.py:1472 +#: ../yuminstall.py:1496 msgid "Performing post install configuration..." msgstr "正在执行安装后配置..." -#: ../yuminstall.py:1690 +#: ../yuminstall.py:1735 msgid "Installation Progress" msgstr "安装过程" -#: ../yuminstall.py:1725 +#: ../yuminstall.py:1770 +msgid "Install Starting" +msgstr "安装开始" + +#: ../yuminstall.py:1771 +msgid "Starting install process. This may take several minutes..." +msgstr "正在开启安装进程，可能会花几分钟时间..." + +#: ../yuminstall.py:1808 msgid "Dependency Check" msgstr "依赖关系检查" -#: ../yuminstall.py:1726 +#: ../yuminstall.py:1809 msgid "Checking dependencies in packages selected for installation..." msgstr "在所选定要安装的软件包中检查依赖关系..." @@ -2778,36 +2797,36 @@ msgstr "根口令(_P)：" msgid "_Confirm:" msgstr "确认(_C)：" -#: ../iw/account_gui.py:74 +#: ../iw/account_gui.py:77 #, fuzzy msgid "Caps Lock is on." msgstr "大写锁定开" -#: ../iw/account_gui.py:84 ../iw/account_gui.py:92 ../iw/account_gui.py:99 -#: ../iw/account_gui.py:119 ../textw/userauth_text.py:71 +#: ../iw/account_gui.py:87 ../iw/account_gui.py:95 ../iw/account_gui.py:102 +#: ../iw/account_gui.py:122 ../textw/userauth_text.py:71 msgid "Error with Password" msgstr "口令错误" -#: ../iw/account_gui.py:85 +#: ../iw/account_gui.py:88 msgid "" "You must enter your root password and confirm it by typing it a second time " "to continue." msgstr "您必须输入根口令并再键入一次来确认以继续。" -#: ../iw/account_gui.py:93 +#: ../iw/account_gui.py:96 msgid "The passwords you entered were different. Please try again." msgstr "输入的口令不匹配，请重新输入。" -#: ../iw/account_gui.py:100 +#: ../iw/account_gui.py:103 msgid "The root password must be at least six characters long." msgstr "根口令最少应包含六个字符。" -#: ../iw/account_gui.py:107 ../textw/userauth_text.py:78 +#: ../iw/account_gui.py:110 ../textw/userauth_text.py:78 #, fuzzy msgid "Weak Password" msgstr "口令" -#: ../iw/account_gui.py:108 ../textw/userauth_text.py:79 +#: ../iw/account_gui.py:111 ../textw/userauth_text.py:79 #, fuzzy, python-format msgid "" "Weak password provided: %s\n" @@ -2815,7 +2834,7 @@ msgid "" "Would you like to continue with this password?" msgstr "是否要继续升级？" -#: ../iw/account_gui.py:120 ../textw/userauth_text.py:72 +#: ../iw/account_gui.py:123 ../textw/userauth_text.py:72 msgid "" "Requested password contains non-ASCII characters, which are not allowed." msgstr "所要求的口令包含非 ASCII 字符，它们不允许被用在口令中。" @@ -2842,11 +2861,11 @@ msgstr "您必须提供一个初始名。" msgid "Error with Data" msgstr "数据错误" -#: ../iw/autopart_type.py:401 ../textw/partition_text.py:1516 +#: ../iw/autopart_type.py:401 ../textw/partition_text.py:1517 msgid "Remove all partitions on selected drives and create default layout" msgstr "在选定磁盘上删除所有分区并创建默认分区结构" -#: ../iw/autopart_type.py:402 ../textw/partition_text.py:1517 +#: ../iw/autopart_type.py:402 ../textw/partition_text.py:1518 msgid "Remove Linux partitions on selected drives and create default layout" msgstr "在选定驱动上删除 linux 分区并创建默认的分区结构" @@ -2855,11 +2874,11 @@ msgstr "在选定驱动上删除 linux 分区并创建默认的分区结构" msgid "Resize existing partition and create default layout in free space" msgstr "在选定驱动上删除 linux 分区并创建默认的分区结构" -#: ../iw/autopart_type.py:404 ../textw/partition_text.py:1518 +#: ../iw/autopart_type.py:404 ../textw/partition_text.py:1519 msgid "Use free space on selected drives and create default layout" msgstr "使用选定驱动器中的空余空间并创建默认的分区结构" -#: ../iw/autopart_type.py:405 ../textw/partition_text.py:1519 +#: ../iw/autopart_type.py:405 ../textw/partition_text.py:1520 msgid "Create custom layout" msgstr "建立自定义的分区结构" @@ -2995,6 +3014,23 @@ msgstr "下列安装的系统将会被升级：" msgid "Unknown Linux system" msgstr "未知的 Linux 系统" +#: ../iw/GroupSelector.py:210 +#, fuzzy, python-format +msgid "Packages in %s" +msgstr "软件包" + +#: ../iw/GroupSelector.py:482 +#, fuzzy, python-format +msgid "%d of %d optional package selected" +msgid_plural "%d of %d optional packages selected" +msgstr[0] "没有可选的软件包" +msgstr[1] "没有可选的软件包" + +#: ../iw/GroupSelector.py:485 +#, python-format +msgid "%s" +msgstr "" + #: ../iw/language_gui.py:30 ../textw/language_text.py:44 msgid "Language Selection" msgstr "语言选择" @@ -3007,7 +3043,7 @@ msgstr "您在安装过程中想使用何种语言？" #: ../iw/lvm_dialog_gui.py:180 ../iw/lvm_dialog_gui.py:220 #: ../iw/lvm_dialog_gui.py:294 ../iw/lvm_dialog_gui.py:606 #: ../iw/lvm_dialog_gui.py:674 ../iw/lvm_dialog_gui.py:893 -#: ../textw/partition_text.py:1274 ../textw/partition_text.py:1293 +#: ../textw/partition_text.py:1275 ../textw/partition_text.py:1294 msgid "Not enough space" msgstr "空间不够" @@ -3088,7 +3124,7 @@ msgid "" "will be too small to hold the currently defined logical volumes." msgstr "您不能删除该物理卷，否则，该卷组就会小得不能容纳目前已定义的逻辑卷。" -#: ../iw/lvm_dialog_gui.py:375 ../textw/partition_text.py:1113 +#: ../iw/lvm_dialog_gui.py:375 ../textw/partition_text.py:1114 msgid "Make Logical Volume" msgstr "制作逻辑卷" @@ -3097,29 +3133,29 @@ msgstr "制作逻辑卷" msgid "Edit Logical Volume: %s" msgstr "编辑逻辑卷：%s" -#: ../iw/lvm_dialog_gui.py:380 ../textw/partition_text.py:1111 +#: ../iw/lvm_dialog_gui.py:380 ../textw/partition_text.py:1112 msgid "Edit Logical Volume" msgstr "编辑逻辑卷" #: ../iw/lvm_dialog_gui.py:393 ../iw/partition_dialog_gui.py:322 -#: ../iw/raid_dialog_gui.py:319 +#: ../iw/raid_dialog_gui.py:321 msgid "_Mount Point:" msgstr "挂载点(_M)：" -#: ../iw/lvm_dialog_gui.py:401 ../iw/raid_dialog_gui.py:332 +#: ../iw/lvm_dialog_gui.py:401 ../iw/raid_dialog_gui.py:334 msgid "_File System Type:" msgstr "文件系统类型(_F)：" -#: ../iw/lvm_dialog_gui.py:411 ../iw/raid_dialog_gui.py:342 +#: ../iw/lvm_dialog_gui.py:411 ../iw/raid_dialog_gui.py:344 msgid "Original File System Type:" msgstr "原始文件系统类型：" -#: ../iw/lvm_dialog_gui.py:416 ../iw/raid_dialog_gui.py:347 +#: ../iw/lvm_dialog_gui.py:416 ../iw/raid_dialog_gui.py:349 msgid "Unknown" msgstr "未知" #: ../iw/lvm_dialog_gui.py:422 ../iw/partition_dialog_gui.py:374 -#: ../iw/raid_dialog_gui.py:353 +#: ../iw/raid_dialog_gui.py:355 msgid "Original File System Label:" msgstr "原始文件系统标签：" @@ -3127,7 +3163,7 @@ msgstr "原始文件系统标签：" msgid "_Logical Volume Name:" msgstr "逻辑卷名称(_L)：" -#: ../iw/lvm_dialog_gui.py:439 ../textw/partition_text.py:304 +#: ../iw/lvm_dialog_gui.py:439 ../textw/partition_text.py:305 msgid "Logical Volume Name:" msgstr "逻辑卷名称：" @@ -3136,8 +3172,8 @@ msgid "_Size (MB):" msgstr "大小(MB)(_S)：" #: ../iw/lvm_dialog_gui.py:453 ../iw/partition_dialog_gui.py:403 -#: ../textw/partition_text.py:319 ../textw/partition_text.py:396 -#: ../textw/partition_text.py:479 ../textw/partition_text.py:587 +#: ../textw/partition_text.py:320 ../textw/partition_text.py:397 +#: ../textw/partition_text.py:480 ../textw/partition_text.py:588 msgid "Size (MB):" msgstr "大小(MB)：" @@ -3146,11 +3182,11 @@ msgstr "大小(MB)：" msgid "(Max size is %s MB)" msgstr "(最大大小是 %s MB)" -#: ../iw/lvm_dialog_gui.py:525 ../textw/partition_text.py:1263 +#: ../iw/lvm_dialog_gui.py:525 ../textw/partition_text.py:1264 msgid "Illegal size" msgstr "大小无效" -#: ../iw/lvm_dialog_gui.py:526 ../textw/partition_text.py:1264 +#: ../iw/lvm_dialog_gui.py:526 ../textw/partition_text.py:1265 msgid "The requested size as entered is not a valid number greater than 0." msgstr "您所申请的大小值不是一个大于0的有效数字。" @@ -3163,15 +3199,15 @@ msgstr "挂载点已被使用" msgid "The mount point \"%s\" is in use. Please pick another." msgstr "挂载点 \"%s\" 已被使用，请另选一个。" -#: ../iw/lvm_dialog_gui.py:573 ../textw/partition_text.py:1234 +#: ../iw/lvm_dialog_gui.py:573 ../textw/partition_text.py:1235 msgid "Illegal Logical Volume Name" msgstr "逻辑卷名称无效" -#: ../iw/lvm_dialog_gui.py:592 ../textw/partition_text.py:1251 +#: ../iw/lvm_dialog_gui.py:592 ../textw/partition_text.py:1252 msgid "Illegal logical volume name" msgstr "逻辑卷名称无效" -#: ../iw/lvm_dialog_gui.py:593 ../textw/partition_text.py:1252 +#: ../iw/lvm_dialog_gui.py:593 ../textw/partition_text.py:1253 #, python-format msgid "The logical volume name \"%s\" is already in use. Please pick another." msgstr "逻辑卷名 \"%s\" 已被使用，请另选一个。" @@ -3188,9 +3224,9 @@ msgstr "" #: ../iw/lvm_dialog_gui.py:651 ../iw/partition_dialog_gui.py:197 #: ../iw/partition_dialog_gui.py:209 ../iw/partition_dialog_gui.py:268 -#: ../iw/raid_dialog_gui.py:246 ../textw/partition_text.py:887 -#: ../textw/partition_text.py:908 ../textw/partition_text.py:1081 -#: ../textw/partition_text.py:1312 +#: ../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 msgid "Error With Request" msgstr "申请出错" @@ -3305,8 +3341,8 @@ msgid "Logical Volume Name" msgstr "逻辑卷名称" #: ../iw/lvm_dialog_gui.py:1097 ../iw/partition_gui.py:369 -#: ../iw/upgrade_swap_gui.py:140 ../textw/partition_text.py:1422 -#: ../textw/upgrade_text.py:112 +#: ../iw/upgrade_swap_gui.py:140 ../textw/partition_text.py:1423 +#: ../textw/upgrade_text.py:120 msgid "Mount Point" msgstr "挂载点" @@ -3391,7 +3427,7 @@ msgstr "%s字段需要输入值。" msgid "Dynamic IP" msgstr "动态 IP" -#: ../iw/netconfig_dialog.py:176 ../loader2/net.c:420 ../loader2/net.c:864 +#: ../iw/netconfig_dialog.py:176 ../loader2/net.c:416 ../loader2/net.c:860 #, c-format, python-format msgid "Sending request for IP information for %s..." msgstr "正在为 %s 发送 IP 信息请求..." @@ -3503,7 +3539,7 @@ msgstr "引导时激活" #: ../iw/network_gui.py:400 ../iw/osbootwidget.py:65 #: ../iw/partition_gui.py:367 ../textw/bootloader_text.py:196 #: ../textw/bootloader_text.py:262 ../textw/mouse_text.py:44 -#: ../textw/partition_text.py:1422 +#: ../textw/partition_text.py:1423 msgid "Device" msgstr "设备" @@ -3559,7 +3595,7 @@ msgstr "未知" msgid "Hardware address: " msgstr "硬件地址:" -#: ../iw/network_gui.py:778 ../textw/network_text.py:228 ../loader2/net.c:824 +#: ../iw/network_gui.py:778 ../textw/network_text.py:228 ../loader2/net.c:820 msgid "Missing Protocol" msgstr "缺少网络协议" @@ -3568,7 +3604,7 @@ 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 ../loader2/net.c:96 +#: ../textw/network_text.py:74 ../loader2/net.c:92 msgid "Invalid Prefix" msgstr "无效的前缀" @@ -3668,7 +3704,7 @@ msgstr "使用全部可用空间(_a)" msgid "The end cylinder must be greater than the start cylinder." msgstr "结束柱面必须大于起始柱面。" -#: ../iw/partition_dialog_gui.py:299 ../textw/partition_text.py:711 +#: ../iw/partition_dialog_gui.py:299 ../textw/partition_text.py:712 msgid "Add Partition" msgstr "添加分区" @@ -3686,7 +3722,7 @@ msgid "File System _Type:" msgstr "文件系统类型(_T)：" #: ../iw/partition_dialog_gui.py:334 ../iw/partition_ui_helpers_gui.py:300 -#: ../iw/raid_dialog_gui.py:327 +#: ../iw/raid_dialog_gui.py:329 #, fuzzy msgid "_Encrypt" msgstr "加密密钥" @@ -3721,15 +3757,15 @@ msgstr "Drive %s (Geom: %s/%s/%s) (Model: %s)" 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:1422 +#: ../iw/partition_gui.py:370 ../textw/partition_text.py:1423 msgid "Type" msgstr "类型" -#: ../iw/partition_gui.py:375 ../textw/partition_text.py:1422 +#: ../iw/partition_gui.py:375 ../textw/partition_text.py:1423 msgid "Start" msgstr "开始" -#: ../iw/partition_gui.py:376 ../textw/partition_text.py:1422 +#: ../iw/partition_gui.py:376 ../textw/partition_text.py:1423 msgid "End" msgstr "结束" @@ -3749,7 +3785,7 @@ msgstr "" "大小\n" "(MB)" -#: ../iw/partition_gui.py:547 ../textw/partition_text.py:1416 +#: ../iw/partition_gui.py:547 ../textw/partition_text.py:1417 msgid "Partitioning" msgstr "分区" @@ -3797,24 +3833,24 @@ msgid "RAID Devices" msgstr "RAID 设备" #: ../iw/partition_gui.py:794 ../iw/partition_gui.py:928 -#: ../textw/partition_text.py:113 ../textw/partition_text.py:177 +#: ../textw/partition_text.py:114 ../textw/partition_text.py:178 msgid "None" msgstr "无" -#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:290 +#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334 msgid "Hard Drives" msgstr "硬盘驱动器" -#: ../iw/partition_gui.py:889 ../textw/partition_text.py:159 -#: ../textw/partition_text.py:198 +#: ../iw/partition_gui.py:889 ../textw/partition_text.py:160 +#: ../textw/partition_text.py:199 msgid "Free space" msgstr "空闲空间" -#: ../iw/partition_gui.py:891 ../textw/partition_text.py:161 +#: ../iw/partition_gui.py:891 ../textw/partition_text.py:162 msgid "Extended" msgstr "扩展分区" -#: ../iw/partition_gui.py:893 ../textw/partition_text.py:163 +#: ../iw/partition_gui.py:893 ../textw/partition_text.py:164 msgid "software RAID" msgstr "软件 RAID" @@ -3822,7 +3858,7 @@ msgstr "软件 RAID" msgid "Free" msgstr "空闲" -#: ../iw/partition_gui.py:1024 ../textw/partition_text.py:246 +#: ../iw/partition_gui.py:1024 ../textw/partition_text.py:247 #, python-format msgid "Could not allocate requested partitions: %s." msgstr "无法拨发所申请分区：%s。" @@ -3933,9 +3969,9 @@ 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:269 -#: ../textw/partition_text.py:271 ../textw/partition_text.py:273 -#: ../textw/partition_text.py:298 +#: ../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 msgid "" msgstr "<不适用>" @@ -3979,7 +4015,7 @@ msgstr "用 Disk Druid 手工分区(_D)" msgid "Installing Packages" msgstr "安装软件包" -#: ../iw/raid_dialog_gui.py:286 +#: ../iw/raid_dialog_gui.py:288 msgid "" "At least two unused software RAID partitions are needed to create a RAID " "device.\n" @@ -3991,41 +4027,41 @@ msgstr "" "\n" "首先，至少创建两个类型为“软件 RAID”的分区，然后再选择“RAID”选项。" -#: ../iw/raid_dialog_gui.py:300 ../iw/raid_dialog_gui.py:733 -#: ../textw/partition_text.py:943 +#: ../iw/raid_dialog_gui.py:302 ../iw/raid_dialog_gui.py:735 +#: ../textw/partition_text.py:944 msgid "Make RAID Device" msgstr "创建 RAID 设备" -#: ../iw/raid_dialog_gui.py:303 +#: ../iw/raid_dialog_gui.py:305 #, python-format msgid "Edit RAID Device: /dev/md%s" msgstr "编辑 RAID 设备：/dev/md%s" -#: ../iw/raid_dialog_gui.py:305 ../textw/partition_text.py:941 +#: ../iw/raid_dialog_gui.py:307 ../textw/partition_text.py:942 msgid "Edit RAID Device" msgstr "编辑 RAID 设备" -#: ../iw/raid_dialog_gui.py:361 +#: ../iw/raid_dialog_gui.py:363 msgid "RAID _Device:" msgstr "RAID 设备(_D)：" -#: ../iw/raid_dialog_gui.py:379 +#: ../iw/raid_dialog_gui.py:381 msgid "RAID _Level:" msgstr "RAID 级别(_L)：" -#: ../iw/raid_dialog_gui.py:420 +#: ../iw/raid_dialog_gui.py:422 msgid "_RAID Members:" msgstr "RAID 成员(_R)：" -#: ../iw/raid_dialog_gui.py:437 +#: ../iw/raid_dialog_gui.py:439 msgid "Number of _spares:" msgstr "备件数量(_s)：" -#: ../iw/raid_dialog_gui.py:447 +#: ../iw/raid_dialog_gui.py:449 msgid "_Format partition?" msgstr "格式化分区吗(_F)？" -#: ../iw/raid_dialog_gui.py:534 +#: ../iw/raid_dialog_gui.py:536 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." @@ -4033,12 +4069,12 @@ msgstr "" "源驱动器上没有要克隆的分区。在它能被克隆前，您必须首先把该驱动器上的分区类型" "定义为“软件 RAID”。" -#: ../iw/raid_dialog_gui.py:538 ../iw/raid_dialog_gui.py:544 -#: ../iw/raid_dialog_gui.py:556 ../iw/raid_dialog_gui.py:569 +#: ../iw/raid_dialog_gui.py:540 ../iw/raid_dialog_gui.py:546 +#: ../iw/raid_dialog_gui.py:558 ../iw/raid_dialog_gui.py:571 msgid "Source Drive Error" msgstr "源驱动器错误" -#: ../iw/raid_dialog_gui.py:545 +#: ../iw/raid_dialog_gui.py:547 msgid "" "The source drive you selected has partitions which are not of type 'software " "RAID'.\n" @@ -4049,7 +4085,7 @@ msgstr "" "\n" "这些分区在该驱动器被克隆前必须被删除。" -#: ../iw/raid_dialog_gui.py:557 +#: ../iw/raid_dialog_gui.py:559 #, python-format msgid "" "The source drive you selected has partitions which are not constrained to " @@ -4062,7 +4098,7 @@ msgstr "" "\n" "这些分区在该驱动器被克隆前必须被删除或被限定于该驱动器之内。" -#: ../iw/raid_dialog_gui.py:570 +#: ../iw/raid_dialog_gui.py:572 msgid "" "The source drive you selected has software RAID partition(s) which are " "members of an active software RAID device.\n" @@ -4073,21 +4109,21 @@ msgstr "" "\n" "这些分区在该驱动器被克隆前必须被删除。" -#: ../iw/raid_dialog_gui.py:583 ../iw/raid_dialog_gui.py:589 -#: ../iw/raid_dialog_gui.py:608 +#: ../iw/raid_dialog_gui.py:585 ../iw/raid_dialog_gui.py:591 +#: ../iw/raid_dialog_gui.py:610 msgid "Target Drive Error" msgstr "目标驱动器错误" -#: ../iw/raid_dialog_gui.py:584 +#: ../iw/raid_dialog_gui.py:586 msgid "Please select the target drives for the clone operation." msgstr "请选择克隆操作的目标驱动器。" -#: ../iw/raid_dialog_gui.py:590 +#: ../iw/raid_dialog_gui.py:592 #, 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:609 +#: ../iw/raid_dialog_gui.py:611 #, python-format msgid "" "The target drive /dev/%s has a partition which cannot be removed for the " @@ -4103,11 +4139,11 @@ msgstr "" "\n" "该分区必须在驱动器成为目标之前被删除。" -#: ../iw/raid_dialog_gui.py:670 +#: ../iw/raid_dialog_gui.py:672 msgid "Please select a source drive." msgstr "请选择源驱动器。" -#: ../iw/raid_dialog_gui.py:690 +#: ../iw/raid_dialog_gui.py:692 #, python-format msgid "" "The drive /dev/%s will now be cloned to the following drives:\n" @@ -4116,7 +4152,7 @@ msgstr "" "驱动器 /dev/%s 现在将会被克隆到下列驱动器上：\n" "\n" -#: ../iw/raid_dialog_gui.py:695 +#: ../iw/raid_dialog_gui.py:697 msgid "" "\n" "\n" @@ -4126,19 +4162,19 @@ msgstr "" "\n" "警告！目标驱动器上的所有数据将会被破坏。" -#: ../iw/raid_dialog_gui.py:698 +#: ../iw/raid_dialog_gui.py:700 msgid "Final Warning" msgstr "最后警告" -#: ../iw/raid_dialog_gui.py:700 +#: ../iw/raid_dialog_gui.py:702 msgid "Clone Drives" msgstr "克隆驱动器" -#: ../iw/raid_dialog_gui.py:709 +#: ../iw/raid_dialog_gui.py:711 msgid "There was an error clearing the target drives. Cloning failed." msgstr "清除目标驱动器时出错。克隆失败。" -#: ../iw/raid_dialog_gui.py:743 +#: ../iw/raid_dialog_gui.py:745 msgid "" "Clone Drive Tool\n" "\n" @@ -4164,15 +4200,15 @@ msgstr "" "\n" "目标驱动器上的一切将会被该进程破坏。" -#: ../iw/raid_dialog_gui.py:763 +#: ../iw/raid_dialog_gui.py:765 msgid "Source Drive:" msgstr "源驱动器：" -#: ../iw/raid_dialog_gui.py:771 +#: ../iw/raid_dialog_gui.py:773 msgid "Target Drive(s):" msgstr "目标驱动器：" -#: ../iw/raid_dialog_gui.py:779 +#: ../iw/raid_dialog_gui.py:781 msgid "Drives" msgstr "驱动器" @@ -4304,13 +4340,12 @@ msgstr "您想怎么办？" msgid "Migrate File Systems" msgstr "迁移文件系统" -#: ../iw/upgrade_migratefs_gui.py:56 ../textw/upgrade_text.py:39 -#, python-format +#: ../iw/upgrade_migratefs_gui.py:62 ../textw/upgrade_text.py:39 +#, fuzzy, python-format msgid "" -"This release of %s supports the ext3 journaling file system, which has " -"several benefits over the ext2 file system traditionally shipped in %s. " -"This installation program can migrate the ext2 formatted partitions to ext3 " -"without data loss.\n" +"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 "" @@ -4323,7 +4358,7 @@ msgstr "" msgid "Upgrade Swap Partition" msgstr "升级交换分区" -#: ../iw/upgrade_swap_gui.py:93 ../textw/upgrade_text.py:95 +#: ../iw/upgrade_swap_gui.py:93 ../textw/upgrade_text.py:103 #, python-format msgid "" "Recent kernels (2.4 or newer) need significantly more swap than older " @@ -4353,7 +4388,7 @@ msgstr "我想创建一个交换文件(_w)" msgid "Select the _partition to put the swap file on:" msgstr "选择存放交换文件的分区(_p)：" -#: ../iw/upgrade_swap_gui.py:140 ../textw/upgrade_text.py:113 +#: ../iw/upgrade_swap_gui.py:140 ../textw/upgrade_text.py:121 msgid "Partition" msgstr "分区" @@ -4383,11 +4418,11 @@ msgid "" msgstr "" "强烈建议您创建一个交换文件，否则会导致安装程序非正常中止。您确定要继续么？" -#: ../iw/upgrade_swap_gui.py:201 ../textw/upgrade_text.py:179 +#: ../iw/upgrade_swap_gui.py:201 ../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:174 +#: ../iw/upgrade_swap_gui.py:208 ../textw/upgrade_text.py:182 msgid "" "There is not enough space on the device you selected for the swap partition." msgstr "您所选的交换分区在该设备上空间不够。" @@ -4517,11 +4552,6 @@ msgstr "引导标签不能空白。" msgid "Boot label contains illegal characters." msgstr "引导标签包含不合法字符。" -#: ../textw/bootloader_text.py:277 ../textw/constants_text.py:62 -#: ../textw/partition_text.py:1427 -msgid "Edit" -msgstr "编辑" - #: ../textw/bootloader_text.py:281 #, python-format msgid "" @@ -4694,12 +4724,12 @@ msgstr "前缀" msgid "Activate on boot" msgstr "引导时激活" -#: ../textw/network_text.py:149 ../loader2/net.c:734 +#: ../textw/network_text.py:149 ../loader2/net.c:730 #: tmp/netpostconfig.glade.h:9 msgid "Enable IPv4 support" msgstr "启动IPv4支持" -#: ../textw/network_text.py:156 ../loader2/net.c:747 +#: ../textw/network_text.py:156 ../loader2/net.c:743 #: tmp/netpostconfig.glade.h:10 msgid "Enable IPv6 support" msgstr "启动IPV6支持" @@ -4817,7 +4847,7 @@ msgstr "自动 IPv6" msgid "DHCPv6" msgstr "DHCPv6" -#: ../textw/network_text.py:678 ../loader2/net.c:1059 +#: ../textw/network_text.py:678 ../loader2/net.c:1055 msgid "Gateway:" msgstr "网关：" @@ -4876,261 +4906,261 @@ msgstr "无效主机名" msgid "You have not specified a hostname." msgstr "您还没有指定一个主机名。" -#: ../textw/partition_text.py:49 +#: ../textw/partition_text.py:50 msgid "Must specify a value" msgstr "必须指定一个值" -#: ../textw/partition_text.py:52 +#: ../textw/partition_text.py:53 msgid "Requested value is not an integer" msgstr "申请值不是整数" -#: ../textw/partition_text.py:54 +#: ../textw/partition_text.py:55 msgid "Requested value is too large" msgstr "申请值太大" -#: ../textw/partition_text.py:121 +#: ../textw/partition_text.py:122 #, python-format msgid "RAID Device %s" msgstr "RAID 设备 %s" -#: ../textw/partition_text.py:249 +#: ../textw/partition_text.py:250 #, python-format msgid "Warning: %s" msgstr "警告：%s" -#: ../textw/partition_text.py:250 +#: ../textw/partition_text.py:251 msgid "Modify Partition" msgstr "修改分区" -#: ../textw/partition_text.py:250 +#: ../textw/partition_text.py:251 msgid "Add anyway" msgstr "强行添加" -#: ../textw/partition_text.py:288 +#: ../textw/partition_text.py:289 msgid "Mount Point:" msgstr "挂载点：" -#: ../textw/partition_text.py:340 +#: ../textw/partition_text.py:341 msgid "File System type:" msgstr "文件系统类型：" -#: ../textw/partition_text.py:374 +#: ../textw/partition_text.py:375 msgid "Allowable Drives:" msgstr "允许的驱动器：" -#: ../textw/partition_text.py:430 +#: ../textw/partition_text.py:431 msgid "Fixed Size:" msgstr "固定大小：" -#: ../textw/partition_text.py:432 +#: ../textw/partition_text.py:433 msgid "Fill maximum size of (MB):" msgstr "使用全部空间(MB)：" -#: ../textw/partition_text.py:436 +#: ../textw/partition_text.py:437 msgid "Fill all available space:" msgstr "使用全部可用空间：" -#: ../textw/partition_text.py:459 +#: ../textw/partition_text.py:460 msgid "Start Cylinder:" msgstr "起始柱面：" -#: ../textw/partition_text.py:472 +#: ../textw/partition_text.py:473 msgid "End Cylinder:" msgstr "结束柱面：" -#: ../textw/partition_text.py:495 +#: ../textw/partition_text.py:496 msgid "Volume Group:" msgstr "卷组：" -#: ../textw/partition_text.py:517 +#: ../textw/partition_text.py:518 msgid "RAID Level:" msgstr "RAID 级别：" -#: ../textw/partition_text.py:535 +#: ../textw/partition_text.py:536 msgid "RAID Members:" msgstr "RAID 成员：" -#: ../textw/partition_text.py:554 +#: ../textw/partition_text.py:555 msgid "Number of spares?" msgstr "备件数量？" -#: ../textw/partition_text.py:568 +#: ../textw/partition_text.py:569 msgid "File System Type:" msgstr "文件系统类型：" -#: ../textw/partition_text.py:581 +#: ../textw/partition_text.py:582 msgid "File System Label:" msgstr "文件系统标签：" -#: ../textw/partition_text.py:592 +#: ../textw/partition_text.py:593 msgid "File System Option:" msgstr "文件系统选项：" -#: ../textw/partition_text.py:595 ../textw/partition_text.py:802 -#: ../textw/partition_text.py:1027 ../textw/partition_text.py:1197 +#: ../textw/partition_text.py:596 ../textw/partition_text.py:803 +#: ../textw/partition_text.py:1028 ../textw/partition_text.py:1198 #, python-format msgid "Format as %s" msgstr "格式化成 %s" -#: ../textw/partition_text.py:597 ../textw/partition_text.py:804 -#: ../textw/partition_text.py:1029 ../textw/partition_text.py:1199 +#: ../textw/partition_text.py:598 ../textw/partition_text.py:805 +#: ../textw/partition_text.py:1030 ../textw/partition_text.py:1200 #, python-format msgid "Migrate to %s" msgstr "迁移到 %s" -#: ../textw/partition_text.py:599 ../textw/partition_text.py:806 -#: ../textw/partition_text.py:1031 ../textw/partition_text.py:1201 +#: ../textw/partition_text.py:600 ../textw/partition_text.py:807 +#: ../textw/partition_text.py:1032 ../textw/partition_text.py:1202 msgid "Leave unchanged" msgstr "保持不变" -#: ../textw/partition_text.py:612 ../textw/partition_text.py:782 -#: ../textw/partition_text.py:1007 ../textw/partition_text.py:1177 +#: ../textw/partition_text.py:613 ../textw/partition_text.py:783 +#: ../textw/partition_text.py:1008 ../textw/partition_text.py:1178 msgid "File System Options" msgstr "文件系统选项" -#: ../textw/partition_text.py:615 +#: ../textw/partition_text.py:616 msgid "" "Please choose how you would like to prepare the file system on this " "partition." msgstr "请选择您想如何在该分区上筹备文件系统。" -#: ../textw/partition_text.py:622 +#: ../textw/partition_text.py:623 msgid "Leave unchanged (preserve data)" msgstr "保持不变（保留信息）" -#: ../textw/partition_text.py:631 +#: ../textw/partition_text.py:632 msgid "Format as:" msgstr "格式化成：" -#: ../textw/partition_text.py:651 +#: ../textw/partition_text.py:652 msgid "Migrate to:" msgstr "迁移到：" -#: ../textw/partition_text.py:752 +#: ../textw/partition_text.py:753 msgid "Force to be a primary partition" msgstr "强制为主分区" -#: ../textw/partition_text.py:761 +#: ../textw/partition_text.py:762 msgid "Not Supported" msgstr "不支持" -#: ../textw/partition_text.py:762 +#: ../textw/partition_text.py:763 msgid "You can only edit LVM Volume Groups in the graphical installer." msgstr "您只能在图形化安装程序中编辑LVM 卷组." -#: ../textw/partition_text.py:829 ../textw/partition_text.py:877 +#: ../textw/partition_text.py:830 ../textw/partition_text.py:878 msgid "Invalid Entry for Partition Size" msgstr "分区大小项目无效" -#: ../textw/partition_text.py:841 +#: ../textw/partition_text.py:842 msgid "Invalid Entry for Maximum Size" msgstr "最大值项目无效" -#: ../textw/partition_text.py:860 +#: ../textw/partition_text.py:861 msgid "Invalid Entry for Starting Cylinder" msgstr "起始柱面项目无效" -#: ../textw/partition_text.py:869 +#: ../textw/partition_text.py:870 msgid "Invalid Entry for End Cylinder" msgstr "结束柱面项目无效" -#: ../textw/partition_text.py:980 +#: ../textw/partition_text.py:981 msgid "No RAID partitions" msgstr "无 RAID 分区" -#: ../textw/partition_text.py:981 +#: ../textw/partition_text.py:982 msgid "At least two software RAID partitions are needed." msgstr "至少需要两个软件 RAID 分区。" -#: ../textw/partition_text.py:993 ../textw/partition_text.py:1164 +#: ../textw/partition_text.py:994 ../textw/partition_text.py:1165 msgid "Format partition?" msgstr "格式化分区？" -#: ../textw/partition_text.py:1055 +#: ../textw/partition_text.py:1056 msgid "Invalid Entry for RAID Spares" msgstr "RAID 备件项目无效" -#: ../textw/partition_text.py:1070 +#: ../textw/partition_text.py:1071 msgid "Too many spares" msgstr "剩余太多" -#: ../textw/partition_text.py:1071 +#: ../textw/partition_text.py:1072 msgid "You may not use any spares with a RAID0 array." msgstr "RAID0 阵列不能有任何多余。" -#: ../textw/partition_text.py:1150 +#: ../textw/partition_text.py:1151 msgid "No Volume Groups" msgstr "没有卷组" -#: ../textw/partition_text.py:1151 +#: ../textw/partition_text.py:1152 msgid "No volume groups exist in which to create a logical volume" msgstr "没有卷组可用于创建逻辑卷" -#: ../textw/partition_text.py:1275 +#: ../textw/partition_text.py:1276 #, 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:1294 +#: ../textw/partition_text.py:1295 #, 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:1347 +#: ../textw/partition_text.py:1348 msgid "New Partition or Logical Volume?" msgstr "是否新建分区或逻辑卷？" -#: ../textw/partition_text.py:1348 +#: ../textw/partition_text.py:1349 msgid "Would you like to create a new partition or a new logical volume?" msgstr "您是否要新建逻辑卷或新建分区？" -#: ../textw/partition_text.py:1350 +#: ../textw/partition_text.py:1351 msgid "partition" msgstr "分区" -#: ../textw/partition_text.py:1350 +#: ../textw/partition_text.py:1351 msgid "logical volume" msgstr "逻辑卷" -#: ../textw/partition_text.py:1422 +#: ../textw/partition_text.py:1423 msgid "Size" msgstr "大小" -#: ../textw/partition_text.py:1426 +#: ../textw/partition_text.py:1427 msgid "New" msgstr "新建" -#: ../textw/partition_text.py:1428 +#: ../textw/partition_text.py:1429 msgid "Delete" msgstr "删除" -#: ../textw/partition_text.py:1429 +#: ../textw/partition_text.py:1430 msgid "RAID" msgstr "RAID" -#: ../textw/partition_text.py:1432 +#: ../textw/partition_text.py:1433 msgid "" " F1-Help F2-New F3-Edit F4-Delete F5-Reset F12-OK " msgstr "" " F1-帮助 F2-新建 F3-编辑 F4-删除 F5-重设 F12-确定 " -#: ../textw/partition_text.py:1464 +#: ../textw/partition_text.py:1465 msgid "No Root Partition" msgstr "无根分区" -#: ../textw/partition_text.py:1465 +#: ../textw/partition_text.py:1466 msgid "Installation requires a / partition." msgstr "安装需要 a /分区." -#: ../textw/partition_text.py:1507 +#: ../textw/partition_text.py:1508 msgid "Partitioning Type" msgstr "分区类型" -#: ../textw/partition_text.py:1509 +#: ../textw/partition_text.py:1510 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 " @@ -5139,35 +5169,35 @@ msgstr "" "安装需要对您的硬盘进行分区。默认分区方案适合大多数用户。您可以选择默认的分" "区，也可以创建您自己的分区。" -#: ../textw/partition_text.py:1533 +#: ../textw/partition_text.py:1534 msgid "Which drive(s) do you want to use for this installation?" msgstr "本次安装，您想使用哪些驱动器？" -#: ../textw/partition_text.py:1548 +#: ../textw/partition_text.py:1549 msgid ",<+>,<-> selection | Add drive | next screen" msgstr ",<+>,<-> 选择 | 添加驱动器 | 下一屏幕" -#: ../textw/partition_text.py:1615 +#: ../textw/partition_text.py:1616 msgid "Review Partition Layout" msgstr "检验分区方案" -#: ../textw/partition_text.py:1616 +#: ../textw/partition_text.py:1617 msgid "Review and modify partitioning layout?" msgstr "检验和修改分区方案？" -#: ../textw/partition_text.py:1637 tmp/adddrive.glade.h:3 +#: ../textw/partition_text.py:1638 tmp/adddrive.glade.h:3 msgid "Advanced Storage Options" msgstr "高级存储选项" -#: ../textw/partition_text.py:1638 tmp/adddrive.glade.h:5 +#: ../textw/partition_text.py:1639 tmp/adddrive.glade.h:5 msgid "How would you like to modify your drive configuration?" msgstr "您想如何修改驱动配置？" -#: ../textw/partition_text.py:1661 +#: ../textw/partition_text.py:1662 msgid "Add FCP Device" msgstr "添加 FCP 设备" -#: ../textw/partition_text.py:1662 tmp/zfcp-config.glade.h:5 +#: ../textw/partition_text.py:1663 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 " @@ -5177,22 +5207,22 @@ msgstr "" "提供5个参数：一个16位设备号、一个16位 SCSI ID、一个64位全局端口名（WWPN）、一" "个16位 SCSI LUN 和一个64位 FCP LUN。" -#: ../textw/partition_text.py:1685 tmp/iscsi-config.glade.h:5 +#: ../textw/partition_text.py:1686 tmp/iscsi-config.glade.h:5 msgid "Configure iSCSI Parameters" msgstr "配置iSCSI参数" -#: ../textw/partition_text.py:1686 tmp/iscsi-config.glade.h:6 +#: ../textw/partition_text.py:1687 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:1687 +#: ../textw/partition_text.py:1688 msgid "Target IP Address" msgstr "目标 IP 地址" -#: ../textw/partition_text.py:1688 +#: ../textw/partition_text.py:1689 msgid "iSCSI Initiator Name" msgstr "iSCSI 启动器名称" @@ -5247,39 +5277,39 @@ msgstr "跳过引导装载程序的更新" msgid "Create new boot loader configuration" msgstr "创建新的引导装载程序配置" -#: ../textw/upgrade_text.py:113 +#: ../textw/upgrade_text.py:121 msgid "Free Space" msgstr "空闲空间" -#: ../textw/upgrade_text.py:128 +#: ../textw/upgrade_text.py:136 msgid "RAM detected (MB):" msgstr "检测到的内存(MB)：" -#: ../textw/upgrade_text.py:131 +#: ../textw/upgrade_text.py:139 msgid "Suggested size (MB):" msgstr "建议大小(MB)：" -#: ../textw/upgrade_text.py:134 +#: ../textw/upgrade_text.py:142 msgid "Swap file size (MB):" msgstr "交换文件大小(MB)：" -#: ../textw/upgrade_text.py:142 +#: ../textw/upgrade_text.py:150 msgid "Add Swap" msgstr "添加交换区" -#: ../textw/upgrade_text.py:167 +#: ../textw/upgrade_text.py:175 msgid "The value you entered is not a valid number." msgstr "您所输入的数值不是一个有效的数字。" -#: ../textw/upgrade_text.py:200 +#: ../textw/upgrade_text.py:208 msgid "Reinstall System" msgstr "重新安装系统" -#: ../textw/upgrade_text.py:214 +#: ../textw/upgrade_text.py:222 msgid "System to Upgrade" msgstr "要升级的系统" -#: ../textw/upgrade_text.py:215 +#: ../textw/upgrade_text.py:223 msgid "" "There seem to be one or more existing Linux installations on your system.\n" "\n" @@ -5427,7 +5457,7 @@ msgstr "检查介质" #: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:99 #: ../loader2/cdinstall.c:117 ../loader2/cdinstall.c:125 -#: ../loader2/method.c:424 +#: ../loader2/method.c:380 msgid "Test" msgstr "测试" @@ -5463,11 +5493,11 @@ msgid "" "and press %s to retry." msgstr "在您所有驱动器中均无法找到 %s 光盘。请插入 %s 光盘，然后按 %s 来重试。" -#: ../loader2/cdinstall.c:196 +#: ../loader2/cdinstall.c:200 msgid "Disc Found" msgstr "找到光盘" -#: ../loader2/cdinstall.c:197 +#: ../loader2/cdinstall.c:201 #, c-format msgid "" "To begin testing the media before installation press %s.\n" @@ -5478,29 +5508,29 @@ msgstr "" "\n" "选择 %s 跳过介质测试并开始安装。" -#: ../loader2/cdinstall.c:323 +#: ../loader2/cdinstall.c:339 #, 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 来重试。" -#: ../loader2/cdinstall.c:328 +#: ../loader2/cdinstall.c:344 #, 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 来重试。" -#: ../loader2/cdinstall.c:334 +#: ../loader2/cdinstall.c:350 msgid "Disc Not Found" msgstr "没找到光盘" -#: ../loader2/cdinstall.c:402 +#: ../loader2/cdinstall.c:422 msgid "Cannot find kickstart file on CDROM." msgstr "在光盘上找不到 kickstart 文件。" -#: ../loader2/copy.c:51 ../loader2/method.c:157 ../loader2/method.c:378 +#: ../loader2/copy.c:51 ../loader2/method.c:113 ../loader2/method.c:334 #, c-format msgid "Failed to read directory %s: %s" msgstr "读取目录 %s 失败：%s" @@ -5597,12 +5627,12 @@ msgid "Do you wish to load any more driver disks?" msgstr "您想载入更多驱动程序盘吗？" #: ../loader2/driverdisk.c:535 ../loader2/driverdisk.c:572 -#: ../loader2/hdinstall.c:426 ../loader2/kickstart.c:132 +#: ../loader2/hdinstall.c:470 ../loader2/kickstart.c:132 #: ../loader2/kickstart.c:142 ../loader2/kickstart.c:185 #: ../loader2/kickstart.c:529 ../loader2/modules.c:336 -#: ../loader2/modules.c:348 ../loader2/net.c:1653 ../loader2/net.c:1676 -#: ../loader2/nfsinstall.c:302 ../loader2/urlinstall.c:426 -#: ../loader2/urlinstall.c:435 ../loader2/urlinstall.c:444 +#: ../loader2/modules.c:348 ../loader2/net.c:1647 ../loader2/net.c:1670 +#: ../loader2/nfsinstall.c:320 ../loader2/urlinstall.c:465 +#: ../loader2/urlinstall.c:474 ../loader2/urlinstall.c:483 msgid "Kickstart Error" msgstr "Kickstart 错误" @@ -5662,37 +5692,37 @@ msgstr "指定可选模块参数" msgid "Select Device Driver to Load" msgstr "选择要载入的设备驱动程序" -#: ../loader2/hdinstall.c:76 ../loader2/nfsinstall.c:167 -#: ../loader2/nfsinstall.c:218 ../loader2/urlinstall.c:262 +#: ../loader2/hdinstall.c:80 ../loader2/nfsinstall.c:153 +#: ../loader2/urlinstall.c:298 msgid "Media Detected" msgstr "检测到介质" -#: ../loader2/hdinstall.c:77 ../loader2/nfsinstall.c:168 -#: ../loader2/nfsinstall.c:219 ../loader2/urlinstall.c:263 +#: ../loader2/hdinstall.c:81 ../loader2/nfsinstall.c:154 +#: ../loader2/urlinstall.c:299 msgid "Local installation media detected..." msgstr "检测到本地安装介质..." -#: ../loader2/hdinstall.c:129 ../loader2/nfsinstall.c:249 -#: ../loader2/urlinstall.c:163 +#: ../loader2/hdinstall.c:137 ../loader2/nfsinstall.c:271 +#: ../loader2/urlinstall.c:192 #, c-format msgid "" "The %s installation tree in that directory does not seem to match your boot " "media." msgstr "该目录中的 %s 安装树似乎和您的引导介质不符。" -#: ../loader2/hdinstall.c:187 +#: ../loader2/hdinstall.c:253 msgid "" "An error occured reading the install from the ISO images. Please check your " "ISO images and try again." msgstr "从 ISO 映像中读取安装时出错。请检查您的 ISO 映像后重试。" -#: ../loader2/hdinstall.c:291 +#: ../loader2/hdinstall.c:335 msgid "" "You don't seem to have any hard drives on your system! Would you like to " "configure additional devices?" msgstr "您的系统似乎未配备任何硬盘驱动器！是否要配置附加设备？" -#: ../loader2/hdinstall.c:305 +#: ../loader2/hdinstall.c:349 #, c-format msgid "" "What partition and directory on that partition hold the CD (iso9660) images " @@ -5702,29 +5732,29 @@ msgstr "" "哪一个分区以及分区上的哪一个目录下存有 %s 的光盘（iso9660）映像？如果您所用的" "磁盘驱动器在这里没有被列出，按 F2 键来配置附加的设备。" -#: ../loader2/hdinstall.c:328 +#: ../loader2/hdinstall.c:372 msgid "Directory holding images:" msgstr "包含映像的目录：" -#: ../loader2/hdinstall.c:356 +#: ../loader2/hdinstall.c:400 msgid "Select Partition" msgstr "选择分区" -#: ../loader2/hdinstall.c:395 +#: ../loader2/hdinstall.c:439 #, c-format msgid "Device %s does not appear to contain %s CDROM images." msgstr "设备 %s 似乎不包含 %s 光盘映像。" -#: ../loader2/hdinstall.c:427 +#: ../loader2/hdinstall.c:471 #, c-format msgid "Bad argument to HD kickstart method command %s: %s" msgstr "硬盘 kickstart 方法命令 %s 的参数不对：%s" -#: ../loader2/hdinstall.c:497 ../loader2/hdinstall.c:553 +#: ../loader2/hdinstall.c:541 ../loader2/hdinstall.c:597 msgid "Cannot find kickstart file on hard drive." msgstr "在硬盘驱动器上找不到 kickstart 文件。" -#: ../loader2/hdinstall.c:540 +#: ../loader2/hdinstall.c:584 #, c-format msgid "Cannot find hard drive for BIOS disk %s" msgstr "无法找到与 BIOS 对应的硬盘 %s" @@ -5831,19 +5861,19 @@ msgstr "在 /dev/%s 中插入更新盘，然后按“确定”来继续。" msgid "Updates Disk" msgstr "更新盘" -#: ../loader2/loader.c:445 +#: ../loader2/loader.c:446 msgid "Failed to mount updates disk" msgstr "挂载更新盘失败。" -#: ../loader2/loader.c:448 +#: ../loader2/loader.c:449 msgid "Updates" msgstr "更新" -#: ../loader2/loader.c:448 +#: ../loader2/loader.c:449 msgid "Reading anaconda updates..." msgstr "正在读取 anaconda 更新..." -#: ../loader2/loader.c:484 +#: ../loader2/loader.c:485 #, fuzzy msgid "" "Unable to download the updates image. Please modify the updates location " @@ -5852,45 +5882,45 @@ msgstr "" "无法下载kickstart文件。请使用交互式安装方法：修改下边的kickstart参数或者 点击" "Cancel。" -#: ../loader2/loader.c:493 +#: ../loader2/loader.c:494 #, fuzzy msgid "Error downloading updates image" msgstr "下载点击开始文件时出错" -#: ../loader2/loader.c:989 +#: ../loader2/loader.c:994 #, c-format msgid "You do not have enough RAM to install %s on this machine." msgstr "在本机上安装 %s 所需内存不够。" -#: ../loader2/loader.c:1146 +#: ../loader2/loader.c:1151 msgid "Rescue Method" msgstr "救援方法" -#: ../loader2/loader.c:1147 +#: ../loader2/loader.c:1152 msgid "Installation Method" msgstr "安装方法" -#: ../loader2/loader.c:1149 +#: ../loader2/loader.c:1154 msgid "What type of media contains the rescue image?" msgstr "哪一类介质包含救援映像？" -#: ../loader2/loader.c:1151 +#: ../loader2/loader.c:1156 msgid "What type of media contains the packages to be installed?" msgstr "哪一类介质包含要安装的软件包？" -#: ../loader2/loader.c:1175 +#: ../loader2/loader.c:1180 msgid "No driver found" msgstr "未找到任何驱动程序" -#: ../loader2/loader.c:1175 +#: ../loader2/loader.c:1180 msgid "Select driver" msgstr "选择驱动程序" -#: ../loader2/loader.c:1176 +#: ../loader2/loader.c:1181 msgid "Use a driver disk" msgstr "使用驱动程序盘" -#: ../loader2/loader.c:1177 +#: ../loader2/loader.c:1182 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?" @@ -5898,39 +5928,39 @@ msgstr "" "找不到这种安装类型所需的任何设备。您想手工选择驱动程序或使用一张驱动程序盘" "吗？" -#: ../loader2/loader.c:1410 +#: ../loader2/loader.c:1415 msgid "The following devices have been found on your system." msgstr "在系统中发现以下设备。" -#: ../loader2/loader.c:1412 +#: ../loader2/loader.c:1417 msgid "" "No device drivers have been loaded for your system. Would you like to load " "any now?" msgstr "没有为您的系统载入任何设备驱动程序。现在是否需要载入？" -#: ../loader2/loader.c:1416 +#: ../loader2/loader.c:1421 msgid "Devices" msgstr "设备" -#: ../loader2/loader.c:1417 +#: ../loader2/loader.c:1422 msgid "Done" msgstr "完成" -#: ../loader2/loader.c:1418 +#: ../loader2/loader.c:1423 msgid "Add Device" msgstr "添加设备" -#: ../loader2/loader.c:1576 +#: ../loader2/loader.c:1600 #, c-format msgid "loader has already been run. Starting shell.\n" msgstr "装载程序已经被运行。正在启动 shell。\n" -#: ../loader2/loader.c:1915 +#: ../loader2/loader.c:1946 #, fuzzy, c-format msgid "Running anaconda %s, the %s rescue mode - please wait...\n" msgstr "正在运行 anaconda，%s 救援模式 - 请稍候...\n" -#: ../loader2/loader.c:1917 +#: ../loader2/loader.c:1948 #, fuzzy, c-format msgid "Running anaconda %s, the %s system installer - please wait...\n" msgstr "正在运行 %s 的 anaconda 系统安装程序 - 请稍候...\n" @@ -5950,13 +5980,33 @@ msgstr "正在检查\"%s\"..." msgid "Checking media now..." msgstr "正在检查介质..." -#: ../loader2/mediacheck.c:101 +#: ../loader2/mediacheck.c:102 msgid "" "Unable to read the disc checksum from the primary volume descriptor. This " "probably means the disc was created without adding the checksum." msgstr "无法从主标签中读出磁盘校验和。这可能是因为创建磁盘时没有添加校验和。" -#: ../loader2/method.c:421 +#: ../loader2/mediacheck.c:109 +msgid "" +"The image which was just tested has errors. This could be due to a corrupt " +"download or a bad disc. If applicable, please clean the disc and try " +"again. If this test continues to fail you should not continue the install." +msgstr "" +"刚测试过的映像上有错误。这可能是由于下载文件或光盘介质被损坏。如果情况如此，" +"请清洁光盘后再试一次。如果测试仍旧失败，您就不应该继续安装。" + +#: ../loader2/mediacheck.c:117 +msgid "Success" +msgstr "" + +#: ../loader2/mediacheck.c:118 +msgid "" +"The image which was just tested was successfully verified. It should be OK " +"to install from this media. Note that not all media/drive errors can be " +"detected by the media check." +msgstr "" + +#: ../loader2/method.c:377 #, c-format msgid "" "Would you like to perform a checksum test of the ISO image:\n" @@ -5967,7 +6017,7 @@ msgstr "" "\n" " %s？" -#: ../loader2/method.c:424 +#: ../loader2/method.c:380 msgid "Checksum Test" msgstr "校验和测试" @@ -5981,20 +6031,13 @@ msgstr "设备 kickstart 方法命令 %s 的参数不对：%s" msgid "A module name must be specified for the kickstart device command." msgstr "模块的种类和名称都必须为点击开始设备命令指定." -#: ../loader2/net.c:57 -#, fuzzy, c-format -msgid "" -"Please enter the URL containing %s on your\n" -"server.\n" -msgstr "请输入版本%s的注册码" - -#: ../loader2/net.c:97 +#: ../loader2/net.c:93 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之间。" -#: ../loader2/net.c:270 +#: ../loader2/net.c:266 #, c-format msgid "" "%s is a wireless network adapter. Please provide the ESSID and encryption " @@ -6004,27 +6047,27 @@ msgstr "" "%s 是无线网络适配器。请提供进入您的无线网络所需的 ESSID 和加密钥匙。如果不需" "要钥匙，请把该字段留为空白，安装将会继续。" -#: ../loader2/net.c:276 +#: ../loader2/net.c:272 msgid "ESSID" msgstr "ESSID" -#: ../loader2/net.c:277 +#: ../loader2/net.c:273 msgid "Encryption Key" msgstr "加密密钥" -#: ../loader2/net.c:280 +#: ../loader2/net.c:276 msgid "Wireless Settings" msgstr "无线设置" -#: ../loader2/net.c:315 +#: ../loader2/net.c:311 msgid "Nameserver IP" msgstr "名称服务器(DNS) IP" -#: ../loader2/net.c:319 +#: ../loader2/net.c:315 msgid "Missing Nameserver" msgstr "缺失名称服务器" -#: ../loader2/net.c:320 +#: ../loader2/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 " @@ -6033,56 +6076,56 @@ msgstr "" "您的IP请求返回了IP配置信息,但该信息没有包括 DNS 名称服务器地址.您若不知道此信" "息,可将该字段留空,安装将继续." -#: ../loader2/net.c:342 +#: ../loader2/net.c:338 msgid "Invalid IP Information" msgstr "IP 信息无效" -#: ../loader2/net.c:343 +#: ../loader2/net.c:339 msgid "You entered an invalid IP address." msgstr "您输入的 IP 地址无效。" -#: ../loader2/net.c:593 ../loader2/net.c:699 +#: ../loader2/net.c:589 ../loader2/net.c:695 msgid "Network Error" msgstr "网络错误" -#: ../loader2/net.c:594 ../loader2/net.c:700 +#: ../loader2/net.c:590 ../loader2/net.c:696 msgid "There was an error configuring your network interface." msgstr "配置网络界面时出错。" -#: ../loader2/net.c:780 +#: ../loader2/net.c:776 msgid "Configure TCP/IP" msgstr "配置 TCP/IP" -#: ../loader2/net.c:825 +#: ../loader2/net.c:821 msgid "You must select at least one protocol (IPv4 or IPv6)." msgstr "您必须至少选择一项网络协议（IPv4或IPv6)。" -#: ../loader2/net.c:832 +#: ../loader2/net.c:828 msgid "IPv4 Needed for NFS" msgstr "NFS 需要 IPv4" -#: ../loader2/net.c:833 +#: ../loader2/net.c:829 msgid "NFS installation method requires IPv4 support." msgstr "NFS 安装需要 IPv4 的支持。" -#: ../loader2/net.c:954 +#: ../loader2/net.c:950 msgid "IPv4 address:" msgstr "IPv4 地址：" -#: ../loader2/net.c:966 ../loader2/net.c:1018 tmp/netconfig.glade.h:1 +#: ../loader2/net.c:962 ../loader2/net.c:1014 tmp/netconfig.glade.h:1 #: tmp/netpostconfig.glade.h:1 msgid "/" msgstr "/" -#: ../loader2/net.c:1006 +#: ../loader2/net.c:1002 msgid "IPv6 address:" msgstr "IPv6地址：" -#: ../loader2/net.c:1067 +#: ../loader2/net.c:1063 msgid "Name Server:" msgstr "域名服务器(DNS)：" -#: ../loader2/net.c:1103 +#: ../loader2/net.c:1099 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 " @@ -6092,42 +6135,42 @@ msgstr "" "掩码或CIDR形式的前缀是可接受的。网关和域名服务器域必须是有效的IPv4或IPv6的地" "址。" -#: ../loader2/net.c:1119 +#: ../loader2/net.c:1115 msgid "Manual TCP/IP Configuration" msgstr "手动配置TCP/IP" -#: ../loader2/net.c:1228 ../loader2/net.c:1234 +#: ../loader2/net.c:1224 ../loader2/net.c:1230 msgid "Missing Information" msgstr "缺少信息" -#: ../loader2/net.c:1229 +#: ../loader2/net.c:1225 msgid "" "You must enter both a valid IPv4 address and a network mask or CIDR prefix." msgstr "必须输入有效的 IPv4 地址和子网掩码或CIDR代码。" -#: ../loader2/net.c:1235 +#: ../loader2/net.c:1231 msgid "You must enter both a valid IPv6 address and a CIDR prefix." msgstr "您必须输入有效的 IPv6 地址和一个 CIDR 前缀。" -#: ../loader2/net.c:1557 +#: ../loader2/net.c:1552 msgid "Determining host name and domain..." msgstr "正在确定主机的名称和域..." -#: ../loader2/net.c:1654 +#: ../loader2/net.c:1648 #, c-format msgid "Bad argument to kickstart network command %s: %s" msgstr "kickstart 网络命令 %s 的参数不对：%s" -#: ../loader2/net.c:1677 +#: ../loader2/net.c:1671 #, c-format msgid "Bad bootproto %s specified in network command" msgstr "网络命令中指定的 bootproto %s 不对" -#: ../loader2/net.c:1865 +#: ../loader2/net.c:1859 msgid "Networking Device" msgstr "网络设备" -#: ../loader2/net.c:1866 +#: ../loader2/net.c:1860 msgid "" "You have multiple network devices on this system. Which would you like to " "install through?" @@ -6143,27 +6186,32 @@ msgid "%s directory:" msgstr "%s 目录：" #: ../loader2/nfsinstall.c:65 -msgid "NFS" -msgstr "NFS" +#, c-format +msgid "Please enter the server name and path to your %s images." +msgstr "" -#: ../loader2/nfsinstall.c:66 +#: ../loader2/nfsinstall.c:67 msgid "NFS Setup" msgstr "NFS 设置" -#: ../loader2/nfsinstall.c:140 +#: ../loader2/nfsinstall.c:139 msgid "Hostname specified with no DNS configured" msgstr "无需设置DNS指定主机名" -#: ../loader2/nfsinstall.c:198 ../loader2/nfsinstall.c:265 +#: ../loader2/nfsinstall.c:193 ../loader2/urls.c:222 +msgid "Retrieving" +msgstr "检索" + +#: ../loader2/nfsinstall.c:262 msgid "That directory could not be mounted from the server." msgstr "无法从服务器中挂载该目录。" -#: ../loader2/nfsinstall.c:253 +#: ../loader2/nfsinstall.c:275 #, c-format msgid "That directory does not seem to contain a %s installation tree." msgstr "该目录似乎不包含 %s 安装树。" -#: ../loader2/nfsinstall.c:303 +#: ../loader2/nfsinstall.c:321 #, c-format msgid "Bad argument to NFS kickstart method command %s: %s" msgstr "NFS kickstart 命令 %s 的参数不对：%s" @@ -6180,72 +6228,77 @@ msgstr "正在等待 telnet 连接..." msgid "Running anaconda via telnet..." msgstr "通过 telnet 运行 anaconda ..." -#: ../loader2/urlinstall.c:82 -#, c-format -msgid "Unable to retrieve %s://%s/%s/%s." +#: ../loader2/urlinstall.c:79 +#, fuzzy, c-format +msgid "Unable to retrieve %s://%s/%s." msgstr "无法获取 %s://%s/%s/%s." -#: ../loader2/urlinstall.c:155 +#: ../loader2/urlinstall.c:186 msgid "Unable to retrieve the install image." msgstr "无法获取安装映像。" -#: ../loader2/urlinstall.c:427 +#: ../loader2/urlinstall.c:466 #, c-format msgid "Bad argument to Url kickstart method command %s: %s" msgstr "URL kickstart 方法命令 %s 的参数不对：%s" -#: ../loader2/urlinstall.c:436 +#: ../loader2/urlinstall.c:475 msgid "Must supply a --url argument to Url kickstart method." msgstr "必须给 URL kickstart 方法提供一个 --url 参数。" -#: ../loader2/urlinstall.c:445 +#: ../loader2/urlinstall.c:484 #, c-format msgid "Unknown Url method %s" msgstr "未知 URL 方法 %s" -#: ../loader2/urls.c:237 -msgid "Retrieving" -msgstr "检索" +#: ../loader2/urls.c:280 +#, fuzzy, c-format +msgid "Please enter the URL containing the %s images on your server." +msgstr "请输入版本%s的注册码" -#: ../loader2/urls.c:306 +#: ../loader2/urls.c:291 #, fuzzy msgid "Configure proxy" msgstr "配置 TCP/IP" -#: ../loader2/urls.c:321 +#: ../loader2/urls.c:306 #, fuzzy msgid "URL Setup" msgstr "NFS 设置" -#: ../loader2/urls.c:329 +#: ../loader2/urls.c:314 #, fuzzy msgid "You must enter a URL." msgstr "您必须输入目录。" -#: ../loader2/urls.c:339 +#: ../loader2/urls.c:320 +msgid "URL must be either an ftp or http URL" +msgstr "" + +#: ../loader2/urls.c:331 msgid "Unknown Host" msgstr "未知主机" -#: ../loader2/urls.c:340 +#: ../loader2/urls.c:332 #, c-format msgid "%s is not a valid hostname." msgstr "%s 不是有效的主机名。" -#: ../loader2/urls.c:386 +#: ../loader2/urls.c:378 msgid "" "If you are using a HTTP proxy server enter the name of the HTTP proxy server " "to use." msgstr "如果要使用的是 HTTP 代理服务器，请输入要使用的 HTTP 代理服务器名称。" -#: ../loader2/urls.c:401 +#: ../loader2/urls.c:393 msgid "Proxy Name:" msgstr "" -#: ../loader2/urls.c:406 +#: ../loader2/urls.c:398 msgid "Proxy Port:" msgstr "" -#: ../loader2/urls.c:422 +#: ../loader2/urls.c:414 #, fuzzy msgid "Further Setup" msgstr "更多 FTP 设置" @@ -6448,6 +6501,42 @@ msgstr "" msgid "_Remote" msgstr "远程" +#: tmp/GroupSelector.glade.h:1 +msgid "" +"Some packages associated with this group are not required to be installed " +"but may provide additional functionality. Please choose the packages which " +"you would like to have installed." +msgstr "" + +#: tmp/GroupSelector.glade.h:2 +#, fuzzy +msgid "_Deselect" +msgstr "删除(_D)" + +#: tmp/GroupSelector.glade.h:3 +#, fuzzy +msgid "_Deselect all optional packages" +msgstr "安装软件包" + +#: tmp/GroupSelector.glade.h:4 +#, fuzzy +msgid "_Optional packages" +msgstr "没有可选的软件包" + +#: tmp/GroupSelector.glade.h:5 +#, fuzzy +msgid "_Select" +msgstr "删除(_D)" + +#: tmp/GroupSelector.glade.h:6 +#, fuzzy +msgid "_Select all optional packages" +msgstr "没有可选的软件包" + +#: tmp/GroupSelector.glade.h:7 +msgid "dialog1" +msgstr "" + #: tmp/instkey.glade.h:2 #, no-c-format msgid "%(instkey)s:" @@ -6848,6 +6937,9 @@ msgstr "威尔士语" msgid "Zulu" msgstr "祖鲁语" +#~ msgid "NFS" +#~ msgstr "NFS" + #~ msgid "Error pulling second part of kickstart config: %s!" #~ msgstr "读取 kickstart 配置文件的第二部分时出错：%s！" @@ -7160,15 +7252,6 @@ msgstr "祖鲁语" #~ msgid "FAILED" #~ msgstr "失败" -#~ msgid "" -#~ "The image which was just tested has errors. This could be due to a " -#~ "corrupt download or a bad disc. If applicable, please clean the disc and " -#~ "try again. If this test continues to fail you should not continue the " -#~ "install." -#~ msgstr "" -#~ "刚测试过的映像上有错误。这可能是由于下载文件或光盘介质被损坏。如果情况如" -#~ "此，请清洁光盘后再试一次。如果测试仍旧失败，您就不应该继续安装。" - #~ msgid "PASSED" #~ msgstr "通过" @@ -7325,9 +7408,6 @@ msgstr "祖鲁语" #~ msgid "Installing %s-%s-%s.%s (%s)" #~ msgstr "正在安装 %s-%s-%s.%s (%s)" -#~ msgid "Package" -#~ msgstr "软件包" - #~ msgid "Summary" #~ msgstr "摘要" -- cgit