Renamed loader2 subdirectory to loader (hooray for git)

1 files changed, 265 insertions, 265 deletions

diff --git a/po/zu.po b/po/zu.po
index d29d4ea83..48f49cdda 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -46,41 +46,41 @@ msgstr ""
 #: ../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 "KULUNGILE"
 
@@ -566,22 +566,22 @@ msgstr "Isistimu yefayela %s yesakhelo..."
 #: ../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 "Iphutha"
 
@@ -635,8 +635,8 @@ msgstr ""
 "Cindezela <Enter> ukulayisha kabusha isistimu yakho."
 
 #: ../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 "Yeqa"
 
@@ -949,21 +949,21 @@ msgstr "Lungisa"
 
 #: ../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 "Yebo"
 
 #: ../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 "Cha"
 
-#: ../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 "Phinda uzame"
 
@@ -974,8 +974,8 @@ msgstr "Ziba"
 #: ../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 "Nqamula"
 
@@ -1851,21 +1851,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 "Emuva"
 
 #: ../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 "Qhubeka"
 
@@ -2291,7 +2291,7 @@ msgstr "Siza ungenise igama leqembu lesisindo."
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../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 "Wamukelekile e-%s"
@@ -3206,7 +3206,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Ukhetho Lolimi"
 
-#: ../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 "Iluphi ulimi ongathanda ukulisebenzisa ngesikhathi senqubo yokufaka?"
 
@@ -3592,7 +3592,7 @@ msgstr "Inani elidingekayo kulenkundla \"%s\"."
 msgid "Dynamic IP"
 msgstr "IP Yekhethelo"
 
-#: ../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 "Ithumela isicelo solwazi lwe-IP lwe-%s..."
@@ -3786,7 +3786,7 @@ msgstr "Okungaziwa"
 msgid "Hardware address: "
 msgstr "Ikheli le-IP:"
 
-#: ../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
 #, fuzzy
 msgid "Missing Protocol"
 msgstr "Iqembu Elilahlekile"
@@ -3797,7 +3797,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Kumele ukhethe okungenani ulimi olulodwa ozolufaka."
 
 #: ../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
 #, fuzzy
 msgid "Invalid Prefix"
 msgstr "Umluko we-IP ongasebenzi"
@@ -4037,7 +4037,7 @@ msgstr "Amathuluzi e-RAID"
 msgid "None"
 msgstr "Lutho"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Ama-drive Aqinile"
 
@@ -4977,12 +4977,12 @@ msgstr "Umluko we-IP ongasebenzi"
 msgid "Activate on boot"
 msgstr "nyakazisa ekulayisheni"
 
-#: ../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 ""
 
-#: ../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 ""
@@ -5110,7 +5110,7 @@ msgstr ""
 msgid "DHCPv6"
 msgstr ""
 
-#: ../textw/network_text.py:678 ../loader2/net.c:1055
+#: ../textw/network_text.py:678 ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Isango lokudlula:"
 
@@ -5744,24 +5744,24 @@ msgid ""
 "in your subscription."
 msgstr ""
 
-#: ../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 "Ukubhekwa Konozindaba"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_IF 2
-#: ../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 "Isivivinyo"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Khipha i-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 "
@@ -5770,7 +5770,7 @@ msgstr ""
 "Khetha \"%s\" ukukhetha i-CD ekwi-drive njengamanje, noma \"%s\" ukukhipha i-"
 "CD ebese ufaka enye ukuze uyivivinye."
 
-#: ../loader2/cdinstall.c:118
+#: ../loader/cdinstall.c:118
 #, c-format
 msgid ""
 "If you would like to test additional media, insert the next disc and press "
@@ -5780,7 +5780,7 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../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 "
@@ -5789,12 +5789,12 @@ msgstr ""
 "I-CD %s ayitholakalanga kuwowonke ama-drive e-CDROM. Siza ungenise i-%s CD "
 "ebese ucindezela %s ukuzama kabusha."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "I-CD Itholakele"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5805,7 +5805,7 @@ msgstr ""
 "\n"
 "Khetha %s ukweqa ukuvivinywa kwezithombe ebese uqala ukufakwa."
 
-#: ../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 "
@@ -5814,7 +5814,7 @@ msgstr ""
 "Ayikho i-CD ye-%s etholakele efanna nonozindaba wakho wokulayisha.  Siza "
 "ufake i-CD %s ebese ucindezela %s ukuzama kabusha."
 
-#: ../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 "
@@ -5823,33 +5823,33 @@ msgstr ""
 "I-CD %s ayitholakalanga kuwowonke ama-drive e-CDROM. Siza ungenise i-%s CD "
 "ebese ucindezela %s ukuzama kabusha."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "I-CD Ayitholakali"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Ayikwazi ukuthola ifayela lokuqala kwi-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 "Yehlulekile ukufunda uhlu lwamafayela %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Iyalayisha"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Ifunda idiski yomshayeli..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Imvelaphi Yediski Yomshayeli"
 
-#: ../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?"
@@ -5857,7 +5857,7 @@ msgstr ""
 "Unamathuluzi amaningi angasebenza njengezimvelaphi zediski.  Iziphi "
 "ongathanda ukuzisebenzisa?"
 
-#: ../loader2/driverdisk.c:263
+#: ../loader/driverdisk.c:263
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the driver "
@@ -5866,53 +5866,53 @@ msgstr ""
 "Unamathuluzi amaningi angasebenza njengezimvelaphi zediski.  Iziphi "
 "ongathanda ukuzisebenzisa?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 #, fuzzy
 msgid "Failed to mount partition."
 msgstr "Yehlulekile ukukhuphula ukuvuselela kwediski"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 #, fuzzy
 msgid "Select driver disk image"
 msgstr "Khetha umshayeli"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr ""
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 #, fuzzy
 msgid "Failed to load driver disk from file."
 msgstr "Yehlulekile ukukhuphuka kwidiski yomshayeli."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Faka idiski yomshayeli kwi-/dev/%s ebese ucofa \"Kulungile\" ukuqhubeka."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Faka Idiski Yomshayeli"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Yehlulekile ukukhuphuka kwidiski yomshayeli."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr ""
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Khetha ngokuzenzekela"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Layisha enye idiski"
 
-#: ../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 "
@@ -5921,38 +5921,38 @@ msgstr ""
 "Awekho amathuluzi ohlobo olufanelekile atholakele kule diski.  Ungathanda "
 "ukukhetha idiski, noma kunjalo qhubeka, noma layisha enye idiski?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Idiski yomshayeli"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Unayo idiski?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Amanye Amadiski Omshayeli?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Uyafisa ukulayisha amanye amadiski amaning omshayeli?"
 
-#: ../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 "Iphutha le-Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Imvelaphi engaziwa yokuqalisa idiski: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5960,7 +5960,7 @@ msgid ""
 msgstr ""
 "Umfakelo olandelayo ongasebenzi ucaciswe kumyaleli wokuqalisa idiski: %s:%s"
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, fuzzy, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5972,25 +5972,25 @@ msgstr ""
 "sikrini ngokucindezela inkinombo \"KULUNGILE\".  Uhlu lwezinketho ezikhona "
 "lungatholakala ngokucindezela ukhiye F1."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Ngenisa Imifakela Yengxenye"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Abekho abashayeli abatholiwe"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Layisha idiski yomshayeli"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
 msgstr "Awekho amadiski atholakele azofakwa.  Ungathanda ukusebenzisan idiski?"
 
-#: ../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."
@@ -5998,27 +5998,27 @@ msgstr ""
 "Siza ukhethe idiski ngezansi ongathanda ukuyisebenzisa.  Uma ngabonakali "
 "futhi unediski, cindezela F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Cacisa imifakela yengxenye engaphoqekile"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Khetha Umshayeli Wethuluzi Wokulayisha"
 
-#: ../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 "Kucoshwe Okwezindaba"
 
-#: ../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 ""
-"Kucoshwe okwezindaba kokufakwa okwaseduze...Umd#: ../loader2/urlinstall.c:420"
+"Kucoshwe okwezindaba kokufakwa okwaseduze...Umd#: ../loader/urlinstall.c:420"
 
-#: ../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 "
@@ -6027,7 +6027,7 @@ msgstr ""
 "Isihlahla sokufakwa se-%s kulolo hlu lwamafayela alufani nokwezindaba "
 "ukulayisha."
 
-#: ../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."
@@ -6035,7 +6035,7 @@ msgstr ""
 "Kwenzeke iphutha ngesikhathi kufundwa ukufakwa okusuka ezithombeni ze-ISO. "
 "Siza ubheke izithombe zakho ze-ISO ebese uyazama futhi."
 
-#: ../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?"
@@ -6043,7 +6043,7 @@ msgstr ""
 "Kubonakala engathi awunayo amadiski kwisistimu yakho! Ungathanda "
 "ukuhlanganisela amathuluzi ongeziwe?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6054,118 +6054,118 @@ msgstr ""
 "(iso9660) ye%s? Uma ungayioni idiski oyisebenzisayo oluhlwuni olulapha, "
 "cindexela F2 ukuhlanganisela amathuluzi ongeziwe."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Izithombe ezibambe uhlu lwamafayela:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Khetha Isahlulo"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, fuzzy, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 "Ithuluzi elingu-%s alibonakali liqukethe izithombe ze-%s ye-Red Hat CDROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Umfakela omubi we-HD wokuqala umyalelo wendlela %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 "Ayikwazi ukuthola ifayela lokuqala ngokushesha kwi-drive enzima"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr ""
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Uhlobo Lwebhodi Lezikhiye"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Unohlobo olunjani lwebhodi yezikhiye?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Iphutha ekuvulweni kwefayela lokuqala %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Iphutha ekufundweni kokuphakathi kwefayeka lokuqala %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Iphutha kwi-%s kulayini we-%d wefayela lokuqalisa %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "A"
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 #, fuzzy
 msgid "Error downloading kickstart file"
 msgstr "Iphutha ekuvulweni kwefayela lokuqala %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, fuzzy, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Umfakela omubi we-HD wokuqala umyalelo wendlela %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Wamukelekile e-%s"
 
-#: ../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> phakathi kwamalunga  | <Space> khetha | <F12> isikrini "
 "esilandelayo "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Khetha Ulimi"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "I-CDROM Yaseduze"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Idrive eqinile"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s uhlu lwamafayela"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Wamukelekile e-%s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Vuselela Imvelaphi Yediski"
 
-#: ../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?"
@@ -6173,7 +6173,7 @@ msgstr ""
 "Umathuluzi amaningi angasebenza njengezimvelaphi zediski yokuvuselela.  "
 "Iyiphi ongathanda ukulisebenzisa?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6182,74 +6182,74 @@ msgstr ""
 "Unamathuluzi amaningi angasebenza njengezimvelaphi zediski.  Iziphi "
 "ongathanda ukuzisebenzisa?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Faka idiski yokuvuselela kwi /dev/%s ebese ucindezela \"Kulungile\" "
 "ukuqhubeka."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Ivuselela Idiski"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Yehlulekile ukukhuphula ukuvuselela kwediski"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Izivuselelo"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Ifunda izivuselelo ze-anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
 "below or press Cancel to proceed without updates.."
 msgstr ""
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Iphutha ekuvulweni kwefayela lokuqala %s: %s"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Awunayo i-RAM eyanele ukufaka %s kulo mshini."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Indlela Yokuhlenga"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Indlela Yokufakwa"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Iluphi uhlobo lonozindaba oluqukethe isithombe sokuhlenga?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Iluphi uhlobo lonozindaba oluqukethe amaphakethe azofakwa?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Akekho umshayeli otholakele"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Khetha umshayeli"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Sebenzisa idiski yomshayeli"
 
-#: ../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?"
@@ -6257,18 +6257,18 @@ msgstr ""
 "Ayikwazi ukuthola amathuluzi ohlobo oludingekayo alolu hlobo lokufaka.  "
 "Ungathanda ukuzikhethela idiski noma ukusebenzisa idiski?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Lama thuluzi alandelayo atholwe kwisistimu yakho."
 
-#: ../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?"
 msgstr ""
 "Awekho amadiski alayishiwe kwisistimu yakho.  Ungathanda ukuwalayisha manje?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Amathuluzi"
 
@@ -6279,45 +6279,45 @@ msgstr "Amathuluzi"
 # # @name LOCAL_STATUS_DOCUMENT_DONE
 # # @loc None
 # 4001
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Kwenziwe"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Yongeza Ithuluzi"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, fuzzy, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "umlayishi usevele uyasebenza.  Iqala igobolondo."
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Isebenzisa i-anaconda, umfaki wesistimu ye-%s - siza ulinde...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Isebenzisa i-anaconda, umfaki wesistimu ye-%s - siza ulinde...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Ayikwazi ukuthola isithombe esifakiwe %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Iyabheka \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Ibheka onozindaba manje..."
 
-#: ../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."
@@ -6325,7 +6325,7 @@ msgstr ""
 "Ayikwazi ukufunda ukubalwa kwediski esuka kumchazi wesisindo wokuqala.  "
 "Lokhu mhlawumbe kuchaza aukuthi isivalo sidalwe ngaphandle kokongeza isibalo."
 
-#: ../loader2/mediacheck.c:109
+#: ../loader/mediacheck.c:109
 #, fuzzy
 msgid ""
 "The image which was just tested has errors. This could be due to a corrupt "
@@ -6338,18 +6338,18 @@ msgstr ""
 "noma isivalo esibi.  Uma kubalulekile, siza uhlanze idiski ebese uyazama "
 "futhi.  Uma lokhu kuvivinya kuqhubeka kumele uyeke ukufaka."
 
-#: ../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"
@@ -6360,28 +6360,28 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Ukuvivinywa Kwesibalo"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Umfalela omubi ethuluzini lomyalelo wendlela yokuqalisa %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Umfakelo olandelayo ongasebenzi ucaciswe kumyaleli wokuqalisa idiski: %s:%s"
 
-#: ../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"
 msgstr ""
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6389,29 +6389,29 @@ msgid ""
 "field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr ""
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr ""
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 #, fuzzy
 msgid "Wireless Settings"
 msgstr "Amalungiselelo Axubene"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Igama lomlekeleli we-IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Igama lomlekeleli"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6423,223 +6423,223 @@ msgstr ""
 "wakho, siza ulingenise manje. Uma ungenalo lolu lwazi, ungashiya le nkundla "
 "ingenalutho futhi ukufaka kuzoqhubeka."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ulwazi lwe-IP Olungasebenzi"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Ungenise ikhele le-IP elingasebenzi."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Igama lokudlula Lempande"
 
-#: ../loader2/net.c:590 ../loader2/net.c:696
+#: ../loader/net.c:590 ../loader/net.c:696
 #, fuzzy
 msgid "There was an error configuring your network interface."
 msgstr ""
 "Kubekhona iphutha ekucaciseni ama-drive aqondiwe.  Ukwakhiwa kwehlulekile."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Hlanganisela i-TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Kumele ukhethe okungenani ulimi olulodwa ozolufaka."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr ""
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr ""
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 #, fuzzy
 msgid "IPv4 address:"
 msgstr "Ikheli le-IP:"
 
-#: ../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
 #, fuzzy
 msgid "IPv6 address:"
 msgstr "Ikheli le-IP:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Igama lomlekeleli"
 
-#: ../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 "
 "gateway and name server fields must be valid IPv4 or IPv6 addresses."
 msgstr ""
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 #, fuzzy
 msgid "Manual TCP/IP Configuration"
 msgstr "Inhlanganiselo ye-z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Ulwazi Olulahlekile"
 
-#: ../loader2/net.c:1225
+#: ../loader/net.c:1225
 #, fuzzy
 msgid ""
 "You must enter both a valid IPv4 address and a network mask or CIDR prefix."
 msgstr "Kumele ungenise kokubili ikheli le-IP kanye nemaski yoxhumano."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Kumele ungenise kokubili ikheli le-IP kanye nemaski yoxhumano."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Ichaza igama lesiteshi kanye nendawo yokulawula..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Umfakela omubi wokuqala umyalelo woxhumano %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Ukulayishwa okubi %s okucaciswe emyalweni woxhumano"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Ithuluzi Lokuxhumana"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
 msgstr ""
 "Unamathuluzi amaningi oxhumano kule sistimu. Imaphi ongathanda ukuwafaka?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Igama lomlekeleli we-NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, fuzzy, c-format
 msgid "%s directory:"
 msgstr "%s uhlu lwamafayela"
 
-#: ../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 "Umiso lwe-NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Iyavundulula"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Lo luhlu lwamafayela angeke ikhushulwe kumlekeleli."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Lo lohlu lwamafayela aluqukethe isihlahla sokufaka se-%s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Umfakela omubi we-NFS wokuqala umyalelo wendlela%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 "Ilinde uxhumano lwe-telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Isebenzisa i-anaconda esuka kwitelnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Ayikwazi ukuvundulula %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Ayikwazi ukuvundulula isithombe sokufaka."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Umfakela omubi we-Url wokuqala umyalelo wendlela %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Kumele unikeze umfakela we - url ukuqala indlela."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Indlela engaziwa ye-Url %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 "Hlanganisela i-TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Umiso lwe-NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Kumele ungenise uhlu lwamafayela."
 
-#: ../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 "Isiteshi sekhomputha esingaziwa"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s akulona igama lesiteshi elisebenzayo."
 
-#: ../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."
@@ -6647,24 +6647,24 @@ msgstr ""
 "Uma usebenzisa umlekeleli womlingani we-HTTP ngenisa igama lomlekeleli "
 "womlingani we-HTTP ozosetshenziswa."
 
-#: ../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 "Umiso lwe-FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Ilayisha umshayeli we-SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Ilayisha umshayeli we-%s..."