summaryrefslogtreecommitdiffstats
path: root/po/zh.po
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2001-03-01 17:13:51 +0000
committerMike Fulbright <msf@redhat.com>2001-03-01 17:13:51 +0000
commitc3a683e8379ec3ff42d13fe302d71db13e8534ed (patch)
tree4101d749574749ea142abcd661e2fd848c847023 /po/zh.po
parent972bb91026498fe573c6f1495537f7aa35f4793e (diff)
downloadanaconda-c3a683e8379ec3ff42d13fe302d71db13e8534ed.tar.gz
anaconda-c3a683e8379ec3ff42d13fe302d71db13e8534ed.tar.xz
anaconda-c3a683e8379ec3ff42d13fe302d71db13e8534ed.zip
incorporate translation fixes
Diffstat (limited to 'po/zh.po')
-rw-r--r--po/zh.po590
1 files changed, 316 insertions, 274 deletions
diff --git a/po/zh.po b/po/zh.po
index f54313f77..f69dcb97a 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: anaconda 7.1\n"
-"POT-Creation-Date: 2001-02-19 18:55-0500\n"
+"POT-Creation-Date: 2001-03-01 11:37-0500\n"
"PO-Revision-Date: 2001-02-09 15:55-0500\n"
"Last-Translator: Anaconda Team <msw@redhat.com>\n"
"Language-Team: Chinese-S <msw@redhat.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
msgid "Everything"
msgstr "正在搜索"
-#: ../exception.py:13 ../text.py:926
+#: ../exception.py:13 ../text.py:949
msgid "Exception Occurred"
msgstr ""
@@ -48,55 +48,55 @@ msgstr ""
msgid "Warning"
msgstr "正在搜索"
-#: ../fstab.py:320 ../fstab.py:514 ../fstab.py:614 ../fstab.py:823 ../harddrive.py:173 ../image.py:64 ../image.py:141 ../libfdisk/newtfsedit.c:1743 ../loader/devices.c:259 ../loader/devices.c:266 ../loader/devices.c:433 ../loader/devices.c:478 ../loader/devices.c:498 ../loader/lang.c:99 ../loader/loader.c:520 ../loader/loader.c:530 ../loader/loader.c:584 ../loader/loader.c:966 ../loader/loader.c:1021 ../loader/loader.c:1191 ../loader/loader.c:1196 ../loader/loader.c:1278 ../loader/loader.c:2152 ../loader/loader.c:2182 ../loader/loader.c:2260 ../loader/loader.c:2472 ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/urls.c:78 ../loader/urls.c:87 ../loader/urls.c:94 ../loader/urls.c:233 ../loader/urls.c:238 ../text.py:357 ../textw/bootdisk_text.py:69 ../todo.py:1148 ../todo.py:1161 ../todo.py:1484 ../upgrade.py:22 ../upgrade.py:50
+#: ../fstab.py:316 ../fstab.py:510 ../fstab.py:610 ../fstab.py:814 ../harddrive.py:173 ../image.py:64 ../image.py:141 ../libfdisk/newtfsedit.c:1743 ../loader/devices.c:259 ../loader/devices.c:266 ../loader/devices.c:433 ../loader/devices.c:478 ../loader/devices.c:498 ../loader/lang.c:99 ../loader/loader.c:520 ../loader/loader.c:530 ../loader/loader.c:584 ../loader/loader.c:966 ../loader/loader.c:1021 ../loader/loader.c:1191 ../loader/loader.c:1196 ../loader/loader.c:1278 ../loader/loader.c:2156 ../loader/loader.c:2186 ../loader/loader.c:2264 ../loader/loader.c:2476 ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/urls.c:78 ../loader/urls.c:87 ../loader/urls.c:94 ../loader/urls.c:233 ../loader/urls.c:238 ../text.py:374 ../textw/bootdisk_text.py:69 ../todo.py:1157 ../todo.py:1170 ../todo.py:1493 ../upgrade.py:22 ../upgrade.py:50
msgid "Error"
msgstr "错误"
-#: ../fstab.py:321
+#: ../fstab.py:317
msgid "The kernel is unable to read your new partitioning information, probably because you modified extended partitions. While this is not critical, you must reboot your machine before proceeding. Insert the Red Hat boot disk now and press \"Ok\" to reboot your system.\n"
msgstr ""
-#: ../fstab.py:503 ../fstab.py:772 ../fstab.py:1209
+#: ../fstab.py:499 ../fstab.py:761 ../fstab.py:1199
msgid "Formatting"
msgstr "正在格式化"
-#: ../fstab.py:504
+#: ../fstab.py:500
#, c-format
msgid "Formatting swap space on /dev/%s..."
msgstr ""
-#: ../fstab.py:514
+#: ../fstab.py:510
msgid "Error creating swap on device "
msgstr ""
-#: ../fstab.py:615
+#: ../fstab.py:611
#, c-format
msgid "Error unmounting %s: %s"
msgstr "卸载 %s 时出现错误: %s"
-#: ../fstab.py:666 ../todo.py:697
+#: ../fstab.py:662 ../todo.py:702
msgid "Creating"
msgstr "正在创建"
-#: ../fstab.py:666
+#: ../fstab.py:662
msgid "Creating RAID devices..."
msgstr "正在创建 RAID 设备..."
-#: ../fstab.py:707
+#: ../fstab.py:703
msgid "Loopback"
msgstr ""
-#: ../fstab.py:708
+#: ../fstab.py:704
#, c-format
msgid "Creating loopback filesystem on device /dev/%s..."
msgstr ""
-#: ../fstab.py:773 ../fstab.py:1210
+#: ../fstab.py:762 ../fstab.py:1200
#, c-format
msgid "Formatting %s filesystem..."
msgstr "正在格式化 %s 文件系统..."
-#: ../fstab.py:824
+#: ../fstab.py:815
#, c-format
msgid ""
"Error mounting device %s as %s: %s\n"
@@ -110,69 +110,69 @@ msgstr ""
msgid "An exceptional condition has occured. This is most likely a bug. Please copy the full text of this exception and file a bug report at http://bugzilla.redhat.com/bugzilla"
msgstr ""
-#: ../gui.py:316 ../text.py:944
+#: ../gui.py:325 ../text.py:967
msgid "Please insert a floppy now. All contents of the disk will be erased, so please choose your diskette carefully."
msgstr ""
-#: ../gui.py:412 ../gui.py:779
+#: ../gui.py:421 ../gui.py:788
msgid "Next"
msgstr "下一步"
-#: ../gui.py:413 ../gui.py:778 ../libfdisk/newtfsedit.c:1477 ../libfdisk/newtfsedit.c:1485 ../loader/cdrom.c:34 ../loader/devices.c:93 ../loader/devices.c:238 ../loader/devices.c:335 ../loader/lang.c:585 ../loader/loader.c:291 ../loader/loader.c:870 ../loader/loader.c:907 ../loader/loader.c:1021 ../loader/loader.c:1113 ../loader/loader.c:1511 ../loader/net.c:185 ../loader/net.c:272 ../loader/net.c:357 ../loader/urls.c:155 ../loader/urls.c:375 ../rescue.py:99 ../text.py:58 ../text.py:69 ../text.py:129 ../text.py:193 ../text.py:200 ../text.py:222 ../text.py:225 ../text.py:305 ../text.py:360 ../text.py:378 ../text.py:381 ../text.py:400 ../text.py:403 ../text.py:425 ../text.py:428 ../text.py:485 ../text.py:488 ../text.py:514 ../text.py:518 ../text.py:527 ../text.py:600 ../text.py:602 ../text.py:612 ../text.py:614 ../textw/bootdisk_text.py:30 ../textw/firewall_text.py:9 ../textw/lilo_text.py:34 ../textw/lilo_text.py:93 ../textw/lilo_text.py:101 ../textw/lilo_text.py:209 ../textw/mouse_text.py:27 ../textw/mouse_text.py:28 ../textw/mouse_text.py:55 ../textw/mouse_text.py:81 ../textw/network_text.py:102 ../textw/network_text.py:161 ../textw/network_text.py:164 ../textw/packages_text.py:55 ../textw/packages_text.py:236 ../textw/packages_text.py:347 ../textw/packages_text.py:353 ../textw/partitioning_text.py:24 ../textw/partitioning_text.py:65 ../textw/partitioning_text.py:155 ../textw/partitioning_text.py:219 ../textw/partitioning_text.py:258 ../textw/partitioning_text.py:341 ../textw/silo_text.py:26 ../textw/silo_text.py:99 ../textw/silo_text.py:206 ../textw/timezone_text.py:69 ../textw/userauth_text.py:30 ../textw/userauth_text.py:165 ../textw/userauth_text.py:199 ../textw/userauth_text.py:297
+#: ../gui.py:422 ../gui.py:787 ../libfdisk/newtfsedit.c:1477 ../libfdisk/newtfsedit.c:1485 ../loader/cdrom.c:34 ../loader/devices.c:93 ../loader/devices.c:238 ../loader/devices.c:335 ../loader/lang.c:585 ../loader/loader.c:291 ../loader/loader.c:870 ../loader/loader.c:907 ../loader/loader.c:1021 ../loader/loader.c:1113 ../loader/loader.c:1516 ../loader/net.c:185 ../loader/net.c:272 ../loader/net.c:357 ../loader/urls.c:155 ../loader/urls.c:375 ../rescue.py:123 ../text.py:58 ../text.py:69 ../text.py:129 ../text.py:193 ../text.py:200 ../text.py:222 ../text.py:225 ../text.py:305 ../text.py:377 ../text.py:395 ../text.py:398 ../text.py:407 ../text.py:408 ../text.py:423 ../text.py:426 ../text.py:448 ../text.py:451 ../text.py:508 ../text.py:511 ../text.py:537 ../text.py:541 ../text.py:550 ../text.py:623 ../text.py:625 ../text.py:635 ../text.py:637 ../textw/bootdisk_text.py:30 ../textw/firewall_text.py:9 ../textw/lilo_text.py:34 ../textw/lilo_text.py:93 ../textw/lilo_text.py:101 ../textw/lilo_text.py:209 ../textw/mouse_text.py:27 ../textw/mouse_text.py:28 ../textw/mouse_text.py:55 ../textw/mouse_text.py:81 ../textw/network_text.py:102 ../textw/network_text.py:161 ../textw/network_text.py:164 ../textw/packages_text.py:55 ../textw/packages_text.py:236 ../textw/packages_text.py:347 ../textw/packages_text.py:353 ../textw/partitioning_text.py:24 ../textw/partitioning_text.py:65 ../textw/partitioning_text.py:155 ../textw/partitioning_text.py:219 ../textw/partitioning_text.py:258 ../textw/partitioning_text.py:341 ../textw/silo_text.py:26 ../textw/silo_text.py:99 ../textw/silo_text.py:206 ../textw/timezone_text.py:69 ../textw/userauth_text.py:30 ../textw/userauth_text.py:165 ../textw/userauth_text.py:199 ../textw/userauth_text.py:297
msgid "Back"
msgstr "上一步"
-#: ../gui.py:414 ../gui.py:784
+#: ../gui.py:423 ../gui.py:793
msgid "Show Help"
msgstr "显示帮助"
-#: ../gui.py:415 ../gui.py:783
+#: ../gui.py:424 ../gui.py:792
msgid "Hide Help"
msgstr "隐藏帮助"
-#: ../gui.py:416 ../gui.py:782
+#: ../gui.py:425 ../gui.py:791
msgid "Finish"
msgstr "完成"
-#: ../gui.py:419 ../gui.py:814
+#: ../gui.py:428 ../gui.py:823
msgid "Online Help"
msgstr "联机帮助"
-#: ../gui.py:420 ../iw/language_gui.py:10 ../iw/language_support_gui.py:25 ../text.py:63 ../text.py:1016 ../text.py:1049
+#: ../gui.py:429 ../iw/language_gui.py:10 ../iw/language_support_gui.py:25 ../text.py:63 ../text.py:1039 ../text.py:1072
msgid "Language Selection"
msgstr "选择语言"
-#: ../gui.py:527 ../iw/firewall_gui.py:125 ../libfdisk/gnomefsedit.c:1388 ../libfdisk/gnomefsedit.c:1405
+#: ../gui.py:536 ../iw/firewall_gui.py:123 ../libfdisk/gnomefsedit.c:1388 ../libfdisk/gnomefsedit.c:1405
msgid "Close"
msgstr "关闭"
-#: ../gui.py:532 ../gui.py:781
+#: ../gui.py:541 ../gui.py:790
msgid "Release Notes"
msgstr ""
-#: ../gui.py:563
+#: ../gui.py:572
msgid "Unable to load file!"
msgstr ""
-#: ../gui.py:702
+#: ../gui.py:711
msgid "Red Hat Linux Installer"
msgstr "Red Hat Linux 安装程序"
-#: ../gui.py:706
+#: ../gui.py:715
msgid "Red Hat Linux Install Shell"
msgstr "Red Hat Linux 安装 Shell 程序"
-#: ../gui.py:717
+#: ../gui.py:726
#, c-format
msgid "Red Hat Linux Installer on %s"
msgstr "用于 %s 的 Red Hat Linux 安装程序"
-#: ../gui.py:718
+#: ../gui.py:727
#, c-format
msgid "Red Hat Linux Install Shell on %s"
msgstr "用于 %s 的 Red Hat Linux 安装Shell 程序"
-#: ../gui.py:863
+#: ../gui.py:872
#, fuzzy
msgid "Install Window"
msgstr "安装"
@@ -217,65 +217,65 @@ msgstr ""
msgid "The CDROM could not be mounted."
msgstr ""
-#: ../loader/cdrom.c:34 ../loader/devices.c:92 ../loader/devices.c:237 ../loader/devices.c:259 ../loader/devices.c:266 ../loader/devices.c:335 ../loader/devices.c:433 ../loader/devices.c:478 ../loader/devices.c:498 ../loader/devices.c:530 ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107 ../loader/lang.c:99 ../loader/lang.c:294 ../loader/lang.c:585 ../loader/loader.c:291 ../loader/loader.c:520 ../loader/loader.c:530 ../loader/loader.c:584 ../loader/loader.c:907 ../loader/loader.c:966 ../loader/loader.c:1021 ../loader/loader.c:1113 ../loader/loader.c:1191 ../loader/loader.c:1196 ../loader/loader.c:1238 ../loader/loader.c:1247 ../loader/loader.c:1278 ../loader/loader.c:1511 ../loader/loader.c:2152 ../loader/loader.c:2182 ../loader/loader.c:2245 ../loader/loader.c:2260 ../loader/loader.c:2472 ../loader/net.c:185 ../loader/net.c:272 ../loader/net.c:357 ../loader/net.c:668 ../loader/net.c:701 ../loader/pcmcia.c:104 ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/urls.c:155 ../loader/urls.c:233 ../loader/urls.c:238 ../loader/urls.c:375 ../rescue.py:17 ../rescue.py:67 ../rescue.py:85 ../rescue.py:93 ../text.py:129 ../text.py:168 ../text.py:222 ../text.py:305 ../text.py:378 ../text.py:425 ../text.py:443 ../text.py:485 ../text.py:514 ../text.py:600 ../text.py:612 ../text.py:641 ../text.py:662 ../text.py:832 ../text.py:886 ../text.py:912 ../text.py:938 ../text.py:946 ../text.py:961 ../text.py:1205 ../textw/bootdisk_text.py:52 ../textw/bootdisk_text.py:54 ../textw/firewall_text.py:9 ../textw/firewall_text.py:126 ../textw/firewall_text.py:128 ../textw/firewall_text.py:191 ../textw/lilo_text.py:33 ../textw/lilo_text.py:93 ../textw/lilo_text.py:152 ../textw/lilo_text.py:158 ../textw/mouse_text.py:55 ../textw/network_text.py:102 ../textw/network_text.py:123 ../textw/network_text.py:161 ../textw/packages_text.py:55 ../textw/packages_text.py:89 ../textw/packages_text.py:236 ../textw/packages_text.py:347 ../textw/partitioning_text.py:258 ../textw/partitioning_text.py:341 ../textw/partitioning_text.py:352 ../textw/partitioning_text.py:360 ../textw/partitioning_text.py:367 ../textw/silo_text.py:25 ../textw/silo_text.py:99 ../textw/timezone_text.py:69 ../textw/userauth_text.py:30 ../textw/userauth_text.py:44 ../textw/userauth_text.py:49 ../textw/userauth_text.py:84 ../textw/userauth_text.py:99 ../textw/userauth_text.py:105 ../textw/userauth_text.py:111 ../textw/userauth_text.py:119 ../textw/userauth_text.py:128 ../textw/userauth_text.py:135 ../textw/userauth_text.py:199 ../textw/userauth_text.py:297 ../xserver.py:34
+#: ../loader/cdrom.c:34 ../loader/devices.c:92 ../loader/devices.c:237 ../loader/devices.c:259 ../loader/devices.c:266 ../loader/devices.c:335 ../loader/devices.c:433 ../loader/devices.c:478 ../loader/devices.c:498 ../loader/devices.c:530 ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107 ../loader/lang.c:99 ../loader/lang.c:294 ../loader/lang.c:585 ../loader/loader.c:291 ../loader/loader.c:520 ../loader/loader.c:530 ../loader/loader.c:584 ../loader/loader.c:907 ../loader/loader.c:966 ../loader/loader.c:1021 ../loader/loader.c:1113 ../loader/loader.c:1191 ../loader/loader.c:1196 ../loader/loader.c:1238 ../loader/loader.c:1247 ../loader/loader.c:1278 ../loader/loader.c:1516 ../loader/loader.c:2156 ../loader/loader.c:2186 ../loader/loader.c:2249 ../loader/loader.c:2264 ../loader/loader.c:2476 ../loader/net.c:185 ../loader/net.c:272 ../loader/net.c:357 ../loader/net.c:678 ../loader/net.c:711 ../loader/pcmcia.c:104 ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/urls.c:155 ../loader/urls.c:233 ../loader/urls.c:238 ../loader/urls.c:375 ../rescue.py:19 ../rescue.py:91 ../rescue.py:109 ../rescue.py:117 ../text.py:129 ../text.py:168 ../text.py:222 ../text.py:305 ../text.py:395 ../text.py:448 ../text.py:466 ../text.py:508 ../text.py:537 ../text.py:623 ../text.py:635 ../text.py:664 ../text.py:685 ../text.py:855 ../text.py:909 ../text.py:935 ../text.py:961 ../text.py:969 ../text.py:984 ../text.py:1228 ../textw/bootdisk_text.py:52 ../textw/bootdisk_text.py:54 ../textw/firewall_text.py:9 ../textw/firewall_text.py:126 ../textw/firewall_text.py:128 ../textw/firewall_text.py:191 ../textw/lilo_text.py:33 ../textw/lilo_text.py:93 ../textw/lilo_text.py:152 ../textw/lilo_text.py:158 ../textw/mouse_text.py:55 ../textw/network_text.py:102 ../textw/network_text.py:123 ../textw/network_text.py:161 ../textw/packages_text.py:55 ../textw/packages_text.py:89 ../textw/packages_text.py:236 ../textw/packages_text.py:347 ../textw/partitioning_text.py:258 ../textw/partitioning_text.py:341 ../textw/partitioning_text.py:352 ../textw/partitioning_text.py:360 ../textw/partitioning_text.py:367 ../textw/silo_text.py:25 ../textw/silo_text.py:99 ../textw/timezone_text.py:69 ../textw/userauth_text.py:30 ../textw/userauth_text.py:44 ../textw/userauth_text.py:49 ../textw/userauth_text.py:84 ../textw/userauth_text.py:99 ../textw/userauth_text.py:105 ../textw/userauth_text.py:111 ../textw/userauth_text.py:119 ../textw/userauth_text.py:128 ../textw/userauth_text.py:135 ../textw/userauth_text.py:199 ../textw/userauth_text.py:297 ../xserver.py:34
msgid "OK"
msgstr "确定"
-#: ../rescue.py:36
+#: ../rescue.py:38
msgid "WARNING: no valid block devices were found.\n"
msgstr ""
-#: ../rescue.py:38
+#: ../rescue.py:40
msgid "ERROR: unknown error encountered reading partition tables.\n"
msgstr ""
-#: ../rescue.py:64
+#: ../rescue.py:88
#, fuzzy
msgid "System to Rescue"
msgstr "要升级的系统"
-#: ../rescue.py:65 ../text.py:376
+#: ../rescue.py:89 ../text.py:393
msgid "What partition holds the root partition of your installation?"
msgstr "哪个分区包含安装的根分区?"
-#: ../iw/congrats_gui.py:13 ../iw/congrats_gui.py:62 ../rescue.py:67 ../rescue.py:71
+#: ../iw/congrats_gui.py:13 ../iw/congrats_gui.py:62 ../rescue.py:91 ../rescue.py:95 ../text.py:348
msgid "Exit"
msgstr "退出"
-#: ../rescue.py:81 ../rescue.py:88
+#: ../rescue.py:105 ../rescue.py:112
#, fuzzy
msgid "Rescue"
msgstr "重置(_R)"
-#: ../rescue.py:82
+#: ../rescue.py:106
msgid ""
"Your system has been mounted under /mnt/sysimage.\n"
"\n"
"Press <return> to get a shell. The system will reboot automatically when you exit from the shell."
msgstr ""
-#: ../rescue.py:89
+#: ../rescue.py:113
msgid ""
"An error occured trying to mount some or all of your system. Some of it may be mounted under /mnt/sysimage.\n"
"\n"
"Press <return> to get a shell. The system will reboot automatically when you exit from the shell."
msgstr ""
-#: ../rescue.py:95
+#: ../rescue.py:119
#, fuzzy
msgid "Rescue Mode"
msgstr "拯救方法"
-#: ../rescue.py:96
+#: ../rescue.py:120
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."
msgstr ""
-#: ../rescue.py:108
+#: ../rescue.py:132
msgid "Your system is mounted under the /mnt/sysimage directory."
msgstr ""
#. code to create dialog in gtk+
-#: ../iw/package_gui.py:470 ../libfdisk/fsedit.c:918 ../libfdisk/fsedit.c:925 ../libfdisk/fsedit.c:932 ../libfdisk/fsedit.c:941 ../libfdisk/fsedit.c:968 ../libfdisk/fsedit.c:981 ../libfdisk/fsedit.c:991 ../libfdisk/fsedit.c:1020 ../libfdisk/fsedit.c:1030 ../libfdisk/fsedit.c:1047 ../libfdisk/fsedit.c:1464 ../libfdisk/gnomefsedit.c:756 ../libfdisk/gnomefsedit.c:788 ../libfdisk/gnomefsedit.c:879 ../libfdisk/gnomefsedit.c:914 ../libfdisk/gnomefsedit.c:1262 ../libfdisk/gnomefsedit.c:1299 ../libfdisk/gnomefsedit.c:1333 ../libfdisk/gnomefsedit.c:1352 ../libfdisk/gnomefsedit.c:1526 ../libfdisk/gnomefsedit.c:1601 ../libfdisk/gnomefsedit.c:1651 ../libfdisk/gnomefsedit.c:1719 ../libfdisk/gnomefsedit.c:1737 ../libfdisk/gnomefsedit.c:2015 ../libfdisk/gnomefsedit.c:2024 ../libfdisk/gnomefsedit.c:2270 ../libfdisk/gnomefsedit.c:2278 ../libfdisk/gnomefsedit.c:2322 ../libfdisk/gnomefsedit.c:2332 ../libfdisk/gnomefsedit.c:2339 ../libfdisk/gnomefsedit.c:2354 ../libfdisk/gnomefsedit.c:2364 ../libfdisk/gnomefsedit.c:2374 ../libfdisk/gnomefsedit.c:2413 ../libfdisk/gnomefsedit.c:2544 ../libfdisk/gnomefsedit.c:2586 ../libfdisk/newtfsedit.c:170 ../libfdisk/newtfsedit.c:347 ../libfdisk/newtfsedit.c:577 ../libfdisk/newtfsedit.c:639 ../libfdisk/newtfsedit.c:672 ../libfdisk/newtfsedit.c:698 ../libfdisk/newtfsedit.c:717 ../libfdisk/newtfsedit.c:848 ../libfdisk/newtfsedit.c:1477 ../libfdisk/newtfsedit.c:1485 ../libfdisk/newtfsedit.c:1610 ../libfdisk/newtfsedit.c:1631 ../libfdisk/newtfsedit.c:1659 ../libfdisk/newtfsedit.c:1743 ../loader/urls.c:78 ../loader/urls.c:87 ../loader/urls.c:94 ../loader/urls.c:244 ../text.py:58 ../text.py:60 ../text.py:193 ../text.py:527 ../textw/lilo_text.py:123 ../textw/lilo_text.py:208 ../textw/mouse_text.py:27 ../textw/partitioning_text.py:155 ../textw/partitioning_text.py:420 ../textw/silo_text.py:136 ../textw/silo_text.py:149 ../textw/silo_text.py:205
+#: ../iw/package_gui.py:470 ../libfdisk/fsedit.c:921 ../libfdisk/fsedit.c:928 ../libfdisk/fsedit.c:935 ../libfdisk/fsedit.c:944 ../libfdisk/fsedit.c:971 ../libfdisk/fsedit.c:984 ../libfdisk/fsedit.c:994 ../libfdisk/fsedit.c:1023 ../libfdisk/fsedit.c:1033 ../libfdisk/fsedit.c:1050 ../libfdisk/fsedit.c:1467 ../libfdisk/gnomefsedit.c:756 ../libfdisk/gnomefsedit.c:788 ../libfdisk/gnomefsedit.c:879 ../libfdisk/gnomefsedit.c:914 ../libfdisk/gnomefsedit.c:1262 ../libfdisk/gnomefsedit.c:1299 ../libfdisk/gnomefsedit.c:1333 ../libfdisk/gnomefsedit.c:1352 ../libfdisk/gnomefsedit.c:1526 ../libfdisk/gnomefsedit.c:1601 ../libfdisk/gnomefsedit.c:1651 ../libfdisk/gnomefsedit.c:1719 ../libfdisk/gnomefsedit.c:1737 ../libfdisk/gnomefsedit.c:2015 ../libfdisk/gnomefsedit.c:2024 ../libfdisk/gnomefsedit.c:2270 ../libfdisk/gnomefsedit.c:2278 ../libfdisk/gnomefsedit.c:2322 ../libfdisk/gnomefsedit.c:2332 ../libfdisk/gnomefsedit.c:2339 ../libfdisk/gnomefsedit.c:2354 ../libfdisk/gnomefsedit.c:2364 ../libfdisk/gnomefsedit.c:2374 ../libfdisk/gnomefsedit.c:2413 ../libfdisk/gnomefsedit.c:2544 ../libfdisk/gnomefsedit.c:2586 ../libfdisk/newtfsedit.c:170 ../libfdisk/newtfsedit.c:347 ../libfdisk/newtfsedit.c:577 ../libfdisk/newtfsedit.c:639 ../libfdisk/newtfsedit.c:672 ../libfdisk/newtfsedit.c:698 ../libfdisk/newtfsedit.c:717 ../libfdisk/newtfsedit.c:848 ../libfdisk/newtfsedit.c:1477 ../libfdisk/newtfsedit.c:1485 ../libfdisk/newtfsedit.c:1610 ../libfdisk/newtfsedit.c:1631 ../libfdisk/newtfsedit.c:1659 ../libfdisk/newtfsedit.c:1743 ../loader/urls.c:78 ../loader/urls.c:87 ../loader/urls.c:94 ../loader/urls.c:244 ../text.py:58 ../text.py:60 ../text.py:193 ../text.py:348 ../text.py:407 ../text.py:550 ../textw/lilo_text.py:123 ../textw/lilo_text.py:208 ../textw/mouse_text.py:27 ../textw/partitioning_text.py:155 ../textw/partitioning_text.py:420 ../textw/silo_text.py:136 ../textw/silo_text.py:149 ../textw/silo_text.py:205
msgid "Ok"
msgstr "确定"
@@ -298,7 +298,7 @@ msgstr "重置(_R)"
msgid "Choose the languages to be installed:"
msgstr "哪一类介质包含要安装的软件包?"
-#: ../text.py:135 ../text.py:1112
+#: ../text.py:135 ../text.py:1135
#, fuzzy
msgid "Language Support"
msgstr "选择语言"
@@ -323,7 +323,7 @@ msgstr "选择语言"
msgid "Choose the default language: "
msgstr "选择语言"
-#: ../text.py:220 ../text.py:1018 ../text.py:1055
+#: ../text.py:220 ../text.py:1041 ../text.py:1078
msgid "Keyboard Selection"
msgstr "选择键盘"
@@ -335,7 +335,7 @@ msgstr "与此计算机连接的键盘属于何种类型?"
msgid "Upgrade Existing Installation"
msgstr "升级现有的安装"
-#: ../text.py:303 ../text.py:1058
+#: ../text.py:303 ../text.py:1081
msgid "Installation Type"
msgstr "安装类型"
@@ -343,35 +343,58 @@ msgstr "安装类型"
msgid "What type of system would you like to install?"
msgstr "您要安装何种类型的系统?"
-#: ../text.py:358
+#: ../iw/lilo_gui.py:50 ../text.py:340
+msgid "Proceed with upgrade?"
+msgstr ""
+
+#: ../iw/lilo_gui.py:51 ../text.py:341
+msgid ""
+"The filesystems of the Linux installation you have chosen to upgrade have already been mounted. You cannot go back past this point. \n"
+"\n"
+msgstr ""
+
+#: ../text.py:345
+msgid "If you would like to exit the upgrade select Exit, or choose Ok to continue with the upgrade."
+msgstr ""
+
+#: ../text.py:375
msgid "You don't have any Linux partitions. You can't upgrade this system!"
msgstr "没有任何 Linux 分区,无法升级本系统!"
-#: ../text.py:375
+#: ../text.py:392
msgid "System to Upgrade"
msgstr "要升级的系统"
-#: ../text.py:392
+#: ../text.py:405
+#, fuzzy
+msgid "Upgrade Partition"
+msgstr "编辑分区"
+
+#: ../text.py:406
+msgid "Going to upgrade partition /dev/"
+msgstr ""
+
+#: ../text.py:415
msgid "Customize Packages to Upgrade"
msgstr "定制要升级的软件包"
-#: ../text.py:393
+#: ../text.py:416
msgid "The packages you have installed, and any other packages which are needed to satisfy their dependencies, have been selected for installation. Would you like to customize the set of packages that will be upgraded?"
msgstr "系统已选定用于安装的已安装软件包,以及满足其相关性要求的其它任何软件包。是否要定制升级的软件包集?"
-#: ../iw/rootpartition_gui.py:503 ../iw/welcome_gui.py:89 ../libfdisk/fsedit.c:949 ../libfdisk/gnomefsedit.c:829 ../libfdisk/gnomefsedit.c:1237 ../libfdisk/gnomefsedit.c:1376 ../libfdisk/gnomefsedit.c:1398 ../libfdisk/gnomefsedit.c:2467 ../libfdisk/gnomefsedit.c:2754 ../libfdisk/gnomefsedit.c:2809 ../libfdisk/newtfsedit.c:615 ../libfdisk/newtfsedit.c:742 ../libfdisk/newtfsedit.c:874 ../libfdisk/newtfsedit.c:1680 ../libfdisk/newtfsedit.c:1698 ../libfdisk/newtfsedit.c:1785 ../loader/devices.c:230 ../loader/loader.c:870 ../loader/net.c:835 ../text.py:400 ../textw/bootdisk_text.py:12 ../textw/bootdisk_text.py:30 ../textw/bootdisk_text.py:38 ../textw/partitioning_text.py:219 ../textw/partitioning_text.py:402
+#: ../iw/rootpartition_gui.py:503 ../iw/welcome_gui.py:89 ../libfdisk/fsedit.c:952 ../libfdisk/gnomefsedit.c:829 ../libfdisk/gnomefsedit.c:1237 ../libfdisk/gnomefsedit.c:1376 ../libfdisk/gnomefsedit.c:1398 ../libfdisk/gnomefsedit.c:2467 ../libfdisk/gnomefsedit.c:2754 ../libfdisk/gnomefsedit.c:2809 ../libfdisk/newtfsedit.c:615 ../libfdisk/newtfsedit.c:742 ../libfdisk/newtfsedit.c:874 ../libfdisk/newtfsedit.c:1680 ../libfdisk/newtfsedit.c:1698 ../libfdisk/newtfsedit.c:1785 ../loader/devices.c:230 ../loader/loader.c:870 ../loader/net.c:845 ../text.py:423 ../textw/bootdisk_text.py:12 ../textw/bootdisk_text.py:30 ../textw/bootdisk_text.py:38 ../textw/partitioning_text.py:219 ../textw/partitioning_text.py:402
msgid "Yes"
msgstr "是"
-#: ../iw/rootpartition_gui.py:505 ../iw/welcome_gui.py:92 ../libfdisk/fsedit.c:949 ../libfdisk/gnomefsedit.c:829 ../libfdisk/gnomefsedit.c:1237 ../libfdisk/gnomefsedit.c:1376 ../libfdisk/gnomefsedit.c:1398 ../libfdisk/gnomefsedit.c:2467 ../libfdisk/gnomefsedit.c:2754 ../libfdisk/gnomefsedit.c:2809 ../libfdisk/newtfsedit.c:615 ../libfdisk/newtfsedit.c:742 ../libfdisk/newtfsedit.c:874 ../libfdisk/newtfsedit.c:1680 ../libfdisk/newtfsedit.c:1698 ../libfdisk/newtfsedit.c:1785 ../loader/devices.c:231 ../loader/net.c:835 ../text.py:400 ../text.py:406 ../textw/bootdisk_text.py:12 ../textw/bootdisk_text.py:30 ../textw/bootdisk_text.py:41 ../textw/partitioning_text.py:402
+#: ../iw/rootpartition_gui.py:505 ../iw/welcome_gui.py:92 ../libfdisk/fsedit.c:952 ../libfdisk/gnomefsedit.c:829 ../libfdisk/gnomefsedit.c:1237 ../libfdisk/gnomefsedit.c:1376 ../libfdisk/gnomefsedit.c:1398 ../libfdisk/gnomefsedit.c:2467 ../libfdisk/gnomefsedit.c:2754 ../libfdisk/gnomefsedit.c:2809 ../libfdisk/newtfsedit.c:615 ../libfdisk/newtfsedit.c:742 ../libfdisk/newtfsedit.c:874 ../libfdisk/newtfsedit.c:1680 ../libfdisk/newtfsedit.c:1698 ../libfdisk/newtfsedit.c:1785 ../loader/devices.c:231 ../loader/net.c:845 ../text.py:423 ../text.py:429 ../textw/bootdisk_text.py:12 ../textw/bootdisk_text.py:30 ../textw/bootdisk_text.py:41 ../textw/partitioning_text.py:402
msgid "No"
msgstr "否"
-#: ../text.py:416 ../text.py:435
+#: ../text.py:439 ../text.py:458
msgid "Red Hat Linux"
msgstr "Red Hat Linux"
-#: ../text.py:417
+#: ../text.py:440
msgid ""
"Welcome to Red Hat Linux!\n"
"\n"
@@ -386,7 +409,7 @@ msgstr ""
"\n"
"如果您购买了 Red Hat Linux 正式版,请务必通过我们的 Web 站点( http://www.redhat.com/) 登记此产品。"
-#: ../text.py:436
+#: ../text.py:459
msgid ""
"Welcome to the Red Hat Linux!\n"
"\n"
@@ -395,61 +418,61 @@ msgid ""
"To exit without changing your setup select the Cancel button below."
msgstr ""
-#: ../libfdisk/gnomefsedit.c:914 ../libfdisk/gnomefsedit.c:2024 ../libfdisk/gnomefsedit.c:2586 ../libfdisk/newtfsedit.c:578 ../libfdisk/newtfsedit.c:1698 ../loader/devices.c:238 ../loader/devices.c:530 ../loader/loader.c:2245 ../loader/pcmcia.c:104 ../text.py:443 ../text.py:446 ../text.py:832 ../text.py:833 ../text.py:946 ../text.py:948 ../textw/lilo_text.py:124 ../textw/silo_text.py:136 ../textw/silo_text.py:154 ../textw/userauth_text.py:63
+#: ../libfdisk/gnomefsedit.c:914 ../libfdisk/gnomefsedit.c:2024 ../libfdisk/gnomefsedit.c:2586 ../libfdisk/newtfsedit.c:578 ../libfdisk/newtfsedit.c:1698 ../loader/devices.c:238 ../loader/devices.c:530 ../loader/loader.c:2249 ../loader/pcmcia.c:104 ../text.py:466 ../text.py:469 ../text.py:855 ../text.py:856 ../text.py:969 ../text.py:971 ../textw/lilo_text.py:124 ../textw/silo_text.py:136 ../textw/silo_text.py:154 ../textw/userauth_text.py:63
msgid "Cancel"
msgstr "取消"
-#: ../text.py:483
+#: ../text.py:506
msgid "X probe results"
msgstr "X 探测结果"
-#: ../text.py:503 ../text.py:523
+#: ../text.py:526 ../text.py:546
msgid "Unlisted Card"
msgstr "未列出的插卡"
-#: ../text.py:511
+#: ../text.py:534
msgid "Video Card Selection"
msgstr "选择视频卡"
-#: ../text.py:512
+#: ../text.py:535
msgid "Which video card do you have?"
msgstr "您使用的视频卡属于何种类型?"
-#: ../text.py:525
+#: ../text.py:548
msgid "X Server Selection"
msgstr "选择 X 服务器"
-#: ../text.py:525
+#: ../text.py:548
msgid "Choose a server"
msgstr "选择一台服务器"
-#: ../text.py:596
+#: ../text.py:619
msgid "Installation to begin"
msgstr "开始安装"
-#: ../iw/confirm_gui.py:45 ../text.py:597
+#: ../iw/confirm_gui.py:45 ../text.py:620
msgid "A complete log of your installation will be in /tmp/install.log after rebooting your system. You may want to keep this file for later reference."
msgstr "重新引导后,系统将在 /tmp/install.log 中对安装进行完整的记录。 您可能需要保留此文件供以后参考。"
-#: ../text.py:608
+#: ../text.py:631
#, fuzzy
msgid "Upgrade to begin"
msgstr "升级系统"
-#: ../iw/confirm_gui.py:41 ../text.py:609
+#: ../iw/confirm_gui.py:41 ../text.py:632
#, fuzzy
msgid "A complete log of your upgrade will be in /tmp/upgrade.log after rebooting your system. You may want to keep this file for later reference."
msgstr "重新引导后,系统将在 /tmp/install.log 中对安装进行完整的记录。 您可能需要保留此文件供以后参考。"
-#: ../text.py:628
+#: ../text.py:651
msgid " <Return> to reboot "
msgstr ""
-#: ../text.py:630 ../text.py:653
+#: ../text.py:653 ../text.py:676
msgid "Complete"
msgstr "完成"
-#: ../iw/congrats_gui.py:34 ../text.py:631
+#: ../iw/congrats_gui.py:34 ../text.py:654
#, fuzzy
msgid ""
"Congratulations, installation is complete.\n"
@@ -463,11 +486,11 @@ msgstr ""
"取出引导介质,然后按回车键以重新引导系统。 有关为此 Red Hat Linux 版本提供的校正信息,请查阅 http://www.redhat.com 上的勘误表。\n"
"《Red Hat Linux 正式版用户指南》中的“安装之后”一章提供了有关配置系统的信息。"
-#: ../text.py:649
+#: ../text.py:672
msgid " <Return> to exit "
msgstr ""
-#: ../text.py:654
+#: ../text.py:677
#, fuzzy
msgid ""
"Congratulations, configuration is complete.\n"
@@ -481,309 +504,309 @@ msgstr ""
"取出引导介质,然后按回车键以重新引导系统。 有关为此 Red Hat Linux 版本提供的校正信息,请查阅 http://www.redhat.com 上的勘误表。\n"
"《Red Hat Linux 正式版用户指南》中的“安装之后”一章提供了有关配置系统的信息。"
-#: ../text.py:721
+#: ../text.py:744
msgid "Package Installation"
msgstr "安装软件包"
-#: ../text.py:723
+#: ../text.py:746
msgid "Name : "
msgstr "名称: "
-#: ../text.py:724
+#: ../text.py:747
msgid "Size : "
msgstr "大小: "
-#: ../text.py:725
+#: ../text.py:748
msgid "Summary: "
msgstr "摘要: "
-#: ../text.py:751
+#: ../text.py:774
msgid " Packages"
msgstr " 软件包"
-#: ../text.py:752
+#: ../text.py:775
msgid " Bytes"
msgstr " 字节"
-#: ../text.py:753
+#: ../text.py:776
msgid " Time"
msgstr " 时间"
-#: ../text.py:755
+#: ../text.py:778
msgid "Total :"
msgstr "合计:"
-#: ../text.py:762
+#: ../text.py:785
msgid "Completed: "
msgstr "已完成: "
-#: ../text.py:772
+#: ../text.py:795
msgid "Remaining: "
msgstr "剩余: "
-#: ../text.py:884
+#: ../text.py:907
msgid "Help not available"
msgstr ""
-#: ../text.py:885
+#: ../text.py:908
msgid "No help is available for this install."
msgstr ""
-#: ../text.py:943
+#: ../text.py:966
msgid "Save Crash Dump"
msgstr ""
-#: ../text.py:954
+#: ../text.py:977
msgid ""
"An internal error occurred in the installation program. Please report this error to Red Hat (through the bugzilla.redhat.com web site) as soon as possible. The information on this failure may be saved to a floppy disk, and will help Red Hat in fixing the problem.\n"
"\n"
msgstr ""
-#: ../text.py:961 ../text.py:964
+#: ../text.py:984 ../text.py:987
msgid "Save"
msgstr ""
-#: ../text.py:961 ../text.py:962
+#: ../text.py:984 ../text.py:985
msgid "Debug"
msgstr "调试"
-#: ../text.py:972
+#: ../text.py:995
msgid " "
msgstr ""
-#: ../text.py:976
+#: ../text.py:999
msgid "Red Hat Linux (C) 2001 Red Hat, Inc."
msgstr "Red Hat Linux (C) 2001 Red Hat, Inc."
-#: ../text.py:979
+#: ../text.py:1002
#, fuzzy
msgid " <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> 选项间切换 | <Space> 选择 | <F12> 下一屏幕 "
-#: ../text.py:981
+#: ../text.py:1004
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> 选项间切换 | <Space> 选择 | <F12> 下一屏幕"
-#: ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:39 ../text.py:1014 ../text.py:1057
+#: ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:39 ../text.py:1037 ../text.py:1080
msgid "Welcome"
msgstr ""
-#: ../text.py:1020 ../text.py:1103
+#: ../text.py:1043 ../text.py:1126
msgid "Hostname Setup"
msgstr "主机名设置"
-#: ../text.py:1022 ../text.py:1100
+#: ../text.py:1045 ../text.py:1123
msgid "Network Setup"
msgstr "网络设置"
-#: ../iw/firewall_gui.py:12 ../text.py:1024 ../text.py:1105 ../textw/firewall_text.py:11
+#: ../iw/firewall_gui.py:12 ../text.py:1047 ../text.py:1128 ../textw/firewall_text.py:11
#, fuzzy
msgid "Firewall Configuration"
msgstr "Lilo 配置"
-#: ../text.py:1032 ../text.py:1117
+#: ../text.py:1055 ../text.py:1140
msgid "Time Zone Setup"
msgstr "时区设置"
-#: ../text.py:1034 ../text.py:1119 ../textw/userauth_text.py:9
+#: ../text.py:1057 ../text.py:1142 ../textw/userauth_text.py:9
msgid "Root Password"
msgstr "根口令"
-#: ../text.py:1036 ../text.py:1121 ../textw/userauth_text.py:172
+#: ../text.py:1059 ../text.py:1144 ../textw/userauth_text.py:172
msgid "User Account Setup"
msgstr "设置用户帐号"
-#: ../text.py:1038 ../text.py:1123
+#: ../text.py:1061 ../text.py:1146
msgid "Authentication"
msgstr "验证"
-#: ../text.py:1044
+#: ../text.py:1067
#, fuzzy
msgid "Configuration Complete"
msgstr "X 配置"
-#: ../text.py:1066 ../textw/silo_text.py:28 ../textw/silo_text.py:101 ../textw/silo_text.py:213
+#: ../text.py:1089 ../textw/silo_text.py:28 ../textw/silo_text.py:101 ../textw/silo_text.py:213
msgid "SILO Configuration"
msgstr "SILO 配置"
-#: ../text.py:1072 ../textw/lilo_text.py:36 ../textw/lilo_text.py:90 ../textw/lilo_text.py:217
+#: ../text.py:1095 ../textw/lilo_text.py:36 ../textw/lilo_text.py:90 ../textw/lilo_text.py:217
msgid "LILO Configuration"
msgstr "LILO 配置"
-#: ../text.py:1076
+#: ../text.py:1099
msgid "Automatic Partition"
msgstr "自动分区"
-#: ../iw/lilo_gui.py:205 ../iw/lilo_gui.py:364 ../iw/silo_gui.py:127 ../iw/silo_gui.py:280 ../text.py:1078 ../text.py:1082
+#: ../iw/lilo_gui.py:230 ../iw/lilo_gui.py:393 ../iw/silo_gui.py:127 ../iw/silo_gui.py:280 ../text.py:1101 ../text.py:1105
msgid "Partition"
msgstr "分区"
-#: ../text.py:1080
+#: ../text.py:1103
msgid "Manually Partition"
msgstr "手动分区"
-#: ../text.py:1084 ../textw/partitioning_text.py:333
+#: ../text.py:1107 ../textw/partitioning_text.py:333
msgid "Root Filesystem Size"
msgstr ""
-#: ../text.py:1086
+#: ../text.py:1109
msgid "Swap"
msgstr "交换"
-#: ../text.py:1088 ../textw/partitioning_text.py:390 ../textw/partitioning_text.py:410
+#: ../text.py:1111 ../textw/partitioning_text.py:390 ../textw/partitioning_text.py:410
#, fuzzy
msgid "Boot Partition Warning"
msgstr "自动分区"
-#: ../text.py:1090
+#: ../text.py:1113
msgid "Filesystem Formatting"
msgstr "正在格式化文件系统"
-#: ../iw/mouse_gui.py:56 ../text.py:1107 ../text.py:1109
+#: ../iw/mouse_gui.py:56 ../text.py:1130 ../text.py:1132
msgid "Mouse Configuration"
msgstr "鼠标配置"
-#: ../text.py:1114
+#: ../text.py:1137
#, fuzzy
msgid "Language Default"
msgstr "选择语言"
-#: ../text.py:1125
+#: ../text.py:1148
msgid "Package Groups"
msgstr "软件包分组"
-#: ../text.py:1127 ../text.py:1155
+#: ../text.py:1150 ../text.py:1178
msgid "Individual Packages"
msgstr "单独软件包"
-#: ../text.py:1129 ../text.py:1156 ../textw/packages_text.py:304
+#: ../text.py:1152 ../text.py:1179 ../textw/packages_text.py:304
msgid "Package Dependencies"
msgstr "软件包相关性"
-#: ../iw/xconfig_gui.py:899 ../text.py:1131 ../text.py:1139
+#: ../iw/xconfig_gui.py:846 ../text.py:1154 ../text.py:1162
msgid "X Configuration"
msgstr "X 配置"
-#: ../text.py:1133
+#: ../text.py:1156
msgid "Installation Begins"
msgstr "开始安装"
-#: ../text.py:1135
+#: ../text.py:1158
msgid "Install System"
msgstr "安装系统"
-#: ../text.py:1136 ../text.py:1138 ../text.py:1161 ../text.py:1163
+#: ../text.py:1159 ../text.py:1161 ../text.py:1184 ../text.py:1186
msgid "Boot Disk"
msgstr "引导盘"
-#: ../text.py:1141
+#: ../text.py:1164
msgid "Installation Complete"
msgstr "安装完成"
-#: ../text.py:1146
+#: ../text.py:1169
msgid "Examine System"
msgstr "检查系统"
-#: ../text.py:1153
+#: ../text.py:1176
msgid "Customize Upgrade"
msgstr "定制升级"
-#: ../text.py:1158
+#: ../text.py:1181
#, fuzzy
msgid "Upgrade Begins"
msgstr "升级检查"
-#: ../text.py:1160
+#: ../text.py:1183
msgid "Upgrade System"
msgstr "升级系统"
-#: ../text.py:1164
+#: ../text.py:1187
msgid "Upgrade Complete"
msgstr "升级完成"
-#: ../text.py:1202
+#: ../text.py:1225
msgid "Cancelled"
msgstr "已取消"
-#: ../text.py:1203
+#: ../text.py:1226
msgid "I can't go to the previous step from here. You will have to try again."
msgstr "无法从此处返回上一步, 您必须重试。"
-#: ../todo.py:697
+#: ../todo.py:702
msgid "Creating boot disk..."
msgstr "正在创建引导盘..."
-#: ../todo.py:716
+#: ../todo.py:721
msgid "Reading"
msgstr "正在读取"
-#: ../todo.py:717
+#: ../todo.py:722
msgid "Reading package information..."
msgstr "正在读取软件包信息..."
-#: ../todo.py:990
+#: ../todo.py:999
msgid "Dependency Check"
msgstr ""
-#: ../todo.py:991
+#: ../todo.py:1000
msgid "Checking dependencies in packages selected for installation..."
msgstr ""
-#: ../todo.py:1016 ../todo.py:1061 ../todo.py:1067 ../todo.py:1084 ../todo.py:1214
+#: ../todo.py:1025 ../todo.py:1070 ../todo.py:1076 ../todo.py:1093 ../todo.py:1223
msgid "no suggestion"
msgstr "没有建议"
-#: ../todo.py:1100
+#: ../todo.py:1109
msgid "One or more of the filesystems listed in the /etc/fstab on your Linux system cannot be mounted. Please fix this problem and try to upgrade again."
msgstr ""
-#: ../todo.py:1118
+#: ../todo.py:1127
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 the upgrade.\n"
"\n"
msgstr ""
-#: ../todo.py:1133
+#: ../todo.py:1142
msgid "Finding"
msgstr "正在查找"
-#: ../todo.py:1134
+#: ../todo.py:1143
msgid "Finding packages to upgrade..."
msgstr "正在查找要升级的软件包..."
-#: ../todo.py:1149
+#: ../todo.py:1158
msgid "Rebuild of RPM database failed. You may be out of disk space?"
msgstr "重建 RPM 数据库失败。 是否磁盘空间已满?"
-#: ../todo.py:1162
+#: ../todo.py:1171
#, fuzzy
msgid "An error occured when finding the packages to upgrade."
msgstr "正在查找要升级的软件包..."
-#: ../todo.py:1450
+#: ../todo.py:1459
msgid "Processing"
msgstr "正在处理"
-#: ../todo.py:1451
+#: ../todo.py:1460
msgid "Preparing to install..."
msgstr "正在进行安装准备..."
-#: ../todo.py:1485
+#: ../todo.py:1494
#, c-format
msgid "The file %s cannot be opened. This is due to a missing file, a bad package, or bad media. Press <return> to try again."
msgstr ""
-#: ../todo.py:1731
+#: ../todo.py:1740
#, c-format
msgid "Upgrading %s.\n"
msgstr "正在升级 %s。\n"
-#: ../todo.py:1733
+#: ../todo.py:1742
#, c-format
msgid "Installing %s.\n"
msgstr "正在安装 %s。\n"
-#: ../todo.py:1778
+#: ../todo.py:1787
msgid ""
"You don't appear to have enough disk space to install the packages you've selected. You need more space on the following filesystems:\n"
"\n"
@@ -791,15 +814,15 @@ msgstr ""
"磁盘空间不足,无法安装已选定的软件包。 您需要更多的磁盘空间才能安装以下文件系统:\n"
"\n"
-#: ../libfdisk/gnomefsedit.c:3132 ../todo.py:1781 ../todo.py:1797
+#: ../libfdisk/gnomefsedit.c:3132 ../todo.py:1790 ../todo.py:1806
msgid "Mount Point"
msgstr "安装点"
-#: ../todo.py:1781
+#: ../todo.py:1790
msgid "Space Needed"
msgstr "所需空间"
-#: ../todo.py:1794
+#: ../todo.py:1803
#, fuzzy
msgid ""
"You don't appear to have enough file nodes to install the packages you've selected. You need more file nodes on the following filesystems:\n"
@@ -808,20 +831,20 @@ msgstr ""
"磁盘空间不足,无法安装已选定的软件包。 您需要更多的磁盘空间才能安装以下文件系统:\n"
"\n"
-#: ../todo.py:1797
+#: ../todo.py:1806
#, fuzzy
msgid "Nodes Needed"
msgstr "所需空间"
-#: ../todo.py:1803
+#: ../todo.py:1812
msgid "Disk Space"
msgstr "磁盘空间"
-#: ../todo.py:1838
+#: ../todo.py:1847
msgid "Post Install"
msgstr "安装后"
-#: ../todo.py:1839
+#: ../todo.py:1848
msgid "Performing post install configuration..."
msgstr "正在执行安装后配置..."
@@ -838,39 +861,39 @@ msgstr "正在搜索 Red Hat Linux 安装..."
msgid "Error mounting ext2 filesystem on %s: %s"
msgstr "在 %s 上安装 ext2 文件系统时出现错误: %s"
-#: ../upgrade.py:97
+#: ../upgrade.py:98
msgid "One or more of the filesystems for your Linux system was not unmounted cleanly. Please boot your Linux installation, let the filesystems be checked, and shut down cleanly to upgrade."
msgstr ""
-#: ../iw/xconfig_gui.py:12 ../xf86config.py:960
+#: ../iw/xconfig_gui.py:12 ../xf86config.py:934
msgid "Video Card"
msgstr "视频卡"
-#: ../iw/xconfig_gui.py:14 ../xf86config.py:962
+#: ../iw/xconfig_gui.py:14 ../xf86config.py:936
msgid "Video Ram"
msgstr "视频 Ram"
-#: ../xf86config.py:965
+#: ../xf86config.py:939
msgid "X server"
msgstr "x 服务器"
-#: ../xf86config.py:968
+#: ../xf86config.py:942
msgid "Unable to detect video card"
msgstr "无法检测到视频卡"
-#: ../iw/xconfig_gui.py:13 ../xf86config.py:975 ../xf86config.py:977
+#: ../iw/xconfig_gui.py:13 ../xf86config.py:949 ../xf86config.py:951
msgid "Monitor"
msgstr "显示器"
-#: ../xf86config.py:977
+#: ../xf86config.py:951
msgid "Plug and Play Monitor"
msgstr "即插即用显示器"
-#: ../xf86config.py:979
+#: ../xf86config.py:953
msgid "Horizontal frequency range"
msgstr "水平频率范围"
-#: ../xf86config.py:981
+#: ../xf86config.py:955
msgid "Vertical frequency range"
msgstr "垂直频率范围"
@@ -887,6 +910,10 @@ msgstr ""
msgid "Use text mode"
msgstr ""
+#: ../xserver.py:69
+msgid "Probing for mouse type..."
+msgstr ""
+
#: ../iw/account_gui.py:15
msgid "Account Configuration"
msgstr "帐号配置"
@@ -1149,45 +1176,45 @@ msgstr "fdisk"
msgid "Select drive to run fdisk on"
msgstr "选择要运行 fdisk 命令的驱动器"
-#: ../iw/firewall_gui.py:119
+#: ../iw/firewall_gui.py:117
#, fuzzy
msgid "Warning: "
msgstr "正在搜索"
-#: ../iw/firewall_gui.py:119
+#: ../iw/firewall_gui.py:117
msgid " is an invalid port."
msgstr ""
-#: ../iw/firewall_gui.py:122
+#: ../iw/firewall_gui.py:120
msgid "The format is 'port:protocol'. For example, '1234:udp'"
msgstr ""
-#: ../iw/firewall_gui.py:206
+#: ../iw/firewall_gui.py:204
msgid "Please choose your security level: "
msgstr ""
-#: ../iw/firewall_gui.py:215 ../textw/firewall_text.py:33
+#: ../iw/firewall_gui.py:213 ../textw/firewall_text.py:33
msgid "High"
msgstr ""
-#: ../iw/firewall_gui.py:216 ../textw/firewall_text.py:36
+#: ../iw/firewall_gui.py:214 ../textw/firewall_text.py:36
msgid "Medium"
msgstr ""
-#: ../iw/firewall_gui.py:217 ../textw/firewall_text.py:39
+#: ../iw/firewall_gui.py:215 ../textw/firewall_text.py:39
msgid "No firewall"
msgstr ""
-#: ../iw/firewall_gui.py:233
+#: ../iw/firewall_gui.py:231
msgid "Use default firewall rules"
msgstr ""
-#: ../iw/firewall_gui.py:234 ../textw/firewall_text.py:9
+#: ../iw/firewall_gui.py:232 ../textw/firewall_text.py:9
#, fuzzy
msgid "Customize"
msgstr "定制"
-#: ../iw/firewall_gui.py:247
+#: ../iw/firewall_gui.py:245
#, fuzzy
msgid "Trusted devices:"
msgstr "已用的 RAID 设备"
@@ -1224,27 +1251,27 @@ msgstr "升级"
msgid "Keyboard Configuration"
msgstr "键盘配置"
-#: ../iw/keyboard_gui.py:86
+#: ../iw/keyboard_gui.py:87
msgid "Model"
msgstr "类型"
-#: ../iw/keyboard_gui.py:106
+#: ../iw/keyboard_gui.py:107
msgid "Layout"
msgstr "布局"
-#: ../iw/keyboard_gui.py:126
+#: ../iw/keyboard_gui.py:127
msgid "Dead Keys"
msgstr ""
-#: ../iw/keyboard_gui.py:135
+#: ../iw/keyboard_gui.py:137
msgid "Enable dead keys"
msgstr ""
-#: ../iw/keyboard_gui.py:136
+#: ../iw/keyboard_gui.py:138
msgid "Disable dead keys"
msgstr ""
-#: ../iw/keyboard_gui.py:145
+#: ../iw/keyboard_gui.py:151
msgid "Test your selection here:"
msgstr "在此处测试您的选择:"
@@ -1271,60 +1298,70 @@ msgstr "选择分区"
msgid "Select as default"
msgstr ""
-#: ../iw/lilo_gui.py:30
+#: ../iw/lilo_gui.py:32
msgid "Lilo Configuration"
msgstr "Lilo 配置"
-#: ../iw/lilo_gui.py:208 ../iw/lilo_gui.py:365 ../iw/silo_gui.py:132 ../iw/silo_gui.py:281 ../libfdisk/gnomefsedit.c:3136
+#: ../iw/lilo_gui.py:55
+#, fuzzy
+msgid "Would you like to continue with the upgrade?"
+msgstr "是否要设置联网?"
+
+#: ../iw/lilo_gui.py:64
+#, fuzzy
+msgid "Aborting upgrade"
+msgstr "要升级的系统"
+
+#: ../iw/lilo_gui.py:233 ../iw/lilo_gui.py:394 ../iw/silo_gui.py:132 ../iw/silo_gui.py:281 ../libfdisk/gnomefsedit.c:3136
msgid "Type"
msgstr "类型"
-#: ../iw/lilo_gui.py:253
+#: ../iw/lilo_gui.py:282
msgid "Install LILO boot record on:"
msgstr "LILO 引导记录安装位置:"
-#: ../iw/lilo_gui.py:260 ../iw/silo_gui.py:173 ../textw/lilo_text.py:87 ../textw/silo_text.py:64
+#: ../iw/lilo_gui.py:289 ../iw/silo_gui.py:173 ../textw/lilo_text.py:87 ../textw/silo_text.py:64
msgid "Master Boot Record (MBR)"
msgstr "主引导记录 (MBR)"
-#: ../iw/lilo_gui.py:264 ../iw/silo_gui.py:176 ../textw/lilo_text.py:88 ../textw/silo_text.py:65
+#: ../iw/lilo_gui.py:293 ../iw/silo_gui.py:176 ../textw/lilo_text.py:88 ../textw/silo_text.py:65
msgid "First sector of boot partition"
msgstr "引导分区的第一个扇区"
-#: ../iw/lilo_gui.py:268 ../textw/lilo_text.py:27
+#: ../iw/lilo_gui.py:297 ../textw/lilo_text.py:27
msgid "Use linear mode (needed for some SCSI drives)"
msgstr "使用线性模式(某些 SCSI 驱动器需要使用)"
-#: ../iw/lilo_gui.py:279 ../iw/silo_gui.py:208
+#: ../iw/lilo_gui.py:308 ../iw/silo_gui.py:208
msgid "Kernel parameters"
msgstr "内核参数"
-#: ../iw/lilo_gui.py:296 ../iw/silo_gui.py:226
+#: ../iw/lilo_gui.py:325 ../iw/silo_gui.py:226
msgid "Create boot disk"
msgstr "创建引导盘"
-#: ../iw/lilo_gui.py:310
+#: ../iw/lilo_gui.py:339
#, fuzzy
msgid "Install LILO"
msgstr "安装"
-#: ../iw/lilo_gui.py:337 ../iw/silo_gui.py:257 ../textw/lilo_text.py:199 ../textw/silo_text.py:196
+#: ../iw/lilo_gui.py:366 ../iw/silo_gui.py:257 ../textw/lilo_text.py:199 ../textw/silo_text.py:196
msgid "Default"
msgstr "缺省"
-#: ../iw/lilo_gui.py:337 ../iw/mouse_gui.py:145 ../iw/silo_gui.py:257 ../libfdisk/gnomefsedit.c:3133 ../textw/lilo_text.py:118 ../textw/lilo_text.py:199 ../textw/mouse_text.py:25 ../textw/silo_text.py:131 ../textw/silo_text.py:196
+#: ../iw/lilo_gui.py:366 ../iw/mouse_gui.py:145 ../iw/silo_gui.py:257 ../libfdisk/gnomefsedit.c:3133 ../textw/lilo_text.py:118 ../textw/lilo_text.py:199 ../textw/mouse_text.py:25 ../textw/silo_text.py:131 ../textw/silo_text.py:196
msgid "Device"
msgstr "设备"
-#: ../iw/lilo_gui.py:337 ../iw/silo_gui.py:257 ../textw/lilo_text.py:199 ../textw/silo_text.py:196
+#: ../iw/lilo_gui.py:366 ../iw/silo_gui.py:257 ../textw/lilo_text.py:199 ../textw/silo_text.py:196
msgid "Partition type"
msgstr "分区类型"
-#: ../iw/lilo_gui.py:337 ../iw/lilo_gui.py:376 ../iw/silo_gui.py:257 ../iw/silo_gui.py:292 ../textw/lilo_text.py:119 ../textw/lilo_text.py:199 ../textw/silo_text.py:132 ../textw/silo_text.py:196
+#: ../iw/lilo_gui.py:366 ../iw/lilo_gui.py:405 ../iw/silo_gui.py:257 ../iw/silo_gui.py:292 ../textw/lilo_text.py:119 ../textw/lilo_text.py:199 ../textw/silo_text.py:132 ../textw/silo_text.py:196
msgid "Boot label"
msgstr "引导卷标"
-#: ../iw/lilo_gui.py:372 ../iw/silo_gui.py:288
+#: ../iw/lilo_gui.py:401 ../iw/silo_gui.py:288
#, fuzzy
msgid "Default boot image"
msgstr "设置缺省 PROM 引导设备"
@@ -1369,7 +1406,7 @@ msgstr "启动引导"
msgid "IP Address"
msgstr "IP 地址"
-#: ../iw/network_gui.py:194 ../loader/net.c:752
+#: ../iw/network_gui.py:194 ../loader/net.c:762
msgid "Netmask"
msgstr "网络掩码"
@@ -1381,23 +1418,23 @@ msgstr "网络"
msgid "Broadcast"
msgstr "广播"
-#: ../iw/network_gui.py:242 ../loader/net.c:556 ../loader/net.c:754 ../textw/network_text.py:161
+#: ../iw/network_gui.py:248 ../loader/net.c:566 ../loader/net.c:764 ../textw/network_text.py:161
msgid "Hostname"
msgstr "主机名"
-#: ../iw/network_gui.py:243
+#: ../iw/network_gui.py:249
msgid "Gateway"
msgstr "网关"
-#: ../iw/network_gui.py:243
+#: ../iw/network_gui.py:249
msgid "Primary DNS"
msgstr "主 DNS"
-#: ../iw/network_gui.py:243
+#: ../iw/network_gui.py:249
msgid "Secondary DNS"
msgstr "次 DNS"
-#: ../iw/network_gui.py:243
+#: ../iw/network_gui.py:249
msgid "Ternary DNS"
msgstr "第三 DNS"
@@ -1677,104 +1714,104 @@ msgstr "测试失败"
msgid "Customize Graphics Configuration"
msgstr "定制 X 配置"
-#: ../iw/xconfig_gui.py:255
+#: ../iw/xconfig_gui.py:233
msgid "Color Depth:"
msgstr ""
-#: ../iw/xconfig_gui.py:283
+#: ../iw/xconfig_gui.py:256
msgid "Screen Resolution:"
msgstr ""
-#: ../iw/xconfig_gui.py:393
+#: ../iw/xconfig_gui.py:358
msgid " Test Setting "
msgstr ""
-#: ../iw/xconfig_gui.py:410
+#: ../iw/xconfig_gui.py:375
msgid "Please choose your default desktop environment:"
msgstr ""
# ../comps/comps-master:259
-#: ../iw/xconfig_gui.py:420 ../iw/xconfig_gui.py:481
+#: ../iw/xconfig_gui.py:385 ../iw/xconfig_gui.py:443
msgid "GNOME"
msgstr ""
# ../comps/comps-master:315
-#: ../iw/xconfig_gui.py:422 ../iw/xconfig_gui.py:495
+#: ../iw/xconfig_gui.py:387 ../iw/xconfig_gui.py:457
msgid "KDE"
msgstr ""
-#: ../iw/xconfig_gui.py:461
+#: ../iw/xconfig_gui.py:426
msgid "Your desktop environment is:"
msgstr ""
-#: ../iw/xconfig_gui.py:506
+#: ../iw/xconfig_gui.py:467
msgid "Please choose your login type:"
msgstr ""
-#: ../iw/xconfig_gui.py:515
+#: ../iw/xconfig_gui.py:474
#, fuzzy
msgid "Text"
msgstr "下一步"
-#: ../iw/xconfig_gui.py:516
+#: ../iw/xconfig_gui.py:475
#, fuzzy
msgid "Graphical"
msgstr "使用图形登录"
-#: ../iw/xconfig_gui.py:564
+#: ../iw/xconfig_gui.py:513
msgid "Bits per Pixel"
msgstr "单位象素的位数"
-#: ../iw/xconfig_gui.py:584
+#: ../iw/xconfig_gui.py:531
#, fuzzy
msgid "Monitor Configuration"
msgstr "Lilo 配置"
-#: ../iw/xconfig_gui.py:853 ../iw/xconfig_gui.py:1649
+#: ../iw/xconfig_gui.py:800 ../iw/xconfig_gui.py:1530
msgid "Restore original values"
msgstr ""
-#: ../iw/xconfig_gui.py:861
+#: ../iw/xconfig_gui.py:808
#, fuzzy
msgid "Horizontal Sync:"
msgstr "水平频率范围"
-#: ../iw/xconfig_gui.py:863
+#: ../iw/xconfig_gui.py:810
#, fuzzy
msgid "Vertical Sync:"
msgstr "水平频率范围"
-#: ../iw/xconfig_gui.py:869
+#: ../iw/xconfig_gui.py:816
msgid "kHz"
msgstr ""
-#: ../iw/xconfig_gui.py:872
+#: ../iw/xconfig_gui.py:819
msgid "Hz"
msgstr ""
-#: ../iw/xconfig_gui.py:1057
+#: ../iw/xconfig_gui.py:980
#, fuzzy
msgid "Your video ram size can not be autodetected. Choose your video ram size from the choices below:"
msgstr "无法自动检测到您的显示器,请在以下列表中选择:"
-#: ../iw/xconfig_gui.py:1068 ../iw/xconfig_gui.py:1089
+#: ../iw/xconfig_gui.py:991 ../iw/xconfig_gui.py:1012
msgid "In most cases your video hardware can be probed to automatically determine the best settings for your display."
msgstr "系统通常可以探测视频硬件,以自动确定适用于显示器的最佳设置。"
-#: ../iw/xconfig_gui.py:1077
+#: ../iw/xconfig_gui.py:1000
msgid "If the probed settings do not match your hardware select the correct setting below:"
msgstr ""
-#: ../iw/xconfig_gui.py:1098
+#: ../iw/xconfig_gui.py:1021
msgid "Autoprobe results:"
msgstr "自动探测结果:"
-#: ../iw/xconfig_gui.py:1584
+#: ../iw/xconfig_gui.py:1465
#, fuzzy
msgid "Video card RAM: "
msgstr "视频卡"
-#: ../iw/xconfig_gui.py:1653
+#: ../iw/xconfig_gui.py:1534
msgid "Skip X Configuration"
msgstr "跳过 X 配置"
@@ -2237,16 +2274,16 @@ msgstr "工作站"
msgid "partitioning did not meet requirements"
msgstr ""
-#: ../libfdisk/fsedit.c:918 ../libfdisk/fsedit.c:925 ../libfdisk/fsedit.c:932 ../libfdisk/fsedit.c:941 ../libfdisk/fsedit.c:968 ../libfdisk/fsedit.c:981 ../libfdisk/fsedit.c:991
+#: ../libfdisk/fsedit.c:921 ../libfdisk/fsedit.c:928 ../libfdisk/fsedit.c:935 ../libfdisk/fsedit.c:944 ../libfdisk/fsedit.c:971 ../libfdisk/fsedit.c:984 ../libfdisk/fsedit.c:994
msgid "Bad Mount Point"
msgstr "安装点错误"
-#: ../libfdisk/fsedit.c:919
+#: ../libfdisk/fsedit.c:922
#, c-format
msgid "The %s directory must be on the root filesystem."
msgstr "%s 目录必须位于根文件系统上。"
-#: ../libfdisk/fsedit.c:926
+#: ../libfdisk/fsedit.c:929
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -2257,7 +2294,7 @@ msgstr ""
"\n"
"安装点起始处必须使用前导 /。"
-#: ../libfdisk/fsedit.c:933
+#: ../libfdisk/fsedit.c:936
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -2268,7 +2305,7 @@ msgstr ""
"\n"
"安装点结束处不能使用 /。"
-#: ../libfdisk/fsedit.c:942
+#: ../libfdisk/fsedit.c:945
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -2279,11 +2316,11 @@ msgstr ""
"\n"
"安装点可能仅使用可印字符。"
-#: ../libfdisk/fsedit.c:950
+#: ../libfdisk/fsedit.c:953
msgid "You've asked to put your root (/) filesystem on a DOS-style FAT partition. You can do this, but you may not use any other filesystems for your Linux system. Additionally, there will be a speed penalty for not using Linux-native partitions. Do you want to continue?"
msgstr ""
-#: ../libfdisk/fsedit.c:969
+#: ../libfdisk/fsedit.c:972
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -2294,12 +2331,12 @@ msgstr ""
"\n"
"系统分区必须在 Linux 本机分区上。"
-#: ../libfdisk/fsedit.c:982
+#: ../libfdisk/fsedit.c:985
#, c-format
msgid "On this platform, /boot must be on a DOS-compatible filesystem %x."
msgstr ""
-#: ../libfdisk/fsedit.c:992
+#: ../libfdisk/fsedit.c:995
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -2310,75 +2347,75 @@ msgstr ""
"\n"
"/usr 必须在 Linux 本机分区或者 NFS 卷上。"
-#: ../libfdisk/fsedit.c:1020
+#: ../libfdisk/fsedit.c:1023
msgid "Too Many Drives"
msgstr "驱动器太多"
-#: ../libfdisk/fsedit.c:1021
+#: ../libfdisk/fsedit.c:1024
msgid "You have more drives than this program supports. Please use the standard fdisk program to setup your drives and please notify Red Hat Software that you saw this message."
msgstr "驱动器数量超出本程序所能支持的范围。请使用标准的 fdisk 程序设置驱动器,并通知 Red Hat 软件您已注意到此消息。"
-#: ../libfdisk/fsedit.c:1030
+#: ../libfdisk/fsedit.c:1033
#, fuzzy
msgid "Error Creating Device Nodes"
msgstr "正在创建 RAID 设备..."
-#: ../libfdisk/fsedit.c:1031
+#: ../libfdisk/fsedit.c:1034
msgid "An error has occurred while trying to create device nodes for the hard drives in your system. This may be because you have run out of disk space on the /tmp partition."
msgstr ""
-#: ../libfdisk/fsedit.c:1047
+#: ../libfdisk/fsedit.c:1050
msgid "No Drives Found"
msgstr "未找到驱动器"
-#: ../libfdisk/fsedit.c:1048
+#: ../libfdisk/fsedit.c:1051
msgid "An error has occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem."
msgstr "出现错误 - 未找到用于创建新文件系统的有效设备。请检查您的硬件以找到问题的起因。"
-#: ../libfdisk/fsedit.c:1376 ../libfdisk/fsedit.c:1439
+#: ../libfdisk/fsedit.c:1379 ../libfdisk/fsedit.c:1442
#, c-format
msgid "An error occurred reading the partition table for the block device %s. The error was"
msgstr "读取成块设备 %s 的分区表时出现错误。错误为"
-#: ../libfdisk/fsedit.c:1379 ../libfdisk/fsedit.c:1451 ../loader/net.c:277 ../loader/net.c:402
+#: ../libfdisk/fsedit.c:1382 ../libfdisk/fsedit.c:1454 ../loader/net.c:277 ../loader/net.c:402
msgid "Retry"
msgstr "重试"
-#: ../libfdisk/fsedit.c:1379 ../libfdisk/fsedit.c:1422 ../libfdisk/fsedit.c:1444 ../libfdisk/fsedit.c:1451
+#: ../libfdisk/fsedit.c:1382 ../libfdisk/fsedit.c:1425 ../libfdisk/fsedit.c:1447 ../libfdisk/fsedit.c:1454
msgid "Skip Drive"
msgstr "跳过驱动器"
-#: ../libfdisk/fsedit.c:1416
+#: ../libfdisk/fsedit.c:1419
#, c-format
msgid "The partition table on device %s is corrupted. To create new partitions it must be initialized, causing the loss of ALL DATA on this drive."
msgstr "设备 %s 上的分区表已损坏。创建新分区时必须对其执行初始化,这样会导致此驱动器中的所有数据丢失。"
-#: ../libfdisk/fsedit.c:1421
+#: ../libfdisk/fsedit.c:1424
msgid "Bad Partition Table"
msgstr "分区表错误"
-#: ../libfdisk/fsedit.c:1422
+#: ../libfdisk/fsedit.c:1425
msgid "Initialize"
msgstr "初始化"
-#: ../libfdisk/fsedit.c:1464
+#: ../libfdisk/fsedit.c:1467
msgid "BSD Disklabel"
msgstr "BSD 磁盘卷标"
-#: ../libfdisk/fsedit.c:1464
+#: ../libfdisk/fsedit.c:1467
msgid "A disk with a BSD disklabel has been found. The Red Hat installation only supports BSD Disklabels in read-only mode, so you must use a custom install and fdisk (instead of Disk Druid) for machines with BSD Disklabels."
msgstr "已找到一个磁盘卷标为 BSD 的磁盘。Red Hat 安装仅以只读模式支持 BSD 磁盘卷标。因此,对于磁盘卷标为 BSD 的机器,您必须使用定制安装和 fdisk(而不是磁盘 Druid)。"
-#: ../libfdisk/fsedit.c:1494 ../libfdisk/fsedit.c:1517
+#: ../libfdisk/fsedit.c:1497 ../libfdisk/fsedit.c:1520
#, c-format
msgid "System error %d"
msgstr "系统错误 %d"
-#: ../libfdisk/fsedit.c:1503 ../libfdisk/fsedit.c:1505 ../libfdisk/fsedit.c:1532
+#: ../libfdisk/fsedit.c:1506 ../libfdisk/fsedit.c:1508 ../libfdisk/fsedit.c:1535
msgid "Fdisk Error"
msgstr "Fdisk 错误"
-#: ../libfdisk/fsedit.c:1527
+#: ../libfdisk/fsedit.c:1530
msgid "This occurs because the drive geometry detected by the kernel used by the installer is different than the drive geometry used when the drive was partitioned. This can be corrected by specifying the drive geometry on the kernel command line when booting the installer."
msgstr ""
@@ -3071,7 +3108,7 @@ msgstr "正在装载辅助升级 ramdisk..."
msgid "Error loading ramdisk."
msgstr "装载 ramdisk 时出现错误。"
-#: ../loader/loader.c:585 ../loader/loader.c:2183
+#: ../loader/loader.c:585 ../loader/loader.c:2187
#, c-format
msgid "Failed to read directory %s: %s"
msgstr "读取目录 %s 失败:%s"
@@ -3143,59 +3180,64 @@ msgstr "无法检索辅助升级 ramdisk"
msgid "FTP and HTTP installs require 20MB or more of system memory."
msgstr ""
-#: ../loader/loader.c:1503
+#: ../loader/loader.c:1508
msgid "Rescue Method"
msgstr "拯救方法"
-#: ../loader/loader.c:1504
+#: ../loader/loader.c:1509
msgid "Installation Method"
msgstr "安装方法"
-#: ../loader/loader.c:1506
+#: ../loader/loader.c:1511
msgid "What type of media contains the rescue image?"
msgstr "哪一类介质包含拯救映像?"
-#: ../loader/loader.c:1508
+#: ../loader/loader.c:1513
msgid "What type of media contains the packages to be installed?"
msgstr "哪一类介质包含要安装的软件包?"
-#: ../loader/loader.c:2153
+#: ../loader/loader.c:2157
msgid "Cannot find ks.cfg on boot floppy."
msgstr "无法在引导软盘中找到 ks.cfg。"
-#: ../loader/loader.c:2245
+#: ../loader/loader.c:2249
#, fuzzy
msgid "Updates Disk"
msgstr "更新"
-#: ../loader/loader.c:2246
+#: ../loader/loader.c:2250
msgid "Insert your updates disk and press \"OK\" to continue."
msgstr "插入更新盘,然后按\"确定\"继续。"
-#: ../loader/loader.c:2251
+#: ../loader/loader.c:2255
#, fuzzy
msgid "The floppy disk you inserted is not a valid update disk for this release of Red Hat Linux."
msgstr "您插入的软盘并非用于此 Red Hat Linux 版本的有效驱动程序软盘。"
-#: ../loader/loader.c:2261
+#: ../loader/loader.c:2265
msgid "Failed to mount floppy disk."
msgstr "安装软盘失败。"
#. Copy everything to /tmp/updates so .so files don't get run
#. from /dev/floppy. We could (and probably should) get smarter
#. about this at some point.
-#: ../loader/loader.c:2266
+#: ../loader/loader.c:2270
msgid "Updates"
msgstr "更新"
-#: ../loader/loader.c:2266
+#: ../loader/loader.c:2270
msgid "Reading anaconda updates..."
msgstr "正在读取 anaconda 更新..."
-#: ../loader/loader.c:2472
+#: ../loader/loader.c:2476
msgid "You don't have enough system memory to install Red Hat on this machine."
msgstr ""
+#: ../loader/loader.c:2934
+#, fuzzy
+msgid "Running anaconda - please wait...\n"
+msgstr "正在读取 anaconda 更新..."
+
#: ../loader/net.c:170
msgid "NFS server name:"
msgstr "NFS 服务器名称:"
@@ -3227,7 +3269,7 @@ msgstr ""
msgid "Nameserver IP"
msgstr "名称服务器"
-#: ../loader/net.c:266 ../loader/net.c:750
+#: ../loader/net.c:266 ../loader/net.c:760
msgid "Nameserver"
msgstr "名称服务器"
@@ -3265,66 +3307,66 @@ msgstr "缺少信息"
msgid "You must enter both a valid IP address and a netmask."
msgstr "必须输入有效的 IP 地址和网络掩码。"
-#: ../loader/net.c:411 ../loader/net.c:684
+#: ../loader/net.c:411 ../loader/net.c:694
msgid "Dynamic IP"
msgstr "动态 IP"
-#: ../loader/net.c:412 ../loader/net.c:685
+#: ../loader/net.c:412 ../loader/net.c:695
msgid "Sending request for IP information..."
msgstr "正在发送 IP 信息请求..."
-#: ../loader/net.c:557
+#: ../loader/net.c:567
msgid "Determining host name and domain..."
msgstr "正在确定主机的名称和域..."
-#: ../loader/net.c:668 ../loader/net.c:701
+#: ../loader/net.c:678 ../loader/net.c:711
msgid "kickstart"
msgstr "反冲启动"
-#: ../loader/net.c:669
+#: ../loader/net.c:679
#, c-format
msgid "bad argument to kickstart network command %s: %s"
msgstr "反冲启动网络命令 %s 的变量错误:%s"
-#: ../loader/net.c:702
+#: ../loader/net.c:712
#, c-format
msgid "Bad bootproto %s specified in network command"
msgstr ""
-#: ../loader/net.c:744
+#: ../loader/net.c:754
msgid "Boot protocol to use"
msgstr "要使用的引导协议"
-#: ../loader/net.c:746
+#: ../loader/net.c:756
msgid "Network gateway"
msgstr "网络网关"
-#: ../loader/net.c:748
+#: ../loader/net.c:758
msgid "IP address"
msgstr "IP 地址"
-#: ../loader/net.c:757
+#: ../loader/net.c:767
msgid "Domain name"
msgstr "域名"
-#: ../loader/net.c:760
+#: ../loader/net.c:770
msgid "Network device"
msgstr "网络设备"
-#: ../loader/net.c:832
+#: ../loader/net.c:842
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> 选项间切换 | <Space> 选择 | <F12> 下一屏幕"
-#: ../loader/net.c:833
+#: ../loader/net.c:843
#, c-format
msgid "netconfig %s (C) 1999 Red Hat, Inc."
msgstr "netconfig %s (C) 1999 Red Hat, Inc."
-#: ../loader/net.c:835
+#: ../loader/net.c:845
msgid "Network configuration"
msgstr "网络配置"
-#: ../loader/net.c:836
+#: ../loader/net.c:846
msgid "Would you like to set up networking?"
msgstr "是否要设置联网?"