summaryrefslogtreecommitdiffstats
path: root/po/zh.po
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2000-01-19 15:18:47 +0000
committerMatt Wilson <msw@redhat.com>2000-01-19 15:18:47 +0000
commitcfbe1783a5d9602560cbc407f68202ab00b4ae2a (patch)
treeeb34361bf4dee2e078b2d06c4314ba17fc113559 /po/zh.po
parent5f3f0f659b28b6dccedf32cd7fa7739e9c27d945 (diff)
downloadanaconda-cfbe1783a5d9602560cbc407f68202ab00b4ae2a.tar.gz
anaconda-cfbe1783a5d9602560cbc407f68202ab00b4ae2a.tar.xz
anaconda-cfbe1783a5d9602560cbc407f68202ab00b4ae2a.zip
msgmerge
Diffstat (limited to 'po/zh.po')
-rw-r--r--po/zh.po917
1 files changed, 529 insertions, 388 deletions
diff --git a/po/zh.po b/po/zh.po
index e90dc5115..7bd6453aa 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-28 17:07-0500\n"
+"POT-Creation-Date: 2000-01-18 14:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,219 +14,228 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ../fstab.py:165 ../fstab.py:308
+#: ../fstab.py:204 ../fstab.py:359
msgid "Formatting"
msgstr "正在格式化"
-#: ../fstab.py:166
+#: ../fstab.py:205
#, c-format
msgid "Formatting swap space on /dev/%s..."
msgstr ""
-#: ../fstab.py:178 ../fstab.py:244 ../fstab.py:358 ../libfdisk/newtfsedit.c:1540 ../loader/devices.c:178 ../loader/devices.c:183 ../loader/loader.c:471 ../loader/loader.c:481 ../loader/loader.c:697 ../loader/loader.c:742 ../loader/loader.c:880 ../loader/loader.c:885 ../loader/loader.c:1621 ../loader/loader.c:1667 ../loader/loader.c:1738 ../loader/urls.c:206 ../loader/urls.c:211 ../text.py:234 ../text.py:694 ../todo.py:340 ../todo.py:823 ../todo.py:852 ../todo.py:1176
+#: ../fstab.py:215 ../fstab.py:292 ../fstab.py:425 ../libfdisk/newtfsedit.c:1541 ../loader/devices.c:178 ../loader/devices.c:183 ../loader/loader.c:467 ../loader/loader.c:477 ../loader/loader.c:693 ../loader/loader.c:738 ../loader/loader.c:876 ../loader/loader.c:881 ../loader/loader.c:1633 ../loader/loader.c:1679 ../loader/loader.c:1750 ../loader/urls.c:70 ../loader/urls.c:79 ../loader/urls.c:86 ../loader/urls.c:223 ../loader/urls.c:228 ../text.py:275 ../text.py:758 ../todo.py:335 ../todo.py:841 ../todo.py:872 ../todo.py:1241
msgid "Error"
msgstr "错误"
-#: ../fstab.py:178
+#: ../fstab.py:215
msgid "Error creating swap on device "
msgstr ""
-#: ../fstab.py:245
+#: ../fstab.py:293
#, c-format
msgid "Error unmounting %s: %s"
msgstr "卸载 %s 时出现错误: %s"
-#: ../fstab.py:261 ../todo.py:480
+#: ../fstab.py:315 ../todo.py:482
msgid "Creating"
msgstr "正在创建"
-#: ../fstab.py:261
+#: ../fstab.py:315
msgid "Creating RAID devices..."
msgstr "正在创建 RAID 设备..."
-#: ../fstab.py:309
+#: ../fstab.py:360
#, c-format
msgid "Formatting %s filesystem..."
msgstr "正在格式化 %s 文件系统..."
-#: ../fstab.py:359
+#: ../fstab.py:382
+msgid "Loopback"
+msgstr ""
+
+#: ../fstab.py:383
+#, c-format
+msgid "Creating loopback filesystem on device /dev/%s..."
+msgstr ""
+
+#: ../fstab.py:426
#, c-format
msgid "Error mounting %s: %s"
msgstr "安装 %s 时出现错误: %s"
-#: ../gui.py:269 ../gui.py:515
+#: ../gui.py:270 ../gui.py:516
msgid "Next"
msgstr "下一步"
-#: ../gui.py:270 ../gui.py:514 ../libfdisk/newtfsedit.c:1292 ../libfdisk/newtfsedit.c:1300 ../loader/cdrom.c:34 ../loader/devices.c:67 ../loader/devices.c:168 ../loader/devices.c:218 ../loader/lang.c:537 ../loader/loader.c:255 ../loader/loader.c:603 ../loader/loader.c:639 ../loader/loader.c:742 ../loader/loader.c:1110 ../loader/net.c:162 ../loader/net.c:284 ../loader/urls.c:129 ../loader/urls.c:341 ../text.py:90 ../text.py:91 ../text.py:110 ../text.py:133 ../text.py:163 ../text.py:166 ../text.py:208 ../text.py:237 ../text.py:251 ../text.py:253 ../text.py:272 ../text.py:274 ../text.py:296 ../text.py:298 ../text.py:387 ../text.py:438 ../text.py:440 ../text.py:449 ../text.py:467 ../text.py:480 ../text.py:517 ../text.py:519 ../text.py:545 ../text.py:548 ../text.py:557 ../text.py:615 ../text.py:616 ../textw/constants.py:10 ../textw/lilo.py:27 ../textw/lilo.py:79 ../textw/lilo.py:86 ../textw/lilo.py:161 ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136 ../textw/packages.py:145 ../textw/partitioning.py:23 ../textw/partitioning.py:63 ../textw/partitioning.py:207 ../textw/silo.py:26 ../textw/silo.py:86 ../textw/silo.py:185 ../textw/timezone.py:63 ../textw/userauth.py:29 ../textw/userauth.py:141 ../textw/userauth.py:172 ../textw/userauth.py:244
+#: ../gui.py:271 ../gui.py:515 ../libfdisk/newtfsedit.c:1292 ../libfdisk/newtfsedit.c:1300 ../loader/cdrom.c:34 ../loader/devices.c:67 ../loader/devices.c:168 ../loader/devices.c:218 ../loader/lang.c:536 ../loader/loader.c:251 ../loader/loader.c:599 ../loader/loader.c:635 ../loader/loader.c:738 ../loader/loader.c:1110 ../loader/net.c:162 ../loader/net.c:284 ../loader/urls.c:146 ../loader/urls.c:361 ../text.py:54 ../text.py:65 ../text.py:100 ../text.py:101 ../text.py:120 ../text.py:143 ../text.py:173 ../text.py:176 ../text.py:222 ../text.py:278 ../text.py:292 ../text.py:294 ../text.py:313 ../text.py:315 ../text.py:337 ../text.py:339 ../text.py:446 ../text.py:497 ../text.py:499 ../text.py:512 ../text.py:530 ../text.py:543 ../text.py:580 ../text.py:582 ../text.py:608 ../text.py:611 ../text.py:620 ../text.py:678 ../text.py:679 ../textw/constants.py:10 ../textw/lilo.py:31 ../textw/lilo.py:86 ../textw/lilo.py:93 ../textw/lilo.py:168 ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136 ../textw/packages.py:145 ../textw/partitioning.py:23 ../textw/partitioning.py:63 ../textw/partitioning.py:211 ../textw/partitioning.py:260 ../textw/silo.py:26 ../textw/silo.py:87 ../textw/silo.py:186 ../textw/timezone.py:63 ../textw/userauth.py:29 ../textw/userauth.py:145 ../textw/userauth.py:176 ../textw/userauth.py:248
msgid "Back"
msgstr "上一步"
-#: ../gui.py:271 ../gui.py:519
+#: ../gui.py:272 ../gui.py:520
msgid "Show Help"
msgstr "显示帮助"
-#: ../gui.py:272 ../gui.py:518
+#: ../gui.py:273 ../gui.py:519
msgid "Hide Help"
msgstr "隐藏帮助"
-#: ../gui.py:273 ../gui.py:517
+#: ../gui.py:274 ../gui.py:518
msgid "Finish"
msgstr "完成"
-#: ../gui.py:276 ../gui.py:540
+#: ../gui.py:277 ../gui.py:541
msgid "Online Help"
msgstr "联机帮助"
-#: ../gui.py:277 ../iw/language.py:10 ../text.py:52 ../text.py:934 ../text.py:963
+#: ../gui.py:278 ../iw/language.py:10 ../text.py:59 ../text.py:998 ../text.py:1027
msgid "Language Selection"
msgstr "选择语言"
-#: ../gui.py:481
+#: ../gui.py:482
msgid "Red Hat Linux Installer"
msgstr "Red Hat Linux 安装程序"
-#: ../gui.py:485
+#: ../gui.py:486
msgid "Red Hat Linux Install Shell"
msgstr "Red Hat Linux 安装 Shell 程序"
-#: ../gui.py:496
+#: ../gui.py:497
#, c-format
msgid "Red Hat Linux Installer on %s"
msgstr "用于 %s 的 Red Hat Linux 安装程序"
-#: ../gui.py:497
+#: ../gui.py:498
#, c-format
msgid "Red Hat Linux Install Shell on %s"
msgstr "用于 %s 的 Red Hat Linux 安装Shell 程序"
-#: ../installclass.py:241
+#: ../installclass.py:245
msgid "You are about to erase any preexisting Linux installations on your system."
msgstr "即将清除系统中先前存在的任何 Linux 安装。"
-#: ../installclass.py:278
+#: ../installclass.py:282
msgid "You are about to erase ALL DATA on your hard drive to make room for your Linux installation."
msgstr "即将清除硬盘驱动器中的所有数据,以清出空间用于 Linux 安装。"
-#: ../text.py:53
+#. code to create dialog in gtk+
+#: ../libfdisk/fsedit.c:669 ../libfdisk/fsedit.c:676 ../libfdisk/fsedit.c:683 ../libfdisk/fsedit.c:692 ../libfdisk/fsedit.c:719 ../libfdisk/fsedit.c:729 ../libfdisk/fsedit.c:758 ../libfdisk/fsedit.c:774 ../libfdisk/fsedit.c:1163 ../libfdisk/gnomefsedit.c:677 ../libfdisk/gnomefsedit.c:1047 ../libfdisk/gnomefsedit.c:1073 ../libfdisk/gnomefsedit.c:1091 ../libfdisk/gnomefsedit.c:1296 ../libfdisk/gnomefsedit.c:1390 ../libfdisk/gnomefsedit.c:1408 ../libfdisk/gnomefsedit.c:1646 ../libfdisk/gnomefsedit.c:1881 ../libfdisk/gnomefsedit.c:1889 ../libfdisk/gnomefsedit.c:1903 ../libfdisk/gnomefsedit.c:1914 ../libfdisk/gnomefsedit.c:1921 ../libfdisk/gnomefsedit.c:1936 ../libfdisk/gnomefsedit.c:1945 ../libfdisk/gnomefsedit.c:1954 ../libfdisk/gnomefsedit.c:1993 ../libfdisk/gnomefsedit.c:2154 ../libfdisk/newtfsedit.c:113 ../libfdisk/newtfsedit.c:462 ../libfdisk/newtfsedit.c:540 ../libfdisk/newtfsedit.c:558 ../libfdisk/newtfsedit.c:576 ../libfdisk/newtfsedit.c:1292 ../libfdisk/newtfsedit.c:1300 ../libfdisk/newtfsedit.c:1426 ../libfdisk/newtfsedit.c:1447 ../libfdisk/newtfsedit.c:1541 ../loader/urls.c:70 ../loader/urls.c:79 ../loader/urls.c:86 ../loader/urls.c:234 ../text.py:54 ../text.py:56 ../text.py:100 ../text.py:620 ../textw/constants.py:10 ../textw/lilo.py:104 ../textw/lilo.py:117 ../textw/lilo.py:167 ../textw/silo.py:124 ../textw/silo.py:137 ../textw/silo.py:185
+msgid "Ok"
+msgstr "确定"
+
+#: ../text.py:60
msgid "What language would you like to use during the installation process?"
msgstr "您要在安装过程中使用何种语言?"
-#: ../loader/cdrom.c:34 ../loader/devices.c:66 ../loader/devices.c:167 ../loader/devices.c:178 ../loader/devices.c:183 ../loader/devices.c:218 ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107 ../loader/lang.c:270 ../loader/lang.c:537 ../loader/loader.c:255 ../loader/loader.c:471 ../loader/loader.c:481 ../loader/loader.c:639 ../loader/loader.c:697 ../loader/loader.c:742 ../loader/loader.c:880 ../loader/loader.c:885 ../loader/loader.c:971 ../loader/loader.c:1110 ../loader/loader.c:1621 ../loader/loader.c:1667 ../loader/loader.c:1730 ../loader/loader.c:1738 ../loader/net.c:162 ../loader/net.c:284 ../loader/net.c:557 ../loader/urls.c:129 ../loader/urls.c:206 ../loader/urls.c:211 ../loader/urls.c:341 ../text.py:55 ../text.py:110 ../text.py:163 ../text.py:208 ../text.py:251 ../text.py:296 ../text.py:387 ../text.py:407 ../text.py:438 ../text.py:517 ../text.py:545 ../text.py:615 ../text.py:639 ../text.py:653 ../text.py:673 ../text.py:686 ../text.py:698 ../text.py:893 ../text.py:897 ../text.py:1087 ../textw/lilo.py:26 ../textw/lilo.py:79 ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136 ../textw/partitioning.py:207 ../textw/silo.py:25 ../textw/silo.py:86 ../textw/timezone.py:63 ../textw/userauth.py:29 ../textw/userauth.py:43 ../textw/userauth.py:48 ../textw/userauth.py:82 ../textw/userauth.py:94 ../textw/userauth.py:102 ../textw/userauth.py:111 ../textw/userauth.py:172 ../textw/userauth.py:244
-msgid "OK"
-msgstr "确定"
-
-#: ../text.py:70
+#: ../text.py:80
msgid "/dev/ttyS0 (COM1 under DOS)"
msgstr "/dev/ttyS0(DOS 下的 COM1)"
-#: ../text.py:71
+#: ../text.py:81
msgid "/dev/ttyS1 (COM2 under DOS)"
msgstr "/dev/ttyS1(DOS 下的 COM2)"
-#: ../text.py:72
+#: ../text.py:82
msgid "/dev/ttyS2 (COM3 under DOS)"
msgstr "/dev/ttyS2(DOS 下的 COM3)"
-#: ../text.py:73
+#: ../text.py:83
msgid "/dev/ttyS3 (COM4 under DOS)"
msgstr "/dev/ttyS3(DOS 下的 COM4)"
-#: ../iw/lilo.py:197 ../iw/silo.py:245 ../text.py:88 ../textw/lilo.py:92 ../textw/lilo.py:151 ../textw/silo.py:118 ../textw/silo.py:175
+#: ../iw/lilo.py:201 ../iw/silo.py:246 ../text.py:98 ../textw/lilo.py:99 ../textw/lilo.py:158 ../textw/silo.py:119 ../textw/silo.py:176
msgid "Device"
msgstr "设备"
-#: ../text.py:89
+#: ../text.py:99
#, c-format
msgid "What device is your mouse located on? %s %i"
msgstr "您的鼠标位于哪个设备上?%s %i"
-#. code to create dialog in gtk+
-#: ../libfdisk/fsedit.c:645 ../libfdisk/fsedit.c:652 ../libfdisk/fsedit.c:659 ../libfdisk/fsedit.c:668 ../libfdisk/fsedit.c:694 ../libfdisk/fsedit.c:704 ../libfdisk/fsedit.c:733 ../libfdisk/fsedit.c:749 ../libfdisk/fsedit.c:1109 ../libfdisk/gnomefsedit.c:677 ../libfdisk/gnomefsedit.c:1047 ../libfdisk/gnomefsedit.c:1073 ../libfdisk/gnomefsedit.c:1091 ../libfdisk/gnomefsedit.c:1296 ../libfdisk/gnomefsedit.c:1390 ../libfdisk/gnomefsedit.c:1408 ../libfdisk/gnomefsedit.c:1646 ../libfdisk/gnomefsedit.c:1881 ../libfdisk/gnomefsedit.c:1889 ../libfdisk/gnomefsedit.c:1903 ../libfdisk/gnomefsedit.c:1914 ../libfdisk/gnomefsedit.c:1921 ../libfdisk/gnomefsedit.c:1936 ../libfdisk/gnomefsedit.c:1945 ../libfdisk/gnomefsedit.c:1984 ../libfdisk/gnomefsedit.c:2145 ../libfdisk/newtfsedit.c:113 ../libfdisk/newtfsedit.c:462 ../libfdisk/newtfsedit.c:540 ../libfdisk/newtfsedit.c:558 ../libfdisk/newtfsedit.c:576 ../libfdisk/newtfsedit.c:1292 ../libfdisk/newtfsedit.c:1300 ../libfdisk/newtfsedit.c:1425 ../libfdisk/newtfsedit.c:1446 ../libfdisk/newtfsedit.c:1540 ../loader/urls.c:217 ../text.py:90 ../text.py:557 ../textw/constants.py:10 ../textw/lilo.py:97 ../textw/lilo.py:110 ../textw/lilo.py:160 ../textw/silo.py:123 ../textw/silo.py:136 ../textw/silo.py:184
-msgid "Ok"
+#: ../loader/cdrom.c:34 ../loader/devices.c:66 ../loader/devices.c:167 ../loader/devices.c:178 ../loader/devices.c:183 ../loader/devices.c:218 ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107 ../loader/lang.c:269 ../loader/lang.c:536 ../loader/loader.c:251 ../loader/loader.c:467 ../loader/loader.c:477 ../loader/loader.c:635 ../loader/loader.c:693 ../loader/loader.c:738 ../loader/loader.c:876 ../loader/loader.c:881 ../loader/loader.c:966 ../loader/loader.c:1110 ../loader/loader.c:1633 ../loader/loader.c:1679 ../loader/loader.c:1742 ../loader/loader.c:1750 ../loader/net.c:162 ../loader/net.c:284 ../loader/net.c:557 ../loader/net.c:588 ../loader/urls.c:146 ../loader/urls.c:223 ../loader/urls.c:228 ../loader/urls.c:361 ../text.py:120 ../text.py:173 ../text.py:222 ../text.py:292 ../text.py:337 ../text.py:354 ../text.py:446 ../text.py:466 ../text.py:497 ../text.py:580 ../text.py:608 ../text.py:678 ../text.py:703 ../text.py:717 ../text.py:737 ../text.py:750 ../text.py:762 ../text.py:957 ../text.py:961 ../text.py:1158 ../textw/lilo.py:30 ../textw/lilo.py:86 ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136 ../textw/partitioning.py:211 ../textw/partitioning.py:260 ../textw/partitioning.py:270 ../textw/partitioning.py:278 ../textw/silo.py:25 ../textw/silo.py:87 ../textw/timezone.py:63 ../textw/userauth.py:29 ../textw/userauth.py:43 ../textw/userauth.py:48 ../textw/userauth.py:81 ../textw/userauth.py:92 ../textw/userauth.py:98 ../textw/userauth.py:106 ../textw/userauth.py:115 ../textw/userauth.py:176 ../textw/userauth.py:248
+msgid "OK"
msgstr "确定"
-#: ../text.py:112
+#: ../text.py:122
msgid "Which model mouse is attached to this computer?"
msgstr "与此计算机连接的鼠标属于何种类型?"
-#: ../text.py:121
+#: ../text.py:131
msgid "Emulate 3 Buttons?"
msgstr "是否为模拟 3 键鼠标?"
-#: ../text.py:123
+#: ../text.py:133
msgid "Mouse Selection"
msgstr "选择鼠标"
-#: ../text.py:161 ../text.py:936 ../text.py:965
+#: ../text.py:171 ../text.py:1000 ../text.py:1029
msgid "Keyboard Selection"
msgstr "选择键盘"
-#: ../text.py:162
+#: ../text.py:172
msgid "Which model keyboard is attached to this computer?"
msgstr "与此计算机连接的键盘属于何种类型?"
-#: ../text.py:201
+#: ../text.py:215
msgid "Install GNOME Workstation"
msgstr "安装 GNOME 工作站"
-#: ../text.py:202
+#: ../text.py:216
msgid "Install KDE Workstation"
msgstr "安装 KDE 工作站"
-#: ../text.py:203
+#: ../text.py:217
msgid "Install Server System"
msgstr "安装服务器系统"
-#: ../text.py:204
+#: ../text.py:218
msgid "Install Custom System"
msgstr "安装定制系统"
-#: ../text.py:205
+#: ../text.py:219
msgid "Upgrade Existing Installation"
msgstr "升级现有的安装"
-#: ../text.py:206 ../text.py:968
+#: ../text.py:220 ../text.py:1032
msgid "Installation Type"
msgstr "安装类型"
-#: ../text.py:207
+#: ../text.py:221
msgid "What type of system would you like to install?"
msgstr "您要安装何种类型的系统?"
-#: ../text.py:235
+#: ../text.py:276
msgid "You don't have any Linux partitions. You can't upgrade this system!"
msgstr "没有任何 Linux 分区,无法升级本系统!"
-#: ../text.py:248
+#: ../text.py:289
msgid "System to Upgrade"
msgstr "要升级的系统"
-#: ../text.py:249
+#: ../text.py:290
msgid "What partition holds the root partition of your installation?"
msgstr "哪个分区包含安装的根分区?"
-#: ../text.py:264
+#: ../text.py:305
msgid "Customize Packages to Upgrade"
msgstr "定制要升级的软件包"
-#: ../text.py:265
+#: ../text.py:306
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 "系统已选定用于安装的已安装软件包,以及满足其相关性要求的其它任何软件包。是否要定制升级的软件包集?"
-#: ../libfdisk/fsedit.c:677 ../libfdisk/gnomefsedit.c:602 ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 ../libfdisk/gnomefsedit.c:2037 ../libfdisk/gnomefsedit.c:2307 ../libfdisk/gnomefsedit.c:2360 ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 ../libfdisk/newtfsedit.c:1581 ../loader/loader.c:603 ../loader/net.c:703 ../text.py:272 ../text.py:449 ../text.py:467 ../text.py:474 ../textw/partitioning.py:172
+#: ../iw/welcome.py:88 ../libfdisk/fsedit.c:702 ../libfdisk/gnomefsedit.c:602 ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 ../libfdisk/gnomefsedit.c:2046 ../libfdisk/gnomefsedit.c:2316 ../libfdisk/gnomefsedit.c:2369 ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1479 ../libfdisk/newtfsedit.c:1497 ../libfdisk/newtfsedit.c:1582 ../loader/loader.c:599 ../loader/net.c:711 ../text.py:313 ../text.py:512 ../text.py:530 ../text.py:537 ../textw/partitioning.py:172
msgid "Yes"
msgstr "是"
-#: ../libfdisk/fsedit.c:677 ../libfdisk/gnomefsedit.c:602 ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 ../libfdisk/gnomefsedit.c:2037 ../libfdisk/gnomefsedit.c:2307 ../libfdisk/gnomefsedit.c:2360 ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 ../libfdisk/newtfsedit.c:1581 ../loader/net.c:703 ../text.py:272 ../text.py:277 ../text.py:449 ../text.py:467 ../text.py:477 ../textw/partitioning.py:172
+#: ../iw/welcome.py:91 ../libfdisk/fsedit.c:702 ../libfdisk/gnomefsedit.c:602 ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 ../libfdisk/gnomefsedit.c:2046 ../libfdisk/gnomefsedit.c:2316 ../libfdisk/gnomefsedit.c:2369 ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1479 ../libfdisk/newtfsedit.c:1497 ../libfdisk/newtfsedit.c:1582 ../loader/net.c:711 ../text.py:313 ../text.py:318 ../text.py:512 ../text.py:530 ../text.py:540 ../textw/partitioning.py:172
msgid "No"
msgstr "否"
-#: ../text.py:287
+#: ../text.py:328 ../text.py:346
msgid "Red Hat Linux"
msgstr "Red Hat Linux"
-#: ../text.py:288
+#: ../text.py:329
msgid ""
"Welcome to Red Hat Linux!\n"
"\n"
@@ -241,51 +250,64 @@ msgstr ""
"\n"
"如果您购买了 Red Hat Linux 正式版,请务必通过我们的 Web 站点( http://www.redhat.com/) 登记此产品。"
-#: ../text.py:359
+#: ../text.py:347
+msgid ""
+"Welcome to the Red Hat Linux!\n"
+"\n"
+"You have entered reconfiguration mode, which will allow you to configure site-specific options of your computer.\n"
+"\n"
+"To exit without changing your setup select the Cancel button below."
+msgstr ""
+
+#: ../libfdisk/gnomefsedit.c:677 ../libfdisk/gnomefsedit.c:1646 ../libfdisk/gnomefsedit.c:2154 ../libfdisk/newtfsedit.c:463 ../libfdisk/newtfsedit.c:1497 ../loader/devices.c:168 ../loader/loader.c:1742 ../text.py:354 ../text.py:356 ../textw/lilo.py:104 ../textw/lilo.py:122 ../textw/silo.py:124 ../textw/silo.py:142 ../textw/userauth.py:62
+msgid "Cancel"
+msgstr "取消"
+
+#: ../text.py:418
msgid "Use bootp/dhcp"
msgstr "使用 bootp/dhcp"
-#: ../loader/net.c:234 ../text.py:364
+#: ../loader/net.c:234 ../text.py:423
msgid "IP address:"
msgstr "IP 地址:"
-#: ../loader/net.c:237 ../text.py:365
+#: ../loader/net.c:237 ../text.py:424
msgid "Netmask:"
msgstr "网络掩码:"
-#: ../loader/net.c:240 ../text.py:366
+#: ../loader/net.c:240 ../text.py:425
msgid "Default gateway (IP):"
msgstr "缺省网关 (IP):"
-#: ../loader/net.c:243 ../text.py:367
+#: ../loader/net.c:243 ../text.py:426
msgid "Primary nameserver:"
msgstr "主名称服务器:"
-#: ../iw/network.py:11 ../text.py:389
+#: ../iw/network.py:11 ../text.py:448
msgid "Network Configuration"
msgstr "网络配置"
-#: ../text.py:405
+#: ../text.py:464
msgid "Invalid information"
msgstr "无效信息"
-#: ../text.py:406
+#: ../text.py:465
msgid "You must enter valid IP information to continue"
msgstr "您必须输入有效的 IP 信息才能继续安装"
-#: ../text.py:434
+#: ../text.py:493
msgid "Hostname Configuration"
msgstr "主机名配置"
-#: ../text.py:435
+#: ../text.py:494
msgid "The hostname is the name of your computer. If your computer is attached to a network, this may be assigned by your network administrator."
msgstr "主机名就是您的计算机名称。 如果您的计算机已连接至网络,则此名称可能已由网络管理员指定。"
-#: ../iw/network.py:210 ../loader/net.c:458 ../loader/net.c:622 ../text.py:438
+#: ../iw/network.py:210 ../loader/net.c:458 ../loader/net.c:630 ../text.py:497
msgid "Hostname"
msgstr "主机名"
-#: ../text.py:450
+#: ../text.py:513
msgid ""
"A custom boot disk provides a way of booting into your Linux system without depending on the normal bootloader. This is useful if you don't want to install lilo on your system, another operating system removes lilo, or lilo doesn't work with your hardware configuration. A custom boot disk can also be used with the Red Hat rescue image, making it much easier to recover from severe system failures.\n"
"\n"
@@ -295,7 +317,7 @@ msgstr ""
"\n"
"是否为您的系统创建一张引导盘?"
-#: ../text.py:469
+#: ../text.py:532
msgid ""
"\n"
"On SMCC made Ultra machines floppy booting probably does not work\n"
@@ -305,60 +327,61 @@ msgstr ""
"软盘引导在 SMCC 制造的 Ultra 机器上可能无法工作\n"
"\n"
-#: ../text.py:472 ../text.py:682
+#: ../text.py:535 ../text.py:746
msgid "Bootdisk"
msgstr "引导盘"
-#: ../text.py:515
+#: ../text.py:578
msgid "X probe results"
msgstr "X 探测结果"
-#: ../text.py:534 ../text.py:553
+#: ../text.py:597 ../text.py:616
msgid "Unlisted Card"
msgstr "未列出的插卡"
-#: ../text.py:542
+#: ../text.py:605
msgid "Video Card Selection"
msgstr "选择视频卡"
-#: ../text.py:543
+#: ../text.py:606
msgid "Which video card do you have?"
msgstr "您使用的视频卡属于何种类型?"
-#: ../text.py:555
+#: ../text.py:618
msgid "X Server Selection"
msgstr "选择 X 服务器"
-#: ../text.py:555
+#: ../text.py:618
msgid "Choose a server"
msgstr "选择一台服务器"
-#: ../text.py:611
+#: ../text.py:674
msgid "Installation to begin"
msgstr "开始安装"
-#: ../iw/confirm.py:30 ../text.py:612
+#: ../iw/confirm.py:31 ../text.py:675
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:629 ../text.py:643 ../text.py:663
+#: ../text.py:692 ../text.py:707 ../text.py:727
msgid "Complete"
msgstr "完成"
-#: ../iw/congrats.py:31 ../text.py:630
+#: ../iw/congrats.py:32 ../text.py:693
+#, fuzzy
msgid ""
"Congratulations, installation is complete.\n"
"\n"
-"Remove the boot media and press return to reboot. For information on fixes which are available for this release of Red Hat Linux, consult the Errata available from http://www.redhat.com.\n"
+"Press return to reboot, and be sure to remove your boot medium as the system reboots, or your system will rerun the install. For information on fixes which are available for this release of Red Hat Linux, consult the Errata available from http://www.redhat.com/errata.\n"
"\n"
-"Information on configuring your system is available in the post install chapter of the Official Red Hat Linux User's Guide."
+"Information on configuring and using your Red Hat Linux system is contained in the Red Hat Linux manuals."
msgstr ""
"祝贺您!安装已完成。\n"
"\n"
"取出引导介质,然后按回车键以重新引导系统。 有关为此 Red Hat Linux 版本提供的校正信息,请查阅 http://www.redhat.com 上的勘误表。\n"
"《Red Hat Linux 正式版用户指南》中的“安装之后”一章提供了有关配置系统的信息。"
-#: ../text.py:644 ../text.py:664
+#: ../text.py:708 ../text.py:728
#, fuzzy
msgid ""
"Congratulations, configuration is complete.\n"
@@ -372,264 +395,268 @@ msgstr ""
"取出引导介质,然后按回车键以重新引导系统。 有关为此 Red Hat Linux 版本提供的校正信息,请查阅 http://www.redhat.com 上的勘误表。\n"
"《Red Hat Linux 正式版用户指南》中的“安装之后”一章提供了有关配置系统的信息。"
-#: ../iw/bootdisk.py:50 ../text.py:683
+#: ../iw/bootdisk.py:50 ../text.py:747
msgid "Insert a blank floppy in the first floppy drive. All data on this disk will be erased during creation of the boot disk."
msgstr "在第一个软盘驱动器中插入一张空白软盘。 创建引导盘的过程中将清除此软盘中的所有数据。"
-#: ../text.py:686 ../text.py:687 ../text.py:698 ../text.py:699 ../textw/lilo.py:26 ../textw/silo.py:25
+#: ../text.py:750 ../text.py:751 ../text.py:762 ../text.py:763 ../textw/lilo.py:30 ../textw/silo.py:25
msgid "Skip"
msgstr "跳过"
-#: ../iw/bootdisk.py:54 ../text.py:695
+#: ../iw/bootdisk.py:54 ../text.py:759
msgid "An error occured while making the boot disk. Please make sure that there is a formatted floppy in the first floppy drive."
msgstr "创建引导盘时出现错误。 请确保第一个软盘驱动器中的软盘已经过格式化。"
-#: ../text.py:757
+#: ../text.py:821
msgid "Package Installation"
msgstr "安装软件包"
-#: ../text.py:759
+#: ../text.py:823
msgid "Name : "
msgstr "名称: "
-#: ../text.py:760
+#: ../text.py:824
msgid "Size : "
msgstr "大小: "
-#: ../text.py:761
+#: ../text.py:825
msgid "Summary: "
msgstr "摘要: "
-#: ../text.py:787
+#: ../text.py:851
msgid " Packages"
msgstr " 软件包"
-#: ../text.py:788
+#: ../text.py:852
msgid " Bytes"
msgstr " 字节"
-#: ../text.py:789
+#: ../text.py:853
msgid " Time"
msgstr " 时间"
-#: ../text.py:791
+#: ../text.py:855
msgid "Total :"
msgstr "合计:"
-#: ../text.py:798
+#: ../text.py:862
msgid "Completed: "
msgstr "已完成: "
-#: ../text.py:808
+#: ../text.py:872
msgid "Remaining: "
msgstr "剩余: "
-#: ../text.py:897 ../text.py:898
+#: ../text.py:961 ../text.py:962
msgid "Debug"
msgstr "调试"
-#: ../text.py:910
+#: ../text.py:974
msgid "Red Hat Linux (C) 1999 Red Hat, Inc."
msgstr "Red Hat Linux (C) 1999 Red Hat, Inc."
-#: ../text.py:912
+#: ../text.py:976
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> 选项间切换 | <Space> 选择 | <F12> 下一屏幕"
-#: ../text.py:938 ../text.py:1004
+#: ../iw/welcome.py:11 ../iw/welcome.py:38 ../text.py:996 ../text.py:1031
+msgid "Welcome"
+msgstr ""
+
+#: ../text.py:1002 ../text.py:1070
msgid "Hostname Setup"
msgstr "主机名设置"
-#: ../text.py:940 ../text.py:1006
+#: ../text.py:1004 ../text.py:1072
msgid "Network Setup"
msgstr "网络设置"
-#: ../text.py:946 ../text.py:1012
+#: ../text.py:1010 ../text.py:1078
msgid "Time Zone Setup"
msgstr "时区设置"
-#: ../text.py:948 ../text.py:1014 ../textw/userauth.py:8
+#: ../text.py:1012 ../text.py:1080 ../textw/userauth.py:8
msgid "Root Password"
msgstr "根口令"
-#: ../text.py:950 ../text.py:1016 ../textw/userauth.py:148
+#: ../text.py:1014 ../text.py:1082 ../textw/userauth.py:152
msgid "User Account Setup"
msgstr "设置用户帐号"
-#: ../text.py:952 ../text.py:1018
+#: ../text.py:1016 ../text.py:1084
msgid "Authentication"
msgstr "验证"
-#: ../text.py:958
+#: ../text.py:1022
#, fuzzy
msgid "Configuration Complete"
msgstr "X 配置"
-#: ../iw/welcome.py:10 ../text.py:967
-msgid "Welcome"
-msgstr ""
-
-#: ../text.py:976 ../textw/silo.py:28 ../textw/silo.py:88 ../textw/silo.py:192
+#: ../text.py:1040 ../textw/silo.py:28 ../textw/silo.py:89 ../textw/silo.py:193
msgid "SILO Configuration"
msgstr "SILO 配置"
-#: ../text.py:982 ../textw/lilo.py:29 ../textw/lilo.py:76 ../textw/lilo.py:169
+#: ../text.py:1046 ../textw/lilo.py:33 ../textw/lilo.py:83 ../textw/lilo.py:176
msgid "LILO Configuration"
msgstr "LILO 配置"
-#: ../iw/lilo.py:104 ../iw/lilo.py:219 ../iw/silo.py:125 ../iw/silo.py:268 ../text.py:986 ../text.py:992
+#: ../iw/lilo.py:104 ../iw/lilo.py:223 ../iw/silo.py:125 ../iw/silo.py:269 ../text.py:1050 ../text.py:1056
msgid "Partition"
msgstr "分区"
-#: ../text.py:988
+#: ../text.py:1052
msgid "Manually Partition"
msgstr "手动分区"
-#: ../text.py:990
+#: ../text.py:1054
msgid "Automatic Partition"
msgstr "自动分区"
-#: ../text.py:994
+#: ../text.py:1058 ../textw/partitioning.py:252
+msgid "Root Filesystem Size"
+msgstr ""
+
+#: ../text.py:1060
msgid "Swap"
msgstr "交换"
-#: ../text.py:996
+#: ../text.py:1062
msgid "Filesystem Formatting"
msgstr "正在格式化文件系统"
-#: ../iw/mouse.py:55 ../text.py:1008 ../text.py:1010
+#: ../iw/mouse.py:55 ../text.py:1074 ../text.py:1076
msgid "Mouse Configuration"
msgstr "鼠标配置"
-#: ../text.py:1020
+#: ../text.py:1086
msgid "Package Groups"
msgstr "软件包分组"
-#: ../text.py:1022 ../text.py:1049
+#: ../text.py:1088 ../text.py:1116
msgid "Individual Packages"
msgstr "单独软件包"
-#: ../text.py:1024 ../textw/packages.py:114
+#: ../text.py:1090 ../textw/packages.py:114
msgid "Package Dependencies"
msgstr "软件包相关性"
-#: ../iw/xconfig.py:120 ../text.py:1026 ../text.py:1034
+#: ../iw/xconfig.py:249 ../text.py:1092 ../text.py:1100
msgid "X Configuration"
msgstr "X 配置"
-#: ../text.py:1028 ../text.py:1033 ../text.py:1050 ../text.py:1053
+#: ../text.py:1094 ../text.py:1099 ../text.py:1117 ../text.py:1120
msgid "Boot Disk"
msgstr "引导盘"
-#: ../text.py:1030
+#: ../text.py:1096
msgid "Installation Begins"
msgstr "开始安装"
-#: ../text.py:1032
+#: ../text.py:1098
msgid "Install System"
msgstr "安装系统"
-#: ../text.py:1036
+#: ../text.py:1102
msgid "Installation Complete"
msgstr "安装完成"
-#: ../text.py:1041
+#: ../text.py:1107
msgid "Examine System"
msgstr "检查系统"
-#: ../text.py:1048
+#: ../text.py:1114
msgid "Customize Upgrade"
msgstr "定制升级"
-#: ../text.py:1052
+#: ../text.py:1119
msgid "Upgrade System"
msgstr "升级系统"
-#: ../text.py:1054
+#: ../text.py:1121
msgid "Upgrade Complete"
msgstr "升级完成"
-#: ../text.py:1084
+#: ../text.py:1155
msgid "Cancelled"
msgstr "已取消"
-#: ../text.py:1085
+#: ../text.py:1156
msgid "I can't go to the previous step from here. You will have to try again."
msgstr "无法从此处返回上一步, 您必须重试。"
-#: ../todo.py:341
+#: ../todo.py:336
#, fuzzy, c-format
msgid "Error copying file: %s"
msgstr "安装 %s 时出现错误: %s"
-#: ../todo.py:480
+#: ../todo.py:482
msgid "Creating boot disk..."
msgstr "正在创建引导盘..."
-#: ../todo.py:627
+#: ../todo.py:635
msgid "Reading"
msgstr "正在读取"
-#: ../todo.py:628
+#: ../todo.py:636
msgid "Reading package information..."
msgstr "正在读取软件包信息..."
-#: ../todo.py:796 ../todo.py:806
+#: ../todo.py:811 ../todo.py:824
msgid "no suggestion"
msgstr "没有建议"
-#: ../todo.py:812
+#: ../todo.py:830
msgid "Searching"
msgstr "正在搜索"
-#: ../todo.py:813
+#: ../todo.py:831
msgid "Searching for Red Hat Linux installations..."
msgstr "正在搜索 Red Hat Linux 安装..."
-#: ../todo.py:824 ../todo.py:853
+#: ../todo.py:842 ../todo.py:873
#, c-format
msgid "Error mounting ext2 filesystem on %s: %s"
msgstr "在 %s 上安装 ext2 文件系统时出现错误: %s"
-#: ../todo.py:872
+#: ../todo.py:884
msgid "Finding"
msgstr "正在查找"
-#: ../todo.py:873
+#: ../todo.py:885
msgid "Finding packages to upgrade..."
msgstr "正在查找要升级的软件包..."
-#: ../todo.py:1056
+#: ../todo.py:1121
msgid "Processing"
msgstr "正在处理"
-#: ../todo.py:1057
+#: ../todo.py:1122
msgid "Preparing to install..."
msgstr "正在进行安装准备..."
-#: ../todo.py:1171
+#: ../todo.py:1236
msgid "Rebuilding"
msgstr "正在重建"
-#: ../todo.py:1172
+#: ../todo.py:1237
msgid "Rebuilding RPM database..."
msgstr "正在重建 RPM 数据库..."
-#: ../todo.py:1177
+#: ../todo.py:1242
msgid "Rebuild of RPM database failed. You may be out of disk space?"
msgstr "重建 RPM 数据库失败。 是否磁盘空间已满?"
-#: ../todo.py:1227
+#: ../todo.py:1292
#, c-format
msgid "Upgrading %s.\n"
msgstr "正在升级 %s。\n"
-#: ../todo.py:1229
+#: ../todo.py:1294
#, c-format
msgid "Installing %s.\n"
msgstr "正在安装 %s。\n"
-#: ../todo.py:1250
+#: ../todo.py:1315
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"
@@ -637,55 +664,55 @@ msgstr ""
"磁盘空间不足,无法安装已选定的软件包。 您需要更多的磁盘空间才能安装以下文件系统:\n"
"\n"
-#: ../todo.py:1253
+#: ../todo.py:1318
msgid "Mount Point"
msgstr "安装点"
-#: ../todo.py:1253
+#: ../todo.py:1318
msgid "Space Needed"
msgstr "所需空间"
-#: ../todo.py:1267
+#: ../todo.py:1331
msgid "Disk Space"
msgstr "磁盘空间"
-#: ../todo.py:1289
+#: ../todo.py:1355
msgid "Post Install"
msgstr "安装后"
-#: ../todo.py:1290
+#: ../todo.py:1356
msgid "Performing post install configuration..."
msgstr "正在执行安装后配置..."
-#: ../iw/xconfig.py:10 ../xf86config.py:241
+#: ../iw/xconfig.py:10 ../xf86config.py:248
msgid "Video Card"
msgstr "视频卡"
-#: ../iw/xconfig.py:12 ../xf86config.py:243
+#: ../iw/xconfig.py:12 ../xf86config.py:250
msgid "Video Ram"
msgstr "视频 Ram"
-#: ../xf86config.py:245
+#: ../xf86config.py:252
msgid "X server"
msgstr "x 服务器"
-#: ../xf86config.py:247
+#: ../xf86config.py:254
msgid "Unable to detect video card"
msgstr "无法检测到视频卡"
-#: ../iw/xconfig.py:11 ../xf86config.py:252 ../xf86config.py:254
+#: ../iw/xconfig.py:11 ../xf86config.py:261 ../xf86config.py:263
msgid "Monitor"
msgstr "显示器"
-#: ../xf86config.py:254
+#: ../xf86config.py:263
msgid "Plug and Play Monitor"
msgstr "即插即用显示器"
-#: ../xf86config.py:256
+#: ../xf86config.py:265
msgid "Horizontal frequency range"
msgstr "水平频率范围"
-#: ../xf86config.py:258
+#: ../xf86config.py:267
msgid "Vertical frequency range"
msgstr "垂直频率范围"
@@ -693,47 +720,62 @@ msgstr "垂直频率范围"
msgid "Account Configuration"
msgstr "帐号配置"
-#: ../iw/account.py:130
+#: ../iw/account.py:35
+#, fuzzy
+msgid "Root password accepted."
+msgstr "根口令: "
+
+#: ../iw/account.py:38
+#, fuzzy
+msgid "Root password is too short."
+msgstr "根口令: "
+
+#: ../iw/account.py:40
+#, fuzzy
+msgid "Root password does not match."
+msgstr "口令不符"
+
+#: ../iw/account.py:136
msgid "Root Password: "
msgstr "根口令: "
-#: ../iw/account.py:133
+#: ../iw/account.py:139
msgid "Confirm: "
msgstr "确认: "
-#: ../iw/account.py:184 ../iw/account.py:227
+#: ../iw/account.py:195 ../iw/account.py:234
msgid "Account Name"
msgstr "帐号名"
-#: ../iw/account.py:188 ../textw/userauth.py:80
+#: ../iw/account.py:199 ../textw/userauth.py:79
msgid "Password"
msgstr "口令"
-#: ../iw/account.py:192 ../textw/userauth.py:81
+#: ../iw/account.py:203 ../textw/userauth.py:80
msgid "Password (confirm)"
msgstr "口令(确认)"
-#: ../iw/account.py:196 ../iw/account.py:227 ../textw/userauth.py:79 ../textw/userauth.py:160
+#: ../iw/account.py:207 ../iw/account.py:234 ../textw/userauth.py:78 ../textw/userauth.py:164
msgid "Full Name"
msgstr "全称"
-#: ../iw/account.py:205 ../libfdisk/newtfsedit.c:1298 ../textw/userauth.py:171
+#: ../iw/account.py:216 ../libfdisk/newtfsedit.c:1298 ../textw/userauth.py:175
msgid "Add"
msgstr "添加"
-#: ../iw/account.py:207 ../libfdisk/newtfsedit.c:1291 ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:160 ../textw/lilo.py:182 ../textw/partitioning.py:62 ../textw/silo.py:184 ../textw/silo.py:206 ../textw/userauth.py:172
+#: ../iw/account.py:218 ../libfdisk/newtfsedit.c:1291 ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:167 ../textw/lilo.py:189 ../textw/partitioning.py:62 ../textw/silo.py:185 ../textw/silo.py:207 ../textw/userauth.py:176
msgid "Edit"
msgstr "编辑"
-#: ../iw/account.py:209 ../libfdisk/newtfsedit.c:1291 ../libfdisk/newtfsedit.c:1299 ../textw/userauth.py:171
+#: ../iw/account.py:220 ../libfdisk/newtfsedit.c:1291 ../libfdisk/newtfsedit.c:1299 ../textw/userauth.py:175
msgid "Delete"
msgstr "删除"
-#: ../iw/account.py:211
+#: ../iw/account.py:222
msgid "New"
msgstr "新建"
-#: ../iw/auth.py:11 ../textw/userauth.py:246
+#: ../iw/auth.py:11 ../textw/userauth.py:250
msgid "Authentication Configuration"
msgstr "验证配置"
@@ -745,7 +787,7 @@ msgstr "启用 MD5 口令"
msgid "Enable shadow passwords"
msgstr "启用屏蔽口令"
-#: ../iw/auth.py:53 ../textw/userauth.py:251
+#: ../iw/auth.py:53 ../textw/userauth.py:255
msgid "Enable NIS"
msgstr "启用 NIS"
@@ -773,19 +815,19 @@ msgstr "跳过创建引导盘"
msgid "About to Install"
msgstr "安装须知"
-#: ../iw/confirm.py:27
+#: ../iw/confirm.py:28
msgid "Click next to begin installation of Red Hat Linux."
msgstr "单击“下一步”以开始安装 Red Hat Linux。"
-#: ../iw/congrats.py:11 ../iw/congrats.py:54
+#: ../iw/congrats.py:11 ../iw/congrats.py:58
msgid "Congratulations"
msgstr "祝贺您"
-#: ../iw/congrats.py:13 ../iw/congrats.py:56
+#: ../iw/congrats.py:13 ../iw/congrats.py:60
msgid "Exit"
msgstr "退出"
-#: ../iw/congrats.py:76
+#: ../iw/congrats.py:80
#, fuzzy
msgid ""
"Congratulations, configuration is complete.\n"
@@ -819,7 +861,7 @@ msgstr "安装软件包以满足相关性"
msgid "Upgrade Examine"
msgstr "升级检查"
-#: ../iw/examine.py:34
+#: ../iw/examine.py:35
msgid ""
"You don't have any Linux partitions.\n"
" You can't upgrade this sytem!"
@@ -827,7 +869,7 @@ msgstr ""
"没有任何 Linux 分区,\n"
"无法升级本系统!"
-#: ../iw/examine.py:59
+#: ../iw/examine.py:60
msgid "Customize packages to be upgraded"
msgstr "定制要升级的软件包"
@@ -835,7 +877,7 @@ msgstr "定制要升级的软件包"
msgid "fdisk"
msgstr "fdisk"
-#: ../iw/fdisk.py:79
+#: ../iw/fdisk.py:80
msgid "Select drive to run fdisk on"
msgstr "选择要运行 fdisk 命令的驱动器"
@@ -843,7 +885,7 @@ msgstr "选择要运行 fdisk 命令的驱动器"
msgid "Choose partitions to Format"
msgstr "选择要格式化的分区"
-#: ../iw/format.py:43
+#: ../iw/format.py:47
msgid "Check for bad blocks while formatting"
msgstr "格式化期间检查磁盘坏块"
@@ -855,7 +897,7 @@ msgstr "GNOME 工作站"
msgid "KDE Workstation"
msgstr "KDE 工作站"
-#: ../iw/installpath.py:42 ../libfdisk/gnomefsedit.c:2213 ../libfdisk/gnomefsedit.c:2233
+#: ../iw/installpath.py:42 ../libfdisk/gnomefsedit.c:2222 ../libfdisk/gnomefsedit.c:2242
msgid "Server"
msgstr "服务器"
@@ -863,19 +905,19 @@ msgstr "服务器"
msgid "Custom"
msgstr "定制"
-#: ../iw/installpath.py:92
+#: ../iw/installpath.py:93
msgid "Install Type"
msgstr "安装类型"
-#: ../iw/installpath.py:173
+#: ../iw/installpath.py:181
msgid "Install"
msgstr "安装"
-#: ../iw/installpath.py:175
+#: ../iw/installpath.py:183
msgid "Upgrade"
msgstr "升级"
-#: ../iw/installpath.py:228
+#: ../iw/installpath.py:236
msgid "Use fdisk"
msgstr "使用 fdisk"
@@ -883,23 +925,31 @@ msgstr "使用 fdisk"
msgid "Keyboard Configuration"
msgstr "键盘配置"
-#: ../iw/keyboard.py:55
+#: ../iw/keyboard.py:56
msgid "Model"
msgstr "类型"
-#: ../iw/keyboard.py:74
+#: ../iw/keyboard.py:75
msgid "Layout"
msgstr "布局"
-#: ../iw/keyboard.py:93
-msgid "Variant"
-msgstr "变量"
+#: ../iw/keyboard.py:94
+msgid "Dead Keys"
+msgstr ""
+
+#: ../iw/keyboard.py:103
+msgid "Enable dead keys"
+msgstr ""
+
+#: ../iw/keyboard.py:104
+msgid "Disable dead keys"
+msgstr ""
-#: ../iw/keyboard.py:108
+#: ../iw/keyboard.py:113
msgid "Test your selection here:"
msgstr "在此处测试您的选择:"
-#: ../iw/language.py:16 ../loader/lang.c:268
+#: ../iw/language.py:21 ../loader/lang.c:267
msgid "What language should be used during the installation process?"
msgstr "安装过程中应使用何种语言?"
@@ -907,47 +957,47 @@ msgstr "安装过程中应使用何种语言?"
msgid "Lilo Configuration"
msgstr "Lilo 配置"
-#: ../iw/lilo.py:109 ../iw/lilo.py:220 ../iw/silo.py:130 ../iw/silo.py:269
+#: ../iw/lilo.py:109 ../iw/lilo.py:224 ../iw/silo.py:130 ../iw/silo.py:270
msgid "Type"
msgstr "类型"
-#: ../iw/lilo.py:140
+#: ../iw/lilo.py:144
msgid "Install LILO boot record on:"
msgstr "LILO 引导记录安装位置:"
-#: ../iw/lilo.py:147 ../iw/silo.py:166 ../textw/silo.py:60
+#: ../iw/lilo.py:151 ../iw/silo.py:167 ../textw/silo.py:61
msgid "Master Boot Record (MBR)"
msgstr "主引导记录 (MBR)"
-#: ../iw/lilo.py:151 ../iw/silo.py:169 ../textw/silo.py:61
+#: ../iw/lilo.py:155 ../iw/silo.py:170 ../textw/silo.py:62
msgid "First sector of boot partition"
msgstr "引导分区的第一个扇区"
-#: ../iw/lilo.py:155 ../textw/lilo.py:20
+#: ../iw/lilo.py:159 ../textw/lilo.py:24
msgid "Use linear mode (needed for some SCSI drives)"
msgstr "使用线性模式(某些 SCSI 驱动器需要使用)"
-#: ../iw/lilo.py:165 ../iw/silo.py:196
+#: ../iw/lilo.py:169 ../iw/silo.py:197
msgid "Kernel parameters"
msgstr "内核参数"
-#: ../iw/lilo.py:182 ../iw/silo.py:214
+#: ../iw/lilo.py:186 ../iw/silo.py:215
msgid "Create boot disk"
msgstr "创建引导盘"
-#: ../iw/lilo.py:186
+#: ../iw/lilo.py:190
msgid "Do not install LILO"
msgstr "不安装 LILO"
-#: ../iw/lilo.py:197 ../iw/silo.py:245 ../textw/lilo.py:151 ../textw/silo.py:175
+#: ../iw/lilo.py:201 ../iw/silo.py:246 ../textw/lilo.py:158 ../textw/silo.py:176
msgid "Default"
msgstr "缺省"
-#: ../iw/lilo.py:197 ../iw/silo.py:245 ../textw/lilo.py:151 ../textw/silo.py:175
+#: ../iw/lilo.py:201 ../iw/silo.py:246 ../textw/lilo.py:158 ../textw/silo.py:176
msgid "Partition type"
msgstr "分区类型"
-#: ../iw/lilo.py:197 ../iw/lilo.py:231 ../iw/silo.py:245 ../iw/silo.py:280 ../textw/lilo.py:93 ../textw/lilo.py:151 ../textw/silo.py:119 ../textw/silo.py:175
+#: ../iw/lilo.py:201 ../iw/lilo.py:235 ../iw/silo.py:246 ../iw/silo.py:281 ../textw/lilo.py:100 ../textw/lilo.py:158 ../textw/silo.py:120 ../textw/silo.py:176
msgid "Boot label"
msgstr "引导卷标"
@@ -967,11 +1017,11 @@ msgstr "启动引导"
msgid "IP Address"
msgstr "IP 地址"
-#: ../iw/network.py:164 ../loader/net.c:620
+#: ../iw/network.py:164 ../loader/net.c:628
msgid "Netmask"
msgstr "网络掩码"
-#: ../iw/network.py:165 ../loader/loader.c:240
+#: ../iw/network.py:165 ../loader/loader.c:236
msgid "Network"
msgstr "网络"
@@ -1079,11 +1129,24 @@ 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 okay?"
msgstr "如果本机内存不足,则必须立即打开交换空间。要执行此操作,必须将新分区表立即写入磁盘。是否执行?"
-#: ../iw/rootpartition.py:98 ../textw/partitioning.py:121
+#: ../iw/rootpartition.py:114 ../textw/partitioning.py:253
+#, c-format
+msgid "You've chosen to put your root filesystem in a file on an already-existing DOS or Windows filesystem. How large, in megabytes, should would you like the root filesystem to be, and how much swap space would you like? They must total less then %d megabytes in size."
+msgstr ""
+
+#: ../iw/rootpartition.py:134
+msgid "Root filesystem size:"
+msgstr ""
+
+#: ../iw/rootpartition.py:139
+msgid "Swap space size:"
+msgstr ""
+
+#: ../iw/rootpartition.py:158 ../textw/partitioning.py:121
msgid "Automatic Partitioning"
msgstr "自动分区"
-#: ../iw/rootpartition.py:164 ../textw/partitioning.py:122
+#: ../iw/rootpartition.py:224 ../textw/partitioning.py:122
#, c-format
msgid ""
"%s\n"
@@ -1094,11 +1157,11 @@ msgstr ""
"\n"
"如果不想执行自动分区,则可以采用手动分区以继续安装;或者也可以返回并执行完全定制的安装。"
-#: ../iw/rootpartition.py:178
+#: ../iw/rootpartition.py:238
msgid "Remove data"
msgstr "删除数据"
-#: ../iw/rootpartition.py:181 ../textw/partitioning.py:126
+#: ../iw/rootpartition.py:241 ../textw/partitioning.py:126
msgid "Manually partition"
msgstr "手动分区"
@@ -1106,19 +1169,19 @@ msgstr "手动分区"
msgid "Silo Configuration"
msgstr "Silo 配置"
-#: ../iw/silo.py:161
+#: ../iw/silo.py:162
msgid "Install SILO boot record on:"
msgstr "SILO 引导记录安装位置:"
-#: ../iw/silo.py:174
+#: ../iw/silo.py:175
msgid "Create PROM alias"
msgstr "创建 PROM 别名"
-#: ../iw/silo.py:192
+#: ../iw/silo.py:193
msgid "Set default PROM boot device to linux"
msgstr "设置 Linux 的缺省 PROM 引导设备"
-#: ../iw/silo.py:224
+#: ../iw/silo.py:225
msgid "Do not install SILO"
msgstr "不安装 SILO"
@@ -1146,6 +1209,11 @@ msgstr "位置"
msgid "UTC Offset"
msgstr "UTC 偏移"
+#: ../iw/welcome.py:80
+#, fuzzy
+msgid "Would you like to configure your system?"
+msgstr "是否要设置联网?"
+
#: ../iw/xconfig.py:13
msgid "Horizontal Frequency Range"
msgstr "水平频率范围"
@@ -1158,7 +1226,7 @@ msgstr "垂直频率范围"
msgid "Test failed"
msgstr "测试失败"
-#: ../iw/xconfig.py:23 ../iw/xconfig.py:258
+#: ../iw/xconfig.py:23 ../iw/xconfig.py:398
msgid "Customize X Configuration"
msgstr "定制 X 配置"
@@ -1166,51 +1234,62 @@ msgstr "定制 X 配置"
msgid "Bits per Pixel"
msgstr "单位象素的位数"
-#: ../iw/xconfig.py:97 ../iw/xconfig.py:254
+#: ../iw/xconfig.py:97 ../iw/xconfig.py:394
msgid "Test this configuration"
msgstr "测试此配置"
-#: ../iw/xconfig.py:201
-msgid "In most cases your video hardware can be probed to automatically determine the best settings for your display."
-msgstr "系统通常可以探测视频硬件,以自动确定适用于显示器的最佳设置。"
+#: ../iw/xconfig.py:112
+#, fuzzy
+msgid "Monitor Configuration"
+msgstr "Lilo 配置"
-#: ../iw/xconfig.py:209
-msgid "Autoprobe results:"
-msgstr "自动探测结果:"
+#: ../iw/xconfig.py:215
+#, fuzzy
+msgid "Horizontal Sync"
+msgstr "水平频率范围"
#: ../iw/xconfig.py:224
-msgid "Your monitor could not be autodetected. Please choose it from the list below:"
+msgid "Vertical Sync"
+msgstr ""
+
+#: ../iw/xconfig.py:318
+#, fuzzy
+msgid "Your video ram size can not be autodetected. Choose your video ram size from the choices below:"
msgstr "无法自动检测到您的显示器,请在以下列表中选择:"
-#: ../iw/xconfig.py:261
+#: ../iw/xconfig.py:329
+msgid "In most cases your video hardware can be probed to automatically determine the best settings for your display."
+msgstr "系统通常可以探测视频硬件,以自动确定适用于显示器的最佳设置。"
+
+#: ../iw/xconfig.py:350
+msgid "If the probed settings do not match your hardware select the correct setting below:"
+msgstr ""
+
+#: ../iw/xconfig.py:403
msgid "Use Graphical Login"
msgstr "使用图形登录"
-#: ../iw/xconfig.py:263
+#: ../iw/xconfig.py:404
msgid "Skip X Configuration"
msgstr "跳过 X 配置"
-#: ../textw/lilo.py:14 ../textw/silo.py:14
+#: ../textw/lilo.py:18 ../textw/silo.py:14
msgid "A few systems will need to pass special options to the kernel at boot time for the system to function properly. If you need to pass boot options to the kernel, enter them now. If you don't need any or aren't sure, leave this blank."
msgstr "在引导过程中,某些系统需要将特殊选项传递至内核才能正常运行。如果需要将引导选项传递至内核,请现在输入这些选项;如果不需要或无法确定,请将此项保留为空白。"
-#: ../textw/lilo.py:77 ../textw/silo.py:90
+#: ../textw/lilo.py:84 ../textw/silo.py:91
msgid "Where do you want to install the bootloader?"
msgstr "您想在何处安装引导装载程序?"
-#: ../textw/lilo.py:97 ../textw/lilo.py:118 ../textw/silo.py:123 ../textw/silo.py:144
+#: ../textw/lilo.py:104 ../textw/lilo.py:125 ../textw/silo.py:124 ../textw/silo.py:145
msgid "Clear"
msgstr "清除"
-#: ../libfdisk/gnomefsedit.c:677 ../libfdisk/gnomefsedit.c:1646 ../libfdisk/gnomefsedit.c:2145 ../libfdisk/newtfsedit.c:463 ../libfdisk/newtfsedit.c:1496 ../loader/devices.c:168 ../loader/loader.c:1730 ../textw/lilo.py:97 ../textw/lilo.py:115 ../textw/silo.py:123 ../textw/silo.py:141 ../textw/userauth.py:62
-msgid "Cancel"
-msgstr "取消"
-
-#: ../textw/lilo.py:105 ../textw/silo.py:131
+#: ../textw/lilo.py:112 ../textw/silo.py:132
msgid "Edit Boot Label"
msgstr "编辑引导卷标"
-#: ../textw/lilo.py:164 ../textw/silo.py:187
+#: ../textw/lilo.py:171 ../textw/silo.py:188
msgid "The boot manager Red Hat uses can boot other operating systems as well. You need to tell me what partitions you would like to be able to boot and what label you want to use for each of them."
msgstr "Red Hat 使用的引导管理程序也可以引导其它操作系统。您必须输入希望能够引导的分区,以及用于其中每一个分区的卷标。"
@@ -1236,7 +1315,7 @@ msgstr ""
msgid "To install Red Hat Linux, you must have at least one partition of 150 MB dedicated to Linux. We suggest placing that partition on one of the first two hard drives in your system so you can boot into Linux with LILO."
msgstr "要安装 Red Hat Linux,您必须具有一个至少 150 MB 的分区以专用于 Linux。建议在系统前两个硬盘驱动器之一中划出该分区,以便可以使用 LILO 引导至 Linux。"
-#: ../loader/loader.c:303 ../loader/loader.c:328 ../textw/partitioning.py:62
+#: ../loader/loader.c:299 ../loader/loader.c:324 ../textw/partitioning.py:62
msgid "Done"
msgstr "完成"
@@ -1248,19 +1327,41 @@ msgstr "继续"
msgid "What partitions would you like to format? We strongly suggest formatting all of the system partitions, including /, /usr, and /var. There is no need to format /home or /usr/local if they have already been configured during a previous install."
msgstr "您希望对哪个分区执行格式化?郑重建议格式化所有系统分区,包括 /、/usr 和 /var。如果在上一次安装过程中已配置 /home 或 /usr/local,则无需对它们执行格式化。"
-#: ../textw/partitioning.py:204
+#: ../textw/partitioning.py:208
msgid "Check for bad blocks during format"
msgstr "格式化过程中检查磁盘坏块"
-#: ../textw/partitioning.py:209
+#: ../textw/partitioning.py:213
msgid "Choose Partitions to Format"
msgstr "选择要格式化的分区"
-#: ../textw/silo.py:62
+#: ../textw/partitioning.py:258
+msgid "Root filesystem size"
+msgstr ""
+
+#: ../textw/partitioning.py:259
+msgid "Swap space"
+msgstr ""
+
+#: ../textw/partitioning.py:268 ../textw/partitioning.py:274
+#, fuzzy
+msgid "Bad Size"
+msgstr "大小"
+
+#: ../textw/partitioning.py:269
+msgid "The size you enter must be a number."
+msgstr ""
+
+#: ../textw/partitioning.py:275
+#, c-format
+msgid "The total size must be smaller then the amount of free space on the disk, which is %d megabytes."
+msgstr ""
+
+#: ../textw/silo.py:63
msgid "Create PROM alias `linux'"
msgstr "创建 PROM 别名 `linux'"
-#: ../textw/silo.py:63
+#: ../textw/silo.py:64
msgid "Set default PROM boot device"
msgstr "设置缺省 PROM 引导设备"
@@ -1276,7 +1377,7 @@ msgstr "是否将硬件时钟设置为 GMT?"
msgid "Pick a root password. You must type it twice to ensure you know what it is and didn't make a mistake in typing. Remember that the root password is a critical part of system security!"
msgstr "设定一个根口令。您必须键入两次,以记住该口令并确保无键入错误。请记住,根口令是确保系统安全的一项重要措施!"
-#: ../loader/urls.c:317 ../textw/userauth.py:23
+#: ../loader/urls.c:337 ../textw/userauth.py:23
msgid "Password:"
msgstr "口令:"
@@ -1284,7 +1385,7 @@ msgstr "口令:"
msgid "Password (again):"
msgstr "口令(再次键入):"
-#: ../textw/userauth.py:40 ../textw/userauth.py:91
+#: ../textw/userauth.py:40 ../textw/userauth.py:95
msgid "Password Length"
msgstr "口令长度"
@@ -1292,11 +1393,11 @@ msgstr "口令长度"
msgid "The root password must be at least 6 characters long."
msgstr "根口令最少应包含 6 个字符。"
-#: ../textw/userauth.py:45 ../textw/userauth.py:99
+#: ../textw/userauth.py:45 ../textw/userauth.py:103
msgid "Password Mismatch"
msgstr "口令不符"
-#: ../textw/userauth.py:46 ../textw/userauth.py:100
+#: ../textw/userauth.py:46 ../textw/userauth.py:104
msgid "The passwords you entered were different. Please try again."
msgstr "输入的口令不符,请再次输入。"
@@ -1308,76 +1409,86 @@ msgstr "编辑用户"
msgid "Add User"
msgstr "添加用户"
-#: ../textw/userauth.py:78
+#: ../textw/userauth.py:77
msgid "User ID"
msgstr "用户 ID"
-#: ../textw/userauth.py:92
+#: ../textw/userauth.py:90
+#, fuzzy
+msgid "Missing User ID"
+msgstr "用户 ID"
+
+#: ../textw/userauth.py:91
+#, fuzzy
+msgid "You must provide a user ID"
+msgstr "您必须输入服务器名称。"
+
+#: ../textw/userauth.py:96
msgid "The password must be at least 6 characters long."
msgstr "口令最少应包含 6 个字符。"
-#: ../textw/userauth.py:109
+#: ../textw/userauth.py:113
msgid "User Exists"
msgstr "用户已存在"
-#: ../textw/userauth.py:110
+#: ../textw/userauth.py:114
msgid "This user id already exists. Choose another."
msgstr "此用户 ID 已存在,请选择另一个用户。"
-#: ../textw/userauth.py:137
+#: ../textw/userauth.py:141
msgid "You should use a normal user account for most activities on your system. By not using the root account casually, you'll reduce the chance of disrupting your system's configuration."
msgstr "对于系统的大多数活动,均应使用正常用户帐号。只要不随意使用根帐号,就可以减少破坏系统配置的机会。"
-#: ../textw/userauth.py:150
+#: ../textw/userauth.py:154
msgid "What user account would you like to have on the system? You should have at least one non-root account for normal work, but multi-user systems can have any number of accounts set up."
msgstr "您要在系统上使用哪一个用户帐号?您至少应具有一个非根帐号以用于日常工作,但是多用户系统则可以具有任意数量的帐号设置。"
-#: ../textw/userauth.py:160
+#: ../textw/userauth.py:164
msgid "User name"
msgstr "用户名"
-#: ../textw/userauth.py:184
+#: ../textw/userauth.py:188
msgid "Enter the information for the user."
msgstr "输入用户信息。"
-#: ../textw/userauth.py:196
+#: ../textw/userauth.py:200
msgid "Change the information for this user."
msgstr "更改此用户的信息。"
-#: ../textw/userauth.py:247
+#: ../textw/userauth.py:251
msgid "Use Shadow Passwords"
msgstr "使用屏蔽口令"
-#: ../textw/userauth.py:249
+#: ../textw/userauth.py:253
msgid "Enable MD5 Passwords"
msgstr "启用 MD5 口令"
-#: ../textw/userauth.py:256
+#: ../textw/userauth.py:260
msgid "NIS Domain:"
msgstr "NIS 域:"
-#: ../textw/userauth.py:258
+#: ../textw/userauth.py:262
msgid "NIS Server:"
msgstr "NIS 服务器:"
-#: ../textw/userauth.py:260
+#: ../textw/userauth.py:264
msgid "or use:"
msgstr "或使用:"
-#: ../textw/userauth.py:263
+#: ../textw/userauth.py:267
msgid "Request server via broadcast"
msgstr "通过广播请求服务器"
-#: ../libfdisk/fsedit.c:645 ../libfdisk/fsedit.c:652 ../libfdisk/fsedit.c:659 ../libfdisk/fsedit.c:668 ../libfdisk/fsedit.c:694 ../libfdisk/fsedit.c:704
+#: ../libfdisk/fsedit.c:669 ../libfdisk/fsedit.c:676 ../libfdisk/fsedit.c:683 ../libfdisk/fsedit.c:692 ../libfdisk/fsedit.c:719 ../libfdisk/fsedit.c:729
msgid "Bad Mount Point"
msgstr "安装点错误"
-#: ../libfdisk/fsedit.c:646
+#: ../libfdisk/fsedit.c:670
#, c-format
msgid "The %s directory must be on the root filesystem."
msgstr "%s 目录必须位于根文件系统上。"
-#: ../libfdisk/fsedit.c:653
+#: ../libfdisk/fsedit.c:677
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1388,7 +1499,7 @@ msgstr ""
"\n"
"安装点起始处必须使用前导 /。"
-#: ../libfdisk/fsedit.c:660
+#: ../libfdisk/fsedit.c:684
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1399,7 +1510,7 @@ msgstr ""
"\n"
"安装点结束处不能使用 /。"
-#: ../libfdisk/fsedit.c:669
+#: ../libfdisk/fsedit.c:693
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1410,11 +1521,11 @@ msgstr ""
"\n"
"安装点可能仅使用可印字符。"
-#: ../libfdisk/fsedit.c:678
+#: ../libfdisk/fsedit.c:703
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:695
+#: ../libfdisk/fsedit.c:720
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1425,7 +1536,7 @@ msgstr ""
"\n"
"系统分区必须在 Linux 本机分区上。"
-#: ../libfdisk/fsedit.c:705
+#: ../libfdisk/fsedit.c:730
#, c-format
msgid ""
"The mount point %s is illegal.\n"
@@ -1436,62 +1547,62 @@ msgstr ""
"\n"
"/usr 必须在 Linux 本机分区或者 NFS 卷上。"
-#: ../libfdisk/fsedit.c:733
+#: ../libfdisk/fsedit.c:758
msgid "Too Many Drives"
msgstr "驱动器太多"
-#: ../libfdisk/fsedit.c:734
+#: ../libfdisk/fsedit.c:759
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:749
+#: ../libfdisk/fsedit.c:774
msgid "No Drives Found"
msgstr "未找到驱动器"
-#: ../libfdisk/fsedit.c:750
+#: ../libfdisk/fsedit.c:775
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:1023 ../libfdisk/fsedit.c:1093
+#: ../libfdisk/fsedit.c:1085 ../libfdisk/fsedit.c:1147
#, c-format
msgid "An error occurred reading the partition table for the block device %s. The error was"
msgstr "读取成块设备 %s 的分区表时出现错误。错误为"
-#: ../libfdisk/fsedit.c:1066
+#: ../libfdisk/fsedit.c:1124
#, 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:1071
+#: ../libfdisk/fsedit.c:1129
msgid "Bad Partition Table"
msgstr "分区表错误"
-#: ../libfdisk/fsedit.c:1072
+#: ../libfdisk/fsedit.c:1130
msgid "Initialize"
msgstr "初始化"
-#: ../libfdisk/fsedit.c:1072 ../libfdisk/fsedit.c:1097
+#: ../libfdisk/fsedit.c:1130 ../libfdisk/fsedit.c:1151
msgid "Skip Drive"
msgstr "跳过驱动器"
-#: ../libfdisk/fsedit.c:1097 ../loader/net.c:329
+#: ../libfdisk/fsedit.c:1151 ../loader/net.c:329
msgid "Retry"
msgstr "重试"
-#: ../libfdisk/fsedit.c:1109
+#: ../libfdisk/fsedit.c:1163
msgid "BSD Disklabel"
msgstr "BSD 磁盘卷标"
-#: ../libfdisk/fsedit.c:1109
+#: ../libfdisk/fsedit.c:1163
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:1139
+#: ../libfdisk/fsedit.c:1193
#, c-format
msgid "System error %d"
msgstr "系统错误 %d"
-#: ../libfdisk/fsedit.c:1148 ../libfdisk/fsedit.c:1150
+#: ../libfdisk/fsedit.c:1202 ../libfdisk/fsedit.c:1204
msgid "Fdisk Error"
msgstr "Fdisk 错误"
@@ -1575,11 +1686,11 @@ msgstr "分区大小错误"
msgid "The size requested is illegal. Make sure the size is greater and zero (0), and is specified int decimal (base 10) format."
msgstr "请求的分区大小非法。请确保分区大小大于零 (0),并已指定为十进制(以 10 为基数)整数格式。"
-#: ../libfdisk/gnomefsedit.c:1091 ../libfdisk/gnomefsedit.c:1984 ../libfdisk/newtfsedit.c:576
+#: ../libfdisk/gnomefsedit.c:1091 ../libfdisk/gnomefsedit.c:1993 ../libfdisk/newtfsedit.c:576
msgid "Swap Size Error"
msgstr "交换分区大小错误"
-#: ../libfdisk/gnomefsedit.c:1092 ../libfdisk/gnomefsedit.c:1985 ../libfdisk/newtfsedit.c:577
+#: ../libfdisk/gnomefsedit.c:1092 ../libfdisk/gnomefsedit.c:1994 ../libfdisk/newtfsedit.c:577
#, c-format
msgid "You have created a swap partition which is too large. The maximum size of a swap partition is %ld Megabytes."
msgstr "创建的交换分区过大。交换分区大小不能超过 %ld MB。"
@@ -1616,7 +1727,7 @@ msgid "The raid device /dev/%s now contains partitions which are unallocated. Th
msgstr "RAID 设备 /dev/%s 包含未分配的分区,此设备 /dev/%s 将被分解至其各个组成分区。请使用已分配分区以重组 RAID 设备。"
#. build list of why they all failed
-#: ../libfdisk/gnomefsedit.c:1390 ../libfdisk/gnomefsedit.c:1409 ../libfdisk/newtfsedit.c:81 ../libfdisk/newtfsedit.c:1477
+#: ../libfdisk/gnomefsedit.c:1390 ../libfdisk/gnomefsedit.c:1409 ../libfdisk/newtfsedit.c:81 ../libfdisk/newtfsedit.c:1478
msgid "Unallocated Partitions"
msgstr "未分配分区"
@@ -1689,105 +1800,114 @@ msgstr "/boot RAID 类型非法"
msgid "Boot partitions (/boot) are only allowed on RAID-1."
msgstr "引导分区 (/boot) 仅允许指定在 RAID-1 上。"
-#: ../libfdisk/gnomefsedit.c:2029
+#: ../libfdisk/gnomefsedit.c:1953
+#, fuzzy
+msgid "Illegal RAID mountpoint"
+msgstr "/boot RAID 类型非法"
+
+#: ../libfdisk/gnomefsedit.c:1955
+msgid "RAID partitions cannot be mounted as root (/) on Alpha."
+msgstr ""
+
+#: ../libfdisk/gnomefsedit.c:2038
#, c-format
msgid "The partition %s is a pre-existing partition in the set of partitions for this RAID device. The mount point is set to /boot. Are you sure that it is possible to boot from this partition?"
msgstr "在用于此 RAID 设备的分区集中,分区 %s 是先前存在的分区。安装点设置为 /boot。是否确定可以从此分区中引导?"
-#: ../libfdisk/gnomefsedit.c:2036
+#: ../libfdisk/gnomefsedit.c:2045
msgid "Use Pre-existing Partition?"
msgstr "是否使用先前存在的分区?"
-#: ../libfdisk/gnomefsedit.c:2145
+#: ../libfdisk/gnomefsedit.c:2154
msgid "Auto-Partition"
msgstr "自动分区"
-#: ../libfdisk/gnomefsedit.c:2152
+#: ../libfdisk/gnomefsedit.c:2161
msgid "Using Existing Disk Space"
msgstr "使用现有的磁盘空间"
-#: ../libfdisk/gnomefsedit.c:2171
+#: ../libfdisk/gnomefsedit.c:2180
msgid "Remove Linux partitions"
msgstr "删除 Linux 分区"
-#: ../libfdisk/gnomefsedit.c:2182
+#: ../libfdisk/gnomefsedit.c:2191
msgid "Use existing free space"
msgstr "使用现有的可用空间"
#. workstation or server?
-#: ../libfdisk/gnomefsedit.c:2194
+#: ../libfdisk/gnomefsedit.c:2203
msgid "Intended Use"
msgstr "预定使用"
-#: ../libfdisk/gnomefsedit.c:2233
+#: ../libfdisk/gnomefsedit.c:2242
msgid "Workstation"
msgstr "工作站"
-#: ../libfdisk/gnomefsedit.c:2307
+#: ../libfdisk/gnomefsedit.c:2316
msgid "Delete RAID Device?"
msgstr "是否删除 RAID 设备?"
-#: ../libfdisk/gnomefsedit.c:2308
+#: ../libfdisk/gnomefsedit.c:2317
msgid "Are you sure you want to remove this RAID device?"
msgstr "是否确定要删除此 RAID 设备?"
-#: ../libfdisk/gnomefsedit.c:2359 ../libfdisk/newtfsedit.c:1580
+#: ../libfdisk/gnomefsedit.c:2368 ../libfdisk/newtfsedit.c:1581
msgid "Reset Partition Table"
msgstr "重置分区表"
-#: ../libfdisk/gnomefsedit.c:2361 ../libfdisk/newtfsedit.c:1582
+#: ../libfdisk/gnomefsedit.c:2370 ../libfdisk/newtfsedit.c:1583
msgid "Reset partition table to original contents? "
msgstr "是否将分区表重置为原始内容? "
-#: ../libfdisk/gnomefsedit.c:2397 ../libfdisk/gnomefsedit.c:2448
+#: ../libfdisk/gnomefsedit.c:2406 ../libfdisk/gnomefsedit.c:2457
msgid "<Swap>"
msgstr "<交换>"
-#: ../libfdisk/gnomefsedit.c:2399
+#: ../libfdisk/gnomefsedit.c:2408
msgid "<RAID>"
msgstr "<RAID>"
-#: ../libfdisk/gnomefsedit.c:2401
+#: ../libfdisk/gnomefsedit.c:2410
msgid "<not set>"
msgstr "<未设置>"
-#: ../libfdisk/gnomefsedit.c:3085
+#: ../libfdisk/gnomefsedit.c:3076
msgid "Unallocated Partitions Exist..."
msgstr "存在未分配分区..."
-#: ../libfdisk/gnomefsedit.c:3091 ../libfdisk/gnomefsedit.c:3105
+#: ../libfdisk/gnomefsedit.c:3082 ../libfdisk/gnomefsedit.c:3096
msgid "You must assign a root (/) partition to a Linux native partition (ext2) or a RAID partition for the install to proceed."
msgstr "您必须将一个根 (/) 分区分配至 Linux 本机分区 (ext2) 或 RAID 分区,才能继续安装。"
-#: ../libfdisk/gnomefsedit.c:3179
+#: ../libfdisk/gnomefsedit.c:3170
msgid "Partitions"
msgstr "分区"
-#: ../libfdisk/gnomefsedit.c:3223
+#: ../libfdisk/gnomefsedit.c:3214
msgid "_Add..."
msgstr "添加(_A)..."
-#: ../libfdisk/gnomefsedit.c:3235
+#: ../libfdisk/gnomefsedit.c:3226
msgid "_Edit..."
msgstr "编辑(_E)..."
-#: ../libfdisk/gnomefsedit.c:3236
+#: ../libfdisk/gnomefsedit.c:3227
msgid "_Delete"
msgstr "删除(_D)"
-#: ../libfdisk/gnomefsedit.c:3237
+#: ../libfdisk/gnomefsedit.c:3228
msgid "_Reset"
msgstr "重置(_R)"
-#: ../libfdisk/gnomefsedit.c:3266
+#: ../libfdisk/gnomefsedit.c:3257
msgid "_Make RAID Device"
msgstr "创建 RAID 设备(_M)"
-#: ../libfdisk/gnomefsedit.c:3275
+#: ../libfdisk/gnomefsedit.c:3266
msgid "Auto Partition"
msgstr "自动分区"
-#: ../libfdisk/gnomefsedit.c:3288
+#: ../libfdisk/gnomefsedit.c:3279
msgid "Drive Summary"
msgstr "驱动器摘要"
@@ -1803,23 +1923,23 @@ msgstr "当前磁盘分区"
msgid "Drive Summaries"
msgstr "驱动器摘要"
-#: ../libfdisk/newtfsedit.c:1425
+#: ../libfdisk/newtfsedit.c:1426
msgid "No Root Partition"
msgstr "无根分区"
-#: ../libfdisk/newtfsedit.c:1426
+#: ../libfdisk/newtfsedit.c:1427
msgid "You must assign a root (/) partition to a Linux native partition (ext2) for the install to proceed."
msgstr "您必须将一个根 (/) 分区分配至 Linux 本机分区 (ext2),才能继续安装。"
-#: ../libfdisk/newtfsedit.c:1446
+#: ../libfdisk/newtfsedit.c:1447
msgid "No Swap Partition"
msgstr "无交换分区"
-#: ../libfdisk/newtfsedit.c:1447
+#: ../libfdisk/newtfsedit.c:1448
msgid "You must assign a swap partition for the install to proceed."
msgstr "您必须分配一个交换分区,才能继续安装。"
-#: ../libfdisk/newtfsedit.c:1479
+#: ../libfdisk/newtfsedit.c:1480
msgid ""
"There are unallocated partitions left. If you quit now they will not be written to the disk.\n"
"\n"
@@ -1829,15 +1949,15 @@ msgstr ""
"\n"
"是否确定要退出?"
-#: ../libfdisk/newtfsedit.c:1495
+#: ../libfdisk/newtfsedit.c:1496
msgid "Save Changes"
msgstr "保存更改"
-#: ../libfdisk/newtfsedit.c:1497
+#: ../libfdisk/newtfsedit.c:1498
msgid "Save changes to partition table(s)?"
msgstr "是否保存对分区表的更改?"
-#: ../libfdisk/newtfsedit.c:1541
+#: ../libfdisk/newtfsedit.c:1542
msgid "You may only delete NFS mounts."
msgstr "可能仅删除 NFS 安装。"
@@ -1869,7 +1989,7 @@ msgstr "此模块可附带影响其操作的参数。如果不了解提供哪些参数,现在按\"确定\"按钮
msgid "Module Parameters"
msgstr "模块参数"
-#: ../loader/devices.c:167 ../loader/devices.c:242 ../loader/loader.c:253 ../loader/loader.c:312 ../loader/loader.c:328 ../loader/loader.c:1730
+#: ../loader/devices.c:167 ../loader/devices.c:242 ../loader/loader.c:249 ../loader/loader.c:308 ../loader/loader.c:324 ../loader/loader.c:1742
msgid "Devices"
msgstr "设备"
@@ -1877,7 +1997,7 @@ msgstr "设备"
msgid "Insert your driver disk and press \"OK\" to continue."
msgstr "插入驱动程序软盘并按\"确定\"继续。"
-#: ../loader/devices.c:179 ../loader/loader.c:1739
+#: ../loader/devices.c:179 ../loader/loader.c:1751
msgid "Failed to mount floppy disk."
msgstr "安装软盘失败。"
@@ -1916,112 +2036,112 @@ msgstr "读取反冲启动文件 %s 的内容时出现错误:%s"
msgid "Error on line %d of kickstart file %s."
msgstr "反冲启动文件 %s 的第 %d 行出现错误。"
-#: ../loader/lang.c:268
+#: ../loader/lang.c:267
msgid "Choose a Language"
msgstr "选择语言"
-#: ../loader/lang.c:535
+#: ../loader/lang.c:534
msgid "Keyboard Type"
msgstr "键盘类型"
-#: ../loader/lang.c:536
+#: ../loader/lang.c:535
msgid "What type of keyboard do you have?"
msgstr "您使用何种类型的键盘?"
-#: ../loader/loader.c:105
+#: ../loader/loader.c:101
msgid "Local CDROM"
msgstr "本地 CDROM"
-#: ../loader/loader.c:108
+#: ../loader/loader.c:104
msgid "NFS image"
msgstr "NFS 映像"
-#: ../loader/loader.c:113
+#: ../loader/loader.c:109
msgid "Hard drive"
msgstr "硬盘驱动器"
-#: ../loader/loader.c:132
+#: ../loader/loader.c:128
msgid "Welcome to Red Hat Linux"
msgstr "欢迎使用 Red Hat Linux"
-#: ../loader/loader.c:134
+#: ../loader/loader.c:130
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr "<Tab>/<Alt-Tab> 选项间切换 | <Space> 选择 | <F12> 下一屏幕 "
-#: ../loader/loader.c:240
+#: ../loader/loader.c:236
msgid "SCSI"
msgstr "SCSI"
-#: ../loader/loader.c:254
+#: ../loader/loader.c:250
msgid "What kind of device would you like to add"
msgstr "您要添加何种设备"
-#: ../loader/loader.c:301
+#: ../loader/loader.c:297
msgid "I have found the following devices in your system:"
msgstr "在系统中发现以下设备:"
-#: ../loader/loader.c:303 ../loader/loader.c:328
+#: ../loader/loader.c:299 ../loader/loader.c:324
msgid "Add Device"
msgstr "添加设备"
-#: ../loader/loader.c:329
+#: ../loader/loader.c:325
msgid "I don't have any special device drivers loaded for your system. Would you like to load some now?"
msgstr "没有为您的系统装载任何特殊设备驱动程序。是否需要现在装载?"
-#: ../loader/loader.c:413 ../loader/loader.c:415
+#: ../loader/loader.c:409 ../loader/loader.c:411
msgid "Loading"
msgstr "正在装载"
-#: ../loader/loader.c:467
+#: ../loader/loader.c:463
msgid "Loading second stage ramdisk..."
msgstr "正在装载辅助升级 ramdisk..."
-#: ../loader/loader.c:471
+#: ../loader/loader.c:467
msgid "Error loading ramdisk."
msgstr "装载 ramdisk 时出现错误。"
-#: ../loader/loader.c:603
+#: ../loader/loader.c:599
msgid "Hard Drives"
msgstr "硬盘驱动器"
-#: ../loader/loader.c:604
+#: ../loader/loader.c:600
msgid "You don't seem to have any hard drives on your system! Would you like to configure additional devices?"
msgstr "您的系统似乎未配备任何硬盘驱动器!是否要配置附加设备?"
-#: ../loader/loader.c:617
+#: ../loader/loader.c:613
msgid "What partition and directory on that partition hold the RedHat/RPMS and RedHat/base directories? If you don't see the disk drive you're using listed here, press F2 to configure additional devices."
msgstr "RedHat/RPMS 和 RedHat/基本目录位于哪个分区及其目录中?如果此处未列出您正在使用的磁盘驱动器,请按 F2 键以配置附加设备。"
-#: ../loader/loader.c:631
+#: ../loader/loader.c:627
msgid "Directory holding Red Hat:"
msgstr "包含 Red Hat 的目录:"
-#: ../loader/loader.c:651
+#: ../loader/loader.c:647
msgid "Select Partition"
msgstr "选择分区"
-#: ../loader/loader.c:698
+#: ../loader/loader.c:694
#, c-format
msgid "Device %s does not appear to contain a Red Hat installation tree."
msgstr "设备 %s 似乎不包含 Red Hat 安装树。"
-#: ../loader/loader.c:743
+#: ../loader/loader.c:739
msgid "I could not find a Red Hat Linux CDROM in any of your CDROM drives. Please insert the Red Hat CD and press \"OK\" to retry."
msgstr "在您的所有 CDROM 驱动器中均无法找到 Red Hat Linux CDROM。请插入 Red Hat CD,然后按\"确定\"重试。"
-#: ../loader/loader.c:881
+#: ../loader/loader.c:877
msgid "That directory does not seem to contain a Red Hat installation tree."
msgstr "此目录似乎不包含 Red Hat 安装树。"
-#: ../loader/loader.c:886
+#: ../loader/loader.c:882
msgid "I could not mount that directory from the server"
msgstr "无法从服务器中安装此目录"
-#: ../loader/loader.c:971
+#: ../loader/loader.c:966
msgid "FTP"
msgstr "FTP"
-#: ../loader/loader.c:972
+#: ../loader/loader.c:967
msgid "Unable to retrieve the second stage ramdisk"
msgstr "无法检索辅助升级 ramdisk"
@@ -2041,35 +2161,35 @@ msgstr "哪一类介质包含拯救映像?"
msgid "What type of media contains the packages to be installed?"
msgstr "哪一类介质包含要安装的软件包?"
-#: ../loader/loader.c:1622
+#: ../loader/loader.c:1634
msgid "Cannot find ks.cfg on boot floppy."
msgstr "无法在引导软盘中找到 ks.cfg。"
-#: ../loader/loader.c:1668
+#: ../loader/loader.c:1680
#, c-format
msgid "Failed to read directory %s: %s"
msgstr "读取目录 %s 失败:%s"
-#: ../loader/loader.c:1731
+#: ../loader/loader.c:1743
msgid "Insert your updates disk and press \"OK\" to continue."
msgstr "插入更新盘,然后按\"确定\"继续。"
#. Copy everything to /tmp/updates so .so files don't get run
#. from /dev/fd0. We could (and probably should) get smarter about
#. this at some point.
-#: ../loader/loader.c:1744
+#: ../loader/loader.c:1756
msgid "Updates"
msgstr "更新"
-#: ../loader/loader.c:1744
+#: ../loader/loader.c:1756
msgid "Reading anaconda updates..."
msgstr "正在读取 anaconda 更新..."
-#: ../loader/loader.c:1897
+#: ../loader/loader.c:1909
msgid "PC Card"
msgstr "PC 卡"
-#: ../loader/loader.c:1897
+#: ../loader/loader.c:1909
msgid "Initializing PC Card Devices..."
msgstr "正在初始化 PC 卡设备..."
@@ -2077,7 +2197,7 @@ msgstr "正在初始化 PC 卡设备..."
msgid "NFS server name:"
msgstr "NFS 服务器名称:"
-#: ../loader/net.c:150 ../loader/urls.c:165
+#: ../loader/net.c:150 ../loader/urls.c:182
msgid "Red Hat directory:"
msgstr "Red Hat 目录:"
@@ -2131,7 +2251,7 @@ msgstr "正在发送 IP 信息请求..."
msgid "Determining host name and domain..."
msgstr "正在确定主机的名称和域..."
-#: ../loader/net.c:557
+#: ../loader/net.c:557 ../loader/net.c:588
msgid "kickstart"
msgstr "反冲启动"
@@ -2140,52 +2260,67 @@ msgstr "反冲启动"
msgid "bad argument to kickstart network command %s: %s"
msgstr "反冲启动网络命令 %s 的变量错误:%s"
-#: ../loader/net.c:612
+#: ../loader/net.c:589
+#, c-format
+msgid "Bad bootproto %s specified in network command"
+msgstr ""
+
+#: ../loader/net.c:620
msgid "Boot protocol to use"
msgstr "要使用的引导协议"
-#: ../loader/net.c:614
+#: ../loader/net.c:622
msgid "Network gateway"
msgstr "网络网关"
-#: ../loader/net.c:616
+#: ../loader/net.c:624
msgid "IP address"
msgstr "IP 地址"
-#: ../loader/net.c:618
+#: ../loader/net.c:626
msgid "Nameserver"
msgstr "名称服务器"
-#: ../loader/net.c:625
+#: ../loader/net.c:633
msgid "Domain name"
msgstr "域名"
-#: ../loader/net.c:628
+#: ../loader/net.c:636
msgid "Network device"
msgstr "网络设备"
-#: ../loader/net.c:700
+#: ../loader/net.c:708
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> 选项间切换 | <Space> 选择 | <F12> 下一屏幕"
-#: ../loader/net.c:701
+#: ../loader/net.c:709
#, c-format
msgid "netconfig %s (C) 1999 Red Hat, Inc."
msgstr "netconfig %s (C) 1999 Red Hat, Inc."
-#: ../loader/net.c:703
+#: ../loader/net.c:711
msgid "Network configuration"
msgstr "网络配置"
-#: ../loader/net.c:704
+#: ../loader/net.c:712
msgid "Would you like to set up networking?"
msgstr "是否要设置联网?"
-#: ../loader/urls.c:66 ../loader/urls.c:69
+#: ../loader/urls.c:71
+#, fuzzy, c-format
+msgid "Failed to log into %s: %s"
+msgstr "读取目录 %s 失败:%s"
+
+#: ../loader/urls.c:80 ../loader/urls.c:87
+#, fuzzy, c-format
+msgid "Failed to retrieve %s: %s"
+msgstr "读取目录 %s 失败:%s"
+
+#: ../loader/urls.c:92
msgid "Retrieving"
msgstr "检索"
-#: ../loader/urls.c:134
+#: ../loader/urls.c:151
msgid ""
"Please enter the following information:\n"
"\n"
@@ -2199,7 +2334,7 @@ msgstr ""
"o 该服务器上包含\n"
" Red Hat Linux(适用于您的体系结构)的目录\n"
-#: ../loader/urls.c:143
+#: ../loader/urls.c:160
msgid ""
"Please enter the following information:\n"
"\n"
@@ -2213,75 +2348,81 @@ msgstr ""
"o 该服务器上包含\n"
" Red Hat Linux(适用于您的体系结构)的目录\n"
-#: ../loader/urls.c:161
+#: ../loader/urls.c:178
msgid "FTP site name:"
msgstr "FTP 站点名:"
-#: ../loader/urls.c:162
+#: ../loader/urls.c:179
msgid "Web site name:"
msgstr "Web 站点名:"
-#: ../loader/urls.c:181
+#: ../loader/urls.c:198
msgid "Use non-anonymous ftp or a proxy server"
msgstr "使用非匿名 FTP 或代理服务器"
-#: ../loader/urls.c:185
+#: ../loader/urls.c:202
msgid "Use proxy server"
msgstr "使用代理服务器"
-#: ../loader/urls.c:196
+#: ../loader/urls.c:213
msgid "FTP Setup"
msgstr "FTP 设置"
-#: ../loader/urls.c:197
+#: ../loader/urls.c:214
msgid "HTTP Setup"
msgstr "HTTP 设置"
-#: ../loader/urls.c:207
+#: ../loader/urls.c:224
msgid "You must enter a server name."
msgstr "您必须输入服务器名称。"
-#: ../loader/urls.c:212
+#: ../loader/urls.c:229
msgid "You must enter a directory."
msgstr "您必须输入目录。"
-#: ../loader/urls.c:217
+#: ../loader/urls.c:234
msgid "Unknown Host"
msgstr ""
-#: ../loader/urls.c:218
+#: ../loader/urls.c:235
#, c-format
msgid "%s is not a valid hostname."
msgstr ""
-#: ../loader/urls.c:287
+#: ../loader/urls.c:307
msgid "If you are using non anonymous ftp, enter the account name and password you wish to use below. If you are using an FTP proxy enter the name of the FTP proxy server to use."
msgstr "如果正在使用非匿名 FTP,请在下面输入要使用的帐号名和口令。如果正在使用 FTP 代理,请输入要使用的 FTP 代理服务器名称。"
-#: ../loader/urls.c:293
+#: ../loader/urls.c:313
msgid "If you are using a HTTP proxy server enter the name of the HTTP proxy server to use."
msgstr "如果正在使用 HTTP 代理服务器,请输入要使用的 HTTP 代理服务器名称。"
-#: ../loader/urls.c:314
+#: ../loader/urls.c:334
msgid "Account name:"
msgstr "帐号名:"
-#: ../loader/urls.c:322
+#: ../loader/urls.c:342
msgid "FTP Proxy:"
msgstr "FTP 代理:"
-#: ../loader/urls.c:323
+#: ../loader/urls.c:343
msgid "HTTP Proxy:"
msgstr "HTTP 代理:"
-#: ../loader/urls.c:327
+#: ../loader/urls.c:347
msgid "FTP Proxy Port:"
msgstr "FTP 代理端口:"
-#: ../loader/urls.c:328
+#: ../loader/urls.c:348
msgid "HTTP Proxy Port:"
msgstr "HTTP 代理端口:"
#: ../loader/windows.c:46
msgid "Loading SCSI driver"
msgstr "正在装载 SCSI 驱动程序"
+
+#~ msgid "Variant"
+#~ msgstr "变量"
+
+#~ msgid "Autoprobe results:"
+#~ msgstr "自动探测结果:"