diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 4442 |
1 files changed, 2420 insertions, 2022 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index d1d28f5b0..32a068b1b 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: 2007-07-02 15:15-0400\n" +"POT-Creation-Date: 2008-03-02 12:12-0500\n" "PO-Revision-Date: 2007-07-13 22:51+0800\n" "Last-Translator: zhangnan <znflint@126.com>\n" "Language-Team: <zh@li.org>\n" @@ -30,16 +30,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../anaconda:262 -msgid "Unknown Error" -msgstr "未知错误" +#: ../anaconda:289 +#, fuzzy, c-format +msgid "Error processing %%ksappend lines: %s" +msgstr "打开 kickstart 文件 %s 时出错：%s" -#: ../anaconda:265 +#: ../anaconda:292 #, c-format -msgid "Error pulling second part of kickstart config: %s!" -msgstr "读取 kickstart 配置文件的第二部分时出错：%s！" +msgid "Unknown error processing %%ksappend lines: %s" +msgstr "" -#: ../anaconda:279 ../cmdline.py:70 ../gui.py:960 ../text.py:403 +#: ../anaconda:306 ../cmdline.py:78 ../gui.py:1174 ../text.py:508 #, c-format, python-format msgid "" "The following error was found while parsing your kickstart configuration:\n" @@ -50,131 +51,122 @@ msgstr "" "\n" "%s" -#: ../anaconda:391 +#: ../anaconda:423 msgid "Press <enter> for a shell" msgstr "按<回车>键执行一个shell命令" -#: ../anaconda:406 ../gui.py:237 ../rescue.py:260 ../rescue.py:334 -#: ../rescue.py:361 ../rescue.py:371 ../rescue.py:450 ../rescue.py:456 -#: ../text.py:443 ../text.py:602 ../vnc.py:146 ../textw/confirm_text.py:26 -#: ../textw/confirm_text.py:54 ../textw/constants_text.py:36 -#: ../textw/network_text.py:39 ../textw/network_text.py:49 -#: ../textw/network_text.py:71 ../textw/network_text.py:77 -#: ../textw/network_text.py:225 ../textw/network_text.py:812 -#: ../textw/network_text.py:820 ../loader2/cdinstall.c:140 -#: ../loader2/cdinstall.c:141 ../loader2/cdinstall.c:258 -#: ../loader2/cdinstall.c:261 ../loader2/cdinstall.c:382 -#: ../loader2/cdinstall.c:387 ../loader2/cdinstall.c:392 -#: ../loader2/cdinstall.c:463 ../loader2/dirbrowser.c:139 -#: ../loader2/driverdisk.c:93 ../loader2/driverdisk.c:281 -#: ../loader2/driverdisk.c:312 ../loader2/driverdisk.c:346 -#: ../loader2/driverdisk.c:384 ../loader2/driverdisk.c:398 -#: ../loader2/driverdisk.c:412 ../loader2/driverdisk.c:422 -#: ../loader2/driverdisk.c:583 ../loader2/driverdisk.c:620 -#: ../loader2/driverselect.c:70 ../loader2/driverselect.c:205 -#: ../loader2/hdinstall.c:106 ../loader2/hdinstall.c:157 -#: ../loader2/hdinstall.c:319 ../loader2/hdinstall.c:369 -#: ../loader2/hdinstall.c:404 ../loader2/hdinstall.c:474 -#: ../loader2/hdinstall.c:517 ../loader2/hdinstall.c:530 ../loader2/kbd.c:131 -#: ../loader2/kickstart.c:127 ../loader2/kickstart.c:137 -#: ../loader2/kickstart.c:180 ../loader2/kickstart.c:279 -#: ../loader2/kickstart.c:366 ../loader2/kickstart.c:523 ../loader2/lang.c:106 -#: ../loader2/lang.c:369 ../loader2/loader.c:316 ../loader2/loader.c:342 -#: ../loader2/loader.c:355 ../loader2/loader.c:366 ../loader2/loader.c:852 -#: ../loader2/loader.c:1016 ../loader2/mediacheck.c:329 -#: ../loader2/mediacheck.c:387 ../loader2/mediacheck.c:432 -#: ../loader2/method.c:157 ../loader2/method.c:375 ../loader2/method.c:449 -#: ../loader2/modules.c:1036 ../loader2/modules.c:1049 ../loader2/net.c:272 -#: ../loader2/net.c:311 ../loader2/net.c:739 ../loader2/net.c:1064 -#: ../loader2/net.c:1597 ../loader2/net.c:1620 ../loader2/net.c:1806 -#: ../loader2/nfsinstall.c:57 ../loader2/nfsinstall.c:125 -#: ../loader2/nfsinstall.c:205 ../loader2/nfsinstall.c:213 -#: ../loader2/nfsinstall.c:251 ../loader2/telnetd.c:87 -#: ../loader2/urlinstall.c:68 ../loader2/urlinstall.c:91 -#: ../loader2/urlinstall.c:142 ../loader2/urlinstall.c:155 -#: ../loader2/urlinstall.c:464 ../loader2/urlinstall.c:473 -#: ../loader2/urlinstall.c:484 ../loader2/urls.c:282 ../loader2/urls.c:347 -#: ../loader2/urls.c:352 ../loader2/urls.c:358 ../loader2/urls.c:470 +#: ../anaconda:438 ../gui.py:235 ../rescue.py:271 ../rescue.py:339 +#: ../rescue.py:366 ../rescue.py:376 ../rescue.py:452 ../rescue.py:458 +#: ../text.py:536 ../text.py:698 ../textw/constants_text.py:42 +#: ../textw/network_text.py:44 ../textw/network_text.py:54 +#: ../textw/network_text.py:76 ../textw/network_text.py:82 +#: ../textw/network_text.py:230 ../textw/network_text.py:815 +#: ../textw/network_text.py:823 ../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/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/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 msgid "OK" msgstr "确定" -#: ../anaconda:413 +#: ../anaconda:445 msgid "" "You do not have enough RAM to use the graphical installer. Starting text " "mode." msgstr "您没有足够的内存来使用图形化安装程序。开始使用文本方式安装。" -#: ../anaconda:429 +#: ../anaconda:461 msgid "No video hardware found, assuming headless" msgstr "没有找到视频硬件，假定为无头机器" -#: ../anaconda:436 ../anaconda:897 +#: ../anaconda:468 ../anaconda:977 msgid "Unable to instantiate a X hardware state object." msgstr "无法实例化 X 硬件状态对象。" -#: ../anaconda:493 +#: ../anaconda:523 msgid "Starting graphical installation..." msgstr "正在启动图形化安装..." -#: ../anaconda:754 +#: ../anaconda:851 msgid "Install class forcing text mode installation" msgstr "安装类别强制使用文本模式安装" -#: ../anaconda:794 +#: ../anaconda:891 msgid "Graphical installation not available... Starting text mode." msgstr "没有可用的图形化安装... 开始文本方式安装。" -#: ../anaconda:802 +#: ../anaconda:899 msgid "DISPLAY variable not set. Starting text mode!" msgstr "DISPLAY 变量未设定，启动文本模式！" -#: ../anaconda:863 -msgid "Unknown install method" -msgstr "未知安装方法" - -#: ../anaconda:864 -msgid "You have specified an install method which isn't supported by anaconda." -msgstr "anaconda 安装程序不支持您指定的安装方法。" - -#: ../anaconda:866 -#, c-format -msgid "unknown install method: %s" -msgstr "未知安装方法: %s" - -#: ../autopart.py:955 +#: ../autopart.py:893 #, python-format msgid "" -"Could not allocate cylinder-based partitions as primary partitions.\n" +"Error resizing partition %s.\n" "\n" "%s" msgstr "" -"无法将基于柱面的区域划为主分区。\n" -"\n" -"%s" -#: ../autopart.py:960 +#: ../autopart.py:896 #, python-format -msgid "" -"Could not allocate partitions as primary partitions.\n" +msgid "Start of partition %s was moved when resizing" +msgstr "" + +#: ../autopart.py:988 +#, fuzzy +msgid "Could not allocate cylinder-based partitions as primary partitions.\n" +msgstr "" +"无法将基于柱面的区域划为主分区。\n" "\n" "%s" + +#: ../autopart.py:993 +#, fuzzy +msgid "Could not allocate partitions as primary partitions.\n" msgstr "" "无法将这些分区划为主分区。\n" "\n" "%s" -#: ../autopart.py:965 -#, python-format -msgid "" -"Could not allocate cylinder-based partitions.\n" -"\n" -"%s" +#: ../autopart.py:998 +#, fuzzy +msgid "Could not allocate cylinder-based partitions.\n" msgstr "" "无法化分基于柱面的分区。\n" "\n" "%s" -#: ../autopart.py:1025 +#: ../autopart.py:1063 #, python-format msgid "" "Boot partition %s doesn't belong to a BSD disk label. SRM won't be able to " @@ -184,7 +176,7 @@ msgstr "" "引导分区 %s 不属于 BSD 磁盘标签。SRM 无法从该分区引导。请使用一个属于 BSD 磁" "盘标签的分区或将该设备磁盘标为 BSD。" -#: ../autopart.py:1027 +#: ../autopart.py:1065 #, python-format msgid "" "Boot partition %s doesn't belong to a disk with enough free space at its " @@ -194,37 +186,37 @@ msgstr "" "引导分区 %s 所属磁盘在前端没有足够的空间来容纳引导装载程序。请确定在磁盘起始" "处至少有 5MB 空闲空间来容纳 /boot" -#: ../autopart.py:1029 +#: ../autopart.py:1067 #, 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:1031 +#: ../autopart.py:1069 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:1038 +#: ../autopart.py:1076 #, python-format msgid "" "Boot partition %s may not meet booting constraints for your architecture." msgstr "引导分区 %s 可能没有满足您的体系的引导制约参数。" -#: ../autopart.py:1064 +#: ../autopart.py:1102 #, python-format msgid "" "Adding this partition would not leave enough disk space for already " "allocated logical volumes in %s." msgstr "若添加该分区，已分配在 %s 的逻辑卷将没有足够的磁盘空间。" -#: ../autopart.py:1259 +#: ../autopart.py:1299 msgid "Requested Partition Does Not Exist" msgstr "所申请的分区不存在" -#: ../autopart.py:1260 +#: ../autopart.py:1300 #, python-format msgid "" "Unable to locate partition %s to use for %s.\n" @@ -235,11 +227,11 @@ msgstr "" "\n" "按确定来退出安装." -#: ../autopart.py:1287 +#: ../autopart.py:1325 msgid "Requested Raid Device Does Not Exist" msgstr "所申请的 RAID 设备不存在" -#: ../autopart.py:1288 +#: ../autopart.py:1326 #, python-format msgid "" "Unable to locate raid device %s to use for %s.\n" @@ -250,11 +242,11 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1319 +#: ../autopart.py:1355 msgid "Requested Volume Group Does Not Exist" msgstr "所申请的卷组不存在" -#: ../autopart.py:1320 +#: ../autopart.py:1356 #, python-format msgid "" "Unable to locate volume group %s to use for %s.\n" @@ -265,11 +257,11 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1357 +#: ../autopart.py:1393 msgid "Requested Logical Volume Does Not Exist" msgstr "所申请的逻辑卷不存在" -#: ../autopart.py:1358 +#: ../autopart.py:1394 #, python-format msgid "" "Unable to locate logical volume %s to use for %s.\n" @@ -280,11 +272,11 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1484 ../autopart.py:1531 +#: ../autopart.py:1529 ../autopart.py:1576 msgid "Automatic Partitioning Errors" msgstr "自动分区错误" -#: ../autopart.py:1485 +#: ../autopart.py:1530 #, python-format msgid "" "The following errors occurred with your partitioning:\n" @@ -299,11 +291,11 @@ msgstr "" "\n" "请按确定退出安装." -#: ../autopart.py:1495 +#: ../autopart.py:1540 msgid "Warnings During Automatic Partitioning" msgstr "进行自动分区时出现警告" -#: ../autopart.py:1496 +#: ../autopart.py:1541 #, python-format msgid "" "Following warnings occurred during automatic partitioning:\n" @@ -314,7 +306,7 @@ msgstr "" "\n" "%s" -#: ../autopart.py:1510 ../autopart.py:1527 +#: ../autopart.py:1555 ../autopart.py:1572 msgid "" "\n" "\n" @@ -324,12 +316,12 @@ msgstr "" "\n" "按确定退出安装." -#: ../autopart.py:1511 ../iw/partition_gui.py:997 -#: ../textw/partition_text.py:239 +#: ../autopart.py:1556 ../iw/partition_gui.py:1023 +#: ../textw/partition_text.py:245 msgid "Error Partitioning" msgstr "分区出错" -#: ../autopart.py:1512 +#: ../autopart.py:1557 #, python-format msgid "" "Could not allocate requested partitions: \n" @@ -340,7 +332,7 @@ msgstr "" "\n" "%s.%s" -#: ../autopart.py:1529 +#: ../autopart.py:1574 msgid "" "\n" "\n" @@ -350,7 +342,7 @@ msgstr "" "\n" "点“确定”，选择不同的分区选项" -#: ../autopart.py:1532 +#: ../autopart.py:1577 #, python-format msgid "" "The following errors occurred with your partitioning:\n" @@ -366,27 +358,15 @@ msgstr "" "\n" "这些错误在安装所需的硬盘驱动器空间不够时会发生.%s" -#: ../autopart.py:1543 +#: ../autopart.py:1588 msgid "Unrecoverable Error" msgstr "无法恢复的错误" -#: ../autopart.py:1544 +#: ../autopart.py:1589 msgid "Your system will now be rebooted." msgstr "您的系统现在将会被重新引导。" -#: ../autopart.py:1691 ../bootloader.py:197 ../image.py:442 -#: ../partedUtils.py:304 ../partedUtils.py:334 ../partedUtils.py:1075 -#: ../partedUtils.py:1124 ../partedUtils.py:1167 ../upgrade.py:348 -#: ../yuminstall.py:1205 ../iw/blpasswidget.py:145 -#: ../iw/bootloader_advanced_gui.py:41 ../iw/task_gui.py:89 -#: ../iw/upgrade_swap_gui.py:188 ../iw/upgrade_swap_gui.py:196 -#: ../iw/upgrade_swap_gui.py:203 ../textw/bootloader_text.py:123 -#: ../textw/bootloader_text.py:448 ../textw/partition_text.py:243 -#: ../textw/upgrade_text.py:172 ../loader2/loader.c:411 -msgid "Warning" -msgstr "警告" - -#: ../autopart.py:1697 +#: ../autopart.py:1706 msgid "" "Automatic Partitioning sets partitions based on the selected installation " "type. You also can customize the partitions once they have been created.\n" @@ -400,169 +380,201 @@ msgstr "" "Disk Druid 是手工分区的工具。它允许您在交互的环境中建立分区。您可以用它来设置" "文件系统类型、挂载点、分区大小等。" -#: ../autopart.py:1708 +#: ../autopart.py:1717 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:1713 +#: ../autopart.py:1722 msgid "Remove all partitions on this system" msgstr "删除系统内的所有分区" -#: ../autopart.py:1714 +#: ../autopart.py:1723 msgid "Remove all Linux partitions on this system" msgstr "删除系统内所有的 Linux 分区" -#: ../autopart.py:1715 +#: ../autopart.py:1724 msgid "Keep all partitions and use existing free space" msgstr "保存所有分区，使用现有的空闲空间" -#: ../autopart.py:1717 -#, python-format -msgid "" -"You have chosen to remove all partitions (ALL DATA) on the following drives:%" -"s\n" -"Are you sure you want to do this?" -msgstr "" -"您已选择了要在下列驱动器内删除所有分区（及其所有数据）：%s\n" -"是否确定要执行该项操作？" - -#: ../autopart.py:1721 -#, python-format -msgid "" -"You have chosen to remove all Linux partitions (and ALL DATA on them) on the " -"following drives:%s\n" -"Are you sure you want to do this?" -msgstr "" -"您已选择了要在下列驱动器内删除所有 Linux 分区（及其所有数据）：%s\n" -"是否确定要执行该项操作？" - -#: ../backend.py:113 +#: ../backend.py:126 #, python-format msgid "Upgrading %s\n" msgstr "升级 %s\n" -#: ../backend.py:115 +#: ../backend.py:128 #, python-format msgid "Installing %s\n" msgstr "安装 %s\n" -#: ../bootloader.py:129 +#: ../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 +#: ../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 +msgid "Warning" +msgstr "警告" + +#: ../bootloader.py:45 +#, fuzzy +msgid "" +"Your filesystems have already been activated. You cannot go back past this " +"point.\n" +"\n" +"Would you like to continue with the installation?" +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 +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 +#: ../iw/partition_gui.py:1037 +msgid "_Continue" +msgstr "继续(_C)" + +#: ../bootloader.py:147 msgid "Bootloader" msgstr "引导装载程序" -#: ../bootloader.py:129 +#: ../bootloader.py:147 msgid "Installing bootloader..." msgstr "正在安装引导装载程序..." -#: ../bootloader.py:198 +#: ../bootloader.py:217 msgid "" "No kernel packages were installed on your system. Your boot loader " "configuration will not be changed." msgstr "您的系统上没有安装任何内核软件包。引导装载程序的配置不变。" -#: ../cmdline.py:45 +#: ../cmdline.py:53 msgid "Completed" msgstr "已完成" -#: ../cmdline.py:53 +#: ../cmdline.py:61 msgid "In progress... " msgstr "进程中..." -#: ../cmdline.py:82 +#: ../cmdline.py:90 msgid "Can't have a question in command line mode!" msgstr "无法在命令行模式中提问！" -#: ../cmdline.py:101 +#: ../cmdline.py:109 msgid "Parted exceptions can't be handled in command line mode!" msgstr "命令行模式中无法处理分开例外！" -#: ../constants.py:65 -#, python-format +#: ../constants.py:75 +#, fuzzy msgid "" "An unhandled exception has occurred. This is most likely a bug. Please " -"save a copy of the detailed exception and file a bug report against anaconda " -"at %s" +"save a copy of the detailed exception and file a bug report" msgstr "" "出现了一个无法处理的例外。这极可能是一个程序错误。请将此例外的完整原文复制下" "来，然后向 %s 提交一份详细的安装程序错误报告。" -#: ../exception.py:412 ../exception.py:429 +#: ../constants.py:81 +msgid " with the provider of this software." +msgstr "" + +#: ../constants.py:85 +#, fuzzy, python-format +msgid " against anaconda at %s" +msgstr "正在读取 anaconda 更新..." + +#: ../exception.py:344 ../exception.py:360 msgid "Dump Written" msgstr "已写完转储信息" -#: ../exception.py:413 +#: ../exception.py:345 +#, fuzzy msgid "" -"Your system's state has been successfully written to the floppy. The " -"installer will now exit." +"Your system's state has been successfully written to the disk. The installer " +"will now exit." msgstr "您的系统状态已被成功地写入软盘,将退出安装." -#: ../exception.py:416 ../exception.py:433 ../fsset.py:1457 ../fsset.py:1742 -#: ../fsset.py:2440 ../fsset.py:2447 ../gui.py:965 ../gui.py:1114 -#: ../image.py:452 ../livecd.py:356 ../upgrade.py:59 ../yuminstall.py:1051 -msgid "_Exit installer" -msgstr "(_E)退出安装程序" - -#: ../exception.py:421 ../exception.py:438 +#: ../exception.py:351 ../exception.py:367 msgid "Dump Not Written" msgstr "未写完转储信息" -#: ../exception.py:422 -msgid "There was a problem writing the system state to the floppy." +#: ../exception.py:352 +#, fuzzy +msgid "There was a problem writing the system state to the disk." msgstr "将系统状态写入软盘时出现问题。" -#: ../exception.py:430 +#: ../exception.py:361 msgid "" "Your system's state has been successfully written to the remote host. The " "installer will now exit." msgstr "您的系统状态已被成功地写入远程主机。将退出安装." -#: ../exception.py:439 +#: ../exception.py:368 msgid "There was a problem writing the system state to the remote host." msgstr "将系统状态存入远程主机时出现问题。" -#: ../fsset.py:216 -msgid "Checking for Bad Blocks" -msgstr "检查磁盘坏块" +#: ../fsset.py:533 +#, fuzzy +msgid "Checking" +msgstr "正在检查\"%s\"..." -#: ../fsset.py:217 -#, python-format -msgid "Checking for bad blocks on /dev/%s..." +#: ../fsset.py:534 +#, fuzzy, python-format +msgid "Checking filesystem on %s..." msgstr "正在检查 /dev/%s 上的磁盘坏块..." -#: ../fsset.py:663 ../fsset.py:1427 ../fsset.py:1458 ../fsset.py:1518 -#: ../fsset.py:1529 ../fsset.py:1583 ../fsset.py:1594 ../fsset.py:1634 -#: ../fsset.py:1684 ../fsset.py:1765 ../fsset.py:1777 ../image.py:135 -#: ../image.py:180 ../image.py:311 ../livecd.py:350 ../partIntfHelpers.py:406 -#: ../urlinstall.py:112 ../urlinstall.py:206 ../yuminstall.py:442 -#: ../yuminstall.py:762 ../yuminstall.py:802 ../yuminstall.py:1019 -#: ../yuminstall.py:1044 ../iw/autopart_type.py:74 ../iw/autopart_type.py:209 -#: ../iw/netconfig_dialog.py:267 ../iw/osbootwidget.py:216 -#: ../iw/osbootwidget.py:225 ../iw/raid_dialog_gui.py:618 -#: ../iw/raid_dialog_gui.py:657 ../iw/task_gui.py:79 ../iw/task_gui.py:145 -#: ../textw/grpselect_text.py:116 ../textw/partition_text.py:1692 -#: ../textw/partition_text.py:1698 ../textw/partition_text.py:1720 -#: ../textw/upgrade_text.py:160 ../textw/upgrade_text.py:167 -#: ../loader2/cdinstall.c:141 ../loader2/cdinstall.c:463 -#: ../loader2/driverdisk.c:93 ../loader2/driverdisk.c:346 -#: ../loader2/driverdisk.c:384 ../loader2/driverdisk.c:412 -#: ../loader2/driverdisk.c:422 ../loader2/driverdisk.c:486 -#: ../loader2/hdinstall.c:106 ../loader2/hdinstall.c:157 -#: ../loader2/hdinstall.c:369 ../loader2/hdinstall.c:474 -#: ../loader2/hdinstall.c:517 ../loader2/hdinstall.c:530 -#: ../loader2/kickstart.c:279 ../loader2/lang.c:106 ../loader2/loader.c:316 -#: ../loader2/loader.c:366 ../loader2/loader.c:852 ../loader2/mediacheck.c:329 -#: ../loader2/mediacheck.c:387 ../loader2/method.c:157 ../loader2/method.c:375 -#: ../loader2/method.c:449 ../loader2/nfsinstall.c:125 -#: ../loader2/nfsinstall.c:205 ../loader2/nfsinstall.c:213 -#: ../loader2/telnetd.c:87 ../loader2/urlinstall.c:68 -#: ../loader2/urlinstall.c:91 ../loader2/urlinstall.c:142 -#: ../loader2/urlinstall.c:155 ../loader2/urls.c:347 ../loader2/urls.c:352 +#: ../fsset.py:544 ../fsset.py:977 +#, fuzzy +msgid "Resizing" +msgstr "检索" + +#: ../fsset.py:545 ../fsset.py:978 +#, 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 +#: ../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 +#: ../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/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 msgid "Error" msgstr "错误" -#: ../fsset.py:664 +#: ../fsset.py:688 #, python-format msgid "" "An error occurred migrating %s to ext3. It is possible to continue without " @@ -575,27 +587,27 @@ msgstr "" "\n" "您想不迁移 %s 而继续吗？" -#: ../fsset.py:1334 +#: ../fsset.py:1502 msgid "RAID Device" msgstr "RAID 设备" -#: ../fsset.py:1338 ../fsset.py:1344 +#: ../fsset.py:1506 ../fsset.py:1512 msgid "Apple Bootstrap" msgstr "Apple 自展程序" -#: ../fsset.py:1349 ../partitions.py:900 +#: ../fsset.py:1517 ../partitions.py:1130 msgid "PPC PReP Boot" msgstr "PPC PReP 引导" -#: ../fsset.py:1352 +#: ../fsset.py:1520 msgid "First sector of boot partition" msgstr "引导分区的第一个扇区" -#: ../fsset.py:1353 +#: ../fsset.py:1521 msgid "Master Boot Record (MBR)" msgstr "主引导记录（MBR）" -#: ../fsset.py:1428 +#: ../fsset.py:1646 #, python-format msgid "" "An error occurred trying to initialize swap on device %s. This problem is " @@ -607,13 +619,13 @@ msgstr "" "\n" "请按 <Enter> 键退出安装." -#: ../fsset.py:1457 ../packages.py:282 ../rescue.py:300 ../rescue.py:302 -#: ../textw/upgrade_text.py:118 ../loader2/cdinstall.c:258 -#: ../loader2/cdinstall.c:261 ../loader2/method.c:422 +#: ../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 msgid "Skip" msgstr "跳过" -#: ../fsset.py:1478 +#: ../fsset.py:1696 #, python-format msgid "" "The swap device:\n" @@ -631,11 +643,11 @@ msgstr "" "是 0 版本的 Linux 交换分区。如果您想使用此设备，您必须用 1 版本的Linux 交换分" "区进行格式化。如果跳过，安装将在安装过程中忽略它。" -#: ../fsset.py:1485 +#: ../fsset.py:1703 msgid "Reformat" msgstr "重新格式化" -#: ../fsset.py:1489 +#: ../fsset.py:1707 #, python-format msgid "" "The swap device:\n" @@ -653,7 +665,7 @@ msgstr "" "在 /etc/fstab 文件中的当前状态是睡眠状态。如果要进行升级，请关闭您的系统，而" "不是使系统进入睡眠状态。" -#: ../fsset.py:1497 +#: ../fsset.py:1715 #, python-format msgid "" "The swap device:\n" @@ -671,7 +683,7 @@ msgstr "" "在 /etc/fstab 中文件用作软件延缓分区.如果要进行全新的安装,请确认安装程序被设" "置为格式化所有交换分区." -#: ../fsset.py:1507 +#: ../fsset.py:1725 msgid "" "\n" "\n" @@ -683,19 +695,34 @@ msgstr "" "如果您想在升级过程中忽略这个分区,请选择跳过.选择格式化将使这个分区被重新格式" "化为交换分区." -#: ../fsset.py:1512 ../iw/partition_gui.py:368 +#: ../fsset.py:1730 ../iw/partition_gui.py:373 msgid "Format" msgstr "格式化" -#: ../fsset.py:1519 -#, python-format +#: ../fsset.py:1736 +#, fuzzy, python-format +msgid "" +"Error enabling swap device %s: %s\n" +"\n" +"Devices in /etc/fstab should be specified by label, not by device name.\n" +"\n" +"Press OK to exit the installer." +msgstr "" +"将 %s 设备挂载成 %s 时出错:%s\n" +"\n" +"/etc/fstab 的设备应由标签而非设备名指定.\n" +"\n" +"请按确定退出安装." + +#: ../fsset.py:1741 +#, fuzzy, python-format msgid "" "Error enabling swap device %s: %s\n" "\n" "The /etc/fstab on your upgrade partition does not reference a valid swap " "partition.\n" "\n" -"Press OK to exit the installer." +"Press OK to exit the installer" msgstr "" "启用交换分区设备 %s 时出错：%s\n" "\n" @@ -703,7 +730,7 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:1530 +#: ../fsset.py:1747 #, python-format msgid "" "Error enabling swap device %s: %s\n" @@ -718,31 +745,7 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:1584 -#, python-format -msgid "" -"Bad blocks have been detected on device /dev/%s. We do not recommend you use " -"this device.\n" -"\n" -"Press <Enter> to exit the installer." -msgstr "" -"在设备 /dev/%s 上检测到坏块.我们不推荐您使用该设备.\n" -"\n" -"请按 <Enter> 退出安装." - -#: ../fsset.py:1595 -#, python-format -msgid "" -"An error occurred searching for bad blocks on %s. This problem is serious, " -"and the install cannot continue.\n" -"\n" -"Press <Enter> to exit the installer." -msgstr "" -"在 %s 上搜寻坏块时出错.问题严重,安装无法继续.\n" -"\n" -"请按 <Enter> 退出安装." - -#: ../fsset.py:1635 +#: ../fsset.py:1821 #, python-format msgid "" "An error occurred trying to format %s. This problem is serious, and the " @@ -754,7 +757,7 @@ msgstr "" "\n" "请按 <Enter> 退出安装." -#: ../fsset.py:1685 +#: ../fsset.py:1871 #, python-format msgid "" "An error occurred trying to migrate %s. This problem is serious, and the " @@ -766,11 +769,11 @@ msgstr "" "\n" "请按 <Enter> 键退出安装." -#: ../fsset.py:1711 ../fsset.py:1720 +#: ../fsset.py:1897 ../fsset.py:1906 msgid "Invalid mount point" msgstr "挂载点无效" -#: ../fsset.py:1712 +#: ../fsset.py:1898 #, python-format msgid "" "An error occurred when trying to create %s. Some element of this path is " @@ -782,7 +785,7 @@ msgstr "" "\n" "请按 <Enter> 退出安装." -#: ../fsset.py:1721 +#: ../fsset.py:1907 #, python-format msgid "" "An error occurred when trying to create %s: %s. This is a fatal error and " @@ -794,24 +797,18 @@ msgstr "" "\n" "请按 <Enter>退出安装." -#: ../fsset.py:1734 +#: ../fsset.py:1921 msgid "Unable to mount filesystem" msgstr "无法载入文件系统！" -#: ../fsset.py:1735 +#: ../fsset.py:1922 #, 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:1743 ../image.py:93 ../image.py:453 ../kickstart.py:1008 -#: ../kickstart.py:1046 ../partedUtils.py:1179 ../upgrade.py:59 -#: ../yuminstall.py:754 ../iw/partition_gui.py:1011 -msgid "_Continue" -msgstr "继续(_C)" - -#: ../fsset.py:1751 +#: ../fsset.py:1938 #, python-format msgid "" "Error mounting device %s as %s: %s\n" @@ -826,7 +823,7 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:1758 +#: ../fsset.py:1945 #, python-format msgid "" "Error mounting device %s as %s: %s\n" @@ -841,7 +838,7 @@ msgstr "" "\n" "请按确定退出安装。" -#: ../fsset.py:1778 +#: ../fsset.py:1966 msgid "" "Error finding / entry.\n" "\n" @@ -855,11 +852,11 @@ msgstr "" "\n" "请按确定退出安装." -#: ../fsset.py:2432 +#: ../fsset.py:2652 msgid "Duplicate Labels" msgstr "标签重复" -#: ../fsset.py:2433 +#: ../fsset.py:2653 #, python-format msgid "" "Multiple devices on your system are labelled %s. Labels across devices must " @@ -871,35 +868,35 @@ msgstr "" "\n" "请解决这个问题后重新启动安装过程。" -#: ../fsset.py:2442 +#: ../fsset.py:2662 msgid "Invalid Label" msgstr "标签无效" -#: ../fsset.py:2443 +#: ../fsset.py:2663 #, python-format msgid "" "An invalid label was found on device %s. Please fix this problem and " "restart the installation process." msgstr "驱动器%s上发现一个无效标签.请解决这个问题后重新启动安装过程。" -#: ../fsset.py:2701 +#: ../fsset.py:2800 msgid "Formatting" msgstr "正在格式化" -#: ../fsset.py:2702 +#: ../fsset.py:2801 #, python-format msgid "Formatting %s file system..." msgstr "正在格式化 %s 文件系统..." -#: ../gui.py:109 +#: ../gui.py:107 msgid "An error occurred copying the screenshots over." msgstr "复制屏幕快照时出错。" -#: ../gui.py:120 +#: ../gui.py:118 msgid "Screenshots Copied" msgstr "屏幕快照被复制" -#: ../gui.py:121 +#: ../gui.py:119 msgid "" "The screenshots have been saved into the directory:\n" "\n" @@ -913,91 +910,118 @@ msgstr "" "\n" "重新引导后再以根用户的身份登录，您便可以存取它们。" -#: ../gui.py:164 +#: ../gui.py:162 msgid "Saving Screenshot" msgstr "保存屏幕快照" -#: ../gui.py:165 +#: ../gui.py:163 #, python-format msgid "A screenshot named '%s' has been saved." msgstr "名为“%s”的屏幕快照已被保存。" -#: ../gui.py:168 +#: ../gui.py:166 msgid "Error Saving Screenshot" msgstr "保存屏幕快照时出错" -#: ../gui.py:169 +#: ../gui.py:167 msgid "" "An error occurred while saving the screenshot. If this occurred during " "package installation, you may need to try several times for it to succeed." msgstr "" "保存屏幕快照时出错。如果它在软件包安装过程中出现，您可能要多试几次才能成功。" -#: ../gui.py:234 ../text.py:440 +#: ../gui.py:232 ../text.py:533 msgid "Fix" msgstr "修复" -#: ../gui.py:235 ../rescue.py:217 ../text.py:441 -#: ../textw/bootloader_text.py:68 ../textw/constants_text.py:48 -#: ../loader2/driverdisk.c:526 ../loader2/driverdisk.c:536 -#: ../loader2/hdinstall.c:265 ../loader2/loader.c:411 +#: ../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 msgid "Yes" msgstr "是" -#: ../gui.py:236 ../rescue.py:217 ../rescue.py:219 ../text.py:442 -#: ../textw/bootloader_text.py:68 ../textw/constants_text.py:52 -#: ../loader2/driverdisk.c:526 ../loader2/driverdisk.c:536 -#: ../loader2/loader.c:411 +#: ../gui.py:234 ../rescue.py:228 ../rescue.py:230 ../text.py:535 +#: ../textw/bootloader_text.py:72 ../textw/constants_text.py:58 +#: ../loader2/driverdisk.c:479 ../loader2/driverdisk.c:489 msgid "No" msgstr "否" -#: ../gui.py:238 ../text.py:444 ../text.py:572 ../loader2/net.c:97 -#: ../loader2/net.c:329 ../loader2/net.c:583 ../loader2/net.c:691 -#: ../loader2/net.c:791 ../loader2/net.c:799 ../loader2/net.c:1193 -#: ../loader2/net.c:1199 +#: ../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 msgid "Retry" msgstr "重试" -#: ../gui.py:239 ../text.py:445 +#: ../gui.py:237 ../text.py:538 msgid "Ignore" msgstr "忽略" -#: ../gui.py:240 ../gui.py:780 ../partIntfHelpers.py:237 -#: ../partIntfHelpers.py:529 ../text.py:106 ../text.py:107 ../text.py:417 -#: ../text.py:419 ../text.py:446 ../iw/bootloader_advanced_gui.py:47 -#: ../textw/bootloader_text.py:198 ../textw/constants_text.py:40 -#: ../loader2/dirbrowser.c:139 ../loader2/driverdisk.c:282 -#: ../loader2/kickstart.c:366 ../loader2/loader.c:355 +#: ../gui.py:238 ../gui.py:843 ../partIntfHelpers.py:244 +#: ../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 msgid "Cancel" msgstr "取消" -#: ../gui.py:607 ../text.py:360 +#: ../gui.py:583 ../text.py:465 msgid "Installation Key" msgstr "安装码" -#: ../gui.py:790 tmp/anaconda.glade.h:2 tmp/exn.glade.h:3 +#: ../gui.py:657 ../gui.py:665 +#, fuzzy +msgid "Error with passphrase" +msgstr "口令错误" + +#: ../gui.py:658 +#, fuzzy +msgid "The passphrases you entered were different. Please try again." +msgstr "输入的口令不匹配，请重新输入。" + +#: ../gui.py:666 +#, fuzzy +msgid "The passphrase must be at least eight characters long." +msgstr "口令至少应包含六个字符。" + +#: ../gui.py:692 ../text.py:275 +#, python-format +msgid "" +"Device %s is encrypted. In order to access the device's contents during " +"installation you must enter the device's passphrase below." +msgstr "" + +#: ../gui.py:855 ../gui.py:856 ../gui.py:968 ../gui.py:969 +#: tmp/anaconda.glade.h:2 msgid "_Debug" msgstr "调试(_D)" -#: ../gui.py:962 ../text.py:405 +#: ../gui.py:1012 ../gui.py:1014 ../livecd.py:112 +msgid "Exit installer" +msgstr "退出安装程序" + +#: ../gui.py:1014 ../text.py:253 ../text.py:261 +msgid "Debug" +msgstr "调试" + +#: ../gui.py:1016 ../text.py:257 +msgid "Exception Occurred" +msgstr "出现例外" + +#: ../gui.py:1176 ../text.py:510 msgid "Error Parsing Kickstart Config" msgstr "解析 kickstart 配置时出错" -#: ../gui.py:970 ../text.py:415 -msgid "" -"Please insert a floppy now. All contents of the disk will be erased, so " -"please choose your diskette carefully." -msgstr "现在请插入软盘。软盘上的所有内容将会被抹掉，所以请慎重选择软盘。" - -#: ../gui.py:1017 +#: ../gui.py:1222 msgid "default:LTR" msgstr "默认：LTR" -#: ../gui.py:1103 ../text.py:567 +#: ../gui.py:1302 ../text.py:663 msgid "Error!" msgstr "错误！" -#: ../gui.py:1104 ../text.py:568 +#: ../gui.py:1303 ../text.py:664 #, python-format msgid "" "An error occurred when attempting to load an installer interface component.\n" @@ -1007,69 +1031,80 @@ msgstr "" "试图载入安装程序界面部件时出现错误。\n" "className = %s" -#: ../gui.py:1109 ../harddrive.py:80 ../harddrive.py:126 ../image.py:526 -#: ../packages.py:331 ../packages.py:336 +#: ../gui.py:1308 ../image.py:162 ../image.py:188 ../packages.py:353 +#: ../packages.py:358 msgid "_Exit" msgstr "退出(_E)" -#: ../gui.py:1110 ../harddrive.py:81 ../image.py:527 ../yuminstall.py:445 -#: ../yuminstall.py:748 ../yuminstall.py:796 ../yuminstall.py:1015 +#: ../gui.py:1309 ../image.py:188 ../yuminstall.py:535 ../yuminstall.py:893 +#: ../yuminstall.py:941 ../yuminstall.py:1173 msgid "_Retry" msgstr "重试(_R)" -#: ../gui.py:1113 ../packages.py:335 +#: ../gui.py:1312 ../packages.py:168 ../packages.py:357 msgid "The installer will now exit..." msgstr "安装程序现在退出..." -#: ../gui.py:1116 ../packages.py:338 +#: ../gui.py:1315 ../packages.py:360 msgid "Your system will now be rebooted..." msgstr "您的系统现在将会被重新引导..." -#: ../gui.py:1117 ../image.py:93 ../packages.py:339 ../partedUtils.py:1178 -#: ../iw/confirm_gui.py:32 ../textw/confirm_text.py:38 -#: ../textw/confirm_text.py:66 +#: ../gui.py:1316 ../image.py:247 ../packages.py:169 ../packages.py:361 +#: ../partedUtils.py:1246 ../yuminstall.py:1226 msgid "_Reboot" msgstr "重新引导(_R)" -#: ../gui.py:1119 +#: ../gui.py:1318 msgid "Exiting" msgstr "退出中" -#: ../gui.py:1186 +#: ../gui.py:1384 #, python-format msgid "%s Installer" msgstr "%s 安装程序" -#: ../gui.py:1193 +#: ../gui.py:1391 msgid "Unable to load title bar" msgstr "无法载入标题栏" -#: ../gui.py:1247 +#: ../gui.py:1444 msgid "Install Window" msgstr "安装窗口" -#: ../harddrive.py:44 ../image.py:146 ../image.py:483 +#: ../image.py:88 #, python-format msgid "" -"The file %s cannot be opened. This is due to a missing file or perhaps a " -"corrupt package. Please verify your installation images and that you have " -"all the required media.\n" -"\n" -"If you exit, your system will be left in an inconsistent state that will " -"likely require reinstallation.\n" +"The ISO image %s has a size which is not a multiple of 2048 bytes. This may " +"mean it was corrupted on transfer to this computer.\n" "\n" +"It is recommended that you exit and abort your installation, but you can " +"choose to continue if you think this is in error." msgstr "" -"无法打开文件%s 。这是由于文件遗失或者软件包损坏造成的。请检测您使用的安装镜" -"像，确定您有所需的一切介质。\n" -"\n" -"您如果退出，您的系统会不稳定，很可能要重装。\n" +"%s ISO镜像的大小不是2048字节的倍数.这可能意味这在传输到这台电脑的过程中产生了" +"错误.\n" "\n" +"建议您重新启动,取消安装.但是您也可以选择继续." + +#: ../image.py:154 +msgid "Couldn't Mount ISO Source" +msgstr "无法挂载ISO镜像" + +#: ../image.py:155 +#, python-format +msgid "" +"An error occurred mounting the source device %s. This may happen if your " +"ISO images are located on an advanced storage device like LVM or RAID, or if " +"there was a problem mounting a partition. Click exit to abort the " +"installation." +msgstr "" +"挂载源设备%s时出现了错误。这可能是由于你的ISO镜像在诸如LVM或者RAID这样的高层" +"存储设备上，或者在分区挂载的时候产生了错误。点击退出来退出安装。" -#: ../harddrive.py:71 ../image.py:516 +#: ../image.py:179 msgid "Missing ISO 9660 Image" msgstr "缺少 ISO 9660图像" -#: ../harddrive.py:72 +#: ../image.py:180 #, python-format msgid "" "The installer has tried to mount image #%s, but cannot find it on the hard " @@ -1082,26 +1117,11 @@ msgstr "" "\n" "请将此图像复制到硬盘中，并点击重试。点击退出来终止安装。" -#: ../harddrive.py:117 -msgid "Couldn't Mount ISO Source" -msgstr "无法挂载ISO镜像" - -#: ../harddrive.py:118 -#, python-format -msgid "" -"An error occurred mounting the source device %s. This may happen if your " -"ISO images are located on an advanced storage device like LVM or RAID, or if " -"there was a problem mounting a partition. Click exit to abort the " -"installation." -msgstr "" -"挂载源设备%s时出现了错误。这可能是由于你的ISO镜像在诸如LVM或者RAID这样的高层" -"存储设备上，或者在分区挂载的时候产生了错误。点击退出来退出安装。" - -#: ../image.py:84 +#: ../image.py:238 msgid "Required Install Media" msgstr "需要的安装介质" -#: ../image.py:85 +#: ../image.py:239 #, python-format msgid "" "The software you have selected to install will require the following discs:\n" @@ -1116,13 +1136,13 @@ msgstr "" "请在继续安装前准备好这些光盘。如果您需要中止安装并重新引导，请选择“重新引" "导”。" -#: ../image.py:93 ../livecd.py:355 ../packages.py:285 ../packages.py:336 -#: ../packages.py:339 ../yuminstall.py:1051 ../iw/confirm_gui.py:32 -#: ../textw/confirm_text.py:38 ../textw/confirm_text.py:66 +#: ../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 msgid "_Back" msgstr "上一步(_B)" -#: ../image.py:136 ../urlinstall.py:207 +#: ../image.py:265 #, python-format msgid "" "An error occurred unmounting the disc. Please make sure you're not " @@ -1130,104 +1150,19 @@ msgid "" msgstr "" "卸载光盘时出错。请确定您不是从 tty2 上的命令行访问 %s，然后点击确定来重试。" -#: ../image.py:170 ../urlinstall.py:102 -msgid "Copying File" -msgstr "正在复制文件" - -#: ../image.py:171 ../urlinstall.py:103 -msgid "Transferring install image to hard drive..." -msgstr "正在将安装映像传输到硬盘..." - -#: ../image.py:181 ../urlinstall.py:113 -msgid "" -"An error occurred transferring the install image to your hard drive. You are " -"probably out of disk space." -msgstr "将安装映像传输到硬盘时出错，很可能是磁盘空间不够。" - -#: ../image.py:270 -msgid "Change Disc" -msgstr "更换光盘" - -#: ../image.py:271 -#, python-format -msgid "Please insert %s disc %d to continue." -msgstr "请插入 %s 光盘 %d 以继续。" - -#: ../image.py:305 -msgid "Wrong Disc" -msgstr "光盘不对" - -#: ../image.py:306 -#, python-format -msgid "That's not the correct %s disc." -msgstr "那不是正确的 %s 光盘。" - -#: ../image.py:312 -msgid "Unable to access the disc." -msgstr "无法读取光盘。" - -#: ../image.py:369 -#, python-format -msgid "" -"The file %s cannot be opened. This is due to a missing file or perhaps a " -"corrupt package. Please verify your installation tree contains all required " -"packages.\n" -"\n" -"If you exit, your system will be left in an inconsistent state that will " -"likely require reinstallation.\n" -"\n" -msgstr "" -"无法打开 %s 文件。这是由于文件遗失或者软件包损坏造成的。请确定您的安装树包含" -"所有组件。\n" -"\n" -"您如果现在推出，您的系统会不稳定需要重新安装。\n" -"\n" - -#: ../image.py:443 -#, python-format -msgid "" -"The ISO image %s has a size which is not a multiple of 2048 bytes. This may " -"mean it was corrupted on transfer to this computer.\n" -"\n" -"It is recommended that you exit and abort your installation, but you can " -"choose to continue if you think this is in error." -msgstr "" -"%s ISO镜像的大小不是2048字节的倍数.这可能意味这在传输到这台电脑的过程中产生了" -"错误.\n" -"\n" -"建议您重新启动,取消安装.但是您也可以选择继续." - -#: ../image.py:517 -#, python-format -msgid "" -"The installer has tried to mount image #%s, but cannot find it on the " -"server.\n" -"\n" -"Please copy this image to the remote server's share path and click Retry. " -"Click Exit to abort the installation." -msgstr "" -"安装程序试图加载图像#%s，但在服务器上无法找到该图像。\n" -"\n" -"请将此图像复制到远程服务器的共享目录中，并点击重试。点击退出来终止安装。" - -#: ../installclass.py:67 +#: ../installclass.py:74 msgid "Install on System" msgstr "在系统上安装" -#: ../iscsi.py:199 ../iscsi.py:200 +#: ../iscsi.py:205 ../iscsi.py:206 msgid "Initializing iSCSI initiator" msgstr "初始化iSCSI initiator" -#: ../kickstart.py:75 -msgid "Scriptlet Failure" -msgstr "Scriptlet 失败" - -#: ../kickstart.py:76 -#, python-format +#: ../kickstart.py:86 +#, fuzzy, python-format msgid "" -"There was an error running the scriptlet. You may examine the output in %" -"s. This is a fatal error and your install will be aborted.\n" -"\n" +"There was an error running the kickstart script at line %s. You may examine " +"the output in %s. This is a fatal error and your install will be aborted. " "Press the OK button to exit the installer." msgstr "" "运行 sciptlet 时出错。您可以在 %s 上检查它的输出。这是一个致命错误，安装将会" @@ -1235,39 +1170,42 @@ msgstr "" "\n" "请按确定按钮来退出安装。" -#: ../kickstart.py:951 ../kickstart.py:968 +#: ../kickstart.py:101 ../kickstart.py:103 +msgid "Scriptlet Failure" +msgstr "Scriptlet 失败" + +#: ../kickstart.py:921 ../kickstart.py:938 msgid "Running..." msgstr "正在运行..." -#: ../kickstart.py:952 +#: ../kickstart.py:922 msgid "Running post-install scripts" msgstr "运行安装后脚本" -#: ../kickstart.py:969 +#: ../kickstart.py:939 msgid "Running pre-install scripts" msgstr "运行安装前脚本" -#: ../kickstart.py:1000 +#: ../kickstart.py:970 msgid "Missing Package" msgstr "缺少软件包" -#: ../kickstart.py:1001 +#: ../kickstart.py:971 #, 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:1007 ../kickstart.py:1045 ../yuminstall.py:748 -#: ../yuminstall.py:751 +#: ../kickstart.py:977 ../kickstart.py:1015 msgid "_Abort" msgstr "中止(_A)" -#: ../kickstart.py:1037 +#: ../kickstart.py:1007 msgid "Missing Group" msgstr "缺少软件包组" -#: ../kickstart.py:1038 +#: ../kickstart.py:1008 #, python-format msgid "" "You have specified that the group '%s' should be installed. This group does " @@ -1275,21 +1213,17 @@ msgid "" msgstr "" "您已指定要安装 '%s' 软件包组。该软件包组不存在。您想要继续还是中止安装？" -#: ../livecd.py:93 +#: ../livecd.py:107 msgid "Unable to find image" msgstr "找不到安装映像" -#: ../livecd.py:94 +#: ../livecd.py:108 #, python-format msgid "" "The given location isn't a valid %s live CD to use as an installation source." msgstr "给出的位置不是一个有效的%s liveCD使用的安装源。" -#: ../livecd.py:98 -msgid "Exit installer" -msgstr "退出安装程序" - -#: ../livecd.py:174 +#: ../livecd.py:167 msgid "Copying live image to hard drive." msgstr "正在将安装映像传输到硬盘." @@ -1303,55 +1237,67 @@ msgid "" "minutes..." msgstr "进行安装后文件系统改变，可能要等一会..." -#: ../network.py:51 +#: ../livecd.py:369 +#, python-format +msgid "" +"The root filesystem you created is not large enough for this live image " +"(%.2f MB required)." +msgstr "" + +#: ../network.py:57 msgid "Hostname must be 64 or less characters in length." msgstr "主机名的长度必须小于等于64个字符。" -#: ../network.py:54 +#: ../network.py:60 msgid "Hostname must start with a valid character in the range 'a-z' or 'A-Z'" msgstr "主机名只能以“a-z”或“A-Z”范围内的字符开头" -#: ../network.py:59 +#: ../network.py:65 msgid "Hostnames can only contain the characters 'a-z', 'A-Z', '-', or '.'" msgstr "主机名只能包含字符：“a-z”、“A-Z”、“-”、或“.”。" -#: ../network.py:89 +#: ../network.py:95 msgid "IP address is missing." msgstr "缺少IP地址" -#: ../network.py:93 +#: ../network.py:99 msgid "" "IPv4 addresses must contain four numbers between 0 and 255, separated by " "periods." msgstr "IPv4 地址必须包含4个从 0 到 255 之间的数字，中间有间隔。" -#: ../network.py:96 +#: ../network.py:102 #, python-format msgid "'%s' is not a valid IPv6 address." msgstr "'%s' 不是有效的IPv6地址。" -#: ../network.py:98 +#: ../network.py:104 #, python-format msgid "'%s' is an invalid IP address." msgstr "'%s' 不是有效的IP地址。" -#: ../packages.py:256 +#: ../packages.py:167 +#, fuzzy +msgid "LVM operation failed" +msgstr "挂载失败" + +#: ../packages.py:278 msgid "Invalid Key" msgstr "无效密码" -#: ../packages.py:257 +#: ../packages.py:279 msgid "The key you entered is invalid." msgstr "您所输入的密码无效." -#: ../packages.py:285 +#: ../packages.py:307 msgid "_Skip" msgstr "(_s)跳过" -#: ../packages.py:317 ../packages.py:340 +#: ../packages.py:339 ../packages.py:362 msgid "Warning! This is pre-release software!" msgstr "警告！这是预发行软件！" -#: ../packages.py:318 +#: ../packages.py:340 #, python-format msgid "" "Thank you for downloading this pre-release of %s.\n" @@ -1377,15 +1323,15 @@ msgstr "" "\n" "然后向“%s”提交报告。\n" -#: ../packages.py:331 +#: ../packages.py:353 msgid "_Install anyway" msgstr "强行安装(_I)" -#: ../partedUtils.py:205 ../textw/partition_text.py:570 +#: ../partedUtils.py:233 ../textw/partition_text.py:576 msgid "Foreign" msgstr "外来" -#: ../partedUtils.py:305 +#: ../partedUtils.py:354 #, python-format msgid "" "The device %s is LDL formatted instead of CDL formatted. LDL formatted " @@ -1401,7 +1347,7 @@ msgstr "" "\n" "您想使用 CDL 格式来重新格式化这个 DASD 吗？" -#: ../partedUtils.py:335 +#: ../partedUtils.py:384 #, python-format msgid "" "/dev/%s currently has a %s partition layout. To use this drive for the " @@ -1415,61 +1361,61 @@ msgstr "" "\n" "您想重新初始化这个驱动器吗？" -#: ../partedUtils.py:344 +#: ../partedUtils.py:393 msgid "_Ignore drive" msgstr "忽略驱动器(_I)" -#: ../partedUtils.py:345 +#: ../partedUtils.py:394 msgid "_Re-initialize drive" msgstr "重新初始化驱动" -#: ../partedUtils.py:911 +#: ../partedUtils.py:979 msgid "Initializing" msgstr "初始化" -#: ../partedUtils.py:912 +#: ../partedUtils.py:980 #, python-format msgid "Please wait while formatting drive %s...\n" msgstr "正在格式化驱动器 %s ...请稍候...\n" -#: ../partedUtils.py:1076 +#: ../partedUtils.py:1068 #, python-format msgid "" -"The partition table on device %s (%s) was unreadable. To create new " -"partitions it must be initialized, causing the loss of ALL DATA on this " -"drive.\n" +"The partition table on device %s was unreadable. To create new partitions it " +"must be initialized, causing the loss of ALL DATA on this drive.\n" "\n" "This operation will override any previous installation choices about which " "drives to ignore.\n" "\n" "Would you like to initialize this drive, erasing ALL DATA?" msgstr "" -"设备 %s (%s) 上的分区表无法被读取。创建新分区时必须对其执行初始化，从而会导致" -"该驱动器中的所有数据丢失。\n" +"设备 %s 上的分区表无法被读取。创建新分区时必须对其执行初始化，从而会导致该驱" +"动器中的所有数据丢失。\n" "\n" "该操作会覆盖所有先前关于要忽略的驱动器的安装选择。\n" "\n" "您想要初始化这个驱动器并删除所有数据吗？" -#: ../partedUtils.py:1125 +#: ../partedUtils.py:1082 #, python-format msgid "" -"The partition table on device %s was unreadable. To create new partitions it " -"must be initialized, causing the loss of ALL DATA on this drive.\n" +"The partition table on device %s (%s) was unreadable. To create new " +"partitions it must be initialized, causing the loss of ALL DATA on this " +"drive.\n" "\n" "This operation will override any previous installation choices about which " "drives to ignore.\n" "\n" "Would you like to initialize this drive, erasing ALL DATA?" msgstr "" -"设备 %s 上的分区表无法被读取。创建新分区时必须对其执行初始化，从而会导致该驱" -"动器中的所有数据丢失。\n" +"设备 %s (%s) 上的分区表无法被读取。创建新分区时必须对其执行初始化，从而会导致" +"该驱动器中的所有数据丢失。\n" "\n" "该操作会覆盖所有先前关于要忽略的驱动器的安装选择。\n" "\n" "您想要初始化这个驱动器并删除所有数据吗？" -#: ../partedUtils.py:1168 +#: ../partedUtils.py:1236 #, python-format msgid "" "The drive /dev/%s has more than 15 partitions on it. The SCSI subsystem in " @@ -1480,22 +1426,11 @@ msgstr "" "驱动器/dev/%s 有超过15个分区.这时Linux内核的SCSI子系统不允许超过15个分区. 您" "将无法改变此硬盘的分区,或在 %s中使用任何超出/dev/%s15的分区" -#: ../partedUtils.py:1184 -#, python-format -msgid "" -"The drive /dev/%s has more than 15 partitions on it. The SCSI subsystem in " -"the Linux kernel does not allow for more than 15 partitions at this time. " -"You will not be able to make changes to the partitioning of this disk or use " -"any partitions beyond /dev/%s15 in %s" -msgstr "" -"驱动器/dev/%s 有超过15个分区.这时Linux内核的SCSI子系统不允许超过15个分区. 您" -"将无法改变此硬盘的分区,或在 %s中使用任何超出/dev/%s15分区" - -#: ../partedUtils.py:1276 +#: ../partedUtils.py:1327 msgid "No Drives Found" msgstr "未找到任何驱动器" -#: ../partedUtils.py:1277 +#: ../partedUtils.py:1328 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." @@ -1503,47 +1438,47 @@ msgstr "" "出现错误 - 未找到要在其中创建新文件系统的有效设备。请检查您的硬件以找到问题的" "起因。" -#: ../partIntfHelpers.py:35 +#: ../partIntfHelpers.py:42 msgid "Please enter a volume group name." msgstr "请输入卷组名称。" -#: ../partIntfHelpers.py:39 +#: ../partIntfHelpers.py:46 msgid "Volume Group Names must be less than 128 characters" msgstr "卷组名称必须小于 128 个字符" -#: ../partIntfHelpers.py:42 +#: ../partIntfHelpers.py:49 #, python-format msgid "Error - the volume group name %s is not valid." msgstr "错误 - 卷组名 %s 无效。" -#: ../partIntfHelpers.py:47 +#: ../partIntfHelpers.py:54 msgid "" "Error - the volume group name contains illegal characters or spaces. " "Acceptable characters are letters, digits, '.' or '_'." msgstr "" "错误 - 卷组名包含不合法字符或空格。可被使用的字符是字母、数字、“.”或“_”。" -#: ../partIntfHelpers.py:57 +#: ../partIntfHelpers.py:64 msgid "Please enter a logical volume name." msgstr "请输入逻辑卷名称。" -#: ../partIntfHelpers.py:61 +#: ../partIntfHelpers.py:68 msgid "Logical Volume Names must be less than 128 characters" msgstr "逻辑卷名称必须小于 128 个字符" -#: ../partIntfHelpers.py:65 +#: ../partIntfHelpers.py:72 #, python-format msgid "Error - the logical volume name %s is not valid." msgstr "错误 - 逻辑卷名称 %s 无效。" -#: ../partIntfHelpers.py:71 +#: ../partIntfHelpers.py:78 msgid "" "Error - the logical volume name contains illegal characters or spaces. " "Acceptable characters are letters, digits, '.' or '_'." msgstr "" "错误 - 逻辑卷名包含不合法字符或空格。可使用的字符是字母、数字、“.”或“_”。" -#: ../partIntfHelpers.py:95 +#: ../partIntfHelpers.py:102 #, python-format msgid "" "The mount point %s is invalid. Mount points must start with '/' and cannot " @@ -1552,58 +1487,58 @@ msgstr "" "挂载点%s无效。挂载点必须以“/”开始，但不能以“/”结束，并且必须使用可打印字符，" "并不能包含空格。" -#: ../partIntfHelpers.py:102 +#: ../partIntfHelpers.py:109 msgid "Please specify a mount point for this partition." msgstr "请为该分区指定一个挂载点。" -#: ../partIntfHelpers.py:112 +#: ../partIntfHelpers.py:119 #, python-format msgid "This partition is part of the RAID device /dev/md%s." msgstr "该分区是 RAID 设备/dev/md%s 的一部分。" -#: ../partIntfHelpers.py:115 +#: ../partIntfHelpers.py:122 msgid "This partition is part of a RAID device." msgstr "该分区是 RAID 设备的一部分。" -#: ../partIntfHelpers.py:120 +#: ../partIntfHelpers.py:127 #, python-format msgid "This partition is part of the LVM volume group '%s'." msgstr "该分区是 LVM 卷组“%s”的一部分。" -#: ../partIntfHelpers.py:123 +#: ../partIntfHelpers.py:130 msgid "This partition is part of a LVM volume group." msgstr "该分区是 LVM 卷组的一部分。" -#: ../partIntfHelpers.py:138 ../partIntfHelpers.py:146 -#: ../partIntfHelpers.py:153 ../partIntfHelpers.py:163 -#: ../partIntfHelpers.py:187 +#: ../partIntfHelpers.py:145 ../partIntfHelpers.py:153 +#: ../partIntfHelpers.py:160 ../partIntfHelpers.py:170 +#: ../partIntfHelpers.py:194 msgid "Unable To Delete" msgstr "无法删除" -#: ../partIntfHelpers.py:139 +#: ../partIntfHelpers.py:146 msgid "You must first select a partition to delete." msgstr "您必须首先选择一个要删除的分区。" -#: ../partIntfHelpers.py:147 +#: ../partIntfHelpers.py:154 msgid "You cannot delete free space." msgstr "您不能删除空闲空间。" -#: ../partIntfHelpers.py:154 +#: ../partIntfHelpers.py:161 msgid "You cannot delete a partition of a LDL formatted DASD." msgstr "您不能删除 LDL 格式的 DASD 上的分区。" -#: ../partIntfHelpers.py:164 +#: ../partIntfHelpers.py:171 #, python-format msgid "" "You cannot delete this partition, as it is an extended partition which " "contains %s" msgstr "您不能删除该分区，因为它是一个包含 %s 的扩展分区" -#: ../partIntfHelpers.py:182 ../iw/raid_dialog_gui.py:554 +#: ../partIntfHelpers.py:189 ../iw/raid_dialog_gui.py:605 msgid "This partition is holding the data for the hard drive install." msgstr "该分区含有硬盘安装的信息。" -#: ../partIntfHelpers.py:188 +#: ../partIntfHelpers.py:195 msgid "" "You cannot delete this partition:\n" "\n" @@ -1611,27 +1546,27 @@ msgstr "" "您不能删除该分区：\n" "\n" -#: ../partIntfHelpers.py:233 ../partIntfHelpers.py:528 -#: ../iw/lvm_dialog_gui.py:755 +#: ../partIntfHelpers.py:240 ../partIntfHelpers.py:534 +#: ../iw/lvm_dialog_gui.py:768 msgid "Confirm Delete" msgstr "确认删除" -#: ../partIntfHelpers.py:234 +#: ../partIntfHelpers.py:241 #, python-format msgid "You are about to delete all partitions on the device '/dev/%s'." msgstr "要删除'/dev/%s'设备上的所有分区。" -#: ../partIntfHelpers.py:237 ../partIntfHelpers.py:529 -#: ../iw/lvm_dialog_gui.py:758 ../iw/lvm_dialog_gui.py:1107 -#: ../iw/osbootwidget.py:104 ../iw/partition_gui.py:1353 +#: ../partIntfHelpers.py:244 ../partIntfHelpers.py:535 +#: ../iw/lvm_dialog_gui.py:771 ../iw/lvm_dialog_gui.py:1120 +#: ../iw/osbootwidget.py:102 ../iw/partition_gui.py:1380 msgid "_Delete" msgstr "删除(_D)" -#: ../partIntfHelpers.py:295 +#: ../partIntfHelpers.py:301 msgid "Notice" msgstr "注意" -#: ../partIntfHelpers.py:296 +#: ../partIntfHelpers.py:302 #, python-format msgid "" "The following partitions were not deleted because they are in use:\n" @@ -1642,16 +1577,16 @@ msgstr "" "\n" "%s" -#: ../partIntfHelpers.py:312 ../partIntfHelpers.py:325 -#: ../partIntfHelpers.py:351 ../partIntfHelpers.py:362 +#: ../partIntfHelpers.py:318 ../partIntfHelpers.py:331 +#: ../partIntfHelpers.py:357 ../partIntfHelpers.py:368 msgid "Unable To Edit" msgstr "无法编辑" -#: ../partIntfHelpers.py:313 +#: ../partIntfHelpers.py:319 msgid "You must select a partition to edit" msgstr "您必须选择一个要编辑的分区" -#: ../partIntfHelpers.py:325 ../partIntfHelpers.py:363 +#: ../partIntfHelpers.py:331 ../partIntfHelpers.py:369 msgid "" "You cannot edit this partition:\n" "\n" @@ -1659,18 +1594,18 @@ msgstr "" "您不能编辑该分区：\n" "\n" -#: ../partIntfHelpers.py:352 +#: ../partIntfHelpers.py:358 #, python-format msgid "" "You cannot edit this partition, as it is an extended partition which " "contains %s" msgstr "您不能编辑该分区，因为它是一个包含 %s 的扩展分区。" -#: ../partIntfHelpers.py:384 +#: ../partIntfHelpers.py:390 msgid "Format as Swap?" msgstr "格式化成交换区？" -#: ../partIntfHelpers.py:385 +#: ../partIntfHelpers.py:391 #, python-format msgid "" "/dev/%s has a partition type of 0x82 (Linux swap) but does not appear to be " @@ -1683,41 +1618,42 @@ msgstr "" "\n" "您想把该分区格式化成交换分区吗？" -#: ../partIntfHelpers.py:405 +#: ../partIntfHelpers.py:411 #, python-format msgid "You need to select at least one hard drive to install %s." msgstr "您至少需要选择一个硬盘驱动器来安装 %s。" -#: ../partIntfHelpers.py:410 +#: ../partIntfHelpers.py:416 +#, fuzzy msgid "" "You have chosen to use a pre-existing partition for this installation " "without formatting it. We recommend that you format this partition to make " "sure files from a previous operating system installation do not cause " "problems with this installation of Linux. However, if this partition " -"contains files that you need to keep, such as home directories, then " +"contains files that you need to keep, such as home directories, then " "continue without formatting this partition." msgstr "" "您选择了在本次安装中使用已有的分区而不进行格式化。我们建议您格式化该分区，以" "确保以前安装的操作系统文件不会在这次 Linux 安装中导致问题。可是，如果该分区包" "含您需要保留的文件，例如用户的主目录，那么您应该继续，而不要格式化该分区。" -#: ../partIntfHelpers.py:418 +#: ../partIntfHelpers.py:424 msgid "Format?" msgstr "格式化？" -#: ../partIntfHelpers.py:418 ../iw/partition_gui.py:1009 +#: ../partIntfHelpers.py:424 ../iw/partition_gui.py:1035 msgid "_Modify Partition" msgstr "修改分区(_M)" -#: ../partIntfHelpers.py:418 +#: ../partIntfHelpers.py:424 msgid "Do _Not Format" msgstr "不要格式化(_N)" -#: ../partIntfHelpers.py:426 +#: ../partIntfHelpers.py:432 msgid "Error with Partitioning" msgstr "分区出错" -#: ../partIntfHelpers.py:427 +#: ../partIntfHelpers.py:433 #, python-format msgid "" "The following critical errors exist with your requested partitioning scheme. " @@ -1729,11 +1665,11 @@ msgstr "" "\n" "%s" -#: ../partIntfHelpers.py:441 +#: ../partIntfHelpers.py:447 msgid "Partitioning Warning" msgstr "分区警告" -#: ../partIntfHelpers.py:442 +#: ../partIntfHelpers.py:448 #, python-format msgid "" "The following warnings exist with your requested partition scheme.\n" @@ -1748,23 +1684,23 @@ msgstr "" "\n" "您想继续使用申请的分区方案吗？" -#: ../partIntfHelpers.py:456 ../iw/partition_gui.py:664 +#: ../partIntfHelpers.py:462 ../iw/partition_gui.py:669 msgid "" "The following pre-existing partitions have been selected to be formatted, " "destroying all data." msgstr "下列存在的分区将被格式化，这会破坏所有数据。" -#: ../partIntfHelpers.py:459 +#: ../partIntfHelpers.py:465 msgid "" "Select 'Yes' to continue and format these partitions, or 'No' to go back and " "change these settings." msgstr "选择“是”来继续并格式化这些分区，或选择“否”返回修改这些设置。" -#: ../partIntfHelpers.py:465 +#: ../partIntfHelpers.py:471 msgid "Format Warning" msgstr "格式化警告" -#: ../partIntfHelpers.py:513 +#: ../partIntfHelpers.py:519 #, python-format msgid "" "You are about to delete the volume group \"%s\".\n" @@ -1775,117 +1711,172 @@ msgstr "" "\n" "该卷组内的所有逻辑卷将会丢失！" -#: ../partIntfHelpers.py:517 +#: ../partIntfHelpers.py:523 #, python-format msgid "You are about to delete the logical volume \"%s\"." msgstr "您即将删除逻辑卷\"%s\"。" -#: ../partIntfHelpers.py:520 +#: ../partIntfHelpers.py:526 msgid "You are about to delete a RAID device." msgstr "您即将删除一个 RAID 设备。" -#: ../partIntfHelpers.py:523 +#: ../partIntfHelpers.py:529 #, python-format msgid "You are about to delete the /dev/%s partition." msgstr "即将删除 /dev/%s 分区。" -#: ../partIntfHelpers.py:526 +#: ../partIntfHelpers.py:532 msgid "The partition you selected will be deleted." msgstr "您选择的分区将会被删除。" -#: ../partIntfHelpers.py:536 +#: ../partIntfHelpers.py:542 msgid "Confirm Reset" msgstr "确认重设" -#: ../partIntfHelpers.py:537 +#: ../partIntfHelpers.py:543 msgid "" "Are you sure you want to reset the partition table to its original state?" msgstr "是否确定要将分区表还原至其最初状态？" -#: ../partitioning.py:61 +#: ../partitions.py:84 msgid "Installation cannot continue." msgstr "安装无法继续。" -#: ../partitioning.py:62 +#: ../partitions.py:85 msgid "" "The partitioning options you have chosen have already been activated. You " "can no longer return to the disk editing screen. Would you like to continue " "with the installation process?" msgstr "您选择的分区选项已被激活，您将无法返回到磁盘编辑屏幕。您想继续安装吗？" -#: ../partitioning.py:92 -msgid "Low Memory" -msgstr "内存不足" +#: ../partitions.py:113 +#, fuzzy +msgid "Writing partitioning to disk" +msgstr "将分区迁移至(_g)：" + +#: ../partitions.py:114 +msgid "" +"The partitioning options you have selected will now be written to disk. Any " +"data on deleted or reformatted partitions will be lost" +msgstr "" + +#: ../partitions.py:119 +#, fuzzy +msgid "Go _back" +msgstr "上一步(_B)" + +#: ../partitions.py:120 +msgid "_Write changes to disk" +msgstr "" + +#: ../partitions.py:200 ../textw/constants_text.py:50 +#: ../loader2/cdinstall.c:335 ../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 +msgid "Back" +msgstr "上一步" + +#: ../partitions.py:200 ../rescue.py:305 ../iw/partition_gui.py:572 +#: ../textw/network_text.py:60 ../loader2/cdinstall.c:117 +#: ../loader2/cdinstall.c:125 ../loader2/driverdisk.c:440 +msgid "Continue" +msgstr "继续" + +#: ../partitions.py:204 +#, fuzzy +msgid "Confirm" +msgstr "确认：" -#: ../partitioning.py:93 +#: ../partitions.py:205 +#, python-format msgid "" -"As you don't have much memory in this machine, we need to turn on swap space " -"immediately. To do this we'll have to write your new partition table to the " -"disk immediately. Is that OK?" +"Are you sure you want to skip entering a passphrase for device %s?\n" +"\n" +"If you skip this step the device's contents will not be available during " +"installation." msgstr "" -"因为本机内存不足，我们需要立即打开交换空间。要执行该项操作，必须将新分区表立" -"即写入磁盘。是否执行？" -#: ../partitions.py:816 +#: ../partitions.py:1019 #, python-format msgid "" "You have not defined a root partition (/), which is required for " "installation of %s to continue." msgstr "您还没有指定继续安装 %s 所需的根分区（/）。" -#: ../partitions.py:821 +#: ../partitions.py:1024 #, 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:840 +#: ../partitions.py:1057 ../partitions.py:1077 +msgid "" +"You must create a /boot/efi partition of type FAT and a size of 50 megabytes." +msgstr "您必须创建一个 FAT 类型的 /boot/efl 分区，大小为 50MB。" + +#: ../partitions.py:1070 msgid "" "Your boot partition isn't on one of the first four partitions and thus won't " "be bootable." msgstr "您的引导区不是最初的四个分区之一，因此无法引导驱动器。" -#: ../partitions.py:847 -msgid "" -"You must create a /boot/efi partition of type FAT and a size of 50 megabytes." -msgstr "您必须创建一个 FAT 类型的 /boot/efl 分区，大小为 50MB。" - -#: ../partitions.py:867 +#: ../partitions.py:1097 msgid "You must create an Apple Bootstrap partition." msgstr "您必须创建一个 Apple 引导分区。" -#: ../partitions.py:889 +#: ../partitions.py:1119 msgid "You must create a PPC PReP Boot partition." msgstr "您必须创建一个 PPC PReP 引导分区。" -#: ../partitions.py:897 ../partitions.py:908 +#: ../partitions.py:1127 ../partitions.py:1138 #, 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:942 +#: ../partitions.py:1172 msgid "" "Installing on a USB device. This may or may not produce a working system." msgstr "正在一个 USB 设备上安装。不能保证可以成功安装。" -#: ../partitions.py:945 +#: ../partitions.py:1175 msgid "" "Installing on a FireWire device. This may or may not produce a working " "system." msgstr "正在一个 FireWire 设备上安装。不能保证可以成功安装。" -#: ../partitions.py:954 ../partRequests.py:679 +#: ../partitions.py:1185 msgid "Bootable partitions can only be on RAID1 devices." msgstr "可引导分区仅允许在 RAID1 设备上。" -#: ../partitions.py:961 +#: ../partitions.py:1190 msgid "Bootable partitions cannot be on a logical volume." msgstr "可引导分区不能位于逻辑卷上。" -#: ../partitions.py:986 +#: ../partitions.py:1196 +#, fuzzy +msgid "Bootable partitions cannot be on a RAID device." +msgstr "可引导分区仅允许在 RAID1 设备上。" + +#: ../partitions.py:1203 +#, fuzzy, python-format +msgid "Bootable partitions cannot be on an %s filesystem." +msgstr "可引导分区不能位于逻辑卷上。" + +#: ../partitions.py:1207 +#, fuzzy +msgid "Bootable partitions cannot be on an encrypted block device" +msgstr "可引导分区不能位于逻辑卷上。" + +#: ../partitions.py:1213 msgid "" "You have not specified a swap partition. Although not strictly required in " "all cases, it will significantly improve performance for most installations." @@ -1893,39 +1884,44 @@ msgstr "" "您还没有指定一个交换分区。虽然在大多情况下这并非必不可少，但若有一个交换分区" "的话，系统性能会显著提高。" -#: ../partitions.py:993 +#: ../partitions.py:1220 #, 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:1004 +#: ../partitions.py:1231 #, 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:1304 +#: ../partitions.py:1526 msgid "the partition in use by the installer." msgstr "安装程序正在使用该分区。" -#: ../partitions.py:1307 +#: ../partitions.py:1529 msgid "a partition which is a member of a RAID array." msgstr "RAID 阵列中的一个分区。" -#: ../partitions.py:1310 +#: ../partitions.py:1532 msgid "a partition which is a member of a LVM Volume Group." msgstr "一个是 LVM 卷组成员之一的分区。" -#: ../partRequests.py:249 +#: ../partRequests.py:273 +#, fuzzy, python-format +msgid "The mount point %s must be formatted during live CD installs." +msgstr "该挂载点必须位于 Linux 文件系统上。" + +#: ../partRequests.py:278 #, python-format msgid "" "This mount point is invalid. The %s directory must be on the / file system." msgstr "该挂载点无效，%s 目录必须位于 / file 系统上。" -#: ../partRequests.py:252 +#: ../partRequests.py:281 #, python-format msgid "" "The mount point %s cannot be used. It must be a symbolic link for proper " @@ -1933,54 +1929,54 @@ msgid "" msgstr "" "挂载点 %s 无法被使用。它必须是符号链接才能使系统正确运行。请另选一个挂载点。" -#: ../partRequests.py:259 +#: ../partRequests.py:290 msgid "This mount point must be on a linux file system." msgstr "该挂载点必须位于 Linux 文件系统上。" -#: ../partRequests.py:280 +#: ../partRequests.py:311 #, python-format msgid "" "The mount point \"%s\" is already in use, please choose a different mount " "point." msgstr "挂载点\"%s\" 已被使用，请另选一个。" -#: ../partRequests.py:294 +#: ../partRequests.py:325 #, python-format msgid "" "The size of the %s partition (%10.2f MB) exceeds the maximum size of %10.2f " "MB." msgstr "%s 分区的大小（%10.2f MB）已超过了最大值 %10.2f MB。" -#: ../partRequests.py:490 +#: ../partRequests.py:533 #, python-format msgid "" "The size of the requested partition (size = %s MB) exceeds the maximum size " "of %s MB." msgstr "所申请分区的大小（%sMB）超过最大值 %sMB。" -#: ../partRequests.py:495 +#: ../partRequests.py:538 #, python-format msgid "The size of the requested partition is negative! (size = %s MB)" msgstr "所申请的分区大小是负数（%sMB）！" -#: ../partRequests.py:499 +#: ../partRequests.py:542 msgid "Partitions can't start below the first cylinder." msgstr "分区不能从第一个柱面前开始。" -#: ../partRequests.py:502 +#: ../partRequests.py:545 msgid "Partitions can't end on a negative cylinder." msgstr "分区不能以负柱面结束。" -#: ../partRequests.py:671 +#: ../partRequests.py:746 msgid "No members in RAID request, or not RAID level specified." msgstr "没有 RAID 成员，或者不是 RAID 级别中指定的。" -#: ../partRequests.py:683 +#: ../partRequests.py:751 #, python-format msgid "A RAID device of type %s requires at least %s members." msgstr "%s 类型的 RAID 设备至少需要 %s 个成员。" -#: ../partRequests.py:692 +#: ../partRequests.py:760 #, python-format msgid "" "This RAID device can have a maximum of %s spares. To have more spares you " @@ -1988,46 +1984,46 @@ msgid "" msgstr "" "该 RAID 设备至多可有 %s 个备件。要增加备件，您需要增加 RAID 设备的成员。" -#: ../partRequests.py:926 +#: ../partRequests.py:1019 msgid "" "Logical volume size must be larger than the volume group's physical extent " "size." msgstr "逻辑卷大小一定要比卷组的物理扩展分区大。" -#: ../rescue.py:146 +#: ../rescue.py:157 msgid "Starting Interface" msgstr "启动接口" -#: ../rescue.py:147 +#: ../rescue.py:158 #, python-format msgid "Attempting to start %s" msgstr "试图启动 %s" -#: ../rescue.py:189 +#: ../rescue.py:200 msgid "When finished please exit from the shell and your system will reboot." msgstr "结束后请退出 shell，您的系统将会被重新启动。" -#: ../rescue.py:215 +#: ../rescue.py:226 msgid "Setup Networking" msgstr "设置网络" -#: ../rescue.py:216 +#: ../rescue.py:227 msgid "Do you want to start the network interfaces on this system?" msgstr "您想在这个系统上启动网络接口吗？" -#: ../rescue.py:256 ../text.py:598 +#: ../rescue.py:267 ../text.py:694 msgid "Cancelled" msgstr "已取消" -#: ../rescue.py:257 ../text.py:599 +#: ../rescue.py:268 ../text.py:695 msgid "I can't go to the previous step from here. You will have to try again." msgstr "无法从这里返回到上一步，您只能重试。" -#: ../rescue.py:289 ../rescue.py:356 ../rescue.py:364 ../rescue.py:445 +#: ../rescue.py:294 ../rescue.py:361 ../rescue.py:369 ../rescue.py:447 msgid "Rescue" msgstr "救援" -#: ../rescue.py:290 +#: ../rescue.py:295 #, python-format msgid "" "The rescue environment will now attempt to find your Linux installation and " @@ -2048,29 +2044,23 @@ msgstr "" "直接进入一个命令行 shell。\n" "\n" -#: ../rescue.py:300 ../iw/partition_gui.py:567 ../textw/network_text.py:55 -#: ../loader2/cdinstall.c:113 ../loader2/cdinstall.c:121 -#: ../loader2/driverdisk.c:487 -msgid "Continue" -msgstr "继续" - -#: ../rescue.py:300 ../rescue.py:305 +#: ../rescue.py:305 ../rescue.py:310 msgid "Read-Only" msgstr "只读" -#: ../rescue.py:331 +#: ../rescue.py:336 msgid "System to Rescue" msgstr "要援救的系统" -#: ../rescue.py:332 +#: ../rescue.py:337 msgid "What partition holds the root partition of your installation?" msgstr "哪个分区包含安装的根分区？" -#: ../rescue.py:334 ../rescue.py:338 ../text.py:572 ../text.py:574 +#: ../rescue.py:339 ../rescue.py:343 ../text.py:668 ../text.py:670 msgid "Exit" msgstr "退出" -#: ../rescue.py:357 +#: ../rescue.py:362 msgid "" "Your system had dirty file systems which you chose not to mount. Press " "return to get a shell from which you can fsck and mount your partitions. " @@ -2079,7 +2069,7 @@ msgstr "" "系统中存在您选择不挂载的有问题的文件系统，按回车键进入 shell，您便可以执行 " "fsck 命令并挂载分区。当您退出 shell 后，系统会自动被重新引导。" -#: ../rescue.py:365 +#: ../rescue.py:370 #, python-format msgid "" "Your system has been mounted under %s.\n" @@ -2099,7 +2089,7 @@ msgstr "" "\n" "当您退出 shell 后，系统将会自动被重新引导。" -#: ../rescue.py:446 +#: ../rescue.py:448 #, python-format msgid "" "An error occurred trying to mount some or all of your system. Some of it may " @@ -2112,11 +2102,11 @@ msgstr "" "\n" "请按 <return> 键进入 shell，当您退出 shell 时，系统将会自动被重新引导。" -#: ../rescue.py:452 +#: ../rescue.py:454 msgid "Rescue Mode" msgstr "救援模式" -#: ../rescue.py:453 +#: ../rescue.py:455 msgid "" "You don't have any Linux partitions. Press return to get a shell. The system " "will reboot automatically when you exit from the shell." @@ -2124,90 +2114,110 @@ msgstr "" "您没有任何 Linux 分区，请按 <return> 键进入 shell。当您退出 shell 时，系统将" "会自动被重新引导。" -#: ../rescue.py:466 +#: ../rescue.py:468 #, python-format msgid "Your system is mounted under the %s directory." msgstr "您的系统被挂载在 %s 目录之下。" -#: ../text.py:153 ../text.py:168 +#: ../text.py:186 ../text.py:250 ../text.py:263 tmp/exnSave.glade.h:1 msgid "Save" msgstr "保存" -#: ../text.py:156 ../text.py:170 -msgid "Remote" -msgstr "远程" - -#: ../text.py:158 ../text.py:166 -msgid "Debug" -msgstr "调试" - -#: ../text.py:162 -msgid "Exception Occurred" -msgstr "出现例外" +#: ../text.py:189 +msgid "Save to Disk" +msgstr "" -#: ../text.py:191 -msgid "Save to Remote Host" -msgstr "存入远程主机" +#: ../text.py:190 +#, fuzzy +msgid "Save to Remote" +msgstr "存入(_R)远程主机" -#: ../text.py:194 +#: ../text.py:204 msgid "Host" msgstr "主机" -#: ../text.py:196 +#: ../text.py:206 msgid "Remote path" msgstr "远程主机目录" -#: ../text.py:198 +#: ../text.py:208 msgid "User name" msgstr "用户名" -#: ../text.py:200 +#: ../text.py:210 msgid "Password" msgstr "口令" -#: ../text.py:257 +#: ../text.py:282 tmp/lukspassphrase.glade.h:5 +msgid "Passphrase" +msgstr "" + +#: ../text.py:290 tmp/lukspassphrase.glade.h:6 +msgid "This is a global passphrase" +msgstr "" + +#: ../text.py:346 msgid "Help not available" msgstr "无帮助信息" -#: ../text.py:258 +#: ../text.py:347 msgid "No help is available for this step of the install." msgstr "这一安装步骤没有帮助信息。" -#: ../text.py:365 +#: ../text.py:445 +#, fuzzy +msgid "Repository editing is not available in text mode." +msgstr "没有可用的图形化安装... 开始文本方式安装。" + +#: ../text.py:470 #, python-format msgid "Please enter your %(instkey)s" msgstr "请输入您的%(instkey)s" -#: ../text.py:382 tmp/instkey.glade.h:6 +#: ../text.py:487 tmp/instkey.glade.h:6 #, no-c-format, python-format msgid "Skip entering %(instkey)s" msgstr "跳过输入 %(instkey)s" -#: ../text.py:414 -msgid "Save Crash Dump" -msgstr "保存崩溃 dump" +#: ../text.py:563 ../loader2/lang.c:63 +#, fuzzy, c-format, python-format +msgid "Welcome to %s for %s" +msgstr "欢迎使用 %s" -#: ../text.py:469 ../loader2/lang.c:55 ../loader2/loader.c:153 -#, c-format, python-format +#: ../text.py:565 +#, python-format msgid "Welcome to %s" msgstr "欢迎使用 %s" -#: ../text.py:472 +#: ../text.py:568 msgid "" " <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen" msgstr "<F1>求助 | <Tab> 元素间切换 | <Space> 选择 | <F12> 下一屏幕" -#: ../text.py:474 +#: ../text.py:570 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next " "screen" msgstr "<Tab>/<Alt-Tab> 元素间切换 | <Space> 选择 | <F12> 下一屏幕" -#: ../upgrade.py:52 +#: ../upgrade.py:76 ../upgrade.py:97 msgid "Proceed with upgrade?" msgstr "继续升级吗？" -#: ../upgrade.py:53 +#: ../upgrade.py:77 +#, python-format +msgid "" +"You have choosen the upgrade for %s architecture, but the installed system " +"is for %s architecture. \n" +"\n" +msgstr "" + +#: ../upgrade.py:81 +#, fuzzy, python-format +msgid "Would you like to upgrade the installed system to the %s architecture?" +msgstr "您想如何在该分区上筹备文件系统？" + +#: ../upgrade.py:98 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" @@ -2216,24 +2226,15 @@ msgstr "" "您所选择要升级的 Linux 文件系统已经被挂载，过了该步骤便不能返回。\n" "\n" -#: ../upgrade.py:57 +#: ../upgrade.py:102 msgid "Would you like to continue with the upgrade?" msgstr "是否要继续升级？" -#: ../upgrade.py:93 -msgid "Searching" -msgstr "搜索" - -#: ../upgrade.py:94 -#, python-format -msgid "Searching for %s installations..." -msgstr "正在搜索 %s 安装..." - -#: ../upgrade.py:149 ../upgrade.py:157 +#: ../upgrade.py:200 ../upgrade.py:208 msgid "Dirty File Systems" msgstr "有问题的文件系统" -#: ../upgrade.py:150 +#: ../upgrade.py:201 #, python-format msgid "" "The following file systems for your Linux system were not unmounted " @@ -2245,7 +2246,7 @@ msgstr "" "查验文件系统，正常关机后再进行系统升级。\n" "%s" -#: ../upgrade.py:158 +#: ../upgrade.py:209 #, python-format msgid "" "The following file systems for your Linux system were not unmounted " @@ -2255,18 +2256,18 @@ msgstr "" "您的 Linux 系统中下列文件系统没有被完整地卸载下来，您仍要挂载它们吗？\n" "%s" -#: ../upgrade.py:295 ../upgrade.py:301 +#: ../upgrade.py:350 ../upgrade.py:356 msgid "Mount failed" msgstr "挂载失败" -#: ../upgrade.py:296 +#: ../upgrade.py:351 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:302 +#: ../upgrade.py:357 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 " @@ -2274,7 +2275,7 @@ msgid "" msgstr "" "/etc/fstab 中列出的文件系统间发生矛盾而无法被挂载，请解决这一问题后再升级。" -#: ../upgrade.py:319 +#: ../upgrade.py:374 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 " @@ -2285,11 +2286,11 @@ msgstr "" "新开始升级。\n" "\n" -#: ../upgrade.py:325 +#: ../upgrade.py:380 msgid "Absolute Symlinks" msgstr "绝对符号链接" -#: ../upgrade.py:336 +#: ../upgrade.py:391 msgid "" "The following are directories which should instead be symbolic links, which " "will cause problems with the upgrade. Please return them to their original " @@ -2300,318 +2301,389 @@ msgstr "" "符号链接状态，然后重新开始升级。\n" "\n" -#: ../upgrade.py:342 +#: ../upgrade.py:397 msgid "Invalid Directories" msgstr "无效目录" -#: ../upgrade.py:349 +#: ../upgrade.py:404 #, python-format msgid "%s not found" msgstr "没有发现 %s" -#: ../urlinstall.py:37 -msgid "Connecting..." -msgstr "正在连接 ..." +#: ../vnc.py:145 +#, python-format +msgid "%s %s installation on host %s" +msgstr "%s %s 安装在主机 %s 上" + +#: ../vnc.py:147 +#, python-format +msgid "%s %s installation" +msgstr "%s %s 的安装" + +#: ../vnc.py:174 +#, python-format +msgid "Attempting to connect to vnc client on host %s..." +msgstr "试图在主机 %s 上连接 vnc..." + +#: ../vnc.py:188 +msgid "Connected!" +msgstr "已连接！" + +#: ../vnc.py:191 +msgid "Will try to connect again in 15 seconds..." +msgstr "将在15秒后试图重新连接..." + +#: ../vnc.py:197 +#, fuzzy, python-format +msgid "Giving up attempting to connect after %d tries!\n" +msgstr "尝试连接50次后放弃连接企图！\n" -#: ../urlinstall.py:76 +#: ../vnc.py:206 #, python-format +msgid "Please manually connect your vnc client to %s to begin the install." +msgstr "请手工把您的 vnc 客户连接到 %s 来开始安装。" + +#: ../vnc.py:208 +msgid "Please manually connect your vnc client to begin the install." +msgstr "请手动连接您的 vnc 客户来开始安装。" + +#: ../vnc.py:211 +msgid "Starting VNC..." +msgstr "启动 VNC..." + +#: ../vnc.py:236 +msgid "The VNC server is now running." +msgstr "VNC 服务器现正运行。" + +#: ../vnc.py:249 msgid "" -"The file %s cannot be opened. This is due to a missing file or perhaps a " -"corrupt package. Please verify your mirror contains all required packages, " -"and try using a different one.\n" "\n" -"If you exit, your system will be left in an inconsistent state that will " -"likely require reinstallation.\n" +"\n" +"You chose to connect to a listening vncviewer. \n" +"This does not require a password to be set. If you \n" +"set a password, it will be used in case the connection \n" +"to the vncviewer is unsuccessful\n" "\n" msgstr "" -"无法打开 %s 文件。这是由于文件遗失或者软件包损坏造成的。请确定您的镜像文件包" -"括所有所需组件，并尝试采用不同的组件。\n" + +#: ../vnc.py:254 +#, fuzzy +msgid "" "\n" -"您如果现在重启，您的系统将不稳定很可能要重装。\n" +"\n" +"WARNING!!! VNC server running with NO PASSWORD!\n" +"You can use the self.password=<password> boot option\n" +"if you would like to secure the server.\n" +"\n" +msgstr "" +"\n" +"\n" +"警告！！！VNC 服务器没有口令！\n" +"您可以使用 vncpassword=<password> 引导选项\n" +"来保护服务器的安全。\n" "\n" -#: ../vnc.py:49 -msgid "Unable to Start X" -msgstr "无法启动 X" - -#: ../vnc.py:50 +#: ../vnc.py:258 msgid "" -"X was unable to start on your machine. Would you like to start VNC to " -"connect to this computer from another computer and perform a graphical " -"install or continue with a text mode install?" +"\n" +"\n" +"You chose to execute vnc with a password. \n" +"\n" msgstr "" -"X 无法在您的机器上运行。您打算从另一台计算机上运行 VNC 连接到此计算机以执行图" -"形化安装，还是继续进行文本模式安装？" -#: ../vnc.py:57 ../vnc.py:60 -msgid "Use text mode" -msgstr "使用文本模式" - -#: ../vnc.py:58 -msgid "Start VNC" -msgstr "启动 VNC" +#: ../vnc.py:260 +#, fuzzy +msgid "" +"\n" +"\n" +"Unknown Error. Aborting. \n" +"\n" +msgstr "未知错误" -#: ../vnc.py:68 +#: ../vnc.py:285 ../vnc.py:374 msgid "VNC Configuration" msgstr "VNC 配置" -#: ../vnc.py:72 +#: ../vnc.py:288 ../vnc.py:378 msgid "No password" msgstr "无口令" -#: ../vnc.py:75 +#: ../vnc.py:290 ../vnc.py:381 msgid "" "A password will prevent unauthorized listeners connecting and monitoring " "your installation progress. Please enter a password to be used for the " "installation" msgstr "口令能防止未授权监听者连接和监控您的安装进程。请为此次安装输入一个口令" -#: ../vnc.py:83 ../textw/userauth_text.py:42 ../loader2/urls.c:460 +#: ../vnc.py:298 ../vnc.py:389 ../textw/userauth_text.py:44 msgid "Password:" msgstr "口令：" -#: ../vnc.py:84 ../textw/userauth_text.py:43 +#: ../vnc.py:299 ../vnc.py:390 ../textw/userauth_text.py:46 msgid "Password (confirm):" msgstr "口令（确认）：" -#: ../vnc.py:106 ../textw/userauth_text.py:64 +#: ../vnc.py:317 ../vnc.py:412 ../textw/userauth_text.py:67 msgid "Password Mismatch" msgstr "口令不匹配" -#: ../vnc.py:107 ../textw/userauth_text.py:65 +#: ../vnc.py:318 ../vnc.py:413 ../textw/userauth_text.py:68 msgid "The passwords you entered were different. Please try again." msgstr "输入的口令不匹配，请重新输入。" -#: ../vnc.py:112 ../textw/userauth_text.py:59 +#: ../vnc.py:323 ../vnc.py:418 ../textw/userauth_text.py:63 msgid "Password Length" msgstr "口令长度" -#: ../vnc.py:113 +#: ../vnc.py:324 ../vnc.py:419 msgid "The password must be at least six characters long." msgstr "口令至少应包含六个字符。" -#: ../vnc.py:143 -msgid "VNC Password Error" -msgstr "VNC密码错误" - -#: ../vnc.py:144 -msgid "" -"You need to specify a vnc password of at least 6 characters long.\n" -"\n" -"Press <return> to reboot your system.\n" -msgstr "" -"您需要至少6位长的VNC密码。\n" -"\n" -"按 <回车> 重启您的系统。\n" - -#: ../vnc.py:189 -msgid "Starting VNC..." -msgstr "启动 VNC..." - -#: ../vnc.py:245 -#, python-format -msgid "%s %s installation on host %s" -msgstr "%s %s 安装在主机 %s 上" - -#: ../vnc.py:247 -#, python-format -msgid "%s %s installation" -msgstr "%s %s 的安装" - -#: ../vnc.py:267 -msgid "Unable to set vnc password - using no password!" -msgstr "无法设置 vnc 口令 - 不使用口令！" - -#: ../vnc.py:268 -msgid "Make sure your password is at least 6 characters in length." -msgstr "请确定您的口令最少包含六个字符。" +#: ../vnc.py:355 +msgid "Unable to Start X" +msgstr "无法启动 X" -#: ../vnc.py:291 +#: ../vnc.py:356 msgid "" -"\n" -"\n" -"WARNING!!! VNC server running with NO PASSWORD!\n" -"You can use the vncpassword=<password> boot option\n" -"if you would like to secure the server.\n" -"\n" +"X was unable to start on your machine. Would you like to start VNC to " +"connect to this computer from another computer and perform a graphical " +"install or continue with a text mode install?" msgstr "" -"\n" -"\n" -"警告！！！VNC 服务器没有口令！\n" -"您可以使用 vncpassword=<password> 引导选项\n" -"来保护服务器的安全。\n" -"\n" - -#: ../vnc.py:295 -msgid "The VNC server is now running." -msgstr "VNC 服务器现正运行。" - -#: ../vnc.py:298 -#, python-format -msgid "Attempting to connect to vnc client on host %s..." -msgstr "试图在主机 %s 上连接 vnc..." - -#: ../vnc.py:311 -msgid "Connected!" -msgstr "已连接！" - -#: ../vnc.py:316 -msgid "Giving up attempting to connect after 50 tries!\n" -msgstr "尝试连接50次后放弃连接企图！\n" - -#: ../vnc.py:318 -#, python-format -msgid "Please manually connect your vnc client to %s to begin the install." -msgstr "请手工把您的 vnc 客户连接到 %s 来开始安装。" - -#: ../vnc.py:320 -msgid "Please manually connect your vnc client to begin the install." -msgstr "请手动连接您的 vnc 客户来开始安装。" - -#: ../vnc.py:324 -msgid "Will try to connect again in 15 seconds..." -msgstr "将在15秒后试图重新连接..." +"X 无法在您的机器上运行。您打算从另一台计算机上运行 VNC 连接到此计算机以执行图" +"形化安装，还是继续进行文本模式安装？" -#: ../vnc.py:332 -#, python-format -msgid "Please connect to %s to begin the install..." -msgstr "请连接到 %s 来开始安装..." +#: ../vnc.py:363 ../vnc.py:366 +msgid "Use text mode" +msgstr "使用文本模式" -#: ../vnc.py:334 -msgid "Please connect to begin the install..." -msgstr "请连接来开始安装..." +#: ../vnc.py:364 +msgid "Start VNC" +msgstr "启动 VNC" -#: ../yuminstall.py:62 +#: ../yuminstall.py:71 #, python-format msgid "%s MB" msgstr "%s 兆字节" -#: ../yuminstall.py:65 +#: ../yuminstall.py:74 #, python-format msgid "%s KB" msgstr "%s 千字节" -#: ../yuminstall.py:68 +#: ../yuminstall.py:77 #, python-format msgid "%s Byte" msgstr "%s 字节" -#: ../yuminstall.py:70 +#: ../yuminstall.py:79 #, python-format msgid "%s Bytes" msgstr "%s 字节" -#: ../yuminstall.py:117 +#: ../yuminstall.py:127 msgid "Processing" msgstr "正在处理" -#: ../yuminstall.py:118 +#: ../yuminstall.py:128 msgid "Preparing transaction from installation source..." msgstr "正在处理安装文件..." -#: ../yuminstall.py:148 +#: ../yuminstall.py:158 #, python-format msgid "<b>Installing %s</b> (%s)\n" msgstr "<b>安装%s</b> (%s)\n" -#: ../yuminstall.py:185 +#: ../yuminstall.py:210 #, python-format msgid "%s of %s packages completed" msgstr "%s of %s 软件包安装完成" -#: ../yuminstall.py:195 +#: ../yuminstall.py:222 msgid "Finishing upgrade" msgstr "完成升级" -#: ../yuminstall.py:196 +#: ../yuminstall.py:223 msgid "Finishing upgrade process. This may take a little while..." msgstr "终止升级进程，可能要等一小会..." -#: ../yuminstall.py:445 ../yuminstall.py:642 ../yuminstall.py:793 -#: ../yuminstall.py:796 ../yuminstall.py:1012 ../yuminstall.py:1015 +#: ../yuminstall.py:327 +msgid "Copying File" +msgstr "正在复制文件" + +#: ../yuminstall.py:328 +msgid "Transferring install image to hard drive..." +msgstr "正在将安装映像传输到硬盘..." + +#: ../yuminstall.py:339 +#, fuzzy +msgid "" +"An error occurred transferring the install image to your hard drive. This " +"is probably due to bad media." +msgstr "将安装映像传输到硬盘时出错，很可能是磁盘空间不够。" + +#: ../yuminstall.py:343 +msgid "" +"An error occurred transferring the install image to your hard drive. You are " +"probably out of disk space." +msgstr "将安装映像传输到硬盘时出错，很可能是磁盘空间不够。" + +#: ../yuminstall.py:381 +msgid "Change Disc" +msgstr "更换光盘" + +#: ../yuminstall.py:382 +#, python-format +msgid "Please insert %s disc %d to continue." +msgstr "请插入 %s 光盘 %d 以继续。" + +#: ../yuminstall.py:396 +msgid "Wrong Disc" +msgstr "光盘不对" + +#: ../yuminstall.py:397 +#, python-format +msgid "That's not the correct %s disc." +msgstr "那不是正确的 %s 光盘。" + +#: ../yuminstall.py:403 +msgid "Unable to access the disc." +msgstr "无法读取光盘。" + +#: ../yuminstall.py:533 ../yuminstall.py:535 msgid "Re_boot" msgstr "重新引导(_b)" -#: ../yuminstall.py:598 ../yuminstall.py:599 +#: ../yuminstall.py:533 +#, fuzzy +msgid "_Eject" +msgstr "弹出光盘" + +#: ../yuminstall.py:539 +#, fuzzy, python-format +msgid "" +"The file %s cannot be opened. This is due to a missing file, a corrupt " +"package or corrupt media. Please verify your installation source.\n" +"\n" +"If you exit, your system will be left in an inconsistent state that will " +"likely require reinstallation.\n" +"\n" +msgstr "" +"无法打开 %s 文件。这是由于文件遗失或者软件包损坏造成的。请确定您的安装树包含" +"所有组件。\n" +"\n" +"您如果现在推出，您的系统会不稳定需要重新安装。\n" +"\n" + +#: ../yuminstall.py:579 +#, fuzzy +msgid "Retrying" +msgstr "检索" + +#: ../yuminstall.py:579 +msgid "Retrying package download..." +msgstr "" + +#: ../yuminstall.py:641 +#, 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 msgid "file conflicts" msgstr "文件冲突" -#: ../yuminstall.py:600 +#: ../yuminstall.py:676 msgid "older package(s)" msgstr "旧的软件包" -#: ../yuminstall.py:601 +#: ../yuminstall.py:677 msgid "insufficient disk space" msgstr "磁盘空间不足" -#: ../yuminstall.py:602 +#: ../yuminstall.py:678 msgid "insufficient disk inodes" msgstr "不足的磁盘节点" -#: ../yuminstall.py:603 +#: ../yuminstall.py:679 msgid "package conflicts" msgstr "软件包冲突" -#: ../yuminstall.py:604 +#: ../yuminstall.py:680 msgid "package already installed" msgstr "软件包已安装" -#: ../yuminstall.py:605 +#: ../yuminstall.py:681 msgid "required package" msgstr "需要的软件包" -#: ../yuminstall.py:606 +#: ../yuminstall.py:682 msgid "package for incorrect arch" msgstr "与硬件体系结构不兼容的软件包" -#: ../yuminstall.py:607 +#: ../yuminstall.py:683 msgid "package for incorrect os" msgstr "与操作系统不兼容的软件包" -#: ../yuminstall.py:621 +#: ../yuminstall.py:697 msgid "You need more space on the following file systems:\n" msgstr "您在以下文件系统中需要更多空间:\n" -#: ../yuminstall.py:637 -msgid "Error running transaction" -msgstr "错误运行记录" +#: ../yuminstall.py:710 +#, fuzzy, python-format +msgid "" +"There were file conflicts when checking the packages to be installed:\n" +"%s\n" +msgstr "哪一类介质包含要安装的软件包？" -#: ../yuminstall.py:638 -#, python-format +#: ../yuminstall.py:713 +#, fuzzy, python-format msgid "" -"There was an error running your transaction, for the following reason(s): %s" +"There was an error running your transaction for the following reason(s): %" +"s.\n" msgstr "出现错误，原因如下：%s" -#: ../yuminstall.py:733 +#: ../yuminstall.py:717 +#, fuzzy +msgid "Error Running Transaction" +msgstr "错误运行记录" + +#: ../yuminstall.py:722 +msgid "Error running transaction" +msgstr "错误运行记录" + +#: ../yuminstall.py:879 msgid "Retrieving installation information..." msgstr "获取安装信息..." -#: ../yuminstall.py:735 +#: ../yuminstall.py:881 #, python-format msgid "Retrieving installation information for %s..." msgstr "重新获取%s安装信息..." -#: ../yuminstall.py:763 ../yuminstall.py:1020 -#, python-format +#: ../yuminstall.py:905 ../yuminstall.py:1179 +#, fuzzy, python-format msgid "" "Unable to read package metadata. This may be due to a missing repodata " "directory. Please ensure that your install tree has been correctly " -"generated. %s" +"generated.\n" +"\n" +"%s" msgstr "" "无法读取软件包的元数据。这可能是因为缺少 repodata 目录。请确定您已经正确建立" "了安装树。%s" -#: ../yuminstall.py:803 +#: ../yuminstall.py:946 msgid "" "Unable to read group information from repositories. This is a problem with " "the generation of your install tree." msgstr "不能从仓库里读取组信息。这是您安装树的问题。" -#: ../yuminstall.py:836 +#: ../yuminstall.py:979 msgid "Uncategorized" msgstr "未分类的" -#: ../yuminstall.py:1045 +#: ../yuminstall.py:1204 #, python-format msgid "" "Your selected packages require %d MB of free space for installation, but you " @@ -2621,7 +2693,15 @@ msgstr "" "您选择的软件包共需要 %d MB 大小的磁盘安装空间，但是您没有足够的磁盘空间。您可" "以改变选择或者退出安装。" -#: ../yuminstall.py:1206 +#: ../yuminstall.py:1223 +msgid "Reboot?" +msgstr "重新引导？" + +#: ../yuminstall.py:1224 +msgid "The system will be rebooted now." +msgstr "系统现在将会被重新引导。" + +#: ../yuminstall.py:1388 #, python-format msgid "" "You appear to be upgrading from a system which is too old to upgrade to this " @@ -2630,150 +2710,181 @@ msgstr "" "您所升级的系统版本似乎太老，它不适合于升级到该版本的 %s。您肯定要继续升级进程" "吗？" -#: ../yuminstall.py:1235 +#: ../yuminstall.py:1415 +#, fuzzy, python-format +msgid "" +"The arch of the release of %s you are upgrading to appears to be %s which " +"does not match your previously installed arch of %s. This is likely to not " +"succeed. Are you sure you wish to continue the upgrade process?" +msgstr "" +"您所升级的系统版本似乎太老，它不适合于升级到该版本的 %s。您肯定要继续升级进程" +"吗？" + +#: ../yuminstall.py:1448 msgid "Install Starting" msgstr "安装开始" -#: ../yuminstall.py:1236 +#: ../yuminstall.py:1449 msgid "Starting install process. This may take several minutes..." msgstr "正在开启安装进程，可能会花几分钟时间..." -#: ../yuminstall.py:1252 +#: ../yuminstall.py:1468 msgid "Post Upgrade" msgstr "升级后" -#: ../yuminstall.py:1253 +#: ../yuminstall.py:1469 msgid "Performing post upgrade configuration..." msgstr "正在执行升级后配置..." -#: ../yuminstall.py:1255 +#: ../yuminstall.py:1471 msgid "Post Install" msgstr "安装后" -#: ../yuminstall.py:1256 +#: ../yuminstall.py:1472 msgid "Performing post install configuration..." msgstr "正在执行安装后配置..." -#: ../yuminstall.py:1473 +#: ../yuminstall.py:1690 msgid "Installation Progress" msgstr "安装过程" -#: ../yuminstall.py:1508 +#: ../yuminstall.py:1725 msgid "Dependency Check" msgstr "依赖关系检查" -#: ../yuminstall.py:1509 +#: ../yuminstall.py:1726 msgid "Checking dependencies in packages selected for installation..." msgstr "在所选定要安装的软件包中检查依赖关系..." -#: ../zfcp.py:43 +#: ../zfcp.py:49 msgid "You have not specified a device number or the number is invalid" msgstr "您没有指定设备号码或号码无效" -#: ../zfcp.py:45 +#: ../zfcp.py:51 msgid "You have not specified a worldwide port name or the name is invalid." msgstr "您没有指定全局端口号或号码无效。" -#: ../zfcp.py:47 +#: ../zfcp.py:53 msgid "You have not specified a FCP LUN or the number is invalid." msgstr "您没有指定 FCP LUN 或号码无效。" -#: ../iw/account_gui.py:26 -msgid "<b>Caps Lock is on.</b>" -msgstr "<b>大写锁定开</b>" +#: ../iw/account_gui.py:48 +#, fuzzy +msgid "Root _Password:" +msgstr "根口令(_P)：" + +#: ../iw/account_gui.py:50 +#, fuzzy +msgid "_Confirm:" +msgstr "确认(_C)：" -#: ../iw/account_gui.py:33 -msgid "Set Root Password" -msgstr "设置根口令" +#: ../iw/account_gui.py:74 +#, fuzzy +msgid "Caps Lock is on." +msgstr "<b>大写锁定开</b>" -#: ../iw/account_gui.py:48 ../iw/account_gui.py:56 ../iw/account_gui.py:63 -#: ../iw/account_gui.py:72 ../textw/userauth_text.py:69 +#: ../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 msgid "Error with Password" msgstr "口令错误" -#: ../iw/account_gui.py:49 +#: ../iw/account_gui.py:85 msgid "" "You must enter your root password and confirm it by typing it a second time " "to continue." msgstr "您必须输入根口令并再键入一次来确认以继续。" -#: ../iw/account_gui.py:57 +#: ../iw/account_gui.py:93 msgid "The passwords you entered were different. Please try again." msgstr "输入的口令不匹配，请重新输入。" -#: ../iw/account_gui.py:64 +#: ../iw/account_gui.py:100 msgid "The root password must be at least six characters long." msgstr "根口令最少应包含六个字符。" -#: ../iw/account_gui.py:73 ../textw/userauth_text.py:70 +#: ../iw/account_gui.py:107 ../textw/userauth_text.py:78 +#, fuzzy +msgid "Weak Password" +msgstr "口令" + +#: ../iw/account_gui.py:108 ../textw/userauth_text.py:79 +#, fuzzy, python-format +msgid "" +"Weak password provided: %s\n" +"\n" +"Would you like to continue with this password?" +msgstr "是否要继续升级？" + +#: ../iw/account_gui.py:120 ../textw/userauth_text.py:72 msgid "" "Requested password contains non-ASCII characters, which are not allowed." msgstr "所要求的口令包含非 ASCII 字符，它们不允许被用在口令中。" -#: ../iw/account_gui.py:107 +#: ../iw/autopart_type.py:94 msgid "" -"The root account is used for administering the system. Enter a password for " -"the root user." -msgstr "根帐号被用来管理系统。请为根用户输入一个口令。" - -#: ../iw/account_gui.py:122 -msgid "Root _Password: " -msgstr "根口令(_P)：" +"No partitions are available to resize. Only physical partitions with " +"specific filesystems can be resized." +msgstr "" -#: ../iw/account_gui.py:125 -msgid "_Confirm: " -msgstr "确认(_C)：" +#: ../iw/autopart_type.py:177 +msgid "Do you really want to boot from disk which is not used for instalation?" +msgstr "" -#: ../iw/autopart_type.py:155 +#: ../iw/autopart_type.py:258 msgid "Invalid Initiator Name" msgstr "无效启动器名称：" -#: ../iw/autopart_type.py:156 +#: ../iw/autopart_type.py:259 msgid "You must provide an initiator name." msgstr "您必须提供一个初始名。" -#: ../iw/autopart_type.py:178 +#: ../iw/autopart_type.py:281 msgid "Error with Data" msgstr "数据错误" -#: ../iw/autopart_type.py:286 ../textw/partition_text.py:1556 +#: ../iw/autopart_type.py:401 ../textw/partition_text.py:1516 msgid "Remove all partitions on selected drives and create default layout" msgstr "在选定磁盘上删除所有分区并创建默认分区结构" -#: ../iw/autopart_type.py:287 ../textw/partition_text.py:1557 +#: ../iw/autopart_type.py:402 ../textw/partition_text.py:1517 msgid "Remove Linux partitions on selected drives and create default layout" msgstr "在选定驱动上删除 linux 分区并创建默认的分区结构" -#: ../iw/autopart_type.py:288 ../textw/partition_text.py:1558 +#: ../iw/autopart_type.py:403 +#, fuzzy +msgid "Resize existing partition and create default layout in free space" +msgstr "在选定驱动上删除 linux 分区并创建默认的分区结构" + +#: ../iw/autopart_type.py:404 ../textw/partition_text.py:1518 msgid "Use free space on selected drives and create default layout" msgstr "使用选定驱动器中的空余空间并创建默认的分区结构" -#: ../iw/autopart_type.py:289 ../textw/partition_text.py:1559 +#: ../iw/autopart_type.py:405 ../textw/partition_text.py:1519 msgid "Create custom layout" msgstr "建立自定义的分区结构" -#: ../iw/blpasswidget.py:37 +#: ../iw/blpasswidget.py:45 +msgid "_Use a boot loader password" +msgstr "使用引导装载程序口令(_U)" + +#: ../iw/blpasswidget.py:46 +#, fuzzy msgid "" -"A boot loader password prevents users from changing options passed to the " -"kernel. For greater system security, it is recommended that you set a " -"password." +"A boot loader password prevents users from changing kernel options, " +"increasing security." msgstr "" "引导装载程序口令可以防止用户改变传递给内核的选项。为安全起见，我们建议您设立" "一个口令。" -#: ../iw/blpasswidget.py:42 -msgid "_Use a boot loader password" -msgstr "使用引导装载程序口令(_U)" - -#: ../iw/blpasswidget.py:73 +#: ../iw/blpasswidget.py:77 msgid "Change _password" msgstr "改变口令(_p)" -#: ../iw/blpasswidget.py:96 +#: ../iw/blpasswidget.py:100 msgid "Enter Boot Loader Password" msgstr "输入引导装载程序口令" -#: ../iw/blpasswidget.py:102 +#: ../iw/blpasswidget.py:106 msgid "" "Enter a boot loader password and then confirm it. (Note that your BIOS " "keymap may be different than the actual keymap you are used to.)" @@ -2781,23 +2892,23 @@ msgstr "" "输入引导装载程序口令，然后确认它。（注意，您的 BIOS 键映射可能和实际使用的键" "映射不同。）" -#: ../iw/blpasswidget.py:109 +#: ../iw/blpasswidget.py:113 msgid "_Password:" msgstr "口令(_P)：" -#: ../iw/blpasswidget.py:115 +#: ../iw/blpasswidget.py:119 msgid "Con_firm:" msgstr "确认(_f)：" -#: ../iw/blpasswidget.py:136 +#: ../iw/blpasswidget.py:140 msgid "Passwords don't match" msgstr "口令不匹配" -#: ../iw/blpasswidget.py:137 ../textw/bootloader_text.py:439 +#: ../iw/blpasswidget.py:141 ../textw/bootloader_text.py:443 msgid "Passwords do not match" msgstr "口令不匹配" -#: ../iw/blpasswidget.py:146 ../textw/bootloader_text.py:449 +#: ../iw/blpasswidget.py:150 ../textw/bootloader_text.py:453 msgid "" "Your boot loader password is shorter than six characters. We recommend a " "longer boot loader password.\n" @@ -2808,140 +2919,28 @@ msgstr "" "\n" "您想继续使用这一口令吗？" -#: ../iw/bootloader_advanced_gui.py:27 -msgid "Advanced Boot Loader Configuration" -msgstr "高级引导装载程序配置" - -#: ../iw/bootloader_advanced_gui.py:42 ../textw/bootloader_text.py:124 -msgid "" -"If LBA32 is not supported by your system's BIOS, forcing its use can prevent " -"your machine from booting.\n" -"\n" -"Would you like to continue and force LBA32 mode?" -msgstr "" -"当 BIOS 不支持您的引导装载程序时，若强制使用 LBA32 可能会导致您的机器无法被引" -"导。\n" -"\n" -"您想继续进行而强制进入 LBA32 模式吗？" - -#: ../iw/bootloader_advanced_gui.py:48 -msgid "Force LBA32" -msgstr "强制使用 LBA32" - -#: ../iw/bootloader_advanced_gui.py:69 -msgid "_Force LBA32 (not normally required)" -msgstr "强制使用 LBA32(_F) (通常不需要)" - -#: ../iw/bootloader_advanced_gui.py:73 -msgid "" -"If you wish to add default options to the boot command, enter them into the " -"'General kernel parameters' field." -msgstr "如果您想在引导命令上添加默认选项，在“常规内核参数”字段内输入它们。" - -#: ../iw/bootloader_advanced_gui.py:79 -msgid "_General kernel parameters" -msgstr "常规内核参数(_G)" - -#: ../iw/bootloader_main_gui.py:30 ../textw/bootloader_text.py:42 -#: ../textw/bootloader_text.py:107 ../textw/bootloader_text.py:164 -#: ../textw/bootloader_text.py:282 ../textw/bootloader_text.py:391 +#: ../iw/bootloader_main_gui.py:34 ../textw/bootloader_text.py:46 +#: ../textw/bootloader_text.py:111 ../textw/bootloader_text.py:168 +#: ../textw/bootloader_text.py:286 ../textw/bootloader_text.py:395 msgid "Boot Loader Configuration" msgstr "引导装载程序配置" -#: ../iw/bootloader_main_gui.py:117 -#, python-format -msgid "The %s boot loader will be installed on /dev/%s." -msgstr "%s 引导装载程序将会被安装在 /dev/%s 上。" - -#: ../iw/bootloader_main_gui.py:123 -msgid "No boot loader will be installed." -msgstr "无引导装载程序将会被安装。" - -#: ../iw/bootloader_main_gui.py:152 -msgid "Configure advanced boot loader _options" -msgstr "配置高级引导装载程序选项(_o)" - -#: ../iw/bootlocwidget.py:39 -msgid "Install Boot Loader record on:" -msgstr "引导装载程序记录的安装位置：" - -#: ../iw/bootlocwidget.py:72 -msgid "_Change Drive Order" -msgstr "改变驱动器顺序(_C)" - -#: ../iw/bootlocwidget.py:84 -msgid "Edit Drive Order" -msgstr "编辑驱动器顺序" - -#: ../iw/bootlocwidget.py:89 -msgid "" -"Arrange the drives to be in the same order as used by the BIOS. Changing the " -"drive order may be useful if you have multiple SCSI adapters or both SCSI " -"and IDE adapters and want to boot from the SCSI device.\n" -"\n" -"Changing the drive order will change where the installation program locates " -"the Master Boot Record (MBR)." -msgstr "" -"请按照您的 BIOS 处理顺序来排列您的驱动器。改变驱动器顺序只有在下面这两种情况" -"下才有用：您有多个 SCSI 适配器；或者您兼有 SCSI 和 IDE 设备，但想从 SCSI 设备" -"中引导。\n" -"\n" -"改变驱动器顺序会改变安装程序定位主引导记录(MBR)的位置。" - -#: ../iw/confirm_gui.py:29 ../textw/confirm_text.py:35 -#: ../textw/confirm_text.py:63 -msgid "Reboot?" -msgstr "重新引导？" - -#: ../iw/confirm_gui.py:30 ../textw/confirm_text.py:36 -#: ../textw/confirm_text.py:64 -msgid "The system will be rebooted now." -msgstr "系统现在将会被重新引导。" - -#: ../iw/confirm_gui.py:74 -msgid "About to Install" -msgstr "即将安装" - -#: ../iw/confirm_gui.py:80 -#, python-format -msgid "Click next to begin installation of %s." -msgstr "点击“下一步”来开始安装 %s。" - -#: ../iw/confirm_gui.py:81 -#, python-format -msgid "" -"A complete log of the installation can be found in the file '%s' after " -"rebooting your system.\n" -"\n" -"A kickstart file containing the installation options selected can be found " -"in the file '%s' after rebooting the system." -msgstr "" -"重新引导系统后，您将会在 '%s' 文件中找到完整的安装日志。\n" -"\n" -"重新引导系统后，您将会在 '%s' 文件中找到包含您所选择的安装选项的 kickstart 文" -"件。" - -#: ../iw/confirm_gui.py:88 -msgid "About to Upgrade" -msgstr "即将升级" - -#: ../iw/confirm_gui.py:94 -#, python-format -msgid "Click next to begin upgrade of %s." -msgstr "点击“下一步”来开始升级 %s。" +#: ../iw/bootloader_main_gui.py:170 ../iw/bootloader_main_gui.py:175 +#: ../iw/bootloader_main_gui.py:212 +#, fuzzy, python-format +msgid "_Install boot loader on /dev/%s." +msgstr "正在安装引导装载程序..." -#: ../iw/confirm_gui.py:95 -#, python-format -msgid "" -"A complete log of the upgrade can be found in the file '%s' after rebooting " -"your system." -msgstr "重新引导系统后，您将会在 %s 文件中找到完整的升级日志。" +#: ../iw/bootloader_main_gui.py:218 +#, fuzzy +msgid "_Change device" +msgstr "更换光盘" -#: ../iw/congrats_gui.py:25 +#: ../iw/congrats_gui.py:31 msgid "Congratulations" msgstr "祝贺您" -#: ../iw/congrats_gui.py:65 +#: ../iw/congrats_gui.py:71 msgid "" "Press the \"Reboot\" button to reboot your system.\n" "\n" @@ -2949,7 +2948,7 @@ msgstr "" "按重启按钮来重新引导您的系统.\n" "\n" -#: ../iw/congrats_gui.py:69 +#: ../iw/congrats_gui.py:75 #, python-format msgid "" "Congratulations, the installation is complete.\n" @@ -2960,39 +2959,27 @@ msgstr "" "\n" "%s%s" -#: ../iw/driveorderwidget.py:44 -msgid "Drive" -msgstr "驱动器" - -#: ../iw/driveorderwidget.py:44 ../textw/partition_text.py:1462 -msgid "Size" -msgstr "大小" - -#: ../iw/driveorderwidget.py:44 -msgid "Model" -msgstr "型号" - -#: ../iw/examine_gui.py:28 +#: ../iw/examine_gui.py:35 msgid "Upgrade Examine" msgstr "升级检查" -#: ../iw/examine_gui.py:50 +#: ../iw/examine_gui.py:57 #, python-format msgid "_Install %s" msgstr "安装 %s(_I)" -#: ../iw/examine_gui.py:52 +#: ../iw/examine_gui.py:59 msgid "" "Choose this option to freshly install your system. Existing software and " "data may be overwritten depending on your configuration choices." msgstr "" "选择该选项来重新安装系统。根据您的配置选择而定，现存软件和数据可能会被覆盖。" -#: ../iw/examine_gui.py:56 +#: ../iw/examine_gui.py:63 msgid "_Upgrade an existing installation" msgstr "升级现有安装(_U)" -#: ../iw/examine_gui.py:58 +#: ../iw/examine_gui.py:65 #, python-format msgid "" "Choose this option if you would like to upgrade your existing %s system. " @@ -3000,31 +2987,31 @@ msgid "" msgstr "" "如果您想升级现有的 %s 系统，选择该选项。该选项会保留您的驱动器上的数据。" -#: ../iw/examine_gui.py:105 ../iw/pixmapRadioButtonGroup_gui.py:197 +#: ../iw/examine_gui.py:112 ../iw/pixmapRadioButtonGroup_gui.py:203 msgid "The following installed system will be upgraded:" msgstr "下列安装的系统将会被升级：" -#: ../iw/examine_gui.py:118 +#: ../iw/examine_gui.py:125 msgid "Unknown Linux system" msgstr "未知的 Linux 系统" -#: ../iw/language_gui.py:24 ../textw/language_text.py:37 +#: ../iw/language_gui.py:30 ../textw/language_text.py:44 msgid "Language Selection" msgstr "语言选择" -#: ../iw/language_gui.py:67 ../textw/language_text.py:38 ../loader2/lang.c:367 +#: ../iw/language_gui.py:76 ../textw/language_text.py:45 ../loader2/lang.c:374 msgid "What language would you like to use during the installation process?" msgstr "您在安装过程中想使用何种语言？" -#: ../iw/lvm_dialog_gui.py:115 ../iw/lvm_dialog_gui.py:162 -#: ../iw/lvm_dialog_gui.py:173 ../iw/lvm_dialog_gui.py:213 -#: ../iw/lvm_dialog_gui.py:287 ../iw/lvm_dialog_gui.py:601 -#: ../iw/lvm_dialog_gui.py:669 ../iw/lvm_dialog_gui.py:880 -#: ../textw/partition_text.py:1313 ../textw/partition_text.py:1332 +#: ../iw/lvm_dialog_gui.py:122 ../iw/lvm_dialog_gui.py:169 +#: ../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 msgid "Not enough space" msgstr "空间不够" -#: ../iw/lvm_dialog_gui.py:116 +#: ../iw/lvm_dialog_gui.py:123 msgid "" "The physical extent size cannot be changed because otherwise the space " "required by the currently defined logical volumes will be increased to more " @@ -3033,11 +3020,11 @@ msgstr "" "物理范围的大小不能被改变，否则，当前已定义的逻辑卷所要求的空间将有可能超过可" "用空间。" -#: ../iw/lvm_dialog_gui.py:125 +#: ../iw/lvm_dialog_gui.py:132 msgid "Confirm Physical Extent Change" msgstr "确认物理范围改变" -#: ../iw/lvm_dialog_gui.py:126 +#: ../iw/lvm_dialog_gui.py:133 msgid "" "This change in the value of the physical extent will require the sizes of " "the current logical volume requests to be rounded up in size to an integer " @@ -3050,12 +3037,12 @@ msgstr "" "\n" "这项改变会立即生效。" -#: ../iw/lvm_dialog_gui.py:135 ../iw/lvm_dialog_gui.py:195 -#: ../iw/network_gui.py:143 ../iw/network_gui.py:147 ../iw/network_gui.py:167 +#: ../iw/lvm_dialog_gui.py:142 ../iw/lvm_dialog_gui.py:202 +#: ../iw/network_gui.py:142 ../iw/network_gui.py:146 ../iw/network_gui.py:166 msgid "C_ontinue" msgstr "继续(_o)" -#: ../iw/lvm_dialog_gui.py:163 +#: ../iw/lvm_dialog_gui.py:170 #, python-format msgid "" "The physical extent size cannot be changed because the value selected (%" @@ -3065,7 +3052,7 @@ msgstr "" "物理范围大小无法被改变，因为选定的值（%10.2f MB）大于该卷组中最小的物理卷（%" "10.2f MB）。" -#: ../iw/lvm_dialog_gui.py:174 +#: ../iw/lvm_dialog_gui.py:181 #, python-format msgid "" "The physical extent size cannot be changed because the value selected (%" @@ -3075,17 +3062,17 @@ msgstr "" "物理范围大小无法被改变，因为选定的值（%10.2f MB）大于该卷组中最小的物理卷（%" "10.2f MB）。" -#: ../iw/lvm_dialog_gui.py:188 +#: ../iw/lvm_dialog_gui.py:195 msgid "Too small" msgstr "太小" -#: ../iw/lvm_dialog_gui.py:189 +#: ../iw/lvm_dialog_gui.py:196 msgid "" "This change in the value of the physical extent will waste substantial space " "on one or more of the physical volumes in the volume group." msgstr "改变物理范围的值会在卷组中一个或多个物理卷上浪费大量空间。" -#: ../iw/lvm_dialog_gui.py:214 +#: ../iw/lvm_dialog_gui.py:221 #, python-format msgid "" "The physical extent size cannot be changed because the resulting maximum " @@ -3095,104 +3082,101 @@ msgstr "" "物理范围大小无法被改变，因为改变的结果会导致最大的逻辑卷大小（%10.2f MB）小于" "一个或多个当前已定义的逻辑卷。" -#: ../iw/lvm_dialog_gui.py:288 +#: ../iw/lvm_dialog_gui.py:295 msgid "" "You cannot remove this physical volume because otherwise the volume group " "will be too small to hold the currently defined logical volumes." msgstr "您不能删除该物理卷，否则，该卷组就会小得不能容纳目前已定义的逻辑卷。" -#: ../iw/lvm_dialog_gui.py:368 ../textw/partition_text.py:1151 +#: ../iw/lvm_dialog_gui.py:375 ../textw/partition_text.py:1113 msgid "Make Logical Volume" msgstr "制作逻辑卷" -#: ../iw/lvm_dialog_gui.py:371 +#: ../iw/lvm_dialog_gui.py:378 #, python-format msgid "Edit Logical Volume: %s" msgstr "编辑逻辑卷：%s" -#: ../iw/lvm_dialog_gui.py:373 ../textw/partition_text.py:1149 +#: ../iw/lvm_dialog_gui.py:380 ../textw/partition_text.py:1111 msgid "Edit Logical Volume" msgstr "编辑逻辑卷" -#: ../iw/lvm_dialog_gui.py:386 ../iw/partition_dialog_gui.py:293 -#: ../iw/raid_dialog_gui.py:280 +#: ../iw/lvm_dialog_gui.py:393 ../iw/partition_dialog_gui.py:322 +#: ../iw/raid_dialog_gui.py:319 msgid "_Mount Point:" msgstr "挂载点(_M)：" -#: ../iw/lvm_dialog_gui.py:394 ../iw/raid_dialog_gui.py:289 +#: ../iw/lvm_dialog_gui.py:401 ../iw/raid_dialog_gui.py:332 msgid "_File System Type:" msgstr "文件系统类型(_F)：" -#: ../iw/lvm_dialog_gui.py:404 ../iw/partition_dialog_gui.py:312 -#: ../iw/raid_dialog_gui.py:299 +#: ../iw/lvm_dialog_gui.py:411 ../iw/raid_dialog_gui.py:342 msgid "Original File System Type:" msgstr "原始文件系统类型：" -#: ../iw/lvm_dialog_gui.py:409 ../iw/partition_dialog_gui.py:323 -#: ../iw/raid_dialog_gui.py:304 +#: ../iw/lvm_dialog_gui.py:416 ../iw/raid_dialog_gui.py:347 msgid "Unknown" msgstr "未知" -#: ../iw/lvm_dialog_gui.py:415 ../iw/partition_dialog_gui.py:358 -#: ../iw/raid_dialog_gui.py:310 +#: ../iw/lvm_dialog_gui.py:422 ../iw/partition_dialog_gui.py:374 +#: ../iw/raid_dialog_gui.py:353 msgid "Original File System Label:" msgstr "原始文件系统标签：" -#: ../iw/lvm_dialog_gui.py:424 +#: ../iw/lvm_dialog_gui.py:431 msgid "_Logical Volume Name:" msgstr "逻辑卷名称(_L)：" -#: ../iw/lvm_dialog_gui.py:432 ../textw/partition_text.py:298 +#: ../iw/lvm_dialog_gui.py:439 ../textw/partition_text.py:304 msgid "Logical Volume Name:" msgstr "逻辑卷名称：" -#: ../iw/lvm_dialog_gui.py:440 ../iw/partition_dialog_gui.py:370 +#: ../iw/lvm_dialog_gui.py:447 ../iw/partition_dialog_gui.py:386 msgid "_Size (MB):" msgstr "大小(MB)(_S)：" -#: ../iw/lvm_dialog_gui.py:446 ../iw/partition_dialog_gui.py:387 -#: ../iw/partition_dialog_gui.py:430 ../textw/partition_text.py:313 -#: ../textw/partition_text.py:390 ../textw/partition_text.py:473 -#: ../textw/partition_text.py:581 +#: ../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 msgid "Size (MB):" msgstr "大小(MB)：" -#: ../iw/lvm_dialog_gui.py:461 +#: ../iw/lvm_dialog_gui.py:468 #, python-format msgid "(Max size is %s MB)" msgstr "(最大大小是 %s MB)" -#: ../iw/lvm_dialog_gui.py:522 ../textw/partition_text.py:1302 +#: ../iw/lvm_dialog_gui.py:525 ../textw/partition_text.py:1263 msgid "Illegal size" msgstr "大小无效" -#: ../iw/lvm_dialog_gui.py:523 ../textw/partition_text.py:1303 +#: ../iw/lvm_dialog_gui.py:526 ../textw/partition_text.py:1264 msgid "The requested size as entered is not a valid number greater than 0." msgstr "您所申请的大小值不是一个大于0的有效数字。" -#: ../iw/lvm_dialog_gui.py:556 +#: ../iw/lvm_dialog_gui.py:561 msgid "Mount point in use" msgstr "挂载点已被使用" -#: ../iw/lvm_dialog_gui.py:557 +#: ../iw/lvm_dialog_gui.py:562 #, python-format msgid "The mount point \"%s\" is in use. Please pick another." msgstr "挂载点 \"%s\" 已被使用，请另选一个。" -#: ../iw/lvm_dialog_gui.py:568 ../textw/partition_text.py:1273 +#: ../iw/lvm_dialog_gui.py:573 ../textw/partition_text.py:1234 msgid "Illegal Logical Volume Name" msgstr "逻辑卷名称无效" -#: ../iw/lvm_dialog_gui.py:587 ../textw/partition_text.py:1290 +#: ../iw/lvm_dialog_gui.py:592 ../textw/partition_text.py:1251 msgid "Illegal logical volume name" msgstr "逻辑卷名称无效" -#: ../iw/lvm_dialog_gui.py:588 ../textw/partition_text.py:1291 +#: ../iw/lvm_dialog_gui.py:593 ../textw/partition_text.py:1252 #, python-format msgid "The logical volume name \"%s\" is already in use. Please pick another." msgstr "逻辑卷名 \"%s\" 已被使用，请另选一个。" -#: ../iw/lvm_dialog_gui.py:602 +#: ../iw/lvm_dialog_gui.py:607 #, python-format msgid "" "The current requested size (%10.2f MB) is larger than the maximum logical " @@ -3202,15 +3186,15 @@ msgstr "" "目前设定的磁盘空间（%10.2f MB）大于逻辑卷磁盘空间的最大值（%10.2f MB）。要提" "高上限，您可以从未分区的磁盘空间中生成更多物理逻辑卷，并将其加入该逻辑卷组。" -#: ../iw/lvm_dialog_gui.py:646 ../iw/partition_dialog_gui.py:179 -#: ../iw/partition_dialog_gui.py:191 ../iw/partition_dialog_gui.py:239 -#: ../iw/raid_dialog_gui.py:207 ../textw/partition_text.py:922 -#: ../textw/partition_text.py:944 ../textw/partition_text.py:1119 -#: ../textw/partition_text.py:1352 +#: ../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 msgid "Error With Request" msgstr "申请出错" -#: ../iw/lvm_dialog_gui.py:670 ../iw/lvm_dialog_gui.py:881 +#: ../iw/lvm_dialog_gui.py:675 ../iw/lvm_dialog_gui.py:894 #, python-format msgid "" "The logical volumes you have configured require %d MB, but the volume group " @@ -3219,20 +3203,20 @@ msgid "" msgstr "" "您配置的逻辑卷需要 %dMB，但是该卷组只有 %d MB。请扩大该卷组，或缩小该逻辑卷。" -#: ../iw/lvm_dialog_gui.py:720 +#: ../iw/lvm_dialog_gui.py:733 msgid "No free slots" msgstr "无空闲插槽" -#: ../iw/lvm_dialog_gui.py:721 +#: ../iw/lvm_dialog_gui.py:734 #, python-format msgid "You cannot create more than %s logical volumes per volume group." msgstr "在每个卷组中，您不能创建多于 %s 个逻辑卷。" -#: ../iw/lvm_dialog_gui.py:727 +#: ../iw/lvm_dialog_gui.py:740 msgid "No free space" msgstr "无空闲空间" -#: ../iw/lvm_dialog_gui.py:728 +#: ../iw/lvm_dialog_gui.py:741 msgid "" "There is no room left in the volume group to create new logical volumes. To " "add a logical volume you must reduce the size of one or more of the " @@ -3241,29 +3225,29 @@ msgstr "" "卷组中没有创建新逻辑卷的空间。要添加逻辑卷，您需要缩小一个或多个现存逻辑卷的" "大小。" -#: ../iw/lvm_dialog_gui.py:756 +#: ../iw/lvm_dialog_gui.py:769 #, python-format msgid "Are you sure you want to delete the logical volume \"%s\"?" msgstr "是否确定要删除该逻辑卷\"%s\"?" -#: ../iw/lvm_dialog_gui.py:892 +#: ../iw/lvm_dialog_gui.py:905 msgid "Invalid Volume Group Name" msgstr "卷组名称无效" -#: ../iw/lvm_dialog_gui.py:903 +#: ../iw/lvm_dialog_gui.py:916 msgid "Name in use" msgstr "名称已被使用" -#: ../iw/lvm_dialog_gui.py:904 +#: ../iw/lvm_dialog_gui.py:917 #, python-format msgid "The volume group name \"%s\" is already in use. Please pick another." msgstr "卷组名称\"%s\" 已被使用，请另选一个。" -#: ../iw/lvm_dialog_gui.py:947 +#: ../iw/lvm_dialog_gui.py:960 msgid "Not enough physical volumes" msgstr "没有足够的物理卷" -#: ../iw/lvm_dialog_gui.py:948 +#: ../iw/lvm_dialog_gui.py:961 msgid "" "At least one unused physical volume partition is needed to create an LVM " "Volume Group.\n" @@ -3275,111 +3259,112 @@ msgstr "" "\n" "首先创建类型为“物理卷(LVM)”的分区或 RAID 阵列，然后再选择 \"LVM\" 选项。" -#: ../iw/lvm_dialog_gui.py:959 +#: ../iw/lvm_dialog_gui.py:972 msgid "Make LVM Volume Group" msgstr "制作 LVM 卷组" -#: ../iw/lvm_dialog_gui.py:962 +#: ../iw/lvm_dialog_gui.py:975 #, python-format msgid "Edit LVM Volume Group: %s" msgstr "编辑 LVM 卷组：%s" -#: ../iw/lvm_dialog_gui.py:964 +#: ../iw/lvm_dialog_gui.py:977 msgid "Edit LVM Volume Group" msgstr "编辑 LVM 卷组" -#: ../iw/lvm_dialog_gui.py:980 +#: ../iw/lvm_dialog_gui.py:993 msgid "_Volume Group Name:" msgstr "卷组名称(_V)：" -#: ../iw/lvm_dialog_gui.py:988 +#: ../iw/lvm_dialog_gui.py:1001 msgid "Volume Group Name:" msgstr "卷组名称：" -#: ../iw/lvm_dialog_gui.py:996 +#: ../iw/lvm_dialog_gui.py:1009 msgid "_Physical Extent:" msgstr "物理范围(_P)：" -#: ../iw/lvm_dialog_gui.py:1011 +#: ../iw/lvm_dialog_gui.py:1024 msgid "Physical Volumes to _Use:" msgstr "要使用的物理卷(_U)：" -#: ../iw/lvm_dialog_gui.py:1017 +#: ../iw/lvm_dialog_gui.py:1030 msgid "Used Space:" msgstr "已用空间：" -#: ../iw/lvm_dialog_gui.py:1034 +#: ../iw/lvm_dialog_gui.py:1047 msgid "Free Space:" msgstr "空闲空间：" -#: ../iw/lvm_dialog_gui.py:1052 +#: ../iw/lvm_dialog_gui.py:1065 msgid "Total Space:" msgstr "总计空间：" -#: ../iw/lvm_dialog_gui.py:1081 +#: ../iw/lvm_dialog_gui.py:1094 msgid "Logical Volume Name" msgstr "逻辑卷名称" -#: ../iw/lvm_dialog_gui.py:1084 ../iw/partition_gui.py:364 -#: ../iw/upgrade_swap_gui.py:136 ../textw/partition_text.py:1462 -#: ../textw/upgrade_text.py:106 +#: ../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 msgid "Mount Point" msgstr "挂载点" -#: ../iw/lvm_dialog_gui.py:1087 ../iw/partition_gui.py:369 +#: ../iw/lvm_dialog_gui.py:1100 ../iw/partition_gui.py:374 msgid "Size (MB)" msgstr "大小(MB)" -#: ../iw/lvm_dialog_gui.py:1101 ../iw/osbootwidget.py:96 +#: ../iw/lvm_dialog_gui.py:1114 ../iw/osbootwidget.py:94 msgid "_Add" msgstr "添加(_A)" -#: ../iw/lvm_dialog_gui.py:1104 ../iw/network_gui.py:448 -#: ../iw/osbootwidget.py:100 ../iw/partition_gui.py:1352 +#: ../iw/lvm_dialog_gui.py:1117 ../iw/network_gui.py:457 +#: ../iw/osbootwidget.py:98 ../iw/partition_gui.py:1379 msgid "_Edit" msgstr "编辑(_E)" -#: ../iw/lvm_dialog_gui.py:1119 -msgid "Logical Volumes" +#: ../iw/lvm_dialog_gui.py:1132 +#, fuzzy +msgid "_Logical Volumes" msgstr "逻辑卷" -#: ../iw/mouse_gui.py:24 +#: ../iw/mouse_gui.py:29 msgid "Mouse Configuration" msgstr "鼠标配置" -#: ../iw/mouse_gui.py:77 ../textw/mouse_text.py:20 +#: ../iw/mouse_gui.py:82 ../textw/mouse_text.py:26 msgid "/dev/ttyS0 (COM1 under DOS)" msgstr "/dev/ttyS0 (DOS 下的 COM1)" -#: ../iw/mouse_gui.py:78 ../textw/mouse_text.py:21 +#: ../iw/mouse_gui.py:83 ../textw/mouse_text.py:27 msgid "/dev/ttyS1 (COM2 under DOS)" msgstr "/dev/ttyS1 (DOS 下的 COM2)" -#: ../iw/mouse_gui.py:79 ../textw/mouse_text.py:22 +#: ../iw/mouse_gui.py:84 ../textw/mouse_text.py:28 msgid "/dev/ttyS2 (COM3 under DOS)" msgstr "/dev/ttyS2 (DOS 下的 COM3)" -#: ../iw/mouse_gui.py:80 ../textw/mouse_text.py:23 +#: ../iw/mouse_gui.py:85 ../textw/mouse_text.py:29 msgid "/dev/ttyS3 (COM4 under DOS)" msgstr "/dev/ttyS3 (DOS 下的 COM4)" -#: ../iw/mouse_gui.py:90 ../iw/osbootwidget.py:157 +#: ../iw/mouse_gui.py:95 ../iw/osbootwidget.py:151 msgid "_Device" msgstr "设备(_D)" -#: ../iw/mouse_gui.py:136 +#: ../iw/mouse_gui.py:141 msgid "_Model" msgstr "型号(_M)" -#: ../iw/mouse_gui.py:234 +#: ../iw/mouse_gui.py:239 msgid "_Emulate 3 buttons" msgstr "模拟三键(_E)" -#: ../iw/mouse_gui.py:249 +#: ../iw/mouse_gui.py:254 msgid "Select the appropriate mouse for the system." msgstr "为系统选择恰当的鼠标。" -#: ../iw/netconfig_dialog.py:137 +#: ../iw/netconfig_dialog.py:143 #, python-format msgid "" "An error occurred converting the value entered for \"%s\":\n" @@ -3388,102 +3373,98 @@ msgstr "" "转换为\"%s\"输入的值时出错：\n" "%s" -#: ../iw/netconfig_dialog.py:139 ../iw/netconfig_dialog.py:148 -#: ../iw/network_gui.py:142 ../iw/network_gui.py:146 ../iw/network_gui.py:150 -#: ../iw/network_gui.py:154 ../iw/network_gui.py:162 ../iw/network_gui.py:167 -#: ../textw/network_text.py:47 ../textw/network_text.py:52 -#: ../textw/network_text.py:58 +#: ../iw/netconfig_dialog.py:145 ../iw/netconfig_dialog.py:154 +#: ../iw/network_gui.py:141 ../iw/network_gui.py:145 ../iw/network_gui.py:149 +#: ../iw/network_gui.py:153 ../iw/network_gui.py:161 ../iw/network_gui.py:166 +#: ../textw/network_text.py:52 ../textw/network_text.py:57 +#: ../textw/network_text.py:63 msgid "Error With Data" msgstr "数据错误" -#: ../iw/netconfig_dialog.py:147 ../iw/network_gui.py:155 -#: ../textw/network_text.py:48 +#: ../iw/netconfig_dialog.py:153 ../iw/network_gui.py:154 +#: ../textw/network_text.py:53 #, python-format msgid "A value is required for the field %s." msgstr "%s字段需要输入值。" -#: ../iw/netconfig_dialog.py:169 +#: ../iw/netconfig_dialog.py:175 msgid "Dynamic IP" msgstr "动态 IP" -#: ../iw/netconfig_dialog.py:170 ../loader2/net.c:413 ../loader2/net.c:830 +#: ../iw/netconfig_dialog.py:176 ../loader2/net.c:420 ../loader2/net.c:864 #, c-format, python-format msgid "Sending request for IP information for %s..." msgstr "正在为 %s 发送 IP 信息请求..." -#: ../iw/netconfig_dialog.py:191 ../iw/netconfig_dialog.py:194 -#: ../textw/network_text.py:88 tmp/netpostconfig.glade.h:12 +#: ../iw/netconfig_dialog.py:197 ../iw/netconfig_dialog.py:200 +#: ../textw/network_text.py:93 tmp/netpostconfig.glade.h:12 msgid "IP Address" msgstr "IP 地址" -#: ../iw/netconfig_dialog.py:201 ../iw/netconfig_dialog.py:204 -msgid "Netmask" -msgstr "子网掩码" - -#: ../iw/netconfig_dialog.py:211 +#: ../iw/netconfig_dialog.py:207 msgid "IPv4 CIDR prefix must be between 0 and 32." msgstr "IPv4 CIDR 前缀必须在0和32之间。" -#: ../iw/netconfig_dialog.py:212 ../iw/netconfig_dialog.py:218 -#: ../iw/netconfig_dialog.py:226 ../iw/netconfig_dialog.py:229 +#: ../iw/netconfig_dialog.py:208 ../iw/netconfig_dialog.py:214 +#: ../iw/netconfig_dialog.py:222 ../iw/netconfig_dialog.py:225 msgid "IPv4 Network Mask" msgstr "IPv4/子网掩码" -#: ../iw/netconfig_dialog.py:235 ../iw/netconfig_dialog.py:238 -#: ../iw/network_gui.py:27 ../iw/network_gui.py:524 +#: ../iw/netconfig_dialog.py:232 ../iw/netconfig_dialog.py:235 +#: ../iw/network_gui.py:34 ../iw/network_gui.py:533 msgid "Gateway" msgstr "网关" -#: ../iw/netconfig_dialog.py:245 +#: ../iw/netconfig_dialog.py:242 msgid "Nameserver" msgstr "名称服务器" -#: ../iw/netconfig_dialog.py:255 +#: ../iw/netconfig_dialog.py:252 msgid "Error configuring network device:" msgstr "配置网络界面时出错:" -#: ../iw/netconfig_dialog.py:268 +#: ../iw/netconfig_dialog.py:265 msgid "Error configuring network device" msgstr "配置网络界面时出错" -#: ../iw/network_gui.py:27 ../iw/network_gui.py:526 +#: ../iw/network_gui.py:34 ../iw/network_gui.py:535 msgid "Primary DNS" msgstr "主 DNS" -#: ../iw/network_gui.py:27 ../iw/network_gui.py:528 +#: ../iw/network_gui.py:34 ../iw/network_gui.py:537 msgid "Secondary DNS" msgstr "从 DNS" -#: ../iw/network_gui.py:28 +#: ../iw/network_gui.py:35 msgid "_Gateway" msgstr "网关(_G)" -#: ../iw/network_gui.py:28 +#: ../iw/network_gui.py:35 msgid "_Primary DNS" msgstr "主 DNS(_P)" -#: ../iw/network_gui.py:28 +#: ../iw/network_gui.py:35 msgid "_Secondary DNS" msgstr "从 DNS(_S)" -#: ../iw/network_gui.py:31 ../textw/network_text.py:527 +#: ../iw/network_gui.py:38 ../textw/network_text.py:532 msgid "Network Configuration" msgstr "网络配置" -#: ../iw/network_gui.py:143 +#: ../iw/network_gui.py:142 msgid "" "You have not specified a hostname. Depending on your network environment " "this may cause problems later." msgstr "您还没有指定主机名。根据您的网络环境情况，这可能会在以后导致问题。" -#: ../iw/network_gui.py:147 +#: ../iw/network_gui.py:146 #, python-format msgid "" "You have not specified the field \"%s\". Depending on your network " "environment this may cause problems later." msgstr "您还没有指定\"%s\"字段。根据您的网络环境情况，这可能会在以后导致问题。" -#: ../iw/network_gui.py:151 ../textw/network_text.py:817 +#: ../iw/network_gui.py:150 ../textw/network_text.py:820 #, python-format msgid "" "The hostname \"%s\" is not valid for the following reason:\n" @@ -3494,23 +3475,16 @@ msgstr "" "\n" "%s" -#: ../iw/network_gui.py:158 ../textw/network_text.py:38 +#: ../iw/network_gui.py:157 ../textw/network_text.py:43 #, python-format msgid "Error With %s Data" msgstr "%s数据错误" -#: ../iw/network_gui.py:159 ../textw/network_text.py:39 -#: ../textw/network_text.py:590 ../textw/network_text.py:594 -#: ../textw/welcome_text.py:22 -#, python-format -msgid "%s" -msgstr "%s" - -#: ../iw/network_gui.py:163 ../textw/network_text.py:59 +#: ../iw/network_gui.py:162 ../textw/network_text.py:64 msgid "The IPv4 information you have entered is invalid." msgstr "您所输入的 IPv4 信息无效." -#: ../iw/network_gui.py:167 +#: ../iw/network_gui.py:166 msgid "" "You have no active network devices. Your system will not be able to " "communicate over a network by default without at least one device active." @@ -3518,118 +3492,112 @@ msgstr "" "您没有活跃的网络设备。至少需要一个活跃的网络设备，您的系统才能默认使用网络交" "换数据。" -#: ../iw/network_gui.py:292 ../iw/network_gui.py:306 +#: ../iw/network_gui.py:291 ../iw/network_gui.py:305 msgid "Disabled" msgstr "禁用" -#: ../iw/network_gui.py:389 +#: ../iw/network_gui.py:398 msgid "Active on Boot" msgstr "引导时激活" -#: ../iw/network_gui.py:391 ../iw/osbootwidget.py:67 -#: ../iw/partition_gui.py:363 ../textw/bootloader_text.py:192 -#: ../textw/bootloader_text.py:258 ../textw/mouse_text.py:38 -#: ../textw/partition_text.py:1462 +#: ../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 msgid "Device" msgstr "设备" -#: ../iw/network_gui.py:393 +#: ../iw/network_gui.py:402 msgid "IPv4/Netmask" msgstr "IPv4/子网掩码" -#: ../iw/network_gui.py:395 +#: ../iw/network_gui.py:404 msgid "IPv6/Prefix" msgstr "IPv6/前缀" -#: ../iw/network_gui.py:455 +#: ../iw/network_gui.py:464 msgid "Network Devices" msgstr "网络设备" -#: ../iw/network_gui.py:466 +#: ../iw/network_gui.py:475 msgid "Set the hostname:" msgstr "设置主机名：" -#: ../iw/network_gui.py:471 +#: ../iw/network_gui.py:480 msgid "_automatically via DHCP" msgstr "通过 DHCP 自动配置(_a)" -#: ../iw/network_gui.py:478 +#: ../iw/network_gui.py:487 msgid "_manually" msgstr "手工设置(_m)" -#: ../iw/network_gui.py:483 +#: ../iw/network_gui.py:492 msgid "(e.g., host.domain.com)" msgstr "(例如：host.domain.com)" -#: ../iw/network_gui.py:489 +#: ../iw/network_gui.py:498 msgid "Hostname" msgstr "主机名" -#: ../iw/network_gui.py:533 +#: ../iw/network_gui.py:542 msgid "Miscellaneous Settings" msgstr "各种设置" -#: ../iw/network_gui.py:621 +#: ../iw/network_gui.py:630 msgid "Edit Device " msgstr "编辑设备" -#: ../iw/network_gui.py:625 +#: ../iw/network_gui.py:634 msgid "Unknown Ethernet Device" msgstr "未知以太网设备" -#: ../iw/network_gui.py:631 +#: ../iw/network_gui.py:640 msgid "unknown" msgstr "未知" -#: ../iw/network_gui.py:633 +#: ../iw/network_gui.py:642 msgid "Hardware address: " msgstr "硬件地址:" -#: ../iw/network_gui.py:769 ../textw/network_text.py:223 ../loader2/net.c:791 +#: ../iw/network_gui.py:778 ../textw/network_text.py:228 ../loader2/net.c:824 msgid "Missing Protocol" msgstr "缺少网络协议" -#: ../iw/network_gui.py:770 ../textw/network_text.py:224 +#: ../iw/network_gui.py:779 ../textw/network_text.py:229 msgid "You must select at least IPv4 or IPv6 support." msgstr "您必须至少选择IPv4或IPv6支持." -#: ../iw/network_gui.py:793 ../iw/network_gui.py:834 ../iw/network_gui.py:840 -#: ../textw/network_text.py:69 ../loader2/net.c:97 +#: ../iw/network_gui.py:802 ../iw/network_gui.py:843 ../iw/network_gui.py:849 +#: ../textw/network_text.py:74 ../loader2/net.c:96 msgid "Invalid Prefix" msgstr "无效的前缀" -#: ../iw/network_gui.py:794 +#: ../iw/network_gui.py:803 msgid "IPv4 prefix must be between 0 and 32." msgstr "IPv4 的前缀必须在0和32之间。" -#: ../iw/network_gui.py:835 ../iw/network_gui.py:841 +#: ../iw/network_gui.py:844 ../iw/network_gui.py:850 msgid "IPv6 prefix must be between 0 and 128." msgstr "IPv6 的前缀必须在0到128之间。" -#: ../iw/osbootwidget.py:43 -msgid "" -"You can configure the boot loader to boot other operating systems by " -"selecting from the list. To add an operating systems that was not " -"automatically detected, click 'Add.' To change the operating system booted " -"by default, select 'Default' next to the desired operating system." -msgstr "" -"在此列表您可以配置引导装载程序引导其它操作系统。要添加一个没有被自动检测到的" -"操作系统，点击“添加”。要改变默认引导的操作系统，在想要的操作系统上选择“默" -"认”。" +#: ../iw/osbootwidget.py:49 +#, fuzzy +msgid "Boot loader operating system list" +msgstr "引导装载程序口令太短" -#: ../iw/osbootwidget.py:67 ../textw/bootloader_text.py:258 +#: ../iw/osbootwidget.py:65 ../textw/bootloader_text.py:262 msgid "Default" msgstr "默认" -#: ../iw/osbootwidget.py:67 +#: ../iw/osbootwidget.py:65 ../iw/partition_gui.py:368 msgid "Label" msgstr "标签" -#: ../iw/osbootwidget.py:130 +#: ../iw/osbootwidget.py:128 msgid "Image" msgstr "映像" -#: ../iw/osbootwidget.py:137 +#: ../iw/osbootwidget.py:135 msgid "" "Enter a label for the boot loader menu to display. The device (or hard drive " "and partition number) is the device from which it boots." @@ -3637,129 +3605,135 @@ msgstr "" "输入要在引导装载程序菜单中显示的标签。该设备（或硬盘驱动器和分区号码）是它引" "导的设备。" -#: ../iw/osbootwidget.py:149 +#: ../iw/osbootwidget.py:143 msgid "_Label" msgstr "标签(_L)" -#: ../iw/osbootwidget.py:188 +#: ../iw/osbootwidget.py:182 msgid "Default Boot _Target" msgstr "默认引导目标(_T)" -#: ../iw/osbootwidget.py:217 +#: ../iw/osbootwidget.py:211 msgid "You must specify a label for the entry" msgstr "您必须为该项目指定标签" -#: ../iw/osbootwidget.py:226 +#: ../iw/osbootwidget.py:220 msgid "Boot label contains illegal characters" msgstr "引导标签包含不合法字符" -#: ../iw/osbootwidget.py:250 +#: ../iw/osbootwidget.py:244 msgid "Duplicate Label" msgstr "标签重复" -#: ../iw/osbootwidget.py:251 +#: ../iw/osbootwidget.py:245 msgid "This label is already in use for another boot entry." msgstr "该标签已被另一个引导项目使用。" -#: ../iw/osbootwidget.py:264 +#: ../iw/osbootwidget.py:258 msgid "Duplicate Device" msgstr "设备重复" -#: ../iw/osbootwidget.py:265 +#: ../iw/osbootwidget.py:259 msgid "This device is already being used for another boot entry." msgstr "该设备已被另一个引导项目使用。" -#: ../iw/osbootwidget.py:329 ../textw/bootloader_text.py:341 +#: ../iw/osbootwidget.py:323 ../textw/bootloader_text.py:345 msgid "Cannot Delete" msgstr "无法删除" -#: ../iw/osbootwidget.py:330 ../textw/bootloader_text.py:342 +#: ../iw/osbootwidget.py:324 ../textw/bootloader_text.py:346 #, python-format msgid "" "This boot target cannot be deleted because it is for the %s system you are " "about to install." msgstr "该引导目标无法被删除，因为它代表您即将安装的 %s 系统。" -#: ../iw/partition_dialog_gui.py:58 +#: ../iw/partition_dialog_gui.py:66 msgid "Additional Size Options" msgstr "其它大小选项" -#: ../iw/partition_dialog_gui.py:63 +#: ../iw/partition_dialog_gui.py:71 msgid "_Fixed size" msgstr "固定大小(_F)" -#: ../iw/partition_dialog_gui.py:65 +#: ../iw/partition_dialog_gui.py:73 msgid "Fill all space _up to (MB):" msgstr "指定空间大小(MB)(_u)：" -#: ../iw/partition_dialog_gui.py:75 +#: ../iw/partition_dialog_gui.py:83 msgid "Fill to maximum _allowable size" msgstr "使用全部可用空间(_a)" -#: ../iw/partition_dialog_gui.py:180 +#: ../iw/partition_dialog_gui.py:198 msgid "The end cylinder must be greater than the start cylinder." msgstr "结束柱面必须大于起始柱面。" -#: ../iw/partition_dialog_gui.py:270 ../textw/partition_text.py:723 +#: ../iw/partition_dialog_gui.py:299 ../textw/partition_text.py:711 msgid "Add Partition" msgstr "添加分区" -#: ../iw/partition_dialog_gui.py:273 +#: ../iw/partition_dialog_gui.py:302 #, python-format msgid "Edit Partition: /dev/%s" msgstr "编辑分区：/dev/%s" -#: ../iw/partition_dialog_gui.py:275 +#: ../iw/partition_dialog_gui.py:304 msgid "Edit Partition" msgstr "编辑分区" -#: ../iw/partition_dialog_gui.py:302 +#: ../iw/partition_dialog_gui.py:331 msgid "File System _Type:" msgstr "文件系统类型(_T)：" -#: ../iw/partition_dialog_gui.py:334 +#: ../iw/partition_dialog_gui.py:334 ../iw/partition_ui_helpers_gui.py:300 +#: ../iw/raid_dialog_gui.py:327 +#, fuzzy +msgid "_Encrypt" +msgstr "加密密钥" + +#: ../iw/partition_dialog_gui.py:350 msgid "Allowable _Drives:" msgstr "允许的驱动器(_D)：" -#: ../iw/partition_dialog_gui.py:349 +#: ../iw/partition_dialog_gui.py:365 msgid "Drive:" msgstr "驱动器：" -#: ../iw/partition_dialog_gui.py:393 +#: ../iw/partition_dialog_gui.py:409 msgid "_Start Cylinder:" msgstr "起始柱面(_S)：" -#: ../iw/partition_dialog_gui.py:411 +#: ../iw/partition_dialog_gui.py:427 msgid "_End Cylinder:" msgstr "结束柱面(_E)：" -#: ../iw/partition_dialog_gui.py:463 +#: ../iw/partition_dialog_gui.py:475 msgid "Force to be a _primary partition" msgstr "强制为主分区(_p)" -#: ../iw/partition_gui.py:314 +#: ../iw/partition_gui.py:318 #, python-format msgid "Drive %s (Geom: %s/%s/%s) (Model: %s)" msgstr "Drive %s (Geom: %s/%s/%s) (Model: %s)" -#: ../iw/partition_gui.py:321 +#: ../iw/partition_gui.py:325 #, python-format msgid "Drive %s (%-0.f MB) (Model: %s)" msgstr "Drive %s (%-0.f MB) (Model: %s)" -#: ../iw/partition_gui.py:365 ../textw/partition_text.py:1462 +#: ../iw/partition_gui.py:370 ../textw/partition_text.py:1422 msgid "Type" msgstr "类型" -#: ../iw/partition_gui.py:370 ../textw/partition_text.py:1462 +#: ../iw/partition_gui.py:375 ../textw/partition_text.py:1422 msgid "Start" msgstr "开始" -#: ../iw/partition_gui.py:371 ../textw/partition_text.py:1462 +#: ../iw/partition_gui.py:376 ../textw/partition_text.py:1422 msgid "End" msgstr "结束" -#: ../iw/partition_gui.py:408 +#: ../iw/partition_gui.py:413 msgid "" "Mount Point/\n" "RAID/Volume" @@ -3767,7 +3741,7 @@ msgstr "" "挂载点/\n" "RAID/Volume" -#: ../iw/partition_gui.py:410 +#: ../iw/partition_gui.py:415 msgid "" "Size\n" "(MB)" @@ -3775,116 +3749,116 @@ msgstr "" "大小\n" "(MB)" -#: ../iw/partition_gui.py:542 ../textw/partition_text.py:1456 +#: ../iw/partition_gui.py:547 ../textw/partition_text.py:1416 msgid "Partitioning" msgstr "分区" -#: ../iw/partition_gui.py:633 +#: ../iw/partition_gui.py:638 msgid "" "The partitioning scheme you requested caused the following critical errors." msgstr "您的分区方法产生了如下关键错误。" -#: ../iw/partition_gui.py:635 +#: ../iw/partition_gui.py:640 #, python-format msgid "" "You must correct these errors before you continue your installation of %s." msgstr "在继续安装 %s 前您必须更正这些错误。" -#: ../iw/partition_gui.py:641 +#: ../iw/partition_gui.py:646 msgid "Partitioning Errors" msgstr "分区错误" -#: ../iw/partition_gui.py:647 +#: ../iw/partition_gui.py:652 msgid "The partitioning scheme you requested generated the following warnings." msgstr "您的分区方法产生了如下的警告。" -#: ../iw/partition_gui.py:649 +#: ../iw/partition_gui.py:654 msgid "Would you like to continue with your requested partitioning scheme?" msgstr "是否要继续执行您所申请的分区方案？" -#: ../iw/partition_gui.py:654 +#: ../iw/partition_gui.py:659 msgid "Partitioning Warnings" msgstr "分区警告" -#: ../iw/partition_gui.py:676 +#: ../iw/partition_gui.py:681 msgid "Format Warnings" msgstr "格式化警告" -#: ../iw/partition_gui.py:681 +#: ../iw/partition_gui.py:686 msgid "_Format" msgstr "格式化(_F)" -#: ../iw/partition_gui.py:718 +#: ../iw/partition_gui.py:723 msgid "LVM Volume Groups" msgstr "LVM 卷组" -#: ../iw/partition_gui.py:753 +#: ../iw/partition_gui.py:764 msgid "RAID Devices" msgstr "RAID 设备" -#: ../iw/partition_gui.py:781 ../iw/partition_gui.py:907 -#: ../textw/partition_text.py:107 ../textw/partition_text.py:171 +#: ../iw/partition_gui.py:794 ../iw/partition_gui.py:928 +#: ../textw/partition_text.py:113 ../textw/partition_text.py:177 msgid "None" msgstr "无" -#: ../iw/partition_gui.py:799 ../loader2/hdinstall.c:265 +#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:290 msgid "Hard Drives" msgstr "硬盘驱动器" -#: ../iw/partition_gui.py:870 ../textw/partition_text.py:153 -#: ../textw/partition_text.py:192 +#: ../iw/partition_gui.py:889 ../textw/partition_text.py:159 +#: ../textw/partition_text.py:198 msgid "Free space" msgstr "空闲空间" -#: ../iw/partition_gui.py:872 ../textw/partition_text.py:155 +#: ../iw/partition_gui.py:891 ../textw/partition_text.py:161 msgid "Extended" msgstr "扩展分区" -#: ../iw/partition_gui.py:874 ../textw/partition_text.py:157 +#: ../iw/partition_gui.py:893 ../textw/partition_text.py:163 msgid "software RAID" msgstr "软件 RAID" -#: ../iw/partition_gui.py:909 +#: ../iw/partition_gui.py:930 msgid "Free" msgstr "空闲" -#: ../iw/partition_gui.py:998 ../textw/partition_text.py:240 +#: ../iw/partition_gui.py:1024 ../textw/partition_text.py:246 #, python-format msgid "Could not allocate requested partitions: %s." msgstr "无法拨发所申请分区：%s。" -#: ../iw/partition_gui.py:1007 +#: ../iw/partition_gui.py:1033 #, python-format msgid "Warning: %s." msgstr "警告：%s。" -#: ../iw/partition_gui.py:1189 ../iw/partition_gui.py:1203 +#: ../iw/partition_gui.py:1215 ../iw/partition_gui.py:1229 msgid "Not supported" msgstr "不支持" -#: ../iw/partition_gui.py:1190 +#: ../iw/partition_gui.py:1216 msgid "LVM is NOT supported on this platform." msgstr "该平台不支持 LVM。" -#: ../iw/partition_gui.py:1204 +#: ../iw/partition_gui.py:1230 msgid "Software RAID is NOT supported on this platform." msgstr "该平台不支持软件 RAID。" -#: ../iw/partition_gui.py:1211 +#: ../iw/partition_gui.py:1237 msgid "No RAID minor device numbers available" msgstr "无可用的 RAID 次设备号码" -#: ../iw/partition_gui.py:1212 +#: ../iw/partition_gui.py:1238 msgid "" "A software RAID device cannot be created because all of the available RAID " "minor device numbers have been used." msgstr "无法创建软件 RAID 设备，因为所有可用的次设备号码已被使用。" -#: ../iw/partition_gui.py:1226 +#: ../iw/partition_gui.py:1252 msgid "RAID Options" msgstr "RAID 选项" -#: ../iw/partition_gui.py:1237 +#: ../iw/partition_gui.py:1263 #, python-format msgid "" "Software RAID allows you to combine several disks into a larger RAID " @@ -3901,7 +3875,7 @@ msgstr "" "\n" "您目前有 %s 个可使用的空闲软件 RAID 分区。\n" -#: ../iw/partition_gui.py:1248 +#: ../iw/partition_gui.py:1274 msgid "" "To use RAID you must first create at least two partitions of type 'software " "RAID'. Then you can create a RAID device that can be formatted and " @@ -3912,80 +3886,75 @@ msgstr "" "创建能被格式化并挂载的 RAID 设备。\n" "\n" -#: ../iw/partition_gui.py:1254 +#: ../iw/partition_gui.py:1280 msgid "What do you want to do now?" msgstr "您现在想怎么办？" -#: ../iw/partition_gui.py:1263 +#: ../iw/partition_gui.py:1289 msgid "Create a software RAID _partition." msgstr "创建软件 RAID 分区(_p)。" -#: ../iw/partition_gui.py:1266 +#: ../iw/partition_gui.py:1292 #, python-format msgid "Create a RAID _device [default=/dev/md%s]." msgstr "创建 RAID 设备(_d) [default=/dev/md%s]。" -#: ../iw/partition_gui.py:1270 +#: ../iw/partition_gui.py:1296 #, python-format msgid "Clone a _drive to create a RAID device [default=/dev/md%s]." msgstr "克隆驱动器来创建 RAID 设备(_d) [default=/dev/md%s]。" -#: ../iw/partition_gui.py:1309 +#: ../iw/partition_gui.py:1335 msgid "Couldn't Create Drive Clone Editor" msgstr "无法创建驱动器克隆编辑器" -#: ../iw/partition_gui.py:1310 +#: ../iw/partition_gui.py:1336 msgid "The drive clone editor could not be created for some reason." msgstr "由于某种原因，驱动器克隆编辑器无法被创建。" -#: ../iw/partition_gui.py:1351 +#: ../iw/partition_gui.py:1378 msgid "Ne_w" msgstr "新建(_w)" -#: ../iw/partition_gui.py:1354 +#: ../iw/partition_gui.py:1381 msgid "Re_set" msgstr "重设(_s)" -#: ../iw/partition_gui.py:1355 +#: ../iw/partition_gui.py:1382 msgid "R_AID" msgstr "RAID(_A)" -#: ../iw/partition_gui.py:1356 +#: ../iw/partition_gui.py:1383 msgid "_LVM" msgstr "LVM(_L)" -#: ../iw/partition_gui.py:1397 +#: ../iw/partition_gui.py:1424 msgid "Hide RAID device/LVM Volume _Group members" msgstr "隐藏 RAID 设备/LVM 卷组成员(_G)" -#: ../iw/partition_ui_helpers_gui.py:91 ../iw/partition_ui_helpers_gui.py:112 -#: ../iw/partition_ui_helpers_gui.py:114 ../textw/partition_text.py:263 -#: ../textw/partition_text.py:265 ../textw/partition_text.py:267 -#: ../textw/partition_text.py:292 +#: ../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 msgid "<Not Applicable>" msgstr "<不适用>" -#: ../iw/partition_ui_helpers_gui.py:255 -msgid "How would you like to prepare the file system on this partition?" -msgstr "您想如何在该分区上筹备文件系统？" - -#: ../iw/partition_ui_helpers_gui.py:263 -msgid "Leave _unchanged (preserve data)" -msgstr "保持不变（保留信息）(_u)" - -#: ../iw/partition_ui_helpers_gui.py:269 -msgid "_Format partition as:" -msgstr "将分区格式化成(_F)：" +#: ../iw/partition_ui_helpers_gui.py:284 +#, fuzzy +msgid "_Format as:" +msgstr "格式化成：" -#: ../iw/partition_ui_helpers_gui.py:292 -msgid "Mi_grate partition to:" -msgstr "将分区迁移至(_g)：" +#: ../iw/partition_ui_helpers_gui.py:307 +#, fuzzy +msgid "Mi_grate filesystem to:" +msgstr "迁移文件系统" -#: ../iw/partition_ui_helpers_gui.py:314 -msgid "Check for _bad blocks?" -msgstr "要检查磁盘坏块吗(_b)？" +#: ../iw/partition_ui_helpers_gui.py:327 tmp/autopart.glade.h:9 +#, fuzzy +msgid "_Resize" +msgstr "固定大小(_F)" -#: ../iw/partition_ui_helpers_gui.py:349 +#: ../iw/partition_ui_helpers_gui.py:381 #, python-format msgid "" "Partitions of type '%s' must be constrained to a single drive. To do this, " @@ -3994,23 +3963,23 @@ msgstr "" "类型为'%s' 的分区必须局限于一个驱动器上。您可在“允许的驱动器”检查表上选择该驱" "动器来达到这个目的。" -#: ../iw/partmethod_gui.py:25 ../textw/partmethod_text.py:24 +#: ../iw/partmethod_gui.py:31 ../textw/partmethod_text.py:30 msgid "Disk Partitioning Setup" msgstr "磁盘分区设置" -#: ../iw/partmethod_gui.py:50 +#: ../iw/partmethod_gui.py:56 msgid "_Automatically partition" msgstr "自动分区(_A)" -#: ../iw/partmethod_gui.py:53 +#: ../iw/partmethod_gui.py:59 msgid "Manually partition with _Disk Druid" msgstr "用 Disk Druid 手工分区(_D)" -#: ../iw/progress_gui.py:31 +#: ../iw/progress_gui.py:38 msgid "Installing Packages" msgstr "安装软件包" -#: ../iw/raid_dialog_gui.py:247 +#: ../iw/raid_dialog_gui.py:286 msgid "" "At least two unused software RAID partitions are needed to create a RAID " "device.\n" @@ -4022,41 +3991,41 @@ msgstr "" "\n" "首先，至少创建两个类型为“软件 RAID”的分区，然后再选择“RAID”选项。" -#: ../iw/raid_dialog_gui.py:261 ../iw/raid_dialog_gui.py:682 -#: ../textw/partition_text.py:979 +#: ../iw/raid_dialog_gui.py:300 ../iw/raid_dialog_gui.py:733 +#: ../textw/partition_text.py:943 msgid "Make RAID Device" msgstr "创建 RAID 设备" -#: ../iw/raid_dialog_gui.py:264 +#: ../iw/raid_dialog_gui.py:303 #, python-format msgid "Edit RAID Device: /dev/md%s" msgstr "编辑 RAID 设备：/dev/md%s" -#: ../iw/raid_dialog_gui.py:266 ../textw/partition_text.py:977 +#: ../iw/raid_dialog_gui.py:305 ../textw/partition_text.py:941 msgid "Edit RAID Device" msgstr "编辑 RAID 设备" -#: ../iw/raid_dialog_gui.py:318 +#: ../iw/raid_dialog_gui.py:361 msgid "RAID _Device:" msgstr "RAID 设备(_D)：" -#: ../iw/raid_dialog_gui.py:336 +#: ../iw/raid_dialog_gui.py:379 msgid "RAID _Level:" msgstr "RAID 级别(_L)：" -#: ../iw/raid_dialog_gui.py:377 +#: ../iw/raid_dialog_gui.py:420 msgid "_RAID Members:" msgstr "RAID 成员(_R)：" -#: ../iw/raid_dialog_gui.py:394 +#: ../iw/raid_dialog_gui.py:437 msgid "Number of _spares:" msgstr "备件数量(_s)：" -#: ../iw/raid_dialog_gui.py:404 +#: ../iw/raid_dialog_gui.py:447 msgid "_Format partition?" msgstr "格式化分区吗(_F)？" -#: ../iw/raid_dialog_gui.py:483 +#: ../iw/raid_dialog_gui.py:534 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." @@ -4064,12 +4033,12 @@ msgstr "" "源驱动器上没有要克隆的分区。在它能被克隆前，您必须首先把该驱动器上的分区类型" "定义为“软件 RAID”。" -#: ../iw/raid_dialog_gui.py:487 ../iw/raid_dialog_gui.py:493 -#: ../iw/raid_dialog_gui.py:505 ../iw/raid_dialog_gui.py:518 +#: ../iw/raid_dialog_gui.py:538 ../iw/raid_dialog_gui.py:544 +#: ../iw/raid_dialog_gui.py:556 ../iw/raid_dialog_gui.py:569 msgid "Source Drive Error" msgstr "源驱动器错误" -#: ../iw/raid_dialog_gui.py:494 +#: ../iw/raid_dialog_gui.py:545 msgid "" "The source drive you selected has partitions which are not of type 'software " "RAID'.\n" @@ -4080,7 +4049,7 @@ msgstr "" "\n" "这些分区在该驱动器被克隆前必须被删除。" -#: ../iw/raid_dialog_gui.py:506 +#: ../iw/raid_dialog_gui.py:557 #, python-format msgid "" "The source drive you selected has partitions which are not constrained to " @@ -4093,7 +4062,7 @@ msgstr "" "\n" "这些分区在该驱动器被克隆前必须被删除或被限定于该驱动器之内。" -#: ../iw/raid_dialog_gui.py:519 +#: ../iw/raid_dialog_gui.py:570 msgid "" "The source drive you selected has software RAID partition(s) which are " "members of an active software RAID device.\n" @@ -4104,21 +4073,21 @@ msgstr "" "\n" "这些分区在该驱动器被克隆前必须被删除。" -#: ../iw/raid_dialog_gui.py:532 ../iw/raid_dialog_gui.py:538 -#: ../iw/raid_dialog_gui.py:557 +#: ../iw/raid_dialog_gui.py:583 ../iw/raid_dialog_gui.py:589 +#: ../iw/raid_dialog_gui.py:608 msgid "Target Drive Error" msgstr "目标驱动器错误" -#: ../iw/raid_dialog_gui.py:533 +#: ../iw/raid_dialog_gui.py:584 msgid "Please select the target drives for the clone operation." msgstr "请选择克隆操作的目标驱动器。" -#: ../iw/raid_dialog_gui.py:539 +#: ../iw/raid_dialog_gui.py:590 #, 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:558 +#: ../iw/raid_dialog_gui.py:609 #, python-format msgid "" "The target drive /dev/%s has a partition which cannot be removed for the " @@ -4134,11 +4103,11 @@ msgstr "" "\n" "该分区必须在驱动器成为目标之前被删除。" -#: ../iw/raid_dialog_gui.py:619 +#: ../iw/raid_dialog_gui.py:670 msgid "Please select a source drive." msgstr "请选择源驱动器。" -#: ../iw/raid_dialog_gui.py:639 +#: ../iw/raid_dialog_gui.py:690 #, python-format msgid "" "The drive /dev/%s will now be cloned to the following drives:\n" @@ -4147,7 +4116,7 @@ msgstr "" "驱动器 /dev/%s 现在将会被克隆到下列驱动器上：\n" "\n" -#: ../iw/raid_dialog_gui.py:644 +#: ../iw/raid_dialog_gui.py:695 msgid "" "\n" "\n" @@ -4157,19 +4126,19 @@ msgstr "" "\n" "警告！目标驱动器上的所有数据将会被破坏。" -#: ../iw/raid_dialog_gui.py:647 +#: ../iw/raid_dialog_gui.py:698 msgid "Final Warning" msgstr "最后警告" -#: ../iw/raid_dialog_gui.py:649 +#: ../iw/raid_dialog_gui.py:700 msgid "Clone Drives" msgstr "克隆驱动器" -#: ../iw/raid_dialog_gui.py:658 +#: ../iw/raid_dialog_gui.py:709 msgid "There was an error clearing the target drives. Cloning failed." msgstr "清除目标驱动器时出错。克隆失败。" -#: ../iw/raid_dialog_gui.py:692 +#: ../iw/raid_dialog_gui.py:743 msgid "" "Clone Drive Tool\n" "\n" @@ -4195,31 +4164,19 @@ msgstr "" "\n" "目标驱动器上的一切将会被该进程破坏。" -#: ../iw/raid_dialog_gui.py:712 +#: ../iw/raid_dialog_gui.py:763 msgid "Source Drive:" msgstr "源驱动器：" -#: ../iw/raid_dialog_gui.py:720 +#: ../iw/raid_dialog_gui.py:771 msgid "Target Drive(s):" msgstr "目标驱动器：" -#: ../iw/raid_dialog_gui.py:728 +#: ../iw/raid_dialog_gui.py:779 msgid "Drives" msgstr "驱动器" -#: ../iw/release_notes.py:156 ../iw/release_notes.py:161 -msgid "Release notes are missing.\n" -msgstr "缺少发行注记。\n" - -#: ../iw/release_notes.py:241 -msgid "Release Notes" -msgstr "发行注记" - -#: ../iw/release_notes.py:244 -msgid "Unable to load file!" -msgstr "无法载入文件！" - -#: ../iw/task_gui.py:80 +#: ../iw/task_gui.py:44 #, python-format msgid "" "Unable to read package metadata from repository. This may be due to a " @@ -4231,79 +4188,95 @@ msgstr "" "无法读取数据库的元数据。这可能是因为缺少 repodata 目录。请确定您已经正确建立" "了安装树。%s" -#: ../iw/task_gui.py:90 +#: ../iw/task_gui.py:54 #, python-format msgid "" "Unable to find a group file for %s. This will prevent manual selection of " "packages from the repository from working" msgstr "无法为 %s 找到组群文件。这会使手工从存储库中选择软件包无法正常工作。" -#: ../iw/task_gui.py:122 +#: ../iw/task_gui.py:80 +#, fuzzy +msgid "Edit Repository" +msgstr "添加主机" + +#: ../iw/task_gui.py:155 msgid "Invalid Repository Name" msgstr "无效主机名" -#: ../iw/task_gui.py:123 +#: ../iw/task_gui.py:156 msgid "You must provide a repository name." msgstr "您必须输入存储库名称。" -#: ../iw/task_gui.py:131 +#: ../iw/task_gui.py:167 +#, fuzzy +msgid "Invalid Proxy URL" +msgstr "无效主机地址" + +#: ../iw/task_gui.py:168 +#, fuzzy +msgid "You must provide an HTTP, HTTPS, or FTP URL to a proxy." +msgstr "您必须为存储器提供一个HTTP或FTP地址。" + +#: ../iw/task_gui.py:187 msgid "Invalid Repository URL" msgstr "无效主机地址" -#: ../iw/task_gui.py:132 -msgid "You must provide an HTTP or FTP URL to a repository." +#: ../iw/task_gui.py:188 +#, fuzzy +msgid "You must provide an HTTP, HTTPS, or FTP URL to a repository." msgstr "您必须为存储器提供一个HTTP或FTP地址。" -#: ../iw/task_gui.py:146 +#: ../iw/task_gui.py:227 #, python-format msgid "" "The repository %s has already been added. Please choose a different " "repository name and URL." msgstr "存储库 %s 已被使用，请另选一个存储库名和 URL。" -#: ../iw/timezone_gui.py:56 ../textw/timezone_text.py:89 +#: ../iw/timezone_gui.py:62 ../textw/timezone_text.py:95 msgid "Time Zone Selection" msgstr "时区选择" -#: ../iw/upgrade_bootloader_gui.py:27 ../textw/upgrade_bootloader_text.py:108 +#: ../iw/upgrade_bootloader_gui.py:33 ../textw/upgrade_bootloader_text.py:132 msgid "Upgrade Boot Loader Configuration" msgstr "升级引导装载程序配置" -#: ../iw/upgrade_bootloader_gui.py:97 +#: ../iw/upgrade_bootloader_gui.py:119 msgid "_Update boot loader configuration" msgstr "更新引导装载程序配置(_U)" -#: ../iw/upgrade_bootloader_gui.py:98 +#: ../iw/upgrade_bootloader_gui.py:120 msgid "This will update your current boot loader." msgstr "这将会更新您目前的引导装载程序。" -#: ../iw/upgrade_bootloader_gui.py:102 ../textw/upgrade_bootloader_text.py:80 +#: ../iw/upgrade_bootloader_gui.py:124 ../textw/upgrade_bootloader_text.py:104 msgid "" "Due to system changes, your boot loader configuration can not be " "automatically updated." msgstr "因系统改变,您的启动配置不能自动更新." -#: ../iw/upgrade_bootloader_gui.py:105 ../textw/upgrade_bootloader_text.py:84 +#: ../iw/upgrade_bootloader_gui.py:127 ../textw/upgrade_bootloader_text.py:108 msgid "" "The installer is unable to detect the boot loader currently in use on your " "system." msgstr "安装程序无法在您的系统上检测到目前使用的引导装载程序。" -#: ../iw/upgrade_bootloader_gui.py:112 ../textw/upgrade_bootloader_text.py:93 +#: ../iw/upgrade_bootloader_gui.py:134 ../textw/upgrade_bootloader_text.py:117 #, python-format msgid "" "The installer has detected the %s boot loader currently installed on %s." msgstr "安装程序检测到 %s 引导装载程序目前安装在 %s 上。" -#: ../iw/upgrade_bootloader_gui.py:116 +#: ../iw/upgrade_bootloader_gui.py:138 msgid "This is the recommended option." msgstr "这是一个推荐的选项。" -#: ../iw/upgrade_bootloader_gui.py:121 +#: ../iw/upgrade_bootloader_gui.py:143 msgid "_Create new boot loader configuration" msgstr "创建新的引导装载程序配置(_C)" -#: ../iw/upgrade_bootloader_gui.py:123 +#: ../iw/upgrade_bootloader_gui.py:145 msgid "" "This option creates a new boot loader configuration. If you wish to switch " "boot loaders, you should choose this." @@ -4311,11 +4284,11 @@ msgstr "" "这将会创建一个新的引导装载程序配置。如果您想更换引导装载程序，应该选择该选" "项。" -#: ../iw/upgrade_bootloader_gui.py:130 +#: ../iw/upgrade_bootloader_gui.py:152 msgid "_Skip boot loader updating" msgstr "跳过引导装载程序的更新(_S)" -#: ../iw/upgrade_bootloader_gui.py:131 +#: ../iw/upgrade_bootloader_gui.py:153 msgid "" "This option makes no changes to boot loader configuration. If you are using " "a third party boot loader, you should choose this." @@ -4323,15 +4296,15 @@ msgstr "" "这将不会对您的引导装载程序做任何改变。如果您使用的是第三方引导装载程序，您应" "该选择该选项。" -#: ../iw/upgrade_bootloader_gui.py:142 +#: ../iw/upgrade_bootloader_gui.py:164 msgid "What would you like to do?" msgstr "您想怎么办？" -#: ../iw/upgrade_migratefs_gui.py:28 ../textw/upgrade_text.py:31 +#: ../iw/upgrade_migratefs_gui.py:32 ../textw/upgrade_text.py:37 msgid "Migrate File Systems" msgstr "迁移文件系统" -#: ../iw/upgrade_migratefs_gui.py:52 ../textw/upgrade_text.py:33 +#: ../iw/upgrade_migratefs_gui.py:56 ../textw/upgrade_text.py:39 #, python-format msgid "" "This release of %s supports the ext3 journaling file system, which has " @@ -4346,11 +4319,11 @@ msgstr "" "\n" "您想迁移哪些分区？" -#: ../iw/upgrade_swap_gui.py:29 +#: ../iw/upgrade_swap_gui.py:33 msgid "Upgrade Swap Partition" msgstr "升级交换分区" -#: ../iw/upgrade_swap_gui.py:89 ../textw/upgrade_text.py:89 +#: ../iw/upgrade_swap_gui.py:93 ../textw/upgrade_text.py:95 #, python-format msgid "" "Recent kernels (2.4 or newer) need significantly more swap than older " @@ -4361,7 +4334,7 @@ msgstr "" "2.4 以上内核所需交换区要比老版内核大得多，大至您系统内存的两倍。您目前配置了 " "%dMB 交换区，但现在您可以在任何一个文件系统中创建额外的交换区。" -#: ../iw/upgrade_swap_gui.py:96 +#: ../iw/upgrade_swap_gui.py:100 #, python-format msgid "" "\n" @@ -4372,62 +4345,62 @@ msgstr "" "\n" "安装程序检测到 %sMB 内存。\n" -#: ../iw/upgrade_swap_gui.py:108 +#: ../iw/upgrade_swap_gui.py:112 msgid "I _want to create a swap file" msgstr "我想创建一个交换文件(_w)" -#: ../iw/upgrade_swap_gui.py:117 +#: ../iw/upgrade_swap_gui.py:121 msgid "Select the _partition to put the swap file on:" msgstr "选择存放交换文件的分区(_p)：" -#: ../iw/upgrade_swap_gui.py:136 ../textw/upgrade_text.py:107 +#: ../iw/upgrade_swap_gui.py:140 ../textw/upgrade_text.py:113 msgid "Partition" msgstr "分区" -#: ../iw/upgrade_swap_gui.py:136 +#: ../iw/upgrade_swap_gui.py:140 msgid "Free Space (MB)" msgstr "空闲磁盘空间(MB)" -#: ../iw/upgrade_swap_gui.py:154 +#: ../iw/upgrade_swap_gui.py:158 #, python-format msgid "" "A minimum swap file size of %d MB is recommended. Please enter a size for " "the swap file:" msgstr "推荐您将交换文件至少定为 %dMB。请输入交换文件的大小：" -#: ../iw/upgrade_swap_gui.py:169 +#: ../iw/upgrade_swap_gui.py:173 msgid "Swap file _size (MB):" msgstr "交换文件大小(MB)(_s)：" -#: ../iw/upgrade_swap_gui.py:179 +#: ../iw/upgrade_swap_gui.py:183 msgid "I _don't want to create a swap file" msgstr "我不想创建交换文件(_d)" -#: ../iw/upgrade_swap_gui.py:189 +#: ../iw/upgrade_swap_gui.py:193 msgid "" "A swap file is strongly recommended. Failure to create one could cause the " "installer to abort abnormally. Are you sure you wish to continue?" msgstr "" "强烈建议您创建一个交换文件，否则会导致安装程序非正常中止。您确定要继续么？" -#: ../iw/upgrade_swap_gui.py:197 ../textw/upgrade_text.py:173 +#: ../iw/upgrade_swap_gui.py:201 ../textw/upgrade_text.py:179 msgid "The swap file must be between 1 and 2000 MB in size." msgstr "交换文件的大小必须在 1MB 到 2000MB 之间。" -#: ../iw/upgrade_swap_gui.py:204 ../textw/upgrade_text.py:168 +#: ../iw/upgrade_swap_gui.py:208 ../textw/upgrade_text.py:174 msgid "" "There is not enough space on the device you selected for the swap partition." msgstr "您所选的交换分区在该设备上空间不够。" -#: ../iw/zipl_gui.py:28 +#: ../iw/zipl_gui.py:35 msgid "z/IPL Boot Loader Configuration" msgstr "z/IPL 引导装载程序配置" -#: ../iw/zipl_gui.py:52 +#: ../iw/zipl_gui.py:59 msgid "The z/IPL boot loader will be installed on your system." msgstr "z/IPL 引导装载程序将会被安装在您的系统上。" -#: ../iw/zipl_gui.py:54 +#: ../iw/zipl_gui.py:61 msgid "" "The z/IPL Boot Loader will now be installed on your system.\n" "\n" @@ -4453,31 +4426,31 @@ msgstr "" "\n" "现在您可以输入任何您的机器或设置所需的额外内核参数。" -#: ../iw/zipl_gui.py:81 ../textw/zipl_text.py:62 +#: ../iw/zipl_gui.py:88 ../textw/zipl_text.py:68 msgid "Kernel Parameters" msgstr "内核参数" -#: ../iw/zipl_gui.py:84 ../iw/zipl_gui.py:87 +#: ../iw/zipl_gui.py:91 ../iw/zipl_gui.py:94 msgid "Chandev Parameters" msgstr "Chandev 参数" -#: ../textw/bootloader_text.py:28 +#: ../textw/bootloader_text.py:32 msgid "Which boot loader would you like to use?" msgstr "您想使用哪一个引导装载程序？" -#: ../textw/bootloader_text.py:38 +#: ../textw/bootloader_text.py:42 msgid "Use GRUB Boot Loader" msgstr "使用 GRUB 引导装载程序" -#: ../textw/bootloader_text.py:39 +#: ../textw/bootloader_text.py:43 msgid "No Boot Loader" msgstr "不使用引导装载程序" -#: ../textw/bootloader_text.py:59 +#: ../textw/bootloader_text.py:63 msgid "Skip Boot Loader" msgstr "跳过引导装载程序" -#: ../textw/bootloader_text.py:60 +#: ../textw/bootloader_text.py:64 msgid "" "You have elected not to install any boot loader, which is not recommended " "unless you have an advanced need. Booting your system into Linux directly " @@ -4491,7 +4464,7 @@ msgstr "" "\n" "您确信要跳过安装引导装载程序吗？" -#: ../textw/bootloader_text.py:92 +#: ../textw/bootloader_text.py:96 msgid "" "A few systems need to pass special options to the kernel at boot time to " "function properly. If you need to pass boot options to the kernel, enter " @@ -4500,44 +4473,56 @@ msgstr "" "在引导过程中，某些系统需要将特殊选项传递至内核才能正常运行。如果需要将引导选" "项传递至内核，现在请输入这些选项；如果不需要或无法确定，请将此项留为空白。" -#: ../textw/bootloader_text.py:101 +#: ../textw/bootloader_text.py:105 msgid "Force use of LBA32 (not normally required)" msgstr "强制使用 LBA32（通常不需要）" -#: ../textw/bootloader_text.py:165 +#: ../textw/bootloader_text.py:128 +msgid "" +"If LBA32 is not supported by your system's BIOS, forcing its use can prevent " +"your machine from booting.\n" +"\n" +"Would you like to continue and force LBA32 mode?" +msgstr "" +"当 BIOS 不支持您的引导装载程序时，若强制使用 LBA32 可能会导致您的机器无法被引" +"导。\n" +"\n" +"您想继续进行而强制进入 LBA32 模式吗？" + +#: ../textw/bootloader_text.py:169 msgid "Where do you want to install the boot loader?" msgstr "您想在何处安装引导装载程序？" -#: ../textw/bootloader_text.py:193 ../textw/bootloader_text.py:258 +#: ../textw/bootloader_text.py:197 ../textw/bootloader_text.py:262 msgid "Boot label" msgstr "引导标签" -#: ../textw/bootloader_text.py:197 +#: ../textw/bootloader_text.py:201 msgid "Clear" msgstr "清除" -#: ../textw/bootloader_text.py:205 +#: ../textw/bootloader_text.py:209 msgid "Edit Boot Label" msgstr "编辑引导标签" -#: ../textw/bootloader_text.py:223 ../textw/bootloader_text.py:228 +#: ../textw/bootloader_text.py:227 ../textw/bootloader_text.py:232 msgid "Invalid Boot Label" msgstr "引导标签无效" -#: ../textw/bootloader_text.py:224 +#: ../textw/bootloader_text.py:228 msgid "Boot label may not be empty." msgstr "引导标签不能空白。" -#: ../textw/bootloader_text.py:229 +#: ../textw/bootloader_text.py:233 msgid "Boot label contains illegal characters." msgstr "引导标签包含不合法字符。" -#: ../textw/bootloader_text.py:273 ../textw/constants_text.py:56 -#: ../textw/partition_text.py:1467 +#: ../textw/bootloader_text.py:277 ../textw/constants_text.py:62 +#: ../textw/partition_text.py:1427 msgid "Edit" msgstr "编辑" -#: ../textw/bootloader_text.py:277 +#: ../textw/bootloader_text.py:281 #, python-format msgid "" "The boot manager %s uses can boot other operating systems as well. Please " @@ -4547,13 +4532,13 @@ msgstr "" "引导管理程序 %s 也可以引导其它操作系统。请告诉我您希望能够引导的分区，以及每" "一个分区想使用的标签。" -#: ../textw/bootloader_text.py:290 +#: ../textw/bootloader_text.py:294 msgid "" " <Space> select | <F2> select default | <F4> delete | <F12> next screen>" msgstr "" " <Space> 选择按钮 | <F2> 选择默认的引导项目 | <F4> 删除 | <F12> 下一屏幕>" -#: ../textw/bootloader_text.py:386 +#: ../textw/bootloader_text.py:390 msgid "" "A boot loader password prevents users from passing arbitrary options to the " "kernel. For highest security, you should set a password, but a password is " @@ -4562,31 +4547,31 @@ msgstr "" "引导装载程序口令可以防止用户将任意选项传递到内核.为安全性最佳,您应设置一个口" "令,但对多数的用户密码并不必要." -#: ../textw/bootloader_text.py:396 +#: ../textw/bootloader_text.py:400 msgid "Use a GRUB Password" msgstr "使用 GRUB 口令" -#: ../textw/bootloader_text.py:408 +#: ../textw/bootloader_text.py:412 msgid "Boot Loader Password:" msgstr "引导装载程序口令：" -#: ../textw/bootloader_text.py:409 +#: ../textw/bootloader_text.py:413 tmp/account.glade.h:1 msgid "Confirm:" msgstr "确认：" -#: ../textw/bootloader_text.py:438 +#: ../textw/bootloader_text.py:442 msgid "Passwords Do Not Match" msgstr "口令不匹配" -#: ../textw/bootloader_text.py:443 +#: ../textw/bootloader_text.py:447 msgid "Password Too Short" msgstr "口令太短" -#: ../textw/bootloader_text.py:444 +#: ../textw/bootloader_text.py:448 msgid "Boot loader password is too short" msgstr "引导装载程序口令太短" -#: ../textw/complete_text.py:26 +#: ../textw/complete_text.py:31 msgid "" "Press <Enter> to end the installation process.\n" "\n" @@ -4594,11 +4579,11 @@ msgstr "" "按 <Enter> 键来结束安装进程。\n" "\n" -#: ../textw/complete_text.py:27 +#: ../textw/complete_text.py:32 msgid "<Enter> to exit" msgstr "按 <Enter> 键退出" -#: ../textw/complete_text.py:31 +#: ../textw/complete_text.py:36 #, python-format msgid "" "Congratulations, your %s installation is complete.\n" @@ -4609,7 +4594,7 @@ msgstr "" "\n" "%s%s" -#: ../textw/complete_text.py:34 +#: ../textw/complete_text.py:39 #, python-format msgid "" "For information on errata (updates and bug fixes), visit http://www.redhat." @@ -4623,112 +4608,72 @@ msgstr "" "有关使用系统的信息，则可到 http://www.redhat.com/docs 网页上 %s 指南手册中查" "阅。" -#: ../textw/complete_text.py:40 +#: ../textw/complete_text.py:45 msgid "Complete" msgstr "完成" -#: ../textw/complete_text.py:41 +#: ../textw/complete_text.py:46 msgid "Reboot" msgstr "重新引导" -#: ../textw/confirm_text.py:22 -msgid "Installation to begin" -msgstr "即将开始安装" - -#: ../textw/confirm_text.py:23 -#, python-format -msgid "" -"A complete log of your installation will be in %s after rebooting your " -"system. You may want to keep this file for later reference." -msgstr "" -"重新引导系统后，一份完整的安装日志将会保存在 %s 中。您可能需要保留该文件以供" -"今后参考。" - -#: ../textw/confirm_text.py:26 ../textw/confirm_text.py:28 -#: ../textw/confirm_text.py:54 ../textw/confirm_text.py:56 -#: ../textw/constants_text.py:44 ../loader2/cdinstall.c:392 -#: ../loader2/driverdisk.c:282 ../loader2/driverdisk.c:313 -#: ../loader2/driverdisk.c:398 ../loader2/driverselect.c:70 -#: ../loader2/driverselect.c:180 ../loader2/driverselect.c:205 -#: ../loader2/hdinstall.c:265 ../loader2/hdinstall.c:319 ../loader2/kbd.c:131 -#: ../loader2/loader.c:342 ../loader2/loader.c:1016 ../loader2/loader.c:1038 -#: ../loader2/net.c:272 ../loader2/net.c:311 ../loader2/net.c:739 -#: ../loader2/net.c:1064 ../loader2/net.c:1806 ../loader2/nfsinstall.c:57 -#: ../loader2/urls.c:282 ../loader2/urls.c:470 -msgid "Back" -msgstr "上一步" - -#: ../textw/confirm_text.py:50 -msgid "Upgrade to begin" -msgstr "即将开始升级" - -#: ../textw/confirm_text.py:51 -#, python-format -msgid "" -"A complete log of your upgrade will be in %s after rebooting your system. " -"You may want to keep this file for later reference." -msgstr "" -"重新引导后，一份完整的安装日志将会保存在 %s 中。您可能需要保留该文件以供今后" -"参考。" - -#: ../textw/grpselect_text.py:87 +#: ../textw/grpselect_text.py:94 msgid "Please select the package groups you would like to install." msgstr "请选择您想安装的软件包." -#: ../textw/grpselect_text.py:105 +#: ../textw/grpselect_text.py:112 msgid "" "<Space>,<+>,<-> selection | <F2> Group Details | <F12> next screen" msgstr "<Space>,<+>,<-> 选择 | <F2> 软件包组详情 | <F12> 下一屏幕" -#: ../textw/grpselect_text.py:117 +#: ../textw/grpselect_text.py:124 msgid "No optional packages to select" msgstr "没有可选的软件包" -#: ../textw/grpselect_text.py:139 +#: ../textw/grpselect_text.py:146 msgid "Package Group Details" msgstr "软件包组详情" -#: ../textw/keyboard_text.py:38 +#: ../textw/keyboard_text.py:46 msgid "Keyboard Selection" msgstr "选择键盘" -#: ../textw/keyboard_text.py:39 +#: ../textw/keyboard_text.py:47 msgid "Which model keyboard is attached to this computer?" msgstr "与计算机连接的键盘属于何种型号？" -#: ../textw/mouse_text.py:39 +#: ../textw/mouse_text.py:45 msgid "What device is your mouse located on?" msgstr "您的鼠标位于哪个设备上？" -#: ../textw/mouse_text.py:71 +#: ../textw/mouse_text.py:77 msgid "Which model mouse is attached to this computer?" msgstr "与计算机连接的鼠标属于何种型号？" -#: ../textw/mouse_text.py:82 +#: ../textw/mouse_text.py:88 msgid "Emulate 3 Buttons?" msgstr "是否模拟三键鼠标？" -#: ../textw/mouse_text.py:85 +#: ../textw/mouse_text.py:91 msgid "Mouse Selection" msgstr "选择鼠标" -#: ../textw/network_text.py:53 +#: ../textw/network_text.py:58 #, python-format msgid "" "You have not specified the field %s. Depending on your network environment " "this may cause problems later." msgstr "您还没有指定%s字段.根据您的网络环境可能会在以后导致问题." -#: ../textw/network_text.py:70 +#: ../textw/network_text.py:75 #, python-format msgid "IPv%d prefix must be between 0 and %d." msgstr "IP%d 前缀必须在0和%d之间." -#: ../textw/network_text.py:74 +#: ../textw/network_text.py:79 msgid "Integer Required for Prefix" msgstr "前缀必需是整数" -#: ../textw/network_text.py:75 +#: ../textw/network_text.py:80 #, python-format msgid "" "You must enter a valid integer for the %s. For IPv4, the value can be " @@ -4737,112 +4682,112 @@ msgstr "" "您必须为%s输入一个有效的整数.对于IPv4,其值介于0到32.如果是IPv6,其值应介于0到" "128." -#: ../textw/network_text.py:82 tmp/netpostconfig.glade.h:16 +#: ../textw/network_text.py:87 tmp/netpostconfig.glade.h:16 msgid "Prefix (Netmask)" msgstr "前缀(子网掩码)" -#: ../textw/network_text.py:84 tmp/netpostconfig.glade.h:15 +#: ../textw/network_text.py:89 tmp/netpostconfig.glade.h:15 msgid "Prefix" msgstr "前缀" -#: ../textw/network_text.py:137 +#: ../textw/network_text.py:142 msgid "Activate on boot" msgstr "引导时激活" -#: ../textw/network_text.py:144 ../loader2/net.c:719 +#: ../textw/network_text.py:149 ../loader2/net.c:734 #: tmp/netpostconfig.glade.h:9 msgid "Enable IPv4 support" msgstr "启动IPv4支持" -#: ../textw/network_text.py:151 ../loader2/net.c:732 +#: ../textw/network_text.py:156 ../loader2/net.c:747 #: tmp/netpostconfig.glade.h:10 msgid "Enable IPv6 support" msgstr "启动IPV6支持" -#: ../textw/network_text.py:164 +#: ../textw/network_text.py:169 msgid "P-to-P:" msgstr "点到点" -#: ../textw/network_text.py:182 tmp/netpostconfig.glade.h:7 +#: ../textw/network_text.py:187 tmp/netpostconfig.glade.h:7 msgid "ESSID:" msgstr "ESSID:" -#: ../textw/network_text.py:191 +#: ../textw/network_text.py:196 msgid "WEP Key:" msgstr "WEP密码:" -#: ../textw/network_text.py:204 +#: ../textw/network_text.py:209 #, python-format msgid "Network Configuration for %s" msgstr "%s 的网络配置" -#: ../textw/network_text.py:241 ../textw/network_text.py:244 +#: ../textw/network_text.py:246 ../textw/network_text.py:249 msgid "point-to-point IP address" msgstr "点到点IP地址" -#: ../textw/network_text.py:267 tmp/netpostconfig.glade.h:5 +#: ../textw/network_text.py:272 tmp/netpostconfig.glade.h:5 msgid "Dynamic IP configuration (DHCP)" msgstr "动态 IP 配置(DHCP)" -#: ../textw/network_text.py:270 ../textw/network_text.py:401 +#: ../textw/network_text.py:275 ../textw/network_text.py:406 msgid "Manual address configuration" msgstr "手动配置地址" -#: ../textw/network_text.py:290 +#: ../textw/network_text.py:295 #, python-format msgid "IPv4 Configuration for %s" msgstr "%s 的IPv4配置" -#: ../textw/network_text.py:320 ../textw/network_text.py:332 -#: ../textw/network_text.py:335 +#: ../textw/network_text.py:325 ../textw/network_text.py:337 +#: ../textw/network_text.py:340 msgid "IPv4 address" msgstr "IPv4 地址" -#: ../textw/network_text.py:324 +#: ../textw/network_text.py:329 msgid "IPv4 network mask" msgstr "IPv4子网掩码" -#: ../textw/network_text.py:350 ../textw/network_text.py:353 -#: ../textw/network_text.py:356 +#: ../textw/network_text.py:355 ../textw/network_text.py:358 +#: ../textw/network_text.py:361 msgid "IPv4 prefix (network mask)" msgstr "IPv4前缀(子网掩码)" -#: ../textw/network_text.py:395 tmp/netpostconfig.glade.h:4 +#: ../textw/network_text.py:400 tmp/netpostconfig.glade.h:4 msgid "Automatic neighbor discovery" msgstr "自动侦测网络邻居" -#: ../textw/network_text.py:398 tmp/netpostconfig.glade.h:6 +#: ../textw/network_text.py:403 tmp/netpostconfig.glade.h:6 msgid "Dynamic IP configuration (DHCPv6)" msgstr "动态 IP 配置(DHCPv6)" -#: ../textw/network_text.py:425 +#: ../textw/network_text.py:430 #, python-format msgid "IPv6 Configuration for %s" msgstr "%s 的IPv6网络配置" -#: ../textw/network_text.py:455 ../textw/network_text.py:466 -#: ../textw/network_text.py:469 +#: ../textw/network_text.py:460 ../textw/network_text.py:471 +#: ../textw/network_text.py:474 msgid "IPv6 address" msgstr "IPv6地址" -#: ../textw/network_text.py:459 ../textw/network_text.py:478 +#: ../textw/network_text.py:464 ../textw/network_text.py:483 msgid "IPv6 prefix" msgstr "IPv6前缀" -#: ../textw/network_text.py:504 +#: ../textw/network_text.py:509 msgid "Configure Network Interface" msgstr "配置网络界面" -#: ../textw/network_text.py:505 +#: ../textw/network_text.py:510 #, python-format msgid "Would you like to configure the %s network interface in your system?" msgstr "您想配置系统的%s网络界面吗?" -#: ../textw/network_text.py:519 ../textw/network_text.py:521 +#: ../textw/network_text.py:524 ../textw/network_text.py:526 msgid "UNCONFIGURED" msgstr "未配置(UNCONFIGURED)" -#: ../textw/network_text.py:530 +#: ../textw/network_text.py:535 msgid "" "The current configuration settings for each interface are listed next to the " "device name. Unconfigured interfaces are shown as UNCONFIGURED. To " @@ -4852,77 +4797,67 @@ msgstr "" "每个接口的现有配置列在设备名称旁。没有配置的接口被标记为UNCONFIGURED。选择接" "口然后选择Edit可以对接口进行配置。当您完成配置，点击OK进行下一步。" -#: ../textw/network_text.py:620 +#: ../textw/network_text.py:567 msgid "Active on boot" msgstr "引导时激活" -#: ../textw/network_text.py:622 +#: ../textw/network_text.py:569 msgid "Inactive on boot" msgstr "引导时不激活" -#: ../textw/network_text.py:625 +#: ../textw/network_text.py:572 msgid "DHCP" msgstr "动态主机配置协议(DHCP)" -#: ../textw/network_text.py:630 +#: ../textw/network_text.py:577 msgid "Auto IPv6" msgstr "自动 IPv6" -#: ../textw/network_text.py:632 +#: ../textw/network_text.py:579 msgid "DHCPv6" msgstr "DHCPv6" -#: ../textw/network_text.py:638 -#, python-format -msgid "%s, %s, %s" -msgstr "%s, %s, %s" - -#: ../textw/network_text.py:640 ../textw/network_text.py:642 -#, python-format -msgid "%s, %s" -msgstr "%s, %s" - -#: ../textw/network_text.py:665 ../loader2/net.c:1025 +#: ../textw/network_text.py:678 ../loader2/net.c:1059 msgid "Gateway:" msgstr "网关：" -#: ../textw/network_text.py:674 +#: ../textw/network_text.py:687 msgid "Primary DNS:" msgstr "主 DNS：" -#: ../textw/network_text.py:679 +#: ../textw/network_text.py:692 msgid "Secondary DNS:" msgstr "从 DNS：" -#: ../textw/network_text.py:686 +#: ../textw/network_text.py:699 msgid "Miscellaneous Network Settings" msgstr "其它网络设置" -#: ../textw/network_text.py:703 ../textw/network_text.py:706 +#: ../textw/network_text.py:716 ../textw/network_text.py:719 msgid "gateway" msgstr "网关" -#: ../textw/network_text.py:713 ../textw/network_text.py:716 +#: ../textw/network_text.py:726 ../textw/network_text.py:729 msgid "primary DNS" msgstr "主 DNS" -#: ../textw/network_text.py:725 +#: ../textw/network_text.py:738 msgid "secondary DNS" msgstr "从 DNS" -#: ../textw/network_text.py:759 +#: ../textw/network_text.py:762 msgid "automatically via DHCP" msgstr "通过 DHCP 自动配置" -#: ../textw/network_text.py:762 +#: ../textw/network_text.py:765 msgid "manually" msgstr "手工设置" -#: ../textw/network_text.py:781 +#: ../textw/network_text.py:784 msgid "Hostname Configuration" msgstr "主机名配置" -#: ../textw/network_text.py:784 +#: ../textw/network_text.py:787 msgid "" "If your system is part of a larger network where hostnames are assigned by " "DHCP, select automatically via DHCP. Otherwise, select manually and enter a " @@ -4933,269 +4868,269 @@ msgstr "" "动配置。否则，选择手工配置，并为您的系统输入一个主机名。如果您不这么做，您的" "系统就会被称为“本地主机”。" -#: ../textw/network_text.py:810 ../textw/network_text.py:816 +#: ../textw/network_text.py:813 ../textw/network_text.py:819 msgid "Invalid Hostname" msgstr "无效主机名" -#: ../textw/network_text.py:811 +#: ../textw/network_text.py:814 msgid "You have not specified a hostname." msgstr "您还没有指定一个主机名。" -#: ../textw/partition_text.py:43 +#: ../textw/partition_text.py:49 msgid "Must specify a value" msgstr "必须指定一个值" -#: ../textw/partition_text.py:46 +#: ../textw/partition_text.py:52 msgid "Requested value is not an integer" msgstr "申请值不是整数" -#: ../textw/partition_text.py:48 +#: ../textw/partition_text.py:54 msgid "Requested value is too large" msgstr "申请值太大" -#: ../textw/partition_text.py:115 +#: ../textw/partition_text.py:121 #, python-format msgid "RAID Device %s" msgstr "RAID 设备 %s" -#: ../textw/partition_text.py:243 +#: ../textw/partition_text.py:249 #, python-format msgid "Warning: %s" msgstr "警告：%s" -#: ../textw/partition_text.py:244 +#: ../textw/partition_text.py:250 msgid "Modify Partition" msgstr "修改分区" -#: ../textw/partition_text.py:244 +#: ../textw/partition_text.py:250 msgid "Add anyway" msgstr "强行添加" -#: ../textw/partition_text.py:282 +#: ../textw/partition_text.py:288 msgid "Mount Point:" msgstr "挂载点：" -#: ../textw/partition_text.py:334 +#: ../textw/partition_text.py:340 msgid "File System type:" msgstr "文件系统类型：" -#: ../textw/partition_text.py:368 +#: ../textw/partition_text.py:374 msgid "Allowable Drives:" msgstr "允许的驱动器：" -#: ../textw/partition_text.py:424 +#: ../textw/partition_text.py:430 msgid "Fixed Size:" msgstr "固定大小：" -#: ../textw/partition_text.py:426 +#: ../textw/partition_text.py:432 msgid "Fill maximum size of (MB):" msgstr "使用全部空间(MB)：" -#: ../textw/partition_text.py:430 +#: ../textw/partition_text.py:436 msgid "Fill all available space:" msgstr "使用全部可用空间：" -#: ../textw/partition_text.py:453 +#: ../textw/partition_text.py:459 msgid "Start Cylinder:" msgstr "起始柱面：" -#: ../textw/partition_text.py:466 +#: ../textw/partition_text.py:472 msgid "End Cylinder:" msgstr "结束柱面：" -#: ../textw/partition_text.py:489 +#: ../textw/partition_text.py:495 msgid "Volume Group:" msgstr "卷组：" -#: ../textw/partition_text.py:511 +#: ../textw/partition_text.py:517 msgid "RAID Level:" msgstr "RAID 级别：" -#: ../textw/partition_text.py:529 +#: ../textw/partition_text.py:535 msgid "RAID Members:" msgstr "RAID 成员：" -#: ../textw/partition_text.py:548 +#: ../textw/partition_text.py:554 msgid "Number of spares?" msgstr "备件数量？" -#: ../textw/partition_text.py:562 +#: ../textw/partition_text.py:568 msgid "File System Type:" msgstr "文件系统类型：" -#: ../textw/partition_text.py:575 +#: ../textw/partition_text.py:581 msgid "File System Label:" msgstr "文件系统标签：" -#: ../textw/partition_text.py:586 +#: ../textw/partition_text.py:592 msgid "File System Option:" msgstr "文件系统选项：" -#: ../textw/partition_text.py:589 ../textw/partition_text.py:827 -#: ../textw/partition_text.py:1064 ../textw/partition_text.py:1236 +#: ../textw/partition_text.py:595 ../textw/partition_text.py:802 +#: ../textw/partition_text.py:1027 ../textw/partition_text.py:1197 #, python-format msgid "Format as %s" msgstr "格式化成 %s" -#: ../textw/partition_text.py:591 ../textw/partition_text.py:829 -#: ../textw/partition_text.py:1066 ../textw/partition_text.py:1238 +#: ../textw/partition_text.py:597 ../textw/partition_text.py:804 +#: ../textw/partition_text.py:1029 ../textw/partition_text.py:1199 #, python-format msgid "Migrate to %s" msgstr "迁移到 %s" -#: ../textw/partition_text.py:593 ../textw/partition_text.py:831 -#: ../textw/partition_text.py:1068 ../textw/partition_text.py:1240 +#: ../textw/partition_text.py:599 ../textw/partition_text.py:806 +#: ../textw/partition_text.py:1031 ../textw/partition_text.py:1201 msgid "Leave unchanged" msgstr "保持不变" -#: ../textw/partition_text.py:609 ../textw/partition_text.py:804 -#: ../textw/partition_text.py:1044 ../textw/partition_text.py:1216 +#: ../textw/partition_text.py:612 ../textw/partition_text.py:782 +#: ../textw/partition_text.py:1007 ../textw/partition_text.py:1177 msgid "File System Options" msgstr "文件系统选项" -#: ../textw/partition_text.py:612 +#: ../textw/partition_text.py:615 msgid "" "Please choose how you would like to prepare the file system on this " "partition." msgstr "请选择您想如何在该分区上筹备文件系统。" -#: ../textw/partition_text.py:620 -msgid "Check for bad blocks" -msgstr "检查磁盘坏块" - -#: ../textw/partition_text.py:624 +#: ../textw/partition_text.py:622 msgid "Leave unchanged (preserve data)" msgstr "保持不变（保留信息）" -#: ../textw/partition_text.py:633 +#: ../textw/partition_text.py:631 msgid "Format as:" msgstr "格式化成：" -#: ../textw/partition_text.py:653 +#: ../textw/partition_text.py:651 msgid "Migrate to:" msgstr "迁移到：" -#: ../textw/partition_text.py:765 +#: ../textw/partition_text.py:752 msgid "Force to be a primary partition" msgstr "强制为主分区" -#: ../textw/partition_text.py:782 +#: ../textw/partition_text.py:761 msgid "Not Supported" msgstr "不支持" -#: ../textw/partition_text.py:783 +#: ../textw/partition_text.py:762 msgid "You can only edit LVM Volume Groups in the graphical installer." msgstr "您只能在图形化安装程序中编辑LVM 卷组." -#: ../textw/partition_text.py:859 ../textw/partition_text.py:912 +#: ../textw/partition_text.py:829 ../textw/partition_text.py:877 msgid "Invalid Entry for Partition Size" msgstr "分区大小项目无效" -#: ../textw/partition_text.py:871 +#: ../textw/partition_text.py:841 msgid "Invalid Entry for Maximum Size" msgstr "最大值项目无效" -#: ../textw/partition_text.py:890 +#: ../textw/partition_text.py:860 msgid "Invalid Entry for Starting Cylinder" msgstr "起始柱面项目无效" -#: ../textw/partition_text.py:904 +#: ../textw/partition_text.py:869 msgid "Invalid Entry for End Cylinder" msgstr "结束柱面项目无效" -#: ../textw/partition_text.py:1017 +#: ../textw/partition_text.py:980 msgid "No RAID partitions" msgstr "无 RAID 分区" -#: ../textw/partition_text.py:1018 +#: ../textw/partition_text.py:981 msgid "At least two software RAID partitions are needed." msgstr "至少需要两个软件 RAID 分区。" -#: ../textw/partition_text.py:1030 ../textw/partition_text.py:1203 +#: ../textw/partition_text.py:993 ../textw/partition_text.py:1164 msgid "Format partition?" msgstr "格式化分区？" -#: ../textw/partition_text.py:1092 +#: ../textw/partition_text.py:1055 msgid "Invalid Entry for RAID Spares" msgstr "RAID 备件项目无效" -#: ../textw/partition_text.py:1107 +#: ../textw/partition_text.py:1070 msgid "Too many spares" msgstr "剩余太多" -#: ../textw/partition_text.py:1108 +#: ../textw/partition_text.py:1071 msgid "You may not use any spares with a RAID0 array." msgstr "RAID0 阵列不能有任何多余。" -#: ../textw/partition_text.py:1189 +#: ../textw/partition_text.py:1150 msgid "No Volume Groups" msgstr "没有卷组" -#: ../textw/partition_text.py:1190 +#: ../textw/partition_text.py:1151 msgid "No volume groups exist in which to create a logical volume" msgstr "没有卷组可用于创建逻辑卷" -#: ../textw/partition_text.py:1314 +#: ../textw/partition_text.py:1275 #, 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:1333 +#: ../textw/partition_text.py:1294 #, 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:1387 +#: ../textw/partition_text.py:1347 msgid "New Partition or Logical Volume?" msgstr "是否新建分区或逻辑卷？" -#: ../textw/partition_text.py:1388 +#: ../textw/partition_text.py:1348 msgid "Would you like to create a new partition or a new logical volume?" msgstr "您是否要新建逻辑卷或新建分区？" -#: ../textw/partition_text.py:1390 +#: ../textw/partition_text.py:1350 msgid "partition" msgstr "分区" -#: ../textw/partition_text.py:1390 +#: ../textw/partition_text.py:1350 msgid "logical volume" msgstr "逻辑卷" -#: ../textw/partition_text.py:1466 +#: ../textw/partition_text.py:1422 +msgid "Size" +msgstr "大小" + +#: ../textw/partition_text.py:1426 msgid "New" msgstr "新建" -#: ../textw/partition_text.py:1468 +#: ../textw/partition_text.py:1428 msgid "Delete" msgstr "删除" -#: ../textw/partition_text.py:1469 +#: ../textw/partition_text.py:1429 msgid "RAID" msgstr "RAID" -#: ../textw/partition_text.py:1472 +#: ../textw/partition_text.py:1432 msgid "" " F1-Help F2-New F3-Edit F4-Delete F5-Reset F12-OK " msgstr "" " F1-帮助 F2-新建 F3-编辑 F4-删除 F5-重设 F12-确定 " -#: ../textw/partition_text.py:1504 +#: ../textw/partition_text.py:1464 msgid "No Root Partition" msgstr "无根分区" -#: ../textw/partition_text.py:1505 +#: ../textw/partition_text.py:1465 msgid "Installation requires a / partition." msgstr "安装需要 a /分区." -#: ../textw/partition_text.py:1547 +#: ../textw/partition_text.py:1507 msgid "Partitioning Type" msgstr "分区类型" -#: ../textw/partition_text.py:1549 +#: ../textw/partition_text.py:1509 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 " @@ -5204,35 +5139,35 @@ msgstr "" "安装需要对您的硬盘进行分区。默认分区方案适合大多数用户。您可以选择默认的分" "区，也可以创建您自己的分区。" -#: ../textw/partition_text.py:1573 +#: ../textw/partition_text.py:1533 msgid "Which drive(s) do you want to use for this installation?" msgstr "本次安装，您想使用哪些驱动器？" -#: ../textw/partition_text.py:1588 +#: ../textw/partition_text.py:1548 msgid "<Space>,<+>,<-> selection | <F2> Add drive | <F12> next screen" msgstr "<Space>,<+>,<-> 选择 | <F2> 添加驱动器 | <F12> 下一屏幕" -#: ../textw/partition_text.py:1657 +#: ../textw/partition_text.py:1615 msgid "Review Partition Layout" msgstr "检验分区方案" -#: ../textw/partition_text.py:1658 +#: ../textw/partition_text.py:1616 msgid "Review and modify partitioning layout?" msgstr "检验和修改分区方案？" -#: ../textw/partition_text.py:1679 tmp/adddrive.glade.h:3 +#: ../textw/partition_text.py:1637 tmp/adddrive.glade.h:3 msgid "Advanced Storage Options" msgstr "高级存储选项" -#: ../textw/partition_text.py:1680 tmp/adddrive.glade.h:5 +#: ../textw/partition_text.py:1638 tmp/adddrive.glade.h:5 msgid "How would you like to modify your drive configuration?" msgstr "您想如何修改驱动配置？" -#: ../textw/partition_text.py:1703 +#: ../textw/partition_text.py:1661 msgid "Add FCP Device" msgstr "添加 FCP 设备" -#: ../textw/partition_text.py:1704 tmp/zfcp-config.glade.h:5 +#: ../textw/partition_text.py:1662 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 " @@ -5242,42 +5177,42 @@ msgstr "" "提供5个参数：一个16位设备号、一个16位 SCSI ID、一个64位全局端口名（WWPN）、一" "个16位 SCSI LUN 和一个64位 FCP LUN。" -#: ../textw/partition_text.py:1727 tmp/iscsi-config.glade.h:5 +#: ../textw/partition_text.py:1685 tmp/iscsi-config.glade.h:5 msgid "Configure iSCSI Parameters" msgstr "配置iSCSI参数" -#: ../textw/partition_text.py:1728 tmp/iscsi-config.glade.h:6 +#: ../textw/partition_text.py:1686 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:1729 +#: ../textw/partition_text.py:1687 msgid "Target IP Address" msgstr "目标 IP 地址" -#: ../textw/partition_text.py:1730 +#: ../textw/partition_text.py:1688 msgid "iSCSI Initiator Name" msgstr "iSCSI 启动器名称" -#: ../textw/partmethod_text.py:26 +#: ../textw/partmethod_text.py:32 msgid "Autopartition" msgstr "自动分区" -#: ../textw/partmethod_text.py:27 +#: ../textw/partmethod_text.py:33 msgid "Disk Druid" msgstr "Disk Druid" -#: ../textw/progress_text.py:51 +#: ../textw/progress_text.py:59 msgid "Package Installation" msgstr "安装软件包" -#: ../textw/task_text.py:42 +#: ../textw/task_text.py:51 msgid "Package selection" msgstr "选择软件包" -#: ../textw/task_text.py:48 tmp/tasksel.glade.h:4 +#: ../textw/task_text.py:57 tmp/tasksel.glade.h:4 #, no-c-format, python-format msgid "" "The default installation of %s includes a set of software applicable for " @@ -5287,64 +5222,64 @@ msgstr "" "%s 的默认安装包括一系列用于一般互联网应用的软件。您希望您的系统可以支持的额外" "功能是什么？" -#: ../textw/task_text.py:63 +#: ../textw/task_text.py:72 msgid "Customize software selection" msgstr "定制软件选择" -#: ../textw/timezone_text.py:68 +#: ../textw/timezone_text.py:74 msgid "In which time zone are you located?" msgstr "您位于哪一个时区？" -#: ../textw/timezone_text.py:86 +#: ../textw/timezone_text.py:92 msgid "System clock uses UTC" msgstr "系统时钟使用 UTC" -#: ../textw/upgrade_bootloader_text.py:88 -#: ../textw/upgrade_bootloader_text.py:97 +#: ../textw/upgrade_bootloader_text.py:112 +#: ../textw/upgrade_bootloader_text.py:121 msgid "Update boot loader configuration" msgstr "更新引导装载程序配置" -#: ../textw/upgrade_bootloader_text.py:100 +#: ../textw/upgrade_bootloader_text.py:124 msgid "Skip boot loader updating" msgstr "跳过引导装载程序的更新" -#: ../textw/upgrade_bootloader_text.py:102 +#: ../textw/upgrade_bootloader_text.py:126 msgid "Create new boot loader configuration" msgstr "创建新的引导装载程序配置" -#: ../textw/upgrade_text.py:107 +#: ../textw/upgrade_text.py:113 msgid "Free Space" msgstr "空闲空间" -#: ../textw/upgrade_text.py:122 +#: ../textw/upgrade_text.py:128 msgid "RAM detected (MB):" msgstr "检测到的内存(MB)：" -#: ../textw/upgrade_text.py:125 +#: ../textw/upgrade_text.py:131 msgid "Suggested size (MB):" msgstr "建议大小(MB)：" -#: ../textw/upgrade_text.py:128 +#: ../textw/upgrade_text.py:134 msgid "Swap file size (MB):" msgstr "交换文件大小(MB)：" -#: ../textw/upgrade_text.py:136 +#: ../textw/upgrade_text.py:142 msgid "Add Swap" msgstr "添加交换区" -#: ../textw/upgrade_text.py:161 +#: ../textw/upgrade_text.py:167 msgid "The value you entered is not a valid number." msgstr "您所输入的数值不是一个有效的数字。" -#: ../textw/upgrade_text.py:194 +#: ../textw/upgrade_text.py:200 msgid "Reinstall System" msgstr "重新安装系统" -#: ../textw/upgrade_text.py:203 +#: ../textw/upgrade_text.py:214 msgid "System to Upgrade" msgstr "要升级的系统" -#: ../textw/upgrade_text.py:204 +#: ../textw/upgrade_text.py:215 msgid "" "There seem to be one or more existing Linux installations on your system.\n" "\n" @@ -5359,20 +5294,25 @@ msgstr "" msgid "Root Password" msgstr "根口令" -#: ../textw/userauth_text.py:29 +#: ../textw/userauth_text.py:30 +#, fuzzy msgid "" "Pick a root password. You must type it twice to ensure you know it and do " -"not make a typing mistake. Remember that the root password is a critical " -"part of system security!" +"not make a typing mistake. " msgstr "" "设定一个根口令.您必须键入两次,以确保无键入错误.切记,根口令是确保系统安全的一" "个重要环节!" -#: ../textw/userauth_text.py:60 +#: ../textw/userauth_text.py:64 msgid "The root password must be at least 6 characters long." msgstr "根口令最少应有六个字符。" -#: ../textw/welcome_text.py:23 +#: ../textw/welcome_text.py:27 +#, python-format +msgid "%s" +msgstr "%s" + +#: ../textw/welcome_text.py:28 #, python-format msgid "" "Welcome to %s!\n" @@ -5381,7 +5321,7 @@ msgstr "" "欢迎使用 %s！\n" "\n" -#: ../textw/zipl_text.py:26 +#: ../textw/zipl_text.py:32 msgid "" "The z/IPL Boot Loader will be installed on your system after installation is " "complete. You can now enter any additional kernel and chandev parameters " @@ -5390,19 +5330,19 @@ msgstr "" "z/IPL 引导装载程序将会在安装完成后在您的系统上被安装。您现在可以输入您的机器" "或设置可能需要的附加内核和 chandev 参数。" -#: ../textw/zipl_text.py:58 +#: ../textw/zipl_text.py:64 msgid "z/IPL Configuration" msgstr "z/IPL 配置" -#: ../textw/zipl_text.py:66 ../textw/zipl_text.py:70 +#: ../textw/zipl_text.py:72 ../textw/zipl_text.py:76 msgid "Chandev line " msgstr "Chandev 行" -#: ../installclasses/fedora.py:15 +#: ../installclasses/fedora.py:34 msgid "_Fedora" msgstr "Fedora(_F)" -#: ../installclasses/fedora.py:16 ../installclasses/rhel.py:22 +#: ../installclasses/fedora.py:35 ../installclasses/rhel.py:42 #, python-format msgid "" "The default installation of %s includes a set of software applicable for " @@ -5412,55 +5352,55 @@ msgstr "" "%s 的默认安装包括一系列用于一般互联网应用的软件。您希望您的系统可以支持的额外" "功能是什么？" -#: ../installclasses/fedora.py:25 +#: ../installclasses/fedora.py:44 msgid "Office and Productivity" msgstr "办公" -#: ../installclasses/fedora.py:26 ../installclasses/rhel.py:35 -#: ../installclasses/rhel.py:40 +#: ../installclasses/fedora.py:45 ../installclasses/rhel.py:55 +#: ../installclasses/rhel.py:60 msgid "Software Development" msgstr "软件开发" -#: ../installclasses/fedora.py:27 ../installclasses/rhel.py:39 +#: ../installclasses/fedora.py:46 ../installclasses/rhel.py:59 msgid "Web server" msgstr "网络服务器" -#: ../installclasses/rhel.py:21 +#: ../installclasses/rhel.py:41 msgid "Red Hat Enterprise Linux" msgstr "红帽企业 Linux" -#: ../installclasses/rhel.py:32 +#: ../installclasses/rhel.py:52 msgid "Office" msgstr "办公" -#: ../installclasses/rhel.py:33 +#: ../installclasses/rhel.py:53 msgid "Multimedia" msgstr "多媒体" -#: ../installclasses/rhel.py:44 +#: ../installclasses/rhel.py:64 msgid "Virtualization" msgstr "虚拟化" -#: ../installclasses/rhel.py:45 +#: ../installclasses/rhel.py:65 msgid "Clustering" msgstr "建立集群" -#: ../installclasses/rhel.py:46 +#: ../installclasses/rhel.py:66 msgid "Storage Clustering" msgstr "存储器 集群" -#: ../installclasses/rhel.py:50 +#: ../installclasses/rhel.py:70 msgid "Installation Number" msgstr "安装号码" -#: ../installclasses/rhel.py:51 +#: ../installclasses/rhel.py:71 msgid "" "To install the full set of supported packages included in your subscription, " "please enter your Installation Number" msgstr "" "如果您希望安装你选择的所有选择的软件包，请输入您的Installation Number。" -#: ../installclasses/rhel.py:54 +#: ../installclasses/rhel.py:74 msgid "" "If you're unable to locate the Installation Number, consult http://www." "redhat.com/apps/support/in.html.\n" @@ -5480,22 +5420,22 @@ msgstr "" "＊您的Red Hat Enterprise Linux 将得不到支持和保护。\n" "＊您将不能获得更多的关于软件和安全升级" -#: ../loader2/cdinstall.c:92 ../loader2/cdinstall.c:113 -#: ../loader2/mediacheck.c:346 +#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:117 +#: ../loader2/mediacheck.c:76 msgid "Media Check" msgstr "检查介质" -#: ../loader2/cdinstall.c:92 ../loader2/cdinstall.c:95 -#: ../loader2/cdinstall.c:113 ../loader2/cdinstall.c:121 -#: ../loader2/method.c:422 +#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:99 +#: ../loader2/cdinstall.c:117 ../loader2/cdinstall.c:125 +#: ../loader2/method.c:424 msgid "Test" msgstr "测试" -#: ../loader2/cdinstall.c:92 ../loader2/cdinstall.c:96 +#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100 msgid "Eject Disc" msgstr "弹出光盘" -#: ../loader2/cdinstall.c:93 +#: ../loader2/cdinstall.c:97 #, c-format msgid "" "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject " @@ -5504,7 +5444,7 @@ msgstr "" "选择\"%s\" 来测试当前驱动器内的光盘，或\"%s\" 来弹出光盘，然后另插入一张来测" "试。" -#: ../loader2/cdinstall.c:114 +#: ../loader2/cdinstall.c:118 #, c-format msgid "" "If you would like to test additional media, insert the next disc and press " @@ -5516,18 +5456,18 @@ msgstr "" "如果您想测试附带的媒体，请放入下一张CD，并按\"%s\"。建议测试每一张CD，但并非" "严格要求这么做。至少在CD在第一次使用前要进行测试，之后就不必再测试了。" -#: ../loader2/cdinstall.c:137 +#: ../loader2/cdinstall.c:142 #, c-format msgid "" "The %s disc was not found in any of your drives. Please insert the %s disc " "and press %s to retry." msgstr "在您所有驱动器中均无法找到 %s 光盘。请插入 %s 光盘，然后按 %s 来重试。" -#: ../loader2/cdinstall.c:258 +#: ../loader2/cdinstall.c:196 msgid "Disc Found" msgstr "找到光盘" -#: ../loader2/cdinstall.c:259 +#: ../loader2/cdinstall.c:197 #, c-format msgid "" "To begin testing the media before installation press %s.\n" @@ -5538,100 +5478,100 @@ msgstr "" "\n" "选择 %s 跳过介质测试并开始安装。" -#: ../loader2/cdinstall.c:379 +#: ../loader2/cdinstall.c:323 #, 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:384 +#: ../loader2/cdinstall.c:328 #, 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:391 +#: ../loader2/cdinstall.c:334 msgid "Disc Not Found" msgstr "没找到光盘" -#: ../loader2/cdinstall.c:464 +#: ../loader2/cdinstall.c:402 msgid "Cannot find kickstart file on CDROM." msgstr "在光盘上找不到 kickstart 文件。" -#: ../loader2/copy.c:45 ../loader2/method.c:158 ../loader2/method.c:376 +#: ../loader2/copy.c:51 ../loader2/method.c:157 ../loader2/method.c:378 #, c-format msgid "Failed to read directory %s: %s" msgstr "读取目录 %s 失败：%s" -#: ../loader2/driverdisk.c:134 ../loader2/firewire.c:55 +#: ../loader2/driverdisk.c:138 msgid "Loading" msgstr "载入" -#: ../loader2/driverdisk.c:134 +#: ../loader2/driverdisk.c:138 msgid "Reading driver disk..." msgstr "正在读取驱动程序盘..." -#: ../loader2/driverdisk.c:276 ../loader2/driverdisk.c:308 +#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262 msgid "Driver Disk Source" msgstr "驱动程序盘源" -#: ../loader2/driverdisk.c:277 +#: ../loader2/driverdisk.c:231 msgid "" "You have multiple devices which could serve as sources for a driver disk. " "Which would you like to use?" msgstr "您的系统上具有多种可作为驱动程序盘源的设备。您想使用哪一个？" -#: ../loader2/driverdisk.c:309 +#: ../loader2/driverdisk.c:263 msgid "" "There are multiple partitions on this device which could contain the driver " "disk image. Which would you like to use?" msgstr "您的系统上具有多种可作为驱动程序盘映像来源的分区。您想使用哪一个？" -#: ../loader2/driverdisk.c:347 +#: ../loader2/driverdisk.c:300 msgid "Failed to mount partition." msgstr "挂载分区失败。" -#: ../loader2/driverdisk.c:355 +#: ../loader2/driverdisk.c:308 msgid "Select driver disk image" msgstr "选择驱动盘映像" -#: ../loader2/driverdisk.c:356 +#: ../loader2/driverdisk.c:309 msgid "Select the file which is your driver disk image." msgstr "选择您的驱动盘映像文件。" -#: ../loader2/driverdisk.c:385 +#: ../loader2/driverdisk.c:338 msgid "Failed to load driver disk from file." msgstr "从文件挂载驱动程序盘失败。" -#: ../loader2/driverdisk.c:396 +#: ../loader2/driverdisk.c:349 #, c-format msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue." msgstr "在 /dev/%s 中插入驱动程序盘，然后按“确定”来继续。" -#: ../loader2/driverdisk.c:398 +#: ../loader2/driverdisk.c:351 msgid "Insert Driver Disk" msgstr "插入驱动程序盘" -#: ../loader2/driverdisk.c:413 +#: ../loader2/driverdisk.c:366 msgid "Failed to mount driver disk." msgstr "挂载驱动程序盘失败。" -#: ../loader2/driverdisk.c:423 +#: ../loader2/driverdisk.c:376 #, c-format msgid "Driver disk is invalid for this release of %s." msgstr "驱动程序盘无效%s 的这个发行版本。" -#: ../loader2/driverdisk.c:486 +#: ../loader2/driverdisk.c:439 msgid "Manually choose" msgstr "手工选择" -#: ../loader2/driverdisk.c:487 +#: ../loader2/driverdisk.c:440 msgid "Load another disk" msgstr "载入另一张磁盘" -#: ../loader2/driverdisk.c:488 +#: ../loader2/driverdisk.c:441 msgid "" "No devices of the appropriate type were found on this driver disk. Would " "you like to manually select the driver, continue anyway, or load another " @@ -5640,45 +5580,45 @@ msgstr "" "在驱动程序盘上没有找到恰当类型的设备。您想手工选择驱动程序、继续、还是载入另" "一张磁盘？" -#: ../loader2/driverdisk.c:526 +#: ../loader2/driverdisk.c:479 msgid "Driver disk" msgstr "驱动程序盘" -#: ../loader2/driverdisk.c:527 +#: ../loader2/driverdisk.c:480 msgid "Do you have a driver disk?" msgstr "您有驱动程序盘吗？" -#: ../loader2/driverdisk.c:536 +#: ../loader2/driverdisk.c:489 msgid "More Driver Disks?" msgstr "更多驱动程序盘？" -#: ../loader2/driverdisk.c:537 +#: ../loader2/driverdisk.c:490 msgid "Do you wish to load any more driver disks?" msgstr "您想载入更多驱动程序盘吗？" -#: ../loader2/driverdisk.c:583 ../loader2/driverdisk.c:620 -#: ../loader2/hdinstall.c:404 ../loader2/kickstart.c:127 -#: ../loader2/kickstart.c:137 ../loader2/kickstart.c:180 -#: ../loader2/kickstart.c:523 ../loader2/modules.c:1036 -#: ../loader2/modules.c:1049 ../loader2/net.c:1597 ../loader2/net.c:1620 -#: ../loader2/nfsinstall.c:251 ../loader2/urlinstall.c:464 -#: ../loader2/urlinstall.c:473 ../loader2/urlinstall.c:484 +#: ../loader2/driverdisk.c:535 ../loader2/driverdisk.c:572 +#: ../loader2/hdinstall.c:426 ../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 msgid "Kickstart Error" msgstr "Kickstart 错误" -#: ../loader2/driverdisk.c:584 +#: ../loader2/driverdisk.c:536 #, c-format msgid "Unknown driver disk kickstart source: %s" msgstr "未知驱动程序盘的 kickstart 源：%s" -#: ../loader2/driverdisk.c:621 +#: ../loader2/driverdisk.c:573 #, c-format msgid "" "The following invalid argument was specified for the kickstart driver disk " "command: %s:%s" msgstr "以下为 kickstart 驱动程序盘命令 %s 指定的参数无效：%s" -#: ../loader2/driverselect.c:60 +#: ../loader2/driverselect.c:65 #, c-format msgid "" "Please enter any parameters which you wish to pass to the %s module " @@ -5688,25 +5628,25 @@ msgstr "" "请输入您想传递给 %s 模块的任何参数，用空格间隔。如果不知道要提供哪些参数，按" "\"确定\"按钮即可跳过。" -#: ../loader2/driverselect.c:80 +#: ../loader2/driverselect.c:85 msgid "Enter Module Parameters" msgstr "输入模块参数" -#: ../loader2/driverselect.c:179 +#: ../loader2/driverselect.c:172 msgid "No drivers found" msgstr "未找到任何驱动程序" -#: ../loader2/driverselect.c:179 +#: ../loader2/driverselect.c:172 msgid "Load driver disk" msgstr "载入驱动程序盘" -#: ../loader2/driverselect.c:180 +#: ../loader2/driverselect.c:173 msgid "" "No drivers were found to manually insert. Would you like to use a driver " "disk?" msgstr "没有找到任何驱动程序来手工插入。您想要使用驱动程序盘吗？" -#: ../loader2/driverselect.c:198 +#: ../loader2/driverselect.c:191 msgid "" "Please select the driver below which you wish to load. If it does not " "appear and you have a driver disk, press F2." @@ -5714,40 +5654,45 @@ msgstr "" "请在下面选择您想载入的驱动程序。如果它没有被包括，并且您另外备有驱动程序盘，" "请按 F2 键。" -#: ../loader2/driverselect.c:206 +#: ../loader2/driverselect.c:200 msgid "Specify optional module arguments" msgstr "指定可选模块参数" -#: ../loader2/driverselect.c:226 +#: ../loader2/driverselect.c:225 msgid "Select Device Driver to Load" msgstr "选择要载入的设备驱动程序" -#: ../loader2/firewire.c:55 ../loader2/windows.c:57 -#, c-format -msgid "Loading %s driver..." -msgstr "正在载入 %s 驱动程序..." +#: ../loader2/hdinstall.c:76 ../loader2/nfsinstall.c:167 +#: ../loader2/nfsinstall.c:218 ../loader2/urlinstall.c:262 +msgid "Media Detected" +msgstr "检测到介质" + +#: ../loader2/hdinstall.c:77 ../loader2/nfsinstall.c:168 +#: ../loader2/nfsinstall.c:219 ../loader2/urlinstall.c:263 +msgid "Local installation media detected..." +msgstr "检测到本地安装介质..." -#: ../loader2/hdinstall.c:102 ../loader2/nfsinstall.c:198 -#: ../loader2/urlinstall.c:151 +#: ../loader2/hdinstall.c:129 ../loader2/nfsinstall.c:249 +#: ../loader2/urlinstall.c:163 #, c-format msgid "" "The %s installation tree in that directory does not seem to match your boot " "media." msgstr "该目录中的 %s 安装树似乎和您的引导介质不符。" -#: ../loader2/hdinstall.c:158 +#: ../loader2/hdinstall.c:187 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:266 +#: ../loader2/hdinstall.c:291 msgid "" "You don't seem to have any hard drives on your system! Would you like to " "configure additional devices?" msgstr "您的系统似乎未配备任何硬盘驱动器！是否要配置附加设备？" -#: ../loader2/hdinstall.c:280 +#: ../loader2/hdinstall.c:305 #, c-format msgid "" "What partition and directory on that partition hold the CD (iso9660) images " @@ -5757,61 +5702,62 @@ msgstr "" "哪一个分区以及分区上的哪一个目录下存有 %s 的光盘（iso9660）映像？如果您所用的" "磁盘驱动器在这里没有被列出，按 F2 键来配置附加的设备。" -#: ../loader2/hdinstall.c:303 +#: ../loader2/hdinstall.c:328 msgid "Directory holding images:" msgstr "包含映像的目录：" -#: ../loader2/hdinstall.c:331 +#: ../loader2/hdinstall.c:356 msgid "Select Partition" msgstr "选择分区" -#: ../loader2/hdinstall.c:370 +#: ../loader2/hdinstall.c:395 #, c-format msgid "Device %s does not appear to contain %s CDROM images." msgstr "设备 %s 似乎不包含 %s 光盘映像。" -#: ../loader2/hdinstall.c:405 +#: ../loader2/hdinstall.c:427 #, c-format msgid "Bad argument to HD kickstart method command %s: %s" msgstr "硬盘 kickstart 方法命令 %s 的参数不对：%s" -#: ../loader2/hdinstall.c:475 ../loader2/hdinstall.c:531 +#: ../loader2/hdinstall.c:497 ../loader2/hdinstall.c:553 msgid "Cannot find kickstart file on hard drive." msgstr "在硬盘驱动器上找不到 kickstart 文件。" -#: ../loader2/hdinstall.c:518 +#: ../loader2/hdinstall.c:540 #, c-format msgid "Cannot find hard drive for BIOS disk %s" msgstr "无法找到与 BIOS 对应的硬盘 %s" -#: ../loader2/kbd.c:129 +#: ../loader2/kbd.c:136 msgid "Keyboard Type" msgstr "键盘类型" -#: ../loader2/kbd.c:130 +#: ../loader2/kbd.c:137 msgid "What type of keyboard do you have?" msgstr "您使用哪一种类型的键盘？" -#: ../loader2/kickstart.c:128 +#: ../loader2/kickstart.c:133 #, c-format msgid "Error opening kickstart file %s: %s" msgstr "打开 kickstart 文件 %s 时出错：%s" -#: ../loader2/kickstart.c:138 +#: ../loader2/kickstart.c:143 #, c-format msgid "Error reading contents of kickstart file %s: %s" msgstr "读取 kickstart 文件 %s 的内容时出现错误：%s" -#: ../loader2/kickstart.c:181 +#: ../loader2/kickstart.c:186 #, c-format msgid "Error in %s on line %d of kickstart file %s." msgstr "%s 处出错，第 %d 行的 kickstart 文件 %s。" -#: ../loader2/kickstart.c:280 -msgid "Cannot find ks.cfg on boot floppy." +#: ../loader2/kickstart.c:285 +#, fuzzy +msgid "Cannot find ks.cfg on removable media." msgstr "无法在引导软盘中找到 ks.cfg。" -#: ../loader2/kickstart.c:371 +#: ../loader2/kickstart.c:377 msgid "" "Unable to download the kickstart file. Please modify the kickstart " "parameter below or press Cancel to proceed as an interactive installation." @@ -5819,115 +5765,132 @@ msgstr "" "无法下载kickstart文件。请使用交互式安装方法：修改下边的kickstart参数或者 点击" "Cancel。" -#: ../loader2/kickstart.c:380 +#: ../loader2/kickstart.c:386 msgid "Error downloading kickstart file" msgstr "下载点击开始文件时出错" -#: ../loader2/kickstart.c:524 +#: ../loader2/kickstart.c:530 #, c-format msgid "Bad argument to shutdown kickstart method command %s: %s" msgstr "关闭 kickstart 方法命令 %s 的参数不对：%s" -#: ../loader2/lang.c:56 -#, c-format -msgid "Welcome to %s - Rescue Mode" +#: ../loader2/lang.c:64 +#, fuzzy, c-format +msgid "Welcome to %s for %s - Rescue Mode" msgstr "欢迎使用 %s - 援救模式" -#: ../loader2/lang.c:57 ../loader2/loader.c:159 +#: ../loader2/lang.c:65 ../loader2/loader.c:166 msgid "" " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen " msgstr "<Tab>/<Alt-Tab> 元素间切换 | <Space> 选择 | <F12> 下一屏幕 " -#: ../loader2/lang.c:366 +#: ../loader2/lang.c:373 msgid "Choose a Language" msgstr "选择一种语言" -#: ../loader2/loader.c:118 +#: ../loader2/loader.c:123 msgid "Local CD/DVD" msgstr "本地光盘" -#: ../loader2/loader.c:120 +#: ../loader2/loader.c:125 msgid "Hard drive" msgstr "硬盘驱动器" -#: ../loader2/loader.c:121 +#: ../loader2/loader.c:126 msgid "NFS directory" msgstr "NFS目录" -#: ../loader2/loader.c:337 +#: ../loader2/loader.c:156 +#, fuzzy, c-format +msgid "Welcome to %s%n for %s" +msgstr "欢迎使用 %s" + +#: ../loader2/loader.c:374 ../loader2/loader.c:410 msgid "Update Disk Source" msgstr "更新盘源" -#: ../loader2/loader.c:338 +#: ../loader2/loader.c:375 msgid "" "You have multiple devices which could serve as sources for an update disk. " "Which would you like to use?" msgstr "您的系统上具有多种可作为更新盘源的设备。您想使用哪一个？" -#: ../loader2/loader.c:353 +#: ../loader2/loader.c:411 +#, fuzzy +msgid "" +"There are multiple partitions on this device which could contain the update " +"disk image. Which would you like to use?" +msgstr "您的系统上具有多种可作为驱动程序盘映像来源的分区。您想使用哪一个？" + +#: ../loader2/loader.c:429 #, c-format msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue." msgstr "在 /dev/%s 中插入更新盘，然后按“确定”来继续。" -#: ../loader2/loader.c:355 +#: ../loader2/loader.c:431 msgid "Updates Disk" msgstr "更新盘" -#: ../loader2/loader.c:367 +#: ../loader2/loader.c:445 msgid "Failed to mount updates disk" msgstr "挂载更新盘失败。" -#: ../loader2/loader.c:370 +#: ../loader2/loader.c:448 msgid "Updates" msgstr "更新" -#: ../loader2/loader.c:370 +#: ../loader2/loader.c:448 msgid "Reading anaconda updates..." msgstr "正在读取 anaconda 更新..." -#: ../loader2/loader.c:412 +#: ../loader2/loader.c:484 +#, fuzzy msgid "" -"No hard drives have been found. You probably need to manually choose device " -"drivers for the installation to succeed. Would you like to select drivers " -"now?" +"Unable to download the updates image. Please modify the updates location " +"below or press Cancel to proceed without updates.." msgstr "" -"没有发现硬盘驱动器。您可能需要手工选择设备驱动程序以确保安装成功。您想现在就" -"选择驱动程序吗？" +"无法下载kickstart文件。请使用交互式安装方法：修改下边的kickstart参数或者 点击" +"Cancel。" -#: ../loader2/loader.c:849 +#: ../loader2/loader.c:493 +#, fuzzy +msgid "Error downloading updates image" +msgstr "下载点击开始文件时出错" + +#: ../loader2/loader.c:989 #, c-format msgid "You do not have enough RAM to install %s on this machine." msgstr "在本机上安装 %s 所需内存不够。" -#: ../loader2/loader.c:1008 +#: ../loader2/loader.c:1146 msgid "Rescue Method" msgstr "救援方法" -#: ../loader2/loader.c:1009 +#: ../loader2/loader.c:1147 msgid "Installation Method" msgstr "安装方法" -#: ../loader2/loader.c:1011 +#: ../loader2/loader.c:1149 msgid "What type of media contains the rescue image?" msgstr "哪一类介质包含救援映像？" -#: ../loader2/loader.c:1013 +#: ../loader2/loader.c:1151 msgid "What type of media contains the packages to be installed?" msgstr "哪一类介质包含要安装的软件包？" -#: ../loader2/loader.c:1037 +#: ../loader2/loader.c:1175 msgid "No driver found" msgstr "未找到任何驱动程序" -#: ../loader2/loader.c:1037 +#: ../loader2/loader.c:1175 msgid "Select driver" msgstr "选择驱动程序" -#: ../loader2/loader.c:1038 +#: ../loader2/loader.c:1176 msgid "Use a driver disk" msgstr "使用驱动程序盘" -#: ../loader2/loader.c:1039 +#: ../loader2/loader.c:1177 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?" @@ -5935,116 +5898,65 @@ msgstr "" "找不到这种安装类型所需的任何设备。您想手工选择驱动程序或使用一张驱动程序盘" "吗？" -#: ../loader2/loader.c:1258 +#: ../loader2/loader.c:1410 msgid "The following devices have been found on your system." msgstr "在系统中发现以下设备。" -#: ../loader2/loader.c:1260 +#: ../loader2/loader.c:1412 msgid "" "No device drivers have been loaded for your system. Would you like to load " "any now?" msgstr "没有为您的系统载入任何设备驱动程序。现在是否需要载入？" -#: ../loader2/loader.c:1264 +#: ../loader2/loader.c:1416 msgid "Devices" msgstr "设备" -#: ../loader2/loader.c:1265 +#: ../loader2/loader.c:1417 msgid "Done" msgstr "完成" -#: ../loader2/loader.c:1266 +#: ../loader2/loader.c:1418 msgid "Add Device" msgstr "添加设备" -#: ../loader2/loader.c:1437 +#: ../loader2/loader.c:1576 #, c-format msgid "loader has already been run. Starting shell.\n" msgstr "装载程序已经被运行。正在启动 shell。\n" -#: ../loader2/loader.c:1823 -#, c-format -msgid "Running anaconda, the %s rescue mode - please wait...\n" +#: ../loader2/loader.c:1915 +#, fuzzy, c-format +msgid "Running anaconda %s, the %s rescue mode - please wait...\n" msgstr "正在运行 anaconda，%s 救援模式 - 请稍候...\n" -#: ../loader2/loader.c:1825 -#, c-format -msgid "Running anaconda, the %s system installer - please wait...\n" +#: ../loader2/loader.c:1917 +#, fuzzy, c-format +msgid "Running anaconda %s, the %s system installer - please wait...\n" msgstr "正在运行 %s 的 anaconda 系统安装程序 - 请稍候...\n" -#: ../loader2/mediacheck.c:330 -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/mediacheck.c:62 +#, c-format +msgid "Unable to find install image %s" +msgstr "找不到安装映像 %s" -#: ../loader2/mediacheck.c:338 +#: ../loader2/mediacheck.c:68 #, c-format msgid "Checking \"%s\"..." msgstr "正在检查\"%s\"..." -#: ../loader2/mediacheck.c:340 +#: ../loader2/mediacheck.c:70 #, c-format msgid "Checking media now..." msgstr "正在检查介质..." -#: ../loader2/mediacheck.c:387 -#, c-format -msgid "Unable to find install image %s" -msgstr "找不到安装映像 %s" - -#: ../loader2/mediacheck.c:397 ../loader2/mediacheck.c:414 -msgid "FAILED" -msgstr "失败" - -#: ../loader2/mediacheck.c:398 +#: ../loader2/mediacheck.c:101 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:408 -msgid "PASSED" -msgstr "通过" - -#: ../loader2/mediacheck.c:409 -msgid "It is OK to install from this media." -msgstr "可以从这个介质中安装。" - -#: ../loader2/mediacheck.c:415 -msgid "No checksum information available, unable to verify media." -msgstr "没有可用的校验和，无法校验介质。" - -#: ../loader2/mediacheck.c:420 -msgid "Media Check Result" -msgstr "介质检查结果" - -#: ../loader2/mediacheck.c:424 -#, c-format -msgid "" -"%s for the image:\n" -"\n" -" %s" -msgstr "" -"%s的映像：\n" -"\n" -" %s" - -#: ../loader2/mediacheck.c:428 -#, c-format -msgid "" -"The media check %s\n" -"\n" -"%s" -msgstr "" -"介质检测%s\n" -"\n" -"%s" +"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:419 +#: ../loader2/method.c:421 #, c-format msgid "" "Would you like to perform a checksum test of the ISO image:\n" @@ -6055,42 +5967,34 @@ msgstr "" "\n" " %s？" -#: ../loader2/method.c:422 +#: ../loader2/method.c:424 msgid "Checksum Test" msgstr "校验和测试" -#: ../loader2/modules.c:1037 +#: ../loader2/modules.c:337 #, c-format msgid "Bad argument to device kickstart method command %s: %s" msgstr "设备 kickstart 方法命令 %s 的参数不对：%s" -#: ../loader2/modules.c:1050 -msgid "" -"Both module type and name must be specified for the kickstart device command." +#: ../loader2/modules.c:349 +#, fuzzy +msgid "A module name must be specified for the kickstart device command." msgstr "模块的种类和名称都必须为点击开始设备命令指定." -#: ../loader2/net.c:59 -#, c-format +#: ../loader2/net.c:57 +#, fuzzy, c-format msgid "" -"Please enter the following information:\n" -"\n" -" o the name or IP number of your %s server\n" -" o the directory on that server containing\n" -" %s for your architecture\n" -msgstr "" -"请输入以下信息：\n" -"\n" -" o %s 服务器的名称或 IP 地址\n" -" o 该服务器上包含适用于您的体系的 %s 的目录\n" -" \n" +"Please enter the URL containing %s on your\n" +"server.\n" +msgstr "请输入版本%s的注册码" -#: ../loader2/net.c:98 +#: ../loader2/net.c:97 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:261 +#: ../loader2/net.c:270 #, c-format msgid "" "%s is a wireless network adapter. Please provide the ESSID and encryption " @@ -6100,27 +6004,27 @@ msgstr "" "%s 是无线网络适配器。请提供进入您的无线网络所需的 ESSID 和加密钥匙。如果不需" "要钥匙，请把该字段留为空白，安装将会继续。" -#: ../loader2/net.c:267 +#: ../loader2/net.c:276 msgid "ESSID" msgstr "ESSID" -#: ../loader2/net.c:268 +#: ../loader2/net.c:277 msgid "Encryption Key" msgstr "加密密钥" -#: ../loader2/net.c:271 +#: ../loader2/net.c:280 msgid "Wireless Settings" msgstr "无线设置" -#: ../loader2/net.c:302 +#: ../loader2/net.c:315 msgid "Nameserver IP" msgstr "名称服务器(DNS) IP" -#: ../loader2/net.c:306 +#: ../loader2/net.c:319 msgid "Missing Nameserver" msgstr "缺失名称服务器" -#: ../loader2/net.c:307 +#: ../loader2/net.c:320 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 " @@ -6129,56 +6033,56 @@ msgstr "" "您的IP请求返回了IP配置信息,但该信息没有包括 DNS 名称服务器地址.您若不知道此信" "息,可将该字段留空,安装将继续." -#: ../loader2/net.c:329 +#: ../loader2/net.c:342 msgid "Invalid IP Information" msgstr "IP 信息无效" -#: ../loader2/net.c:330 +#: ../loader2/net.c:343 msgid "You entered an invalid IP address." msgstr "您输入的 IP 地址无效。" -#: ../loader2/net.c:583 ../loader2/net.c:691 +#: ../loader2/net.c:593 ../loader2/net.c:699 msgid "Network Error" msgstr "网络错误" -#: ../loader2/net.c:584 ../loader2/net.c:692 +#: ../loader2/net.c:594 ../loader2/net.c:700 msgid "There was an error configuring your network interface." msgstr "配置网络界面时出错。" -#: ../loader2/net.c:765 +#: ../loader2/net.c:780 msgid "Configure TCP/IP" msgstr "配置 TCP/IP" -#: ../loader2/net.c:792 +#: ../loader2/net.c:825 msgid "You must select at least one protocol (IPv4 or IPv6)." msgstr "您必须至少选择一项网络协议（IPv4或IPv6)。" -#: ../loader2/net.c:799 +#: ../loader2/net.c:832 msgid "IPv4 Needed for NFS" msgstr "NFS 需要 IPv4" -#: ../loader2/net.c:800 +#: ../loader2/net.c:833 msgid "NFS installation method requires IPv4 support." msgstr "NFS 安装需要 IPv4 的支持。" -#: ../loader2/net.c:920 +#: ../loader2/net.c:954 msgid "IPv4 address:" msgstr "IPv4 地址：" -#: ../loader2/net.c:932 ../loader2/net.c:984 tmp/netconfig.glade.h:1 +#: ../loader2/net.c:966 ../loader2/net.c:1018 tmp/netconfig.glade.h:1 #: tmp/netpostconfig.glade.h:1 msgid "/" msgstr "/" -#: ../loader2/net.c:972 +#: ../loader2/net.c:1006 msgid "IPv6 address:" msgstr "IPv6地址：" -#: ../loader2/net.c:1033 +#: ../loader2/net.c:1067 msgid "Name Server:" msgstr "域名服务器(DNS)：" -#: ../loader2/net.c:1069 +#: ../loader2/net.c:1103 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 " @@ -6188,202 +6092,184 @@ msgstr "" "掩码或CIDR形式的前缀是可接受的。网关和域名服务器域必须是有效的IPv4或IPv6的地" "址。" -#: ../loader2/net.c:1085 +#: ../loader2/net.c:1119 msgid "Manual TCP/IP Configuration" msgstr "手动配置TCP/IP" -#: ../loader2/net.c:1193 ../loader2/net.c:1199 +#: ../loader2/net.c:1228 ../loader2/net.c:1234 msgid "Missing Information" msgstr "缺少信息" -#: ../loader2/net.c:1194 +#: ../loader2/net.c:1229 msgid "" "You must enter both a valid IPv4 address and a network mask or CIDR prefix." msgstr "必须输入有效的 IPv4 地址和子网掩码或CIDR代码。" -#: ../loader2/net.c:1200 +#: ../loader2/net.c:1235 msgid "You must enter both a valid IPv6 address and a CIDR prefix." msgstr "您必须输入有效的 IPv6 地址和一个 CIDR 前缀。" -#: ../loader2/net.c:1505 +#: ../loader2/net.c:1557 msgid "Determining host name and domain..." msgstr "正在确定主机的名称和域..." -#: ../loader2/net.c:1598 +#: ../loader2/net.c:1654 #, c-format msgid "Bad argument to kickstart network command %s: %s" msgstr "kickstart 网络命令 %s 的参数不对：%s" -#: ../loader2/net.c:1621 +#: ../loader2/net.c:1677 #, c-format msgid "Bad bootproto %s specified in network command" msgstr "网络命令中指定的 bootproto %s 不对" -#: ../loader2/net.c:1802 +#: ../loader2/net.c:1865 msgid "Networking Device" msgstr "网络设备" -#: ../loader2/net.c:1803 +#: ../loader2/net.c:1866 msgid "" "You have multiple network devices on this system. Which would you like to " "install through?" msgstr "您的系统上具有多种网络设备。您想通过哪一种设备来安装？" -#: ../loader2/nfsinstall.c:47 +#: ../loader2/nfsinstall.c:57 msgid "NFS server name:" msgstr "NFS 服务器名称：" -#: ../loader2/nfsinstall.c:50 ../loader2/urls.c:313 +#: ../loader2/nfsinstall.c:60 #, c-format msgid "%s directory:" msgstr "%s 目录：" -#: ../loader2/nfsinstall.c:55 +#: ../loader2/nfsinstall.c:65 msgid "NFS" msgstr "NFS" -#: ../loader2/nfsinstall.c:56 +#: ../loader2/nfsinstall.c:66 msgid "NFS Setup" msgstr "NFS 设置" -#: ../loader2/nfsinstall.c:126 +#: ../loader2/nfsinstall.c:140 msgid "Hostname specified with no DNS configured" msgstr "无需设置DNS指定主机名" -#: ../loader2/nfsinstall.c:202 +#: ../loader2/nfsinstall.c:198 ../loader2/nfsinstall.c:265 +msgid "That directory could not be mounted from the server." +msgstr "无法从服务器中挂载该目录。" + +#: ../loader2/nfsinstall.c:253 #, c-format msgid "That directory does not seem to contain a %s installation tree." msgstr "该目录似乎不包含 %s 安装树。" -#: ../loader2/nfsinstall.c:214 -msgid "That directory could not be mounted from the server." -msgstr "无法从服务器中挂载该目录。" - -#: ../loader2/nfsinstall.c:252 +#: ../loader2/nfsinstall.c:303 #, c-format msgid "Bad argument to NFS kickstart method command %s: %s" msgstr "NFS kickstart 命令 %s 的参数不对：%s" -#: ../loader2/telnetd.c:83 ../loader2/telnetd.c:125 +#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131 msgid "Telnet" msgstr "Telnet" -#: ../loader2/telnetd.c:83 +#: ../loader2/telnetd.c:89 msgid "Waiting for telnet connection..." msgstr "正在等待 telnet 连接..." -#: ../loader2/telnetd.c:125 +#: ../loader2/telnetd.c:131 msgid "Running anaconda via telnet..." msgstr "通过 telnet 运行 anaconda ..." -#: ../loader2/urlinstall.c:69 +#: ../loader2/urlinstall.c:82 #, c-format msgid "Unable to retrieve %s://%s/%s/%s." msgstr "无法获取 %s://%s/%s/%s." -#: ../loader2/urlinstall.c:143 +#: ../loader2/urlinstall.c:155 msgid "Unable to retrieve the install image." msgstr "无法获取安装映像。" -#: ../loader2/urlinstall.c:288 -msgid "Media Detected" -msgstr "检测到介质" - -#: ../loader2/urlinstall.c:289 -msgid "Local installation media detected..." -msgstr "检测到本地安装介质..." - -#: ../loader2/urlinstall.c:465 +#: ../loader2/urlinstall.c:427 #, c-format msgid "Bad argument to Url kickstart method command %s: %s" msgstr "URL kickstart 方法命令 %s 的参数不对：%s" -#: ../loader2/urlinstall.c:474 +#: ../loader2/urlinstall.c:436 msgid "Must supply a --url argument to Url kickstart method." msgstr "必须给 URL kickstart 方法提供一个 --url 参数。" -#: ../loader2/urlinstall.c:485 +#: ../loader2/urlinstall.c:445 #, c-format msgid "Unknown Url method %s" msgstr "未知 URL 方法 %s" -#: ../loader2/urls.c:219 +#: ../loader2/urls.c:237 msgid "Retrieving" msgstr "检索" -#: ../loader2/urls.c:286 -msgid "FTP" -msgstr "FTP" - -#: ../loader2/urls.c:291 -msgid "Web" -msgstr "Web" - -#: ../loader2/urls.c:308 -msgid "FTP site name:" -msgstr "FTP 站点名：" - -#: ../loader2/urls.c:309 -msgid "Web site name:" -msgstr "网站名：" - -#: ../loader2/urls.c:328 -msgid "Use non-anonymous ftp" -msgstr "使用非匿名 FTP" - -#: ../loader2/urls.c:337 -msgid "FTP Setup" -msgstr "FTP 设置" - -#: ../loader2/urls.c:338 -msgid "HTTP Setup" -msgstr "HTTP 设置" +#: ../loader2/urls.c:306 +#, fuzzy +msgid "Configure proxy" +msgstr "配置 TCP/IP" -#: ../loader2/urls.c:348 -msgid "You must enter a server name." -msgstr "您必须输入服务器名称。" +#: ../loader2/urls.c:321 +#, fuzzy +msgid "URL Setup" +msgstr "NFS 设置" -#: ../loader2/urls.c:353 -msgid "You must enter a directory." +#: ../loader2/urls.c:329 +#, fuzzy +msgid "You must enter a URL." msgstr "您必须输入目录。" -#: ../loader2/urls.c:358 +#: ../loader2/urls.c:339 msgid "Unknown Host" msgstr "未知主机" -#: ../loader2/urls.c:359 +#: ../loader2/urls.c:340 #, c-format msgid "%s is not a valid hostname." msgstr "%s 不是有效的主机名。" -#: ../loader2/urls.c:430 -msgid "" -"If you are using non anonymous ftp, enter the account name and password you " -"wish to use below." -msgstr "如果要使用的是非匿名 FTP，请在下面输入要使用的帐号名和口令。" - -#: ../loader2/urls.c:435 +#: ../loader2/urls.c:386 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:457 -msgid "Account name:" -msgstr "帐号名：" +#: ../loader2/urls.c:401 +msgid "Proxy Name:" +msgstr "" -#: ../loader2/urls.c:480 -msgid "Further FTP Setup" -msgstr "更多 FTP 设置" +#: ../loader2/urls.c:406 +msgid "Proxy Port:" +msgstr "" -#: ../loader2/urls.c:483 -msgid "Further HTTP Setup" -msgstr "更多 HTTP 设置" +#: ../loader2/urls.c:422 +#, fuzzy +msgid "Further Setup" +msgstr "更多 FTP 设置" -#: ../loader2/windows.c:56 +#: ../loader2/windows.c:63 msgid "Loading SCSI driver" msgstr "载入 SCSI 驱动程序" +#: ../loader2/windows.c:64 +#, c-format +msgid "Loading %s driver..." +msgstr "正在载入 %s 驱动程序..." + +#: tmp/account.glade.h:2 +#, fuzzy +msgid "Root Password:" +msgstr "根口令" + +#: tmp/account.glade.h:3 +msgid "" +"The root account is used for administering the system. Enter a password for " +"the root user." +msgstr "根帐号被用来管理系统。请为根用户输入一个口令。" + #: tmp/adddrive.glade.h:1 msgid "Add _ZFCP LUN" msgstr "添加 _ZFCP LUN" @@ -6401,27 +6287,48 @@ msgid "_Add drive" msgstr "(_A)添加驱动器" #: tmp/addrepo.glade.h:1 -msgid "<b>Repository _URL:</b>" -msgstr "<b>主机 (_U)地址：<b>" - -#: tmp/addrepo.glade.h:2 msgid "<b>Repository _name:</b>" msgstr "<b>主机（_n）名称:</b>" -#: tmp/addrepo.glade.h:3 +#: tmp/addrepo.glade.h:2 msgid "Add Repository" msgstr "添加主机" -#: tmp/addrepo.glade.h:5 -#, no-c-format +#: tmp/addrepo.glade.h:3 +#, fuzzy msgid "" "Please provide the location where your additional software can be installed " -"from. Note that this must be a valid repository for %s." +"from." msgstr "请指定安装附加软件的位置。注意您必须提供一个有效的存储器%s。" +#: tmp/addrepo.glade.h:4 +msgid "Proxy U_RL:" +msgstr "" + +#: tmp/addrepo.glade.h:5 +#, fuzzy +msgid "Proxy pass_word:" +msgstr "无口令" + #: tmp/addrepo.glade.h:6 -msgid "_Add repository" -msgstr "（_A）添加主机" +#, fuzzy +msgid "Proxy u_sername:" +msgstr "FTP 站点名：" + +#: tmp/addrepo.glade.h:7 +#, fuzzy +msgid "Repository _Mirror" +msgstr "添加主机" + +#: tmp/addrepo.glade.h:8 +#, fuzzy +msgid "Repository _URL" +msgstr "<b>主机 (_U)地址：<b>" + +#: tmp/addrepo.glade.h:9 +#, fuzzy +msgid "_Proxy configuration" +msgstr "鼠标配置" #: tmp/anaconda.glade.h:1 msgid "Reboo_t" @@ -6431,11 +6338,12 @@ msgstr "重新引导(_t)" msgid "_Next" msgstr "下一步(_N)" -#: tmp/anaconda.glade.h:4 -msgid "_Release Notes" -msgstr "发行注记(_R)" - #: tmp/autopart.glade.h:1 +#, fuzzy +msgid "<b>Resize _target:</b>" +msgstr "<b>主机（_n）名称:</b>" + +#: tmp/autopart.glade.h:2 msgid "" "Installation requires partitioning of your hard drive. By default, a " "partitioning layout is chosen which is reasonable for most users. You can " @@ -6444,37 +6352,101 @@ msgstr "" "安装需要对您的硬盘进行分区。默认情况下，选择适合大多数用户的分区方案。您可以" "选择默认方式，也可以创建您自己的分区方式。" -#: tmp/autopart.glade.h:2 +#: tmp/autopart.glade.h:3 msgid "Re_view and modify partitioning layout" msgstr "检验和修改分区方案(_v)" -#: tmp/autopart.glade.h:3 -msgid "What drive would you like to boot this installation from?" +#: tmp/autopart.glade.h:4 +#, fuzzy +msgid "What drive would you like to _boot this installation from?" msgstr "您想从哪个驱动器安装?" -#: tmp/autopart.glade.h:4 +#: tmp/autopart.glade.h:5 +msgid "Which Partition to resize" +msgstr "" + +#: tmp/autopart.glade.h:6 +#, fuzzy +msgid "" +"Which partition would you like to resize to make room for your installation?" +msgstr "哪个分区包含安装的根分区？" + +#: tmp/autopart.glade.h:7 msgid "_Advanced storage configuration" msgstr "（_A）高级存储配置" -#: tmp/autopart.glade.h:5 +#: tmp/autopart.glade.h:8 +#, fuzzy +msgid "_Encrypt system" +msgstr "加密密钥" + +#: tmp/autopart.glade.h:10 msgid "_Select the drive(s) to use for this installation." msgstr "选择本次安装中使用的驱动程序(_S)。" -#: tmp/exn.glade.h:1 -msgid "Exception Info" -msgstr "Exception信息" +#: tmp/blwhere.glade.h:1 +#, fuzzy +msgid "/boot" +msgstr "重新引导" -#: tmp/exn.glade.h:2 -msgid "Save to _Remote" -msgstr "存入(_R)远程主机" +#: tmp/blwhere.glade.h:2 +#, fuzzy +msgid "BIOS Drive Order" +msgstr "编辑驱动器顺序" + +#: tmp/blwhere.glade.h:3 +#, fuzzy +msgid "Boot loader device" +msgstr "引导装载程序" -#: tmp/exn.glade.h:4 -msgid "_Exception details" -msgstr "Exception详情(_E)" +#: tmp/blwhere.glade.h:4 +#, fuzzy +msgid "First BIOS drive:" +msgstr "格式化驱动器(_F)" + +#: tmp/blwhere.glade.h:5 +#, fuzzy +msgid "Fourth BIOS drive:" +msgstr "格式化驱动器(_F)" + +#: tmp/blwhere.glade.h:6 +msgid "MBR" +msgstr "" + +#: tmp/blwhere.glade.h:7 +msgid "Second BIOS drive:" +msgstr "" + +#: tmp/blwhere.glade.h:8 +msgid "Third BIOS drive:" +msgstr "" -#: tmp/exn.glade.h:5 -msgid "_Save to floppy" -msgstr "保存到软盘" +#: tmp/blwhere.glade.h:9 +#, fuzzy +msgid "Where would you like to install the boot loader for your system?" +msgstr "您想在何处安装引导装载程序？" + +#: tmp/detailed-dialog.glade.h:1 +#, fuzzy +msgid "Info" +msgstr "忽略" + +#: tmp/detailed-dialog.glade.h:2 +msgid "_Details" +msgstr "" + +#: tmp/exnSave.glade.h:2 +msgid "Select a destination for the exception information." +msgstr "" + +#: tmp/exnSave.glade.h:3 +msgid "_Disk" +msgstr "" + +#: tmp/exnSave.glade.h:4 +#, fuzzy +msgid "_Remote" +msgstr "远程" #: tmp/instkey.glade.h:2 #, no-c-format @@ -6518,6 +6490,25 @@ msgstr "安装活动光盘到您的硬盘." msgid "Install to Hard Drive" msgstr "安装到硬盘" +#: tmp/lukspassphrase.glade.h:1 +msgid "" +"Choose a passphrase for this encrypted partition. You will be prompted for " +"the passphrase during system boot." +msgstr "" + +#: tmp/lukspassphrase.glade.h:2 +#, fuzzy +msgid "Confirm passphrase:" +msgstr "确认重设" + +#: tmp/lukspassphrase.glade.h:3 +msgid "Enter passphrase for encrypted partition" +msgstr "" + +#: tmp/lukspassphrase.glade.h:4 +msgid "Enter passphrase:" +msgstr "" + #: tmp/netconfig.glade.h:2 msgid "<b>Gateway:</b>" msgstr "<b>网关：</b>" @@ -6608,6 +6599,11 @@ msgstr "（_A）添加额外的软件库" msgid "_Customize now" msgstr "现在定制(_C)" +#: tmp/tasksel.glade.h:8 +#, fuzzy +msgid "_Modify repository" +msgstr "（_A）添加主机" + #: tmp/zfcp-config.glade.h:1 msgid "<b>Device number:</b>" msgstr "<b>设备号码:</b>" @@ -6852,6 +6848,414 @@ msgstr "威尔士语" msgid "Zulu" msgstr "祖鲁语" +#~ msgid "Error pulling second part of kickstart config: %s!" +#~ msgstr "读取 kickstart 配置文件的第二部分时出错：%s！" + +#~ msgid "Unknown install method" +#~ msgstr "未知安装方法" + +#~ msgid "" +#~ "You have specified an install method which isn't supported by anaconda." +#~ msgstr "anaconda 安装程序不支持您指定的安装方法。" + +#~ msgid "unknown install method: %s" +#~ msgstr "未知安装方法: %s" + +#~ msgid "" +#~ "You have chosen to remove all partitions (ALL DATA) on the following " +#~ "drives:%s\n" +#~ "Are you sure you want to do this?" +#~ msgstr "" +#~ "您已选择了要在下列驱动器内删除所有分区（及其所有数据）：%s\n" +#~ "是否确定要执行该项操作？" + +#~ msgid "" +#~ "You have chosen to remove all Linux partitions (and ALL DATA on them) on " +#~ "the following drives:%s\n" +#~ "Are you sure you want to do this?" +#~ msgstr "" +#~ "您已选择了要在下列驱动器内删除所有 Linux 分区（及其所有数据）：%s\n" +#~ "是否确定要执行该项操作？" + +#~ msgid "Checking for Bad Blocks" +#~ msgstr "检查磁盘坏块" + +#~ msgid "" +#~ "Bad blocks have been detected on device /dev/%s. We do not recommend you " +#~ "use this device.\n" +#~ "\n" +#~ "Press <Enter> to exit the installer." +#~ msgstr "" +#~ "在设备 /dev/%s 上检测到坏块.我们不推荐您使用该设备.\n" +#~ "\n" +#~ "请按 <Enter> 退出安装." + +#~ msgid "" +#~ "An error occurred searching for bad blocks on %s. This problem is " +#~ "serious, and the install cannot continue.\n" +#~ "\n" +#~ "Press <Enter> to exit the installer." +#~ msgstr "" +#~ "在 %s 上搜寻坏块时出错.问题严重,安装无法继续.\n" +#~ "\n" +#~ "请按 <Enter> 退出安装." + +#~ msgid "" +#~ "Please insert a floppy now. All contents of the disk will be erased, so " +#~ "please choose your diskette carefully." +#~ msgstr "现在请插入软盘。软盘上的所有内容将会被抹掉，所以请慎重选择软盘。" + +#~ msgid "" +#~ "The file %s cannot be opened. This is due to a missing file or perhaps a " +#~ "corrupt package. Please verify your installation images and that you " +#~ "have all the required media.\n" +#~ "\n" +#~ "If you exit, your system will be left in an inconsistent state that will " +#~ "likely require reinstallation.\n" +#~ "\n" +#~ msgstr "" +#~ "无法打开文件%s 。这是由于文件遗失或者软件包损坏造成的。请检测您使用的安装" +#~ "镜像，确定您有所需的一切介质。\n" +#~ "\n" +#~ "您如果退出，您的系统会不稳定，很可能要重装。\n" +#~ "\n" + +#~ msgid "" +#~ "The installer has tried to mount image #%s, but cannot find it on the " +#~ "server.\n" +#~ "\n" +#~ "Please copy this image to the remote server's share path and click Retry. " +#~ "Click Exit to abort the installation." +#~ msgstr "" +#~ "安装程序试图加载图像#%s，但在服务器上无法找到该图像。\n" +#~ "\n" +#~ "请将此图像复制到远程服务器的共享目录中，并点击重试。点击退出来终止安装。" + +#~ msgid "" +#~ "The drive /dev/%s has more than 15 partitions on it. The SCSI subsystem " +#~ "in the Linux kernel does not allow for more than 15 partitions at this " +#~ "time. You will not be able to make changes to the partitioning of this " +#~ "disk or use any partitions beyond /dev/%s15 in %s" +#~ msgstr "" +#~ "驱动器/dev/%s 有超过15个分区.这时Linux内核的SCSI子系统不允许超过15个分区. " +#~ "您将无法改变此硬盘的分区,或在 %s中使用任何超出/dev/%s15分区" + +#~ msgid "Low Memory" +#~ msgstr "内存不足" + +#~ msgid "" +#~ "As you don't have much memory in this machine, we need to turn on swap " +#~ "space immediately. To do this we'll have to write your new partition " +#~ "table to the disk immediately. Is that OK?" +#~ msgstr "" +#~ "因为本机内存不足，我们需要立即打开交换空间。要执行该项操作，必须将新分区表" +#~ "立即写入磁盘。是否执行？" + +#~ msgid "Save to Remote Host" +#~ msgstr "存入远程主机" + +#~ msgid "Save Crash Dump" +#~ msgstr "保存崩溃 dump" + +#~ msgid "Searching" +#~ msgstr "搜索" + +#~ msgid "Searching for %s installations..." +#~ msgstr "正在搜索 %s 安装..." + +#~ msgid "Connecting..." +#~ msgstr "正在连接 ..." + +#~ msgid "" +#~ "The file %s cannot be opened. This is due to a missing file or perhaps a " +#~ "corrupt package. Please verify your mirror contains all required " +#~ "packages, and try using a different one.\n" +#~ "\n" +#~ "If you exit, your system will be left in an inconsistent state that will " +#~ "likely require reinstallation.\n" +#~ "\n" +#~ msgstr "" +#~ "无法打开 %s 文件。这是由于文件遗失或者软件包损坏造成的。请确定您的镜像文件" +#~ "包括所有所需组件，并尝试采用不同的组件。\n" +#~ "\n" +#~ "您如果现在重启，您的系统将不稳定很可能要重装。\n" +#~ "\n" + +#~ msgid "VNC Password Error" +#~ msgstr "VNC密码错误" + +#~ msgid "" +#~ "You need to specify a vnc password of at least 6 characters long.\n" +#~ "\n" +#~ "Press <return> to reboot your system.\n" +#~ msgstr "" +#~ "您需要至少6位长的VNC密码。\n" +#~ "\n" +#~ "按 <回车> 重启您的系统。\n" + +#~ msgid "Unable to set vnc password - using no password!" +#~ msgstr "无法设置 vnc 口令 - 不使用口令！" + +#~ msgid "Make sure your password is at least 6 characters in length." +#~ msgstr "请确定您的口令最少包含六个字符。" + +#~ msgid "Please connect to %s to begin the install..." +#~ msgstr "请连接到 %s 来开始安装..." + +#~ msgid "Please connect to begin the install..." +#~ msgstr "请连接来开始安装..." + +#~ msgid "Set Root Password" +#~ msgstr "设置根口令" + +#~ msgid "Advanced Boot Loader Configuration" +#~ msgstr "高级引导装载程序配置" + +#~ msgid "Force LBA32" +#~ msgstr "强制使用 LBA32" + +#~ msgid "_Force LBA32 (not normally required)" +#~ msgstr "强制使用 LBA32(_F) (通常不需要)" + +#~ msgid "" +#~ "If you wish to add default options to the boot command, enter them into " +#~ "the 'General kernel parameters' field." +#~ msgstr "如果您想在引导命令上添加默认选项，在“常规内核参数”字段内输入它们。" + +#~ msgid "_General kernel parameters" +#~ msgstr "常规内核参数(_G)" + +#~ msgid "The %s boot loader will be installed on /dev/%s." +#~ msgstr "%s 引导装载程序将会被安装在 /dev/%s 上。" + +#~ msgid "No boot loader will be installed." +#~ msgstr "无引导装载程序将会被安装。" + +#~ msgid "Configure advanced boot loader _options" +#~ msgstr "配置高级引导装载程序选项(_o)" + +#~ msgid "Install Boot Loader record on:" +#~ msgstr "引导装载程序记录的安装位置：" + +#~ msgid "_Change Drive Order" +#~ msgstr "改变驱动器顺序(_C)" + +#~ msgid "" +#~ "Arrange the drives to be in the same order as used by the BIOS. Changing " +#~ "the drive order may be useful if you have multiple SCSI adapters or both " +#~ "SCSI and IDE adapters and want to boot from the SCSI device.\n" +#~ "\n" +#~ "Changing the drive order will change where the installation program " +#~ "locates the Master Boot Record (MBR)." +#~ msgstr "" +#~ "请按照您的 BIOS 处理顺序来排列您的驱动器。改变驱动器顺序只有在下面这两种情" +#~ "况下才有用：您有多个 SCSI 适配器；或者您兼有 SCSI 和 IDE 设备，但想从 " +#~ "SCSI 设备中引导。\n" +#~ "\n" +#~ "改变驱动器顺序会改变安装程序定位主引导记录(MBR)的位置。" + +#~ msgid "About to Install" +#~ msgstr "即将安装" + +#~ msgid "Click next to begin installation of %s." +#~ msgstr "点击“下一步”来开始安装 %s。" + +#~ msgid "" +#~ "A complete log of the installation can be found in the file '%s' after " +#~ "rebooting your system.\n" +#~ "\n" +#~ "A kickstart file containing the installation options selected can be " +#~ "found in the file '%s' after rebooting the system." +#~ msgstr "" +#~ "重新引导系统后，您将会在 '%s' 文件中找到完整的安装日志。\n" +#~ "\n" +#~ "重新引导系统后，您将会在 '%s' 文件中找到包含您所选择的安装选项的 " +#~ "kickstart 文件。" + +#~ msgid "About to Upgrade" +#~ msgstr "即将升级" + +#~ msgid "Click next to begin upgrade of %s." +#~ msgstr "点击“下一步”来开始升级 %s。" + +#~ msgid "" +#~ "A complete log of the upgrade can be found in the file '%s' after " +#~ "rebooting your system." +#~ msgstr "重新引导系统后，您将会在 %s 文件中找到完整的升级日志。" + +#~ msgid "Drive" +#~ msgstr "驱动器" + +#~ msgid "Model" +#~ msgstr "型号" + +#~ msgid "Netmask" +#~ msgstr "子网掩码" + +#~ msgid "" +#~ "You can configure the boot loader to boot other operating systems by " +#~ "selecting from the list. To add an operating systems that was not " +#~ "automatically detected, click 'Add.' To change the operating system " +#~ "booted by default, select 'Default' next to the desired operating system." +#~ msgstr "" +#~ "在此列表您可以配置引导装载程序引导其它操作系统。要添加一个没有被自动检测到" +#~ "的操作系统，点击“添加”。要改变默认引导的操作系统，在想要的操作系统上选" +#~ "择“默认”。" + +#~ msgid "Leave _unchanged (preserve data)" +#~ msgstr "保持不变（保留信息）(_u)" + +#~ msgid "_Format partition as:" +#~ msgstr "将分区格式化成(_F)：" + +#~ msgid "Check for _bad blocks?" +#~ msgstr "要检查磁盘坏块吗(_b)？" + +#~ msgid "Release notes are missing.\n" +#~ msgstr "缺少发行注记。\n" + +#~ msgid "Release Notes" +#~ msgstr "发行注记" + +#~ msgid "Unable to load file!" +#~ msgstr "无法载入文件！" + +#~ msgid "Installation to begin" +#~ msgstr "即将开始安装" + +#~ msgid "" +#~ "A complete log of your installation will be in %s after rebooting your " +#~ "system. You may want to keep this file for later reference." +#~ msgstr "" +#~ "重新引导系统后，一份完整的安装日志将会保存在 %s 中。您可能需要保留该文件以" +#~ "供今后参考。" + +#~ msgid "Upgrade to begin" +#~ msgstr "即将开始升级" + +#~ msgid "" +#~ "A complete log of your upgrade will be in %s after rebooting your system. " +#~ "You may want to keep this file for later reference." +#~ msgstr "" +#~ "重新引导后，一份完整的安装日志将会保存在 %s 中。您可能需要保留该文件以供今" +#~ "后参考。" + +#~ msgid "%s, %s, %s" +#~ msgstr "%s, %s, %s" + +#~ msgid "%s, %s" +#~ msgstr "%s, %s" + +#~ msgid "Check for bad blocks" +#~ msgstr "检查磁盘坏块" + +#~ msgid "" +#~ "No hard drives have been found. You probably need to manually choose " +#~ "device drivers for the installation to succeed. Would you like to select " +#~ "drivers now?" +#~ 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 "通过" + +#~ msgid "It is OK to install from this media." +#~ msgstr "可以从这个介质中安装。" + +#~ msgid "No checksum information available, unable to verify media." +#~ msgstr "没有可用的校验和，无法校验介质。" + +#~ msgid "Media Check Result" +#~ msgstr "介质检查结果" + +#~ msgid "" +#~ "%s for the image:\n" +#~ "\n" +#~ " %s" +#~ msgstr "" +#~ "%s的映像：\n" +#~ "\n" +#~ " %s" + +#~ msgid "" +#~ "The media check %s\n" +#~ "\n" +#~ "%s" +#~ msgstr "" +#~ "介质检测%s\n" +#~ "\n" +#~ "%s" + +#~ msgid "" +#~ "Please enter the following information:\n" +#~ "\n" +#~ " o the name or IP number of your %s server\n" +#~ " o the directory on that server containing\n" +#~ " %s for your architecture\n" +#~ msgstr "" +#~ "请输入以下信息：\n" +#~ "\n" +#~ " o %s 服务器的名称或 IP 地址\n" +#~ " o 该服务器上包含适用于您的体系的 %s 的目录\n" +#~ " \n" + +#~ msgid "FTP" +#~ msgstr "FTP" + +#~ msgid "Web" +#~ msgstr "Web" + +#~ msgid "Web site name:" +#~ msgstr "网站名：" + +#~ msgid "Use non-anonymous ftp" +#~ msgstr "使用非匿名 FTP" + +#~ msgid "FTP Setup" +#~ msgstr "FTP 设置" + +#~ msgid "HTTP Setup" +#~ msgstr "HTTP 设置" + +#~ msgid "You must enter a server name." +#~ msgstr "您必须输入服务器名称。" + +#~ msgid "" +#~ "If you are using non anonymous ftp, enter the account name and password " +#~ "you wish to use below." +#~ msgstr "如果要使用的是非匿名 FTP，请在下面输入要使用的帐号名和口令。" + +#~ msgid "Account name:" +#~ msgstr "帐号名：" + +#~ msgid "Further HTTP Setup" +#~ msgstr "更多 HTTP 设置" + +#~ msgid "_Release Notes" +#~ msgstr "发行注记(_R)" + +#~ msgid "Exception Info" +#~ msgstr "Exception信息" + +#~ msgid "_Exception details" +#~ msgstr "Exception详情(_E)" + +#~ msgid "_Save to floppy" +#~ msgstr "保存到软盘" + #~ msgid "Rebooting System" #~ msgstr "重新引导系统" @@ -6898,18 +7302,12 @@ msgstr "祖鲁语" #~ msgid "Installing %s-%s-%s... " #~ msgstr "正在安装 %s-%s-%s..." -#~ msgid "Please enter the registration key for your version of %s." -#~ msgstr "请输入版本%s的注册码" - #~ msgid "Enter Registration Key" #~ msgstr "输入注册码" #~ msgid "Key:" #~ msgstr "注册码：" -#~ msgid "_Format drive" -#~ msgstr "格式化驱动器(_F)" - #~ msgid "" #~ "The following critical errors exist with your requested partitioning " #~ "scheme." |