drop in updated translations from hampton branch

1 files changed, 1616 insertions, 1876 deletions

diff --git a/po/anaconda.pot b/po/anaconda.pot
index 8fb331b70..b4f3191a8 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -1,138 +1,141 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: ../gettext_rh.py:340
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-18 15:53-0500\n"
+"POT-Creation-Date: 2002-04-16 18:52-0400\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../anaconda:309
+#: ../anaconda:319
 msgid ""
 "You do not have enough RAM to use the graphical installer.  Starting text "
 "mode."
 msgstr ""
 
-#: ../anaconda:324 ../gui.py:104 ../loader/cdrom.c:34 ../loader/devices.c:94
+#: ../anaconda:338 ../gui.py:110 ../mouse.py:283 ../rescue.py:35
+#: ../rescue.py:142 ../rescue.py:165 ../rescue.py:174 ../rescue.py:190
+#: ../rescue.py:196 ../text.py:303 ../text.py:424 ../xserver.py:51
+#: ../iw/account_gui.py:150 ../iw/account_gui.py:161
+#: ../iw/partition_gui.py:506 ../iw/partition_gui.py:860
+#: ../iw/partition_gui.py:1342 ../textw/bootdisk_text.py:66
+#: ../textw/bootdisk_text.py:68 ../textw/complete_text.py:48
+#: ../textw/complete_text.py:63 ../textw/complete_text.py:79
+#: ../textw/confirm_text.py:24 ../textw/confirm_text.py:36
+#: ../textw/constants_text.py:36 ../textw/fdisk_text.py:41
+#: ../textw/firewall_text.py:195 ../textw/network_text.py:139
+#: ../textw/silo_text.py:110 ../textw/silo_text.py:147
+#: ../textw/silo_text.py:160 ../loader/cdrom.c:34 ../loader/devices.c:94
 #: ../loader/devices.c:239 ../loader/devices.c:258 ../loader/devices.c:265
 #: ../loader/devices.c:334 ../loader/devices.c:429 ../loader/kickstart.c:59
 #: ../loader/kickstart.c:69 ../loader/kickstart.c:108 ../loader/lang.c:28
-#: ../loader/lang.c:96 ../loader/lang.c:308 ../loader/lang.c:628
-#: ../loader/loader.c:325 ../loader/loader.c:467 ../loader/loader.c:484
-#: ../loader/loader.c:590 ../loader/loader.c:797 ../loader/loader.c:987
-#: ../loader/loader.c:1046 ../loader/loader.c:1110 ../loader/loader.c:1177
-#: ../loader/loader.c:1208 ../loader/loader.c:1305 ../loader/loader.c:1417
-#: ../loader/loader.c:1422 ../loader/loader.c:1464 ../loader/loader.c:1503
-#: ../loader/loader.c:1535 ../loader/loader.c:1806 ../loader/loader.c:2520
-#: ../loader/loader.c:2550 ../loader/loader.c:2613 ../loader/loader.c:2628
-#: ../loader/loader.c:2846 ../loader/mediacheck.c:190
-#: ../loader/mediacheck.c:235 ../loader/mediacheck.c:261
-#: ../loader/modules.c:492 ../loader/modules.c:512 ../loader/modules.c:545
-#: ../loader/net.c:185 ../loader/net.c:272 ../loader/net.c:359
-#: ../loader/net.c:733 ../loader/net.c:766 ../loader/pcmcia.c:104
+#: ../loader/lang.c:96 ../loader/lang.c:308 ../loader/lang.c:634
+#: ../loader/loader.c:331 ../loader/loader.c:473 ../loader/loader.c:490
+#: ../loader/loader.c:596 ../loader/loader.c:895 ../loader/loader.c:1096
+#: ../loader/loader.c:1155 ../loader/loader.c:1252 ../loader/loader.c:1253
+#: ../loader/loader.c:1292 ../loader/loader.c:1295 ../loader/loader.c:1366
+#: ../loader/loader.c:1367 ../loader/loader.c:1463 ../loader/loader.c:1576
+#: ../loader/loader.c:1581 ../loader/loader.c:1623 ../loader/loader.c:1662
+#: ../loader/loader.c:1694 ../loader/loader.c:1965 ../loader/loader.c:2723
+#: ../loader/loader.c:2753 ../loader/loader.c:2816 ../loader/loader.c:2831
+#: ../loader/loader.c:3054 ../loader/loader.c:3086 ../loader/mediacheck.c:192
+#: ../loader/mediacheck.c:248 ../loader/mediacheck.c:280
+#: ../loader/modules.c:389 ../loader/modules.c:409 ../loader/modules.c:442
+#: ../loader/net.c:186 ../loader/net.c:269 ../loader/net.c:355
+#: ../loader/net.c:730 ../loader/net.c:763 ../loader/pcmcia.c:104
 #: ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/telnetd.c:68
-#: ../loader/urls.c:79 ../loader/urls.c:89 ../loader/urls.c:97
-#: ../loader/urls.c:193 ../loader/urls.c:271 ../loader/urls.c:276
-#: ../loader/urls.c:282 ../loader/urls.c:422 ../mouse.py:284 ../rescue.py:34
-#: ../rescue.py:130 ../rescue.py:151 ../rescue.py:167 ../rescue.py:173
-#: ../text.py:285 ../text.py:403 ../textw/bootdisk_text.py:66
-#: ../textw/bootdisk_text.py:68 ../textw/complete_text.py:53
-#: ../textw/confirm_text.py:24 ../textw/confirm_text.py:36
-#: ../textw/constants_text.py:20 ../textw/fdasd_text.py:32
-#: ../textw/fdisk_text.py:41 ../textw/network_text.py:148
-#: ../textw/silo_text.py:110 ../textw/silo_text.py:147
-#: ../textw/silo_text.py:160 ../xserver.py:51
+#: ../loader/urls.c:81 ../loader/urls.c:91 ../loader/urls.c:99
+#: ../loader/urls.c:198 ../loader/urls.c:268 ../loader/urls.c:273
+#: ../loader/urls.c:279 ../loader/urls.c:419
 msgid "OK"
 msgstr ""
 
-#: ../anaconda:374
+#: ../anaconda:381
 msgid "Probing for video card:   "
 msgstr ""
 
-#: ../anaconda:382
+#: ../anaconda:389
 msgid "Unable to probe\n"
 msgstr ""
 
-#: ../anaconda:384
+#: ../anaconda:391
 msgid "Probing for monitor type: "
 msgstr ""
 
-#: ../anaconda:391
+#: ../anaconda:398
 msgid "Probing for mouse type:   "
 msgstr ""
 
-#: ../anaconda:395
+#: ../anaconda:402
 msgid "Skipping mouse probe.\n"
 msgstr ""
 
-#: ../anaconda:401
+#: ../anaconda:417
 #, c-format
 msgid ""
 "Graphical installation not available for %s installs.  Starting text mode."
 msgstr ""
 
-#: ../anaconda:413
+#: ../anaconda:427
 msgid ""
 "No mouse was detected.  A mouse is required for graphical installation.  "
 "Starting text mode."
 msgstr ""
 
-#: ../anaconda:418
+#: ../anaconda:432
 msgid "Using mouse type: "
 msgstr ""
 
-#: ../anaconda:422
-msgid "DISPLAY variable not set. Starting text mode!"
-msgstr ""
-
-#: ../autopart.py:708
+#: ../autopart.py:713
 msgid "Could not allocate cylinder-based partitions as primary partitions"
 msgstr ""
 
-#: ../autopart.py:711
+#: ../autopart.py:716
 msgid "Could not allocate partitions as primary partitions"
 msgstr ""
 
-#: ../autopart.py:714
+#: ../autopart.py:719
 msgid "Could not allocate cylinder-based partitions"
 msgstr ""
 
-#: ../autopart.py:717
+#: ../autopart.py:722
 msgid "Could not allocate partitions"
 msgstr ""
 
-#: ../autopart.py:771
-#, c-format
+#: ../autopart.py:769
+#, python-format
 msgid ""
 "Boot partition %s may not meet booting constraints for your architecture.  "
 "Creation of a boot disk is highly encouraged."
 msgstr ""
 
-#: ../autopart.py:908
+#: ../autopart.py:901
 msgid "Requested Partition Does Not Exist"
 msgstr ""
 
-#: ../autopart.py:909
-#, c-format
+#: ../autopart.py:902
+#, python-format
 msgid ""
 "Unable to locate partition %s to use for %s.\n"
 "\n"
 "Press OK to reboot your system."
 msgstr ""
 
-#: ../autopart.py:942
+#: ../autopart.py:935
 msgid "Partition Request Sanity Check Errors"
 msgstr ""
 
-#: ../autopart.py:943
-#, c-format
+#: ../autopart.py:936
+#, python-format
 msgid ""
 "The following errors occurred with your partitioning:\n"
 "\n"
@@ -141,43 +144,44 @@ msgid ""
 "Press OK to reboot your system."
 msgstr ""
 
-#: ../autopart.py:952
+#: ../autopart.py:945
 msgid "Warnings During Automatic Partitioning"
 msgstr ""
 
-#: ../autopart.py:953
-#, c-format
+#: ../autopart.py:946
+#, python-format
 msgid ""
 "Following warnings occurred during automatic partitioning:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../autopart.py:966 ../iw/partition_gui.py:1542
-#: ../textw/partition_text.py:167
+#: ../autopart.py:959 ../iw/partition_gui.py:1291
+#: ../textw/partition_text.py:164
 msgid "Error Partitioning"
 msgstr ""
 
-#: ../autopart.py:967
-#, c-format
+#: ../autopart.py:960
+#, python-format
 msgid ""
 "Could not allocate requested partitions: \n"
 "\n"
 "%s.%s"
 msgstr ""
 
-#: ../autopart.py:1040 ../bootloader.py:115 ../gui.py:677 ../image.py:197
-#: ../iw/bootloader_gui.py:57 ../iw/bootloader_gui.py:270
-#: ../iw/upgrade_swap_gui.py:198 ../iw/upgrade_swap_gui.py:206
-#: ../iw/upgrade_swap_gui.py:213 ../loader/loader.c:3211 ../partedUtils.py:232
-#: ../partedUtils.py:564 ../textw/bootloader_text.py:134
-#: ../textw/bootloader_text.py:447 ../textw/fdasd_text.py:84
-#: ../textw/partition_text.py:171 ../textw/upgrade_text.py:172
-#: ../upgrade.py:251 ../upgrade.py:371 ../upgrade.py:390
+#: ../autopart.py:996 ../bootloader.py:286 ../image.py:200
+#: ../partitioning.py:706 ../partitioning.py:1455 ../upgrade.py:258
+#: ../upgrade.py:378 ../upgrade.py:397 ../iw/bootloader_gui.py:58
+#: ../iw/bootloaderpassword_gui.py:29 ../iw/partition_gui.py:1296
+#: ../iw/partition_gui.py:1625 ../iw/upgrade_swap_gui.py:171
+#: ../iw/upgrade_swap_gui.py:179 ../iw/upgrade_swap_gui.py:186
+#: ../textw/bootloader_text.py:133 ../textw/bootloader_text.py:436
+#: ../textw/partition_text.py:168 ../textw/upgrade_text.py:174
+#: ../loader/loader.c:3478
 msgid "Warning"
 msgstr ""
 
-#: ../autopart.py:1046
+#: ../autopart.py:1002
 msgid ""
 "Automatic Partitioning sets up your partitioning based on your installation "
 "type. You also can customize the resulting partitions to meet your needs.\n"
@@ -190,26 +194,26 @@ msgid ""
 "Although it is not as easy to use, there are cases where fdisk is preferred."
 msgstr ""
 
-#: ../autopart.py:1062
+#: ../autopart.py:1018
 msgid ""
 "Before automatic partitioning can be set up by the installation program, you "
 "must choose how to use the space on hard drives."
 msgstr ""
 
-#: ../autopart.py:1067
+#: ../autopart.py:1023
 msgid "Remove all partitions on this system"
 msgstr ""
 
-#: ../autopart.py:1068
+#: ../autopart.py:1024
 msgid "Remove all Linux Partitions on this system"
 msgstr ""
 
-#: ../autopart.py:1069
+#: ../autopart.py:1025
 msgid "Keep all partitions and use existing free space"
 msgstr ""
 
-#: ../autopart.py:1071
-#, c-format
+#: ../autopart.py:1027
+#, python-format
 msgid ""
 "WARNING!!\tWARNING!!\n"
 "\n"
@@ -218,8 +222,8 @@ msgid ""
 "Are you sure you want to do this?"
 msgstr ""
 
-#: ../autopart.py:1076
-#, c-format
+#: ../autopart.py:1032
+#, python-format
 msgid ""
 "WARNING!!\tWARNING!!\n"
 "\n"
@@ -228,90 +232,88 @@ msgid ""
 "Are you sure you want to do this?"
 msgstr ""
 
-#: ../bootloader.py:81
-msgid "Bootloader"
+#: ../bootloader.py:287
+msgid ""
+"No kernel packages were installed on your system.  Your boot loader "
+"configuration will not be changed."
 msgstr ""
 
-#: ../bootloader.py:81
-msgid "Installing bootloader..."
+#: ../bootloader.py:866
+msgid "Bootloader"
 msgstr ""
 
-#: ../bootloader.py:116
-msgid ""
-"No kernel packages were installed on your system.  Your boot loader "
-"configuration will not be changed."
+#: ../bootloader.py:866
+msgid "Installing bootloader..."
 msgstr ""
 
-#: ../comps.py:562
+#: ../comps.py:563
 msgid "Everything"
 msgstr ""
 
-#: ../comps.py:681 ../comps.py:747 ../upgrade.py:476
+#: ../comps.py:682 ../comps.py:748 ../upgrade.py:546
 msgid "no suggestion"
 msgstr ""
 
-#: ../exception.py:167 ../text.py:221
+#: ../exception.py:163 ../text.py:239
 msgid "Exception Occurred"
 msgstr ""
 
-#: ../exception.py:234
+#: ../exception.py:230
 msgid "Dump Written"
 msgstr ""
 
-#: ../exception.py:235
+#: ../exception.py:231
 msgid ""
 "Your system's state has been successfully written to the floppy. Your system "
 "will now be reset."
 msgstr ""
 
-#: ../floppy.py:62 ../floppy.py:85 ../fsset.py:474 ../fsset.py:921
-#: ../fsset.py:940 ../fsset.py:986 ../fsset.py:1022 ../fsset.py:1056
-#: ../fsset.py:1099 ../harddrive.py:172 ../image.py:63 ../image.py:140
-#: ../iw/bootloader_gui.py:548 ../iw/bootloader_gui.py:557
+#: ../floppy.py:62 ../floppy.py:91 ../fsset.py:522 ../fsset.py:946
+#: ../fsset.py:965 ../fsset.py:1010 ../fsset.py:1032 ../fsset.py:1079
+#: ../fsset.py:1122 ../harddrive.py:172 ../image.py:63 ../image.py:145
+#: ../packages.py:263 ../partitioning.py:1335 ../upgrade.py:311
+#: ../upgrade.py:323 ../textw/upgrade_text.py:162 ../textw/upgrade_text.py:169
+#: ../textw/upgrade_text.py:192 ../textw/xconfig_text.py:434
 #: ../loader/devices.c:258 ../loader/devices.c:265 ../loader/devices.c:429
-#: ../loader/lang.c:28 ../loader/lang.c:96 ../loader/loader.c:467
-#: ../loader/loader.c:484 ../loader/loader.c:590 ../loader/loader.c:797
-#: ../loader/loader.c:1046 ../loader/loader.c:1110 ../loader/loader.c:1208
-#: ../loader/loader.c:1417 ../loader/loader.c:1422 ../loader/loader.c:1464
-#: ../loader/loader.c:1535 ../loader/loader.c:2520 ../loader/loader.c:2550
-#: ../loader/loader.c:2628 ../loader/loader.c:2846 ../loader/mediacheck.c:190
-#: ../loader/mediacheck.c:235 ../loader/modules.c:492 ../loader/modules.c:512
-#: ../loader/pcmcia.c:114 ../loader/pcmcia.c:131 ../loader/telnetd.c:68
-#: ../loader/urls.c:79 ../loader/urls.c:89 ../loader/urls.c:97
-#: ../loader/urls.c:271 ../loader/urls.c:276 ../packages.py:242
-#: ../partIntfHelpers.py:114 ../partIntfHelpers.py:217 ../partedUtils.py:327
-#: ../partedUtils.py:357 ../textw/fdasd_text.py:73
-#: ../textw/partition_text.py:947 ../textw/partition_text.py:958
-#: ../textw/upgrade_text.py:160 ../textw/upgrade_text.py:167
-#: ../textw/upgrade_text.py:190 ../upgrade.py:304 ../upgrade.py:316
+#: ../loader/lang.c:28 ../loader/lang.c:96 ../loader/loader.c:473
+#: ../loader/loader.c:490 ../loader/loader.c:596 ../loader/loader.c:895
+#: ../loader/loader.c:1155 ../loader/loader.c:1253 ../loader/loader.c:1367
+#: ../loader/loader.c:1576 ../loader/loader.c:1581 ../loader/loader.c:1623
+#: ../loader/loader.c:1694 ../loader/loader.c:2723 ../loader/loader.c:2753
+#: ../loader/loader.c:2831 ../loader/loader.c:3054 ../loader/loader.c:3086
+#: ../loader/mediacheck.c:192 ../loader/mediacheck.c:248
+#: ../loader/modules.c:389 ../loader/modules.c:409 ../loader/pcmcia.c:114
+#: ../loader/pcmcia.c:131 ../loader/telnetd.c:68 ../loader/urls.c:81
+#: ../loader/urls.c:91 ../loader/urls.c:99 ../loader/urls.c:268
+#: ../loader/urls.c:273
 msgid "Error"
 msgstr ""
 
-#: ../floppy.py:63 ../floppy.py:86
+#: ../floppy.py:63 ../floppy.py:92
 msgid ""
 "An error occured while making the boot disk. Please make sure that there is "
 "a formatted floppy in the first floppy drive."
 msgstr ""
 
-#: ../floppy.py:73
+#: ../floppy.py:78
 msgid "Creating"
 msgstr ""
 
-#: ../floppy.py:73
+#: ../floppy.py:78
 msgid "Creating boot disk..."
 msgstr ""
 
-#: ../fsset.py:166
+#: ../fsset.py:161
 msgid "Checking for Bad Blocks"
 msgstr ""
 
-#: ../fsset.py:167
-#, c-format
+#: ../fsset.py:162
+#, python-format
 msgid "Checking for bad blocks on /dev/%s..."
 msgstr ""
 
-#: ../fsset.py:475
-#, c-format
+#: ../fsset.py:523
+#, python-format
 msgid ""
 "An error occurred migrating %s to ext3.  It is possible to continue without "
 "migrating this filesystem if desired.\n"
@@ -319,20 +321,16 @@ msgid ""
 "Would you like to continue without migrating %s?"
 msgstr ""
 
-#: ../fsset.py:854
-msgid "RAID Device"
+#: ../fsset.py:880 ../iw/silo_gui.py:181 ../textw/silo_text.py:75
+msgid "Master Boot Record (MBR)"
 msgstr ""
 
-#: ../fsset.py:857 ../iw/silo_gui.py:184 ../textw/silo_text.py:76
+#: ../fsset.py:881 ../iw/silo_gui.py:184 ../textw/silo_text.py:76
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../fsset.py:858 ../iw/silo_gui.py:181 ../textw/silo_text.py:75
-msgid "Master Boot Record (MBR)"
-msgstr ""
-
-#: ../fsset.py:922
-#, c-format
+#: ../fsset.py:947
+#, python-format
 msgid ""
 "An error occurred trying to initialize swap on device %s.  This problem is "
 "serious, and the install cannot continue.\n"
@@ -340,8 +338,8 @@ msgid ""
 "Press Enter to reboot your system."
 msgstr ""
 
-#: ../fsset.py:941
-#, c-format
+#: ../fsset.py:966
+#, python-format
 msgid ""
 "Error enabling swap device %s: %s\n"
 "\n"
@@ -350,8 +348,8 @@ msgid ""
 "Press OK to reboot your system."
 msgstr ""
 
-#: ../fsset.py:987
-#, c-format
+#: ../fsset.py:1011
+#, python-format
 msgid ""
 "An error occurred searching for bad blocks on %s.  This problem is serious, "
 "and the install cannot continue.\n"
@@ -359,8 +357,8 @@ msgid ""
 "Press Enter to reboot your system."
 msgstr ""
 
-#: ../fsset.py:1023
-#, c-format
+#: ../fsset.py:1033
+#, python-format
 msgid ""
 "An error occurred trying to format %s.  This problem is serious, and the "
 "install cannot continue.\n"
@@ -368,8 +366,8 @@ msgid ""
 "Press Enter to reboot your system."
 msgstr ""
 
-#: ../fsset.py:1057
-#, c-format
+#: ../fsset.py:1080
+#, python-format
 msgid ""
 "An error occurred trying to migrate %s.  This problem is serious, and the "
 "install cannot continue.\n"
@@ -377,12 +375,12 @@ msgid ""
 "Press Enter to reboot your system."
 msgstr ""
 
-#: ../fsset.py:1077 ../fsset.py:1086
+#: ../fsset.py:1100 ../fsset.py:1109
 msgid "Invalid mount point"
 msgstr ""
 
-#: ../fsset.py:1078
-#, c-format
+#: ../fsset.py:1101
+#, python-format
 msgid ""
 "An error occurred when trying to create %s.  Some element of this path is "
 "not a directory. This is a fatal error and the install cannot continue.\n"
@@ -390,8 +388,8 @@ msgid ""
 "Press Enter to reboot your system."
 msgstr ""
 
-#: ../fsset.py:1087
-#, c-format
+#: ../fsset.py:1110
+#, python-format
 msgid ""
 "An error occurred when trying to create %s: %s.  This is a fatal error and "
 "the install cannot continue.\n"
@@ -399,8 +397,8 @@ msgid ""
 "Press Enter to reboot your system."
 msgstr ""
 
-#: ../fsset.py:1100
-#, c-format
+#: ../fsset.py:1123
+#, python-format
 msgid ""
 "Error mounting device %s as %s: %s\n"
 "\n"
@@ -409,52 +407,58 @@ msgid ""
 "Press OK to reboot your system."
 msgstr ""
 
-#: ../fsset.py:1803
+#: ../fsset.py:1719
 msgid "Formatting"
 msgstr ""
 
-#: ../fsset.py:1804
-#, c-format
+#: ../fsset.py:1720
+#, python-format
 msgid "Formatting %s filesystem..."
 msgstr ""
 
-#: ../gui.py:101 ../text.py:282
+#: ../gui.py:107 ../text.py:300
 msgid "Fix"
 msgstr ""
 
-#: ../gui.py:102 ../loader/devices.c:232 ../loader/loader.c:918
-#: ../loader/loader.c:3211 ../loader/net.c:900 ../text.py:283
-#: ../textw/bootdisk_text.py:26 ../textw/bootloader_text.py:78
-#: ../textw/constants_text.py:32 ../textw/upgrade_text.py:252
+#: ../gui.py:108 ../text.py:301 ../iw/partition_gui.py:508
+#: ../iw/partition_gui.py:665 ../iw/partition_gui.py:730
+#: ../iw/welcome_gui.py:97 ../textw/bootdisk_text.py:26
+#: ../textw/bootloader_text.py:78 ../textw/constants_text.py:48
+#: ../textw/upgrade_text.py:254 ../loader/devices.c:232
+#: ../loader/loader.c:1026 ../loader/loader.c:3478 ../loader/net.c:897
 msgid "Yes"
 msgstr ""
 
-#: ../gui.py:103 ../loader/devices.c:233 ../loader/loader.c:3211
-#: ../loader/net.c:900 ../text.py:284 ../textw/bootdisk_text.py:26
+#: ../gui.py:109 ../text.py:302 ../iw/partition_gui.py:509
+#: ../iw/partition_gui.py:667 ../iw/partition_gui.py:732
+#: ../iw/welcome_gui.py:100 ../textw/bootdisk_text.py:26
 #: ../textw/bootdisk_text.py:55 ../textw/bootloader_text.py:78
-#: ../textw/constants_text.py:36 ../textw/upgrade_text.py:252
-#: ../textw/upgrade_text.py:259
+#: ../textw/constants_text.py:52 ../textw/upgrade_text.py:254
+#: ../textw/upgrade_text.py:261 ../loader/devices.c:233
+#: ../loader/loader.c:3478 ../loader/net.c:897
 msgid "No"
 msgstr ""
 
-#: ../gui.py:105 ../loader/net.c:277 ../loader/net.c:404 ../text.py:286
+#: ../gui.py:111 ../text.py:304 ../loader/net.c:274 ../loader/net.c:400
 msgid "Retry"
 msgstr ""
 
-#: ../gui.py:106 ../text.py:287
+#: ../gui.py:112 ../text.py:305
 msgid "Ignore"
 msgstr ""
 
-#: ../gui.py:107 ../loader/devices.c:240 ../loader/loader.c:2613
-#: ../loader/modules.c:545 ../loader/pcmcia.c:104 ../text.py:113
-#: ../text.py:114 ../text.py:252 ../text.py:254 ../text.py:288
-#: ../textw/bootloader_text.py:210 ../textw/constants_text.py:24
+#: ../gui.py:113 ../text.py:117 ../text.py:118 ../text.py:270 ../text.py:272
+#: ../text.py:306 ../iw/account_gui.py:151 ../iw/account_gui.py:162
+#: ../iw/partition_gui.py:861 ../iw/partition_gui.py:1343
+#: ../textw/bootloader_text.py:202 ../textw/constants_text.py:40
 #: ../textw/silo_text.py:147 ../textw/silo_text.py:165
-#: ../textw/userauth_text.py:76
+#: ../textw/userauth_text.py:76 ../textw/welcome_text.py:51
+#: ../textw/welcome_text.py:54 ../loader/devices.c:240 ../loader/loader.c:2816
+#: ../loader/modules.c:442 ../loader/pcmcia.c:104
 msgid "Cancel"
 msgstr ""
 
-#: ../gui.py:223 ../text.py:260
+#: ../gui.py:195 ../text.py:278
 msgid ""
 "An unhandled exception has occured.  This is most likely a bug.  Please copy "
 "the full text of this exception or save the crash dump to a floppy then file "
@@ -462,80 +466,80 @@ msgid ""
 "bugzilla/"
 msgstr ""
 
-#: ../gui.py:340 ../text.py:250
+#: ../gui.py:316 ../text.py:268
 msgid ""
 "Please insert a floppy now. All contents of the disk will be erased, so "
 "please choose your diskette carefully."
 msgstr ""
 
-#: ../gui.py:403 ../gui.py:853
+#: ../gui.py:396 ../gui.py:776
 msgid "Online Help"
 msgstr ""
 
-#: ../gui.py:404 ../iw/language_gui.py:21 ../textw/language_text.py:38
+#: ../gui.py:397 ../iw/language_gui.py:20 ../textw/language_text.py:38
 msgid "Language Selection"
 msgstr ""
 
-#: ../gui.py:479
+#: ../gui.py:455 ../iw/firewall_gui.py:135
+msgid "Close"
+msgstr ""
+
+#: ../gui.py:460 ../gui.py:636
 msgid "Release Notes"
 msgstr ""
 
-#: ../gui.py:516
+#: ../gui.py:492
 msgid "Unable to load file!"
 msgstr ""
 
-#: ../gui.py:550
+#: ../gui.py:526
 msgid "Release notes are missing.\n"
 msgstr ""
 
-#: ../gui.py:658
-msgid "_Back"
-msgstr ""
-
-#: ../gui.py:660
-msgid "_Next"
-msgstr ""
-
-#: ../gui.py:662
-msgid "_Abort installation"
-msgstr ""
-
-#: ../gui.py:664
-msgid "_Release Notes"
+#: ../gui.py:632 ../textw/confirm_text.py:24 ../textw/confirm_text.py:26
+#: ../textw/confirm_text.py:36 ../textw/confirm_text.py:38
+#: ../textw/constants_text.py:44 ../textw/silo_text.py:110
+#: ../textw/userauth_text.py:185 ../loader/cdrom.c:34 ../loader/devices.c:95
+#: ../loader/devices.c:240 ../loader/devices.c:334 ../loader/lang.c:634
+#: ../loader/loader.c:331 ../loader/loader.c:1026 ../loader/loader.c:1096
+#: ../loader/loader.c:1367 ../loader/loader.c:1463 ../loader/loader.c:1965
+#: ../loader/net.c:186 ../loader/net.c:269 ../loader/net.c:355
+#: ../loader/urls.c:198 ../loader/urls.c:419
+msgid "Back"
 msgstr ""
 
-#: ../gui.py:666
-msgid "Show _Help"
+#: ../gui.py:634
+msgid "Next"
 msgstr ""
 
-#: ../gui.py:668
-msgid "Hide _Help"
+#: ../gui.py:638
+msgid "Show Help"
 msgstr ""
 
-#: ../gui.py:691
-msgid ""
-"Warning: Are you sure that you wish to exit the Red Hat Linux installation?"
+#: ../gui.py:640
+msgid "Hide Help"
 msgstr ""
 
-#: ../gui.py:755
-msgid "Red Hat Linux Installer"
+#: ../gui.py:682
+#, python-format
+msgid "%s Installer"
 msgstr ""
 
-#: ../gui.py:770
-#, c-format
-msgid "Red Hat Linux Installer on %s"
+#: ../gui.py:697
+#, python-format
+msgid "%s Installer on %s"
 msgstr ""
 
-#: ../gui.py:809
+#: ../gui.py:735
 msgid "Unable to load title bar"
 msgstr ""
 
-#: ../gui.py:908
+#: ../gui.py:824
 msgid "Install Window"
 msgstr ""
 
 #: ../harddrive.py:173
-#, c-format
+#, python-format
 msgid "Missing CD #%d, which is required for the install."
 msgstr ""
 
@@ -553,24 +557,24 @@ msgid ""
 "probably out of disk space."
 msgstr ""
 
-#: ../image.py:117
+#: ../image.py:120
 msgid "Change CDROM"
 msgstr ""
 
-#: ../image.py:118
-#, c-format
+#: ../image.py:121
+#, python-format
 msgid "Please insert disc %d to continue."
 msgstr ""
 
-#: ../image.py:135
+#: ../image.py:140
 msgid "Wrong CDROM"
 msgstr ""
 
-#: ../image.py:136
+#: ../image.py:141
 msgid "That's not the correct Red Hat CDROM."
 msgstr ""
 
-#: ../image.py:141
+#: ../image.py:146
 msgid "The CDROM could not be mounted."
 msgstr ""
 
@@ -578,151 +582,15 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
-#: ../monitor.py:172 ../mouse.py:187 ../videocard.py:137
+#: ../monitor.py:155 ../mouse.py:183 ../videocard.py:152
 msgid "Unable to probe"
 msgstr ""
 
-#: ../mouse.py:22
-msgid "ALPS - GlidePoint (PS/2)"
-msgstr ""
-
-#: ../mouse.py:24
-msgid "ASCII - MieMouse (serial)"
-msgstr ""
-
-#: ../mouse.py:26
-msgid "ASCII - MieMouse (PS/2)"
-msgstr ""
-
-#: ../mouse.py:28
-msgid "ATI - Bus Mouse"
-msgstr ""
-
-#: ../mouse.py:30
-msgid "Generic - 2 Button Mouse (serial)"
-msgstr ""
-
-#: ../mouse.py:32
-msgid "Generic - 3 Button Mouse (serial)"
-msgstr ""
-
-#: ../mouse.py:34
-msgid "Generic - 2 Button Mouse (PS/2)"
-msgstr ""
-
-#: ../mouse.py:36
-msgid "Generic - 3 Button Mouse (PS/2)"
-msgstr ""
-
-#: ../mouse.py:38
-msgid "Generic - 2 Button Mouse (USB)"
-msgstr ""
-
-#: ../mouse.py:40
-msgid "Generic - 3 Button Mouse (USB)"
-msgstr ""
-
-#: ../mouse.py:42
-msgid "Genius - NetMouse (serial)"
-msgstr ""
-
-#: ../mouse.py:44
-msgid "Genius - NetMouse (PS/2)"
-msgstr ""
-
-#: ../mouse.py:46
-msgid "Genius - NetMouse Pro (PS/2)"
-msgstr ""
-
-#: ../mouse.py:48
-msgid "Genius - NetScroll (PS/2)"
-msgstr ""
-
-#: ../mouse.py:50
-msgid "Kensington - Thinking Mouse (serial)"
-msgstr ""
-
-#: ../mouse.py:52
-msgid "Kensington - Thinking Mouse (PS/2)"
-msgstr ""
-
-#: ../mouse.py:54
-msgid "Logitech - C7 Mouse (serial, old C7 type)"
-msgstr ""
-
-#: ../mouse.py:56
-msgid "Logitech - CC Series (serial)"
-msgstr ""
-
-#: ../mouse.py:58
-msgid "Logitech - Bus Mouse"
-msgstr ""
-
-#: ../mouse.py:60
-msgid "Logitech - MouseMan/FirstMouse (serial)"
-msgstr ""
-
-#: ../mouse.py:62
-msgid "Logitech - MouseMan/FirstMouse (PS/2)"
-msgstr ""
-
-#: ../mouse.py:64
-msgid "Logitech - MouseMan+/FirstMouse+ (serial)"
-msgstr ""
-
-#: ../mouse.py:66
-msgid "Logitech - MouseMan+/FirstMouse+ (PS/2)"
-msgstr ""
-
-#: ../mouse.py:68
-msgid "Logitech - MouseMan Wheel (USB)"
-msgstr ""
-
-#: ../mouse.py:70
-msgid "Microsoft - Compatible Mouse (serial)"
-msgstr ""
-
-#: ../mouse.py:72
-msgid "Microsoft - Rev 2.1A or higher (serial)"
-msgstr ""
-
-#: ../mouse.py:74
-msgid "Microsoft - IntelliMouse (serial)"
-msgstr ""
-
-#: ../mouse.py:76
-msgid "Microsoft - IntelliMouse (PS/2)"
-msgstr ""
-
-#: ../mouse.py:79
-msgid "Microsoft - IntelliMouse (USB)"
-msgstr ""
-
-#: ../mouse.py:82
-msgid "Microsoft - Bus Mouse"
-msgstr ""
-
-#: ../mouse.py:84
-msgid "Mouse Systems - Mouse (serial)"
-msgstr ""
-
-#: ../mouse.py:86
-msgid "MM - Series (serial)"
-msgstr ""
-
-#: ../mouse.py:88
-msgid "MM - HitTablet (serial)"
-msgstr ""
-
-#: ../mouse.py:92
-msgid "Sun - Mouse"
-msgstr ""
-
-#: ../mouse.py:277 ../xserver.py:44
+#: ../mouse.py:276 ../xserver.py:44
 msgid "Mouse Not Detected"
 msgstr ""
 
-#: ../mouse.py:278 ../xserver.py:45
+#: ../mouse.py:277 ../xserver.py:45
 msgid ""
 "Your mouse was not automatically detected.  To proceed in the graphical "
 "installation mode, please proceed to the next screen and provide your mouse "
@@ -730,22 +598,22 @@ msgid ""
 "a mouse."
 msgstr ""
 
-#: ../mouse.py:284 ../mouse.py:285 ../xserver.py:51 ../xserver.py:52
+#: ../mouse.py:283 ../mouse.py:284 ../xserver.py:51 ../xserver.py:52
 msgid "Use text mode"
 msgstr ""
 
-#: ../iw/package_gui.py:33 ../packages.py:38
+#: ../packages.py:38 ../iw/package_gui.py:30
 msgid "Proceed with upgrade?"
 msgstr ""
 
-#: ../iw/package_gui.py:34 ../packages.py:39
+#: ../packages.py:39 ../iw/package_gui.py:31
 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 ""
 
-#: ../iw/package_gui.py:38 ../packages.py:43
+#: ../packages.py:43 ../iw/package_gui.py:35
 msgid "Would you like to continue with the upgrade?"
 msgstr ""
 
@@ -765,51 +633,66 @@ msgstr ""
 msgid "Checking dependencies in packages selected for installation..."
 msgstr ""
 
-#: ../packages.py:206 ../packages.py:483
+#: ../packages.py:223 ../packages.py:538
 msgid "Processing"
 msgstr ""
 
-#: ../packages.py:207
+#: ../packages.py:224
 msgid "Preparing to install..."
 msgstr ""
 
-#: ../packages.py:243
-#, c-format
+#: ../packages.py:264
+#, python-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 ""
 
-#: ../packages.py:484
+#: ../packages.py:286
+msgid "Error Installing Package"
+msgstr ""
+
+#: ../packages.py:287
+#, python-format
+msgid ""
+"There was an error installing %s.  This can indicate media failure, lack of "
+"disk space, and/or hardware problems.  This is a fatal error and your "
+"install will be aborted.  Please verify your media and try your install "
+"again.\n"
+"\n"
+"Press the OK button to reboot your system."
+msgstr ""
+
+#: ../packages.py:539
 msgid "Setting up RPM transaction..."
 msgstr ""
 
-#: ../packages.py:521
-#, c-format
+#: ../packages.py:576
+#, python-format
 msgid ""
 "Upgrading %s packages\n"
 "\n"
 msgstr ""
 
-#: ../packages.py:523
-#, c-format
+#: ../packages.py:578
+#, python-format
 msgid ""
 "Installing %s packages\n"
 "\n"
 msgstr ""
 
-#: ../packages.py:530
-#, c-format
+#: ../packages.py:585
+#, python-format
 msgid "Upgrading %s-%s-%s.\n"
 msgstr ""
 
-#: ../packages.py:532
-#, c-format
+#: ../packages.py:587
+#, python-format
 msgid "Installing %s-%s-%s.\n"
 msgstr ""
 
-#: ../packages.py:548
-#, c-format
+#: ../packages.py:603
+#, python-format
 msgid ""
 "\n"
 "\n"
@@ -819,589 +702,543 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../packages.py:598
+#: ../packages.py:609
+msgid "Install Starting"
+msgstr ""
+
+#: ../packages.py:610
+msgid "Starting install process, this may take several minutes..."
+msgstr ""
+
+#: ../packages.py:655
 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"
 msgstr ""
 
-#: ../iw/partition_gui.py:320 ../iw/partition_gui.py:2055
-#: ../iw/upgrade_swap_gui.py:147 ../packages.py:602 ../packages.py:622
-#: ../textw/upgrade_text.py:106
+#: ../packages.py:659 ../packages.py:679 ../iw/partition_gui.py:1562
+#: ../iw/upgrade_swap_gui.py:123 ../textw/partition_text.py:986
+#: ../textw/upgrade_text.py:108
 msgid "Mount Point"
 msgstr ""
 
-#: ../packages.py:603
+#: ../packages.py:660
 msgid "Space Needed"
 msgstr ""
 
-#: ../packages.py:618
+#: ../packages.py:675
 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"
 "\n"
 msgstr ""
 
-#: ../packages.py:623
+#: ../packages.py:680
 msgid "Nodes Needed"
 msgstr ""
 
-#: ../packages.py:629
+#: ../packages.py:686
 msgid "Disk Space"
 msgstr ""
 
-#: ../packages.py:650
+#: ../packages.py:707
 msgid ""
 "\n"
 "\n"
 "The following packages were available in this version but NOT upgraded:\n"
 msgstr ""
 
-#: ../packages.py:667
+#: ../packages.py:724
 msgid "Post Install"
 msgstr ""
 
-#: ../packages.py:668
+#: ../packages.py:725
 msgid "Performing post install configuration..."
 msgstr ""
 
-#: ../partedUtils.py:168
+#: ../partitioning.py:171
 msgid "Foreign"
 msgstr ""
 
-#: ../partedUtils.py:233
-#, c-format
-msgid ""
-"The partition table on device /dev/%s is of an unexpected type %s for your "
-"architecture.  To use this disk for installation of Red Hat Linux, it must "
-"be re-initialized causing the loss of ALL DATA on this drive.\n"
-"\n"
-"Would you like to initialize this drive?"
-msgstr ""
-
-#: ../partedUtils.py:328 ../partedUtils.py:358
-#, c-format
-msgid "Error mounting filesystem on %s: %s"
-msgstr ""
-
-#: ../partedUtils.py:449
-msgid "Initializing"
-msgstr ""
-
-#: ../partedUtils.py:450
-#, c-format
-msgid "Please wait while formatting drive %s...\n"
-msgstr ""
-
-#: ../partedUtils.py:565
-#, c-format
-msgid ""
-"The partition table on device %s was unreadable. To create new partitions it "
-"must be initialized, causing the loss of ALL DATA on this drive.\n"
-"\n"
-"Would you like to initialize this drive?"
-msgstr ""
-
-#: ../partedUtils.py:675 ../textw/fdasd_text.py:100
-msgid "No Drives Found"
-msgstr ""
-
-#: ../partedUtils.py:676
-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 ""
-
-#: ../partIntfHelpers.py:34
-msgid "Please enter a volume group name."
-msgstr ""
-
-#: ../partIntfHelpers.py:38
-msgid "Volume Group Names must be less than 128 characters"
-msgstr ""
-
-#: ../partIntfHelpers.py:41
-#, c-format
-msgid "Error - the volume group name %s is not valid."
-msgstr ""
-
-#: ../partIntfHelpers.py:44
-msgid "Error - the volume group name contains illegal characters  or spaces."
-msgstr ""
-
-#: ../partIntfHelpers.py:53
-msgid "Please enter a logical volume name."
-msgstr ""
-
-#: ../partIntfHelpers.py:57
-msgid "Logical Volume Names must be less than 128 characters"
-msgstr ""
-
-#: ../partIntfHelpers.py:61
-#, c-format
-msgid "Error - the logical volume name %s is not valid."
-msgstr ""
-
-#: ../partIntfHelpers.py:66
-msgid "Error - the logical volume name contains illegal characters or spaces."
-msgstr ""
-
-#: ../partIntfHelpers.py:88
+#: ../partitioning.py:355
 msgid ""
 "The mount point is invalid.  Mount points must start with '/' and cannot end "
 "with '/', and must contain printable characters and no spaces."
 msgstr ""
 
-#: ../partIntfHelpers.py:95
+#: ../partitioning.py:363
 msgid "Please specify a mount point for this partition."
 msgstr ""
 
-#: ../partIntfHelpers.py:109 ../partIntfHelpers.py:122
-#: ../partIntfHelpers.py:130 ../partIntfHelpers.py:140
-#: ../partIntfHelpers.py:147 ../partIntfHelpers.py:154
-#: ../partIntfHelpers.py:160
-msgid "Unable To Remove"
-msgstr ""
-
-#: ../partIntfHelpers.py:110
-msgid "You must first select a partition to remove."
+#: ../partitioning.py:382
+#, python-format
+msgid ""
+"The mount point %s is already in use, please choose a different mount point."
 msgstr ""
 
-#: ../partIntfHelpers.py:115 ../textw/partition_text.py:959
-msgid "DASD partitions can only be deleted with fdasd"
+#: ../partitioning.py:439
+msgid ""
+"This mount point is invalid.  This directory must be on the / filesystem."
 msgstr ""
 
-#: ../partIntfHelpers.py:123
-msgid "You cannot remove free space."
+#: ../partitioning.py:444
+msgid "This mount point must be on a linux filesystem."
 msgstr ""
 
-#: ../partIntfHelpers.py:131
-#, c-format
+#: ../partitioning.py:457
+#, python-format
 msgid ""
-"You cannot remove this partition, as it is an extended partition which "
-"contains %s"
+"The size of the %s partition (size = %s MB) exceeds the maximum size of %s "
+"MB."
 msgstr ""
 
-#: ../partIntfHelpers.py:141
+#: ../partitioning.py:464
+#, python-format
 msgid ""
-"You cannot remove this partition, as it is holding the data for the hard "
-"drive install."
+"The size of the requested partition (size = %s MB) exceeds the maximum size "
+"of %s MB."
 msgstr ""
 
-#: ../partIntfHelpers.py:148
-msgid "You cannot remove this partition, as it is part of a RAID device."
+#: ../partitioning.py:469
+#, python-format
+msgid "The size of the requested partition is negative! (size = %s MB)"
 msgstr ""
 
-#: ../partIntfHelpers.py:155
-msgid "Removing logical volumes from the treeview is not currently supported."
+#: ../partitioning.py:473
+msgid "Partitions can't start below the first cylinder."
 msgstr ""
 
-#: ../partIntfHelpers.py:161
-msgid "You cannot remove this partition, as it is part of a LVM volume group."
+#: ../partitioning.py:476
+msgid "Partitions can't end on a negative cylinder."
 msgstr ""
 
-#: ../partIntfHelpers.py:200 ../partIntfHelpers.py:235
-msgid "Unable To Edit"
+#: ../partitioning.py:509
+msgid "No members in RAID request, or not RAID level specified."
 msgstr ""
 
-#: ../partIntfHelpers.py:201
-msgid "You must select a partition to edit"
+#: ../partitioning.py:527 ../partitioning.py:617
+msgid "Bootable partitions can only be on RAID1 devices."
 msgstr ""
 
-#: ../partIntfHelpers.py:218
-msgid "You must go back and use fdasd to inititalize this partition"
+#: ../partitioning.py:531
+#, python-format
+msgid "A RAID device of type %s requires at least %s members."
 msgstr ""
 
-#: ../partIntfHelpers.py:236
-#, c-format
+#: ../partitioning.py:537
+#, python-format
 msgid ""
-"You cannot edit this partition, as it is an extended partition which "
-"contains %s"
-msgstr ""
-
-#: ../partIntfHelpers.py:245
-msgid "Unable to Edit"
+"This RAID device can have a maximum of %s spares. To have more spares you "
+"will need to add members to the RAID device."
 msgstr ""
 
-#: ../partIntfHelpers.py:246
-msgid "You cannot edit this partition as it is part of a RAID device"
+#: ../partitioning.py:578
+#, python-format
+msgid ""
+"You have not defined a root partition (/), which is required for "
+"installation of %s to continue."
 msgstr ""
 
-#: ../partIntfHelpers.py:268
-msgid "Format as Swap?"
+#: ../partitioning.py:581
+#, python-format
+msgid ""
+"Your root partition is less than 250 megabytes which is usually too small to "
+"install %s."
 msgstr ""
 
-#: ../partIntfHelpers.py:269
-#, c-format
+#: ../partitioning.py:586
 msgid ""
-"/dev/%s has a partition type of 0x82 (Linux swap) but does not appear to be "
-"formatted as a Linux swap partition.\n"
-"\n"
-"Would you like to format this partition as a swap partition?"
+"You must create a /boot/efi partition of type FAT and a size of 50 megabytes."
 msgstr ""
 
-#: ../partIntfHelpers.py:289 ../partIntfHelpers.py:310
-msgid "Format?"
+#: ../partitioning.py:594
+#, python-format
+msgid ""
+"Your %s partition is less than %s megabytes which is lower than recommended "
+"for a normal %s install."
 msgstr ""
 
-#: ../partIntfHelpers.py:290
+#: ../partitioning.py:621
 msgid ""
-"You have chosen to format a pre-existing partition.  This will destroy all "
-"data that was previously on it.\n"
-"\n"
-"Are you sure you want to do this?"
+"You have not specified a swap partition.  Although not strictly required in "
+"all cases, it will significantly improve performance for most installations."
 msgstr ""
 
-#: ../partIntfHelpers.py:299
+#: ../partitioning.py:625
+#, python-format
 msgid ""
-"You have chosen to use a pre-existing partition for this installation "
-"without formatting it. Red Hat recommends that you format this partition to "
-"make sure files from a previous operating system installation do not cause "
-"problems with this installation of Linux. However, if this partition "
-"contains files that you need to keep, such as a users home directories, then "
-"you should continue without formatting this partition. \n"
-"\n"
-"Are you sure you want to continue without formattingthe partition ?"
+"You have specified more than 32 swap devices.  The kernel for %s only "
+"supports 32 swap devices."
 msgstr ""
 
-#: ../partIntfHelpers.py:318
-msgid "Error with Partitioning"
+#: ../partitioning.py:634
+#, python-format
+msgid ""
+"You have allocated less swap space (%dM) than available RAM (%dM) on your "
+"system.  This could negatively impact performance."
 msgstr ""
 
-#: ../partIntfHelpers.py:319
-#, c-format
+#: ../partitioning.py:707
+#, python-format
 msgid ""
-"The following critical errors exist with your requested partitioning scheme. "
-"These errors must be corrected prior to continuing with your install of Red "
-"Hat Linux.\n"
+"The partition table on device /dev/%s is of an unexpected type for your "
+"architecture.  To use this disk for installation of %s, it must be re-"
+"initialized causing the loss of ALL DATA on this drive.\n"
 "\n"
-"%s"
+"Would you like to initialize this drive?"
 msgstr ""
 
-#: ../partIntfHelpers.py:332
-msgid "Partitioning Warning"
+#: ../partitioning.py:1336
+#, python-format
+msgid "Error mounting filesystem on %s: %s"
 msgstr ""
 
-#: ../partIntfHelpers.py:333
-#, c-format
+#: ../partitioning.py:1456
+#, python-format
 msgid ""
-"The following warnings exist with your requested partition scheme.\n"
-"\n"
-"%s\n"
+"The partition table on device %s was unreadable. To create new partitions it "
+"must be initialized, causing the loss of ALL DATA on this drive.\n"
 "\n"
-"Would you like to continue with your requested partitioning scheme?"
+"Would you like to initialize this drive?"
 msgstr ""
 
-#: ../iw/partition_gui.py:782 ../partIntfHelpers.py:347
-msgid ""
-"The following pre-existing partitions have been selected to be formatted, "
-"destroying all data."
+#: ../partitioning.py:1544
+msgid "No Drives Found"
 msgstr ""
 
-#: ../iw/partition_gui.py:785 ../partIntfHelpers.py:350
+#: ../partitioning.py:1545
 msgid ""
-"Select 'Yes' to continue and format these partitions, or 'No' to go back and "
-"change these settings."
-msgstr ""
-
-#: ../partIntfHelpers.py:356
-msgid "Format Warning"
+"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 ""
 
-#: ../partIntfHelpers.py:391
+#: ../partitioning.py:1633
 msgid ""
 "You are about to delete a RAID device.\n"
 "\n"
 "Are you sure?"
 msgstr ""
 
-#: ../partIntfHelpers.py:394
-#, c-format
+#: ../partitioning.py:1636
+#, python-format
 msgid ""
 "You are about to delete the /dev/%s partition.\n"
 "\n"
 "Are you sure?"
 msgstr ""
 
-#: ../partIntfHelpers.py:398
+#: ../partitioning.py:1640
 msgid "Are you sure you want to delete this partition?"
 msgstr ""
 
-#: ../iw/partition_gui.py:1974 ../partIntfHelpers.py:400
+#: ../partitioning.py:1642
 msgid "Confirm Delete"
 msgstr ""
 
-#: ../partIntfHelpers.py:405
+#: ../partitioning.py:1646
 msgid "Confirm Reset"
 msgstr ""
 
-#: ../partIntfHelpers.py:406
+#: ../partitioning.py:1647
 msgid ""
 "Are you sure you want to reset the partition table to its original state?"
 msgstr ""
 
-#: ../partitioning.py:153
-msgid "Installation cannot continue."
+#: ../partitioning.py:1671
+msgid "the partition in use by the installer."
 msgstr ""
 
-#: ../partitioning.py:154
-msgid ""
-"The partitioning options you have chosen have already been activated. You "
-"can no longer return to the disk editing screen. Would you like to continue "
-"with the installation process?"
+#: ../partitioning.py:1674
+msgid "a partition which is a member of a RAID array."
 msgstr ""
 
-#: ../partitioning.py:181
-msgid "Low Memory"
+#: ../partitioning.py:1683 ../partitioning.py:1689 ../partitioning.py:1697
+#: ../partitioning.py:1708 ../partitioning.py:1715
+msgid "Unable To Remove"
 msgstr ""
 
-#: ../partitioning.py:182
-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?"
+#: ../partitioning.py:1684
+msgid "You must first select a partition to remove."
 msgstr ""
 
-#: ../partitions.py:476
-msgid ""
-"You have not defined a root partition (/), which is required for "
-"installation of Red Hat Linux to continue."
+#: ../partitioning.py:1690
+msgid "You cannot remove free space."
 msgstr ""
 
-#: ../partitions.py:481
+#: ../partitioning.py:1698
+#, python-format
 msgid ""
-"Your root partition is less than 250 megabytes which is usually too small to "
-"install Red Hat Linux."
+"You cannot remove this partition, as it is an extended partition which "
+"contains %s"
 msgstr ""
 
-#: ../partitions.py:488
+#: ../partitioning.py:1709
 msgid ""
-"You must create a /boot/efi partition of type FAT and a size of 50 megabytes."
+"You cannot remove this partition, as it is holding the data for the hard "
+"drive install."
 msgstr ""
 
-#: ../partitions.py:496
-#, c-format
-msgid ""
-"Your %s partition is less than %s megabytes which is lower than recommended "
-"for a normal Red Hat Linux install."
+#: ../partitioning.py:1716
+msgid "You cannot remove this partition, as it is part of a RAID device."
 msgstr ""
 
-#: ../partRequests.py:506 ../partitions.py:523
-msgid "Bootable partitions can only be on RAID1 devices."
+#: ../partitioning.py:1747 ../partitioning.py:1769
+msgid "Unable To Edit"
 msgstr ""
 
-#: ../partitions.py:529
-msgid "Bootable partitions cannot be on a logical volume."
+#: ../partitioning.py:1748
+msgid "You must select a partition to edit"
 msgstr ""
 
-#: ../partitions.py:533
+#: ../partitioning.py:1770
+#, python-format
 msgid ""
-"You have not specified a swap partition.  Although not strictly required in "
-"all cases, it will significantly improve performance for most installations."
+"You cannot edit this partition, as it is an extended partition which "
+"contains %s"
 msgstr ""
 
-#: ../partitions.py:540
-msgid ""
-"You have specified more than 32 swap devices.  The kernel for Red Hat Linux "
-"only supports 32 swap devices."
+#: ../partitioning.py:1778
+msgid "Unable to Edit"
 msgstr ""
 
-#: ../partitions.py:551
-#, c-format
-msgid ""
-"You have allocated less swap space (%dM) than available RAM (%dM) on your "
-"system.  This could negatively impact performance."
+#: ../partitioning.py:1779
+msgid "You cannot edit this partition as it is part of a RAID device"
 msgstr ""
 
-#: ../partitions.py:752
-msgid "the partition in use by the installer."
+#: ../partitioning.py:1791
+msgid "Installation cannot continue."
 msgstr ""
 
-#: ../partitions.py:755
-msgid "a partition which is a member of a RAID array."
+#: ../partitioning.py:1792
+msgid ""
+"The partitioning options you have chosen have already been activated. You "
+"can no longer return to the disk editing screen. Would you like to continue "
+"with the installation process?"
+msgstr ""
+
+#: ../partitioning.py:1815
+msgid "Low Memory"
 msgstr ""
 
-#: ../partRequests.py:159
+#: ../partitioning.py:1816
 msgid ""
-"This mount point is invalid.  This directory must be on the / filesystem."
+"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 ""
 
-#: ../partRequests.py:164
-msgid "This mount point must be on a linux filesystem."
+#: ../partitioning.py:1837
+msgid "Format as Swap?"
 msgstr ""
 
-#: ../partRequests.py:179
-#, c-format
+#: ../partitioning.py:1838
+#, python-format
 msgid ""
-"The mount point %s is already in use, please choose a different mount point."
+"/dev/%s has a partition type of 0x82 (Linux swap) but does not appear to be "
+"formatted as a Linux swap partition.\n"
+"\n"
+"Would you like to format this partition as a swap partition?"
 msgstr ""
 
-#: ../partRequests.py:193
-#, c-format
+#: ../partitioning.py:1857 ../partitioning.py:1875
+msgid "Format?"
+msgstr ""
+
+#: ../partitioning.py:1858
 msgid ""
-"The size of the %s partition (size = %s MB) exceeds the maximum size of %s "
-"MB."
+"You have chosen to format a pre-existing partition.  This will destroy all "
+"data that was previously on it.\n"
+"\n"
+"Are you sure you want to do this?"
 msgstr ""
 
-#: ../partRequests.py:369
-#, c-format
+#: ../partitioning.py:1866
 msgid ""
-"The size of the requested partition (size = %s MB) exceeds the maximum size "
-"of %s MB."
+"You have chosen not to format a pre-existing partition which is being "
+"mounted under a system directory.  Unless you have particular needs to "
+"preserve data on this partition, it is highly recommended you format this "
+"partition to guarantee the data formerly on the partition does not corrupt "
+"your new installation.\n"
+"\n"
+"Are you sure you want to do this?"
 msgstr ""
 
-#: ../partRequests.py:374
-#, c-format
-msgid "The size of the requested partition is negative! (size = %s MB)"
+#: ../partitioning.py:1882
+msgid "Error with Partitioning"
 msgstr ""
 
-#: ../partRequests.py:378
-msgid "Partitions can't start below the first cylinder."
+#: ../partitioning.py:1883
+#, python-format
+msgid ""
+"The following critical errors exist with your requested partitioning scheme. "
+"These errors must be corrected prior to continuing with your install of %s.\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../partRequests.py:381
-msgid "Partitions can't end on a negative cylinder."
+#: ../partitioning.py:1896
+msgid "Partitioning Warning"
 msgstr ""
 
-#: ../partRequests.py:498
-msgid "No members in RAID request, or not RAID level specified."
+#: ../partitioning.py:1897
+#, python-format
+msgid ""
+"The following warnings exist with your requested partition scheme.\n"
+"\n"
+"%s\n"
+"\n"
+"Would you like to continue with your requested partitioning scheme?"
 msgstr ""
 
-#: ../partRequests.py:510
-#, c-format
-msgid "A RAID device of type %s requires at least %s members."
+#: ../partitioning.py:1909 ../iw/partition_gui.py:586
+msgid ""
+"The following pre-existing partitions have been selected to be formatted, "
+"destroying all data."
 msgstr ""
 
-#: ../partRequests.py:516
-#, c-format
+#: ../partitioning.py:1912 ../iw/partition_gui.py:589
 msgid ""
-"This RAID device can have a maximum of %s spares. To have more spares you "
-"will need to add members to the RAID device."
+"Select 'Yes' to continue and format these partitions, or 'No' to go back and "
+"change these settings."
+msgstr ""
+
+#: ../partitioning.py:1918
+msgid "Format Warning"
 msgstr ""
 
-#: ../rescue.py:68 ../rescue.py:104 ../rescue.py:183
+#: ../rescue.py:69 ../rescue.py:112 ../rescue.py:206
 msgid "When finished please exit from the shell and your system will reboot."
 msgstr ""
 
-#: ../rescue.py:90 ../rescue.py:145 ../rescue.py:162
+#: ../rescue.py:96 ../rescue.py:160 ../rescue.py:168 ../rescue.py:185
 msgid "Rescue"
 msgstr ""
 
-#: ../rescue.py:91
-#, c-format
+#: ../rescue.py:97
 msgid ""
 "The rescue environment will now attempt to find your Red Hat Linux "
-"installation and mount it under the directory %s.  You can then make any "
-"changes required to your system.  If you want to proceed with this step "
-"choose 'Continue'.\n"
+"installation and mount it under the directory /mnt/sysimage.  You can then "
+"make any changes required to your system.  If you want to proceed with this "
+"step choose 'Continue'. You can also choose to mount your filesystems read-"
+"only instead of read-write by choosing 'Read-Only'.\n"
 "\n"
 "If for some reason this process fails you can choose 'Skip' and this step "
 "will be skipped and you will go directly to a command shell.\n"
 "\n"
 msgstr ""
 
-#: ../loader/loader.c:1091 ../loader/loader.c:1096 ../rescue.py:99
+#: ../rescue.py:107 ../loader/loader.c:1227 ../loader/loader.c:1235
 msgid "Continue"
 msgstr ""
 
-#: ../loader/loader.c:818 ../loader/loader.c:1178 ../rescue.py:99
-#: ../rescue.py:101 ../textw/bootdisk_text.py:68 ../textw/bootdisk_text.py:90
-#: ../textw/silo_text.py:36 ../textw/upgrade_text.py:118
+#: ../rescue.py:107 ../rescue.py:116
+msgid "Read-Only"
+msgstr ""
+
+#: ../rescue.py:107 ../rescue.py:109 ../textw/bootdisk_text.py:68
+#: ../textw/bootdisk_text.py:90 ../textw/silo_text.py:36
+#: ../textw/upgrade_text.py:120 ../loader/loader.c:916 ../loader/loader.c:1293
+#: ../loader/loader.c:1295
 msgid "Skip"
 msgstr ""
 
-#: ../rescue.py:127
+#: ../rescue.py:139
 msgid "System to Rescue"
 msgstr ""
 
-#: ../rescue.py:128 ../textw/upgrade_text.py:209
+#: ../rescue.py:140 ../textw/upgrade_text.py:211
 msgid "What partition holds the root partition of your installation?"
 msgstr ""
 
-#: ../iw/congrats_gui.py:27 ../iw/congrats_gui.py:84 ../rescue.py:130
-#: ../rescue.py:134
+#: ../rescue.py:142 ../rescue.py:146 ../iw/congrats_gui.py:29
+#: ../iw/congrats_gui.py:87
 msgid "Exit"
 msgstr ""
 
-#: ../rescue.py:146
-#, c-format
+#: ../rescue.py:161
 msgid ""
-"Your system has been mounted under %s.\n"
+"Your system had dirty filesystems which you chose not to mount.  Press "
+"return to get a shell from which you can fsck and mount your partitions.  "
+"The system will reboot automatically when you exit from the shell."
+msgstr ""
+
+#: ../rescue.py:169
+msgid ""
+"Your system has been mounted under /mnt/sysimage.\n"
 "\n"
 "Press <return> to get a shell. If you would like to make your system the "
 "root environment, run the command:\n"
 "\n"
-"\tchroot %s\n"
+"\tchroot /mnt/sysimage\n"
 "\n"
 "The system will reboot automatically when you exit from the shell."
 msgstr ""
 
-#: ../rescue.py:163
-#, c-format
+#: ../rescue.py:186
 msgid ""
 "An error occured trying to mount some or all of your system. Some of it may "
-"be mounted under %s.\n"
+"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:169
+#: ../rescue.py:192
 msgid "Rescue Mode"
 msgstr ""
 
-#: ../rescue.py:170
+#: ../rescue.py:193
 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:180
-#, c-format
-msgid "Your system is mounted under the %s directory."
+#: ../rescue.py:203
+msgid "Your system is mounted under the /mnt/sysimage directory."
 msgstr ""
 
-#: ../text.py:177
+#: ../text.py:195
 msgid "Help not available"
 msgstr ""
 
-#: ../text.py:178
+#: ../text.py:196
 msgid "No help is available for this step of the install."
 msgstr ""
 
-#: ../text.py:249
+#: ../text.py:267
 msgid "Save Crash Dump"
 msgstr ""
 
-#: ../text.py:268 ../text.py:271
+#: ../text.py:286 ../text.py:289
 msgid "Save"
 msgstr ""
 
-#: ../text.py:268 ../text.py:269
+#: ../text.py:286 ../text.py:287
 msgid "Debug"
 msgstr ""
 
-#: ../text.py:303
-msgid "Red Hat Linux (C) 2001 Red Hat, Inc."
+#: ../text.py:321
+#, python-format
+msgid "%s (C) 2002 Red Hat, Inc."
 msgstr ""
 
-#: ../text.py:306
+#: ../text.py:324
 msgid ""
 " <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""
 
-#: ../text.py:308
+#: ../text.py:326
 msgid ""
 "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
 "screen"
 msgstr ""
 
-#: ../text.py:399
+#: ../text.py:420
 msgid "Cancelled"
 msgstr ""
 
-#: ../text.py:400
+#: ../text.py:421
 msgid "I can't go to the previous step from here. You will have to try again."
 msgstr ""
 
@@ -1410,10 +1247,11 @@ msgid "Searching"
 msgstr ""
 
 #: ../upgrade.py:44
-msgid "Searching for Red Hat Linux installations..."
+#, python-format
+msgid "Searching for %s installations..."
 msgstr ""
 
-#: ../upgrade.py:77
+#: ../upgrade.py:77 ../upgrade.py:84
 msgid "Dirty Filesystems"
 msgstr ""
 
@@ -1424,24 +1262,30 @@ msgid ""
 "checked, and shut down cleanly to upgrade."
 msgstr ""
 
-#: ../upgrade.py:218 ../upgrade.py:224
+#: ../upgrade.py:85
+msgid ""
+"One or more filesystems for your Linux system was not unmounted cleanly.  "
+"Would you like to mount them anyway?"
+msgstr ""
+
+#: ../upgrade.py:225 ../upgrade.py:231
 msgid "Mount failed"
 msgstr ""
 
-#: ../upgrade.py:219
+#: ../upgrade.py:226
 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 ""
 
-#: ../upgrade.py:225
+#: ../upgrade.py:232
 msgid ""
 "One or more of the filesystems listed in the /etc/fstab of your Linux system "
 "are inconsistent and cannot be mounted.  Please fix this problem and try to "
 "upgrade again."
 msgstr ""
 
-#: ../upgrade.py:241
+#: ../upgrade.py:248
 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 "
@@ -1449,28 +1293,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../upgrade.py:252
-#, c-format
+#: ../upgrade.py:259
+#, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../upgrade.py:274
+#: ../upgrade.py:281
 msgid "Finding"
 msgstr ""
 
-#: ../upgrade.py:275
+#: ../upgrade.py:282
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: ../upgrade.py:305
+#: ../upgrade.py:312
 msgid "Rebuild of RPM database failed. You may be out of disk space?"
 msgstr ""
 
-#: ../upgrade.py:317
+#: ../upgrade.py:324
 msgid "An error occured when finding the packages to upgrade."
 msgstr ""
 
-#: ../upgrade.py:372
+#: ../upgrade.py:379
 msgid ""
 "This system appears to have third party packages installed that overlap with "
 "packages included in Red Hat Linux. Because these packages overlap, "
@@ -1479,7 +1323,7 @@ msgid ""
 "process?"
 msgstr ""
 
-#: ../upgrade.py:391
+#: ../upgrade.py:398
 msgid ""
 "This system does not have an /etc/redhat-release file.  It is possible that "
 "this is not a Red Hat Linux system. Continuing with the upgrade process may "
@@ -1487,23 +1331,23 @@ msgid ""
 "process?"
 msgstr ""
 
-#: ../videocard.py:442
+#: ../videocard.py:483
 msgid "Unknown Card"
 msgstr ""
 
-#: ../textw/xconfig_text.py:516 ../xf86config.py:860
+#: ../xf86config.py:881 ../textw/xconfig_text.py:488
 msgid "Video Card"
 msgstr ""
 
-#: ../xf86config.py:862
+#: ../xf86config.py:883
 msgid "Video Ram"
 msgstr ""
 
-#: ../xf86config.py:865
+#: ../xf86config.py:886
 msgid "X server"
 msgstr ""
 
-#: ../xf86config.py:868
+#: ../xf86config.py:889
 msgid "Unable to detect video card"
 msgstr ""
 
@@ -1515,125 +1359,122 @@ msgstr ""
 msgid "Attempting to start native X server"
 msgstr ""
 
-#: ../xserver.py:118
+#: ../xserver.py:117
 msgid "Attempting to start VGA16 X server"
 msgstr ""
 
-#: ../xserver.py:179
+#: ../xserver.py:170
 msgid "Waiting for X server to start...log located in /tmp/X.log\n"
 msgstr ""
 
-#: ../xserver.py:206
+#: ../xserver.py:197
 msgid " X server started successfully."
 msgstr ""
 
-#: ../iw/account_gui.py:27
+#: ../iw/account_gui.py:26
 msgid "Account Configuration"
 msgstr ""
 
-#: ../iw/account_gui.py:59
+#: ../iw/account_gui.py:49
 msgid "Root password accepted."
 msgstr ""
 
-#: ../iw/account_gui.py:64
+#: ../iw/account_gui.py:54
 msgid "Root password is too short."
 msgstr ""
 
-#: ../iw/account_gui.py:66
+#: ../iw/account_gui.py:56
 msgid "Root passwords do not match."
 msgstr ""
 
-#: ../iw/account_gui.py:86
+#: ../iw/account_gui.py:68
 msgid "User password accepted."
 msgstr ""
 
-#: ../iw/account_gui.py:92
+#: ../iw/account_gui.py:75
 msgid "Root account can not be added here."
 msgstr ""
 
-#: ../iw/account_gui.py:95
-msgid "System accounts can not be added here."
-msgstr ""
-
-#: ../iw/account_gui.py:97
+#: ../iw/account_gui.py:77
 msgid "Please enter user password."
 msgstr ""
 
-#: ../iw/account_gui.py:99
+#: ../iw/account_gui.py:79
 msgid "User password is too short."
 msgstr ""
 
-#: ../iw/account_gui.py:101
+#: ../iw/account_gui.py:81
 msgid "User passwords do not match."
 msgstr ""
 
-#: ../iw/account_gui.py:191
+#: ../iw/account_gui.py:148
 msgid "Add a New User"
 msgstr ""
 
-#: ../iw/account_gui.py:200 ../textw/userauth_text.py:90
+#: ../iw/account_gui.py:158 ../textw/userauth_text.py:92
 msgid "Edit User"
 msgstr ""
 
-#: ../iw/account_gui.py:231
+#: ../iw/account_gui.py:183
 msgid "User Name:"
 msgstr ""
 
-#: ../iw/account_gui.py:235 ../iw/bootloader_gui.py:236 ../loader/urls.c:392
-#: ../textw/userauth_text.py:37
-msgid "Password:"
+#: ../iw/account_gui.py:185
+msgid "Full Name:"
 msgstr ""
 
-#: ../iw/account_gui.py:239 ../textw/userauth_text.py:38
-msgid "Password (confirm):"
+#: ../iw/account_gui.py:187 ../iw/bootloaderpassword_gui.py:87
+#: ../textw/userauth_text.py:37 ../loader/urls.c:389
+msgid "Password:"
 msgstr ""
 
-#: ../iw/account_gui.py:243
-msgid "Full Name:"
+#: ../iw/account_gui.py:189 ../iw/bootloaderpassword_gui.py:91
+#: ../textw/bootloader_text.py:397
+msgid "Confirm:"
 msgstr ""
 
-#: ../iw/account_gui.py:248
+#: ../iw/account_gui.py:192
 msgid "Please enter user name"
 msgstr ""
 
-#: ../iw/account_gui.py:341
+#: ../iw/account_gui.py:273
 msgid "Enter the password for the root user (administrator) of this system."
 msgstr ""
 
-#: ../iw/account_gui.py:358
+#: ../iw/account_gui.py:289
 msgid "Root Password: "
 msgstr ""
 
-#: ../iw/account_gui.py:361
+#: ../iw/account_gui.py:292
 msgid "Confirm: "
 msgstr ""
 
-#: ../iw/account_gui.py:401
+#: ../iw/account_gui.py:326
 msgid "Account Name"
 msgstr ""
 
-#: ../iw/account_gui.py:404 ../textw/userauth_text.py:101
-#: ../textw/userauth_text.py:209
+#: ../iw/account_gui.py:326 ../textw/userauth_text.py:103
+#: ../textw/userauth_text.py:204
 msgid "Full Name"
 msgstr ""
 
-#: ../iw/account_gui.py:413 ../textw/userauth_text.py:223
+#: ../iw/account_gui.py:333 ../textw/userauth_text.py:218
 msgid "Add"
 msgstr ""
 
-#: ../iw/account_gui.py:415 ../textw/bootloader_text.py:292
-#: ../textw/fdisk_text.py:41 ../textw/partition_text.py:1000
-#: ../textw/partition_text.py:1007 ../textw/silo_text.py:216
-#: ../textw/silo_text.py:238 ../textw/userauth_text.py:224
+#: ../iw/account_gui.py:335 ../textw/bootloader_text.py:281
+#: ../textw/fdisk_text.py:41 ../textw/partition_text.py:990
+#: ../textw/silo_text.py:216 ../textw/silo_text.py:238
+#: ../textw/userauth_text.py:219
 msgid "Edit"
 msgstr ""
 
-#: ../iw/account_gui.py:418 ../textw/partition_text.py:1001
-#: ../textw/partition_text.py:1008 ../textw/userauth_text.py:223
+#: ../iw/account_gui.py:338 ../textw/partition_text.py:990
+#: ../textw/userauth_text.py:218
 msgid "Delete"
 msgstr ""
 
-#: ../iw/account_gui.py:439
+#: ../iw/account_gui.py:358
 msgid ""
 "Additional accounts can be created for other users of this system. Such "
 "accounts could be for a personal login account, or for other non-"
@@ -1641,7 +1482,7 @@ msgid ""
 "enter additional user accounts."
 msgstr ""
 
-#: ../iw/auth_gui.py:21 ../textw/userauth_text.py:324
+#: ../iw/auth_gui.py:21 ../textw/userauth_text.py:319
 msgid "Authentication Configuration"
 msgstr ""
 
@@ -1653,7 +1494,7 @@ msgstr ""
 msgid "Enable shadow passwords"
 msgstr ""
 
-#: ../iw/auth_gui.py:101 ../textw/userauth_text.py:333
+#: ../iw/auth_gui.py:101 ../textw/userauth_text.py:328
 msgid "Enable NIS"
 msgstr ""
 
@@ -1669,7 +1510,7 @@ msgstr ""
 msgid "NIS Server: "
 msgstr ""
 
-#: ../iw/auth_gui.py:139 ../textw/userauth_text.py:367
+#: ../iw/auth_gui.py:139 ../textw/userauth_text.py:362
 msgid "Enable LDAP"
 msgstr ""
 
@@ -1677,27 +1518,27 @@ msgstr ""
 msgid "Use TLS lookups"
 msgstr ""
 
-#: ../iw/auth_gui.py:143 ../textw/userauth_text.py:373
+#: ../iw/auth_gui.py:143 ../textw/userauth_text.py:368
 msgid "LDAP Server:"
 msgstr ""
 
-#: ../iw/auth_gui.py:145 ../textw/userauth_text.py:375
+#: ../iw/auth_gui.py:145 ../textw/userauth_text.py:370
 msgid "LDAP Base DN:"
 msgstr ""
 
-#: ../iw/auth_gui.py:172 ../textw/userauth_text.py:396
+#: ../iw/auth_gui.py:172 ../textw/userauth_text.py:391
 msgid "Enable Kerberos"
 msgstr ""
 
-#: ../iw/auth_gui.py:176 ../textw/userauth_text.py:403
+#: ../iw/auth_gui.py:176 ../textw/userauth_text.py:398
 msgid "Realm:"
 msgstr ""
 
-#: ../iw/auth_gui.py:178 ../textw/userauth_text.py:405
+#: ../iw/auth_gui.py:178 ../textw/userauth_text.py:400
 msgid "KDC:"
 msgstr ""
 
-#: ../iw/auth_gui.py:180 ../textw/userauth_text.py:407
+#: ../iw/auth_gui.py:180 ../textw/userauth_text.py:402
 msgid "Admin Server:"
 msgstr ""
 
@@ -1734,9 +1575,9 @@ msgid "Boot Disk Creation"
 msgstr ""
 
 #: ../iw/bootdisk_gui.py:54 ../textw/bootdisk_text.py:75
+#, python-format
 msgid ""
-"The boot disk allows you to boot your Red Hat Linux system from a floppy "
-"diskette.\n"
+"The boot disk allows you to boot your %s system from a floppy diskette.\n"
 "\n"
 "Please remove any diskettes from the floppy drive and insert a blank "
 "diskette. All data will be ERASED during creation of the boot disk."
@@ -1753,14 +1594,13 @@ msgstr ""
 msgid "Skip boot disk creation"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:43 ../iw/bootloader_gui.py:461
-#: ../textw/bootloader_text.py:50 ../textw/bootloader_text.py:118
-#: ../textw/bootloader_text.py:175 ../textw/bootloader_text.py:301
-#: ../textw/bootloader_text.py:390
+#: ../iw/bootloader_gui.py:29 ../textw/bootloader_text.py:50
+#: ../textw/bootloader_text.py:117 ../textw/bootloader_text.py:168
+#: ../textw/bootloader_text.py:290 ../textw/bootloader_text.py:379
 msgid "Boot Loader Configuration"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:58 ../textw/bootloader_text.py:135
+#: ../iw/bootloader_gui.py:59 ../textw/bootloader_text.py:134
 msgid ""
 "Forcing the use of LBA32 for your bootloader when not supported by the BIOS "
 "can cause your machine to be unable to boot.  We highly recommend you create "
@@ -1769,248 +1609,168 @@ msgid ""
 "Would you like to continue and force LBA32 mode?"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:120
-msgid "Select framebuffer resolution"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:126
-msgid ""
-"Please select the resolution and bit depth that you would prefer to use as "
-"your framebuffer settings."
-msgstr ""
-
-#: ../iw/bootloader_gui.py:134 ../textw/xconfig_text.py:45
-msgid "Resolution"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:152
-msgid "Bit Depth"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:160
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:196
-msgid "No Framebuffer"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:219
-msgid "Enter Boot Loader Password"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:225 ../textw/bootloader_text.py:385
-msgid ""
-"A boot loader password prevents users from passing arbitrary options to the "
-"kernel.  For highest security, we recommend setting a password, but this is "
-"not necessary for more casual users."
-msgstr ""
-
-#: ../iw/bootloader_gui.py:241 ../textw/bootloader_text.py:408
-msgid "Confirm:"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:261
-msgid "Passwords don't match"
+#: ../iw/bootloader_gui.py:245 ../iw/bootloader_gui.py:435
+#: ../iw/silo_gui.py:135 ../iw/silo_gui.py:286 ../iw/upgrade_swap_gui.py:123
+#: ../textw/upgrade_text.py:109
+msgid "Partition"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:262 ../textw/bootloader_text.py:438
-msgid "Passwords do not match"
+#: ../iw/bootloader_gui.py:248 ../iw/bootloader_gui.py:436
+#: ../iw/partition_gui.py:1562 ../iw/silo_gui.py:140 ../iw/silo_gui.py:287
+#: ../textw/partition_text.py:986
+msgid "Type"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:271 ../textw/bootloader_text.py:448
-msgid ""
-"Your boot loader password is less than six characters.  We recommend a "
-"longer boot loader password.\n"
-"\n"
-"Would you like to continue with this password?"
+#: ../iw/bootloader_gui.py:308
+msgid "Install Boot Loader record on:"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:290
-msgid "No password"
+#: ../iw/bootloader_gui.py:329
+msgid "Kernel Parameters"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:292
-msgid "Change password"
+#: ../iw/bootloader_gui.py:340 ../textw/bootloader_text.py:111
+msgid "Force use of LBA32 (not normally required)"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:352
+#: ../iw/bootloader_gui.py:349
 msgid ""
 "Please select the boot loader that the computer will use.  GRUB is the "
 "default boot loader. However, if you do not wish to overwrite your current "
 "boot loader, select \"Do not install a boot loader.\"  "
 msgstr ""
 
-#: ../iw/bootloader_gui.py:360
-msgid "Use _GRUB as the boot loader"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:362
-msgid "Use _LILO as the boot loader"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:364
-msgid "Do not install a boot loader"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:395
-msgid ""
-"The following affect options passed to the kernel on boot.  FIXME.Obviously "
-"there needs to be more explanatory text here and throughout and better "
-"spacing"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:402
-msgid "Use Framebuffer Mode"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:420
-msgid "Use a Boot Loader Password"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:421
-msgid "Set Password"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:436
-msgid "Force LBA32"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:440
-msgid "General kernel parameters"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:490
-msgid "Image"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:497
-msgid ""
-"The label is what is displayed in the boot loader to choose to boot this "
-"operating system.  The device is the device which it boots from."
-msgstr ""
-
-#: ../iw/bootloader_gui.py:509
-msgid "Label"
+#: ../iw/bootloader_gui.py:356 ../iw/silo_gui.py:263
+#: ../textw/bootloader_text.py:266 ../textw/silo_text.py:207
+#: ../textw/xconfig_text.py:389 ../textw/xconfig_text.py:396
+#: ../textw/xconfig_text.py:492 ../textw/xconfig_text.py:493
+#: ../textw/xconfig_text.py:512 ../textw/xconfig_text.py:513
+msgid "Default"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:515 ../iw/mouse_gui.py:92
-#: ../iw/partition_gui.py:315 ../iw/silo_gui.py:263
-#: ../textw/bootloader_text.py:204 ../textw/bootloader_text.py:276
-#: ../textw/mouse_text.py:38 ../textw/silo_text.py:142
-#: ../textw/silo_text.py:207
+#: ../iw/bootloader_gui.py:356 ../iw/mouse_gui.py:159
+#: ../iw/partition_gui.py:1561 ../iw/silo_gui.py:263
+#: ../textw/bootloader_text.py:196 ../textw/bootloader_text.py:266
+#: ../textw/mouse_text.py:38 ../textw/partition_text.py:986
+#: ../textw/silo_text.py:142 ../textw/silo_text.py:207
 msgid "Device"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:525
-msgid "Default Boot Target"
-msgstr ""
-
-#: ../iw/bootloader_gui.py:549
-msgid "You must specify a label for the entry"
+#: ../iw/bootloader_gui.py:357 ../iw/silo_gui.py:263
+#: ../textw/bootloader_text.py:266 ../textw/silo_text.py:207
+msgid "Partition type"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:558
-msgid "Boot label contains illegal characters"
+#: ../iw/bootloader_gui.py:357 ../iw/bootloader_gui.py:446
+#: ../iw/silo_gui.py:263 ../iw/silo_gui.py:298 ../textw/bootloader_text.py:197
+#: ../textw/bootloader_text.py:266 ../textw/silo_text.py:143
+#: ../textw/silo_text.py:207
+msgid "Boot label"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:582
-msgid "Duplicate Label"
+#: ../iw/bootloader_gui.py:361
+msgid "Use GRUB as the boot loader"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:583
-msgid "This label is already in use for another boot entry."
+#: ../iw/bootloader_gui.py:362
+msgid "Use LILO as the boot loader"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:596
-msgid "Duplicate Device"
+#: ../iw/bootloader_gui.py:363
+msgid "Do not install a boot loader"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:597
-msgid "This device is already being used for another boot entry."
+#: ../iw/bootloader_gui.py:443 ../iw/silo_gui.py:294
+msgid "Default boot image"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:650
-msgid "Cannot Delete"
+#: ../iw/bootloaderpassword_gui.py:24
+msgid "Boot Loader Password Configuration"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:651
+#: ../iw/bootloaderpassword_gui.py:30 ../textw/bootloader_text.py:437
 msgid ""
-"You cannot remove the system being installed from the bootloader options."
+"Your boot loader password is less than six characters.  We recommend a "
+"longer boot loader password.\n"
+"\n"
+"Would you like to continue with this password?"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:762
-msgid "Insert some text about booting other operating systems"
+#: ../iw/bootloaderpassword_gui.py:54
+msgid "Password accepted."
 msgstr ""
 
-#: ../iw/bootloader_gui.py:815 ../iw/partition_gui.py:2072
-msgid "_Add"
+#: ../iw/bootloaderpassword_gui.py:59
+msgid "Password is too short."
 msgstr ""
 
-#: ../iw/bootloader_gui.py:819 ../iw/partition_gui.py:2075
-#: ../iw/partition_gui.py:2230 ../iw/partition_gui.py:2236
-msgid "_Edit"
+#: ../iw/bootloaderpassword_gui.py:61
+msgid "Passwords do not match."
 msgstr ""
 
-#: ../iw/bootloader_gui.py:823 ../iw/partition_gui.py:2078
-#: ../iw/partition_gui.py:2231 ../iw/partition_gui.py:2237
-msgid "_Delete"
+#: ../iw/bootloaderpassword_gui.py:77 ../textw/bootloader_text.py:374
+msgid ""
+"A boot loader password prevents users from passing arbitrary options to the "
+"kernel.  For highest security, we recommend setting a password, but this is "
+"not necessary for more casual users."
 msgstr ""
 
-#: ../iw/bootloader_gui.py:837
-msgid "Install Boot Loader record on:"
+#: ../iw/bootloaderpassword_gui.py:84
+msgid "Use a GRUB Password?"
 msgstr ""
 
-#: ../iw/bootloader_gui.py:878
-msgid "Blah, this is the BIOS drive order, more information, etc"
+#: ../iw/bootloaderpassword_gui.py:109
+msgid "Please enter password"
 msgstr ""
 
-#: ../iw/confirm_gui.py:54
+#: ../iw/confirm_gui.py:55
 msgid "About to Install"
 msgstr ""
 
-#: ../iw/confirm_gui.py:59
-msgid "Click next to begin installation of Red Hat Linux."
+#: ../iw/confirm_gui.py:60
+#, python-format
+msgid "Click next to begin installation of %s."
 msgstr ""
 
-#: ../iw/confirm_gui.py:60
+#: ../iw/confirm_gui.py:61
 msgid ""
-"A complete log of your installation will be in /tmp/install.log after "
+"A complete log of your installation will be in /root/install.log after "
 "rebooting your system. You may want to keep this file for later reference. A "
 "kickstart file representing the choices you have made will be in /root/"
 "anaconda-ks.cfg."
 msgstr ""
 
-#: ../iw/confirm_gui.py:67
+#: ../iw/confirm_gui.py:68
 msgid "About to Upgrade"
 msgstr ""
 
-#: ../iw/confirm_gui.py:72
-msgid "Click next to begin upgrade of Red Hat Linux."
+#: ../iw/confirm_gui.py:73
+#, python-format
+msgid "Click next to begin upgrade of %s."
 msgstr ""
 
-#: ../iw/confirm_gui.py:73 ../textw/confirm_text.py:33
+#: ../iw/confirm_gui.py:74 ../textw/confirm_text.py:33
 msgid ""
-"A complete log of your upgrade will be in /tmp/upgrade.log after rebooting "
+"A complete log of your upgrade will be in /root/upgrade.log after rebooting "
 "your system. You may want to keep this file for later reference."
 msgstr ""
 
-#: ../iw/congrats_gui.py:21 ../iw/congrats_gui.py:82
+#: ../iw/congrats_gui.py:23 ../iw/congrats_gui.py:85
 msgid "Congratulations"
 msgstr ""
 
-#: ../iw/congrats_gui.py:46 ../textw/complete_text.py:27
+#: ../iw/congrats_gui.py:48 ../textw/complete_text.py:30
+#, python-format
 msgid ""
-"If you created a boot disk to use to boot your Red Hat Linux system, insert "
-"it before you press <Enter> to reboot.\n"
+"If you created a boot disk to use to boot your %s system, insert it before "
+"you press <Enter> to reboot.\n"
 "\n"
 msgstr ""
 
-#: ../iw/congrats_gui.py:54
-#, c-format
+#: ../iw/congrats_gui.py:56
+#, python-format
 msgid ""
-"Congratulations, your Red Hat Linux installation is complete.\n"
+"Congratulations, your %s installation is complete.\n"
 "\n"
 "Remove any floppy diskettes you used during the installation process and "
 "press <Enter> to reboot your system. \n"
@@ -2018,240 +1778,241 @@ msgid ""
 "%sFor information on errata (updates and bug fixes), visit http://www.redhat."
 "com/errata.\n"
 "\n"
-"Information on using and configuring your system is available in the Red Hat "
-"Linux manuals at http://www.redhat.com/docs."
+"Information on using and configuring your system is available in the %s "
+"manuals at http://www.redhat.com/docs."
 msgstr ""
 
-#: ../iw/congrats_gui.py:101
+#: ../iw/congrats_gui.py:104
+#, python-format
 msgid ""
 "Congratulations, configuration is complete.\n"
 "\n"
 "For information on errata (updates and bug fixes), visit http://www.redhat."
 "com/errata.\n"
 "\n"
-"Information on using and configuring your system is available in the Red Hat "
-"Linux manuals at http://www.redhat.com/docs."
+"Information on using and configuring your system is available in the %s "
+"manuals at http://www.redhat.com/docs."
 msgstr ""
 
-#: ../iw/dependencies_gui.py:21
+#: ../iw/dependencies_gui.py:20
 msgid "Unresolved Dependencies"
 msgstr ""
 
-#: ../iw/dependencies_gui.py:34 ../iw/package_gui.py:238
-#: ../iw/package_gui.py:424 ../textw/packages_text.py:24
-#: ../textw/packages_text.py:270
-#, c-format
+#: ../iw/dependencies_gui.py:33 ../iw/package_gui.py:519
+#: ../textw/packages_text.py:24 ../textw/packages_text.py:270
+#, python-format
 msgid "Total install size: %s"
 msgstr ""
 
-#: ../iw/dependencies_gui.py:74 ../iw/package_gui.py:322
-#: ../iw/progress_gui.py:205 ../textw/packages_text.py:301
+#: ../iw/dependencies_gui.py:66 ../iw/package_gui.py:425
+#: ../iw/progress_gui.py:191 ../textw/packages_text.py:301
 msgid "Package"
 msgstr ""
 
-#: ../iw/dependencies_gui.py:76 ../textw/packages_text.py:301
+#: ../iw/dependencies_gui.py:66 ../textw/packages_text.py:301
 msgid "Requirement"
 msgstr ""
 
-#: ../iw/dependencies_gui.py:90 ../textw/packages_text.py:316
+#: ../iw/dependencies_gui.py:83 ../textw/packages_text.py:316
 msgid "Install packages to satisfy dependencies"
 msgstr ""
 
-#: ../iw/dependencies_gui.py:93 ../textw/packages_text.py:317
+#: ../iw/dependencies_gui.py:86 ../textw/packages_text.py:317
 msgid "Do not install packages that have dependencies"
 msgstr ""
 
-#: ../iw/dependencies_gui.py:97 ../textw/packages_text.py:318
+#: ../iw/dependencies_gui.py:90 ../textw/packages_text.py:318
 msgid "Ignore package dependencies"
 msgstr ""
 
-#: ../iw/examine_gui.py:23
+#: ../iw/examine_gui.py:24
 msgid "Upgrade Examine"
 msgstr ""
 
-#: ../iw/examine_gui.py:50
+#: ../iw/examine_gui.py:51
 msgid ""
 "You don't have any Linux partitions.\n"
 "You can't upgrade this sytem!"
 msgstr ""
 
-#: ../iw/examine_gui.py:60
+#: ../iw/examine_gui.py:61
 msgid "Please select the device containing the root filesystem: "
 msgstr ""
 
-#: ../iw/examine_gui.py:88 ../textw/upgrade_text.py:223
-#, c-format
-msgid "Upgrading the Red Hat Linux installation on partition /dev/%s"
+#: ../iw/examine_gui.py:89 ../textw/upgrade_text.py:225
+#, python-format
+msgid "Upgrading the %s installation on partition /dev/%s"
 msgstr ""
 
-#: ../iw/examine_gui.py:94
+#: ../iw/examine_gui.py:95
 msgid "Customize packages to be upgraded"
 msgstr ""
 
-#: ../iw/fdasd_gui.py:27
-msgid "fdasd"
-msgstr ""
-
-#: ../iw/fdasd_gui.py:28
-msgid "Select drive to run fdasd on"
-msgstr ""
-
 #: ../iw/fdisk_gui.py:26 ../textw/partmethod_text.py:28
 msgid "fdisk"
 msgstr ""
 
-#: ../iw/fdisk_gui.py:93
+#: ../iw/fdisk_gui.py:94
 msgid "Select drive to run fdisk on"
 msgstr ""
 
-#: ../iw/firewall_gui.py:23 ../textw/firewall_text.py:26
+#: ../iw/firewall_gui.py:23 ../textw/firewall_text.py:25
 msgid "Firewall Configuration"
 msgstr ""
 
-#: ../iw/firewall_gui.py:112
-#, c-format
-msgid ""
-"Invalid port given: %s.  The proper format is 'port:protocol'.  For example, "
-"'1234:udp'"
+#: ../iw/firewall_gui.py:129
+msgid "Warning: "
 msgstr ""
 
-#: ../iw/firewall_gui.py:116
-msgid "Warning: Bad Token"
+#: ../iw/firewall_gui.py:129
+msgid " is an invalid port."
 msgstr ""
 
-#: ../iw/firewall_gui.py:170
+#: ../iw/firewall_gui.py:132
+msgid "The format is 'port:protocol'.  For example, '1234:udp'"
+msgstr ""
+
+#: ../iw/firewall_gui.py:219
 msgid "Please choose your security level:  "
 msgstr ""
 
-#: ../iw/firewall_gui.py:179 ../textw/firewall_text.py:48
+#: ../iw/firewall_gui.py:228 ../textw/firewall_text.py:47
 msgid "High"
 msgstr ""
 
-#: ../iw/firewall_gui.py:180 ../textw/firewall_text.py:51
+#: ../iw/firewall_gui.py:229 ../textw/firewall_text.py:50
 msgid "Medium"
 msgstr ""
 
-#: ../iw/firewall_gui.py:181 ../textw/firewall_text.py:54
+#: ../iw/firewall_gui.py:230 ../textw/firewall_text.py:53
 msgid "No firewall"
 msgstr ""
 
-#: ../iw/firewall_gui.py:197
+#: ../iw/firewall_gui.py:246
 msgid "Use default firewall rules"
 msgstr ""
 
-#: ../iw/firewall_gui.py:198 ../textw/firewall_text.py:24
+#: ../iw/firewall_gui.py:247 ../textw/firewall_text.py:23
 msgid "Customize"
 msgstr ""
 
-#: ../iw/firewall_gui.py:211
+#: ../iw/firewall_gui.py:260
 msgid "Trusted devices:"
 msgstr ""
 
-#: ../iw/firewall_gui.py:235 ../textw/firewall_text.py:85
+#: ../iw/firewall_gui.py:285 ../textw/firewall_text.py:84
 msgid "Allow incoming:"
 msgstr ""
 
-#: ../iw/firewall_gui.py:258
+#: ../iw/firewall_gui.py:314
 msgid "Other ports:"
 msgstr ""
 
+#: ../iw/format_gui.py:25
+msgid "Choose partitions to Format"
+msgstr ""
+
 #: ../iw/installpath_gui.py:35 ../textw/installpath_text.py:42
 msgid "Installation Type"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:27
+#: ../iw/keyboard_gui.py:26
 msgid "Keyboard Configuration"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:107
+#: ../iw/keyboard_gui.py:103
 msgid "Which model keyboard is attached to the computer?"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:113
+#: ../iw/keyboard_gui.py:112
 msgid "Model"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:146
+#: ../iw/keyboard_gui.py:132
 msgid "Layout"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:181
+#: ../iw/keyboard_gui.py:152
 msgid "Dead Keys"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:190
+#: ../iw/keyboard_gui.py:162
 msgid "Enable dead keys"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:193
+#: ../iw/keyboard_gui.py:163
 msgid "Disable dead keys"
 msgstr ""
 
-#: ../iw/keyboard_gui.py:226
+#: ../iw/keyboard_gui.py:176
 msgid "Test your selection here:"
 msgstr ""
 
-#: ../iw/language_gui.py:61 ../textw/language_text.py:39
+#: ../iw/language_gui.py:49 ../textw/language_text.py:39 ../loader/lang.c:306
 msgid "What language would you like to use during the installation process?"
 msgstr ""
 
-#: ../iw/language_support_gui.py:21
+#: ../iw/language_support_gui.py:23
 msgid "Additional Language Support"
 msgstr ""
 
-#: ../iw/language_support_gui.py:124
+#: ../iw/language_support_gui.py:143
 msgid "Choose the default language for this system:   "
 msgstr ""
 
-#: ../iw/language_support_gui.py:135
+#: ../iw/language_support_gui.py:155
+msgid "Currently installed languages:"
+msgstr ""
+
+#: ../iw/language_support_gui.py:157
 msgid "Choose additional languages you would like to use on this system:"
 msgstr ""
 
-#: ../iw/language_support_gui.py:183
+#: ../iw/language_support_gui.py:206
 msgid "Select all"
 msgstr ""
 
-#: ../iw/language_support_gui.py:189 ../textw/language_text.py:115
+#: ../iw/language_support_gui.py:212 ../textw/language_text.py:120
 msgid "Reset"
 msgstr ""
 
-#: ../iw/language_support_gui.py:203
+#: ../iw/language_support_gui.py:226
 msgid "Select as default"
 msgstr ""
 
-#: ../iw/mouse_gui.py:23
+#: ../iw/mouse_gui.py:24
 msgid "Mouse Configuration"
 msgstr ""
 
-#: ../iw/mouse_gui.py:79 ../textw/mouse_text.py:20
+#: ../iw/mouse_gui.py:148 ../textw/mouse_text.py:20
 msgid "/dev/ttyS0 (COM1 under DOS)"
 msgstr ""
 
-#: ../iw/mouse_gui.py:80 ../textw/mouse_text.py:21
+#: ../iw/mouse_gui.py:149 ../textw/mouse_text.py:21
 msgid "/dev/ttyS1 (COM2 under DOS)"
 msgstr ""
 
-#: ../iw/mouse_gui.py:81 ../textw/mouse_text.py:22
+#: ../iw/mouse_gui.py:150 ../textw/mouse_text.py:22
 msgid "/dev/ttyS2 (COM3 under DOS)"
 msgstr ""
 
-#: ../iw/mouse_gui.py:82 ../textw/mouse_text.py:23
+#: ../iw/mouse_gui.py:151 ../textw/mouse_text.py:23
 msgid "/dev/ttyS3 (COM4 under DOS)"
 msgstr ""
 
-#: ../iw/mouse_gui.py:94
-msgid "Port"
+#: ../iw/mouse_gui.py:153
+msgid "Emulate 3 Buttons"
 msgstr ""
 
-#: ../iw/mouse_gui.py:222
-msgid "Emulate 3 Buttons"
+#: ../iw/mouse_gui.py:159
+msgid "Port"
 msgstr ""
 
-#: ../iw/mouse_gui.py:236
+#: ../iw/mouse_gui.py:229
 msgid "Which model mouse is attached to the computer?"
 msgstr ""
 
-#: ../iw/network_gui.py:21 ../textw/network_text.py:129
+#: ../iw/network_gui.py:21
 msgid "Network Configuration"
 msgstr ""
 
@@ -2259,7 +2020,7 @@ msgstr ""
 msgid "Configure using DHCP"
 msgstr ""
 
-#: ../iw/network_gui.py:183
+#: ../iw/network_gui.py:183 ../textw/network_text.py:73
 msgid "Activate on boot"
 msgstr ""
 
@@ -2267,11 +2028,11 @@ msgstr ""
 msgid "IP Address"
 msgstr ""
 
-#: ../iw/network_gui.py:195 ../loader/net.c:817
+#: ../iw/network_gui.py:195 ../loader/net.c:814
 msgid "Netmask"
 msgstr ""
 
-#: ../iw/network_gui.py:196 ../loader/loader.c:310
+#: ../iw/network_gui.py:196 ../loader/loader.c:316
 msgid "Network"
 msgstr ""
 
@@ -2279,539 +2040,403 @@ msgstr ""
 msgid "Broadcast"
 msgstr ""
 
-#: ../iw/network_gui.py:200
-msgid "Point to Point (IP)"
-msgstr ""
-
-#: ../iw/network_gui.py:256 ../loader/net.c:625 ../loader/net.c:819
-#: ../textw/network_text.py:193
+#: ../iw/network_gui.py:251 ../textw/network_text.py:207 ../loader/net.c:622
+#: ../loader/net.c:816
 msgid "Hostname"
 msgstr ""
 
-#: ../iw/network_gui.py:256
+#: ../iw/network_gui.py:251
 msgid "Gateway"
 msgstr ""
 
-#: ../iw/network_gui.py:256
+#: ../iw/network_gui.py:251
 msgid "Primary DNS"
 msgstr ""
 
-#: ../iw/network_gui.py:257
+#: ../iw/network_gui.py:252
 msgid "Secondary DNS"
 msgstr ""
 
-#: ../iw/network_gui.py:257
-msgid "Ternary DNS"
+#: ../iw/network_gui.py:252
+msgid "Tertiary DNS"
 msgstr ""
 
-#: ../iw/package_gui.py:44 ../textw/packages_text.py:237
+#: ../iw/package_gui.py:41 ../textw/packages_text.py:237
 msgid "Individual Package Selection"
 msgstr ""
 
-#: ../iw/package_gui.py:74
-msgid "All Packages"
+#: ../iw/package_gui.py:275
+msgid "Total install size: "
 msgstr ""
 
-#: ../iw/package_gui.py:305
+#: ../iw/package_gui.py:411
 msgid "Tree View"
 msgstr ""
 
-#: ../iw/package_gui.py:307
+#: ../iw/package_gui.py:413
 msgid "Flat View"
 msgstr ""
 
-#: ../iw/package_gui.py:324 ../iw/partition_gui.py:318
-#: ../iw/partition_gui.py:2058
+#: ../iw/package_gui.py:427 ../iw/partition_gui.py:1562
 msgid "Size (MB)"
 msgstr ""
 
-#: ../iw/package_gui.py:359
+#: ../iw/package_gui.py:458
 msgid "Total size: "
 msgstr ""
 
-#: ../iw/package_gui.py:362
+#: ../iw/package_gui.py:461
 msgid "Select all in group"
 msgstr ""
 
-#: ../iw/package_gui.py:366
+#: ../iw/package_gui.py:465
 msgid "Unselect all in group"
 msgstr ""
 
-#: ../iw/package_gui.py:403 ../textw/packages_text.py:57
+#: ../iw/package_gui.py:498 ../textw/packages_text.py:57
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../iw/package_gui.py:487 ../textw/packages_text.py:50
+#: ../iw/package_gui.py:582 ../textw/packages_text.py:50
 msgid "Select individual packages"
 msgstr ""
 
-#: ../iw/partition_gui.py:316
-msgid "Start"
-msgstr ""
-
-#: ../iw/partition_gui.py:317
-msgid "End"
-msgstr ""
-
-#: ../iw/partition_gui.py:319 ../iw/silo_gui.py:140 ../iw/silo_gui.py:287
-msgid "Type"
-msgstr ""
-
-#: ../iw/partition_gui.py:321
-msgid "Format"
-msgstr ""
-
-#: ../iw/partition_gui.py:455 ../iw/partition_gui.py:476
-#: ../iw/partition_gui.py:478 ../textw/partition_text.py:190
-#: ../textw/partition_text.py:192 ../textw/partition_text.py:194
-#: ../textw/partition_text.py:219
+#: ../iw/partition_gui.py:323 ../iw/partition_gui.py:344
+#: ../iw/partition_gui.py:346 ../textw/partition_text.py:187
+#: ../textw/partition_text.py:189 ../textw/partition_text.py:191
+#: ../textw/partition_text.py:216
 msgid "<Not Applicable>"
 msgstr ""
 
-#: ../iw/partition_gui.py:686 ../textw/fdasd_text.py:50
-#: ../textw/fdisk_text.py:39
+#: ../iw/partition_gui.py:493 ../textw/fdisk_text.py:39
 msgid "Disk Setup"
 msgstr ""
 
-#: ../iw/partition_gui.py:749
+#: ../iw/partition_gui.py:553
 msgid ""
 "The following critical errors exist with your requested partitioning scheme."
 msgstr ""
 
-#: ../iw/partition_gui.py:752
+#: ../iw/partition_gui.py:556
+#, python-format
 msgid ""
-"These errors must be corrected prior to continuing with your install of Red "
-"Hat Linux."
+"These errors must be corrected prior to continuing with your install of %s."
 msgstr ""
 
-#: ../iw/partition_gui.py:759
+#: ../iw/partition_gui.py:563
 msgid "Partitioning Errors"
 msgstr ""
 
-#: ../iw/partition_gui.py:765
+#: ../iw/partition_gui.py:569
 msgid "The following warnings exist with your requested partition scheme."
 msgstr ""
 
-#: ../iw/partition_gui.py:767
+#: ../iw/partition_gui.py:571
 msgid "Would you like to continue with your requested partitioning scheme?"
 msgstr ""
 
-#: ../iw/partition_gui.py:773
+#: ../iw/partition_gui.py:577
 msgid "Partitioning Warnings"
 msgstr ""
 
-#: ../iw/partition_gui.py:795
+#: ../iw/partition_gui.py:599
 msgid "Format Warnings"
 msgstr ""
 
-#: ../iw/partition_gui.py:831
-#, c-format
-msgid "LVM: %s"
-msgstr ""
-
-#: ../iw/partition_gui.py:838
-msgid "LVM Volume Group"
-msgstr ""
-
-#: ../iw/partition_gui.py:877 ../iw/partition_gui.py:965
-#: ../textw/partition_text.py:96 ../textw/partition_text.py:148
-msgid "None"
-msgstr ""
-
-#: ../iw/partition_gui.py:880 ../textw/partition_text.py:150
-#, c-format
-msgid "RAID Device %s"
-msgstr ""
-
-#: ../iw/partition_gui.py:945 ../textw/partition_text.py:78
-#: ../textw/partition_text.py:117
+#: ../iw/partition_gui.py:652 ../textw/partition_text.py:75
+#: ../textw/partition_text.py:114
 msgid "Free space"
 msgstr ""
 
-#: ../iw/partition_gui.py:947 ../textw/partition_text.py:80
+#: ../iw/partition_gui.py:654 ../textw/partition_text.py:77
 msgid "Extended"
 msgstr ""
 
-#: ../iw/partition_gui.py:949 ../textw/partition_text.py:82
+#: ../iw/partition_gui.py:656 ../textw/partition_text.py:79
 msgid "software RAID"
 msgstr ""
 
-#: ../iw/partition_gui.py:967
+#: ../iw/partition_gui.py:674 ../iw/partition_gui.py:734
+#: ../textw/partition_text.py:93 ../textw/partition_text.py:145
+msgid "None"
+msgstr ""
+
+#: ../iw/partition_gui.py:676
 msgid "Free"
 msgstr ""
 
-#: ../iw/partition_gui.py:1052
+#: ../iw/partition_gui.py:736 ../textw/partition_text.py:147
+#, python-format
+msgid "RAID Device %s"
+msgstr ""
+
+#: ../iw/partition_gui.py:815
 msgid "Additional Size Options"
 msgstr ""
 
-#: ../iw/partition_gui.py:1057
+#: ../iw/partition_gui.py:820
 msgid "Fixed size"
 msgstr ""
 
-#: ../iw/partition_gui.py:1059
+#: ../iw/partition_gui.py:821
 msgid "Fill all space up to (MB):"
 msgstr ""
 
-#: ../iw/partition_gui.py:1069
+#: ../iw/partition_gui.py:829
 msgid "Fill to maximum allowable size"
 msgstr ""
 
-#: ../iw/partition_gui.py:1099 ../textw/partition_text.py:545
+#: ../iw/partition_gui.py:858 ../textw/partition_text.py:542
 msgid "Add Partition"
 msgstr ""
 
-#: ../iw/partition_gui.py:1115 ../iw/partition_gui.py:1624
-#: ../textw/partition_text.py:209
+#: ../iw/partition_gui.py:875 ../iw/partition_gui.py:1366
+#: ../textw/partition_text.py:206
 msgid "Mount Point:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1123 ../textw/partition_text.py:608
+#: ../iw/partition_gui.py:883 ../textw/partition_text.py:605
 msgid "Filesystem Type:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1131
+#: ../iw/partition_gui.py:891
 msgid "Original Filesystem Type:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1142
+#: ../iw/partition_gui.py:900
 msgid "Unknown"
 msgstr ""
 
-#: ../iw/partition_gui.py:1154 ../textw/partition_text.py:264
+#: ../iw/partition_gui.py:912 ../textw/partition_text.py:261
 msgid "Allowable Drives:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1167
+#: ../iw/partition_gui.py:923
 msgid "Drive:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1176
+#: ../iw/partition_gui.py:932
 msgid "Original Filesystem Label:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1188 ../iw/partition_gui.py:1204
-#: ../iw/partition_gui.py:1242 ../iw/partition_gui.py:1818
-#: ../textw/partition_text.py:286 ../textw/partition_text.py:369
-#: ../textw/partition_text.py:624
+#: ../iw/partition_gui.py:943 ../iw/partition_gui.py:958
+#: ../iw/partition_gui.py:994 ../textw/partition_text.py:283
+#: ../textw/partition_text.py:366 ../textw/partition_text.py:621
 msgid "Size (MB):"
 msgstr ""
 
-#: ../iw/partition_gui.py:1209 ../textw/partition_text.py:349
+#: ../iw/partition_gui.py:963 ../textw/partition_text.py:346
 msgid "Start Cylinder:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1226 ../textw/partition_text.py:362
+#: ../iw/partition_gui.py:979 ../textw/partition_text.py:359
 msgid "End Cylinder:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1258
+#: ../iw/partition_gui.py:1010
 msgid "How would you like to prepare the filesystem on this partition?"
 msgstr ""
 
-#: ../iw/partition_gui.py:1267 ../textw/partition_text.py:452
+#: ../iw/partition_gui.py:1019 ../textw/partition_text.py:449
 msgid "Leave unchanged (preserve data)"
 msgstr ""
 
-#: ../iw/partition_gui.py:1273
+#: ../iw/partition_gui.py:1024
 msgid "Format partition as:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1293
+#: ../iw/partition_gui.py:1044
 msgid "Migrate partition to:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1317
+#: ../iw/partition_gui.py:1068
 msgid "Check for bad blocks?"
 msgstr ""
 
-#: ../iw/partition_gui.py:1352 ../textw/partition_text.py:587
+#: ../iw/partition_gui.py:1101 ../textw/partition_text.py:584
 msgid "Force to be a primary partition"
 msgstr ""
 
-#: ../iw/partition_gui.py:1360 ../textw/partition_text.py:450
-#: ../textw/partition_text.py:590
+#: ../iw/partition_gui.py:1108 ../textw/partition_text.py:447
+#: ../textw/partition_text.py:587
 msgid "Check for bad blocks"
 msgstr ""
 
-#: ../iw/partition_gui.py:1439 ../iw/partition_gui.py:1448
-#: ../iw/partition_gui.py:1486 ../iw/partition_gui.py:1761
-#: ../textw/partition_text.py:754 ../textw/partition_text.py:776
+#: ../iw/partition_gui.py:1178 ../iw/partition_gui.py:1187
+#: ../iw/partition_gui.py:1225 ../iw/partition_gui.py:1496
+#: ../textw/partition_text.py:751 ../textw/partition_text.py:773
 #: ../textw/partition_text.py:902
 msgid "Error With Request"
 msgstr ""
 
-#: ../iw/partition_gui.py:1440
-msgid "The end cylinder must be greater than the start cylinder."
-msgstr ""
-
-#: ../iw/partition_gui.py:1543 ../textw/partition_text.py:168
-#, c-format
+#: ../iw/partition_gui.py:1292 ../textw/partition_text.py:165
+#, python-format
 msgid "Could not allocate requested partitions: %s."
 msgstr ""
 
-#: ../iw/partition_gui.py:1551
-#, c-format
-msgid "Warning: %s."
+#: ../iw/partition_gui.py:1298 ../textw/partition_text.py:169
+msgid "Modify Partition"
 msgstr ""
 
-#: ../iw/partition_gui.py:1553
-msgid "_Modify Partition"
+#: ../iw/partition_gui.py:1299 ../textw/partition_text.py:169
+msgid "Add anyway"
 msgstr ""
 
-#: ../iw/partition_gui.py:1555
-msgid "_Continue"
+#: ../iw/partition_gui.py:1303
+#, python-format
+msgid "Warning: %s."
 msgstr ""
 
-#: ../iw/partition_gui.py:1603 ../textw/partition_text.py:831
-msgid "At least two software RAID partitions are needed."
+#: ../iw/partition_gui.py:1340 ../textw/partition_text.py:807
+msgid "Make RAID Device"
 msgstr ""
 
-#: ../iw/partition_gui.py:1612 ../textw/partition_text.py:807
-msgid "Make RAID Device"
+#: ../iw/partition_gui.py:1358 ../textw/partition_text.py:831
+msgid "At least two software RAID partitions are needed."
 msgstr ""
 
-#: ../iw/partition_gui.py:1631 ../textw/partition_text.py:230
+#: ../iw/partition_gui.py:1373 ../textw/partition_text.py:227
 msgid "Filesystem type:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1643 ../textw/partition_text.py:386
+#: ../iw/partition_gui.py:1385 ../textw/partition_text.py:383
 msgid "RAID Level:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1678 ../textw/partition_text.py:404
+#: ../iw/partition_gui.py:1420 ../textw/partition_text.py:401
 msgid "RAID Members:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1690
+#: ../iw/partition_gui.py:1431
 msgid "Number of spares:"
 msgstr ""
 
-#: ../iw/partition_gui.py:1697 ../textw/partition_text.py:843
+#: ../iw/partition_gui.py:1438 ../textw/partition_text.py:843
 msgid "Format partition?"
 msgstr ""
 
-#: ../iw/partition_gui.py:1796
-msgid "Make Logical Volume"
-msgstr ""
-
-#: ../iw/partition_gui.py:1807
-msgid "Mount point:"
-msgstr ""
-
-#: ../iw/partition_gui.py:1814
-msgid "Filesystem:"
-msgstr ""
-
-#: ../iw/partition_gui.py:1815
-msgid "ext3"
-msgstr ""
-
-#: ../iw/partition_gui.py:1825
-msgid "Logical Volume Name:"
-msgstr ""
-
-#: ../iw/partition_gui.py:1852
-msgid "Illegal size"
-msgstr ""
-
-#: ../iw/partition_gui.py:1853
-msgid "The requested size as entered is not a valid number greater than 0."
-msgstr ""
-
-#: ../iw/partition_gui.py:1866
-msgid "Bad mount point"
-msgstr ""
-
-#: ../iw/partition_gui.py:1887
-msgid "Mount point in use"
-msgstr ""
-
-#: ../iw/partition_gui.py:1888
-#, c-format
-msgid "The mount point %s is in use, please pick another."
-msgstr ""
-
-#: ../iw/partition_gui.py:1894
-msgid "Illegal Logical Volume Name"
-msgstr ""
-
-#: ../iw/partition_gui.py:1915
-msgid "Illegal logical volume name"
-msgstr ""
-
-#: ../iw/partition_gui.py:1916
-#, c-format
-msgid "The logical volume name %s is already in use. Please pick another."
-msgstr ""
-
-#: ../iw/partition_gui.py:1975
-#, c-format
-msgid "Are you sure you want to remove the logical volume %s?"
-msgstr ""
-
-#: ../iw/partition_gui.py:1997
-msgid "Not enough physical volumes"
-msgstr ""
-
-#: ../iw/partition_gui.py:1998
-msgid "At least one LVM partition is needed."
-msgstr ""
-
-#: ../iw/partition_gui.py:2002
-msgid "Make LVM Device"
-msgstr ""
-
-#: ../iw/partition_gui.py:2016
-msgid "Volume Group Name:"
-msgstr ""
-
-#: ../iw/partition_gui.py:2028
-msgid "Physical Volumes to Use:"
-msgstr ""
-
-#: ../iw/partition_gui.py:2052
-msgid "Logical Volume Name"
-msgstr ""
-
-#: ../iw/partition_gui.py:2088
-msgid "Logical Volumes"
-msgstr ""
-
-#: ../iw/partition_gui.py:2133
-msgid "Not enough space"
-msgstr ""
-
-#: ../iw/partition_gui.py:2134
-#, c-format
-msgid ""
-"The logical volumes you have configured require %g MB, but the volume group "
-"only has %g MB.  Please either make the volume group larger or make the "
-"logical volume(s) smaller."
-msgstr ""
-
-#: ../iw/partition_gui.py:2145
-msgid "Invalid Volume Group Name"
+#: ../iw/partition_gui.py:1542
+msgid "_New"
 msgstr ""
 
-#: ../iw/partition_gui.py:2157
-msgid "Name in use"
+#: ../iw/partition_gui.py:1543
+msgid "_Edit"
 msgstr ""
 
-#: ../iw/partition_gui.py:2158
-#, c-format
-msgid "The volume group name %s is already in use. Please pick another."
+#: ../iw/partition_gui.py:1544
+msgid "_Delete"
 msgstr ""
 
-#: ../iw/partition_gui.py:2232 ../iw/partition_gui.py:2238
+#: ../iw/partition_gui.py:1545
 msgid "_Reset"
 msgstr ""
 
-#: ../iw/partition_gui.py:2233 ../iw/partition_gui.py:2239
+#: ../iw/partition_gui.py:1546
 msgid "Make _RAID"
 msgstr ""
 
-#: ../iw/partition_gui.py:2235
-msgid "_New"
+#: ../iw/partition_gui.py:1561 ../textw/partition_text.py:986
+msgid "Start"
 msgstr ""
 
-#: ../iw/partition_gui.py:2240
-msgid "_LVM"
+#: ../iw/partition_gui.py:1561 ../textw/partition_text.py:986
+msgid "End"
 msgstr ""
 
-#: ../iw/partition_gui.py:2288 ../textw/partition_text.py:1086
+#: ../iw/partition_gui.py:1562
+msgid "Format"
+msgstr ""
+
+#: ../iw/partition_gui.py:1607 ../textw/partition_text.py:1066
 msgid "Automatic Partitioning"
 msgstr ""
 
-#: ../iw/partition_gui.py:2317
-msgid ""
-"You need to select at least one drive to have Red Hat Linux installed onto."
+#: ../iw/partition_gui.py:1626
+#, python-format
+msgid "You need to select at least one drive to have %s installed onto."
 msgstr ""
 
-#: ../iw/partition_gui.py:2359
+#: ../iw/partition_gui.py:1666
 msgid "I want to have automatic partitioning:"
 msgstr ""
 
-#: ../iw/partition_gui.py:2390 ../textw/partition_text.py:1109
+#: ../iw/partition_gui.py:1697 ../textw/partition_text.py:1089
 msgid "Which drive(s) do you want to use for this installation?"
 msgstr ""
 
-#: ../iw/partition_gui.py:2414
+#: ../iw/partition_gui.py:1719
 msgid ""
 "Review (allows you to see and change the automatic partitioning results)"
 msgstr ""
 
-#: ../iw/partmethod_gui.py:25 ../textw/partmethod_text.py:24
+#: ../iw/partmethod_gui.py:24 ../textw/partmethod_text.py:24
 msgid "Disk Partitioning Setup"
 msgstr ""
 
-#: ../iw/partmethod_gui.py:58
+#: ../iw/partmethod_gui.py:59
 msgid "Have the installer automatically partition for you"
 msgstr ""
 
-#: ../iw/partmethod_gui.py:61
+#: ../iw/partmethod_gui.py:62
 msgid "Manually partition with Disk Druid"
 msgstr ""
 
-#: ../iw/partmethod_gui.py:64
+#: ../iw/partmethod_gui.py:65
 msgid "Manually partition with fdisk [experts only]"
 msgstr ""
 
-#: ../iw/progress_gui.py:29
+#: ../iw/progress_gui.py:28
 msgid "Installing Packages"
 msgstr ""
 
-#: ../iw/progress_gui.py:91 ../iw/progress_gui.py:257
-msgid "Completed"
-msgstr ""
-
-#: ../iw/progress_gui.py:97 ../iw/progress_gui.py:256
-msgid "Total"
-msgstr ""
-
-#: ../iw/progress_gui.py:103 ../iw/progress_gui.py:258
-msgid "Remaining"
-msgstr ""
-
-#: ../iw/progress_gui.py:135
-#, c-format
+#: ../iw/progress_gui.py:119
+#, python-format
 msgid "%s KBytes"
 msgstr ""
 
-#: ../iw/progress_gui.py:206 ../iw/progress_gui.py:269
+#: ../iw/progress_gui.py:192 ../iw/progress_gui.py:245
+#: ../textw/partition_text.py:986
 msgid "Size"
 msgstr ""
 
-#: ../iw/progress_gui.py:207
+#: ../iw/progress_gui.py:193
 msgid "Summary"
 msgstr ""
 
-#: ../iw/progress_gui.py:237
+#: ../iw/progress_gui.py:223
 msgid "Package Progress: "
 msgstr ""
 
-#: ../iw/progress_gui.py:242
+#: ../iw/progress_gui.py:228
 msgid "Total Progress:   "
 msgstr ""
 
-#: ../iw/progress_gui.py:269
+#: ../iw/progress_gui.py:245
 msgid "Status"
 msgstr ""
 
-#: ../iw/progress_gui.py:269
+#: ../iw/progress_gui.py:245
 msgid "Packages"
 msgstr ""
 
-#: ../iw/progress_gui.py:269
+#: ../iw/progress_gui.py:245
 msgid "Time"
 msgstr ""
 
-#: ../iw/silo_gui.py:28
-msgid "Silo Configuration"
+#: ../iw/progress_gui.py:255
+msgid "Total"
 msgstr ""
 
-#: ../iw/silo_gui.py:135 ../iw/silo_gui.py:286 ../iw/upgrade_swap_gui.py:147
-#: ../textw/upgrade_text.py:107
-msgid "Partition"
+#: ../iw/progress_gui.py:256
+msgid "Completed"
+msgstr ""
+
+#: ../iw/progress_gui.py:257
+msgid "Remaining"
+msgstr ""
+
+#: ../iw/silo_gui.py:28
+msgid "Silo Configuration"
 msgstr ""
 
 #: ../iw/silo_gui.py:172
@@ -2838,58 +2463,94 @@ msgstr ""
 msgid "Do not install SILO"
 msgstr ""
 
-#: ../iw/silo_gui.py:263 ../textw/bootloader_text.py:276
-#: ../textw/silo_text.py:207 ../textw/xconfig_text.py:413
-#: ../textw/xconfig_text.py:420 ../textw/xconfig_text.py:520
-#: ../textw/xconfig_text.py:521 ../textw/xconfig_text.py:540
-#: ../textw/xconfig_text.py:541
-msgid "Default"
+#: ../iw/timezone_gui.py:44 ../textw/timezone_text.py:95
+msgid "Time Zone Selection"
 msgstr ""
 
-#: ../iw/silo_gui.py:263 ../textw/silo_text.py:207
-msgid "Partition type"
+#: ../iw/timezone_gui.py:187
+msgid "View:"
 msgstr ""
 
-#: ../iw/silo_gui.py:263 ../iw/silo_gui.py:298 ../textw/bootloader_text.py:205
-#: ../textw/bootloader_text.py:276 ../textw/silo_text.py:143
-#: ../textw/silo_text.py:207
-msgid "Boot label"
+#: ../iw/timezone_gui.py:195 ../iw/timezone_gui.py:196
+msgid "System clock uses UTC"
 msgstr ""
 
-#: ../iw/silo_gui.py:294
-msgid "Default boot image"
+#: ../iw/timezone_gui.py:242
+msgid "Use Daylight Saving Time (US only)"
 msgstr ""
 
-#: ../iw/timezone_gui.py:26 ../textw/timezone_text.py:95
-msgid "Time Zone Selection"
+#: ../iw/timezone_gui.py:256
+msgid "Location"
 msgstr ""
 
-#: ../iw/timezone_gui.py:147 ../iw/timezone_gui.py:148
-msgid "System clock uses UTC"
+#: ../iw/timezone_gui.py:257
+msgid "UTC Offset"
 msgstr ""
 
-#: ../iw/timezone_gui.py:170
-msgid "Location"
+#: ../iw/upgrade_bootloader_gui.py:29 ../textw/upgrade_bootloader_text.py:72
+msgid "Upgrade Boot Loader Configuration"
 msgstr ""
 
-#: ../iw/timezone_gui.py:218
-msgid "Use Daylight Saving Time (US only)"
+#: ../iw/upgrade_bootloader_gui.py:69 ../textw/upgrade_bootloader_text.py:53
+#: ../textw/upgrade_bootloader_text.py:60
+msgid "Update boot loader configuration"
 msgstr ""
 
-#: ../iw/timezone_gui.py:231
-msgid "UTC Offset"
+#: ../iw/upgrade_bootloader_gui.py:70
+msgid "This will update your current boot loader."
+msgstr ""
+
+#: ../iw/upgrade_bootloader_gui.py:73 ../textw/upgrade_bootloader_text.py:49
+#, python-format
+msgid ""
+"The installer has detected the %s boot loader currently installed on %s."
+msgstr ""
+
+#: ../iw/upgrade_bootloader_gui.py:77
+msgid "This is the recommended option."
 msgstr ""
 
-#: ../iw/upgrade_migratefs_gui.py:28 ../textw/upgrade_text.py:30
+#: ../iw/upgrade_bootloader_gui.py:81 ../textw/upgrade_bootloader_text.py:57
+msgid ""
+"The installer is unable to detect the boot loader currently in use on your "
+"system."
+msgstr ""
+
+#: ../iw/upgrade_bootloader_gui.py:90 ../textw/upgrade_bootloader_text.py:66
+msgid "Create new boot loader configuration"
+msgstr ""
+
+#: ../iw/upgrade_bootloader_gui.py:92
+msgid ""
+"This will let you create a new boot loader configuration.  If you wish to "
+"switch boot loaders, you should choose this."
+msgstr ""
+
+#: ../iw/upgrade_bootloader_gui.py:99 ../textw/upgrade_bootloader_text.py:64
+msgid "Skip boot loader updating"
+msgstr ""
+
+#: ../iw/upgrade_bootloader_gui.py:100
+msgid ""
+"This will make no changes to boot loader configuration.  If you are using a "
+"third party boot loader, you should choose this."
+msgstr ""
+
+#: ../iw/upgrade_bootloader_gui.py:112
+msgid "What would you like to do?"
+msgstr ""
+
+#: ../iw/upgrade_migratefs_gui.py:30 ../textw/upgrade_text.py:31
 msgid "Migrate Filesystems"
 msgstr ""
 
-#: ../iw/upgrade_migratefs_gui.py:53 ../textw/upgrade_text.py:32
+#: ../iw/upgrade_migratefs_gui.py:55 ../textw/upgrade_text.py:33
+#, python-format
 msgid ""
-"This release of Red Hat Linux supports the ext3 journalling filesystem.  It "
-"has several benefits over the ext2 filesystem traditionally shipped in Red "
-"Hat Linux.  It is possible to migrate the ext2 formatted partitions to ext3 "
-"without data loss.\n"
+"This release of %s supports the ext3 journalling filesystem.  It has several "
+"benefits over the ext2 filesystem traditionally shipped in %s.  It is "
+"possible to migrate the ext2 formatted partitions to ext3 without data "
+"loss.\n"
 "\n"
 "Which of these partitions would you like to migrate?"
 msgstr ""
@@ -2898,8 +2559,8 @@ msgstr ""
 msgid "Upgrade Swap Partition"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:101
-#, c-format
+#: ../iw/upgrade_swap_gui.py:90
+#, python-format
 msgid ""
 "The 2.4 kernel needs significantly more swap than older kernels, as much as "
 "twice as much swap space as RAM on the system.  You currently have %dMB of "
@@ -2907,230 +2568,216 @@ msgid ""
 "file systems now."
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:108
-#, c-format
+#: ../iw/upgrade_swap_gui.py:97
+#, python-format
 msgid ""
 "\n"
 "\n"
 "The installer has detected %s MB of RAM.\n"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:120
+#: ../iw/upgrade_swap_gui.py:109
 msgid "I want to create a swap file"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:129
+#: ../iw/upgrade_swap_gui.py:118
 msgid "Select the partition to put the swap file on:"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:147
+#: ../iw/upgrade_swap_gui.py:123
 msgid "Free Space (MB)"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:165
-#, c-format
+#: ../iw/upgrade_swap_gui.py:138
+#, python-format
 msgid ""
 "It is recommended that your swap file be at least %d MB.  Please enter a "
 "size for the swap file:"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:180 ../textw/upgrade_text.py:128
+#: ../iw/upgrade_swap_gui.py:153 ../textw/upgrade_text.py:130
 msgid "Swap file size (MB):"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:189
+#: ../iw/upgrade_swap_gui.py:162
 msgid "I don't want to create a swap file"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:199
+#: ../iw/upgrade_swap_gui.py:172
 msgid ""
 "It is stongly recommended that you create a swap file.  Failure to do so "
 "could cause the installer to abort abnormally.  Are you sure that you wish "
 "to continue?"
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:207 ../textw/upgrade_text.py:173
+#: ../iw/upgrade_swap_gui.py:180 ../textw/upgrade_text.py:175
 msgid "The swap file must be between 1 and 2000 MB in size."
 msgstr ""
 
-#: ../iw/upgrade_swap_gui.py:214 ../textw/upgrade_text.py:168
+#: ../iw/upgrade_swap_gui.py:187 ../textw/upgrade_text.py:170
 msgid ""
 "There is not enough space on the device you selected for the swap partition."
 msgstr ""
 
-#: ../iw/welcome_gui.py:20
+#: ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
 msgid "Welcome"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:30 ../textw/xconfig_text.py:20
-msgid "DDC Probed Monitor"
+#: ../iw/welcome_gui.py:62
+msgid "Exiting anaconda now"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:31 ../textw/xconfig_text.py:21
-msgid "Unprobed Monitor"
+#: ../iw/welcome_gui.py:89
+msgid "Would you like to configure your system?"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:36
+#: ../iw/xconfig_gui.py:32
 msgid "Customize Graphics Configuration"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:196 ../textw/xconfig_text.py:174
+#: ../iw/xconfig_gui.py:197 ../textw/xconfig_text.py:183
 msgid "Color Depth:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:201 ../textw/xconfig_text.py:102
+#: ../iw/xconfig_gui.py:202 ../textw/xconfig_text.py:100
 msgid "256 Colors (8 Bit)"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:201 ../textw/xconfig_text.py:102
+#: ../iw/xconfig_gui.py:202 ../textw/xconfig_text.py:100
 msgid "High Color (16 Bit)"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:201 ../textw/xconfig_text.py:102
+#: ../iw/xconfig_gui.py:202 ../textw/xconfig_text.py:100
 msgid "True Color (24 Bit)"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:210
+#: ../iw/xconfig_gui.py:211
 msgid "Screen Resolution:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:294
+#: ../iw/xconfig_gui.py:305
 msgid "   Test Setting   "
 msgstr ""
 
-#: ../iw/xconfig_gui.py:317
+#: ../iw/xconfig_gui.py:328
 msgid "Please choose your default desktop environment:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:319
+#: ../iw/xconfig_gui.py:330
 msgid "Your desktop environment is:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:334 ../textw/xconfig_text.py:195
-#: ../textw/xconfig_text.py:204
+#: ../iw/xconfig_gui.py:345 ../textw/xconfig_text.py:204
+#: ../textw/xconfig_text.py:213
 msgid "GNOME"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:336 ../textw/xconfig_text.py:197
-#: ../textw/xconfig_text.py:206
+#: ../iw/xconfig_gui.py:347 ../textw/xconfig_text.py:206
+#: ../textw/xconfig_text.py:215
 msgid "KDE"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:365
+#: ../iw/xconfig_gui.py:376
 msgid "Please choose your login type:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:372 ../textw/xconfig_text.py:215
+#: ../iw/xconfig_gui.py:383 ../textw/xconfig_text.py:224
 msgid "Text"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:373 ../textw/xconfig_text.py:213
+#: ../iw/xconfig_gui.py:384 ../textw/xconfig_text.py:222
 msgid "Graphical"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:390 ../textw/xconfig_text.py:416
+#: ../iw/xconfig_gui.py:401 ../textw/xconfig_text.py:392
 msgid "Monitor Configuration"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:629
+#: ../iw/xconfig_gui.py:564 ../iw/xconfig_gui.py:891
 msgid "Generic"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:676 ../iw/xconfig_gui.py:1027
+#: ../iw/xconfig_gui.py:601
+msgid "DDC Probed Monitor"
+msgstr ""
+
+#: ../iw/xconfig_gui.py:603
+msgid "Unprobed Monitor"
+msgstr ""
+
+#: ../iw/xconfig_gui.py:650 ../iw/xconfig_gui.py:1007
 msgid "Restore original values"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:684
+#: ../iw/xconfig_gui.py:658
 msgid "Horizontal Sync:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:686
+#: ../iw/xconfig_gui.py:660
 msgid "Vertical Sync:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:692
+#: ../iw/xconfig_gui.py:666
 msgid "kHz"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:695
+#: ../iw/xconfig_gui.py:669
 msgid "Hz"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:713
+#: ../iw/xconfig_gui.py:687
 msgid "Graphical Interface (X) Configuration"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:738
-msgid "Unknown video card"
+#: ../iw/xconfig_gui.py:723
+msgid "Unknown server"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:739
-#, c-format
+#: ../iw/xconfig_gui.py:724
 msgid ""
-"An error has occurred selecting the video card %s. Please report this error "
-"to bugzilla.redhat.com."
+"This video card has no suitable X server in the database.  You will need to "
+"choose a different card or choose the 'Skip X Configuration' button."
 msgstr ""
 
-#: ../iw/xconfig_gui.py:763 ../textw/xconfig_text.py:648
+#: ../iw/xconfig_gui.py:731 ../textw/xconfig_text.py:620
 msgid "Unspecified video card"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:764 ../textw/xconfig_text.py:649
+#: ../iw/xconfig_gui.py:732 ../textw/xconfig_text.py:621
 msgid ""
 "You need to pick a video card before X configuration can continue.  If you "
 "want to skip X configuration entirely choose the 'Skip X Configuration' "
 "button."
 msgstr ""
 
-#: ../iw/xconfig_gui.py:901
+#: ../iw/xconfig_gui.py:852
 msgid ""
 "Your video ram size can not be autodetected.  Choose your video ram size "
 "from the choices below:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:909
+#: ../iw/xconfig_gui.py:860
 msgid ""
 "In most cases your video hardware can be probed to automatically determine "
 "the best settings for your display."
 msgstr ""
 
-#: ../iw/xconfig_gui.py:915
+#: ../iw/xconfig_gui.py:866
 msgid ""
 "If the probed settings do not match your hardware, select the correct "
 "hardware settings below:"
 msgstr ""
 
-#: ../iw/xconfig_gui.py:1006
-msgid "Video card RAM: "
-msgstr ""
-
-#: ../iw/xconfig_gui.py:1031 ../textw/xconfig_text.py:606
-msgid "Skip X Configuration"
-msgstr ""
-
-#: ../iw/zipl_gui.py:33
-msgid "z/IPL Boot Loader Configuration"
+#: ../iw/xconfig_gui.py:896
+msgid "Other"
 msgstr ""
 
-#: ../iw/zipl_gui.py:75 ../textw/zipl_text.py:22
-msgid ""
-"The z/IPL Boot Loader will now be installed on your system.\n"
-"\n"
-"The root partition will be the one you selected previously in the partition "
-"setup.\n"
-"\n"
-"The kernel used to start the machine will be the one to be installed by "
-"default.\n"
-"\n"
-"If you wish to make changes later after the installation feel free to change "
-"the /etc/zipl.conf configuration file.\n"
-"\n"
-"You can now enter any additional kernel parameters which your machine or "
-"your setup may require."
+#: ../iw/xconfig_gui.py:985
+msgid "Video card RAM: "
 msgstr ""
 
-#: ../iw/zipl_gui.py:102 ../textw/zipl_text.py:54
-msgid "Kernel Parameters"
+#: ../iw/xconfig_gui.py:1011 ../textw/xconfig_text.py:578
+msgid "Skip X Configuration"
 msgstr ""
 
 #: ../textw/bootdisk_text.py:27
@@ -3179,7 +2826,7 @@ msgid ""
 "Are you sure you want to skip boot loader installation?"
 msgstr ""
 
-#: ../textw/bootloader_text.py:103 ../textw/silo_text.py:25
+#: ../textw/bootloader_text.py:102 ../textw/silo_text.py:25
 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 "
@@ -3187,155 +2834,141 @@ msgid ""
 "blank."
 msgstr ""
 
-#: ../textw/bootloader_text.py:112
-msgid "Force use of LBA32 (not normally required)"
-msgstr ""
-
-#: ../textw/bootloader_text.py:176
+#: ../textw/bootloader_text.py:169
 msgid "Where do you want to install the boot loader?"
 msgstr ""
 
-#: ../textw/bootloader_text.py:209 ../textw/silo_text.py:147
+#: ../textw/bootloader_text.py:201 ../textw/silo_text.py:147
 #: ../textw/silo_text.py:168
 msgid "Clear"
 msgstr ""
 
-#: ../textw/bootloader_text.py:218
+#: ../textw/bootloader_text.py:209
 msgid "Edit Boot Label Please"
 msgstr ""
 
-#: ../textw/bootloader_text.py:236 ../textw/bootloader_text.py:241
+#: ../textw/bootloader_text.py:227 ../textw/bootloader_text.py:232
 msgid "Invalid Boot Label"
 msgstr ""
 
-#: ../textw/bootloader_text.py:237
+#: ../textw/bootloader_text.py:228
 msgid "Boot label may not be empty."
 msgstr ""
 
-#: ../textw/bootloader_text.py:242
+#: ../textw/bootloader_text.py:233
 msgid "Boot label contains illegal characters."
 msgstr ""
 
-#: ../textw/bootloader_text.py:296 ../textw/silo_text.py:219
+#: ../textw/bootloader_text.py:285 ../textw/silo_text.py:219
 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 ""
 
-#: ../textw/bootloader_text.py:395
+#: ../textw/bootloader_text.py:298
+msgid ""
+" <Space> selects button | <F2> select default boot entry | <F12> next screen>"
+msgstr ""
+
+#: ../textw/bootloader_text.py:384
 msgid "Use a GRUB Password"
 msgstr ""
 
-#: ../textw/bootloader_text.py:407
+#: ../textw/bootloader_text.py:396
 msgid "Boot Loader Password:"
 msgstr ""
 
-#: ../textw/bootloader_text.py:437
+#: ../textw/bootloader_text.py:426
 msgid "Passwords Do Not Match"
 msgstr ""
 
-#: ../textw/bootloader_text.py:442
+#: ../textw/bootloader_text.py:427
+msgid "Passwords do not match"
+msgstr ""
+
+#: ../textw/bootloader_text.py:431
 msgid "Password Too Short"
 msgstr ""
 
-#: ../textw/bootloader_text.py:443
+#: ../textw/bootloader_text.py:432
 msgid "Boot loader password is too short"
 msgstr ""
 
-#: ../textw/complete_text.py:23
+#: ../textw/complete_text.py:26
 msgid "<Enter> to reboot"
 msgstr ""
 
-#: ../textw/complete_text.py:36
-msgid ""
-"Remove any floppy diskettes you used during the installation process and "
-"press <Enter> to reboot your system.\n"
-"\n"
-msgstr ""
-
-#: ../textw/complete_text.py:42
+#: ../textw/complete_text.py:36 ../textw/complete_text.py:57
+#: ../textw/complete_text.py:72
 msgid "Complete"
 msgstr ""
 
-#: ../textw/complete_text.py:43
-#, c-format
+#: ../textw/complete_text.py:37
+#, python-format
 msgid ""
-"Congratulations, your Red Hat Linux installation is complete.\n"
+"Congratulations, your %s installation is complete.\n"
 "\n"
-"%s%sFor information on errata (updates and bug fixes), visit http://www."
-"redhat.com/errata.\n"
+"Remove any floppy diskettes you used during the installation process and "
+"press <Enter> to reboot your system. \n"
+"\n"
+"%sFor information on errata (updates and bug fixes), visit http://www.redhat."
+"com/errata.\n"
 "\n"
 "Information on using your system is available in the Red Hat Linux manuals "
-"at http://www.redhat.com/support/manuals."
+"at http://www.redhat.com/docs."
 msgstr ""
 
-#: ../textw/confirm_text.py:20
-msgid "Installation to begin"
+#: ../textw/complete_text.py:55
+msgid "<Enter> to continue"
 msgstr ""
 
-#: ../textw/confirm_text.py:21
+#: ../textw/complete_text.py:58
+#, python-format
 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 ""
-
-#: ../loader/cdrom.c:34 ../loader/devices.c:95 ../loader/devices.c:240
-#: ../loader/devices.c:334 ../loader/lang.c:628 ../loader/loader.c:325
-#: ../loader/loader.c:918 ../loader/loader.c:987 ../loader/loader.c:1208
-#: ../loader/loader.c:1305 ../loader/loader.c:1806 ../loader/net.c:185
-#: ../loader/net.c:272 ../loader/net.c:359 ../loader/urls.c:193
-#: ../loader/urls.c:422 ../textw/confirm_text.py:24
-#: ../textw/confirm_text.py:26 ../textw/confirm_text.py:36
-#: ../textw/confirm_text.py:38 ../textw/constants_text.py:28
-#: ../textw/silo_text.py:110 ../textw/userauth_text.py:190
-msgid "Back"
-msgstr ""
-
-#: ../textw/confirm_text.py:32
-msgid "Upgrade to begin"
-msgstr ""
-
-#: ../textw/fdasd_text.py:31
-msgid "Choose a disk to run fdasd or dasdfmt on"
+"Congratulations, package installation is complete.\n"
+"\n"
+"Press return to continue.\n"
+"\n"
+"Information on configuring and using your Red Hat Linux system is contained "
+"in the %s manuals."
 msgstr ""
 
-#: ../textw/fdasd_text.py:32
-msgid "Edit Partitions"
+#: ../textw/complete_text.py:69
+msgid "<Enter> to exit"
 msgstr ""
 
-#: ../textw/fdasd_text.py:33
-msgid "Format DASD"
+#: ../textw/complete_text.py:73
+#, python-format
+msgid ""
+"Congratulations, configuration is complete.\n"
+"\n"
+"For information on errata (updates and bug fixes), visit http://www.redhat."
+"com/errata.\n"
+"\n"
+"Information on using your system is available in the %s manuals at http://"
+"www.redhat.com/docs."
 msgstr ""
 
-#: ../textw/fdasd_text.py:74
-#, c-format
-msgid "An error occured while running %s on drive %s."
+#: ../textw/confirm_text.py:20
+msgid "Installation to begin"
 msgstr ""
 
-#: ../textw/fdasd_text.py:85
-#, c-format
+#: ../textw/confirm_text.py:21
 msgid ""
-"Running dasdfmt means the loss of \n"
-"ALL DATA on drive %s.\n"
-"\n"
-"Do you really want this?"
+"A complete log of your installation will be in /root/install.log after "
+"rebooting your system. You may want to keep this file for later reference."
 msgstr ""
 
-#: ../textw/fdasd_text.py:101
-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 or use "
-"dasdfmt.\n"
-"\n"
-"Back to the fdasd screen?"
+#: ../textw/confirm_text.py:32
+msgid "Upgrade to begin"
 msgstr ""
 
 #: ../textw/fdisk_text.py:40
 msgid "Choose a disk to run fdisk on"
 msgstr ""
 
-#: ../textw/firewall_text.py:28
+#: ../textw/firewall_text.py:27
 msgid ""
 "A firewall protects against unauthorized network intrusions. High security "
 "blocks all incoming accesses. Medium blocks access to system services (such "
@@ -3343,56 +2976,56 @@ msgid ""
 "connections and is not recommended. "
 msgstr ""
 
-#: ../textw/firewall_text.py:44
+#: ../textw/firewall_text.py:43
 msgid "Security Level:"
 msgstr ""
 
-#: ../textw/firewall_text.py:73
+#: ../textw/firewall_text.py:72
 msgid "Trusted Devices:"
 msgstr ""
 
-#: ../textw/firewall_text.py:90
+#: ../textw/firewall_text.py:89
 msgid "DHCP"
 msgstr ""
 
-#: ../textw/firewall_text.py:92
+#: ../textw/firewall_text.py:91
 msgid "SSH"
 msgstr ""
 
-#: ../loader/telnetd.c:64 ../loader/telnetd.c:106 ../textw/firewall_text.py:94
+#: ../textw/firewall_text.py:93 ../loader/telnetd.c:64 ../loader/telnetd.c:106
 msgid "Telnet"
 msgstr ""
 
-#: ../textw/firewall_text.py:96
+#: ../textw/firewall_text.py:95
 msgid "WWW (HTTP)"
 msgstr ""
 
-#: ../textw/firewall_text.py:98
+#: ../textw/firewall_text.py:97
 msgid "Mail (SMTP)"
 msgstr ""
 
-#: ../loader/loader.c:1503 ../textw/firewall_text.py:100
+#: ../textw/firewall_text.py:99 ../loader/loader.c:1662
 msgid "FTP"
 msgstr ""
 
-#: ../textw/firewall_text.py:104
+#: ../textw/firewall_text.py:103
 msgid "Other ports"
 msgstr ""
 
-#: ../textw/firewall_text.py:130 ../textw/firewall_text.py:193
-#: ../textw/language_text.py:152
+#: ../textw/firewall_text.py:129 ../textw/firewall_text.py:193
+#: ../textw/language_text.py:157
 msgid "Invalid Choice"
 msgstr ""
 
-#: ../textw/firewall_text.py:131
+#: ../textw/firewall_text.py:130
 msgid "You cannot customize a disabled firewall."
 msgstr ""
 
-#: ../textw/firewall_text.py:136
+#: ../textw/firewall_text.py:135
 msgid "Firewall Configuration - Customize"
 msgstr ""
 
-#: ../textw/firewall_text.py:138
+#: ../textw/firewall_text.py:137
 msgid ""
 "You can customize your firewall in two ways. First, you can select to allow "
 "all traffic from certain network interfaces. Second, you can allow certain "
@@ -3401,7 +3034,7 @@ msgid ""
 msgstr ""
 
 #: ../textw/firewall_text.py:194
-#, c-format
+#, python-format
 msgid "Warning: %s is not a valid port."
 msgstr ""
 
@@ -3417,27 +3050,27 @@ msgstr ""
 msgid "Which model keyboard is attached to this computer?"
 msgstr ""
 
-#: ../textw/language_text.py:115
+#: ../textw/language_text.py:120
 msgid "Select All"
 msgstr ""
 
-#: ../textw/language_text.py:117
+#: ../textw/language_text.py:122
 msgid "Choose additional languages that you would like to use on this system:"
 msgstr ""
 
-#: ../textw/language_text.py:121
+#: ../textw/language_text.py:126
 msgid "Language Support"
 msgstr ""
 
-#: ../textw/language_text.py:153
+#: ../textw/language_text.py:158
 msgid "You must select at least one language to install."
 msgstr ""
 
-#: ../textw/language_text.py:181
+#: ../textw/language_text.py:186
 msgid "Default Language"
 msgstr ""
 
-#: ../textw/language_text.py:182
+#: ../textw/language_text.py:187
 msgid "Choose the default language for this system: "
 msgstr ""
 
@@ -3457,51 +3090,57 @@ msgstr ""
 msgid "Mouse Selection"
 msgstr ""
 
-#: ../textw/network_text.py:77
+#: ../textw/network_text.py:67
+#, python-format
+msgid "Network Device: %s"
+msgstr ""
+
+#: ../textw/network_text.py:70
 msgid "Use bootp/dhcp"
 msgstr ""
 
-#: ../loader/net.c:309 ../textw/network_text.py:88
+#: ../textw/network_text.py:77 ../loader/net.c:305
 msgid "IP address:"
 msgstr ""
 
-#: ../loader/net.c:312 ../textw/network_text.py:89
+#: ../textw/network_text.py:78 ../loader/net.c:308
 msgid "Netmask:"
 msgstr ""
 
-#: ../loader/net.c:315 ../textw/network_text.py:90
+#: ../textw/network_text.py:79 ../loader/net.c:311
 msgid "Default gateway (IP):"
 msgstr ""
 
-#: ../loader/net.c:318 ../textw/network_text.py:91
+#: ../textw/network_text.py:81 ../loader/net.c:314
 msgid "Primary nameserver:"
 msgstr ""
 
-#: ../textw/network_text.py:92
+#: ../textw/network_text.py:83
 msgid "Secondary nameserver:"
 msgstr ""
 
-#: ../textw/network_text.py:93
-msgid "Ternary nameserver:"
+#: ../textw/network_text.py:85
+msgid "Tertiary nameserver:"
 msgstr ""
 
-#: ../textw/network_text.py:95
-msgid "Point to Point (IP):"
+#: ../textw/network_text.py:114
+#, python-format
+msgid "Network Configuration for %s"
 msgstr ""
 
-#: ../textw/network_text.py:146
+#: ../textw/network_text.py:137
 msgid "Invalid information"
 msgstr ""
 
-#: ../textw/network_text.py:147
+#: ../textw/network_text.py:138
 msgid "You must enter valid IP information to continue"
 msgstr ""
 
-#: ../textw/network_text.py:189
+#: ../textw/network_text.py:203
 msgid "Hostname Configuration"
 msgstr ""
 
-#: ../textw/network_text.py:190
+#: ../textw/network_text.py:204
 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."
@@ -3516,7 +3155,7 @@ msgid "Size    :"
 msgstr ""
 
 #: ../textw/packages_text.py:97
-#, c-format
+#, python-format
 msgid "%.1f KBytes"
 msgstr ""
 
@@ -3540,99 +3179,91 @@ msgid ""
 "installed."
 msgstr ""
 
-#: ../textw/partition_text.py:38
+#: ../textw/partition_text.py:35
 msgid "Must specify a value"
 msgstr ""
 
-#: ../textw/partition_text.py:41
+#: ../textw/partition_text.py:38
 msgid "Requested value is not an integer"
 msgstr ""
 
-#: ../textw/partition_text.py:43
+#: ../textw/partition_text.py:40
 msgid "Requested value is too large"
 msgstr ""
 
-#: ../textw/partition_text.py:171
-#, c-format
+#: ../textw/partition_text.py:168
+#, python-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../textw/partition_text.py:172
-msgid "Modify Partition"
-msgstr ""
-
-#: ../textw/partition_text.py:172
-msgid "Add anyway"
-msgstr ""
-
-#: ../textw/partition_text.py:320
+#: ../textw/partition_text.py:317
 msgid "Fixed Size:"
 msgstr ""
 
-#: ../textw/partition_text.py:322
+#: ../textw/partition_text.py:319
 msgid "Fill maximum size of (MB):"
 msgstr ""
 
-#: ../textw/partition_text.py:326
+#: ../textw/partition_text.py:323
 msgid "Fill all available space:"
 msgstr ""
 
-#: ../textw/partition_text.py:423
+#: ../textw/partition_text.py:420
 msgid "Number of spares?"
 msgstr ""
 
-#: ../textw/partition_text.py:441 ../textw/partition_text.py:646
+#: ../textw/partition_text.py:438 ../textw/partition_text.py:643
 msgid "Filesystem Options"
 msgstr ""
 
-#: ../textw/partition_text.py:444
+#: ../textw/partition_text.py:441
 msgid ""
 "Please choose how you would like to prepare the filesystem on this partition."
 msgstr ""
 
-#: ../textw/partition_text.py:461
+#: ../textw/partition_text.py:458
 msgid "Format as:"
 msgstr ""
 
-#: ../textw/partition_text.py:481
+#: ../textw/partition_text.py:478
 msgid "Migrate to:"
 msgstr ""
 
-#: ../textw/partition_text.py:618
+#: ../textw/partition_text.py:615
 msgid "Filesystem Label:"
 msgstr ""
 
-#: ../textw/partition_text.py:629
+#: ../textw/partition_text.py:626
 msgid "Filesystem Option:"
 msgstr ""
 
-#: ../textw/partition_text.py:632 ../textw/partition_text.py:666
-#, c-format
+#: ../textw/partition_text.py:629 ../textw/partition_text.py:663
+#, python-format
 msgid "Format as %s"
 msgstr ""
 
-#: ../textw/partition_text.py:634 ../textw/partition_text.py:668
-#, c-format
+#: ../textw/partition_text.py:631 ../textw/partition_text.py:665
+#, python-format
 msgid "Migrate to %s"
 msgstr ""
 
-#: ../textw/partition_text.py:636 ../textw/partition_text.py:670
+#: ../textw/partition_text.py:633 ../textw/partition_text.py:667
 msgid "Leave unchanged"
 msgstr ""
 
-#: ../textw/partition_text.py:695 ../textw/partition_text.py:744
+#: ../textw/partition_text.py:692 ../textw/partition_text.py:741
 msgid "Invalid Entry for Partition Size"
 msgstr ""
 
-#: ../textw/partition_text.py:707
+#: ../textw/partition_text.py:704
 msgid "Invalid Entry for Maximum Size"
 msgstr ""
 
-#: ../textw/partition_text.py:726
+#: ../textw/partition_text.py:723
 msgid "Invalid Entry for Starting Cylinder"
 msgstr ""
 
-#: ../textw/partition_text.py:736
+#: ../textw/partition_text.py:733
 msgid "Invalid Entry for End Cylinder"
 msgstr ""
 
@@ -3652,37 +3283,28 @@ msgstr ""
 msgid "The maximum number of spares with a RAID0 array is 0."
 msgstr ""
 
-#: ../textw/partition_text.py:948
-msgid "You must go back and use fdasd to initialize this partition"
-msgstr ""
-
-#: ../textw/partition_text.py:989
+#: ../textw/partition_text.py:980
 msgid "Partitioning"
 msgstr ""
 
-#: ../textw/partition_text.py:1002 ../textw/partition_text.py:1009
-msgid "RAID"
-msgstr ""
-
-#: ../textw/partition_text.py:1004
-msgid ""
-"    F1-Help                 F3-Edit   F4-Delete    F5-Reset    F12-OK        "
+#: ../textw/partition_text.py:990
+msgid "New"
 msgstr ""
 
-#: ../textw/partition_text.py:1006
-msgid "New"
+#: ../textw/partition_text.py:990
+msgid "RAID"
 msgstr ""
 
-#: ../textw/partition_text.py:1012
+#: ../textw/partition_text.py:993
 msgid ""
 "    F1-Help     F2-New      F3-Edit   F4-Delete    F5-Reset    F12-OK        "
 msgstr ""
 
-#: ../textw/partition_text.py:1041
+#: ../textw/partition_text.py:1020
 msgid "No Root Partition"
 msgstr ""
 
-#: ../textw/partition_text.py:1042
+#: ../textw/partition_text.py:1021
 msgid "Must have a / partition to install on."
 msgstr ""
 
@@ -3763,8 +3385,8 @@ msgstr ""
 msgid "Hardware clock set to GMT?"
 msgstr ""
 
-#: ../textw/upgrade_text.py:89
-#, c-format
+#: ../textw/upgrade_text.py:91
+#, python-format
 msgid ""
 "The 2.4 kernel needs significantly more swap than older kernels, as much as "
 "twice as much swap space as RAM on the system. You currently have %dMB of "
@@ -3772,43 +3394,43 @@ msgid ""
 "file systems now."
 msgstr ""
 
-#: ../textw/upgrade_text.py:107
+#: ../textw/upgrade_text.py:109
 msgid "Free Space"
 msgstr ""
 
-#: ../textw/upgrade_text.py:122
+#: ../textw/upgrade_text.py:124
 msgid "RAM detected (MB):"
 msgstr ""
 
-#: ../textw/upgrade_text.py:125
+#: ../textw/upgrade_text.py:127
 msgid "Suggested size (MB):"
 msgstr ""
 
-#: ../textw/upgrade_text.py:136
+#: ../textw/upgrade_text.py:138
 msgid "Add Swap"
 msgstr ""
 
-#: ../textw/upgrade_text.py:161
+#: ../textw/upgrade_text.py:163
 msgid "The value you entered is not a valid number."
 msgstr ""
 
-#: ../textw/upgrade_text.py:191
+#: ../textw/upgrade_text.py:193
 msgid "You don't have any Linux partitions. You can't upgrade this system!"
 msgstr ""
 
-#: ../textw/upgrade_text.py:208
+#: ../textw/upgrade_text.py:210
 msgid "System to Upgrade"
 msgstr ""
 
-#: ../textw/upgrade_text.py:222
+#: ../textw/upgrade_text.py:224
 msgid "Upgrade Partition"
 msgstr ""
 
-#: ../textw/upgrade_text.py:244
+#: ../textw/upgrade_text.py:246
 msgid "Customize Packages to Upgrade"
 msgstr ""
 
-#: ../textw/upgrade_text.py:245
+#: ../textw/upgrade_text.py:247
 msgid ""
 "The packages you have installed, and any other packages which are needed to "
 "satisfy their dependencies, have been selected for installation. Would you "
@@ -3826,7 +3448,11 @@ msgid ""
 "critical part of system security!"
 msgstr ""
 
-#: ../textw/userauth_text.py:54 ../textw/userauth_text.py:126
+#: ../textw/userauth_text.py:38
+msgid "Password (confirm):"
+msgstr ""
+
+#: ../textw/userauth_text.py:54 ../textw/userauth_text.py:128
 msgid "Password Length"
 msgstr ""
 
@@ -3834,202 +3460,216 @@ msgstr ""
 msgid "The root password must be at least 6 characters long."
 msgstr ""
 
-#: ../textw/userauth_text.py:59 ../textw/userauth_text.py:134
+#: ../textw/userauth_text.py:59 ../textw/userauth_text.py:136
 msgid "Password Mismatch"
 msgstr ""
 
-#: ../textw/userauth_text.py:60 ../textw/userauth_text.py:135
+#: ../textw/userauth_text.py:60 ../textw/userauth_text.py:137
 msgid "The passwords you entered were different. Please try again."
 msgstr ""
 
-#: ../textw/userauth_text.py:93
+#: ../textw/userauth_text.py:95
 msgid "Add User"
 msgstr ""
 
-#: ../textw/userauth_text.py:98
+#: ../textw/userauth_text.py:100
 msgid "User Name"
 msgstr ""
 
-#: ../textw/userauth_text.py:99
+#: ../textw/userauth_text.py:101
 msgid "Password"
 msgstr ""
 
-#: ../textw/userauth_text.py:100
+#: ../textw/userauth_text.py:102
 msgid "Password (confirm)"
 msgstr ""
 
-#: ../textw/userauth_text.py:113
-msgid "Bad User Name"
+#: ../textw/userauth_text.py:115
+msgid "Bad User ID"
 msgstr ""
 
-#: ../textw/userauth_text.py:114
-msgid "User names must contain only characters A-Z, a-z, and 0-9."
+#: ../textw/userauth_text.py:116
+msgid ""
+"User IDs must be less than 8 characters and contain only characters A-Z, a-"
+"z, and 0-9."
 msgstr ""
 
-#: ../textw/userauth_text.py:121
-msgid "Missing User Name"
+#: ../textw/userauth_text.py:123
+msgid "Missing User ID"
 msgstr ""
 
-#: ../textw/userauth_text.py:122
-msgid "You must provide a user name"
+#: ../textw/userauth_text.py:124
+msgid "You must provide a user ID"
 msgstr ""
 
-#: ../textw/userauth_text.py:127
+#: ../textw/userauth_text.py:129
 msgid "The password must be at least 6 characters long."
 msgstr ""
 
-#: ../textw/userauth_text.py:143 ../textw/userauth_text.py:150
-#: ../textw/userauth_text.py:158
+#: ../textw/userauth_text.py:145 ../textw/userauth_text.py:153
 msgid "User Exists"
 msgstr ""
 
-#: ../textw/userauth_text.py:144
+#: ../textw/userauth_text.py:146
 msgid ""
 "The root user is already configured. You don't need to add this user here."
 msgstr ""
 
-#: ../textw/userauth_text.py:151
-msgid ""
-"This system user is already configured. You don't need to add this user here."
-msgstr ""
-
-#: ../textw/userauth_text.py:159
+#: ../textw/userauth_text.py:154
 msgid "This user id already exists.  Choose another."
 msgstr ""
 
-#: ../textw/userauth_text.py:186
+#: ../textw/userauth_text.py:181
 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_text.py:197
+#: ../textw/userauth_text.py:192
 msgid "User Account Setup"
 msgstr ""
 
-#: ../textw/userauth_text.py:199
+#: ../textw/userauth_text.py:194
 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_text.py:209
+#: ../textw/userauth_text.py:204
 msgid "User name"
 msgstr ""
 
-#: ../textw/userauth_text.py:236
+#: ../textw/userauth_text.py:231
 msgid "Enter the information for the user."
 msgstr ""
 
-#: ../textw/userauth_text.py:254
+#: ../textw/userauth_text.py:249
 msgid "Change the information for this user."
 msgstr ""
 
-#: ../textw/userauth_text.py:326
+#: ../textw/userauth_text.py:321
 msgid "Use Shadow Passwords"
 msgstr ""
 
-#: ../textw/userauth_text.py:328
+#: ../textw/userauth_text.py:323
 msgid "Enable MD5 Passwords"
 msgstr ""
 
-#: ../textw/userauth_text.py:339
+#: ../textw/userauth_text.py:334
 msgid "NIS Domain:"
 msgstr ""
 
-#: ../textw/userauth_text.py:341
+#: ../textw/userauth_text.py:336
 msgid "NIS Server:"
 msgstr ""
 
-#: ../textw/userauth_text.py:343
+#: ../textw/userauth_text.py:338
 msgid "or use:"
 msgstr ""
 
-#: ../textw/userauth_text.py:346
+#: ../textw/userauth_text.py:341
 msgid "Request server via broadcast"
 msgstr ""
 
-#: ../textw/userauth_text.py:385
+#: ../textw/userauth_text.py:380
 msgid "Use TLS connections"
 msgstr ""
 
-#: ../textw/welcome_text.py:21
-msgid "Red Hat Linux"
+#: ../textw/welcome_text.py:22 ../textw/welcome_text.py:42
+#, python-format
+msgid "%s"
 msgstr ""
 
-#: ../textw/welcome_text.py:22
+#: ../textw/welcome_text.py:23
+#, python-format
 msgid ""
-"Welcome to Red Hat Linux!\n"
+"Welcome to %s!\n"
 "\n"
-"This installation process is outlined in detail in the Official Red Hat "
-"Linux Installation Guide available from Red Hat, Inc. If you have access to "
-"this manual, you should read the installation section before continuing.\n"
+"This installation process is outlined in detail in the Official %s "
+"Installation Guide available from Red Hat, Inc. If you have access to this "
+"manual, you should read the installation section before continuing.\n"
 "\n"
-"If you have purchased Official Red Hat Linux, be sure to register your "
-"purchase through our web site, http://www.redhat.com/."
+"If you have purchased Official %s, be sure to register your purchase through "
+"our web site, http://www.redhat.com/."
 msgstr ""
 
-#: ../textw/xconfig_text.py:26
+#: ../textw/welcome_text.py:43
+#, python-format
+msgid ""
+"Welcome to %s!\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 ""
+
+#: ../textw/xconfig_text.py:24
 msgid "Color Depth"
 msgstr ""
 
-#: ../textw/xconfig_text.py:27
+#: ../textw/xconfig_text.py:25
 msgid "Please select the color depth you would like to use:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:46
+#: ../textw/xconfig_text.py:43
+msgid "Resolution"
+msgstr ""
+
+#: ../textw/xconfig_text.py:44
 msgid "Please select the resolution you would like to use:"
 msgstr ""
 
-#: ../loader/loader.c:818 ../loader/loader.c:1091 ../loader/loader.c:1096
-#: ../textw/xconfig_text.py:162 ../textw/xconfig_text.py:171
+#: ../textw/xconfig_text.py:171 ../textw/xconfig_text.py:180
+#: ../loader/loader.c:916 ../loader/loader.c:1206 ../loader/loader.c:1209
+#: ../loader/loader.c:1227 ../loader/loader.c:1235
 msgid "Test"
 msgstr ""
 
-#: ../textw/xconfig_text.py:165
+#: ../textw/xconfig_text.py:174
 msgid "X Customization"
 msgstr ""
 
-#: ../textw/xconfig_text.py:168
-#, c-format
+#: ../textw/xconfig_text.py:177
+#, python-format
 msgid ""
 "Select the color depth and video mode you want to use for your system. Use "
 "the '%s' button to test the video mode."
 msgstr ""
 
-#: ../textw/xconfig_text.py:178 ../textw/xconfig_text.py:185
-#: ../textw/xconfig_text.py:427 ../textw/xconfig_text.py:438
-#: ../textw/xconfig_text.py:625 ../textw/xconfig_text.py:632
+#: ../textw/xconfig_text.py:187 ../textw/xconfig_text.py:194
+#: ../textw/xconfig_text.py:403 ../textw/xconfig_text.py:414
+#: ../textw/xconfig_text.py:597 ../textw/xconfig_text.py:604
 msgid "Change"
 msgstr ""
 
-#: ../textw/xconfig_text.py:181
+#: ../textw/xconfig_text.py:190
 msgid "Resolution:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:191
+#: ../textw/xconfig_text.py:200
 msgid "Default Desktop:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:211
+#: ../textw/xconfig_text.py:220
 msgid "Default Login:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:262
+#: ../textw/xconfig_text.py:271
 msgid "Monitor"
 msgstr ""
 
-#: ../textw/xconfig_text.py:263
+#: ../textw/xconfig_text.py:272
 msgid "Please select the monitor attached to your system."
 msgstr ""
 
-#: ../textw/xconfig_text.py:287
+#: ../textw/xconfig_text.py:289
 msgid "Monitor Sync Rates"
 msgstr ""
 
-#: ../textw/xconfig_text.py:292
+#: ../textw/xconfig_text.py:294
 msgid ""
 "Please enter the sync rates for your monitor. \n"
 "\n"
@@ -4037,28 +3677,28 @@ msgid ""
 "should be taken to make sure the values entered are accurate."
 msgstr ""
 
-#: ../textw/xconfig_text.py:297
+#: ../textw/xconfig_text.py:299
 msgid "HSync Rate: "
 msgstr ""
 
-#: ../textw/xconfig_text.py:302
+#: ../textw/xconfig_text.py:304
 msgid "VSync Rate: "
 msgstr ""
 
-#: ../textw/xconfig_text.py:326
+#: ../textw/xconfig_text.py:328
 msgid "horizontal"
 msgstr ""
 
-#: ../textw/xconfig_text.py:329
+#: ../textw/xconfig_text.py:331
 msgid "vertical"
 msgstr ""
 
-#: ../textw/xconfig_text.py:338
+#: ../textw/xconfig_text.py:340
 msgid "Invalid Sync Rates"
 msgstr ""
 
-#: ../textw/xconfig_text.py:339
-#, c-format
+#: ../textw/xconfig_text.py:341
+#, python-format
 msgid ""
 "The %s sync rate is invalid:\n"
 "\n"
@@ -4071,68 +3711,68 @@ msgid ""
 "31.5,35.0,39.3-40.0          a list of numbers/ranges\n"
 msgstr ""
 
-#: ../textw/xconfig_text.py:419
-#, c-format
+#: ../textw/xconfig_text.py:395
+#, python-format
 msgid ""
 "Select the monitor for your system.  Use the '%s' button to reset to the "
 "probed values."
 msgstr ""
 
-#: ../textw/xconfig_text.py:423
+#: ../textw/xconfig_text.py:399
 msgid "Monitor:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:430
+#: ../textw/xconfig_text.py:406
 msgid "HSync Rate:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:440
+#: ../textw/xconfig_text.py:416
 msgid "VSync Rate:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:517
-#, c-format
+#: ../textw/xconfig_text.py:435
+msgid "You cannot go back from this step."
+msgstr ""
+
+#: ../textw/xconfig_text.py:489
+#, python-format
 msgid ""
 "Please select the video card present in your system.  Choose '%s' to reset "
 "the selection to the card the installer detected in your system."
 msgstr ""
 
-#: ../textw/xconfig_text.py:535
+#: ../textw/xconfig_text.py:507
 msgid "Video RAM"
 msgstr ""
 
-#: ../textw/xconfig_text.py:536
-#, c-format
+#: ../textw/xconfig_text.py:508
+#, python-format
 msgid ""
 "Please select the amount of video RAM present on your video card. Choose '%"
 "s' to reset the selection to the amount the installer detected on your card."
 msgstr ""
 
-#: ../textw/xconfig_text.py:609
+#: ../textw/xconfig_text.py:581
 msgid "Video Card Configuration"
 msgstr ""
 
-#: ../textw/xconfig_text.py:612
+#: ../textw/xconfig_text.py:584
 msgid "Select the video card and video RAM for your system."
 msgstr ""
 
-#: ../textw/xconfig_text.py:615
+#: ../textw/xconfig_text.py:587
 msgid "Video Card:"
 msgstr ""
 
-#: ../textw/xconfig_text.py:620
+#: ../textw/xconfig_text.py:592
 msgid "Unknown card"
 msgstr ""
 
-#: ../textw/xconfig_text.py:628
+#: ../textw/xconfig_text.py:600
 msgid "Video RAM:"
 msgstr ""
 
-#: ../textw/zipl_text.py:50
-msgid "z/IPL Configuration"
-msgstr ""
-
-#: ../installclasses/custom.py:10
+#: ../installclasses/custom.py:12
 msgid "Custom"
 msgstr ""
 
@@ -4140,7 +3780,7 @@ msgstr ""
 msgid "Laptop"
 msgstr ""
 
-#: ../installclasses/server.py:10
+#: ../installclasses/server.py:9
 msgid "Server"
 msgstr ""
 
@@ -4152,7 +3792,7 @@ msgstr ""
 msgid "Upgrade"
 msgstr ""
 
-#: ../installclasses/workstation.py:10
+#: ../installclasses/workstation.py:9
 msgid "Workstation"
 msgstr ""
 
@@ -4188,7 +3828,7 @@ msgid "Module Parameters"
 msgstr ""
 
 #: ../loader/devices.c:232 ../loader/devices.c:239 ../loader/devices.c:357
-#: ../loader/loader.c:323 ../loader/loader.c:384 ../loader/loader.c:400
+#: ../loader/loader.c:329 ../loader/loader.c:390 ../loader/loader.c:406
 msgid "Devices"
 msgstr ""
 
@@ -4205,9 +3845,10 @@ msgid "Failed to mount driver disk."
 msgstr ""
 
 #: ../loader/devices.c:266
+#, c-format
 msgid ""
-"The floppy disk you inserted is not a valid driver disk for this release of "
-"Red Hat Linux."
+"The floppy disk you inserted is not a valid driver disk for this release of %"
+"s."
 msgstr ""
 
 #: ../loader/devices.c:326
@@ -4244,350 +3885,387 @@ msgstr ""
 msgid "Error on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader/lang.c:41 ../loader/loader.c:195
-msgid "Welcome to Red Hat Linux"
+#: ../loader/lang.c:41 ../loader/loader.c:197
+#, c-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../loader/lang.c:42 ../loader/loader.c:197
+#: ../loader/lang.c:42 ../loader/loader.c:203
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../loader/lang.c:306
+#: ../loader/lang.c:305
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader/lang.c:306
-msgid "What language should be used during the installation process?"
-msgstr ""
-
-#: ../loader/lang.c:626
+#: ../loader/lang.c:632
 msgid "Keyboard Type"
 msgstr ""
 
-#: ../loader/lang.c:627
+#: ../loader/lang.c:633
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader/loader.c:131
+#: ../loader/loader.c:135
 msgid "Local CDROM"
 msgstr ""
 
-#: ../loader/loader.c:134
+#: ../loader/loader.c:138
 msgid "NFS image"
 msgstr ""
 
-#: ../loader/loader.c:139
+#: ../loader/loader.c:143
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader/loader.c:310
+#: ../loader/loader.c:316
 msgid "SCSI"
 msgstr ""
 
-#: ../loader/loader.c:324
+#: ../loader/loader.c:330
 msgid "What kind of device would you like to add"
 msgstr ""
 
-#: ../loader/loader.c:373
-msgid "I have found the following devices in your system:"
+#: ../loader/loader.c:379
+msgid "The following devices have been found on your system:"
 msgstr ""
 
-#: ../loader/loader.c:375 ../loader/loader.c:400
+#: ../loader/loader.c:381 ../loader/loader.c:406
 msgid "Done"
 msgstr ""
 
-#: ../loader/loader.c:375 ../loader/loader.c:400
+#: ../loader/loader.c:381 ../loader/loader.c:406
 msgid "Add Device"
 msgstr ""
 
-#: ../loader/loader.c:401
+#: ../loader/loader.c:407
 msgid ""
-"I don't have any special device drivers loaded for your system. Would you "
-"like to load some now?"
+"No special device drivers have been loaded for your system. Would you like "
+"to load any now?"
 msgstr ""
 
-#: ../loader/loader.c:485 ../loader/loader.c:798 ../loader/loader.c:2551
+#: ../loader/loader.c:491 ../loader/loader.c:896 ../loader/loader.c:2754
 #, c-format
 msgid "Failed to read directory %s: %s"
 msgstr ""
 
-#: ../loader/loader.c:591
+#: ../loader/loader.c:597
 msgid ""
 "An error occured reading the install from the ISO images. Please check your "
 "ISO images and try again."
 msgstr ""
 
-#: ../loader/loader.c:815
+#: ../loader/loader.c:913
 #, c-format
-msgid "Would you like to perform an integrity check of the ISO image %s?"
+msgid ""
+"Would you like to perform a checksum test of the ISO image:\n"
+"\n"
+"   %s?"
 msgstr ""
 
-#: ../loader/loader.c:818
-msgid "Integrity Check"
+#: ../loader/loader.c:916
+msgid "Checksum Test"
 msgstr ""
 
-#: ../loader/loader.c:918
+#: ../loader/loader.c:1026
 msgid "Hard Drives"
 msgstr ""
 
-#: ../loader/loader.c:919
+#: ../loader/loader.c:1027
 msgid ""
 "You don't seem to have any hard drives on your system! Would you like to "
 "configure additional devices?"
 msgstr ""
 
-#: ../loader/loader.c:965
+#: ../loader/loader.c:1072
+#, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
-"for Red Hat Linux? If you don't see the disk drive you're using listed here, "
-"press F2 to configure additional devices."
+"for %s? If you don't see the disk drive you're using listed here, press F2 "
+"to configure additional devices."
 msgstr ""
 
-#: ../loader/loader.c:979
+#: ../loader/loader.c:1088
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader/loader.c:999
+#: ../loader/loader.c:1108
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader/loader.c:1047
+#: ../loader/loader.c:1156
 #, c-format
 msgid "Device %s does not appear to contain Red Hat CDROM images."
 msgstr ""
 
-#: ../loader/loader.c:1091 ../loader/mediacheck.c:198
+#: ../loader/loader.c:1206 ../loader/loader.c:1227 ../loader/mediacheck.c:209
 msgid "Media Check"
 msgstr ""
 
-#: ../loader/loader.c:1092
+#: ../loader/loader.c:1206 ../loader/loader.c:1210
+msgid "Eject CD"
+msgstr ""
+
+#: ../loader/loader.c:1207
 #, c-format
 msgid ""
-"Please insert any additional media you would like to test and press %s.\n"
+"Choose \"%s\" to test the CD currently in the drive, or \"%s\" to eject the "
+"CD and insert another for testing."
+msgstr ""
+
+#: ../loader/loader.c:1228
+#, c-format
+msgid ""
+"If you would like to test additional media, insert the next CD and press \"%s"
+"\". You do not have to test all CDs, although it is recommended you do so at "
+"least once.\n"
 "\n"
-"Otherwise insert CD #1 into your drive and press %s to continue."
+"To begin the installation process insert CD #1 into the drive and press \"%s"
+"\"."
 msgstr ""
 
-#: ../loader/loader.c:1111 ../loader/loader.c:1209
+#: ../loader/loader.c:1249 ../loader/loader.c:1363
+#, c-format
 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."
+"The %s CD was not found in any of your CDROM drives. Please insert the %s CD "
+"and press %s to retry."
 msgstr ""
 
-#: ../loader/loader.c:1177
+#: ../loader/loader.c:1292
 msgid "CD Found"
 msgstr ""
 
-#: ../loader/loader.c:1179
+#: ../loader/loader.c:1294
+#, c-format
 msgid ""
-"We will now test your media before installing.\n"
+"To begin testing the CD media before installation press %s.\n"
 "\n"
-"Choose 'Skip' if you would like to skip this test."
+"Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader/loader.c:1301
+#: ../loader/loader.c:1459
 msgid "Networking Device"
 msgstr ""
 
-#: ../loader/loader.c:1302
+#: ../loader/loader.c:1460
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
 msgstr ""
 
-#: ../loader/loader.c:1418
+#: ../loader/loader.c:1577
 msgid "That directory does not seem to contain a Red Hat installation tree."
 msgstr ""
 
-#: ../loader/loader.c:1423
-msgid "I could not mount that directory from the server"
+#: ../loader/loader.c:1582
+msgid "That directory could not be mounted from the server"
 msgstr ""
 
-#: ../loader/loader.c:1465
+#: ../loader/loader.c:1624
 #, c-format
 msgid "File %s/%s not found on server."
 msgstr ""
 
-#: ../loader/loader.c:1503
+#: ../loader/loader.c:1662
 msgid "HTTP"
 msgstr ""
 
-#: ../loader/loader.c:1504
+#: ../loader/loader.c:1663
 msgid "Unable to retrieve the first install image"
 msgstr ""
 
-#: ../loader/loader.c:1535
+#: ../loader/loader.c:1694
 msgid "FTP and HTTP installs require 20MB or more of system memory."
 msgstr ""
 
-#: ../loader/loader.c:1798
+#: ../loader/loader.c:1957
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader/loader.c:1799
+#: ../loader/loader.c:1958
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader/loader.c:1801
+#: ../loader/loader.c:1960
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader/loader.c:1803
+#: ../loader/loader.c:1962
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader/loader.c:2521
+#: ../loader/loader.c:2724
 msgid "Cannot find ks.cfg on boot floppy."
 msgstr ""
 
-#: ../loader/loader.c:2613
+#: ../loader/loader.c:2816
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader/loader.c:2614
+#: ../loader/loader.c:2817
 msgid "Insert your updates disk and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader/loader.c:2619
+#: ../loader/loader.c:2822
+#, c-format
 msgid ""
-"The floppy disk you inserted is not a valid update disk for this release of "
-"Red Hat Linux."
+"The floppy disk you inserted is not a valid update disk for this release of %"
+"s."
 msgstr ""
 
-#: ../loader/loader.c:2629
+#: ../loader/loader.c:2832
 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:2634
+#: ../loader/loader.c:2837
 msgid "Updates"
 msgstr ""
 
-#: ../loader/loader.c:2634
+#: ../loader/loader.c:2837
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../loader/loader.c:2846
-msgid "You do not have enough RAM to install Red Hat Linux on this machine."
+#: ../loader/loader.c:3051
+#, c-format
+msgid "You do not have enough RAM to install %s on this machine."
+msgstr ""
+
+#: ../loader/loader.c:3087
+msgid ""
+"The second stage of the install which you have selected does not match the "
+"boot disk which you are using.  This shouldn't happen, and I'm rebooting "
+"your system now."
 msgstr ""
 
-#: ../loader/loader.c:3212
+#: ../loader/loader.c:3479
 msgid ""
 "No hard drives have been found. You probably need to manually choose device "
 "drivers for the installation to succeed. Would you like to select drivers "
 "now?"
 msgstr ""
 
-#: ../loader/loader.c:3372
+#: ../loader/loader.c:3644
 msgid "Running anaconda - please wait...\n"
 msgstr ""
 
-#: ../loader/mediacheck.c:191
+#: ../loader/mediacheck.c:193
 msgid ""
 "Unable to read the disc checksum from the primary volume descriptor.  This "
 "probably means the disc was created without adding the checksum."
 msgstr ""
 
-#: ../loader/mediacheck.c:200 ../loader/mediacheck.c:201
+#: ../loader/mediacheck.c:201
+#, c-format
+msgid "Checking \"%s\"..."
+msgstr ""
+
+#: ../loader/mediacheck.c:203
 msgid "Checking media now..."
 msgstr ""
 
-#: ../loader/mediacheck.c:235
+#: ../loader/mediacheck.c:248
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader/mediacheck.c:248
+#: ../loader/mediacheck.c:261
 msgid ""
 "FAIL.\n"
 "\n"
 "It is not recommended to use this media."
 msgstr ""
 
-#: ../loader/mediacheck.c:250
+#: ../loader/mediacheck.c:263
 msgid ""
 "PASS.\n"
 "\n"
 "It is OK to install from this media."
 msgstr ""
 
-#: ../loader/mediacheck.c:252
+#: ../loader/mediacheck.c:265
 msgid ""
 "NA.\n"
 "\n"
 "No checksum information available, unable to verify media."
 msgstr ""
 
-#: ../loader/mediacheck.c:254
+#: ../loader/mediacheck.c:267
 msgid "Media Check Result"
 msgstr ""
 
-#: ../loader/mediacheck.c:256
+#: ../loader/mediacheck.c:271
 #, c-format
-msgid "The media check is complete, the result is: %s"
+msgid ""
+"of the image:\n"
+"\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: ../loader/modules.c:493
+#: ../loader/mediacheck.c:275
+#, c-format
+msgid "The media check %sis complete, and the result is: %s\n"
+msgstr ""
+
+#: ../loader/modules.c:390
 #, c-format
 msgid "Failed to mount driver disk: %s."
 msgstr ""
 
-#: ../loader/modules.c:513
+#: ../loader/modules.c:410
 msgid "The wrong diskette was inserted."
 msgstr ""
 
-#. This message isn't good, but it'll do.
-#: ../loader/modules.c:526
+#: ../loader/modules.c:423
 msgid "Loading"
 msgstr ""
 
-#: ../loader/modules.c:526 ../loader/windows.c:47
+#: ../loader/modules.c:423 ../loader/windows.c:47
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
 
-#: ../loader/modules.c:545
+#: ../loader/modules.c:442
 msgid "Driver Disk"
 msgstr ""
 
-#: ../loader/modules.c:546
+#: ../loader/modules.c:443
 #, c-format
 msgid "Please insert the %s driver disk now."
 msgstr ""
 
-#: ../loader/net.c:170
+#: ../loader/net.c:62
+#, c-format
+msgid ""
+"Please enter the following information:\n"
+"\n"
+"    o the name or IP number of your %s server\n"
+"    o the directory on that server containing\n"
+"      %s for your architecture\n"
+msgstr ""
+
+#: ../loader/net.c:176
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader/net.c:173 ../loader/urls.c:229
+#: ../loader/net.c:179 ../loader/urls.c:226
 msgid "Red Hat directory:"
 msgstr ""
 
-#: ../loader/net.c:179
+#: ../loader/net.c:185
 msgid "NFS Setup"
 msgstr ""
 
-#: ../loader/net.c:180
-msgid ""
-"Please enter the following information:\n"
-"\n"
-"    o the name or IP number of your NFS server\n"
-"    o the directory on that server containing\n"
-"      Red Hat Linux for your architecture"
-msgstr ""
-
-#: ../loader/net.c:262
+#: ../loader/net.c:259
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader/net.c:266 ../loader/net.c:815
+#: ../loader/net.c:263 ../loader/net.c:812
 msgid "Nameserver"
 msgstr ""
 
-#: ../loader/net.c:267
+#: ../loader/net.c:264
 msgid ""
 "Your dynamic IP request returned IP configuration information, but it did "
 "not include a DNS nameserver. If you know what your nameserver is, please "
@@ -4595,98 +4273,98 @@ msgid ""
 "blank and the install will continue."
 msgstr ""
 
-#: ../loader/net.c:277
+#: ../loader/net.c:274
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader/net.c:278
+#: ../loader/net.c:275
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader/net.c:303
+#: ../loader/net.c:299
 msgid ""
 "Please enter the IP configuration for this machine. Each item should be "
 "entered as an IP address in dotted-decimal notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../loader/net.c:345
+#: ../loader/net.c:341
 msgid "Use dynamic IP configuration (BOOTP/DHCP)"
 msgstr ""
 
-#: ../loader/net.c:373
+#: ../loader/net.c:369
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader/net.c:404
+#: ../loader/net.c:400
 msgid "Missing Information"
 msgstr ""
 
-#: ../loader/net.c:405
+#: ../loader/net.c:401
 msgid "You must enter both a valid IP address and a netmask."
 msgstr ""
 
-#: ../loader/net.c:413 ../loader/net.c:749
+#: ../loader/net.c:409 ../loader/net.c:746
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../loader/net.c:414 ../loader/net.c:750
+#: ../loader/net.c:410 ../loader/net.c:747
 msgid "Sending request for IP information..."
 msgstr ""
 
-#: ../loader/net.c:626
+#: ../loader/net.c:623
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader/net.c:733 ../loader/net.c:766
+#: ../loader/net.c:730 ../loader/net.c:763
 msgid "kickstart"
 msgstr ""
 
-#: ../loader/net.c:734
+#: ../loader/net.c:731
 #, c-format
 msgid "bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader/net.c:767
+#: ../loader/net.c:764
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader/net.c:809
+#: ../loader/net.c:806
 msgid "Boot protocol to use"
 msgstr ""
 
-#: ../loader/net.c:811
+#: ../loader/net.c:808
 msgid "Network gateway"
 msgstr ""
 
-#: ../loader/net.c:813
+#: ../loader/net.c:810
 msgid "IP address"
 msgstr ""
 
-#: ../loader/net.c:822
+#: ../loader/net.c:819
 msgid "Domain name"
 msgstr ""
 
-#: ../loader/net.c:825
+#: ../loader/net.c:822
 msgid "Network device"
 msgstr ""
 
-#: ../loader/net.c:897
+#: ../loader/net.c:894
 msgid ""
 " <Tab>/<Alt-Tab> between elements   |   <Space> selects  |   <F12> next "
 "screen"
 msgstr ""
 
-#: ../loader/net.c:898
+#: ../loader/net.c:895
 #, c-format
 msgid "netconfig %s  (C) 1999 Red Hat, Inc."
 msgstr ""
 
-#: ../loader/net.c:900
+#: ../loader/net.c:897
 msgid "Network configuration"
 msgstr ""
 
-#: ../loader/net.c:901
+#: ../loader/net.c:898
 msgid "Would you like to set up networking?"
 msgstr ""
 
@@ -4722,108 +4400,90 @@ msgstr ""
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader/urls.c:80
+#: ../loader/urls.c:82
 #, c-format
 msgid "Failed to log into %s: %s"
 msgstr ""
 
-#: ../loader/urls.c:90 ../loader/urls.c:98
+#: ../loader/urls.c:92 ../loader/urls.c:100
 #, c-format
 msgid "Failed to retrieve %s: %s"
 msgstr ""
 
-#: ../loader/urls.c:103
+#: ../loader/urls.c:105
 msgid "Retrieving"
 msgstr ""
 
-#: ../loader/urls.c:198
-msgid ""
-"Please enter the following information:\n"
-"\n"
-"    o the name or IP number of your FTP server\n"
-"    o the directory on that server containing\n"
-"      Red Hat Linux for your architecture\n"
-msgstr ""
-
-#: ../loader/urls.c:207
-msgid ""
-"Please enter the following information:\n"
-"\n"
-"    o the name or IP number of your web server\n"
-"    o the directory on that server containing\n"
-"      Red Hat Linux for your architecure\n"
-msgstr ""
-
-#: ../loader/urls.c:225
+#: ../loader/urls.c:222
 msgid "FTP site name:"
 msgstr ""
 
-#: ../loader/urls.c:226
+#: ../loader/urls.c:223
 msgid "Web site name:"
 msgstr ""
 
-#: ../loader/urls.c:244
+#: ../loader/urls.c:241
 msgid "Use non-anonymous ftp"
 msgstr ""
 
-#: ../loader/urls.c:249
+#: ../loader/urls.c:246
 msgid "Use proxy server"
 msgstr ""
 
-#: ../loader/urls.c:261
+#: ../loader/urls.c:258
 msgid "FTP Setup"
 msgstr ""
 
-#: ../loader/urls.c:262
+#: ../loader/urls.c:259
 msgid "HTTP Setup"
 msgstr ""
 
-#: ../loader/urls.c:272
+#: ../loader/urls.c:269
 msgid "You must enter a server name."
 msgstr ""
 
-#: ../loader/urls.c:277
+#: ../loader/urls.c:274
 msgid "You must enter a directory."
 msgstr ""
 
-#: ../loader/urls.c:282
+#: ../loader/urls.c:279
 msgid "Unknown Host"
 msgstr ""
 
-#: ../loader/urls.c:283
+#: ../loader/urls.c:280
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../loader/urls.c:363
+#: ../loader/urls.c:360
 msgid ""
 "If you are using non anonymous ftp, enter the account name and password you "
 "wish to use below."
 msgstr ""
 
-#: ../loader/urls.c:368
+#: ../loader/urls.c:365
 msgid ""
 "If you are using a HTTP proxy server enter the name of the HTTP proxy server "
 "to use."
 msgstr ""
 
-#: ../loader/urls.c:389
+#: ../loader/urls.c:386
 msgid "Account name:"
 msgstr ""
 
-#: ../loader/urls.c:398
+#: ../loader/urls.c:395
 msgid "FTP Proxy:"
 msgstr ""
 
-#: ../loader/urls.c:399
+#: ../loader/urls.c:396
 msgid "HTTP Proxy:"
 msgstr ""
 
-#: ../loader/urls.c:403
+#: ../loader/urls.c:400
 msgid "FTP Proxy Port:"
 msgstr ""
 
-#: ../loader/urls.c:404
+#: ../loader/urls.c:401
 msgid "HTTP Proxy Port:"
 msgstr ""
 
@@ -4831,111 +4491,163 @@ msgstr ""
 msgid "Loading SCSI driver"
 msgstr ""
 
+#: ../gnome-map/gglobe-canvas.c:24
+msgid "Map Image to display"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:25
+msgid "Width of map (in pixels)"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:26
+msgid "Enable antialias"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:100 ../gnome-map/timezonemapmodule.c:70
+msgid "World"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:101 ../gnome-map/timezonemapmodule.c:71
+msgid "North America"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:102 ../gnome-map/timezonemapmodule.c:72
+msgid "South America"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:103 ../gnome-map/timezonemapmodule.c:73
+msgid "Indian Rim"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:104 ../gnome-map/timezonemapmodule.c:74
+msgid "Europe"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:105 ../gnome-map/timezonemapmodule.c:75
+msgid "Africa"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:106 ../gnome-map/timezonemapmodule.c:76
+msgid "Asia"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:714 ../gnome-map/timezonemapmodule.c:698
+msgid "Cannot load timezone data"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:720 ../gnome-map/timezonemapmodule.c:731
+msgid "gglobe-canvas"
+msgstr ""
+
+#: ../gnome-map/gglobe-canvas.c:765
+msgid "View: "
+msgstr ""
+
 # ../comps/comps-master:3
 msgid "Base"
 msgstr ""
 
-# ../comps/comps-master:166
+# ../comps/comps-master:162
 msgid "Printing Support"
 msgstr ""
 
-# ../comps/comps-master:224
+# ../comps/comps-master:218
 msgid "Classic X Window System"
 msgstr ""
 
-# ../comps/comps-master:306
+# ../comps/comps-master:300
 msgid "X Window System"
 msgstr ""
 
-# ../comps/comps-master:349
+# ../comps/comps-master:343
 msgid "Laptop Support"
 msgstr ""
 
-# ../comps/comps-master:507
+# ../comps/comps-master:500
 msgid "Sound and Multimedia Support"
 msgstr ""
 
-# ../comps/comps-master:556
+# ../comps/comps-master:549
 msgid "Network Support"
 msgstr ""
 
-# ../comps/comps-master:632
+# ../comps/comps-master:625
 msgid "Dialup Support"
 msgstr ""
 
-# ../comps/comps-master:655
+# ../comps/comps-master:648
 msgid "Messaging and Web Tools"
 msgstr ""
 
-# ../comps/comps-master:699
+# ../comps/comps-master:692
 msgid "Graphics and Image Manipulation"
 msgstr ""
 
-# ../comps/comps-master:733
+# ../comps/comps-master:726
 msgid "News Server"
 msgstr ""
 
-# ../comps/comps-master:739
+# ../comps/comps-master:732
 msgid "NFS File Server"
 msgstr ""
 
-# ../comps/comps-master:744
+# ../comps/comps-master:737
 msgid "Windows File Server"
 msgstr ""
 
-# ../comps/comps-master:751
+# ../comps/comps-master:744
 msgid "Anonymous FTP Server"
 msgstr ""
 
-# ../comps/comps-master:757
+# ../comps/comps-master:750
 msgid "SQL Database Server"
 msgstr ""
 
-# ../comps/comps-master:771
+# ../comps/comps-master:764
 msgid "Web Server"
 msgstr ""
 
-# ../comps/comps-master:808
+# ../comps/comps-master:801
 msgid "Router / Firewall"
 msgstr ""
 
-# ../comps/comps-master:823
+# ../comps/comps-master:816
 msgid "DNS Name Server"
 msgstr ""
 
-# ../comps/comps-master:835
+# ../comps/comps-master:828
 msgid "Network Managed Workstation"
 msgstr ""
 
-# ../comps/comps-master:844
+# ../comps/comps-master:837
 msgid "Authoring and Publishing"
 msgstr ""
 
-# ../comps/comps-master:874
+# ../comps/comps-master:867
 msgid "Emacs"
 msgstr ""
 
-# ../comps/comps-master:897
+# ../comps/comps-master:890
 msgid "Utilities"
 msgstr ""
 
-# ../comps/comps-master:936
+# ../comps/comps-master:929
 msgid "Legacy Application Support"
 msgstr ""
 
-# ../comps/comps-master:963
+# ../comps/comps-master:956
 msgid "Software Development"
 msgstr ""
 
-# ../comps/comps-master:1172
+# ../comps/comps-master:1165
 msgid "Kernel Development"
 msgstr ""
 
-# ../comps/comps-master:1177
+# ../comps/comps-master:1170
 msgid "Windows Compatibility / Interoperability"
 msgstr ""
 
-# ../comps/comps-master:1195
+# ../comps/comps-master:1188
 msgid "Games and Entertainment"
 msgstr ""
 
@@ -4976,6 +4688,10 @@ msgid "Amundsen-Scott Station, South Pole"
 msgstr ""
 
 #. generated from zone.tab
+msgid "Aqtobe (Aktobe)"
+msgstr ""
+
+#. generated from zone.tab
 msgid "Atlantic islands"
 msgstr ""
 
@@ -4992,6 +4708,10 @@ msgid "Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971"
 msgstr ""
 
 #. generated from zone.tab
+msgid "Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)"
+msgstr ""
+
+#. generated from zone.tab
 msgid "Azores"
 msgstr ""
 
@@ -5012,11 +4732,11 @@ msgid "Catamarca (CT)"
 msgstr ""
 
 #. generated from zone.tab
-msgid "central Crimea"
+msgid "central China - Gansu, Guizhou, Sichuan, Yunnan, etc."
 msgstr ""
 
 #. generated from zone.tab
-msgid "central Kazakhstan"
+msgid "central Crimea"
 msgstr ""
 
 #. generated from zone.tab
@@ -5052,6 +4772,10 @@ msgid "Central Time - most locations"
 msgstr ""
 
 #. generated from zone.tab
+msgid "Central Time - North Dakota - Oliver County"
+msgstr ""
+
+#. generated from zone.tab
 msgid "Central Time - Quintana Roo"
 msgstr ""
 
@@ -5072,31 +4796,31 @@ msgid "Chatham Islands"
 msgstr ""
 
 #. generated from zone.tab
-msgid "China coast"
+msgid "Davis Station, Vestfold Hills"
 msgstr ""
 
 #. generated from zone.tab
-msgid "China mountains"
+msgid "Dornod, Sukhbaatar"
 msgstr ""
 
 #. generated from zone.tab
-msgid "Davis Station, Vestfold Hills"
+msgid "Dumont-d'Urville Base, Terre Adelie"
 msgstr ""
 
 #. generated from zone.tab
-msgid "Dornod, Sukhbaatar (unsure about this)"
+msgid "E Amazonas"
 msgstr ""
 
 #. generated from zone.tab
-msgid "Dumont-d'Urville Base, Terre Adelie"
+msgid "E Argentina (BA, DF, SC, TF)"
 msgstr ""
 
 #. generated from zone.tab
-msgid "E Amazonas"
+msgid "east China - Beijing, Guangdong, Shanghai, etc."
 msgstr ""
 
 #. generated from zone.tab
-msgid "E Argentina (BA, DF, SC, TF)"
+msgid "east coast, north of Scoresbysund"
 msgstr ""
 
 #. generated from zone.tab
@@ -5164,18 +4888,6 @@ msgid "Eastern Time - Thunder Bay, Ontario"
 msgstr ""
 
 #. generated from zone.tab
-msgid "Eastern Turkestan"
-msgstr ""
-
-#. generated from zone.tab
-msgid "east Greenland"
-msgstr ""
-
-#. generated from zone.tab
-msgid "east Kazakhstan"
-msgstr ""
-
-#. generated from zone.tab
 msgid "east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor"
 msgstr ""
 
@@ -5204,6 +4916,10 @@ msgid "Hawaii"
 msgstr ""
 
 #. generated from zone.tab
+msgid "Heilongjiang"
+msgstr ""
+
+#. generated from zone.tab
 msgid "Irian Jaya & the Moluccas"
 msgstr ""
 
@@ -5308,7 +5024,11 @@ msgid "Moscow+07 - Amur River"
 msgstr ""
 
 #. generated from zone.tab
-msgid "Moscow+08 - Magadan & Sakhalin"
+msgid "Moscow+07 - Sakhalin Island"
+msgstr ""
+
+#. generated from zone.tab
+msgid "Moscow+08 - Magadan"
 msgstr ""
 
 #. generated from zone.tab
@@ -5396,14 +5116,6 @@ msgid "Northern Territory"
 msgstr ""
 
 #. generated from zone.tab
-msgid "north Manchuria"
-msgstr ""
-
-#. generated from zone.tab
-msgid "northwest Greenland"
-msgstr ""
-
-#. generated from zone.tab
 msgid "Pacific Time - north Yukon"
 msgstr ""
 
@@ -5444,6 +5156,10 @@ msgid "Queensland - most locations"
 msgstr ""
 
 #. generated from zone.tab
+msgid "Qyzylorda (Kyzylorda, Kzyl-Orda)"
+msgstr ""
+
+#. generated from zone.tab
 msgid "Roraima"
 msgstr ""
 
@@ -5456,6 +5172,10 @@ msgid "Sabah & Sarawak"
 msgstr ""
 
 #. generated from zone.tab
+msgid "Scoresbysund / Ittoqqortoormiit"
+msgstr ""
+
+#. generated from zone.tab
 msgid "Society Islands"
 msgstr ""
 
@@ -5464,11 +5184,11 @@ msgid "South Australia"
 msgstr ""
 
 #. generated from zone.tab
-msgid "southwest Greenland"
+msgid "southwest Mali"
 msgstr ""
 
 #. generated from zone.tab
-msgid "southwest Mali"
+msgid "southwest Xinjiang Uyghur"
 msgstr ""
 
 #. generated from zone.tab
@@ -5488,7 +5208,11 @@ msgid "Tasmania"
 msgstr ""
 
 #. generated from zone.tab
-msgid "Tibet & Xinjiang"
+msgid "Thule / Pituffik"
+msgstr ""
+
+#. generated from zone.tab
+msgid "Tibet & most of Xinjiang Uyghur"
 msgstr ""
 
 #. generated from zone.tab
@@ -5532,7 +5256,7 @@ msgid "Western Australia"
 msgstr ""
 
 #. generated from zone.tab
-msgid "west Kazakhstan"
+msgid "West Kazakhstan"
 msgstr ""
 
 #. generated from zone.tab
@@ -5552,6 +5276,14 @@ msgid "Zaporozh'ye, E Lugansk"
 msgstr ""
 
 #. generated from lang-table
+msgid "Chinese(Simplified)"
+msgstr ""
+
+#. generated from lang-table
+msgid "Chinese(Traditional)"
+msgstr ""
+
+#. generated from lang-table
 msgid "Czech"
 msgstr ""
 
@@ -5592,6 +5324,14 @@ msgid "Norwegian"
 msgstr ""
 
 #. generated from lang-table
+msgid "Portuguese"
+msgstr ""
+
+#. generated from lang-table
+msgid "Romanian"
+msgstr ""
+
+#. generated from lang-table
 msgid "Russian"
 msgstr ""