Renamed loader2 subdirectory to loader (hooray for git)

1 files changed, 264 insertions, 264 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 573f24039..2cf82795d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -46,41 +46,41 @@ msgstr "Press <enter> for a shell"
 #: ../textw/network_text.py:44 ../textw/network_text.py:54
 #: ../textw/network_text.py:76 ../textw/network_text.py:82
 #: ../textw/network_text.py:230 ../textw/network_text.py:815
-#: ../textw/network_text.py:823 ../loader2/cdinstall.c:145
-#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:200
-#: ../loader2/cdinstall.c:203 ../loader2/cdinstall.c:342
-#: ../loader2/cdinstall.c:347 ../loader2/cdinstall.c:351
-#: ../loader2/cdinstall.c:421 ../loader2/dirbrowser.c:145
-#: ../loader2/driverdisk.c:98 ../loader2/driverdisk.c:235
-#: ../loader2/driverdisk.c:266 ../loader2/driverdisk.c:299
-#: ../loader2/driverdisk.c:337 ../loader2/driverdisk.c:351
-#: ../loader2/driverdisk.c:365 ../loader2/driverdisk.c:375
-#: ../loader2/driverdisk.c:535 ../loader2/driverdisk.c:572
-#: ../loader2/driverselect.c:75 ../loader2/driverselect.c:199
-#: ../loader2/hdinstall.c:141 ../loader2/hdinstall.c:252
-#: ../loader2/hdinstall.c:388 ../loader2/hdinstall.c:438
-#: ../loader2/hdinstall.c:470 ../loader2/hdinstall.c:540
-#: ../loader2/hdinstall.c:583 ../loader2/hdinstall.c:596 ../loader2/kbd.c:138
-#: ../loader2/kickstart.c:132 ../loader2/kickstart.c:142
-#: ../loader2/kickstart.c:185 ../loader2/kickstart.c:284
-#: ../loader2/kickstart.c:372 ../loader2/kickstart.c:529 ../loader2/lang.c:115
-#: ../loader2/lang.c:376 ../loader2/loader.c:344 ../loader2/loader.c:379
-#: ../loader2/loader.c:414 ../loader2/loader.c:431 ../loader2/loader.c:445
-#: ../loader2/loader.c:480 ../loader2/loader.c:997 ../loader2/loader.c:1159
-#: ../loader2/mediacheck.c:62 ../loader2/mediacheck.c:101
-#: ../loader2/mediacheck.c:108 ../loader2/mediacheck.c:117
-#: ../loader2/method.c:120 ../loader2/method.c:346 ../loader2/method.c:420
-#: ../loader2/modules.c:336 ../loader2/modules.c:348 ../loader2/net.c:277
-#: ../loader2/net.c:320 ../loader2/net.c:750 ../loader2/net.c:1094
-#: ../loader2/net.c:1647 ../loader2/net.c:1670 ../loader2/net.c:1863
-#: ../loader2/nfsinstall.c:68 ../loader2/nfsinstall.c:153
-#: ../loader2/nfsinstall.c:283 ../loader2/nfsinstall.c:301
-#: ../loader2/nfsinstall.c:342 ../loader2/telnetd.c:93
-#: ../loader2/urlinstall.c:78 ../loader2/urlinstall.c:101
-#: ../loader2/urlinstall.c:185 ../loader2/urlinstall.c:196
-#: ../loader2/urlinstall.c:437 ../loader2/urlinstall.c:446
-#: ../loader2/urlinstall.c:455 ../loader2/urls.c:280 ../loader2/urls.c:315
-#: ../loader2/urls.c:321 ../loader2/urls.c:333 ../loader2/urls.c:405
+#: ../textw/network_text.py:823 ../loader/cdinstall.c:145
+#: ../loader/cdinstall.c:146 ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:203 ../loader/cdinstall.c:342
+#: ../loader/cdinstall.c:347 ../loader/cdinstall.c:351
+#: ../loader/cdinstall.c:421 ../loader/dirbrowser.c:145
+#: ../loader/driverdisk.c:98 ../loader/driverdisk.c:235
+#: ../loader/driverdisk.c:266 ../loader/driverdisk.c:299
+#: ../loader/driverdisk.c:337 ../loader/driverdisk.c:351
+#: ../loader/driverdisk.c:365 ../loader/driverdisk.c:375
+#: ../loader/driverdisk.c:535 ../loader/driverdisk.c:572
+#: ../loader/driverselect.c:75 ../loader/driverselect.c:199
+#: ../loader/hdinstall.c:141 ../loader/hdinstall.c:252
+#: ../loader/hdinstall.c:388 ../loader/hdinstall.c:438
+#: ../loader/hdinstall.c:470 ../loader/hdinstall.c:540
+#: ../loader/hdinstall.c:583 ../loader/hdinstall.c:596 ../loader/kbd.c:138
+#: ../loader/kickstart.c:132 ../loader/kickstart.c:142
+#: ../loader/kickstart.c:185 ../loader/kickstart.c:284
+#: ../loader/kickstart.c:372 ../loader/kickstart.c:529 ../loader/lang.c:115
+#: ../loader/lang.c:376 ../loader/loader.c:344 ../loader/loader.c:379
+#: ../loader/loader.c:414 ../loader/loader.c:431 ../loader/loader.c:445
+#: ../loader/loader.c:480 ../loader/loader.c:997 ../loader/loader.c:1159
+#: ../loader/mediacheck.c:62 ../loader/mediacheck.c:101
+#: ../loader/mediacheck.c:108 ../loader/mediacheck.c:117
+#: ../loader/method.c:120 ../loader/method.c:346 ../loader/method.c:420
+#: ../loader/modules.c:336 ../loader/modules.c:348 ../loader/net.c:277
+#: ../loader/net.c:320 ../loader/net.c:750 ../loader/net.c:1094
+#: ../loader/net.c:1647 ../loader/net.c:1670 ../loader/net.c:1863
+#: ../loader/nfsinstall.c:68 ../loader/nfsinstall.c:153
+#: ../loader/nfsinstall.c:283 ../loader/nfsinstall.c:301
+#: ../loader/nfsinstall.c:342 ../loader/telnetd.c:93
+#: ../loader/urlinstall.c:78 ../loader/urlinstall.c:101
+#: ../loader/urlinstall.c:185 ../loader/urlinstall.c:196
+#: ../loader/urlinstall.c:437 ../loader/urlinstall.c:446
+#: ../loader/urlinstall.c:455 ../loader/urls.c:280 ../loader/urls.c:315
+#: ../loader/urls.c:321 ../loader/urls.c:333 ../loader/urls.c:405
 msgid "OK"
 msgstr "OK"
 
@@ -579,22 +579,22 @@ msgstr "Formatting %s file system..."
 #: ../textw/grpselect_text.py:123 ../textw/partition_text.py:1651
 #: ../textw/partition_text.py:1657 ../textw/partition_text.py:1679
 #: ../textw/upgrade_text.py:174 ../textw/upgrade_text.py:181
-#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:421
-#: ../loader2/driverdisk.c:98 ../loader2/driverdisk.c:299
-#: ../loader2/driverdisk.c:337 ../loader2/driverdisk.c:365
-#: ../loader2/driverdisk.c:375 ../loader2/driverdisk.c:439
-#: ../loader2/hdinstall.c:141 ../loader2/hdinstall.c:252
-#: ../loader2/hdinstall.c:438 ../loader2/hdinstall.c:540
-#: ../loader2/hdinstall.c:583 ../loader2/hdinstall.c:596
-#: ../loader2/kickstart.c:284 ../loader2/lang.c:115 ../loader2/loader.c:344
-#: ../loader2/loader.c:445 ../loader2/loader.c:997 ../loader2/mediacheck.c:62
-#: ../loader2/mediacheck.c:101 ../loader2/mediacheck.c:108
-#: ../loader2/method.c:120 ../loader2/method.c:346 ../loader2/method.c:420
-#: ../loader2/nfsinstall.c:153 ../loader2/nfsinstall.c:283
-#: ../loader2/nfsinstall.c:301 ../loader2/telnetd.c:93
-#: ../loader2/urlinstall.c:78 ../loader2/urlinstall.c:101
-#: ../loader2/urlinstall.c:185 ../loader2/urlinstall.c:196
-#: ../loader2/urls.c:315 ../loader2/urls.c:321
+#: ../loader/cdinstall.c:146 ../loader/cdinstall.c:421
+#: ../loader/driverdisk.c:98 ../loader/driverdisk.c:299
+#: ../loader/driverdisk.c:337 ../loader/driverdisk.c:365
+#: ../loader/driverdisk.c:375 ../loader/driverdisk.c:439
+#: ../loader/hdinstall.c:141 ../loader/hdinstall.c:252
+#: ../loader/hdinstall.c:438 ../loader/hdinstall.c:540
+#: ../loader/hdinstall.c:583 ../loader/hdinstall.c:596
+#: ../loader/kickstart.c:284 ../loader/lang.c:115 ../loader/loader.c:344
+#: ../loader/loader.c:445 ../loader/loader.c:997 ../loader/mediacheck.c:62
+#: ../loader/mediacheck.c:101 ../loader/mediacheck.c:108
+#: ../loader/method.c:120 ../loader/method.c:346 ../loader/method.c:420
+#: ../loader/nfsinstall.c:153 ../loader/nfsinstall.c:283
+#: ../loader/nfsinstall.c:301 ../loader/telnetd.c:93
+#: ../loader/urlinstall.c:78 ../loader/urlinstall.c:101
+#: ../loader/urlinstall.c:185 ../loader/urlinstall.c:196
+#: ../loader/urls.c:315 ../loader/urls.c:321
 msgid "Error"
 msgstr "Error"
 
@@ -650,8 +650,8 @@ msgstr ""
 "Press <Enter> to reboot your system."
 
 #: ../fsset.py:1715 ../packages.py:368 ../rescue.py:305 ../rescue.py:307
-#: ../textw/upgrade_text.py:132 ../loader2/cdinstall.c:200
-#: ../loader2/cdinstall.c:203 ../loader2/method.c:393
+#: ../textw/upgrade_text.py:132 ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:203 ../loader/method.c:393
 msgid "Skip"
 msgstr "Skip"
 
@@ -983,21 +983,21 @@ msgstr "Fix"
 
 #: ../gui.py:232 ../rescue.py:228 ../text.py:535
 #: ../textw/bootloader_text.py:72 ../textw/constants_text.py:54
-#: ../loader2/driverdisk.c:479 ../loader2/driverdisk.c:489
-#: ../loader2/hdinstall.c:334
+#: ../loader/driverdisk.c:479 ../loader/driverdisk.c:489
+#: ../loader/hdinstall.c:334
 msgid "Yes"
 msgstr "Yes"
 
 #: ../gui.py:233 ../rescue.py:228 ../rescue.py:230 ../text.py:536
 #: ../textw/bootloader_text.py:72 ../textw/constants_text.py:58
-#: ../loader2/driverdisk.c:479 ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:479 ../loader/driverdisk.c:489
 msgid "No"
 msgstr "No"
 
-#: ../gui.py:235 ../text.py:538 ../text.py:669 ../loader2/net.c:92
-#: ../loader2/net.c:338 ../loader2/net.c:589 ../loader2/net.c:695
-#: ../loader2/net.c:820 ../loader2/net.c:828 ../loader2/net.c:1224
-#: ../loader2/net.c:1230
+#: ../gui.py:235 ../text.py:538 ../text.py:669 ../loader/net.c:92
+#: ../loader/net.c:338 ../loader/net.c:589 ../loader/net.c:695
+#: ../loader/net.c:820 ../loader/net.c:828 ../loader/net.c:1224
+#: ../loader/net.c:1230
 msgid "Retry"
 msgstr "Retry"
 
@@ -1008,8 +1008,8 @@ msgstr "Ignore"
 #: ../gui.py:237 ../gui.py:856 ../gui.py:1403 ../partIntfHelpers.py:244
 #: ../partIntfHelpers.py:535 ../text.py:108 ../text.py:109 ../text.py:540
 #: ../textw/bootloader_text.py:202 ../textw/constants_text.py:46
-#: ../loader2/dirbrowser.c:145 ../loader2/driverdisk.c:236
-#: ../loader2/kickstart.c:372 ../loader2/loader.c:379 ../loader2/loader.c:480
+#: ../loader/dirbrowser.c:145 ../loader/driverdisk.c:236
+#: ../loader/kickstart.c:372 ../loader/loader.c:379 ../loader/loader.c:480
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -1874,21 +1874,21 @@ msgid "_Write changes to disk"
 msgstr ""
 
 #: ../partitions.py:200 ../textw/constants_text.py:50
-#: ../loader2/cdinstall.c:351 ../loader2/driverdisk.c:236
-#: ../loader2/driverdisk.c:267 ../loader2/driverdisk.c:351
-#: ../loader2/driverselect.c:75 ../loader2/driverselect.c:173
-#: ../loader2/driverselect.c:199 ../loader2/hdinstall.c:334
-#: ../loader2/hdinstall.c:388 ../loader2/kbd.c:138 ../loader2/loader.c:415
-#: ../loader2/loader.c:431 ../loader2/loader.c:1159 ../loader2/loader.c:1181
-#: ../loader2/net.c:277 ../loader2/net.c:320 ../loader2/net.c:750
-#: ../loader2/net.c:1094 ../loader2/net.c:1863 ../loader2/nfsinstall.c:68
-#: ../loader2/urls.c:280 ../loader2/urls.c:405
+#: ../loader/cdinstall.c:351 ../loader/driverdisk.c:236
+#: ../loader/driverdisk.c:267 ../loader/driverdisk.c:351
+#: ../loader/driverselect.c:75 ../loader/driverselect.c:173
+#: ../loader/driverselect.c:199 ../loader/hdinstall.c:334
+#: ../loader/hdinstall.c:388 ../loader/kbd.c:138 ../loader/loader.c:415
+#: ../loader/loader.c:431 ../loader/loader.c:1159 ../loader/loader.c:1181
+#: ../loader/net.c:277 ../loader/net.c:320 ../loader/net.c:750
+#: ../loader/net.c:1094 ../loader/net.c:1863 ../loader/nfsinstall.c:68
+#: ../loader/urls.c:280 ../loader/urls.c:405
 msgid "Back"
 msgstr "Back"
 
 #: ../partitions.py:200 ../rescue.py:305 ../iw/partition_gui.py:572
-#: ../textw/network_text.py:60 ../loader2/cdinstall.c:117
-#: ../loader2/cdinstall.c:125 ../loader2/driverdisk.c:440
+#: ../textw/network_text.py:60 ../loader/cdinstall.c:117
+#: ../loader/cdinstall.c:125 ../loader/driverdisk.c:440
 msgid "Continue"
 msgstr "Continue"
 
@@ -2318,7 +2318,7 @@ msgstr "Please enter your %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Skip entering %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, fuzzy, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Welcome to %s"
@@ -3197,7 +3197,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Language Selection"
 
-#: ../iw/language_gui.py:76 ../textw/language_text.py:45 ../loader2/lang.c:374
+#: ../iw/language_gui.py:76 ../textw/language_text.py:45 ../loader/lang.c:374
 msgid "What language would you like to use during the installation process?"
 msgstr "What language would you like to use during the installation process?"
 
@@ -3574,7 +3574,7 @@ msgstr "A value is required for the field %s."
 msgid "Dynamic IP"
 msgstr "Dynamic IP"
 
-#: ../iw/netconfig_dialog.py:177 ../loader2/net.c:416 ../loader2/net.c:860
+#: ../iw/netconfig_dialog.py:177 ../loader/net.c:416 ../loader/net.c:860
 #, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "Sending request for IP information for %s..."
@@ -3748,7 +3748,7 @@ msgstr "unknown"
 msgid "Hardware address: "
 msgstr "Hardware address: "
 
-#: ../iw/network_gui.py:778 ../textw/network_text.py:228 ../loader2/net.c:820
+#: ../iw/network_gui.py:778 ../textw/network_text.py:228 ../loader/net.c:820
 msgid "Missing Protocol"
 msgstr "Missing Protocol"
 
@@ -3757,7 +3757,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "You must select at least IPv4 or IPv6 support."
 
 #: ../iw/network_gui.py:802 ../iw/network_gui.py:843 ../iw/network_gui.py:849
-#: ../textw/network_text.py:74 ../loader2/net.c:92
+#: ../textw/network_text.py:74 ../loader/net.c:92
 msgid "Invalid Prefix"
 msgstr "Invalid Prefix"
 
@@ -3993,7 +3993,7 @@ msgstr "RAID Devices"
 msgid "None"
 msgstr "None"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Hard Drives"
 
@@ -4909,12 +4909,12 @@ msgstr "Prefix"
 msgid "Activate on boot"
 msgstr "Activate on boot"
 
-#: ../textw/network_text.py:149 ../loader2/net.c:730
+#: ../textw/network_text.py:149 ../loader/net.c:730
 #: tmp/netpostconfig.glade.h:9
 msgid "Enable IPv4 support"
 msgstr "Enable IPv4 support"
 
-#: ../textw/network_text.py:156 ../loader2/net.c:743
+#: ../textw/network_text.py:156 ../loader/net.c:743
 #: tmp/netpostconfig.glade.h:10
 msgid "Enable IPv6 support"
 msgstr "Enable IPv6 support"
@@ -5034,7 +5034,7 @@ msgstr "Auto IPv6"
 msgid "DHCPv6"
 msgstr "DHCPv6"
 
-#: ../textw/network_text.py:678 ../loader2/net.c:1055
+#: ../textw/network_text.py:678 ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Gateway:"
 
@@ -5656,23 +5656,23 @@ msgstr ""
 "* You will not get software and security updates for packages not included "
 "in your subscription."
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:117
-#: ../loader2/mediacheck.c:76
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:117
+#: ../loader/mediacheck.c:76
 msgid "Media Check"
 msgstr "Media Check"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:99
-#: ../loader2/cdinstall.c:117 ../loader2/cdinstall.c:125
-#: ../loader2/method.c:393
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:99
+#: ../loader/cdinstall.c:117 ../loader/cdinstall.c:125
+#: ../loader/method.c:393
 msgid "Test"
 msgstr "Test"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Eject CD"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, fuzzy, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5681,7 +5681,7 @@ msgstr ""
 "Choose \"%s\" to test the CD currently in the drive, or \"%s\" to eject the "
 "CD and insert another for testing."
 
-#: ../loader2/cdinstall.c:118
+#: ../loader/cdinstall.c:118
 #, fuzzy, c-format
 msgid ""
 "If you would like to test additional media, insert the next disc and press "
@@ -5696,7 +5696,7 @@ msgstr ""
 "the first time. After they have been successfully tested, it is not required "
 "to retest each CD prior to using it again."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, fuzzy, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5705,12 +5705,12 @@ msgstr ""
 "The %s CD was not found in any of your CDROM drives. Please insert the %s CD "
 "and press %s to retry."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD Found"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5721,7 +5721,7 @@ msgstr ""
 "\n"
 "Choose %s to skip the media test and start the installation."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, fuzzy, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5730,7 +5730,7 @@ msgstr ""
 "No %s CD was found which matches your boot media.  Please insert the %s CD "
 "and press %s to retry."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, fuzzy, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5739,33 +5739,33 @@ msgstr ""
 "The %s CD was not found in any of your CDROM drives. Please insert the %s CD "
 "and press %s to retry."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD Not Found"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Cannot find kickstart file on CDROM."
 
-#: ../loader2/copy.c:51 ../loader2/method.c:121 ../loader2/method.c:347
+#: ../loader/copy.c:51 ../loader/method.c:121 ../loader/method.c:347
 #, c-format
 msgid "Failed to read directory %s: %s"
 msgstr "Failed to read directory %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Loading"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Reading driver disk..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Driver Disk Source"
 
-#: ../loader2/driverdisk.c:231
+#: ../loader/driverdisk.c:231
 msgid ""
 "You have multiple devices which could serve as sources for a driver disk.  "
 "Which would you like to use?"
@@ -5773,7 +5773,7 @@ msgstr ""
 "You have multiple devices which could serve as sources for a driver disk.  "
 "Which would you like to use?"
 
-#: ../loader2/driverdisk.c:263
+#: ../loader/driverdisk.c:263
 msgid ""
 "There are multiple partitions on this device which could contain the driver "
 "disk image.  Which would you like to use?"
@@ -5781,49 +5781,49 @@ msgstr ""
 "There are multiple partitions on this device which could contain the driver "
 "disk image.  Which would you like to use?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Failed to mount partition."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Select driver disk image"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Select the file which is your driver disk image."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Failed to load driver disk from file."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Insert Driver Disk"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Failed to mount driver disk."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Driver disk is invalid for this release of %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Manually choose"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Load another disk"
 
-#: ../loader2/driverdisk.c:441
+#: ../loader/driverdisk.c:441
 msgid ""
 "No devices of the appropriate type were found on this driver disk.  Would "
 "you like to manually select the driver, continue anyway, or load another "
@@ -5833,38 +5833,38 @@ msgstr ""
 "you like to manually select the driver, continue anyway, or load another "
 "driver disk?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Driver disk"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Do you have a driver disk?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "More Driver Disks?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Do you wish to load any more driver disks?"
 
-#: ../loader2/driverdisk.c:535 ../loader2/driverdisk.c:572
-#: ../loader2/hdinstall.c:470 ../loader2/kickstart.c:132
-#: ../loader2/kickstart.c:142 ../loader2/kickstart.c:185
-#: ../loader2/kickstart.c:529 ../loader2/modules.c:336
-#: ../loader2/modules.c:348 ../loader2/net.c:1647 ../loader2/net.c:1670
-#: ../loader2/nfsinstall.c:342 ../loader2/urlinstall.c:437
-#: ../loader2/urlinstall.c:446 ../loader2/urlinstall.c:455
+#: ../loader/driverdisk.c:535 ../loader/driverdisk.c:572
+#: ../loader/hdinstall.c:470 ../loader/kickstart.c:132
+#: ../loader/kickstart.c:142 ../loader/kickstart.c:185
+#: ../loader/kickstart.c:529 ../loader/modules.c:336
+#: ../loader/modules.c:348 ../loader/net.c:1647 ../loader/net.c:1670
+#: ../loader/nfsinstall.c:342 ../loader/urlinstall.c:437
+#: ../loader/urlinstall.c:446 ../loader/urlinstall.c:455
 msgid "Kickstart Error"
 msgstr "Kickstart Error"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Unknown driver disk kickstart source: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5873,7 +5873,7 @@ msgstr ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5884,19 +5884,19 @@ msgstr ""
 "separated by spaces.  If you don't know what parameters to supply, skip this "
 "screen by pressing the \"OK\" button."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Enter Module Parameters"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "No drivers found"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Load driver disk"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5904,7 +5904,7 @@ msgstr ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
 
-#: ../loader2/driverselect.c:191
+#: ../loader/driverselect.c:191
 msgid ""
 "Please select the driver below which you wish to load.  If it does not "
 "appear and you have a driver disk, press F2."
@@ -5912,26 +5912,26 @@ msgstr ""
 "Please select the driver below which you wish to load.  If it does not "
 "appear and you have a driver disk, press F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Specify optional module arguments"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Select Device Driver to Load"
 
-#: ../loader2/hdinstall.c:80 ../loader2/nfsinstall.c:168
-#: ../loader2/urlinstall.c:274
+#: ../loader/hdinstall.c:80 ../loader/nfsinstall.c:168
+#: ../loader/urlinstall.c:274
 msgid "Media Detected"
 msgstr "Media Detected"
 
-#: ../loader2/hdinstall.c:81 ../loader2/nfsinstall.c:169
-#: ../loader2/urlinstall.c:275
+#: ../loader/hdinstall.c:81 ../loader/nfsinstall.c:169
+#: ../loader/urlinstall.c:275
 msgid "Local installation media detected..."
 msgstr "Local installation media detected..."
 
-#: ../loader2/hdinstall.c:137 ../loader2/nfsinstall.c:293
-#: ../loader2/urlinstall.c:192
+#: ../loader/hdinstall.c:137 ../loader/nfsinstall.c:293
+#: ../loader/urlinstall.c:192
 #, c-format
 msgid ""
 "The %s installation tree in that directory does not seem to match your boot "
@@ -5940,7 +5940,7 @@ msgstr ""
 "The %s installation tree in that directory does not seem to match your boot "
 "media."
 
-#: ../loader2/hdinstall.c:253
+#: ../loader/hdinstall.c:253
 msgid ""
 "An error occured reading the install from the ISO images. Please check your "
 "ISO images and try again."
@@ -5948,7 +5948,7 @@ msgstr ""
 "An error occured reading the install from the ISO images. Please check your "
 "ISO images and try again."
 
-#: ../loader2/hdinstall.c:335
+#: ../loader/hdinstall.c:335
 msgid ""
 "You don't seem to have any hard drives on your system! Would you like to "
 "configure additional devices?"
@@ -5956,7 +5956,7 @@ msgstr ""
 "You don't seem to have any hard drives on your system! Would you like to "
 "configure additional devices?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5967,62 +5967,62 @@ msgstr ""
 "for %s? If you don't see the disk drive you're using listed here, press F2 "
 "to configure additional devices."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Directory holding images:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Select Partition"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Device %s does not appear to contain %s CDROM images."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Bad argument to HD kickstart method command %s: %s"
 
-#: ../loader2/hdinstall.c:541 ../loader2/hdinstall.c:597
+#: ../loader/hdinstall.c:541 ../loader/hdinstall.c:597
 msgid "Cannot find kickstart file on hard drive."
 msgstr "Cannot find kickstart file on hard drive."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Cannot find hard drive for BIOS disk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Keyboard Type"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "What type of keyboard do you have?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Error opening kickstart file %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Error reading contents of kickstart file %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Error in %s on line %d of kickstart file %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Cannot find ks.cfg on boot floppy."
 
-#: ../loader2/kickstart.c:377
+#: ../loader/kickstart.c:377
 msgid ""
 "Unable to download the kickstart file.  Please modify the kickstart "
 "parameter below or press Cancel to proceed as an interactive installation."
@@ -6030,53 +6030,53 @@ msgstr ""
 "Unable to download the kickstart file.  Please modify the kickstart "
 "parameter below or press Cancel to proceed as an interactive installation."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Error downloading kickstart file"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Bad argument to shutdown kickstart method command %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Welcome to %s - Rescue Mode"
 
-#: ../loader2/lang.c:65 ../loader2/loader.c:166
+#: ../loader/lang.c:65 ../loader/loader.c:166
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Choose a Language"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Local CDROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Hard drive"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS directory"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Welcome to %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Update Disk Source"
 
-#: ../loader2/loader.c:375
+#: ../loader/loader.c:375
 msgid ""
 "You have multiple devices which could serve as sources for an update disk.  "
 "Which would you like to use?"
@@ -6084,7 +6084,7 @@ msgstr ""
 "You have multiple devices which could serve as sources for an update disk.  "
 "Which would you like to use?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6093,28 +6093,28 @@ msgstr ""
 "There are multiple partitions on this device which could contain the driver "
 "disk image.  Which would you like to use?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Updates Disk"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Failed to mount updates disk"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Updates"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Reading anaconda updates..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6123,45 +6123,45 @@ msgstr ""
 "Unable to download the kickstart file.  Please modify the kickstart "
 "parameter below or press Cancel to proceed as an interactive installation."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Error downloading kickstart file"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "You do not have enough RAM to install %s on this machine."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Rescue Method"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installation Method"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "What type of media contains the rescue image?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "What type of media contains the packages to be installed?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "No driver found"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Select driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Use a driver disk"
 
-#: ../loader2/loader.c:1182
+#: ../loader/loader.c:1182
 msgid ""
 "Unable to find any devices of the type needed for this installation type.  "
 "Would you like to manually select your driver or use a driver disk?"
@@ -6169,11 +6169,11 @@ msgstr ""
 "Unable to find any devices of the type needed for this installation type.  "
 "Would you like to manually select your driver or use a driver disk?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "The following devices have been found on your system."
 
-#: ../loader2/loader.c:1417
+#: ../loader/loader.c:1417
 msgid ""
 "No device drivers have been loaded for your system.  Would you like to load "
 "any now?"
@@ -6181,49 +6181,49 @@ msgstr ""
 "No device drivers have been loaded for your system.  Would you like to load "
 "any now?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Devices"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Done"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Add Device"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "loader has already been run.  Starting shell.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Running anaconda, the %s rescue mode - please wait...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Running anaconda, the %s system installer - please wait...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Unable to find install image %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Checking \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Checking media now..."
 
-#: ../loader2/mediacheck.c:102
+#: ../loader/mediacheck.c:102
 msgid ""
 "Unable to read the disc checksum from the primary volume descriptor.  This "
 "probably means the disc was created without adding the checksum."
@@ -6231,7 +6231,7 @@ msgstr ""
 "Unable to read the disc checksum from the primary volume descriptor.  This "
 "probably means the disc was created without adding the checksum."
 
-#: ../loader2/mediacheck.c:109
+#: ../loader/mediacheck.c:109
 msgid ""
 "The image which was just tested has errors. This could be due to a corrupt "
 "download or a bad disc.  If applicable, please clean the disc and try "
@@ -6241,18 +6241,18 @@ msgstr ""
 "download or a bad disc.  If applicable, please clean the disc and try "
 "again.  If this test continues to fail you should not continue the install."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr ""
 
-#: ../loader2/mediacheck.c:118
+#: ../loader/mediacheck.c:118
 msgid ""
 "The image which was just tested was successfully verified.  It should be OK "
 "to install from this media.  Note that not all media/drive errors can be "
 "detected by the media check."
 msgstr ""
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6263,22 +6263,22 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Checksum Test"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Bad argument to device kickstart method command %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Both module type and name must be specified for the kickstart device command."
 
-#: ../loader2/net.c:93
+#: ../loader/net.c:93
 msgid ""
 "Prefix must be between 1 and 32 for IPv4 networks or between 1 and 128 for "
 "IPv6 networks"
@@ -6286,7 +6286,7 @@ msgstr ""
 "Prefix must be between 1 and 32 for IPv4 networks or between 1 and 128 for "
 "IPv6 networks"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6297,27 +6297,27 @@ msgstr ""
 "key needed to access your wireless network.  If no key is needed, leave this "
 "field blank and the install will continue."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Encryption Key"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Wireless Settings"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Nameserver IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Missing Nameserver"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 msgid ""
 "Your IP address request returned configuration information, but it did not "
 "include a nameserver address. If you do not have this information, you can "
@@ -6327,56 +6327,56 @@ msgstr ""
 "include a nameserver address. If you do not have this information, you can "
 "leave the field blank and the install will continue."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Invalid IP Information"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "You entered an invalid IP address."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Network Error"
 
-#: ../loader2/net.c:590 ../loader2/net.c:696
+#: ../loader/net.c:590 ../loader/net.c:696
 msgid "There was an error configuring your network interface."
 msgstr "There was an error configuring your network interface."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configure TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "You must select at least one protocol (IPv4 or IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 Needed for NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS installation method requires IPv4 support."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 address:"
 
-#: ../loader2/net.c:962 ../loader2/net.c:1014 tmp/netconfig.glade.h:1
+#: ../loader/net.c:962 ../loader/net.c:1014 tmp/netconfig.glade.h:1
 #: tmp/netpostconfig.glade.h:1
 msgid "/"
 msgstr "/"
 
-#: ../loader2/net.c:1002
+#: ../loader/net.c:1002
 msgid "IPv6 address:"
 msgstr "IPv6 address:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Name Server:"
 
-#: ../loader2/net.c:1099
+#: ../loader/net.c:1099
 msgid ""
 "Enter the IPv4 and/or the IPv6 address and prefix (address / prefix).  For "
 "IPv4, the dotted-quad netmask or the CIDR-style prefix are acceptable. The "
@@ -6386,43 +6386,43 @@ msgstr ""
 "IPv4, the dotted-quad netmask or the CIDR-style prefix are acceptable. The "
 "gateway and name server fields must be valid IPv4 or IPv6 addresses."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Manual TCP/IP Configuration"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Missing Information"
 
-#: ../loader2/net.c:1225
+#: ../loader/net.c:1225
 msgid ""
 "You must enter both a valid IPv4 address and a network mask or CIDR prefix."
 msgstr ""
 "You must enter both a valid IPv4 address and a network mask or CIDR prefix."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "You must enter both a valid IPv6 address and a CIDR prefix."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Determining host name and domain..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Bad argument to kickstart network command %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Bad bootproto %s specified in network command"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Networking Device"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6430,115 +6430,115 @@ msgstr ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS server name:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s directory:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS Setup"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Hostname specified with no DNS configured"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Retrieving"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "That directory could not be mounted from the server."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "That directory does not seem to contain a %s installation tree."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Bad argument to NFS kickstart method command %s: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "Telnet"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "Waiting for telnet connection..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Running anaconda via telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Unable to retrieve %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Unable to retrieve the install image."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Bad argument to Url kickstart method command %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Must supply a --url argument to Url kickstart method."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Unknown Url method %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr ""
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "Configure TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS Setup"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "You must enter a directory."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr ""
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Unknown Host"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s is not a valid hostname."
 
-#: ../loader2/urls.c:380
+#: ../loader/urls.c:380
 msgid ""
 "If you are using a HTTP proxy server enter the name of the HTTP proxy server "
 "to use."
@@ -6546,24 +6546,24 @@ msgstr ""
 "If you are using a HTTP proxy server enter the name of the HTTP proxy server "
 "to use."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr ""
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr ""
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 #, fuzzy
 msgid "Further Setup"
 msgstr "Further FTP Setup"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Loading SCSI driver"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Loading %s driver..."