Renamed loader2 subdirectory to loader (hooray for git)

author: David Cantrell <dcantrell@redhat.com> 2008-08-25 17:13:37 -1000
committer: David Cantrell <dcantrell@redhat.com> 2008-08-25 17:13:37 -1000
commit: 80713e3f73e48856221c667f32b94b0a023ebecc (patch)
tree: aff4d9170fc24d2f1acc238a2d8908159a71d3dd /po
parent: ef5fbf7bc72572f3a6326b12f9187a5438e58e4c (diff)
download: anaconda-80713e3f73e48856221c667f32b94b0a023ebecc.tar.gz
anaconda-80713e3f73e48856221c667f32b94b0a023ebecc.tar.xz
anaconda-80713e3f73e48856221c667f32b94b0a023ebecc.zip
80 files changed, 21438 insertions, 21438 deletions
diff --git a/po/Makefile b/po/Makefile
index c6f7fcd40..115f0140a 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -17,7 +17,7 @@ INTLFILES = $(GLADEFILES) $(DESKTOPFILES)
 
 POTFILES = ../anaconda ../*.py ../iw/*.py ../textw/*.py \
            ../installclasses/*.py \
-           ../loader2/*.c 
+           ../loader/*.c 
 
 NONPOTFILES = ../lang-table
 
diff --git a/po/af.po b/po/af.po
index 60ca0b304..fc63b9fa5 100644
--- a/po/af.po
+++ b/po/af.po
@@ -47,41 +47,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 "OK"
 
@@ -573,22 +573,22 @@ msgstr "Formateer tans %s-lêerstelsel..."
 #: ../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 "Fout"
 
@@ -644,8 +644,8 @@ msgstr ""
 "Druk <Enter> om jou rekenaar te laat herselflaai."
 
 #: ../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 "Oorslaan"
 
@@ -955,21 +955,21 @@ msgstr "Herstel"
 
 #: ../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 "Ja"
 
 #: ../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 "Nee"
 
-#: ../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 "Weer probeer"
 
@@ -980,8 +980,8 @@ msgstr "Ignoreer"
 #: ../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 "Kanselleer"
 
@@ -1844,21 +1844,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 "Terug"
 
 #: ../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 "Gaan voort"
 
@@ -2287,7 +2287,7 @@ msgstr "Tik 'n volumegroep-naam in."
 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 "Welkom by %s"
@@ -3189,7 +3189,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Taalseleksie"
 
-#: ../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 "Watter taal wil jy graag tydens die installeerproses gebruik?"
 
@@ -3569,7 +3569,7 @@ msgstr "'n Waarde word vir die veld \"%s\" vereis."
 msgid "Dynamic IP"
 msgstr "Dinamiese 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 "Stuur versoek vir IP-inligting vir %s..."
@@ -3759,7 +3759,7 @@ msgstr "Onbekend"
 msgid "Hardware address: "
 msgstr "Hardewareadres:"
 
-#: ../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 "Vermiste groep"
@@ -3770,7 +3770,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Jy moet ten minste een taal kies om te installeer."
 
 #: ../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 "Ongeldige IP-string"
@@ -4010,7 +4010,7 @@ msgstr "RAID-toestelle"
 msgid "None"
 msgstr "Geen"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Hardeskywe"
 
@@ -4948,12 +4948,12 @@ msgstr "Ongeldige IP-string"
 msgid "Activate on boot"
 msgstr "Aktiveer by selflaai"
 
-#: ../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 ""
@@ -5083,7 +5083,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 "Deurgang:"
 
@@ -5712,23 +5712,23 @@ 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 "Mediatoets"
 
-#: ../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 "Toets"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Skiet CD uit"
 
-#: ../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 "
@@ -5737,7 +5737,7 @@ msgstr ""
 "Kies \"%s\" om die huidige CD in die aandrywer te toets, of \"%s\" om die CD "
 "uit te skiet en 'n ander een in te sit en te toets."
 
-#: ../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 "
@@ -5747,7 +5747,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 "
@@ -5756,12 +5756,12 @@ msgstr ""
 "Die %s CD kon nie in enige van jou CD-ROM-aandrywers gevind word nie. Sit "
 "asseblief die %s CD in en druk %s om weer te probeer."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD gevind"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5772,7 +5772,7 @@ msgstr ""
 "\n"
 "Kies %s om die mediatoets oor te slaan en die installering te begin."
 
-#: ../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 "
@@ -5781,7 +5781,7 @@ msgstr ""
 "Die %s CD, wat met jou laaimedia ooreenstem, kon nie gevind word nie. Sit "
 "asseblief die %s CD in en druk %s om weer te probeer."
 
-#: ../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 "
@@ -5790,33 +5790,33 @@ msgstr ""
 "Die %s CD kon nie in enige van jou CD-ROM-aandrywers gevind word nie. Sit "
 "asseblief die %s CD in en druk %s om weer te probeer."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD nie gevind nie"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Kan nie aansitlêer op CD-ROM vind nie."
 
-#: ../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 "Kon nie gids %s lees nie: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Besig om te laai"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Lees tans drywerskyf..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Drywerskyfbron"
 
-#: ../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?"
@@ -5824,7 +5824,7 @@ msgstr ""
 "Jy het verskeie toestelle wat as bron kan dien vir 'n drywerskyf. Watter een "
 "wil jy gebruik?"
 
-#: ../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?"
@@ -5832,49 +5832,49 @@ msgstr ""
 "Daar is verskeie partisies op hierdie toestel wat die drywerskyfbeeld kan "
 "bevat. Watter een wil jy gebruik?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Kon nie aan partisie heg nie."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Kies drywerskyfbeeld"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Kies die lêer wat jou drywerskyfbeeld bevat."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Kon nie drywerskyf vanaf lêer laai nie."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Sit jou drywerskyf in /dev/%s en druk \"OK\" om voort te gaan."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Steek drywerskyf in"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Kon nie aan drywerskyf heg nie."
 
-#: ../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 "Kies self"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Laai 'n ander skyf"
 
-#: ../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 "
@@ -5883,38 +5883,38 @@ msgstr ""
 "Geen geskikte toestelle kon op hierdie drywerskyf gevind word nie. Wil jy "
 "die drywer self kies, nogtans voortgaan of 'n ander drywerskyf laai?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Drywerskyf"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Het jy 'n drywerskyf?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Nog drywerskywe?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Wil jy enige ander drywerskywe laai?"
 
-#: ../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 "Aansitfout"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Onbekende drywerskyf-aansitbron: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5923,7 +5923,7 @@ msgstr ""
 "Die volgende ongeldige argument is gespesifiseer vir die bevel om die "
 "drywerskryf aan te sit: %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 "
@@ -5935,19 +5935,19 @@ msgstr ""
 "skerm of deur die \"OK\"-knop te druk. 'n Lys geldige opsies kan bekom word "
 "deur die F1-sleutel te druk."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Tik moduleparameters in"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Geen drywers gevind nie"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Laai drywerskyf"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5955,7 +5955,7 @@ msgstr ""
 "Geen drywers kon gevind word om self te installeer nie. Wil jy 'n drywerskyf "
 "gebruik?"
 
-#: ../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."
@@ -5963,26 +5963,26 @@ msgstr ""
 "Kies asseblief die drywer wat jy wil laai hieronder. As dit nie verskyn nie, "
 "en jy 'n drywerskyf het, druk dan F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Spesifiseer opsionele module-argumente"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Kies toesteldrywer om te laai"
 
-#: ../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 Bespeur"
 
-#: ../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 "Plaaslike installeermedia bespeur..."
 
-#: ../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 "
@@ -5991,7 +5991,7 @@ msgstr ""
 "Dit lyk asof die %s-installasiestruktuur in daardie gids nie ooreenstem met "
 "jou laaimedia nie."
 
-#: ../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."
@@ -5999,7 +5999,7 @@ msgstr ""
 "Daar het iets verkeerd geloop met die lees van die installasie vanaf die ISO-"
 "beelde. Kontroleer asseblief jou ISO-beelde en probeer weer."
 
-#: ../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?"
@@ -6007,7 +6007,7 @@ msgstr ""
 "Dit lyk asof daar nie enige hardeskywe op jou rekenaar is nie! Wil jy "
 "bykomende toestelle opstel?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6018,116 +6018,116 @@ msgstr ""
 "As jy nie die hardeskyf wat jy gebruik in die lys sien nie, druk F2 om "
 "bykomende toestelle op te stel."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Gids met prente:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Kies partisie"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Dit lyk nie asof die toestel %s enige %s CD-ROM-beelde bevat nie."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Verkeerde argument vir HD-aansitmetode-bevel %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 "Kan nie aansitlêer op hardeskyf vind nie."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Kan nie hardeskyf vir BIOS-skryf %s vind nie"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Soort sleutelbord"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Watter soort sleutelbord het jy?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Fout met oopmaak van aansitlêer %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Fout met lees van inhoud van aansitlêer %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Fout in %s op lyn %d van aansitlêer %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Kan nie ks.cfg op selflaaistiffie find nie."
 
-#: ../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 "Fout met oopmaak van aansitlêer %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Verkeerde argument vir afskakelaansitmetode-bevel %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Welkom by %s - Hulpmodus"
 
-#: ../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> tussen elemente | <Spasie> selekteer | <F12> volgende skerm "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Kies 'n taal"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Plaaslike CD-ROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Hardeskyf"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s gids:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Welkom by %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Opdateer skyfbron"
 
-#: ../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?"
@@ -6135,7 +6135,7 @@ msgstr ""
 "Jy het verskeie toestelle wat as bron kan dien vir 'n opdateerskyf. Watter "
 "een wil jy gebruik?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6144,73 +6144,73 @@ msgstr ""
 "Daar is verskeie partisies op hierdie toestel wat die drywerskyfbeeld kan "
 "bevat. Watter een wil jy gebruik?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Sit jou opdateerskyf in /dev/%s en druk \"OK\" om voort te gaan."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Opdateer Skyf"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Kon nie aan opdateerskyf heg nie"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Opdaterings"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Lees anaconda-opdaterings..."
 
-#: ../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 "Fout met oopmaak van aansitlêer %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 ""
 "Jy het nie genoeg rekenaargeheue om %s op hierdie rekenaar te installeer nie."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Hulpmetode"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installeermetode"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Watter soort media bevat die hulpprent?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Watter soort media bevat die pakkette wat geïnstalleer moet word?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Geen drywer gevind nie"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Kies drywer"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Gebruik 'n drywerskyf"
 
-#: ../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?"
@@ -6219,11 +6219,11 @@ msgstr ""
 "installasie benodig word nie. Wil jy die drywer self kies of 'n drywerskyf "
 "gebruik?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Die volgende toestelle is op jou rekenaar gevind."
 
-#: ../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?"
@@ -6231,49 +6231,49 @@ msgstr ""
 "Geen toesteldrywers is vir jou rekenaar gelaai nie. Wil jy nou enige drywers "
 "laai?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Toestelle"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Klaar"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Voeg toestel by"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Laaier het reeds geloop. Dop word begin.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Anaconda loop die %s hulpmodus - wag asseblief...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Anaconda loop die %s rekenaarinstalleerder - wag asseblief...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Kon nie installeerprent %s vind nie"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Kontroleer nou \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Kontroleer nou media..."
 
-#: ../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."
@@ -6282,7 +6282,7 @@ msgstr ""
 "nie. Dit beteken waarskynlik die skyf is geskep sonder om die "
 "kontroleersyfer by te voeg."
 
-#: ../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 "
@@ -6296,18 +6296,18 @@ msgstr ""
 "weer, indien van toepassing. Indien hierdie toets die heeltyd misluk, moet "
 "jy die installering staak."
 
-#: ../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"
@@ -6318,29 +6318,29 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Kontroleertoets"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Verkeerde argument vir toestelaansitmetode-bevel %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Die volgende ongeldige argument is gespesifiseer vir die bevel om die "
 "drywerskryf aan te sit: %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 "
@@ -6352,28 +6352,28 @@ msgstr ""
 "'n sleutel nie nodig is nie, kan jy hierdie veld oop los en die installering "
 "sal voortgaan."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Enkripsiesleutel"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Draadloos-opstelling"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Naambediener-IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Naambediener"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6385,109 +6385,109 @@ msgstr ""
 "weet wat dit is. As jy nie hierdie inligting het nie, kan jy hierdie veld "
 "oop los en die installering sal voortgaan."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ongeldige IP-inligting"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Jy het 'n ongeldige IP-adres ingetik."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Geen wagwoord nie"
 
-#: ../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 ""
 "Daar was fout tydens die skoonmaak van die teikenaandrywers. Kloon het "
 "misluk."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Bevestig TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Jy moet ten minste een taal kies om te installeer."
 
-#: ../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 "IP-adres:"
 
-#: ../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 "IP-adres:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Naambediener"
 
-#: ../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 "z/IPL-instelling"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Ontbrekende inligting"
 
-#: ../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 "Jy moet sowel 'n geldige IP-adres as 'n netmask intik."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Jy moet sowel 'n geldige IP-adres as 'n netmask intik."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Besig om gasheernaam en domein te bepaal..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Verkeerde argument vir netwerkaansit-bevel %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Verkeerde laaiprotokol %s in netwerkbevel gespesifiseer"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Netwerktoestel"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6495,139 +6495,139 @@ msgstr ""
 "Daar is verskeie netwerktoestelle op hierdie rekenaar. Deur watter een wil "
 "jy die installering doen?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS-bedienernaam:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s gids:"
 
-#: ../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-opstelling"
 
-#: ../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 "Lees nou"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Daardie gids kon nie vanaf die bediener geheg word nie."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Dit lyk nie of daardie gids 'n %s installasiestruktuur bevat nie."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Verkeerde argument vir NFS-aansitmetode-bevel %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 "Wag vir telnetkonneksie..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Anaconda loop via telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Kon nie %s://%s/%s/%s lees nie."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Kon nie die installeerprent lees nie."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Verkeerde argument vir URL-aansitmetode-bevel %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Jy moet 'n \"--url\"-argument verskaf vir 'n URL-aansitmetode."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Onbekende URL-metode %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 "Bevestig TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS-opstelling"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Jy moet 'n gidsnaam intik."
 
-#: ../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 "Onbekende gasheer"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s is nie 'n geldige gasheernaam nie."
 
-#: ../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."
 msgstr ""
 "Tik die naam van die HTTP-instaanbediener in, indien jy van een gebruik maak."
 
-#: ../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 "Verdere FTP-opstelling"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Besig om SCSI-drywer te laai"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Besig om drywer %s te laai..."
diff --git a/po/am.po b/po/am.po
index 562dcebdb..fbf8eb614 100644
--- a/po/am.po
+++ b/po/am.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 "እሺ"
 
@@ -548,22 +548,22 @@ msgstr "የ%sን ዶሴ አሠራር በማስተካከል ላይ..."
 #: ../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 "ስህተት"
 
@@ -617,8 +617,8 @@ msgstr ""
 "ሲስተምዎትን እንደገና ለማስጀመር <አጽድቅ>ን ይጫኑ።"
 
 #: ../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 "ዝለል"
 
@@ -911,21 +911,21 @@ msgstr "አስተካክል"
 
 #: ../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 "አዎ"
 
 #: ../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 "አይ"
 
-#: ../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 "እንደገና ሞክር"
 
@@ -936,8 +936,8 @@ msgstr "ተውት"
 #: ../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 "ተወው"
 
@@ -1775,21 +1775,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 "ወደኋላ"
 
 #: ../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 "ቀጥል"
 
@@ -2189,7 +2189,7 @@ msgstr "እባክዎን በዛ ያለ የቡድን ስም ያስገቡ።"
 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 "ወደ %s እንኳን ደህና መጡ"
@@ -3067,7 +3067,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "የቋንቋ ምርጫ"
 
-#: ../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 "በማስገባቱ ሂደት ወቅት የቱን ቋንቋ ነው መጠቀም የሚፈልጉት?"
 
@@ -3432,7 +3432,7 @@ msgstr "ለመጻፊያ ሣጥኑ «%s» ዋጋ ያስፈልጋል።"
 msgid "Dynamic IP"
 msgstr "ሀይለኛ አይፒ"
 
-#: ../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 "ለአይፒ መረጃ ለ%s የተጠየቀውን በመላክ ላይ..."
@@ -3613,7 +3613,7 @@ msgstr "ያልታወቀ"
 msgid "Hardware address: "
 msgstr "የሀርድዌር አድራሻ፦"
 
-#: ../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 "የጠፋ ቡድን"
@@ -3624,7 +3624,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "ለማስገባት በትንሹ አንድ ቋንቋ መምረጥ አለብዎት።"
 
 #: ../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 "ተቀባይነት የለለው የIP ሐረግ"
@@ -3859,7 +3859,7 @@ msgstr "የRAID መስሪያዎች"
 msgid "None"
 msgstr "ምንም"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ሀርድ ድራይቮች"
 
@@ -4736,12 +4736,12 @@ msgstr "ተቀባይነት የለለው የIP ሐረግ"
 msgid "Activate on boot"
 msgstr "በማስጀመሪያ ላይ አሰራ/አስጀምር"
 
-#: ../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 ""
@@ -4869,7 +4869,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 "መንገድ/ጎዳና፦"
 
@@ -5486,23 +5486,23 @@ 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 "ማሰራጫ መቆጣጠር"
 
-#: ../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 "ሙከራ"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "ሲዲ አውጣ (_E)"
 
-#: ../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 "
@@ -5510,7 +5510,7 @@ msgid ""
 msgstr ""
 "ድራይቭ ውስጥ ያለውን ሲዲ ለመሞከር «%s»ን ምረጥ ወይንም ሲዲውን ለማውጣት «%s»ን ይምረጡና ለሙከራ ሌላ ሲዲ ይክተቱ።"
 
-#: ../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 "
@@ -5520,7 +5520,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 "
@@ -5529,12 +5529,12 @@ msgstr ""
 "በየትኛውም የሲዲሮም ድራይቮችዎት ውስጥ የ%s ሲዲ አልተገኘም። እንደገና ለመሞከር እባክዎትን የ%sን ሲዲ ይክተቱና %sን "
 "ይጫኑ።"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "ሲዲ ተገኝቷል"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5545,7 +5545,7 @@ msgstr ""
 "\n"
 "የማሰራጫ ሙከራውን ለመዝለል እና የማስገባቱን ሥራ ለመጀመር %sን ይምረጡ።"
 
-#: ../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 "
@@ -5554,7 +5554,7 @@ msgstr ""
 "ከማስጀመሪያዎት ማሰራጫ ጋር የሚመሳሰል ምንም የ%s ሲዲ አልተገኘም። እባክዎን የ%sን ሲዲ ይክተቱና እንደገና ለመሞከር %"
 "sን ይጫኑ።"
 
-#: ../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 "
@@ -5563,88 +5563,88 @@ msgstr ""
 "በየትኛውም የሲዲሮም ድራይቮችዎት ውስጥ የ%s ሲዲ አልተገኘም። እንደገና ለመሞከር እባክዎትን የ%sን ሲዲ ይክተቱና %sን "
 "ይጫኑ።"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "ሲዲ አልተገኘም"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "የkickstart ፋይል በሲዲሮም ላይ አልተገኘም።"
 
-#: ../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 "የ%sን ማውጫ ለማንበብ ውድቅ ሆኗል፦ %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "በመጫን ላይ"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "የድራይቨሩን መርጃ ማከማቻ በማንበብ ላይ..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "የድራይቭ መርጃ ማከማቻ ምንጭ"
 
-#: ../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?"
 msgstr "ለድራይቨሩ መርጃ ማከማቻ ሊያገለግሉ የሚችሉ በርከት ያሉ መሥሪያዎች አልዎት። የትኛውን ነው መጠቀም የሚፈልጉት?"
 
-#: ../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?"
 msgstr ""
 "የድራይቨሩን መርጃ ማከማቻ ገጽታ የያዙ በርከት ያሉ መከፋፈያዎች እዚህ መሣሪያ ላይ አሉ። የትኛውን መጠቀም ይፈልጋሉ?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "መከፋፈያዎችን የማሳደጉ ሥራ ውድቅ ሆኗል"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "የድራይቨር መረጃ ማከማቻ ገጽታ ምረጥ"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "የድራይቨሩን መረጃ ማከማቻ ከፋይሉ ላይ ለመጫን አልተቻለም።"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "የድራይቨሩን መረጃ ማከማቻ በ/dev/%s ውስጥ ይክተቱና ለመቀጠል «እሺ»ን ይጫኑ።"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "የድራይቨሩን መረጃ ማከማቻ ይክተቱ"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "የድራይቨሩን መረጃ ማከማቻ ለማሳደግ አልተቻለም።"
 
-#: ../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 "እራስዎት ይምረጡ"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "ሌላ የመረጃ ማከማቻ ጫኑ"
 
-#: ../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 "
@@ -5653,45 +5653,45 @@ msgstr ""
 "በዚህ የድራይቨር መረጃ ማከማቻ ላይ ምንም ተገቢ የሆነ መሥሪያዎች አልተገኙም። እራስዎት ድራይቩን መምረጥ፣ ምንም ቢሆን "
 "መቀጠል ወይንም ሌላ የድራይቨር መረጃ ማከማቻ መጫን ይፈልጋሉ?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "የድራይቨር መረጃ ማከማቻ"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "የድራይቨር መረጃ ማከማቻ አልዎት?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "ተጨማሪ የድራይቨር መረጃ ማከማቻዎች?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "ተጨማሪ የድራይቨር ማከማቻዎችን መጫን ይፈልጋሉ?"
 
-#: ../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 "የኪክስታርት ስሕተት"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "ያልታወቀ የድራይቨር መረጃ ማከማቻ ኪክስታርት ምንጭ፦ %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "የሚከተለው ተቀባይነት የሌለው ክርክር የተገለፀው ለኪክስታርት ድራይቨር መረጃ ማከማቻ ትእዛዝ ነበር፦ %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 "
@@ -5702,25 +5702,25 @@ msgstr ""
 "መለያ ባህሪ ካላወቁት «እሺ» የሚለውን ቁልፍ በመጫን ይህንን መመልከቻ ይዝለሉት። በጊዜው የሚገኙትን የምርጫዎች ዝርዝር "
 "የF1ንን ቁልፍ በመጫን ሊገኝ ይችላል።"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "የሞድዩል ክፍል አስገባ"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ምንም ድራይቨሮች አልተገኙም"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "የድራይቨሩ መረጃ ማከማቻ ጫን"
 
-#: ../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 "ምንም ድራይቨር በእጅ የገቡ አልተገኙም። የድራይቨር መረጃ ማከማቻ መጠቀም ይፈልጋሉ?"
 
-#: ../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."
@@ -5728,46 +5728,46 @@ msgstr ""
 "እባክዎትን መጫን የሚፈልጉትን ከስር ያለውን ድራይቨር ይምረጡ። ካልተከሰተ እና የድራይቨር መረጃ ማከማቻ ካልዎት F2ን "
 "ይጫኑ።"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "አማራጭ የክፍል ክርክሮችን ግለጽ"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "የመሥሪያ ድራይቨር ለመጫን ምረጥ"
 
-#: ../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 "የመገናኛ ዘዴዎች ተገኝተዋል"
 
-#: ../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 "የአንድ ቦታ የመገናኛ ዘዴዎች የማስገባት ሥራ ተገኝቷል..."
 
-#: ../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 "
 "media."
 msgstr "በእዛ ማውጫ ውስጥ ያለው የ%s ማስገቢያ ዛፍ ከማስጀመሪያ ማሰራጫዎት ጋር አብሮ የሚሄድ አይመስልም።"
 
-#: ../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."
 msgstr ""
 "የገባውን ከISO ገጽታዎች ላይ በሚያነብበት ጊዜ ስሕተት ተከስቷል። እባክዎትን የISO ገጽታ ያጣሩና እንደገና ይሞክሩ።"
 
-#: ../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?"
 msgstr "በሲስተምዎት ላይ ምንም ሀርድ ድራይቭ ያለዎት አይመስልም። ተጨማሪ መሥሪያዎችን ማስተካከል ይፈልጋሉ?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5777,121 +5777,121 @@ msgstr ""
 "ምን ዓይነት መከፋፈያና ማውጫ ነው በእዛ መከፋፈያ ላይ ያለውን የሲዲውን (iso9660) ገጽታ ለ%s የያዘው? እዚህ "
 "ከተዘረዘሩት የመረጃ ማከማቻ ድራይቭዎትን ካላዩት ተጨማሪ መሥሪያዎችን ለማስተካከል F2ን ይጫኑ"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ማውጫው የያዛቸው ገጽታዎች፦"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "መከፋፈያ ምረጥ"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "መስሪያው %s የ%s CDROMን ገጽታዎችን ይዞ አልተገኘም።"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "መጥፎ ክርክር ለኤችዲ ኪክስታርት የትእዛዝ ዘዴ %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 "የኪክስታርትን ፋይ ሀርድ ድራይቩ ላይ አልተገኘም።"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "ለBIOS መረጃ ማከማቻ %s ሀርድ ድራይቭ ማግኘት አልተቻለም"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "የፊደል ሠሌዳ ዓይነት"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "ምን ዓይነት የፊደል ሠሌዳ ነው ያልዎት?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "የኪክስታርት ፋይል %s በሚከፈትበት ጊዜ ስሕተት፦ %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "የኪክስታርት ፋይል %s ዝርዝሮች በሚያነብበት ጊዜ ስሕተት፦ %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s ውስጥ በመስመር ላይ የ%d ኪክስታርት ፋይል ስሕተት፡ %s።"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "በማስጀመሪያው የመረጃ ማከማቻው ላይ ks.cfgን ማግኘት አልተቻለም።"
 
-#: ../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 "የኪክስታርት ፋይል %s በሚከፈትበት ጊዜ ስሕተት፦ %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "ኪክስታርት የትእዛዝ ዘዴ %sን ለመዝጋት መጥፎ ክርክር፦ %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "ወደ %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> መሠረታዊ ነገሮች መካከል   | <ቦታ>  ምርጫዎች  | <F12> የሚቀጥለው ማሳያ "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ቋንቋ ምረጥ"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "የውስጥ ሲዲሮም"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ሀርድ ድራይቭ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "የ%s ማውጫ፦"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "ወደ %s እንኳን ደህና መጡ"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "የመረጃ ማከማቻ ምንጭን አሻሽል"
 
-#: ../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?"
 msgstr "ለተሻሻለ መረጃ ማከማቻን ሊያገለግሉ የሚችሉ በዛ ያሉ መሥሪያዎች አልዎት። የትኛውን መጠቀም ይፈልጋሉ?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -5899,72 +5899,72 @@ msgid ""
 msgstr ""
 "የድራይቨሩን መርጃ ማከማቻ ገጽታ የያዙ በርከት ያሉ መከፋፈያዎች እዚህ መሣሪያ ላይ አሉ። የትኛውን መጠቀም ይፈልጋሉ?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "የተሻሻሉትን የመረጃ ማከማቻ በ/dev/%s ውስጥ ይክተቱና ለመቀጠል «እሺ»ን ይጫኑ።"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "መረጃ ማከማቻን ያሻሽላል"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "የተሻሻሉ የመረጃ ማከማቻዎችን ማሳደጉ ውድቅ ሆኗል"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "የተሻሻሉ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "የተሻሻሉትን አናኮዳ በማንበብ ላይ...."
 
-#: ../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 "የኪክስታርት ፋይል %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 "በዚህ ማሽን ላይ %sን ለማስገባት በቂ የሆነ ራም የልዎትም።"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "ዘዴውን አድን"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "የማስገባት ዘዴ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "የማዳኛውን ገጽታ የያዘው ምን ዓይነት ማሰራጫ ነው?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "የሚገቡትን ጥቅሎች የያዘው ምን ዓይነት ማሰራጫ ነው?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ምንም ድራይቨሮች አልተገኙም"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ድራይቨሮች ምረጥ"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "የድራይቨር መረጃ ማከማቻ ተጠቀም"
 
-#: ../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?"
@@ -5972,59 +5972,59 @@ msgstr ""
 "ለዚህ የማስገቢያ ዓይነት የሚፈለጉትን ዓይነት መሥሪያዎች ሊገኙ አልቻሉም። በእጅዎት ድራይቨርዎትን ወይንም የድራይቨር "
 "መረጃ ማከማቻ መምረጥ ይፈልጋሉ?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "የሚከተሉት መሥሪያዎች በሲስተምዎት ላይ ይገኛሉ።"
 
-#: ../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 "ምንም የመሥሪያ ድራይቨሮች ለሲስተምዎት አልተጫኑም። አሁን የሆነውን መጫን ይፈልጋሉ?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "መሥሪያዎች"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "ጨርሷል"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "መሥሪያ ጨምር"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "መጫኛው ቀደም ብሎ ሥራ ጀምሯል። ሼል በመጀመር ላይ\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "አናኮዳ በማስኬድ ላይ፣ የ%s የማዳኛ አሠራር ዘዴ - እባክዎን ይጠብቁ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "አናኮዳን በማስኬድ ላይ፣ የ%s ሲስተም አስገቢ - እባክዎን ይጠብቁ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "የገባ የ%s ገጽታን ማግኘት አልተቻለም"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "«%s»ን በማጣራት ላይ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "አሁን ማሰራጫውን በማጣራት ላይ..."
 
-#: ../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."
@@ -6032,7 +6032,7 @@ msgstr ""
 "የዲስኩን ቼክሳም ከመጀመሪያው ቅጂ መግለጫ ላይ ማንበብ አልተቻለም። ምናልባት ይህ ማለት ዲስኩ የተፈጠረው ቼክሳሙ "
 "ሳይጨመር ይሆናል።"
 
-#: ../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 "
@@ -6043,18 +6043,18 @@ msgstr ""
 "አሁን የተመረመረው ገጽታ ስሕተት አለው። ይህ ሊሆን የሚችለው በተረበሸ የመጫን ሥራ ወይንም በመጥፎ ዲስክ ምክንያት ነው። "
 "የሚሆን ከሆነ እባክዎን ዲስኩን ያጽዱና እንደገና ይሞክሩ። ይህ ሙከራ ውድቅ ከሆነ የማስገባቱን ሥራ ባይቀጥሉ ይሻላል።"
 
-#: ../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"
@@ -6065,27 +6065,27 @@ msgstr ""
 "\n"
 " %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "የቼክሳም ሙከራ"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "መጥፎ ክርክር ለኪክስታርት ዘዴ ትዕዛዝ %s፦ %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "የሚከተለው ተቀባይነት የሌለው ክርክር የተገለፀው ለኪክስታርት ድራይቨር መረጃ ማከማቻ ትእዛዝ ነበር፦ %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 "
@@ -6095,28 +6095,28 @@ msgstr ""
 "%s የኔትወርክ ማገናኛ ራዲዮ ነው። እባክዎን የESSID እና ኢንክሪፕሽን ቅልፍ ገመድ የለሹን ኔትወርክዎትን ለማሰራት "
 "ያስፈልጋል። ምንም ቁልፍ ካተፈለገ ይህንን ቦታ ባዶውን ይተውትና የማስገባቱ ሥራ ይቀጥላል።"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "የኢንክሪፕሽን ቁልፍ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "የራዲዮ አቀማመጥ"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "የስም ሰርቨር አይፒ"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "የስም ስርቨር"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6126,244 +6126,244 @@ msgstr ""
 "ሀይለኛው የIP ጥያቄ የIP የመረጃ አቀማመጥ መልሶታል ግን የDNS ሰርቨር ስምን አላጠቃለለም። የሰርቨሩን ስም ካወቁት "
 "እባክዎን አሁን ያስገቡት። ካየዚህ መረጃ ከሌልዎት ይህንን ቦታ ባዶውን መተው ይችላሉ እና የማስገባቱ ሥራ ይቀጥላል።"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "ተቀባይነት የሌለው የአይፒ መረጃ"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "ያስገቡት ተቀባይነት የሌለው የአይፒ አድራሻ ነው።"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "የሚስጢራዊ ቃል የለም"
 
-#: ../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 "የታለሙት ድራይቮች በሚያፀዳበት ወቅት ስህተት ነበር። ቅጂው አልተሳካም።"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IPን አስተካክል"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "ለማስገባት በትንሹ አንድ ቋንቋ መምረጥ አለብዎት።"
 
-#: ../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 "የአይፒ አድራሻ፦"
 
-#: ../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 "የአይፒ አድራሻ፦"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "የስም ስርቨር"
 
-#: ../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 "የz/IPL አቀማመጥ"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "የጠፋ መረጃ"
 
-#: ../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 "ሁለቱንም ተቀባይነት ያላቸውን የአይፒ አድራሻ እና የመረብ ጭምብሉን ማስገባት አለብዎት።"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "ሁለቱንም ተቀባይነት ያላቸውን የአይፒ አድራሻ እና የመረብ ጭምብሉን ማስገባት አለብዎት።"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "የሆስቱን ስምና ዶሜኑን አካባቢ በመፈለግ ላይ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "ለኪክስታርት መረብ ትእዛዝ %s መጥፎ ክርክር፦ %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "በመረቡ ትእዛዝ ውስጥ መጥፎ የማስጀመሪያ ፕሮቶ %s ተጠቅሷል"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "የመረብ መሥሪያዎች"
 
-#: ../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 "ብዙ የመረብ መሥሪያዎች በዚህ ሲስተም ላይ አሉ። የትኛውን ነው እስከመጨረሻው እንዲገባ የሚፈልጉት?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "የNFS ሰርበር ስም፦"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "የ%s ማውጫ፦"
 
-#: ../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 አቀማመጥ"
 
-#: ../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 "መረጃን ማግኘት"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ያ ማውጫ ከሰርቨሩ ሊጨምር/ማውጣት አልተቻለም።"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ያ ማውጫ ማስገቢያ ዛፉን %s ያጠቃለለ አይመስልም።"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "ለNFS ኪድስታርት ዘዴ ትእዛዝ %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 "የቴሌኔት እስኪገናኝ ድረስ በመጠበቅ ላይ..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "አናኮዳን በቴልኔት በኩል ማስኬድ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%sን መልሶ ለማውጣት አልትቻለም://%s/%s/%s"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "የማስገባቱን ገጽጋ መልሶ ለማውጣው አልተቻለም።"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "ለUrl ኪክስታርት ዘዴ %s ትእዛዝ መጥፎ ክርክር፦ %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "ለurl ኪክስታርት ዘዴ የ--url መከራከሪያ መቅረብ አለበት"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "የማይታወቅ የ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 "TCP/IPን አስተካክል"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "የNFS አቀማመጥ"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "ማውጫ ማስገባት አለብዎት።"
 
-#: ../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 "የማይታወቅ ሆስት"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ተቀባይነት የሌለው የሆስት ስም ነው።"
 
-#: ../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."
 msgstr "የHTTP ፕሮክሲ ሰርበርን እየተጠቀሙ ከሆነ ለመተቀም የHTTP ፕሮክሲ ሰርበሩን ስም አስገቡ።"
 
-#: ../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 "የFTP አቀማመጥ"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "የSCSIን ድራይቸር በመጫን ላይ"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "የ%sን ድራይቨር በመጫን ላይ..."
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 95ba86b5c..72fd35e2c 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -45,41 +45,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 ""
 
@@ -485,22 +485,22 @@ msgstr ""
 #: ../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 ""
 
@@ -547,8 +547,8 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -790,21 +790,21 @@ msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
-#: ../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 ""
 
@@ -815,8 +815,8 @@ msgstr ""
 #: ../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 ""
 
@@ -1544,21 +1544,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 ""
 
 #: ../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 ""
 
@@ -1924,7 +1924,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2703,7 +2703,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr ""
 
-#: ../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 ""
 
@@ -3041,7 +3041,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3203,7 +3203,7 @@ msgstr ""
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3212,7 +3212,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3436,7 +3436,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4204,12 +4204,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4325,7 +4325,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 ""
 
@@ -4897,29 +4897,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4929,18 +4929,18 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -4948,145 +4948,145 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5094,69 +5094,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5164,269 +5164,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5434,26 +5434,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5461,258 +5461,258 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr ""
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr ""
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index f3778b55c..aadda1a60 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -54,41 +54,41 @@ msgstr "إضغط على مفتاح الإدخال enter من أجل 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 "موافق"
 
@@ -562,22 +562,22 @@ msgstr "تهيئة نظام الملفّات %s..."
 #: ../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 "خطأ"
 
@@ -633,8 +633,8 @@ msgstr ""
 "إضغط <Enter> لتعيد تشغيل نظامك."
 
 #: ../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 "تخطّي"
 
@@ -937,21 +937,21 @@ msgstr "أصْلح"
 
 #: ../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 "نعم"
 
 #: ../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 "لا"
 
-#: ../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 "أعد المحاولة"
 
@@ -962,8 +962,8 @@ msgstr "تجاهل"
 #: ../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 "إلغاء"
 
@@ -1800,21 +1800,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 "ارجع"
 
 #: ../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 "استمر"
 
@@ -2224,7 +2224,7 @@ msgstr "رجاء أدخل اسم مجموعة الكتل."
 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 "أهلاً بكم إلى %s"
@@ -3106,7 +3106,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "خيار اللّغة"
 
-#: ../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 "ما اللّغة التي تودّ استخدامها أثناء عمليّة التثبيت؟"
 
@@ -3477,7 +3477,7 @@ msgstr "مطلوب قيمة للحقل \"%s\"."
 msgid "Dynamic IP"
 msgstr "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 "جاري إرسال طلب معلومات IP من أجل %s..."
@@ -3660,7 +3660,7 @@ msgstr "غير معروف"
 msgid "Hardware address: "
 msgstr "عنوان الجهاز:"
 
-#: ../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 "معلومات مفقودة"
@@ -3670,7 +3670,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 "عنوان IP غير صالح"
@@ -3906,7 +3906,7 @@ msgstr "أجهزة RAID"
 msgid "None"
 msgstr "لاشيء"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "الأقراص الصّلبة"
 
@@ -4810,12 +4810,12 @@ msgstr "عنوان IP غير صالح"
 msgid "Activate on boot"
 msgstr "نشّط عند الإقلاع"
 
-#: ../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 ""
@@ -4943,7 +4943,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 "البوّابة:"
 
@@ -5575,23 +5575,23 @@ 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 "التّحقّق من الوسط"
 
-#: ../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 "اختبر"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "أخرج القرص المدمج"
 
-#: ../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 "
@@ -5600,7 +5600,7 @@ msgstr ""
 "اختر \"%s\" كي تختبر القرص المدمج الموجود حاليّاً في السّوّاقة، أو \"%s\" كي "
 "تخرج القرص المدمج وتدخل آخر للاختبار."
 
-#: ../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 "
@@ -5614,7 +5614,7 @@ 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 "
@@ -5623,12 +5623,12 @@ msgstr ""
 "لم يعثر على القرص %s المدمج في أي من السّوّاقات. رجاء أدخل القرص %s المدمج "
 "واضغط %s لتعيد المحاولة."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "عُثر على القرص المدمج"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5639,7 +5639,7 @@ msgstr ""
 "\n"
 "اختر %s كي تتخطّى اختبار الوسط وتبدأ التّثبيت."
 
-#: ../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 "
@@ -5648,7 +5648,7 @@ msgstr ""
 "لم يعثر على قرص %s مدمج يطابق وسط الإقلاع خاصّتك.  رجاء أدخل القرص %s المدمج "
 "واضغط %s لإعادة المحاولة."
 
-#: ../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 "
@@ -5657,40 +5657,40 @@ msgstr ""
 "لم يعثر على القرص %s المدمج في أي من السّوّاقات. رجاء أدخل القرص %s المدمج "
 "واضغط %s لتعيد المحاولة."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "لم يعثر على القرص المدمج"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "لا يمكن العثور على ملف kickstart على القرص المدمج."
 
-#: ../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 "فشلت قراءة الدّليل %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "جاري التّحميل"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "جاري قراءة قرص برنامج التّعريف..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "مصدر قرص برنامج التّعريف"
 
-#: ../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?"
 msgstr ""
 "لديك عدّة أجهزة يمكن أن تخدم كمصادر قرص برنامج التّعريف. أيّها تودّ استخدامه؟"
 
-#: ../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?"
@@ -5698,49 +5698,49 @@ msgstr ""
 "توجد عدّة تجزئات على هذا الجهاز قابلة على احتواء صورة القرص القائد. أيّا منها "
 "تريد الاستعمال ؟امه؟"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "فشلت في تركيب التّجزئة.ت"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "إختر صورة قرص القائد"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "فشلت في تحميل قرص القائد من الملفّ.ف"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "أدخل قرص برنامج التّعريف في /dev/%s واضغط \"موافق\" كي تستمرّ."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "أدخل قرص برنامج التّعريف"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "فشل تجهيز قرص برنامج التّعريف"
 
-#: ../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 "اختر يدويّاً"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "حمّل قرص آخر"
 
-#: ../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 "
@@ -5750,38 +5750,38 @@ msgstr ""
 "اختيار برنامج التّعريف يدويّاً، الاستمرار على أي حال، أو تحميل قرص برنامج تعريف "
 "آخر؟"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "قرص برنامج تعريف"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "هل لديك قرص برنامج تعريف؟"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "المزيد من أقراص برامج التّعريف؟"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "هل تودّ تحميل أيّة أقراص برامج تعريف إضافيّة؟"
 
-#: ../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"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "برنامج تعريف مجهول لمصدر kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5790,7 +5790,7 @@ msgstr ""
 "المُدخل الغير صالح التالي تمّ تحديده من أجل أمر قرص برنامج تعريف kickstart: %"
 "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 "
@@ -5801,26 +5801,26 @@ msgstr ""
 "تعرف المُعطيات المطلوبة، تخطّ هذه الشّاشة بالضّغط على الزرّ \"موافق\".  يمكن "
 "الحصول على لائحة بالخيارات المتوفّرة بالضّغط على المفتاح F1."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "أدخل مُعطيات الوحدة"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "لم يعثر على أية برامج تعريف"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "حمّل قرص برنامج التّعريف"
 
-#: ../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 ""
 "لم يُعثر على برامج تعريف لإضافتها يدويّاً.  هل تودّ استخدام قرص برنامج تعريف؟"
 
-#: ../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."
@@ -5828,46 +5828,46 @@ msgstr ""
 "رجاء اختر برنامج التّعريف أدناه والذي تودّ تحميله.  إن لم يكن يظهر وكان لديك "
 "قرص برنامج تعريف، اضغط F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "حدّد مُعطيات الوحدة الاختياريّة"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "اختر برنامج التّعريف لتحميله"
 
-#: ../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 "عُثر على وسط"
 
-#: ../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 "تمّ العثور على وسط تثبيت محلّي..."
 
-#: ../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 "
 "media."
 msgstr "شجرة تثبيت %s في ذلك الدّليل لا يبدو مطابقاً لوسط الإقلاع."
 
-#: ../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."
 msgstr ""
 "حدث خطأ خلال قراءة التّثبيت من صور ISO. رجاء تحقّق من صور ISO وحاول مجدّداً."
 
-#: ../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?"
 msgstr "لا يبدو أنه لديك أية أقراص صلبة في نظامك! هل تودّ تهيئة أجهزة إضافيّة؟"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5877,121 +5877,121 @@ msgstr ""
 "ما هو التّجزيء والدليل على ذلك التّجزيء تحتوي صور القرص المدمج (iso9660) لـ%s؟ "
 "إن لم ترَ سوّاقة القرص التي تستخدمه مسردة هنا، اضغط F2 كي تهيّئ أجهزة إضافيّة."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "الدّليل الذي يحتوي الصّور:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "اختر قسمً"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "الجهاز %s لا يبدو أنّه يحتوي صور الأقراص المدمجة %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "مُعطى الأمر %s لطريقة القرص الصّلب kickstart لا يصلح: %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 "لم يمكن العثور على ملف kickstart على القرص الصّلب."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "لم استطع العثور علي سواقة قرص صلب لقرص BIOSالمعرّف %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "نوع لوحة المفاتيح"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "ما نوع لوحة المفاتيح التي لديك؟"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "خطأ في فتح ملف kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "خطأ في قراءة محتويات ملف kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "خطأ في %s عند السّطر %d من ملف kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "لا يمكن العثور على kd.cfg على القرص المرن."
 
-#: ../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 "خطأ في فتح ملف kickstart %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "مُعطى الأمر  لطريقة القرص الصّلب kickstart لا يصلح %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "أهلاً بكم إلى %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> بين العناصر  | <Space> يحدّد | <F12> الشّاشة التّالية "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "اختر لغة"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "القرص المدمج المحلّي"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "القرص الصّلب"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "دليل %s:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "أهلاً بكم إلى %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "مصدر قرص التّحديث"
 
-#: ../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?"
 msgstr "لديك عدّة أجهزة يمكنها أن تخدم كمصادر لقرص التّحديث.  أيّها تودّ استخدامه؟"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6000,72 +6000,72 @@ msgstr ""
 "توجد عدّة تجزئات على هذا الجهاز قابلة على احتواء صورة القرص القائد. أيّا منها "
 "تريد الاستعمال ؟امه؟"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "أدخل قرص التّحديثات في /dev/%s واضغط \"موافق\" كي تستمرّ."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "قرص التّحديثات"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "فشل تجهيز قرص التّحديثات"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "تحديثات"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "جاري قراءة تحديثات أناكوندا..."
 
-#: ../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 "خطأ في فتح ملف kickstart %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 "ليس لديك ذاكرة كافية كي تثبّت %s على هذه الماكينة."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "طريقة الإنقاذ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "طريقة التّثبيت"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "ما نوع الوسط الذي يحتوي صورة الإنقاذ؟"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ما نوع الوسط الذي يحتوي الحزم لتثبيتها؟"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "لم يُعثر على أيّ برنامج تعريف"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "اختر برنامج تعريف"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "اسم قرص برنامج تعريف"
 
-#: ../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?"
@@ -6073,59 +6073,59 @@ msgstr ""
 "لم يمكن العثور على أية أجهزة من النّوع المطلوب لنوع التّثبيت هذا.  هل تودّ "
 "اختيار برنامج التّعريف يدويّاً أو استخدام قرص برنامج تعريف؟"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "تمّ العثور على الأجهزة التّالية في نظامك."
 
-#: ../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 "لم يتمّ تحميل أيّ برامج تعريف لنظامك.  هل تودّ تحميل أيّها الآن؟"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "الأجهزة"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "تمّ"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "أضف جهازاً"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "تمّ تشغيل المُحمّل مسبّقاً. يجري بدأ الصّدفة.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "جاري تشغيل anaconda، وضع الإنقاذ لـ%s  - الرّجاء الانتظار...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "جاري تشغيل anaconda، مُثبّت نظام %s - الرّجاء الانتظار...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "لم يمكن العثور على صورة التّثبيت %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "جاري فحص \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "جاري فحص الوسط الآن..."
 
-#: ../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."
@@ -6133,7 +6133,7 @@ msgstr ""
 "لم يمكن قراءة مجموع الفحص للقرص من واصف الكتلة الأوّلي.  هذا على الأرجح يعني "
 "أن القرص أنشئ دون إضافة مجموع الفحص."
 
-#: ../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 "
@@ -6146,18 +6146,18 @@ msgstr ""
 "إن كان ممكناً، رجاء نظّف القرص وحاول مرّة أخرى.  إن استمرّ هذا الاختبار بالفشل "
 "يجب ألّا تستمرّ بالتّثبيت."
 
-#: ../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"
@@ -6168,29 +6168,29 @@ msgstr ""
 "\n"
 "   %s؟"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "فحص Checksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "مُعطى الأمر %s لا يصلح لطريق جهاز kickstart:%s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "المُدخل الغير صالح التالي تمّ تحديده من أجل أمر قرص برنامج تعريف kickstart: %"
 "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 "
@@ -6201,28 +6201,28 @@ msgstr ""
 "بشبكتك اللّاسلكية. في حالة عدم الحاجة إلى مفتاح، أترك هذا الحقل فارغا و "
 "سيواصل التّثبيت."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "مفتاح التّرميز"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "إعدادات اللّاسلكي"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "عنوان IP لخادم النّطاق"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "خادم النّطاق"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6233,243 +6233,243 @@ msgstr ""
 "إن كنت تعرف ما هو اسم خادم الاسم، رجاء أدخله الآن. إن لم تكن لديك هذه "
 "المعلومات، يمكنك ترك هذا الحقل فارغاً وسوف يستمرّ التّثبيت."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "معلومات IP غير صالحة"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "لقد أدخلت عنوان IP غير صالح."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "ليست هناك كلمة مرور"
 
-#: ../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 "كان هناك خطأ في مسح الأقراص المستهدفة.  فشل الاستنساخ."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "هيّئ TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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 "عنوان 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 "عنوان IP:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "خادم النّطاق"
 
-#: ../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 "تهيئة z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "معلومات مفقودة"
 
-#: ../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 "يجب أن تدخل كلّاً من عنوان IP صالح وقناع شبكة."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "يجب أن تدخل كلّاً من عنوان IP صالح وقناع شبكة."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "جاري إقرار اسم المضيف والمجال..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "مُعطى سيّئ لأمر شبكة kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "بروتوكول إقلاع غير صالح %s حدّد في أمر الشّبكة"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "جهاز التّشبيك"
 
-#: ../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 "لديك عدّة أجهزة شبكة على هذا النّظام. من خلال أيّها تودّ التّثبيت؟"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "اسم خادم NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "دليل %s:"
 
-#: ../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"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "ُحدِدَ اسم المضيف بدون تهيئة DNS."
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "جاري الجَلْب"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "لم يمكن تجهيز الدّليل من الخادم."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "يبدو أن الدّليل لا يحتوي على شجرة تثبيت %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "مُعطى سيّء لأمر طريقة kickstart NFS %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 "بانتظار اتّصال telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "جاري تشغيل anaconda عبر telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "لم يمكن جلب %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "لم يمكن جَلْب صورة التّثبيت."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "مُعطى سيّء لأمر طريقة Url kickstart %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "يجب أن تُزوّد المُعطى --url لطريقة Url kickstart."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "طريقة 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 "هيّئ TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "إعداد NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "يجب عليك إدخال دليل."
 
-#: ../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 "مضيف غير معروف"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ليس اسم مضيف صالح."
 
-#: ../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."
 msgstr "إن كنت تستخدم خادم بروكسي HTTP أدخل اسمه لاستخدامه."
 
-#: ../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 "إعداد تفصيلي ل FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "جاري تحميل برنامج تعريف SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "جاري تحميل برنامج تعريف %s..."
diff --git a/po/as.po b/po/as.po
index d1fa7ffc3..0245cfa8d 100644
--- a/po/as.po
+++ b/po/as.po
@@ -50,41 +50,41 @@ msgstr "শ্বেলৰ বাবে <enter> টিপক"
 #: ../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 "ঠিক অাছে"
 
@@ -556,22 +556,22 @@ msgstr "%s ত নথিপত্ৰপ্ৰণালীক পুনঃ আক
 #: ../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 "ভুল"
 
@@ -626,8 +626,8 @@ msgstr ""
 "সংস্থাপকৰ পৰা বাহিৰ হ'বলৈ <Enter> টিপক ।"
 
 #: ../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 "এৰি যাওক"
 
@@ -956,21 +956,21 @@ msgstr "শুধৰাওক"
 
 #: ../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 "হয়"
 
 #: ../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 "নহয়"
 
-#: ../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 "পুনঃ চেষ্টা কৰক"
 
@@ -981,8 +981,8 @@ msgstr "আওকাণ কৰক"
 #: ../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 "বাতিল"
 
@@ -1827,21 +1827,21 @@ msgid "_Write changes to disk"
 msgstr "ডিষ্কত সলনিসমূহ লিখক (_W)"
 
 #: ../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 "পিছলৈ"
 
 #: ../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 "আগবাঢ়ক"
 
@@ -2258,7 +2258,7 @@ msgstr "অনুগ্ৰহ কৰি আপোনাৰ %(instkey)s দিয়
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s দিয়া এৰি যাওক"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s লৈ স্বাগতম %s ৰ বাবে"
@@ -3139,7 +3139,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "ভাষাৰ নিৰ্ব্বাচন"
 
-#: ../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 "সংস্থাপনৰ সময়ত আপুনি কোনতো ভাষা ব্যৱহাৰ কৰিব খোজে ?"
 
@@ -3507,7 +3507,7 @@ msgstr "%s ক্ষেত্ৰৰ বাবে সংখ্যা এটাৰ
 msgid "Dynamic IP"
 msgstr "গতিশীল 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 "%s IP তথ্যৰ বাবে অনুৰোধ পঠিওৱা হৈছে..."
@@ -3678,7 +3678,7 @@ msgstr "অজ্ঞাত"
 msgid "Hardware address: "
 msgstr "যান্ত্ৰিক সামগ্ৰীৰ ঠিকনা:"
 
-#: ../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 "অনুপস্থিত আচাৰ বিধি"
 
@@ -3687,7 +3687,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "IPv4 বা IPv6 ৰ ভিতৰত অতি কমেও এটা আচাৰ বিধি নিৰ্ব্বাচন কৰিব লাগিব ।"
 
 #: ../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 "অসিদ্ধ উপসৰ্গ"
 
@@ -3915,7 +3915,7 @@ msgstr "RAID যন্ত্ৰ"
 msgid "None"
 msgstr "একো নাই"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "হাৰ্ড ড্ৰাইভসমূহ"
 
@@ -4813,12 +4813,12 @@ msgstr "উপসৰ্গ"
 msgid "Activate on boot"
 msgstr "আৰম্ভ কৰোঁতে সক্ৰীয় কৰক"
 
-#: ../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 "IPv4 সমৰ্থন সক্ষম কৰক"
 
-#: ../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 "IPv6 সমৰ্থন সক্ষম কৰক"
@@ -4938,7 +4938,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 "দ্বাৰ:"
 
@@ -5558,22 +5558,22 @@ msgstr ""
 "হ'ব পাৰে ।\n"
 "* আপোনাৰ বৰঙনিত নোহোৱা সৰঞ্জামসমূহৰ বাবে চালনাজ্ঞান আৰু সুৰক্ষাৰ উন্নয়ন নাপাব ।"
 
-#: ../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 "মাধ্যমৰ পৰীক্ষা"
 
-#: ../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 "পৰীক্ষা"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ডিষ্ক বাহিৰ কৰক"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5582,7 +5582,7 @@ msgstr ""
 "বৰ্ত্তমানে ড্ৰাইভত থকা ডিষ্ক পৰীক্ষা কৰিব'লৈ \"%s\" নিৰ্ব্বাচন কৰক, বা  \"%s\" "
 "নিৰ্ব্বাচন কৰি ডিষ্ক বহিষ্কাৰ কৰক আৰু বেলেগ এখন পৰীক্ষা কৰিব'লৈ ভৰাওক ।"
 
-#: ../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 "
@@ -5596,7 +5596,7 @@ msgstr ""
 "দিয়া হয় । অতি কমেও, ডিষ্ক সমূহ প্ৰথম বাৰ ব্যৱহাৰ কৰাৰ পূৰ্বে পৰীক্ষা কৰিব লাগে । "
 "এবাৰ সফল ভাবে পৰীক্ষা কৰাৰ পিছত, ব্যৱহাৰ কৰাৰ পূৰ্বে পুনঃ পৰীক্ষা কৰাৰ প্ৰয়োজন নাই ।"
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5605,11 +5605,11 @@ msgstr ""
 "%s ডিষ্ক আপোনাৰ কোনো ড্ৰাইভত পোৱা ন'গ'ল । অনুগ্ৰহ কৰি %s ডিষ্ক ভৰাওক আৰু পুনঃ চেষ্টা "
 "কৰিব'লৈ %s টিপক ।"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ডিষ্ক পোৱা গ'ল"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5620,7 +5620,7 @@ msgstr ""
 "\n"
 "মাধ্যমৰ পৰীক্ষা এৰি যাবলৈ %s নিৰ্ব্বাচন কৰক আৰু সংস্থাপন আৰম্ভ কৰক ।"
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5629,7 +5629,7 @@ msgstr ""
 "আপোনাৰ মাধ্যমৰ সৈতে সমানতা থকা কোনো %s ডিষ্ক পোৱা ন'গ'ল । অনুগ্ৰহ কৰি %s ডিষ্ক "
 "ভৰাওক আৰু পুনঃ চেষ্টা কৰিব'লৈ %s টিপক ।"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5638,32 +5638,32 @@ msgstr ""
 "%s ডিষ্ক আপোনাৰ কোনো CDROM ড্ৰাইভত পোৱা ন'গ'ল । অনুগ্ৰহ কৰি %s ডিষ্ক ভৰাওক আৰু পুনঃ "
 "চেষ্টা কৰিব'লৈ %s টিপক ।"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ডিষ্ক পোৱা ন'গ'ল"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "CDROM-ত kickstart নথিপত্ৰ পোৱা ন'গ'ল ।"
 
-#: ../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 "%s পঞ্জিকা পঢ়োঁতে ভুল হ'ল: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "তুলি লোৱা হৈছে"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "চালক ডিষ্ক পছা হৈছে..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "চালক ডিষ্কৰ উৎস"
 
-#: ../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?"
@@ -5671,7 +5671,7 @@ msgstr ""
 "আপোনাৰ ওচৰত একাধিক যন্ত্ৰ আছে যি চালক ডিষ্কৰ উৎস হিচাপে সেৱা কৰিব পাৰে । আপুনি "
 "কোনটো ব্যৱহাৰ কৰিব খোজে?"
 
-#: ../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?"
@@ -5679,49 +5679,49 @@ msgstr ""
 "চালক ডিষ্ক থাকিব পৰা এই যন্ত্ৰত একাধিক বিভাজন আছে । আপুনি কোনটো ব্যৱহাৰ কৰিব "
 "খোজে ?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "বিভাজন অভ্যুত্থান কৰিব ন'গ'ল ।"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "চালক ডিষ্কৰ প্ৰতিমূৰ্তি নিৰ্ব্বাচন কৰক"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "নথিপত্ৰৰ পৰা চালক ডিষ্ক তুলি ল'ব পৰা ন'গ'ল ।"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "চালক ডিষ্ক /dev/%s-ত ভৰাওক আৰু আগবাঢ়িব'লৈ \"ঠিক আছে\" টিপক ।"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "চালক ডিষ্ক দিয়ক"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "চালক ডিষ্ক অভ্যুত্থান কৰিব পৰা ন'গ'ল ।"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s ৰ এই মুক্তিৰ বাবে চালক ডিষ্ক অসিদ্ধ ।"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "নিজে নিৰ্ব্বাচন কৰক"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "অন্য এখন ডিষ্ক তুলি লওক"
 
-#: ../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 "
@@ -5730,45 +5730,45 @@ msgstr ""
 "এই চালক ডিষ্কত কোনো যথোপযুক্ত যন্ত্ৰ পোৱা ন'গ'ল । আপুনি নিজে চালক নিৰ্ব্বাচন কৰিব "
 "খোজে, নে আগবাঢ়িব খোজে নে অন্য এখন চালক ডিষ্ক তুলি ল'ব খোজে?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "চালক ডিষ্ক"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "আপোনাৰ চালক ডিষ্ক আছেনে ?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "আৰু চালক ডিষ্ক ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "আপুনি আৰু কোন চালক ডিষ্ক তুলি ল'ব খোজে নেকি ?"
 
-#: ../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 ভুল"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "অজ্ঞাত চালক ডিষ্ক kickstart উত্‌স: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "kickstart চালক ডিষ্ক আদেশৰ বাবে নিম্নলিখিত অসিদ্ধ তৰ্ক নিৰ্ধাৰিত কৰা হেছিল: %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 "
@@ -5778,25 +5778,25 @@ msgstr ""
 "বিক্ত স্থানেৰে পৃথক কৰি %s ক্ষুদ্ৰাংশলৈ আগবঢ়াব খোজা যিকোনো স্থিতিমাপ দিব পাৰে । যদি "
 "কি স্থিতিমাপ দিয় লাগে আপুনি নেজানে, \"ঠিক আছে\" বুটাম টিপি এই পৰ্দ্দা এৰি যাওক ।"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "ক্ষুদ্ৰাংশ স্থিতিমাপসমূহ দিয়ক"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "কোনো চালক পোৱা ন'গ'ল ।"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "চালক ডিষ্ক তুলি লওক ।"
 
-#: ../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 "নিজে ভৰাব'লৈ কোনো চালক পোৱা ন'গ'ল । আপুনি এটা চালক ডিধ্ক ব্যৱহাৰ কৰিব খোজে নেকি?"
 
-#: ../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."
@@ -5804,26 +5804,26 @@ msgstr ""
 "অনুগ্ৰহ কৰি তুলি ল'ব খোজা চালক নিৰ্ব্বাচন কৰক । যদি সেইটো প্ৰকাশ নহয় আৰু আপোনাৰ "
 "ওচৰত চালক ডিষ্ক আছে, F2 টিপক ।"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "বৈকল্পিক ক্ষুদ্ৰাংশ তৰ্কসমূহ নিৰ্ধাৰিত কৰক"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "তুলি ল'ব লগীয়া যন্ত্ৰ চালক নিৰ্ব্বাচন কৰক"
 
-#: ../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 "মাধ্যম উদ্ঘাটন কৰা হৈছে"
 
-#: ../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 "স্থানিক সংস্থাপনৰ মাধ্যম উদ্ঘাটন কৰা হৈছে..."
 
-#: ../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 "
@@ -5832,7 +5832,7 @@ msgstr ""
 "সেই পঞ্জিকাত থকা %s সংস্থাপন তথ্য আকাৰ আপোনাৰ বুট মাধ্যমৰ সৈতে সমান নহয় যেন "
 "নেলাগে । "
 
-#: ../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."
@@ -5840,7 +5840,7 @@ msgstr ""
 "ISO প্ৰতিমূৰ্তিৰ পৰা সংস্থাপন পঢ়োঁতে বুল হ'ল । অনুগ্ৰহ কৰি আপোনাৰ ISO প্ৰতিমূৰ্তি "
 "পৰীক্ষা কৰক আৰু পুনঃ চেষ্টা কৰক ।"
 
-#: ../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?"
@@ -5848,7 +5848,7 @@ msgstr ""
 "আপোনাৰ ব্যৱস্থাপ্ৰণালীত কোনো হাৰ্ড ড্ৰাইভ থকা যেন নেলাগে ! অতিৰিক্ত যন্ত্ৰ বিন্যাস "
 "কৰিব বিচাৰেনে?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5859,61 +5859,61 @@ msgstr ""
 "আপুনি ব্যৱহাৰ কৰা ডিষ্ক ড্ৰাইভ তালিকাভুক্ত কৰা দেখা নাই, অতিৰিক্ত যন্ত্ৰৰ বিন্যাসৰ "
 "বাবে F2 টিপক ।"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "প্ৰতিমূৰ্তি থকা পঞ্জিকা"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "বিভাজন নিৰ্ব্বাচন কৰক"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s যন্ত্ৰত %s CDROM প্ৰতিমূৰ্তি থকা যেন নেলাগে ।"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "হাৰ্ড ড্ৰাইভ kickstart প্ৰক্ৰীয়া আদেশ %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 "kickstart নথিপত্ৰ হাৰ্ড ড্ৰাইভত পোৱা ন'গ'ল ।"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "%s BIOS ডিষ্কৰ বাবে হাৰ্ড ড্ৰাইভ পোৱা ন'গ'ল ।"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "চাবি ফলকৰ ধৰণ"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "আপোনাৰ কেনে ধৰণৰ চাবিৰ ফলক আছে ?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s kickstart নথিপত্ৰ খোলোঁতে ভুল হ'ল: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s kickstart নথিপত্ৰ বিষয় বস্তু পঢ়োঁতে ভুল হ'ল: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s kickstart নথিপত্ৰৰ %d পংক্তিত %s ভুল পোৱা গ'ল ।"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "আঁতৰাব পৰা মিডিয়াত ks.cfg পোৱা ন'গ'ল ।"
 
-#: ../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."
@@ -5921,50 +5921,50 @@ msgstr ""
 "kickstart নথিপত্ৰ ডাউন্লোড কৰোঁতে ভুল হ'ল । অনুগ্ৰহ কৰি তলৰ kickstart স্থিতিমাপ "
 "সলনি কৰক বা বাতিল কৰক টিপি পাৰস্পৰিক পৰিবেশত সংস্থাপন আৰম্ভ কৰক ।"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "kickstart নথিপত্ৰ ডাউন্লোড কৰোঁতে ভুল"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "বন্ধ কৰিব'লৈ kickstart প্ৰক্ৰীয়া আদেশ %s লৈ বেয়া তৰ্ক দিয়া হৈছে: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s লৈ স্বাগতম %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> পদাৰ্থৰ মাজত  | <Space>-এ নিৰ্ব্বাচন কৰে | <F12> পৰৱৰ্তী পৰ্দ্দালৈ "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "এটা ভাষা নিৰ্ব্বাচন কৰক"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "স্থানীয় CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "হাৰ্ড ড্ৰাইভ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS পঞ্জিকা"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n লৈ স্বাগতম %s ৰ বাবে"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "ডিষ্কৰ উত্‌স বৰ্ত্তমানলৈ আনক"
 
-#: ../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?"
@@ -5972,7 +5972,7 @@ msgstr ""
 "আপোনাৰ ওচৰত একাধিক যন্ত্ৰ আছে যি ব্যৱস্থাপ্ৰণালী বৰ্ত্তমানলৈ অনাৰ ডিষ্কৰ উৎস হিচাপে "
 "সেৱা কৰিব পাৰে । আপুনি কোনটো ব্যৱহাৰ কৰিব খোজে?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -5980,30 +5980,30 @@ msgstr ""
 "উন্নত ডিষ্কৰ প্ৰতিমূৰ্ত্তি থাকিব পৰা এই যন্ত্ৰত একাধিক বিভাজন আছে । আপুনি কোনটো "
 "ব্যৱহাৰ কৰিব খোজে ?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "আপোনাৰ ব্যৱস্থাপ্ৰণালী বৰ্ত্তমানলৈ অনাৰ ডিষ্ক /dev/%s-ত ভৰাই দিয়ক আৰু আগবাঢ়িব'লৈ "
 "\"ঠিক আছে\" টিপক ।"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "ব্যৱস্থাপ্ৰণালী বৰ্ত্তমানলৈ অনাৰ ডিষ্ক"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "ব্যৱস্থাপ্ৰণালী বৰ্ত্তমানলৈ অনাৰ ডিষ্ক তুলি ল'বলৈ অক্ষম হ'ল"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "ব্যৱস্থাপ্ৰণালী বৰ্ত্তমানলৈ অনা তথ্য"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "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.."
@@ -6011,44 +6011,44 @@ msgstr ""
 "উন্নয়নৰ প্ৰতিমূৰ্ত্তি ডাউন্‌লোড কৰিব পৰা ন'গ'ল । তলৰ উন্নয়নৰ স্থান সলনি কৰক বা উন্নয়ন "
 "নকৰাকৈ আগবাঢ়িবলৈ বাতিল টিপক.."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "উন্নয়নৰ প্ৰতিমূৰ্ত্তি ডাউন্‌লোড কৰোঁতে ভুল"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "আপোনাৰ ওচৰত এই যন্ত্ৰত %s সংস্থাপন কৰিব'লৈ পৰ্যাপ্ত RAM নাই ।"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "পৰিত্ৰাণৰ ধৰণ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "সংস্থাপনৰ ধৰণ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "পৰিত্ৰাণৰ প্ৰতিমূৰ্তিত কোনতো ধৰণৰ মাধ্যমত আছে?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "সংস্থাপন কৰিব লগা সৰঞ্জাম কোনতো ধৰণৰ মাধ্যমত আছে?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "কোনো চালক পোৱা ন'গ'ল ।"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "চালক নিৰ্ব্বাচন কৰক"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "চালক ডিষ্ক ব্যৱহাৰ কৰক"
 
-#: ../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?"
@@ -6056,11 +6056,11 @@ msgstr ""
 "সংস্থাপন বিধৰ বাবে প্ৰয়োজনীয় ধৰণৰ যন্ত্ৰ পোৱা ন'গ'ল । আপুনি নিজেই কোনো চালক "
 "নিৰ্ব্বাচন কৰিব খোজে নে কোনো চালক ডিষ্ক ব্যৱহাৰ কৰিব খোজে?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "নিম্নলিখিত যন্ত্ৰসমূহ আপোনাৰ ব্যৱস্থাপ্ৰণালীত পোৱা হৈছে ।"
 
-#: ../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?"
@@ -6068,49 +6068,49 @@ msgstr ""
 "আপোনাৰ ব্যৱস্থাপ্ৰণালীৰ বাবে কোনো যন্ত্ৰ চালক তুলি লোৱা হোৱা নাই । আপুনি এতিয়া তুলি "
 "ল'ব খোজে নেকি?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "যন্ত্ৰ সমূহ"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "কৰা হ'ল"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "যন্ত্ৰ যোগ কৰক"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "লোডাৰ ইতিমধ্যে চলোৱা হ'ল । শ্বেল আৰম্ভ কৰা হৈছে ।\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "anaconda চলোৱা হৈছে %s, %s পৰিত্ৰাণ পদ্ধতি - অনুগ্ৰহ কৰি প্ৰতীক্ষা কৰক...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "anaconda চলোৱা হৈছে %s, %s ব্যৱস্থাপ্ৰণালীৰ সংস্থাপক - অনুগ্ৰহ কৰি প্ৰতীক্ষা কৰক...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "সংস্থাপন প্ৰতিমূৰ্তি %s পোৱা ন'গ'ল ।"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" পৰীক্ষা কৰা হৈছে..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "মাধ্যম পৰীক্ষা কৰা হৈছে..."
 
-#: ../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."
@@ -6118,25 +6118,25 @@ msgstr ""
 "প্ৰাৰম্ভিক আয়তন বৰ্ণনা কৰ্তাৰ পৰা ডিষ্ক চেকছাম পঢ়িব পৰা ন'গ'ল । এইটোৱে ইয়াকে বুজাই "
 "যে ডিষ্কখন চেকছাম যোগ নকৰাকৈ সৃষ্টি কৰা হৈছিল ।"
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr "এইমাত্ৰ পৰীক্ষা কৰা প্ৰতিমূৰ্ত্তিত ভুল আছে । এটা বেয়া ডাউন্‌লোড বা ডিষ্কৰ বাবে এইটো হ'ব পাৰে । যদি কৰিব পৰা যায়, তেনেহ'লে ডিষ্ক পৰিষ্কাৰ কৰি আকৌ চেষ্টা কৰক । এই পৰীক্ষা বিফল হৈ থাকিলে আপুনি সংস্থাপনত আগবাঢ়িব নালাগে ।"
 
-#: ../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"
@@ -6147,20 +6147,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "চেকছাম পৰীক্ষা"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "যন্ত্ৰ kickstart প্ৰক্ৰীয়া আদেশ %s লৈ বেয়া তৰ্ক দিয়া হৈছে: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "kickstart যন্ত্ৰৰ আদেশৰ বাবে ক্ষুদ্ৰাংশৰ ধৰণৰ নাম নিৰ্দ্ধাৰিত কৰিব লাগিব ।"
 
-#: ../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"
@@ -6168,7 +6168,7 @@ msgstr ""
 "IPv4 নে'টৱৰ্কৰ বাবে উপসৰ্গ ১ আৰু ৩২ ৰ মাজত বা IPv6 নে'টৱৰ্কৰ বাবে ১ আৰু ১২৮ ৰ "
 "মাজত হ'ব লাগিব ।"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6179,27 +6179,27 @@ msgstr ""
 "আৰু গোপনীয় কৰাৰ চাবিৰ যোগান ধৰক । যদি কোনো চাবিৰ প্ৰয়োজন নাই, তেন্তে এই ক্ষেত্ৰ "
 "ৰিক্ত ৰাখক আৰু সংস্থাপন আগবাঢ়িব । "
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "গোপনীয় কৰাৰ চাবি"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "অনাতাঁৰ পটভুমি"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "নামাংকৰণ সেৱকৰ IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "নামাঙ্কৰণৰ সেৱক পোৱা ন'গ'ল"
 
-#: ../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 "
@@ -6208,56 +6208,56 @@ msgstr ""
 "আপোনাৰ IP ঠিকনাৰ অনুৰোধে বিন্যাস তথ্য ঘূৰাই দিছে, কিন্তু কোনো নামাংকৰণ সেৱক নাছিল "
 "। যদি আপুনি এই বিষয়ে জানে, আপুনি এই ক্ষেত্ৰ ৰিক্ত ৰাখক আৰু সংস্থাপন আগবাঢ়িব ।"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "অসিদ্ধ IP তথ্য"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "আপুনি এটা অসিদ্ধ IP ঠিকনা দিছে ।"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "নে'টৱৰ্কত ভুল"
 
-#: ../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 "আপোনাৰ নে'টৱৰ্ক সংযোগ-মাধ্যম বিন্যাস কৰোঁতে ভুল হ'ল ।"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP বিন্যাস কৰক"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "অতি কমেও এটা আচাৰ বিধি (IPv4 বা IPv6) নিৰ্ব্বাচন কৰিব লাগিব ।"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFSৰ বাবে IPv4ৰ প্ৰয়োজন"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS সংস্থাপন প্ৰক্ৰীয়াত IPv4 সমৰ্থনৰ প্ৰয়োজন ।"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ঠিকনা:"
 
-#: ../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 ঠিকনা:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "নামাংকৰণ সেৱক:"
 
-#: ../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 "
@@ -6267,41 +6267,41 @@ msgstr ""
 "চতুৰ্গুণ নে'টমাস্ক বা CIDR ধৰণৰ উপসৰ্গ গ্ৰহণযোগ্য । দ্বাৰ আৰু নামাঙ্কৰণ সেৱকৰ ক্ষেত্ৰ "
 "বৈধ IPv4 বা IPv6 ঠিকনা হ'ব লাগিব ।"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "হস্থচালিত TCP/IP বিন্যাস"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "অনুপস্থিত তথ্য"
 
-#: ../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 "এটা সিদ্ধ IPv4 ঠিকনা আৰু এটা নে'টৱৰ্ক মাস্ক বা CIDR উপসৰ্গ দুয়োতা দিব লাগিব ।"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "এটা সিদ্ধ IPv6 ঠিকনা আৰু এটা CIDR উপসৰ্গ দুয়োতা দিব লাগিব ।"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "গৃহস্থৰ নাম আৰু ডোমেইন নিৰ্ধাৰিত কৰা হৈছে..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart নে'টৱৰ্ক আদেশ %sত বেয়া তৰ্ক দিয়া হৈছে: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "নে'টৱৰ্ক আদেশত বেয়া বুট বিধি %s নিৰ্দ্দিষ্ট কৰা হৈছে"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "নে'টৱৰ্ক কৰাৰ যন্ত্ৰ"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6309,112 +6309,112 @@ msgstr ""
 "আপোনাৰ এই ব্যৱস্থাপ্ৰণালীত একাধিক নে'টৱৰ্ক যন্ত্ৰ নছে । আপুনি কোনতোৰ দ্বাৰা সংস্থাপন "
 "কৰিব খোজে?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS সেৱকৰ নাম:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s পঞ্জিকা:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "আপোনাৰ %s প্ৰতিমূৰ্ত্তিসমূহৰ সেৱকৰ নাম আৰু পথ দিয়ক ।"
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS প্ৰতিষ্ঠাপন"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "গৃহস্থৰনাম কোনো DNS বিন্যাস নকৰাকৈ নিৰ্ধাৰিত কৰা হৈছে"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "উদ্ধাৰ কৰা হৈছে"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "সেৱকৰ পৰা পঞ্জিকা তুলি ল'ব পৰা ন'গ'ল ।"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "সেই পঞ্জিকাত %s সংস্থাপন তথ্য আকাৰ নোহোৱা যেন লাগে ।"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart প্ৰক্ৰীয়া আদেশ %s লৈ বেয়া তৰ্ক দিয়া হৈছে: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "টেলনেট"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "টেলনেট সংযোগৰ বাবে প্ৰতীক্ষা কৰা হৈছে..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "টেলনেটৰ যোগেদি anaconda চলোৱা হৈছে..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s উদ্ধাৰ কৰিব পৰা ন'গ'ল://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "সংস্থাপন প্ৰতিমূৰ্তি উদ্ধাৰ কৰিব পৰা ন'গ'ল ।"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url kickstart প্ৰক্ৰীয়া আদেশ %s লৈ বেয়া তৰ্ক দিয়া হৈছে : %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url kickstart প্ৰক্ৰীয়াত এটা --url তৰ্কৰ যোগান ধৰিব লাগিব ।"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "অজ্ঞাত 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 "আপোনাৰ সেৱকত থকা %s প্ৰতিমূৰ্ত্তিসমূহ থকা URL দিয়ক ।"
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "নিযুক্তক বিন্যাস কৰক"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL প্ৰতিষ্ঠাপন"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "আপুনি এটা URL দিব লাগিব ।"
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL এটা ftp বা http URL হ'ব লাগে"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "অজ্ঞাত গৃহস্থ"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s সিদ্ধ গৃহস্থৰ নাম নহয় ।"
 
-#: ../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."
@@ -6422,23 +6422,23 @@ msgstr ""
 "যদি আপুনি HTTP সেৱকৰ নিযুক্তক ব্যৱহাৰ কৰিছে তেন্তে ব্যৱহাৰ কৰিব'লৈ HTTP সেৱকৰ "
 "নিযুক্তকৰ নাম দিয়ক ।"
 
-#: ../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
 msgid "Further Setup"
 msgstr "ওপৰঞ্চি প্ৰতিষ্ঠাপন"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI চালক তুলি লোৱা হেছে"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s যন্ত্ৰ তুলি লোৱা হৈছে..."
diff --git a/po/bal.po b/po/bal.po
index aceb06b76..e3d1de98e 100644
--- a/po/bal.po
+++ b/po/bal.po
@@ -47,41 +47,41 @@ msgstr "په یک شل <enter> بجنیت"
 #: ../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 "هوبنت"
 
@@ -519,22 +519,22 @@ msgstr ""
 #: ../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 ""
 
@@ -581,8 +581,8 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -824,21 +824,21 @@ msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
-#: ../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 ""
 
@@ -849,8 +849,8 @@ msgstr ""
 #: ../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 ""
 
@@ -1578,21 +1578,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 ""
 
 #: ../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 ""
 
@@ -1958,7 +1958,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2737,7 +2737,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr ""
 
-#: ../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 ""
 
@@ -3075,7 +3075,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3237,7 +3237,7 @@ msgstr ""
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3246,7 +3246,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3470,7 +3470,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4238,12 +4238,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4359,7 +4359,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 ""
 
@@ -4931,29 +4931,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4963,18 +4963,18 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -4982,145 +4982,145 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5128,69 +5128,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5198,269 +5198,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5468,26 +5468,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5495,258 +5495,258 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr ""
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr ""
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/be.po b/po/be.po
index ca9f261f4..f798c7d25 100644
--- a/po/be.po
+++ b/po/be.po
@@ -47,41 +47,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 "Добра"
 
@@ -566,22 +566,22 @@ msgstr "Фарматаваньне файлавае сыстэмы %s..."
 #: ../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 "Памылка"
 
@@ -636,8 +636,8 @@ msgstr ""
 "Націсніце <Enter> для перазагрузкі сыстэмы."
 
 #: ../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 "Абмінуць"
 
@@ -935,21 +935,21 @@ msgstr "Выправіць"
 
 #: ../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 "Так"
 
 #: ../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 "Не"
 
-#: ../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 "Паўтарыць"
 
@@ -960,8 +960,8 @@ msgstr "Ігнараваць"
 #: ../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 "Скасаваць"
 
@@ -1721,21 +1721,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 ""
 
 #: ../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 "Працяг"
 
@@ -2106,7 +2106,7 @@ msgstr "Калі ласка, абярыце тып уваходу:"
 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 "Вітаем у %s"
@@ -2942,7 +2942,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Вылучэньне мовы"
 
-#: ../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 "На якой мовы вы жадаеце весьці ўсталёўку?"
 
@@ -3283,7 +3283,7 @@ msgstr "Значэньне неабходня для поля \"%s\"."
 msgid "Dynamic IP"
 msgstr "Дынамічны 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 ""
@@ -3466,7 +3466,7 @@ msgstr "Невядома"
 msgid "Hardware address: "
 msgstr "АйПі адрас:"
 
-#: ../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 "Адсутнічае група"
@@ -3477,7 +3477,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Вы мусіце вылучыць ня менш за адну мову для ўсталёўкі."
 
 #: ../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 "Нерэчаісны радок IP адраса"
@@ -3706,7 +3706,7 @@ msgstr "RAID прылады"
 msgid "None"
 msgstr "Няма"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4497,12 +4497,12 @@ msgstr "Нерэчаісны радок IP адраса"
 msgid "Activate on boot"
 msgstr "Задзейнічаць пад час загрузкі"
 
-#: ../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 ""
@@ -4629,7 +4629,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 "Брама:"
 
@@ -5220,30 +5220,30 @@ 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 ""
 
-#: ../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 "Тэст"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Вываліць дыск"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -5253,19 +5253,19 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Дыск знойдзен"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5273,146 +5273,146 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Дыск ня знойдзен"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 "Немагчыма прачытаць тэчку %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Загрузка"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5420,57 +5420,57 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
@@ -5478,13 +5478,13 @@ msgstr ""
 "Узьнікла памылка чытаньня ўсталёўкі з ISO вобразаў. Калі ласка, праверце "
 "вашыя ISO вобразы й паўтарыце спробу."
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5492,276 +5492,276 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Вылучыце падзел"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Прылада %s ня ўтрымлівае %s вобразы CDROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Тып клявіятуры"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Памылка ў %s, радок %d файла kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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 "Памылка разбору наладкі Kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Вітаем у %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> паміж элемэнтамі | <Прагал> вылучыць | <F12> наступны "
 "экран "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Абярыце мову"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Мясцовы CDROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Жорсткі дыск"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s тэчка:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Вітаем у %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Абнавіць крыніцу"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Устаўце дыск з абнаўленьнямі ў /dev/%s і націсьніце \"Добра\" для працягу."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Дыск з абнаўленьнямі"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Абнаўленьні"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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 "Памылка разбору наладкі Kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Бракуе памяці для ўсталёўкі %s на гэай машыне."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Мэтад аднаўленьня"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Мэтад усталёўкі"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Носьбіт якога тыпу ўтрымлівае выратавальны вобраз?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Носьбіт якога тыпу ўтрымлівае пакеты для ўсталёўваньня?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Кіроўца ня знойдзены"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Вылучыце кіроўцу"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Ужыць дыск с кіроўцам"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Наступныя прылады былі знойдзены ў вашае сыстэме."
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Прылады"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Зроблена"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Дадаць прыладу"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Немагчыма адшукаць вобраз усталёўкі %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Праверка \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5772,26 +5772,26 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Падлік праверчае сумы"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5799,271 +5799,271 @@ msgid ""
 "field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Ключ шыфраваньня"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP паслужніка DNS"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "DNS паслужнік"
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Нерэчаісныя зьвесткі аб IP"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Вы ўвялі нерэчаісны IP адрас."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Без паролю"
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Наладка TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Вы мусіце вылучыць ня менш за адну мову для ўсталёўкі."
 
-#: ../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 "АйПі адрас:"
 
-#: ../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 "АйПі адрас:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "DNS паслужнік"
 
-#: ../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 "Наладка z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Вы ўвялі нерэчаісны IP адрас."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Вызначэньне назвы вузла й маёнтка..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Сеткавая прылада"
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Назва паслужніка NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s тэчка:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, fuzzy, 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"
 
-#: ../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 "Выцягваньне"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Анаконда працуе праз telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Немагчыма выцягнуць %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Невядомы 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 "Наладка %s"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Наладка NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Вы мусіце задаць назву тэчкі."
 
-#: ../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 "Невядомы вузел"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s - нерэчаісная назва вузла.ы"
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 #, fuzzy
 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 "Наладка FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Загрузка кіроўцы SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index ffecd3c07..568c653d4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -53,41 +53,41 @@ msgstr "Натиснете <enter> преход към текстова обви
 #: ../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 "Да"
 
@@ -593,22 +593,22 @@ msgstr "Форматиране на файлова система %s..."
 #: ../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 "Грешка"
 
@@ -664,8 +664,8 @@ msgstr ""
 "Натиснете <Enter> за изход от инсталатора."
 
 #: ../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 "Пропуск"
 
@@ -995,21 +995,21 @@ msgstr "Корекция"
 
 #: ../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 "Да"
 
 #: ../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 "Не"
 
-#: ../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 "Отново"
 
@@ -1020,8 +1020,8 @@ msgstr "Игнориране"
 #: ../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 "Отказ"
 
@@ -1891,21 +1891,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 "Назад"
 
 #: ../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 "Продължение"
 
@@ -2336,7 +2336,7 @@ msgstr "Моля въведете %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Прескачане въвеждането на %(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 "Добре дошли във %s"
@@ -3212,7 +3212,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Избор на език"
 
-#: ../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 "Какъв език желаете да ползвате по време на инсталационния процес?"
 
@@ -3590,7 +3590,7 @@ msgstr "Необходима е стойност за полето %s."
 msgid "Dynamic IP"
 msgstr "Динамичен 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 "Изпращане на заявка за IP информация за %s..."
@@ -3761,7 +3761,7 @@ msgstr "непознат"
 msgid "Hardware address: "
 msgstr "Хардуерен адрес: "
 
-#: ../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 "Липсващ протокол"
 
@@ -3770,7 +3770,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Трябва да изберете поне IPv4 или IPv6 поддръжка."
 
 #: ../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 "Невалиден префикс"
 
@@ -4004,7 +4004,7 @@ msgstr "RAID устройства"
 msgid "None"
 msgstr "Няма"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Твърди дискове"
 
@@ -4920,12 +4920,12 @@ msgstr "Префикс"
 msgid "Activate on boot"
 msgstr "Активиране при зареждането"
 
-#: ../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 "Включване на IPv4 поддръжка"
 
-#: ../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 "Включване на IPv6 поддръжка"
@@ -5045,7 +5045,7 @@ msgstr "Автоматично 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 "Шлюз:"
 
@@ -5666,22 +5666,22 @@ 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 "Проверка на носителите"
 
-#: ../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 "Тест"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Изваждане на диска"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5690,7 +5690,7 @@ msgstr ""
 "Изберете \"%s\" за да проверите диска в устройството или \"%s\" за да го "
 "извадите и поставите друг за проверка."
 
-#: ../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 "
@@ -5705,7 +5705,7 @@ msgstr ""
 "ползван за първи път. След успешен тест, не е необходимо повторна проверка "
 "на всеки диск преди повторна употреба."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5714,11 +5714,11 @@ msgstr ""
 "Диск %s не бе намерено в никое от устройствата. Моля поставете диска %s и "
 "натиснете %s за нов опит."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Намерен диск"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5729,7 +5729,7 @@ msgstr ""
 "\n"
 "Изберете %s за да пропуснете теста и започнете с инсталацията."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5738,7 +5738,7 @@ msgstr ""
 "Не е намерен диск %s съответстващ на инсталационния носител.  Моля поставете "
 "диска %s и натиснете %s за нов опит."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5747,32 +5747,32 @@ msgstr ""
 "Диск %s не бе намерен в никое от CDROM устройствата. Моля поставете %s и "
 "натиснете %s за нов опит."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Диска не е намерен"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "В CDROM-a не може да бъде открит kickstart файл."
 
-#: ../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 "Неуспешно четене на директория %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Зареждане"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Четене на диск с драйвери..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Диск с драйвери"
 
-#: ../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?"
@@ -5780,7 +5780,7 @@ msgstr ""
 "Имате няколко устройства от които могат да се прочетат дискове с драйвери.  "
 "Кое да бъде ползвано?"
 
-#: ../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?"
@@ -5788,50 +5788,50 @@ msgstr ""
 "Има няколко дяла на това устройство, които могат да съдържат образ на диск с "
 "драйвери.  Кой да бъде ползван?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Неуспех при монтиране на дял."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Избор на образ на диск с драйвери"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "Неуспешно зареждане на диск с драйвери от файла."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Поставете диск с драйвери в /dev/%s и натиснете \"Да\" за да продължите."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Поставете диск с драйвери"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Неуспех при монтирането на диска с драйвери."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Диска с драйвери не е валиден за тази версия на %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Ръчен избор"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Зареждане на друг диск"
 
-#: ../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 "
@@ -5840,38 +5840,38 @@ msgstr ""
 "Не са намерени устройства от подходящия тип на този диск.  Ще искате ли "
 "ръчно да изберете драйвер, продължите въпреки това, или да сложите друг диск?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Диск с драйвери"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Имате ли диск с драйвери?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Още дискове с драйвери?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Желаете ли да заредите други дискове?"
 
-#: ../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 грешка"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Непознат дисков източник в kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5880,7 +5880,7 @@ msgstr ""
 "Следните невалидни аргументи бяха указани към kickstart командата за "
 "инсталация от диск: %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 "
@@ -5891,19 +5891,19 @@ msgstr ""
 "с интервали.  Ако не знаете какви параметри да зададете, просто пропуснете "
 "този екран натискайки бутона \"Да\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Въведете параметри за модула"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Няма намерени драйвери"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Зареждане на диск с драйвери"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5911,7 +5911,7 @@ msgstr ""
 "Не са намерени драйвери за ръчно поставяне.  Искате ли да ползвате диск с "
 "драйвери?"
 
-#: ../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."
@@ -5919,26 +5919,26 @@ msgstr ""
 "Моля изберете драйвера, който искате да бъде зареден.  Ако го няма и имате "
 "диск с драйвери, натиснете F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Задаване опционални параметри на модула"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Кой драйвер за устройство да бъде зареден"
 
-#: ../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 "Намерена е медия"
 
-#: ../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 "Местна инсталационна медия е намерена..."
 
-#: ../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 "
@@ -5947,7 +5947,7 @@ msgstr ""
 "Инсталационното дърво %s в директорията изглежда не съвпада с зареждаща Ви "
 "медия."
 
-#: ../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."
@@ -5955,7 +5955,7 @@ msgstr ""
 "Получи се грешка при четенето на инсталацията от ISO образите. Моля "
 "проверете ISO образите и опитайте отново."
 
-#: ../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?"
@@ -5963,7 +5963,7 @@ msgstr ""
 "Изглежда нямате твърди дискове на системата си! Желаете ли да конфигурирате "
 "допълнителни устройства?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5974,63 +5974,63 @@ msgstr ""
 "виждате дисковото устройство, което използвате, показано натиснете F2 за да "
 "конфигурирате допълнителни устройства."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Директория съдържащата образите:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Избор на дял"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Устройството %s изглежда не съдържа %s CDROM образи."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 "Невалиден аргумент към kickstart командата на инсталация от твърд диск %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 "Не може да бъде намерен kickstart файл на твърдия диск."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Не може да бъде намерен твърдият диск отговарящ на BIOS диск %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Тип на клавиатурата"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Какъв тип клавиатура имате?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Грешка при отварянето на kickstart файл %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Грешка при четене на съдържанието на kickstart файл %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Грешка в %s на ред %d от kickstart файл %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Не може да бъде намерен ks.cfg на зареждащото флопи."
 
-#: ../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."
@@ -6038,52 +6038,52 @@ msgstr ""
 "Не може да бъде свален kickstart файла.  Моля променете kickstart параметъра "
 "по-долу или натиснете Отказ за да продължите с интерактивна инсталация."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Грешка при сваляне на kickstart файл"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Невалиден аргумент за командата за спиране на kickstart метода %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Добре дошли във %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> между елементите  |  <Интервал> избор  |  <F12> напред  "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Изберете език"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Локално CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Твърд Диск"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS директория"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Добре дошли във %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Диск източник с обновления"
 
-#: ../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?"
@@ -6091,7 +6091,7 @@ msgstr ""
 "Имате няколко устройства, които могат да бъдат дискове с обновления. Кое "
 "желаете да се използва?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6100,30 +6100,30 @@ msgstr ""
 "Има няколко дяла на това устройство, които могат да съдържат образ на диск с "
 "драйвери.  Кой да бъде ползван?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Поставете диска с обновления в /dev/%s и натиснете \"Добре\" за да "
 "продължите."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Диск с обновления"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Провал при монтирането на диска с обновления"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Обновления"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Четене на обновленията за анаконда..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6132,45 +6132,45 @@ msgstr ""
 "Не може да бъде свален kickstart файла.  Моля променете kickstart параметъра "
 "по-долу или натиснете Отказ за да продължите с интерактивна инсталация."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Грешка при сваляне на kickstart файл"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Нямата достатъчно RAM за инсталирането на %s на машината."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Спасителен метод"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Инсталационен метод"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Какъв е вида на медията, която съдържа спасителните изображения?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Какъв е вида на медията, която съдържа пакетите за инсталиране?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Не е намерен драйвер"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Изберете драйвер"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "използване на диск с драйвери"
 
-#: ../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?"
@@ -6179,11 +6179,11 @@ msgstr ""
 "метод.  Желаете ли, ръчно да изберете драйвер или да ползвате диск с "
 "драйвери?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Следните устройства са намерени на системата."
 
-#: ../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?"
@@ -6191,50 +6191,50 @@ msgstr ""
 "Не са заредени драйвери за устройствата на системата.  Желаете ли да "
 "заредите, въпреки това?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Устройства"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Готово"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Добави устройства"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Зареждача е стартиран.  Стартирам конзолата.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Изпълнение на анаконда, %s спасителен режим - моля изчакайте...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Стартиране на анаконда, системният инсталатор версия %s - моля изчакайте...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Не може да бъде намерен инсталационния образ %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Проверява се \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Проверка на медията..."
 
-#: ../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."
@@ -6243,7 +6243,7 @@ msgstr ""
 "дескриптор.  Това може би значи, че диска е създаден без добавянето на "
 "контролна сума."
 
-#: ../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 "
@@ -6253,18 +6253,18 @@ msgstr ""
 "или лош диск.  Ако е възможно почистете диска и опитайте отново.  Ако този "
 "тест продължава да пропада не трябва да продължавате инсталацията."
 
-#: ../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"
@@ -6275,23 +6275,23 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Проверка на контролната сума"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Лош аргумент към kickstart метода за устройството %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "И типа на модула и името му следва да бъдат указани в kickstart командите "
 "към устройства."
 
-#: ../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"
@@ -6299,7 +6299,7 @@ msgstr ""
 "Префикса трябва да бъде между 1 и 32 за IPv4 мрежи или между 1 и 128 за IPv6 "
 "мрежи"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6310,27 +6310,27 @@ msgstr ""
 "необходимо, за достъп до безжичната мрежа.  Ако не е нужен ключ оставете "
 "полето празно и инсталацията ще продължи."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Криптиращ ключ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Безжични параметри"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP на сървъра за имена"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Липсва сървър за имена"
 
-#: ../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 "
@@ -6340,56 +6340,56 @@ msgstr ""
 "DNS сървър. Ако не разполагате с тази информация, можете да оставите полето "
 "празно и инсталацията ще продължи."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Невалидна IP информация"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Въвели сте невалиден IP адрес."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Мрежова грешка"
 
-#: ../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 "Имаше грешка при настройката на мрежовия интерфейс."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Настройка на TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Трябва да изберете поне един протокол (IPv4 или IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 трябва за NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Инсталационния метод през NFS изисква IPv4 поддръжка."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 адрес:"
 
-#: ../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 адрес:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Сървър за имена:"
 
-#: ../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 "
@@ -6399,43 +6399,43 @@ msgstr ""
 "За IPv4 мрежова маска са приложими четири цифри с точки или префикс в CIDR "
 "стил. Шлюза и сървъра за имена трябва да са валидни IPv4 или IPv6 адреси."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ръчна TCP/IP настройка"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Липсваща информация"
 
-#: ../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 ""
 "Трябва да въведете валидни IPv4 адрес и мрежова маска или CIDR префикс."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Трябва да въведете валидни IPv6 адрес и CIDR префикс."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Определяне името на машината и домейна..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Лош аргумент към мрежовата kickstart команда %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "В мрежовата команда е указан лош протокол за зареждане %s"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Мрежово устройство"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6443,139 +6443,139 @@ msgstr ""
 "Имате няколко мрежови устройства в системата. Чрез кое, желаете да "
 "инсталирате?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Име на NFS сървъра:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s директория:"
 
-#: ../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 настройки"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Зададено име на машина без конфигуриран DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Извличане на ... "
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Директорията не може да се монтира от сървъра."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Директорията изглежда не съдържа %s инсталационното дърво."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Лош аргумент за командата на NFS kickstart метода %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 "Очакване на telnet връзка..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Изпълнение на анаконда през telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Не мога да получа %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Не може да бъде получен инсталационния образ."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Лош аргумент за командата за Url kickstart метода %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Трябва да зададе --url аргумент за Url kickstart метода."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Непознат 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 "Настройка на TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS настройки"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Трябва да въведете директория."
 
-#: ../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 "Непозната машина"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s е невалидно име на машина."
 
-#: ../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."
 msgstr ""
 "Ако използвате HTTP прокси, въведете името на проксито, което да се ползва."
 
-#: ../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 "Допълнителни FTP настройки"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Зареждане на SCSI драйвер"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Зареждане на драйвер %s..."
diff --git a/po/bn.po b/po/bn.po
index 9eccad751..b121c47ca 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -53,41 +53,41 @@ msgstr "শেল এর জন্য <enter> টিপুন"
 #: ../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 "ঠিক আছে"
 
@@ -638,22 +638,22 @@ msgstr "%s ফাইল-সিস্টেম ফরম্যাট করা �
 #: ../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 "ত্রুটি"
 
@@ -716,8 +716,8 @@ msgstr ""
 "সিস্টেম পুনরায় বুট করার জন্য <Enter> চাপুন।"
 
 #: ../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 "উপেক্ষা করুন"
 
@@ -1073,21 +1073,21 @@ msgstr "সংশোধন করা হবে"
 
 #: ../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 "হ্যাঁ"
 
 #: ../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 "না"
 
-#: ../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 "পুনঃপ্রচেষ্টা"
 
@@ -1099,8 +1099,8 @@ msgstr "উপেক্ষা করা হবে"
 #: ../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 "বাতিল"
 
@@ -2035,21 +2035,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 "পূর্ববর্তী"
 
 #: ../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 "অগ্রসর"
 
@@ -2506,7 +2506,7 @@ msgstr "অনুগ্রহ করে আপনার %(instkey)s উল্ল
 msgid "Skip entering %(instkey)s"
 msgstr "%(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 "%s-এ স্বাগত"
@@ -3417,7 +3417,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "ভাষা নির্বাচন"
 
-#: ../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 "ইনস্টলেশন চলাকালে আপনি কোন ভাষা ব্যবহার করতে ইচ্ছুক?"
 
@@ -3801,7 +3801,7 @@ msgstr "%s ক্ষেত্রে মান লেখা আবশ্যক।
 msgid "Dynamic IP"
 msgstr "ডাইনামিক 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 "%s-র IP সংক্রান্ত তথ্যের জন্য অনুরোধ করা হচ্ছে..."
@@ -3976,7 +3976,7 @@ msgstr "অজানা"
 msgid "Hardware address: "
 msgstr "হার্ডওয়্যার ঠিকানা:"
 
-#: ../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 "অনুপস্থিত প্রোটোকল"
 
@@ -3985,7 +3985,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "IPv4 অথবা IPv6'র মধ্যে অন্তত একটি সমর্থন নির্বাচন করা আবশ্যক।"
 
 #: ../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 "অবৈধ প্রেফিক্স"
 
@@ -4220,7 +4220,7 @@ msgstr "RAID ডিভাইস"
 msgid "None"
 msgstr "শূন্য"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "হার্ড-ড্রাইভ"
 
@@ -5144,12 +5144,12 @@ msgstr "প্রেফিক্স"
 msgid "Activate on boot"
 msgstr "বুট করার সময় সক্রিয় করা হবে"
 
-#: ../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 "IPv4 সমর্থন সক্রিয় করা হবে"
 
-#: ../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 "IPv6 সমর্থন সক্রিয় করা হবে"
@@ -5265,7 +5265,7 @@ msgstr "সয়ংক্রিয় 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 "গেটওয়ে:"
 
@@ -5898,23 +5898,23 @@ 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 "মিডিয়া পরীক্ষণ"
 
-#: ../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 "পরীক্ষা"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "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 "
@@ -5923,7 +5923,7 @@ msgstr ""
 "বর্তমানে ড্রাইভে উপস্থিত CD পরীক্ষা করার জন্য  \"%s\" নির্বাচন করুন অথবা \"%s\" "
 "নির্বাচন করে CD-টি বের করে অন্য একটি CD পরীক্ষা করুন।"
 
-#: ../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 "
@@ -5937,7 +5937,7 @@ msgstr ""
 "প্রথমবার প্রয়োগ করার পূর্বে CD-গুলি পরীক্ষা করা উচিত। পরীক্ষার ফলাফল সফল হলে "
 "প্রতিবার ব্যবহারের পূর্বে CD-গুলি পরীক্ষা করা আবশ্যক নয়।"
 
-#: ../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 "
@@ -5946,12 +5946,12 @@ msgstr ""
 "আপনার কম্পিউটারের কোনো CDROM ড্রাইভের মধ্যে %s CD-টি পাওয়া যায়নি। অনুগ্রহ করে "
 "পুনরায় %s CD-টি ড্রাইভে ঢুকিয়ে %s চেপে পুনরায় চেষ্টা করুন।"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD পাওয়া গিয়েছে"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5962,7 +5962,7 @@ msgstr ""
 "\n"
 "CD পরীক্ষা না করে ইনস্টলেশন প্রক্রিয়া আরম্ভ করতে হলে %s চাপুন।"
 
-#: ../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 "
@@ -5971,7 +5971,7 @@ msgstr ""
 "বুট মিডিয়ার অনুরূপ কোনো %s CD পাওয়া যায়নি। অনুগ্রহ করে  %s CD ঢুকিয়ে ও %s টিপে "
 "পুনরায় প্রচেষ্টা করুন।"
 
-#: ../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 "
@@ -5980,33 +5980,33 @@ msgstr ""
 "আপনার কম্পিউটারের কোনো CDROM ড্রাইভের মধ্যে %s CD-টি পাওয়া যায়নি। অনুগ্রহ করে "
 "পুনরায় %s CD-টি ড্রাইভে ঢুকিয়ে %s চেপে পুনরায় চেষ্টা করুন।"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD পাওয়া যায়নি"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "CDROM-এ kickstart ফাইল পাওয়া যায়নি।"
 
-#: ../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 "%s ডিরেক্টরি পড়তে ব্যর্থ: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "লোড করা হচ্ছে"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ড্রাইভার ডিস্ক পড়া হচ্ছে..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ড্রাইভার ডিস্কের উৎস"
 
-#: ../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?"
@@ -6014,7 +6014,7 @@ msgstr ""
 "ড্রাইভার ডিস্কের উৎস রূপে ব্যবহারযোগ্য একাধিক ডিভাইস উপস্থিত।  এর মধ্যে কোনটি "
 "ব্যবহার করা হবে?"
 
-#: ../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?"
@@ -6022,49 +6022,49 @@ msgstr ""
 "ড্রাইভার ডিস্কের ইমেজ ধারণের উদ্দেশ্যে চিহ্নিত ডিভাইসে একাধিক পার্টিশন উপস্থিত "
 "রয়েছে।  এর মধ্যে কোনটি ব্যবহার করা হবে?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "পার্টিশন মাউন্ট করতে ব্যর্থ।"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ড্রাইভার ডিস্ক ইমেজ নির্বাচন করুন"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ফাইল থেকে ড্রাইভার ডিস্ক লোড করতে ব্যর্থ।"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "/dev/%s-এ ড্রাইভার ডিস্ক ঢুকিয়ে \"ঠিক আছে\" টিপুন।"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ড্রাইভার ডিস্ক ঢোকান"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ড্রাইভার ডিস্ক মাউন্ট করতে ব্যর্থ।"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s বর্তমান রিলিজ সংস্করণের জন্য ড্রাইভার-ডিস্ক বৈধ নয়।"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "নিজে বেছে নিন"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "একটি পৃথক ডিস্ক লোড করুন"
 
-#: ../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 "
@@ -6074,38 +6074,38 @@ msgstr ""
 "নির্নবাচন করুন, এই অবস্থায় এগিয়ে চলবেন নাকি অন্য একটি ড্রাইভার ডিস্ক দিয়ে চেষ্টা "
 "করবেন?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ড্রাইভার ডিস্ক"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "কোনো পৃথক ড্রাইভার ডিস্ক রয়েছে কিনা?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "অতিরিক্ত ড্রাইভার ডিস্ক?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "আপনি কি অতিরিক্ত ড্রাইভার ডিস্ক লোড করতে ইচ্ছুক?"
 
-#: ../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'এ সমস্যা"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "অজানা ড্রাইভার ডিস্কের kickstart'র উৎস: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -6114,7 +6114,7 @@ msgstr ""
 "kickstart ড্রাইভার ডিস্কের কমান্ডের সাথে নিম্নলিখিত অবৈধ কমান্ড উল্লিখিত হয়েছে: %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 "
@@ -6125,19 +6125,19 @@ msgstr ""
 "প্রেরণের উদ্দেশ্যে যথাযত পরামিতিরগুলির মান অজ্ঞাত হলে \"ঠিক আছে\" বাটন চেপে "
 "পরবর্তী ধাপে এগিয়ে চলুন।"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "মডিউলের ক্ষেত্রে প্রযোজ্য পরামিতি উল্লেখ করুন"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "কোনো ড্রাইভার পাওয়া যায়নি"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ড্রাইভার ডিস্ক লোড করা হবে"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6145,7 +6145,7 @@ msgstr ""
 "ব্যবহারকারী দ্বারা অন্তর্ভুক্ত করার উদ্দেশ্যে কোনো ড্রাইভার পাওয়া যায়নি।  আপনি কি "
 "একটি ড্রাইভার ডিস্ক ব্যবহার করতে ইচ্ছুক?"
 
-#: ../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."
@@ -6153,26 +6153,26 @@ msgstr ""
 "লোড করার উদ্দেশ্যে অনুগ্রহ করে নীচের তালিকা থেকে একটি ড্রাইভার নির্বাচন করুন।  "
 "তালিকা প্রদর্শিত না হলে এবং কোনো পৃথক ড্রাইভার ডিস্ক উপস্থিত থাকলে F2 টিপুন।"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "মডিউলের ক্ষেত্রে ঐচ্ছিক আর্গুমেন্ট উল্লেখ করুন"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "লোড করার জন্য ডিভাইস ড্রাইভার বাছাই করুন"
 
-#: ../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 "মিডিয়া সনাক্ত করা হয়েছে"
 
-#: ../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 "স্থানীয় ইনস্টলেশন মিডিয়া সনাক্ত করা হয়েছে..."
 
-#: ../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 "
@@ -6180,7 +6180,7 @@ msgid ""
 msgstr ""
 "চিহ্নিত ডিরেক্টরির মধ্যে উপস্থিত %s ইনস্টলেশন ট্রি প্রদত্ত বুট মিডিয়ার সাথে সুসংগত নয়।"
 
-#: ../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."
@@ -6188,14 +6188,14 @@ msgstr ""
 "ISO ইমেজ থেকে ইনস্টলেশন সংক্রান্ত তথ্য পড়তে সমস্যা। অনুগ্রহ করে ISO ইমেজ পরীক্ষা করে "
 "পুনরায় প্রচেষ্টা করুন।"
 
-#: ../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?"
 msgstr ""
 "আপনার সিস্টেমে কোনো হার্ড-ড্রাইভ পাওয়া যায়নি! অতিরিক্ত ডিভাইস কনফিগার করা হবে কি?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6206,62 +6206,62 @@ msgstr ""
 "আপনি ব্যবহার করছেন সেটি যদি তালিকায় উপস্থিত না থাকে তাহলে F2 চেপে অতিরিক্ত "
 "ডিভাইস কনফিগার করুন।"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ইমেজ ধারণকারী ডিরেক্টরি:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "পার্টিশন বাছাই করুন"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "সম্ভবত %s ডিভাইস-এ %s-র CDROM ইমেজ উপস্থিত নেই।"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD kickstart প্রণালী কমান্ড %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 "হার্ড-ড্রাইভে kickstart পাওয়া যায়নি।"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS ডিস্ক %s-র জন্য হার্ড-ড্রাইভ পাওয়া যায়নি"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "কি-বোর্ডের ধরন"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "আপনার ব্যবহৃত কি-বোর্ডের ধরন কী?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "kickstart ফাইল %s খুলত সমস্যা: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "kickstart ফাইল %s থেকে পড়তে সমস্যা: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "kickstart ফাইল %3$s'র %2$d তম পংক্তির %1$s-এ সমস্যা।"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "বুট ফ্লপিতে ks.cfg পাওয়া যায়নি।"
 
-#: ../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."
@@ -6269,53 +6269,53 @@ msgstr ""
 "Kickstart ফাইল ডাউনলোড করতে ব্যর্থ।  অনুগ্রহ করে kickstart সংক্রান্ত নিম্নলিখিত "
 "পরামিতি পরিবর্তন করুন অথবা বাতিল টিপে ইন্টারেক্টিভ ইনস্টেলশনে এগিয়ে চলুন"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "kickstart ফাইল ডাউনলোড করতে সমস্যা"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "kickstart প্রণালীর %s কমান্ড অশুদ্ধ আর্গুমেন্টের কারণে বন্ধ হয়েছে: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%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> অদল বদল  | <Space> নির্বাচন | <F12> পরবর্তী পর্দা "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "একটি ভাষা নির্বাচন করুন"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "স্থানীয় CDROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "হার্ড-ড্রাইভ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s ডিরেক্টরি:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s-এ স্বাগত"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "আপডেট ডিস্ক উৎস"
 
-#: ../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?"
@@ -6323,7 +6323,7 @@ msgstr ""
 "একাধিক ডিভাইস আপডেট ডিস্কের উৎস রূপে ব্যবহার করা যেতে পারে।  আপনি কোনটি ব্যবহার "
 "করতে চান?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6332,29 +6332,29 @@ msgstr ""
 "ড্রাইভার ডিস্কের ইমেজ ধারণের উদ্দেশ্যে চিহ্নিত ডিভাইসে একাধিক পার্টিশন উপস্থিত "
 "রয়েছে।  এর মধ্যে কোনটি ব্যবহার করা হবে?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "/dev/%s-এ আপডেট ডিস্ক ঢুকিয়ে \"ঠিক আছে\" টিপুন"
 
 # Altered by Progga
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "আপডেট ডিস্ক"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "আপডেট ডিস্ক মাউন্ট করতে ব্যর্থ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "আপডেট"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Anaconda'র আপডেট পড়া হচ্ছে..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6363,45 +6363,45 @@ msgstr ""
 "Kickstart ফাইল ডাউনলোড করতে ব্যর্থ।  অনুগ্রহ করে kickstart সংক্রান্ত নিম্নলিখিত "
 "পরামিতি পরিবর্তন করুন অথবা বাতিল টিপে ইন্টারেক্টিভ ইনস্টেলশনে এগিয়ে চলুন"
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "kickstart ফাইল ডাউনলোড করতে সমস্যা"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "এই কম্পিউটারে %s ইনস্টল করার উদ্দেশ্যে পর্যাপ্ত RAM উপস্থিত নেই।"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "রেসকিউ মেথড"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "ইনস্টলেশনের প্রণালী"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "রেস্কিউ ইমেজটি কি ধরনের মিডিয়ায় উপস্থিত রয়েছে?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ইনস্টলেশনের উদ্দেশ্যে প্যাকেজগুলি কোন ধরনের মিডিয়ায় উপস্থিত রয়েছে ?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "কোনো ড্রাইভার পাওয়া যায়নি"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ড্রাইভার বাছাই করুন"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ড্রাইভার ডিস্ক ব্যবহার করা হবে"
 
-#: ../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?"
@@ -6409,11 +6409,11 @@ msgstr ""
 "এই ধরনের ইনস্টলেশনের জন্য প্রয়োজনীয় কোনো ডিভাইস পাওয়া যায়নি। আপনি কি স্বয়ং কোনো "
 "ড্রাইভার নির্বাচন করতে অথবা ড্রাইভার-ডিস্ক ব্যবহার করতে ইচ্ছুক?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "আপনার সিস্টেমে নিম্নলিখিত সিস্টেমগুলি সনাক্ত করা হয়েছে।"
 
-#: ../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?"
@@ -6421,50 +6421,50 @@ msgstr ""
 "আপনার সিস্টেমের ক্ষেত্রে কোনো ডিভাইস ড্রাইভার লোড করা হয়নি। আপনি কি কিছু লোড করতে "
 "ইচ্ছুক?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ডিভাইস"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "সমাপ্ত"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ডিভাইস যোগ করুন"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "লোডার চালানো হয়েছে।  শেল আরম্ভ করা হচ্ছে।\n"
 
 # FIXME
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Anaconda চালানো হচ্ছে, %s রেসকিউ মোড - অনুগ্রহ করে অপেক্ষা করুন...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Anaconda চালানো হচ্ছে, %s সিস্টেম ইনস্টলার - অনুগ্রহ করে অপেক্ষা করুন...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "ইনস্টল ইমেজ %s পাওয়া যায়নি"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" পরীক্ষা করা হচ্ছে..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "মিডিয়া পরীক্ষা করা হচ্ছে..."
 
-#: ../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."
@@ -6472,7 +6472,7 @@ msgstr ""
 "প্রধান ভলিউম ডেস্ক্রিপ্টর থেকে checksum পড়তে ব্যর্থ।  সম্ভবত ডিস্ক নির্মাণের সময় "
 "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 "
@@ -6482,18 +6482,18 @@ msgstr ""
 "ডিস্কের ফলে এটি হওয়ার সম্ভাবনা রয়েছে।  সম্ভব হলে, ডিস্কটি পরিষ্কার করে পুনরায় "
 "প্রচেষ্টা করুন।  বারংবার এই পরীক্ষণ ব্যর্থ হলে ইনস্টলেশন না করাই বাঞ্ছনীয়।"
 
-#: ../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"
@@ -6504,22 +6504,22 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Checksum পরীক্ষা"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 "ডিভাইস kickstart প্রণালী কমান্ড %s'র ক্ষেত্রে অশুদ্ধ আর্গুমেন্ট উল্লিখিত হয়েছে: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "kickstart ডিভাইস কমান্ডের জন্য মডিউল ধরন এবং নাম উল্লেখ করা প্রয়োজন।"
 
-#: ../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"
@@ -6527,7 +6527,7 @@ msgstr ""
 "প্রেফিক্সে মাস্কের মান IPv4 নেটওয়ার্কের ক্ষেত্রে ১ থেকে ৩২'র মধ্যে IPv6 নেটওয়ার্কের "
 "ক্ষেত্রে ১ থেকে ১২৮'র মধ্যে হওয়া আবশ্যক"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6538,27 +6538,27 @@ msgstr ""
 "করে প্রয়োজনীয় ESSID এবং এনক্রিপশন-কি উল্লেখ করুন। এনক্রিপশন-কি  প্রয়োজন না হলে এই "
 "ক্ষেত্রটি ফাঁকা রাখুন এবং এর ফলে ইনস্টলেশন প্রক্রিয়া বিঘ্নিত হবে না।"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "এনক্রিপশন-কি"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "বেতার ব্যবস্থা সংক্রান্ত বৈশিষ্ট্য"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "নেম-সার্ভারের IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "অনুপস্থিত নেম-সার্ভার"
 
-#: ../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 "
@@ -6568,56 +6568,56 @@ msgstr ""
 "গেলেও নেম-সার্ভার সম্বন্ধে কিছু জানা যায়নি। এই তথ্য আপনার অজানা থাকলে জায়গাটি "
 "ফাঁকা রেখে দিতে পারেন এবং এর ফলে ইনস্টলেশন প্রক্রিয়া বিঘ্নিত হবে না।"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "IP সংক্রান্ত তথ্য বৈধ নয়"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "উল্লিখিত IP ঠিকানা বৈধ নয়।"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "নেটওয়ার্ক সংক্রান্ত সমস্যা"
 
-#: ../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 "নেটওয়ার্ক ইন্টারফেস কনফিগার করতে সমস্যা।"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP কনফিগার করুন"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "অন্তত একটি প্রোটোকল (IPv4 অথবা IPv6) নির্বাচন করা আবশ্যক।"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS'র জন্য IPv4 আবশ্যক"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS ইনস্টলেশন প্রণালীর ক্ষেত্রে IPv4 সমর্থন আবশ্যক।"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ঠিকানা:"
 
-#: ../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 ঠিকানা:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "নেম-সার্ভার:"
 
-#: ../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 "
@@ -6627,43 +6627,43 @@ msgstr ""
 "ক্ষেত্রে,  dotted-quad নেটমাস্ক অথবা CIDR-বিন্যাসের প্রেফিক্স গ্রহণযোগ্য। গেটওয়ে ও "
 "নেম-সার্ভার ক্ষেত্রগুলির মধ্যে বৈধ IPv4 অথবা IPv6 ঠিকানা উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "ব্যবহারকারী দ্বারা TCP/IP কনফিগারেশন"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "অনুপস্থিত তথ্য"
 
-#: ../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 ""
 "বৈধ IPv4 ঠিকানা ও একটি নেটওয়ার্ক মাস্ক অথবা CIDR প্রেফিক্স উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "বৈধ IPv6 ঠিকানা এবং CIDR প্রেফিক্স উভয় উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "হোস্ট-নেম এবং ডোমেন ধার্য করা হচ্ছে..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Kickstart নেটওয়ার্ক কমান্ড %s'র ক্ষেত্রে অশুদ্ধ আর্গুমেন্ট উল্লিখিত হয়েছে: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "নেটওয়ার্ক কমান্ডে ভুল bootproto %s উল্লেখ করা হয়েছে"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "নেটওয়ার্কিং ডিভাইস"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6671,115 +6671,115 @@ msgstr ""
 "আপনার সিস্টেমে একাধিক নেটওয়ার্ক ডিভাইস উপস্থিত রয়েছে। আপনি কোন ডিভাইসটি ব্যবহার "
 "করতে ইচ্ছুক?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS সার্ভারের নাম:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ডিরেক্টরি:"
 
-#: ../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'র প্রস্তুতি"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS কনফিগার না করে হোস্ট-নেম উল্লিখিত হয়েছে"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "উদ্ধার করা হচ্ছে"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "চিহ্নিত ডিরেক্টরি সার্ভার থেকে মাউন্ট করা যায়নি।"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "চিহ্নিত ডিরেক্টির মধ্যে সম্ভবত %s ইনস্টলেশন ট্রি উপস্থিত নেই।"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart প্রণালী কমান্ড %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 "telnet সংযোগ স্থাপনের জন্য অপেক্ষারত..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "telnet'র মাধ্যমে anaconda চালানো হচ্ছে..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "উদ্ধার করতে ব্যর্থ %s://%s/%s/%s।"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ইনস্টলেশনের জন্য ইমেজ প্রাপ্ত করতে ব্যর্থ।"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url kickstart প্রণালী কমান্ড %s'র ক্ষেত্রে অশুদ্ধ আর্গুমেন্ট উল্লিখিত হয়েছে: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url kickstart প্রণালীর ক্ষেত্রে --url আর্গুমেন্ট উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "অজানা 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 "%s কনফিগার করুন"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS'র প্রস্তুতি"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "ডিরেক্টরি উল্লেখ করা আবশ্যক।"
 
-#: ../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 "অজানা হোস্ট"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s হোস্ট-নেমটি বৈধ নয়।"
 
-#: ../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."
@@ -6787,25 +6787,25 @@ msgstr ""
 "HTTP প্রক্সি সার্ভার প্রয়োগ করা হলে ব্যবহারের জন্য HTTP প্রক্সি সার্ভারের নাম উল্লেখ "
 "করুন।"
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr ""
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr ""
 
 # msgstr "non-anonymous এফ. টি. পি. ব্যবহার করো" ?
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 #, fuzzy
 msgid "Further Setup"
 msgstr "FTP সংক্রান্ত অতিরিক্ত বৈশিষ্ট্য"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ড্রাইভার লোড করার হচ্ছে"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s ড্রাইভার লোড করা হচ্ছে..."
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 520201bff..c345c1aab 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -60,41 +60,41 @@ msgstr "শেল প্রাপ্ত করতে <enter> টিপুন"
 #: ../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 "ঠিক আছে"
 
@@ -625,22 +625,22 @@ msgstr "%s-র ফাইল-সিস্টেমের মাপ পরিব�
 #: ../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 "ত্রুটি"
 
@@ -702,8 +702,8 @@ msgstr ""
 "<Enter> টিপে ইনস্টলার থেকে প্রস্থান করুন।"
 
 #: ../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 "উপেক্ষা করুন"
 
@@ -1056,21 +1056,21 @@ msgstr "সংশোধন করা হবে"
 
 #: ../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 "হ্যাঁ"
 
 #: ../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 "না"
 
-#: ../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 "পুনঃপ্রচেষ্টা"
 
@@ -1082,8 +1082,8 @@ msgstr "উপেক্ষা করা হবে"
 #: ../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 "বাতিল"
 
@@ -2014,21 +2014,21 @@ msgid "_Write changes to disk"
 msgstr "পরিবর্তনগুলি ডিস্কে লেখা হবে (_W)"
 
 #: ../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 "পূর্ববর্তী"
 
 #: ../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 "অগ্রসর"
 
@@ -2476,7 +2476,7 @@ msgstr "অনুগ্রহ করে আপনার %(instkey)s লিখু
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s উপেক্ষা করুন"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s-এ স্বাগতম, %s-র জন্য এটি নির্মিত"
@@ -3389,7 +3389,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "ভাষা নির্বাচন"
 
-#: ../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 "ইনস্টলেশন চলাকালে আপনি কোন ভাষা ব্যবহার করতে ইচ্ছুক?"
 
@@ -3769,7 +3769,7 @@ msgstr "%s ক্ষেত্রে মান লেখা আবশ্যক।
 msgid "Dynamic IP"
 msgstr "ডাইনামিক 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 "%s-র IP সংক্রান্ত তথ্যের জন্য অনুরোধ করা হচ্ছে..."
@@ -3941,7 +3941,7 @@ msgstr "অজ্ঞাত"
 msgid "Hardware address: "
 msgstr "হার্ডওয়্যার ঠিকানা: "
 
-#: ../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 "অনুপস্থিত প্রোটোকল"
 
@@ -3950,7 +3950,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "IPv4 অথবা IPv6 সমরর্থনের মধ্যে একটি নির্বাচন করা আবশ্যক।"
 
 #: ../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 "অবৈধ প্রেফিক্স"
 
@@ -4181,7 +4181,7 @@ msgstr "RAID ডিভাইস"
 msgid "None"
 msgstr "শূন্য"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "হার্ড-ড্রাইভ"
 
@@ -5081,12 +5081,12 @@ msgstr "প্রেফিক্স"
 msgid "Activate on boot"
 msgstr "বুট করার সময় সক্রিয় করা হবে"
 
-#: ../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 "IPv4 সমর্থন সক্রিয় করা হবে"
 
-#: ../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 "IPv6 সমর্থন সক্রিয় করা হবে"
@@ -5206,7 +5206,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 "গেটওয়ে:"
 
@@ -5826,22 +5826,22 @@ 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 "মিডিয়া পরীক্ষণ"
 
-#: ../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 "পরীক্ষা"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ডিস্ক বের করা হবে"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5850,7 +5850,7 @@ msgstr ""
 "বর্তমানে ড্রাইভে উপস্থিত ডিস্ক পরীক্ষা করার জন্য  \"%s\" নির্বাচন করুন অথবা \"%s\" "
 "নির্বাচন করে ডিস্কটি বের করে অন্য একটি ডিস্ক পরীক্ষা করুন।"
 
-#: ../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 "
@@ -5864,7 +5864,7 @@ msgstr ""
 "প্রথমবার প্রয়োগ করার পূর্বে ডিস্কগুলি পরীক্ষা করা উচিত। পরীক্ষার ফলাফল সফল হলে "
 "প্রতিবার ব্যবহারের পূর্বে ডিস্কগুলি পরীক্ষা করা আবশ্যক নয়।"
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5873,11 +5873,11 @@ msgstr ""
 "আপনার কম্পিউটারের কোনো ড্রাইভের মধ্যে %s ডিস্কটি পাওয়া যায়নি। অনুগ্রহ করে পুনরায় %s "
 "ডিস্কটি ড্রাইভে ঢুকিয়ে %s চেপে পুনরায় চেষ্টা করুন।"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ডিস্ক পাওয়া গিয়েছে"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5888,7 +5888,7 @@ msgstr ""
 "\n"
 "CD পরীক্ষা না করে ইনস্টলেশন প্রক্রিয়া আরম্ভ করতে হলে %s চাপুন।"
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5897,7 +5897,7 @@ msgstr ""
 "বুট মিডিয়ার অনুরূপ কোনো %s ডিস্ক পাওয়া যায়নি। অনুগ্রহ করে  %s ডিস্ক ঢুকিয়ে ও %s টিপে "
 "পুনরায় প্রচেষ্টা করুন।"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5906,32 +5906,32 @@ msgstr ""
 "আপনার কম্পিউটারের কোনো CDROM ড্রাইভের মধ্যে %s ডিস্কটি পাওয়া যায়নি। অনুগ্রহ করে "
 "পুনরায় %s ডিস্কটি ড্রাইভে ঢুকিয়ে %s চেপে পুনরায় চেষ্টা করুন।"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ডিস্ক পাওয়া যায়নি"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "CDROM-এ kickstart ফাইল পাওয়া যায়নি।"
 
-#: ../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 "%s ডিরেক্টরি পড়তে ব্যর্থ: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "লোড করা হচ্ছে"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ড্রাইভার ডিস্ক পড়া হচ্ছে..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ড্রাইভার ডিস্কের উৎস"
 
-#: ../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?"
@@ -5939,7 +5939,7 @@ msgstr ""
 "ড্রাইভার ডিস্কের উৎস রূপে ব্যবহারযোগ্য একাধিক ডিভাইস উপস্থিত।  এর মধ্যে কোনটি "
 "ব্যবহার করা হবে?"
 
-#: ../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?"
@@ -5947,49 +5947,49 @@ msgstr ""
 "ড্রাইভার ডিস্কের ইমেজ ধারণের উদ্দেশ্যে চিহ্নিত ডিভাইসে একাধিক পার্টিশন উপস্থিত "
 "রয়েছে।  এর মধ্যে কোনটি ব্যবহার করা হবে?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "পার্টিশন মাউন্ট করতে ব্যর্থ।"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ড্রাইভার ডিস্ক ইমেজ নির্বাচন করুন"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ফাইল থেকে ড্রাইভার ডিস্ক লোড করতে ব্যর্থ।"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "/dev/%s-এ ড্রাইভার ডিস্ক ঢুকিয়ে \"ঠিক আছে\" টিপুন।"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ড্রাইভার ডিস্ক ঢোকান"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ড্রাইভার ডিস্ক মাউন্ট করতে ব্যর্থ।"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s বর্তমান রিলিজ সংস্করণের জন্য ড্রাইভার-ডিস্ক বৈধ নয়।"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "নিজে বেছে নিন"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "একটি পৃথক ডিস্ক লোড করুন"
 
-#: ../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 "
@@ -5999,38 +5999,38 @@ msgstr ""
 "নির্নবাচন করুন, এই অবস্থায় এগিয়ে চলবেন নাকি অন্য একটি ড্রাইভার ডিস্ক দিয়ে চেষ্টা "
 "করবেন?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ড্রাইভার ডিস্ক"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "কোনো পৃথক ড্রাইভার ডিস্ক রয়েছে কিনা?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "অতিরিক্ত ড্রাইভার ডিস্ক?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "আপনি কি অতিরিক্ত ড্রাইভার ডিস্ক লোড করতে ইচ্ছুক?"
 
-#: ../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'এ সমস্যা"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "অজানা ড্রাইভার ডিস্কের kickstart'র উৎস: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -6039,7 +6039,7 @@ msgstr ""
 "kickstart ড্রাইভার ডিস্কের কমান্ডের সাথে নিম্নলিখিত অবৈধ কমান্ড উল্লিখিত হয়েছে: %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 "
@@ -6050,19 +6050,19 @@ msgstr ""
 "প্রেরণের উদ্দেশ্যে যথাযত পরামিতিরগুলির মান অজ্ঞাত হলে \"ঠিক আছে\" বাটন চেপে "
 "পরবর্তী ধাপে এগিয়ে চলুন।"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "মডিউলের ক্ষেত্রে প্রযোজ্য পরামিতি উল্লেখ করুন"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "কোনো ড্রাইভার পাওয়া যায়নি"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ড্রাইভার ডিস্ক লোড করা হবে"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6070,7 +6070,7 @@ msgstr ""
 "ব্যবহারকারী দ্বারা অন্তর্ভুক্ত করার উদ্দেশ্যে কোনো ড্রাইভার পাওয়া যায়নি।  আপনি কি "
 "একটি ড্রাইভার ডিস্ক ব্যবহার করতে ইচ্ছুক?"
 
-#: ../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."
@@ -6078,33 +6078,33 @@ msgstr ""
 "লোড করার উদ্দেশ্যে অনুগ্রহ করে নীচের তালিকা থেকে একটি ড্রাইভার নির্বাচন করুন।  "
 "তালিকা প্রদর্শিত না হলে এবং কোনো পৃথক ড্রাইভার ডিস্ক উপস্থিত থাকলে F2 টিপুন।"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "মডিউলের ক্ষেত্রে ঐচ্ছিক আর্গুমেন্ট উল্লেখ করুন"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "লোড করার জন্য ডিভাইস ড্রাইভার বাছাই করুন"
 
-#: ../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 "মিডিয়া সনাক্ত করা হয়েছে"
 
-#: ../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 "স্থানীয় ইনস্টলেশন মিডিয়া সনাক্ত করা হয়েছে..."
 
-#: ../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 "
 "media."
 msgstr "চিহ্নিত ডিরেক্টরির মধ্যে উপস্থিত %s ইনস্টলেশন ট্রি প্রদত্ত বুট মিডিয়ার সাথে সুসংগত নয়।"
 
-#: ../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."
@@ -6112,13 +6112,13 @@ msgstr ""
 "ISO ইমেজ থেকে ইনস্টলেশন সংক্রান্ত তথ্য পড়তে সমস্যা। অনুগ্রহ করে ISO ইমেজ পরীক্ষা করে "
 "পুনরায় প্রচেষ্টা করুন।"
 
-#: ../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?"
 msgstr "আপনার সিস্টেমে কোনো হার্ড-ড্রাইভ পাওয়া যায়নি! অতিরিক্ত ডিভাইস কনফিগার করা হবে কি?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6129,61 +6129,61 @@ msgstr ""
 "আপনি ব্যবহার করছেন সেটি যদি তালিকায় উপস্থিত না থাকে তাহলে F2 চেপে অতিরিক্ত "
 "ডিভাইস কনফিগার করুন।"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ইমেজ ধারণকারী ডিরেক্টরি:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "পার্টিশন বাছাই করুন"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "সম্ভবত %s ডিভাইস-এ %s-র CDROM ইমেজ উপস্থিত নেই।"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD kickstart প্রণালী কমান্ড %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 "হার্ড-ড্রাইভে kickstart পাওয়া যায়নি।"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS ডিস্ক %s-র জন্য হার্ড-ড্রাইভ পাওয়া যায়নি"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "কি-বোর্ডের ধরন"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "আপনার ব্যবহৃত কি-বোর্ডের ধরন কী?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "kickstart ফাইল %s খুলত সমস্যা: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "kickstart ফাইল %s থেকে পড়তে সমস্যা: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "kickstart ফাইল %3$s'র %2$d তম পংক্তির %1$s-এ সমস্যা।"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "অপসারণযোগ্য মিডিয়ার মধ্যে ks.cfg ফাইল পাওয়া যায়নি।"
 
-#: ../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."
@@ -6191,50 +6191,50 @@ msgstr ""
 "kickstart ফাইল ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে নীচে kickstart পরামিতির মান "
 "পরিবর্তন করুন অথবা বাতিল টিপে ইন্টারেক্টিভ ইনস্টলেশনে এগিয়ে চলুন।"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "kickstart ফাইল ডাউনলোড করতে সমস্যা"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "kickstart প্রণালীর %s কমান্ড অশুদ্ধ আর্গুমেন্টের কারণে বন্ধ হয়েছে: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%2$s-র জন্য নির্মিত %1$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> অদল বদল  | <Space> নির্বাচন | <F12> পরবর্তী পর্দা "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "একটি ভাষা নির্বাচন করুন"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "স্থানীয় CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "হার্ড-ড্রাইভ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS ডিরেক্টরি"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n-এ স্বাগতম, এটি %s-র জন্য নির্মিত"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "আপডেট ডিস্ক উৎস"
 
-#: ../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?"
@@ -6242,7 +6242,7 @@ msgstr ""
 "একাধিক ডিভাইস আপডেট ডিস্কের উৎস রূপে ব্যবহার করা যেতে পারে।  আপনি কোনটি ব্যবহার "
 "করতে চান?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6250,29 +6250,29 @@ msgstr ""
 "চিহ্নিত ডিভাইসের মধ্যে, আপডেট ডিস্কের ইমেজ ধারণের যোগ্য একাধিক পার্টিশন উপস্থিত "
 "রয়েছে।  এর মধ্যে কোনটি ব্যবহার করা হবে?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "/dev/%s-এ আপডেট ডিস্ক ঢুকিয়ে \"ঠিক আছে\" টিপুন"
 
 # Altered by Progga
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "আপডেট ডিস্ক"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "আপডেট ডিস্ক মাউন্ট করতে ব্যর্থ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "আপডেট"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "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.."
@@ -6280,44 +6280,44 @@ msgstr ""
 "আপডেট ইমেজ ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে নীচে উল্লিখিত আপডেট ধারণকারী অবস্থান "
 "পরিবর্তন করুন অথবা বাতিল টিপে আপডেট না করে এগিয়ে চলুন।"
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "আপডেট ইমেজ ডাউনলোড করতে সমস্যা"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "এই কম্পিউটারে %s ইনস্টল করার উদ্দেশ্যে পর্যাপ্ত RAM উপস্থিত নেই।"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "রেসকিউ মেথড"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "ইনস্টলেশনের প্রণালী"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "রেস্কিউ ইমেজটি কি ধরনের মিডিয়ায় উপস্থিত রয়েছে?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ইনস্টলেশনের উদ্দেশ্যে প্যাকেজগুলি কোন ধরনের মিডিয়ায় উপস্থিত রয়েছে ?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "কোনো ড্রাইভার পাওয়া যায়নি"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ড্রাইভার বাছাই করুন"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ড্রাইভার ডিস্ক ব্যবহার করা হবে"
 
-#: ../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?"
@@ -6325,11 +6325,11 @@ msgstr ""
 "এই ধরনের ইনস্টলেশনের জন্য প্রয়োজনীয় কোনো ডিভাইস পাওয়া যায়নি। আপনি কি স্বয়ং কোনো "
 "ড্রাইভার নির্বাচন করতে অথবা ড্রাইভার-ডিস্ক ব্যবহার করতে ইচ্ছুক?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "আপনার সিস্টেমে নিম্নলিখিত সিস্টেমগুলি সনাক্ত করা হয়েছে।"
 
-#: ../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?"
@@ -6337,50 +6337,50 @@ msgstr ""
 "আপনার সিস্টেমের ক্ষেত্রে কোনো ডিভাইস ড্রাইভার লোড করা হয়নি। আপনি কি কিছু লোড করতে "
 "ইচ্ছুক?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ডিভাইস"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "সমাপ্ত"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ডিভাইস যোগ করুন"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "লোডার চালানো হয়েছে।  শেল আরম্ভ করা হচ্ছে।\n"
 
 # FIXME
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Anaconda %s চালানো হচ্ছে, %s রেসকিউ মোড - অনুগ্রহ করে অপেক্ষা করুন...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Anaconda %s চালানো হচ্ছে, %s সিস্টেম ইনস্টলার - অনুগ্রহ করে অপেক্ষা করুন...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "ইনস্টল ইমেজ %s পাওয়া যায়নি"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" পরীক্ষা করা হচ্ছে..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "মিডিয়া পরীক্ষা করা হচ্ছে..."
 
-#: ../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."
@@ -6388,7 +6388,7 @@ msgstr ""
 "প্রধান ভলিউম ডেস্ক্রিপ্টর থেকে checksum পড়তে ব্যর্থ।  সম্ভবত ডিস্ক নির্মাণের সময় "
 "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 "
@@ -6398,11 +6398,11 @@ msgstr ""
 "ডিস্কের ফলে এটি হওয়ার সম্ভাবনা রয়েছে।  সম্ভব হলে, ডিস্কটি পরিষ্কার করে পুনরায় "
 "প্রচেষ্টা করুন।  বারংবার এই পরীক্ষণ ব্যর্থ হলে ইনস্টলেশন না করাই বাঞ্ছনীয়।"
 
-#: ../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 "
@@ -6412,7 +6412,7 @@ 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"
@@ -6423,20 +6423,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Checksum পরীক্ষা"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "ডিভাইস kickstart প্রণালী কমান্ড %s'র ক্ষেত্রে অশুদ্ধ আর্গুমেন্ট উল্লিখিত হয়েছে: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "kickstart ডিভাইস কমান্ডের জন্য মডিউলের নাম উল্লেখ করা আবশ্যক।"
 
-#: ../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"
@@ -6444,7 +6444,7 @@ msgstr ""
 "প্রেফিক্সে মাস্কের মান IPv4 নেটওয়ার্কের ক্ষেত্রে ১ থেকে ৩২'র মধ্যে IPv6 নেটওয়ার্কের "
 "ক্ষেত্রে ১ থেকে ১২৮'র মধ্যে হওয়া আবশ্যক"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6455,27 +6455,27 @@ msgstr ""
 "করে প্রয়োজনীয় ESSID এবং এনক্রিপশন-কি উল্লেখ করুন। এনক্রিপশন-কি  প্রয়োজন না হলে এই "
 "ক্ষেত্রটি ফাঁকা রাখুন এবং এর ফলে ইনস্টলেশন প্রক্রিয়া বিঘ্নিত হবে না।"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "এনক্রিপশন-কি"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "বেতার ব্যবস্থা সংক্রান্ত বৈশিষ্ট্য"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "নেম-সার্ভারের IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "নেম-সার্ভার অনুসপস্থিত"
 
-#: ../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 "
@@ -6485,56 +6485,56 @@ msgstr ""
 "গেলেও নেম-সার্ভার সম্বন্ধে কিছু জানা যায়নি। এই তথ্য আপনার অজানা থাকলে জায়গাটি "
 "ফাঁকা রেখে দিতে পারেন এবং এর ফলে ইনস্টলেশন প্রক্রিয়া বিঘ্নিত হবে না।"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "IP সংক্রান্ত তথ্য বৈধ নয়"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "উল্লিখিত IP ঠিকানা বৈধ নয়।"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "নেটওয়ার্ক সংক্রান্ত সমস্যা"
 
-#: ../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 "নেটওয়ার্ক ইন্টারফেস কনফিগার করতে সমস্যা।"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP কনফিগার করুন"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "অন্তত একটি প্রোটোকল (IPv4 অথবা IPv6) নির্বাচন করা আবশ্যক।"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS'র জন্য IPv4 আবশ্যক"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS ইনস্টলেশন প্রণালীর ক্ষেত্রে IPv4 সমর্থন আবশ্যক।"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ঠিকানা:"
 
-#: ../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 ঠিকানা:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "নেম-সার্ভার:"
 
-#: ../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 "
@@ -6544,41 +6544,41 @@ msgstr ""
 "ক্ষেত্রে,  dotted-quad নেটমাস্ক অথবা CIDR-বিন্যাসের প্রেফিক্স গ্রহণযোগ্য। গেটওয়ে ও "
 "নেম-সার্ভার ক্ষেত্রগুলির মধ্যে বৈধ IPv4 অথবা IPv6 ঠিকানা উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "ব্যবহারকারী দ্বারা TCP/IP কনফিগারেশন"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "অনুপস্থিত তথ্য"
 
-#: ../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 "বৈধ IPv4 ঠিকানা ও একটি নেটওয়ার্ক মাস্ক অথবা CIDR প্রেফিক্স উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "বৈধ IPv6 ঠিকানা এবং CIDR প্রেফিক্স উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "হোস্ট-নেম এবং ডোমেন ধার্য করা হচ্ছে..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Kickstart নেটওয়ার্ক কমান্ড %s'র ক্ষেত্রে অশুদ্ধ আর্গুমেন্ট উল্লিখিত হয়েছে: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "নেটওয়ার্ক কমান্ডে ভুল bootproto %s উল্লেখ করা হয়েছে"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "নেটওয়ার্কিং ডিভাইস"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6586,112 +6586,112 @@ msgstr ""
 "আপনার সিস্টেমে একাধিক নেটওয়ার্ক ডিভাইস উপস্থিত রয়েছে। আপনি কোন ডিভাইসটি ব্যবহার "
 "করতে ইচ্ছুক?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS সার্ভারের নাম:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ডিরেক্টরি:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "অনুগ্রহ করে সার্ভারের নাম ও %s ইমেজ ধারণকারী পাথের নাম উল্লেখ করুন।"
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS'র প্রস্তুতি"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS কনফিগার না করে হোস্ট-নেম উল্লিখিত হয়েছে"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "উদ্ধার করা হচ্ছে"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "চিহ্নিত ডিরেক্টরি সার্ভার থেকে মাউন্ট করা যায়নি।"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "চিহ্নিত ডিরেক্টির মধ্যে সম্ভবত %s ইনস্টলেশন ট্রি উপস্থিত নেই।"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart প্রণালী কমান্ড %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 "telnet সংযোগ স্থাপনের জন্য অপেক্ষারত..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "telnet'র মাধ্যমে anaconda চালানো হচ্ছে..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s://%s/%s উদ্ধার করতে ব্যর্থ।"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ইনস্টলেশনের জন্য ইমেজ প্রাপ্ত করতে ব্যর্থ।"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url kickstart প্রণালী কমান্ড %s'র ক্ষেত্রে অশুদ্ধ আর্গুমেন্ট উল্লিখিত হয়েছে: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url kickstart প্রণালীর ক্ষেত্রে --url আর্গুমেন্ট উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "অজানা 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 "অনুগ্রহ করে সার্ভারের মধ্যে %s ইমেজ চিহ্নকারী URL উল্লেখ করুন।"
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "প্রক্সি কনফিগার করুন"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL-র প্রস্তুতি"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "URL উল্লেখ করা আবশ্যক।"
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL-টি, ftp অথবা http URL হওয়া আবশ্যক"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "অজানা হোস্ট"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s হোস্ট-নেমটি বৈধ নয়।"
 
-#: ../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."
@@ -6699,24 +6699,24 @@ msgstr ""
 "HTTP প্রক্সি সার্ভার প্রয়োগ করা হলে ব্যবহারের জন্য HTTP প্রক্সি সার্ভারের নাম উল্লেখ "
 "করুন।"
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "প্রক্সির নাম:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "প্রক্সির পোর্ট:"
 
 # msgstr "non-anonymous এফ. টি. পি. ব্যবহার করো" ?
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "অতিরিক্ত প্রস্তুতি"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ড্রাইভার লোড করার হচ্ছে"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s ড্রাইভার লোড করা হচ্ছে..."
diff --git a/po/bs.po b/po/bs.po
index cce6d7c5b..c6ab284de 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -47,41 +47,41 @@ msgstr "Za shell pritisnite <ENTER>"
 #: ../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 "U redu"
 
@@ -585,22 +585,22 @@ msgstr "Pogreška tijekom pristupanja datotečnom sistemu pri %s: %s"
 #: ../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 "Greška"
 
@@ -657,8 +657,8 @@ msgstr ""
 "Da biste ponovo pokrenuli sistem kliknite \"U redu\"."
 
 #: ../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 "Preskoči"
 
@@ -998,21 +998,21 @@ msgstr "Popravi"
 
 #: ../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 "Da"
 
 #: ../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 "Ne"
 
-#: ../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 "Ponovi"
 
@@ -1023,8 +1023,8 @@ msgstr "Ignoriraj"
 #: ../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 "Odustani"
 
@@ -1895,21 +1895,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 "Povratak"
 
 #: ../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 "Nastavi"
 
@@ -2346,7 +2346,7 @@ msgstr "Unesite naziv grupe volumena."
 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 "Dobro došli u %s"
@@ -3250,7 +3250,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Odabir jezika"
 
-#: ../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 "Koji jezik želite upotrebljavati tijekom instalacijskog postupka?"
 
@@ -3631,7 +3631,7 @@ msgstr "Potrebno je imati vrijednost u polju \"%s\"."
 msgid "Dynamic IP"
 msgstr "Dinamički 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 "Slanje zahtijeva o IP podacima za %s..."
@@ -3810,7 +3810,7 @@ msgstr "Nepoznato"
 msgid "Hardware address: "
 msgstr "Hardverska adresa: %s"
 
-#: ../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 "Nedostaje protokol"
 
@@ -3820,7 +3820,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Za DHCP je potrebno odabrati najmanje jedan protokol (IPv4 ili IPv6)."
 
 #: ../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 "Neispravan prefiks"
 
@@ -4056,7 +4056,7 @@ msgstr "RAID uređaji"
 msgid "None"
 msgstr "Nijedan"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Tvrdi diskovi"
 
@@ -4991,12 +4991,12 @@ msgstr "IPv6/Prefiks"
 msgid "Activate on boot"
 msgstr "Aktiviraj pri pokretanju"
 
-#: ../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 "Omogući IPv4 podršku"
 
-#: ../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 "Omogući IPv6 podršku"
@@ -5125,7 +5125,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 "Pristupnik:"
 
@@ -5757,23 +5757,23 @@ 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 "Provjera medija"
 
-#: ../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 "Izbaci 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 "
@@ -5782,7 +5782,7 @@ msgstr ""
 "Za ispitivanje medija koji se trenutno nalazi u uređaju odaberite \"%s\", "
 "ili \"%s\" za izbacivanje i umetanje drugog medija koji će biti ispitan."
 
-#: ../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 "
@@ -5796,7 +5796,7 @@ msgstr ""
 "barem prije njihove prve upotrebe.  Nakon uspješne provjere neće biti "
 "potrebno ponovo provjeravati svaki CD prije njegove upotrebe."
 
-#: ../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 "
@@ -5805,12 +5805,12 @@ msgstr ""
 "CD %s nije pronađen niti u jednom CD-ROM uređaju. Umetnite CD %s i kliknite %"
 "s za ponovni pokušaj."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD je pronađen"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5821,7 +5821,7 @@ msgstr ""
 "\n"
 "Da biste preskočili ispitivanja medija i pokrenuli instalaciju odaberite %s."
 
-#: ../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 "
@@ -5830,7 +5830,7 @@ msgstr ""
 "Nije pronađen CD %s koji bi odgovarao vašem pokretačkom mediju. Umetnite CD %"
 "s i odaberite %s za ponovni pokušaj."
 
-#: ../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 "
@@ -5839,33 +5839,33 @@ msgstr ""
 "CD %s nije pronađen niti u jednom CD-ROM uređaju. Umetnite CD %s i kliknite %"
 "s za ponovni pokušaj."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD nije pronađen"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Na CD mediju nije moguće pronaći kickstart datoteku."
 
-#: ../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 "Pogreška pri čitanju mape %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Učitavanje"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Čitanje upravljačkog diska..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Izvor upravljačkog diska"
 
-#: ../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?"
@@ -5873,7 +5873,7 @@ msgstr ""
 "Imate višestruke uređaje koji bi mogli poslužiti kao izvor za disk s "
 "upravljačkim programima.  Koji od njih želite upotrijebiti?"
 
-#: ../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?"
@@ -5881,51 +5881,51 @@ msgstr ""
 "Na ovom uređaju postoji nekoliko particija koje bi mogli sadržavati presliku "
 "upravljačkih programa.  Koju od njih želite upotrijebiti?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Pristupanje particiji nije uspjelo."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Odaberite presliku upravljačkog diska"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Odaberite datoteku koja je preslika diska s upravljačkim programima."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Učitavanje diska s upravljačkim programima iz datoteke nije uspjelo."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Umetnite disk s upravljačkim programima u uređaj /dev/%s i kliknite \"U redu"
 "\" za nastavak."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Umetnite upravljački disk"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Pristupanje upravljačkom disku nije uspjelo."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Disk s upravljačkim programima nije ispravan za ovo izdanje %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Ručni odabir"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Učitajte drugi 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 "
@@ -5935,38 +5935,38 @@ msgstr ""
 "ručno odabrati upravljački program, ipak nastaviti ili učitati drugi disk s "
 "upravljačkim programima?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Upravljački disk"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Imate li disk s upravljačkim programima?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Imate li još diskova?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Želite li učitati još koji disk s upravljačkim programima?"
 
-#: ../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 pogreška"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Nepoznati kickstart izvor diska s upravljačkim programima: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5975,7 +5975,7 @@ msgstr ""
 "Određeni su sljedeći neispravni argumenti za kickstart naredbu diska s "
 "upravljačkim programima: %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 "
@@ -5986,19 +5986,19 @@ msgstr ""
 "Ukoliko ne znate koje je parametre potrebno proslijediti, ovaj zaslon "
 "preskočite klikanjem gumba \"U redu\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Unesite parametre modula"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Upravljački programi nisu pronađeni"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Učitaj upravljački 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?"
@@ -6006,7 +6006,7 @@ msgstr ""
 "Nisu pronađeni upravljački programi za ručno postavljanje. Želite li "
 "upotrijebiti disk s upravljačkim programima?"
 
-#: ../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."
@@ -6014,26 +6014,26 @@ msgstr ""
 "S donjeg popisa odaberite upravljački program koji želite učitati. Ako nije "
 "na popisu, a imate disk s upravljačkim programom, pritisnite F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Određivanje dodatnih argumenata modula"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Odabir upravljačkog programa uređaja"
 
-#: ../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 "Pronađen je medij"
 
-#: ../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 "Pronađen je lokalni instalacijski medij..."
 
-#: ../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 "
@@ -6042,7 +6042,7 @@ msgstr ""
 "Izgleda da instalacijsko stablo %s u toj mapi ne odgovara vašem mediju za "
 "pokretanje sistema."
 
-#: ../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."
@@ -6050,7 +6050,7 @@ msgstr ""
 "Došlo je do pogreške pri čitanju instalacije s ISO preslika. Provjerite ISO "
 "preslike i ponovo pokušajte."
 
-#: ../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?"
@@ -6058,7 +6058,7 @@ msgstr ""
 "Izgleda da nemate niti jedan tvrdi disk na vašem sistemu! Želite li "
 "konfigurirati dodatne uređaje?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6069,117 +6069,117 @@ msgstr ""
 "Ako disk koji upotrebljavate nije vidljiv na ovom popisu, pritisnite F2 za "
 "konfiguriranje dodatnih uređaja."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Mapa koja sadrži preslike diskova:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Odaberite particiju"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Izgleda da uređaj %s ne sadrži preslike %s CD-a."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Loš argument za HD kickstart naredbu načina %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 "Na tvrdom disku nije moguće pronaći kickstart datoteku."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Nije moguće pronaći tvrdi disk u skladu s diskom iz BIOS-a: %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Vrsta tipkovnice"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Koju vrstu tipkovnice imate?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Pogreška pri otvaranju kickstart datoteke %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Pogreška pri čitanju sadržaja kickstart datoteke %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Pogreška pri %s u retku %d kickstart datoteke %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Na pokretačkoj disketi nije moguće pronaći ks.cfg."
 
-#: ../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 "Pogreška pri otvaranju kickstart datoteke %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Loš argument za kickstart naredbu načina gašenja %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Dobrodošli u %s - Spašavanje"
 
-#: ../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> između elemenata  | <razmaknica> odabir | <F12> sljedeći "
 "zaslon"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Odaberite jezik"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Lokalni CD-ROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Tvrdi disk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s mapa:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Dobro došli u %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Izvor diska s ažuriranjima"
 
-#: ../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?"
@@ -6187,7 +6187,7 @@ msgstr ""
 "Imate višestruke uređaje koji bi mogli poslužiti kao izvor diska s "
 "ažuriranjima.  Koji od njih želite upotrijebiti?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6196,74 +6196,74 @@ msgstr ""
 "Na ovom uređaju postoji nekoliko particija koje bi mogli sadržavati presliku "
 "upravljačkih programa.  Koju od njih želite upotrijebiti?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Umetnite diskove s ažuriranjima u /dev/%s i pritisnite \"U redu\" za "
 "nastavak."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disk s ažuriranjima"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Pristupanje disku s ažuriranjima nije uspjelo."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Ažuriranja"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Čitanje Anaconda ažuriranja..."
 
-#: ../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 "Pogreška pri otvaranju kickstart datoteke %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 "Na ovom računaru nema dovoljno radne memorije za instalaciju %s."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Spašavanje"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Instalacija"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Koja vrsta medija sadrži presliku diska za spašavanje?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Koja vrsta medija sadrži pakete za instaliranje?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Upravljački program nije pronađen"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Odaberite upravljački program"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Upotrijebi upravljački 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?"
@@ -6272,11 +6272,11 @@ msgstr ""
 "Želite li ručno odabrati upravljački program ili upotrijebiti disk s "
 "upravljačkim programima?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Sljedeći su uređaji pronađeni na sistemu."
 
-#: ../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?"
@@ -6284,50 +6284,50 @@ msgstr ""
 "Upravljački programi za vaš sistem nisu učitani. Želite li sad učitati neki "
 "program?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Uređaji"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Gotovo"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Dodaj uređaj"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Pokretač je već bio pokrenut. Pokretanje korisničke ljuske.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Pokretanje Anaconde, %s način spašavanja - Pričekajte...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Pokretanje Anaconde, instalacijskog program sistema %s - pričekajte...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Nije moguće pronaći instalacijsku presliku %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Provjeravanje \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Provjeravanje medija..."
 
-#: ../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."
@@ -6335,7 +6335,7 @@ msgstr ""
 "Kontrolni iznos s primarnog opisa volumena nije moguće pročitati.  To "
 "vjerojatno znači da je disk izrađen bez dodavanja kontrolnog iznosa."
 
-#: ../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 "
@@ -6346,18 +6346,18 @@ msgstr ""
 "pokušajte ponovo. Ako se tijekom ispitivanja nastave pojavljivati pogreške "
 "ne biste trebali nastaviti s instalacijom."
 
-#: ../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"
@@ -6368,23 +6368,23 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Provjera kontrolnog iznosa"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Loš argument za kickstart naredbu načina uređaja %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Određeni su sljedeći neispravni argumenti za kickstart naredbu diska s "
 "upravljačkim programima: %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"
@@ -6392,7 +6392,7 @@ msgstr ""
 "Prefiks mora biti između 1 i 32 za IPv4 mreže, odnosno između 1 i 128 za "
 "IPv6 mreže"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6403,28 +6403,28 @@ msgstr ""
 "ESSID i ključ šifriranja. Ako ključ nije potreban, polje ostavite "
 "neispunjenim i  instalacija će biti nastavljena."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Ključ šifriranja"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Postavke bežičnih uređaja"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP poslužitelja naziva"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Poslužitelj naziva"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6436,100 +6436,100 @@ msgstr ""
 "unesite ga sad. Ako nemate taj podatak, ovo polje možete ostaviti "
 "neispunjenim i instalacija će biti nastavljena."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Neispravan IP podatak"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Unijeli ste neispravnu IP adresu."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Mrežna pogreška"
 
-#: ../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 "Tijekom konfiguriranja mrežnog sučelja došlo je do pogreške."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfiguriranje TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Za DHCP je potrebno odabrati najmanje jedan protokol (IPv4 ili IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 je potreban za NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Način instaliranje putem NFS zahtjeva IPv4 podršku."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 adresa:"
 
-#: ../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 adresa:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Poslužitelj naziva:"
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "Ručna TCP/IP konfiguracija"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Nedostaje podatak"
 
-#: ../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 "Potrebno unijeti valjanu IPv4 adresu i mrežnu masku ili CIDR prefiks."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Potrebno unijeti valjanu IPv6 adresu i CIDR prefiks."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Određivanje naziva i domene..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Loš argument za kickstart mrežnu naredbu %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "U mrežnoj je naredbi određen loš protokol pokretanja sistema %s"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Mrežni uređaj"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6537,115 +6537,115 @@ msgstr ""
 "Na ovom sistemu postoji nekoliko mrežnih uređaja. Putem kojeg od njih želite "
 "izvršiti instalaciju? "
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Naziv NFS poslužitelja:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s mapa:"
 
-#: ../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 "NSF postavke"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Određen je naziv poslužitelja bez DNS konfiguracije"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Dohvaćanje"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Ovoj mapi nije moguće pristupiti s poslužitelja."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Izgleda da ova mapa ne sadrži %s instalacijsko stablo."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Loš argument za NFS kickstart naredbu načina %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 "Čekanje uspostavljanja telnet veze..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Pokretanje Anaconde putem Telneta..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Nije moguće dohvatiti %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Nije moguće dohvatiti instalacijsku presliku."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Loš argument za URL kickstart naredbu načina %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Potrebno je unijeti ---url argument za URL kickstart način."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Nepoznat URL način %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, fuzzy, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Unesite registracijski ključ vaše verzije %s."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "Konfiguriranje %s"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NSF postavke"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Potrebno je unijeti mapu."
 
-#: ../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 "Nepoznat računar"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s nije ispravan naziv računara."
 
-#: ../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."
@@ -6653,24 +6653,24 @@ msgstr ""
 "Ako upotrebljavate HTTP proxy poslužitelj, unesite naziv HTTP proxy "
 "poslužitelja."
 
-#: ../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 "Dodatne FTP postavke"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Učitavanje SCSI upravljačkih programa"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Učitavanje upravljačkog programa %s..."
diff --git a/po/ca.po b/po/ca.po
index 08e2da790..3569f9c90 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -62,41 +62,41 @@ msgstr "Premeu <retorn> per a la línia d'ordres"
 #: ../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 "D'acord"
 
@@ -602,22 +602,22 @@ msgstr "S'està formatant el sistema de fitxers %s..."
 #: ../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"
 
@@ -674,8 +674,8 @@ msgstr ""
 "Premeu <tecla de retorn> per a sortir de l'instal·lador."
 
 #: ../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 "Omet"
 
@@ -1013,21 +1013,21 @@ msgstr "Arregla"
 
 #: ../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 "Sí"
 
 #: ../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 "Reintenta"
 
@@ -1038,8 +1038,8 @@ msgstr "Omet"
 #: ../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·la"
 
@@ -1915,21 +1915,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 "Anterior"
 
 #: ../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 "Continua"
 
@@ -2369,7 +2369,7 @@ msgstr "Introduïu la vostra %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Omet la introducció de %(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 "Benvingut a %s"
@@ -3263,7 +3263,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Selecció de l'idioma"
 
-#: ../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 "Quin idioma voleu fer servir durant el procés d'instal·lació?"
 
@@ -3641,7 +3641,7 @@ msgstr "Es requereix un valor per al camp %s."
 msgid "Dynamic IP"
 msgstr "IP dinàmica"
 
-#: ../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 "S'està enviant una sol·licitud d'informació d'IP per a %s..."
@@ -3812,7 +3812,7 @@ msgstr "desconegut"
 msgid "Hardware address: "
 msgstr "Adreça del maquinari: "
 
-#: ../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 "Manca un protocol"
 
@@ -3821,7 +3821,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Heu d'escollir habilitar IPv4 o bé IPv6."
 
 #: ../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 "El prefix no és vàlid"
 
@@ -4060,7 +4060,7 @@ msgstr "Dispositius RAID"
 msgid "None"
 msgstr "Cap"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Discos durs"
 
@@ -4979,12 +4979,12 @@ msgstr "Prefix"
 msgid "Activate on boot"
 msgstr "Activa en arrencar"
 
-#: ../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 "Habilita l'IPv4"
 
-#: ../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 "Habilita l'IPv6"
@@ -5106,7 +5106,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 "Passarel·la:"
 
@@ -5732,22 +5732,22 @@ msgstr ""
 "* No obtindreu actualitzacions del programari ni de seguretat per als "
 "paquets que no estiguin inclosos a la subscripció."
 
-#: ../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 "Comprovació del medi"
 
-#: ../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 "Comprova"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Expulsa el disc"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5756,7 +5756,7 @@ msgstr ""
 "Escolliu «%s» per a comprovar el CD que hi ha a la unitat, o «%s» per a "
 "expulsar el disc i inserir-ne un altre per a provar-lo."
 
-#: ../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 "
@@ -5770,7 +5770,7 @@ msgstr ""
 "s'hauria de fer abans d'utilitzar-los per primera vegada. Un cop comprovats, "
 "ja no cal tornar a fer-ho abans d'utilitzar-los."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5779,11 +5779,11 @@ msgstr ""
 "No s'ha pogut trobar el disc %s en cap de les unitats del sistema. Inseriu "
 "el disc %s i premeu %s per a intentar-ho de nou."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "S'ha trobat el disc"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5794,7 +5794,7 @@ msgstr ""
 "\n"
 "Escolliu %s per a ometre la comprovació i començar la instal·lació."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5803,7 +5803,7 @@ msgstr ""
 "No s'ha trobat cap disc %s que coincideixi amb el medi d'arrencada escollit. "
 "Inseriu el disc %s i premeu %s per a intentar-ho de nou."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5812,32 +5812,32 @@ msgstr ""
 "No s'ha pogut trobar el disc %s en cap de les unitats del sistema. Inseriu "
 "el disc %s i premeu %s per a intentar-ho de nou."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "No s'ha trobat el disc"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "No s'ha pogut trobar el fitxer kickstart al 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 "S'ha produït un error en llegir el directori %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "S'està carregant"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "S'està llegint el disquet de controladors..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Font del disquet de controladors"
 
-#: ../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?"
@@ -5845,7 +5845,7 @@ msgstr ""
 "Hi ha diversos dispositius que poden servir com a fonts per al disquet de "
 "controladors. Quin voleu fer servir?"
 
-#: ../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?"
@@ -5853,50 +5853,50 @@ msgstr ""
 "Hi ha diverses particions en aquest dispositiu que podrien contenir la "
 "imatge del disquet de controladors. Quina voleu fer servir?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "S'ha produït un error en muntar la partició."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Seleccioneu la imatge del disc de controladors"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Seleccioneu el fitxer que sigui la imatge del disc de controladors."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "No s'ha pogut carregar el disc de controladors des del fitxer."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Inseriu el disc de controladors a /dev/%s i premeu «D'acord» per continuar."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Inseriu el disc de controladors"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "No s'ha pogut muntar el disc de controladors."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "El disc de controladors no és vàlid per a aquesta versió de %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Escolliu manualment"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Carregueu un altre disquet"
 
-#: ../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 "
@@ -5906,38 +5906,38 @@ msgstr ""
 "controladors. Voleu seleccionar-ne un manualment, carregar un altre disc de "
 "controladors o continuar?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disc de controladors"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Teniu un disc de controladors?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Teniu més discos de controladors?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Voleu carregar més discos de controladors?"
 
-#: ../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 "S'ha produït un error en el kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "No es coneix cap font de discos de controladors del kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5946,7 +5946,7 @@ msgstr ""
 "S'ha especificat el següent argument invàlid de la comanda per al disc de "
 "controladors del kickstart: %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 "
@@ -5957,19 +5957,19 @@ msgstr ""
 "Si no sabeu quins paràmetres proporcionar, deixeu-ho en blanc i premeu el "
 "botó «D'acord»."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Indiqueu els paràmetres del mòdul"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "No s'han trobat controladors"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Carrega el disc de controladors"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5977,7 +5977,7 @@ msgstr ""
 "No s'han trobat controladors per inserir manualment. Voleu fer servir un "
 "disc de controladors?"
 
-#: ../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."
@@ -5985,26 +5985,26 @@ msgstr ""
 "Seleccioneu el controlador que vulgueu carregar. Si no hi apareix i teniu un "
 "disc de controladors, premeu F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Indiqueu arguments opcionals per al mòdul"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Seleccioneu quin controlador del dispositiu voleu carregar"
 
-#: ../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 "S'ha detectat el medi"
 
-#: ../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 "S'ha detectat el medi per a la instal·lació local..."
 
-#: ../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 "
@@ -6013,7 +6013,7 @@ msgstr ""
 "L'arbre d'instal·lació %s en aquell directori no sembla coincidir amb el "
 "medi d'arrencada."
 
-#: ../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."
@@ -6021,7 +6021,7 @@ msgstr ""
 "S'ha produït un error en llegir la instal·lació de les imatges ISO. "
 "Comproveu les imatges ISO de nou."
 
-#: ../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?"
@@ -6029,7 +6029,7 @@ msgstr ""
 "Sembla que no hi ha cap disc dur al sistema. Voleu configurar dispositius "
 "addicionals?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6040,64 +6040,64 @@ msgstr ""
 "(iso9660) per a %s? Si no veieu la unitat de disc que feu servir llistada "
 "aquí, premeu F2 per configurar dispositius addicionals."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Directori que conté les imatges:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Seleccioneu la partició"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "El dispositiu %s no sembla que contingui imatges de CDROM de %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Argument erroni per a l'ordre HD del kickstart %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 "No s'ha pogut trobar el fitxer del kickstart al disc dur."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "No s'ha pogut trobar un disc dur per al disc de la BIOS %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tipus de teclat"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Quin tipus de teclat teniu?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "S'ha produït un error en obrir el fitxer kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 "S'ha produït un error en llegir els continguts del fitxer del kickstart %s: %"
 "s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Hi ha un error a %s a la línia %d del fitxer kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "No s'ha pogut trobar ks.cfg en el disquet d'arrencada."
 
-#: ../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."
@@ -6106,51 +6106,51 @@ msgstr ""
 "d'aquí sota, o premeu Cancel·la per continuar com en una instal·lació "
 "interactiva."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "S'ha produït un error en baixar el fitxer kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Argument erroni per aturar l'ordre del mètode del kickstart %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Benvingut a %s - Mode de rescat"
 
-#: ../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> mou | <Espai> selecciona | <F12> següent "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Escolliu l'idioma"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD local"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disc dur"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Directori NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Benvingut a %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Actualitza el disc font"
 
-#: ../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?"
@@ -6158,7 +6158,7 @@ msgstr ""
 "Teniu diversos dispositius que poden servir de fonts per a un disc "
 "d'actualització. Quin voleu fer servir?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6167,30 +6167,30 @@ msgstr ""
 "Hi ha diverses particions en aquest dispositiu que podrien contenir la "
 "imatge del disquet de controladors. Quina voleu fer servir?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Inseriu el disc d'actualitzacions a /dev/%s i premeu \"D'acord\" per "
 "continuar."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disc d'actualitzacions"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "S'ha produït un error en muntar el disc d'actualitzacions"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Actualitzacions"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "S'estan llegint les actualitzacions de l'anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6200,45 +6200,45 @@ msgstr ""
 "d'aquí sota, o premeu Cancel·la per continuar com en una instal·lació "
 "interactiva."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "S'ha produït un error en baixar el fitxer kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Aquest ordinador no té prou memòria RAM per a instal·lar-hi %s."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Mètode de rescat"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Mètode d'instal·lació"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Quin tipus de medi conté la imatge de rescat?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Quin tipus de medi conté els paquets per instal·lar?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "No s'ha trobat el controlador"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Seleccioneu el controlador"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Utilitza un disc de controladors"
 
-#: ../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?"
@@ -6247,62 +6247,62 @@ msgstr ""
 "d'instal·lació. Voleu seleccionar manualment el controlador, o utilitzar un "
 "disc?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "S'han trobat els següents dispositius en aquest sistema."
 
-#: ../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 ""
 "No s'ha carregat cap controlador al sistema. Voleu carregar-ne algun ara?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Dispositius"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Fet"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Afegeix dispositiu"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 "ja s'ha executat el carregador. S'està iniciant l'intèrpret d'ordres.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "S'està executant l'anaconda, el mode de rescat de %s. Espereu...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "S'està executant l'anaconda, l'instal·lador del sistema %s. Espereu...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "No s'ha pogut trobar la imatge d'instal·lació %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "S'està comprovant «%s»..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "S'està comprovant el medi..."
 
-#: ../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."
@@ -6311,7 +6311,7 @@ msgstr ""
 "volum primari. Molt probablement això indica que el disc es va crear sense "
 "afegir la suma de verificació."
 
-#: ../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 "
@@ -6322,18 +6322,18 @@ msgstr ""
 "intenteu-ho de nou. Si aquest test torna a fallar no hauríeu de continuar la "
 "instal·lació."
 
-#: ../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"
@@ -6344,24 +6344,24 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Comprovació de les sumes de verificació"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 "Argument erroni al dispositiu de l'ordre del mètode del kickstart %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "S'ha d'especificar tan el tipus com el nom del mòdul per a la comanda de la "
 "unitat del kickstart."
 
-#: ../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"
@@ -6369,7 +6369,7 @@ msgstr ""
 "Els prefixos ha de ser entre 1 i 32 per a xarxes IPv4 i entre 1 i 128 per a "
 "xarxes IPv6."
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6380,27 +6380,27 @@ msgstr ""
 "xifratge que calgui per accedir a la xarxa sense fil. Si no cal cap clau, "
 "deixeu aquest camp en blanc i la instal·lació continuarà."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Clau de xifratge"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Configuració de la xarxa sense fil"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP del servidor de noms"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Manca el servidor de noms"
 
-#: ../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 "
@@ -6410,56 +6410,56 @@ msgstr ""
 "servidor de noms. Si no disposeu d'aquesta informació, podeu deixar aquest "
 "camp en blanc i la instal·lació continuarà."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "La informació d'IP no és vàlida"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Heu indicat una adreça IP invàlida."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Error de xarxa"
 
-#: ../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 "S'ha produït un error en configurar la vostra interfície de xarxa."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configureu TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Heu d'escollir almenys un protocol IPv4 o IPv6."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "Cal IPv4 per a NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "El mètode d'instal·lació per NFS requereix IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Adreça IPv4:"
 
-#: ../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 "Adreça IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Servidor de noms:"
 
-#: ../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 "
@@ -6470,42 +6470,42 @@ msgstr ""
 "o bé fent servir l'estil CIDR. Les adreces de la passarel·la i del servidor "
 "de noms han de ser vàlides."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Configuració TCP/IP manual"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Manca informació"
 
-#: ../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 "Heu d'indicar una adreça IPv4 i una màscara de xarxa o CIDR vàlides."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Heu d'indicar una adreça IPv6 i un prefix CIDR vàlids."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "S'està determinant el nom de la màquina i el domini..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Argument erroni per a l'ordre de xarxa del kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Protocol d'arrencada %s erroni especificat en l'ordre de xarxa"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Dispositius de xarxa"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6513,140 +6513,140 @@ msgstr ""
 "Hi ha diversos dispositius de xarxa en aquest sistema. Per quin voleu "
 "continuar la instal·lació?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nom del servidor NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Directori %s:"
 
-#: ../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 "Configuració de l'NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "S'ha especificat un nom d'ordinador sense tenir el DNS configurat"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "S'està descarregant"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "No s'ha pogut muntar aquell directori des del servidor."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Aquell directori no sembla contenir un arbre d'instal·lació %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Argument erroni per a l'ordre del kickstart NFS %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 "S'està esperant la connexió telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "S'està executant l'anaconda mitjançant telnet..."
 
 #  Traducció "retrieve" per "descarregar" enlloc de "recuperar"
 #  Feta a posta, ja que en aquest cas s'hi escau millor.
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "No s'ha pogut descarregar %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "No s'ha pogut descarregar la imatge d'instal·lació."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Argument erroni per a l'ordre Url del mètode del kickstart %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Cal indicar l'argument --url al mètode Url del kickstart."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Mètode url %s desconegut"
 
-#: ../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 "Configureu TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Configuració de l'NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Heu d'introduir un directori."
 
-#: ../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 "Ordinador desconegut"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s no és un nom d'un ordinador central vàlid."
 
-#: ../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."
 msgstr "Si feu servir un servidor intermediari HTTP, indiqueu-ne el nom."
 
-#: ../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 "Més configuracions de l'FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "S'està carregant el controlador SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "S'està carregant el controlador %s..."
diff --git a/po/cs.po b/po/cs.po
index 0a156254a..28fc9ed80 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -50,41 +50,41 @@ msgstr "Stiskněte <Enter> pro 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"
 
@@ -563,22 +563,22 @@ msgstr "Měním velikost systému souborů na %s..."
 #: ../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 "Chyba"
 
@@ -633,8 +633,8 @@ msgstr ""
 "Stiskněte <Enter> pro ukončení instalace."
 
 #: ../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 "Vynechat"
 
@@ -966,21 +966,21 @@ msgstr "Opravit"
 
 #: ../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 "Ano"
 
 #: ../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 "Ne"
 
-#: ../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 "Znovu"
 
@@ -991,8 +991,8 @@ msgstr "Ignorovat"
 #: ../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 "Zrušit"
 
@@ -1844,21 +1844,21 @@ msgid "_Write changes to disk"
 msgstr "Za_psat změny na disk"
 
 #: ../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 "Zpět"
 
 #: ../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 "Pokračovat"
 
@@ -2284,7 +2284,7 @@ msgstr "Vložte %(instkey)s."
 msgid "Skip entering %(instkey)s"
 msgstr "Přeskočit vložení %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Vítá vás %s pro %s"
@@ -3170,7 +3170,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Výběr jazyka"
 
-#: ../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 "Jaký jazyk chcete používat během instalace?"
 
@@ -3544,7 +3544,7 @@ msgstr "V poli %s je nutné vyplnit hodnotu."
 msgid "Dynamic IP"
 msgstr "Dynamické nastavení 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 "Odesílám požadavek o informace IP pro %s..."
@@ -3715,7 +3715,7 @@ msgstr "neznámý"
 msgid "Hardware address: "
 msgstr "Hardwarová adresa: "
 
-#: ../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 "Chybějící protokol"
 
@@ -3724,7 +3724,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Musíte vybrat alespoň jeden z protokolů IPv4 nebo IPv6."
 
 #: ../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 "Neplatný prefix"
 
@@ -3957,7 +3957,7 @@ msgstr "RAID zařízení"
 msgid "None"
 msgstr "Nic"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Pevné disky"
 
@@ -4859,12 +4859,12 @@ msgstr "Prefix"
 msgid "Activate on boot"
 msgstr "Aktivovat při startu"
 
-#: ../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 "Povolit podporu IPv4"
 
-#: ../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 "Povolit podporu IPv6"
@@ -4984,7 +4984,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 "Brána:"
 
@@ -5599,22 +5599,22 @@ msgstr ""
 "Linuxu.\n"
 "* Nezískáte bezpečnostní a softwarové aktualizace dle předplatného."
 
-#: ../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 "Kontrola média"
 
-#: ../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
 msgid "Eject Disc"
 msgstr "Vysunout CD "
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5623,7 +5623,7 @@ msgstr ""
 "Zvolte \"%s\" pro test média, které je právě v mechanice nebo \"%s\" pro "
 "vysunutí média. Pak vložte další médium, které chcete otestovat."
 
-#: ../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 "
@@ -5637,7 +5637,7 @@ msgstr ""
 "doporučován. Určitě by měla být média testována před prvním použitím. Po "
 "úspěšném otestování již není vyžadováno dalsí testování před každým použitím."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5646,11 +5646,11 @@ msgstr ""
 "Nemohu nalézt médium %s v žádné jednotce. Vložte médium s distribucí %s a "
 "stiskněte tlačítko %s pro opakování."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Médium nalezeno"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5661,7 +5661,7 @@ msgstr ""
 "\n"
 "Klikněte na %s pro vynechání testu média a započetí instalace. "
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5670,7 +5670,7 @@ msgstr ""
 "Nemohu nalézt médium %s odpovídající vašemu zaváděcímu médiu. Vložte médium "
 "% s a opakujte stisknutím %s."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5679,32 +5679,32 @@ msgstr ""
 "Nemohu nalézt médium %s v žádné jednotce. Vložte médium s distribucí %s a "
 "stiskněte tlačítko %s pro opakování."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Médium  nenalezeno"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Nemohu najít soubor kickstart na 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 "Nemohu číst adresář %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Načítání"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Načítám ovladače..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Umístění ovladačů"
 
-#: ../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?"
@@ -5712,7 +5712,7 @@ msgstr ""
 "V počítači je k dispozici více zařízení, která by mohla být použita pro "
 "načtení ovladačů. Vyberte zařízení, ze kterého chcete ovladače načíst."
 
-#: ../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?"
@@ -5720,50 +5720,50 @@ msgstr ""
 "Na zařízení je více oddílů, které by mohly obsahovat obraz disku s ovladači. "
 "Který chcete použít?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Nemohu připojit oddíl."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Zvolte obraz disku s ovladači"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Zvolte soubor, který je obraz vaší disk s ovladači."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Nemohu načíst disk s ovladači ze souboru."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Vložte disk s ovladači do zařízení /dev/%s a pokračujte stisknutím \"OK\"."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Vložte disk s ovladači"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Nemohu připojit disk s ovladači."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Disk s ovladači není pro %s platný."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Zvolit ručně"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Načíst jiný 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 "
@@ -5772,38 +5772,38 @@ msgstr ""
 "Na disku s ovladači nebyla nalezena žádná zařízení potřebného typu. Chcete "
 "vybrat ovladač ručně, i přesto pokračovat, nebo načíst jiný disk s ovladači?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disk s ovladači"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Máte disk s ovladači?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Více disků s ovladači?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Chcete načíst další disky s ovladači?"
 
-#: ../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 "Chyba kickstartu"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Neznámy zdroj driver disk kickstartu: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5811,7 +5811,7 @@ msgid ""
 msgstr ""
 "Byl zadán následující neplatný argument příkazu kickstart driver disk: %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 "
@@ -5821,19 +5821,19 @@ msgstr ""
 "Zadejte parametry, které chcete předat modulu %s, oddělené mezerami. Pokud "
 "nevíte, jaké parametry zadat, stiskňete tlačítko \"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Zadejte parametry modulu"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nenalezen žádný ovladač"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Načíst disk s ovladači"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5841,7 +5841,7 @@ msgstr ""
 "Nebyly nalezeny žádné ovladače pro ruční zavedení. Chcete použít disk s "
 "ovladači?"
 
-#: ../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."
@@ -5849,26 +5849,26 @@ msgstr ""
 "Vyberte ovladač, který si přejete načíst. Pokud není uveden a máte disk s "
 "ovladači, stiskněte F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Zadejte volitelné parametry modulu"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Vyberte ovladač zařízení, který načíst"
 
-#: ../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 "Detekováno médium"
 
-#: ../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 "Detekováno místní instalační médium..."
 
-#: ../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 "
@@ -5877,7 +5877,7 @@ msgstr ""
 "Instalační strom %s v zadaném adresáři neodpovídá systému, který jste "
 "nastartovali."
 
-#: ../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."
@@ -5885,7 +5885,7 @@ msgstr ""
 "Při čtení instalačního programu z ISO obrazu došlo k chybě. Zkontrolujte ISO "
 "obrazy a zkuste spustit instalaci znovu."
 
-#: ../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?"
@@ -5893,7 +5893,7 @@ msgstr ""
 "V počítači nebyly nalezeny žádné pevné disky! Chcete nastavit další "
 "připojená zařízení?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5904,61 +5904,61 @@ msgstr ""
 "s? Pokud oddíl ani disk na seznamu nenaleznete, stiskněte klávesu F2 pro "
 "nakonfigurování dalších zařízení."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Adresář obsahující obrazy:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Výběr oddílu"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Zařízení %s zřejmě neobsahuje obrazy CD %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Chybný argument kickstart příkazu metody HD %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 "Nemohu najít soubor kickstart na pevném disku."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Nemohu najít pevný disk pro disk BIOSu %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Typ klávesnice"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Jakou mapu kláves chcete použít?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Chyba při otevírání souboru kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Chyba při čtení obsahu souboru kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Chyba v %s na řádku %d souboru kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Na výměnném médiu nemohu nalézt ks.cfg."
 
-#: ../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."
@@ -5966,52 +5966,52 @@ msgstr ""
 "Chyba při stahování kickstart souboru. Opravte umístění kickstart souboru "
 "nebo stiskněte 'Přerušit' a instalace bude dále pokračovat interaktivně."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Chyba při stahování kickstart souboru"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Chybný argument kickstart příkazu metody shutdown %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Vítá vás %s pro %s - Záchranný režim"
 
-#: ../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> další položka   |  <Mezera> vybrat   |  <F12> pokračovat "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Vyberte jazyk"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokální CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Pevný disk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS adresář"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Vítá vás %s%n pro %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Zdroj disku s aktualizací"
 
-#: ../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?"
@@ -6019,7 +6019,7 @@ msgstr ""
 "Máte více zařízení, která by mohla být použita pro disk s aktualizací. Které "
 "chcete použít?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6027,28 +6027,28 @@ msgstr ""
 "Na zařízení je více oddílů, které by mohly obsahovat obraz disku s "
 "aktualizacemi. Který chcete použít?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Vložte disk s aktualizací do /dev/%s a pokračujte stisknutím \"OK\"."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disk s aktualizací"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Nemohu připojit disk s aktualizací"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Aktualizace"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Čtu aktualizace anacondy..."
 
-#: ../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.."
@@ -6056,44 +6056,44 @@ msgstr ""
 "Nemohu stáhnout obraz s aktualizacemi. Opravte prosím umístění aktualizací "
 "níže nebo pokračujte bez aktualizací stisknutím Zrušit.."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Chyba při stahování obrazu s aktualizacemi"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Nemáte dostatek paměti RAM pro instalaci distribuce %s."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Metoda zotavení"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Metoda instalace"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Jaký druh média obsahuje disk pro zotavení?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Kde jsou umístěny balíčky, které chcete instalovat?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Žádný ovladač nebyl nalezen"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Vybrat ovladač"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Použít disk s ovladači"
 
-#: ../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?"
@@ -6101,61 +6101,61 @@ msgstr ""
 "Nemohu najít žádná zařízení, která jsou potřeba pro provedení tohoto typu "
 "instalace. Chcete vybrat ovladač ručně nebo chcete použít disk s ovladači?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Ve vašem systému byla nalezena následující zařízení."
 
-#: ../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 ""
 "Pro váš systém nebyly zavedeny žádné ovladače zařízení. Chcete nějaké zavést?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Zařízení"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Přidat zařízení"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "loader již byl spuštěn. Spouštím shell.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Spouštím anacondu %s, záchranný režim systému %s - čekejte prosím...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Spouštím anacondu %s, instalační program systému %s - čekejte prosím...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Nemohu najít instalační obraz %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Kontroluji \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Probíhá kontrola média..."
 
-#: ../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."
@@ -6163,7 +6163,7 @@ msgstr ""
 "Nemohu přečíst kontrolní součet disku z primárního deskriptoru svazku. Disk "
 "byl pravděpodobně vytvořen bez kontrolního součtu."
 
-#: ../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 "
@@ -6173,11 +6173,11 @@ msgstr ""
 "stažení nebo špatnému médiu. Je-li to třeba, očistěte médium a zkuste test "
 "znovu. Bude-li test nadále selhávat, neměli byste pokračovat v instalaci."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Úspěch"
 
-#: ../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 "
@@ -6187,7 +6187,7 @@ msgstr ""
 "by měla být bez problémů. Vemte na vědomí, že ne všechny chyby média a "
 "mechaniky musí být tímto testem detekovány."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6198,26 +6198,26 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Test kontrolních součtů"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Chybný argument kickstart příkazu metody device %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Pro příkaz kickstartu device musí být zadán název modulu."
 
-#: ../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 "Prefix musí být pro IPv4 sítě mezi 1 a 32 a pro IPv6 sítě mezi 1 a 128"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6228,28 +6228,28 @@ msgstr ""
 "po přístup k vaší bezdrátové síti. Pokud klíč není potřeba, nechte pole "
 "prázdné a instalace bude pokračovat."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Šifrovací klíč"
 
 # If you can get away with it in English...
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Bezdrátová nastavení"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP DNS serveru"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Chybí DNS server"
 
-#: ../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 "
@@ -6258,56 +6258,56 @@ msgstr ""
 "Odpověď na žádost o přidělení IP adresy neobsahuje jméno DNS serveru. Pokud "
 "adresu neznáte, ponechte políčko prázdné a instalace bude pokračovat."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Chybná IP informace"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Vložili jste chybnou IP adresu."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: ../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 "Došlo k chybě v průběhu konfigurování vašeho síťového rozhraní"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Nastavení TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Musíte vybrat alespoň jeden z protokolů (IPv4 nebo IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "Pro NFS je potřeba IPv4"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS instalace vyžaduje podporu IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 adresa:"
 
-#: ../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 adresa:"
 
-#: ../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 "
@@ -6317,176 +6317,176 @@ msgstr ""
 "můžete zadat masku ve formátu čtyř čísel oddělených tečkami nebo použít CIDR-"
 "styl. Brána a adresy DNS serverů musí být platné IPv4 nebo IPv6 adresy."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ruční konfigurace TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Chybějící informace"
 
-#: ../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 "Musíte zadat platnou IPv4 adresu a masku sítě nebo CIDR prefix."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Musíte zadat platnou IPv6 adresu a platný CIDR prefix."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Zjišťuji jméno počítače a doménu..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Chybný argument Kickstart příkazu network %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Chybný zaváděcí protokol %s v příkazu network"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Síťové zařízení"
 
-#: ../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 ""
 "V počítači je více síťových zařízení. Pomocí kterého chcete instalovat?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Jméno NFS serveru:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Adresář %s:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Prosím vložte jméno serveru a cestu k obrazu %s."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS instalace"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Zadáno jméno počítače s nekonfigurovaným DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Načítání"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Uvedený adresář nelze připojit."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Uvedený adresář zřejmě neobsahuje instalační strom %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Chybný argument Kickstart příkazu metody NFS %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 "Čekám na telnetové spojení..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Spouštím Anacondu přes telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Nemohu přenést %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Nemohu přenést instalační obraz."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Chybný argument Kickstart příkazu metody Url %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Kickstart metodě Url musíte zadat argument --url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Neznámá metoda v 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 "Zadejte prosím URL, které na vašem server obsahuje obraz %s."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Nastavit proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Nastavení URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Musíte zadat URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL musí být buď typu ftp nebo http"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Neznámý počítač"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s není platné jméno počítače."
 
-#: ../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."
 msgstr "Jestliže používáte HTTP proxy server, zadejte jeho jméno."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Název proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Port proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Další nastavení"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Zavádím SCSI ovladač"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Zavádím ovladač %s ..."
diff --git a/po/cy.po b/po/cy.po
index aaaac8095..71964f4d7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -46,41 +46,41 @@ msgstr "Pwyswch <enter> i gael plisgyn"
 #: ../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 "Iawn"
 
@@ -580,22 +580,22 @@ msgstr "Gwall wrth osod y system ffeil ar %s: %s"
 #: ../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 "Gwall"
 
@@ -651,8 +651,8 @@ msgstr ""
 "Gwasgwch <Enter> i ailgychwyn eich 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 "Hepgor"
 
@@ -992,21 +992,21 @@ msgstr "Trwsio"
 
 #: ../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 "Ie"
 
 #: ../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 "Nage"
 
-#: ../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 "Ail-geisio"
 
@@ -1017,8 +1017,8 @@ msgstr "Anwybyddu"
 #: ../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 "Diddymu"
 
@@ -1881,21 +1881,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 "Yn Ôl"
 
 #: ../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 "Parhau"
 
@@ -2327,7 +2327,7 @@ msgstr "Rhowch enw grŵp cyfrolau."
 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 "Croeso i %s"
@@ -3228,7 +3228,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Dewis Iaith"
 
-#: ../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 "Pa iaith hoffech ei defnyddio yn ystod y broses arsefydlu?"
 
@@ -3612,7 +3612,7 @@ msgstr "Mae gofyn am werth i'r maes \"%s\"."
 msgid "Dynamic IP"
 msgstr "IP Dynamig"
 
-#: ../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 "Yn anfon cais am wybodaeth IP ar gyfer %s..."
@@ -3791,7 +3791,7 @@ msgstr "Anhysbys"
 msgid "Hardware address: "
 msgstr "Cyfeiriad caledwedd:"
 
-#: ../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 "Protocol ar Goll"
 
@@ -3801,7 +3801,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Rhaid i chi ddewis un protocol o leiaf (IPv4 neu IPv6) ar gyfer DHCP."
 
 #: ../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 ""
 
@@ -4035,7 +4035,7 @@ msgstr "Dyfeisiau RAID"
 msgid "None"
 msgstr "Dim un"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Gyriannau Caled"
 
@@ -4960,12 +4960,12 @@ msgstr "Masg IPv6/Rhwyd"
 msgid "Activate on boot"
 msgstr "Gweithredoli ar gychwyn"
 
-#: ../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 "Galluogi cynnal IPv4"
 
-#: ../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 "Galluogi cynnal IPv6"
@@ -5094,7 +5094,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 "Porth:"
 
@@ -5716,23 +5716,23 @@ 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 "Gwirio Cyfrwng"
 
-#: ../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 "Profi"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Allyrru CDd"
 
-#: ../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 "
@@ -5741,7 +5741,7 @@ msgstr ""
 "Dewiswch \"%s\" i brofi'r CDd sydd yn y gyriant yn gyfredol, neu \"%s\" i "
 "allyrru'r CDd a mewnosod un arall i'w phrofi."
 
-#: ../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 "
@@ -5755,7 +5755,7 @@ msgstr ""
 "Fe ddylid, o leiaf, brofi'r CDau cyn eu defnyddio am y tro cyntaf. Wedi eu "
 "profi'n llwyddiannus, does dim rhaid  profi bob CD cyn ei ddefnyddio eto."
 
-#: ../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 "
@@ -5764,12 +5764,12 @@ msgstr ""
 "Ni chanfuwyd yr CDd %s yn unrhyw un o'ch gyriannau CDdROM. Rhowch y CDd %s i "
 "mewn a gwasgwch %s i ail-geisio."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Canfuwyd CDd"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5780,7 +5780,7 @@ msgstr ""
 "\n"
 "Dewiswch %s i hepgor y prawf cyfryngau a dechrau'r arsefydliad."
 
-#: ../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 "
@@ -5789,7 +5789,7 @@ msgstr ""
 "Ni chanfuwyd CDd %s sy'n cydweddu â'ch cyfrwng cychwyn.  Rhowch y CDd %s i "
 "mewn a gwasgwch %s i ail-geisio."
 
-#: ../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 "
@@ -5798,33 +5798,33 @@ msgstr ""
 "Ni chanfuwyd yr CDd %s yn unrhyw un o'ch gyriannau CDdROM. Rhowch y CDd %s i "
 "mewn a gwasgwch %s i ail-geisio."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Ni Chanfuwyd CDd"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Methu canfod ffeil kickstart ar yr CDdROM."
 
-#: ../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 "Methwyd darllen cyfeiriadur %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Yn Llwytho"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Yn Darllen disg yrrydd..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Tarddiad Disg Gyrrydd"
 
-#: ../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?"
@@ -5832,7 +5832,7 @@ msgstr ""
 "Mae gennych sawl dyfais a allai fod yn darddiad disg gyrrydd.  Pa un hoffech "
 "ei defnyddio?"
 
-#: ../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?"
@@ -5840,49 +5840,49 @@ msgstr ""
 "Mae gennych sawl rhaniad a allai fod yn darddiad delwedd disg gyrrydd.  Pa "
 "un hoffech ei defnyddio?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Methwyd gosod rhaniad."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Dewiswch ddelwedd disg gyrrydd"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Dewiswch pa ffeil yw'r eich delwedd disg gyrrydd."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Methwyd gosod disg gyrrydd o'r ffeil."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Rhowch eich disg gyrrydd yn /dev/%s a gwasgwch \"Iawn\" i barhau."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Rhowch Ddisg Gyrrydd i Mewn"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Methwyd gosod disg gyrrydd."
 
-#: ../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 "Dewiswch â llaw"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Llwytho disg arall"
 
-#: ../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 "
@@ -5891,38 +5891,38 @@ msgstr ""
 "Ni chanfuwyd dyfeisiau o'r math addas ar y ddisg yrrydd yma. A hoffech "
 "ddewis y gyrrydd â llaw, parhau beth bynnag, neu lwytho disg yrrydd arall?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disg gyrrydd"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "A oes gennych ddisg gyrrydd?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Rhagor o Ddisgiau Gyrrydd?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "A hoffech lwytho rhagor o ddisgiau gyrrydd?"
 
-#: ../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 "Gwall Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Tarddiad kickstart disg gyrrydd anhysbys: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5931,7 +5931,7 @@ msgstr ""
 "Penodwyd yr ymresymiad annilys canlynol ar gyfer y gorchymyn disg gyrrydd: %"
 "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 "
@@ -5942,19 +5942,19 @@ msgstr ""
 "fylchau. Os nad ydych chi'n gwybod pa baramedrau i'w rhoi, ewch heibio'r "
 "sgrin hon gan bwyso'r botwm \"Iawn\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Rhowch Baramedrau Modwl"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ni chanfuwyd unrhyw yrrydd"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Llwytho disg gyrrydd"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5962,7 +5962,7 @@ msgstr ""
 "Ni chanfuwyd unrhyw yrrydd i'w fewnosod â llaw.  A hoffech ddefnyddio disg "
 "gyrrydd?"
 
-#: ../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."
@@ -5970,26 +5970,26 @@ msgstr ""
 "Dewiswch y gyrrydd isod yr hoffech ei lwytho.  Os nad yw'n ymddangos, a bod "
 "gennych ddisg gyrrydd, gwasgwch F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Penodwch ymresymiadau modwl dewisol"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Dewiswch Yrrydd Dyfais i'w Lwytho"
 
-#: ../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 "Canfyddwyd Cyfrwng"
 
-#: ../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 "Canfyddwyd cyfrwng arsefydlu lleol..."
 
-#: ../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 "
@@ -5998,7 +5998,7 @@ msgstr ""
 "Nid yw'r goeden arsefydlu %s yn y cyfeiriadur yna i weld yn cydweddu'ch "
 "cyfrwng cychwyn."
 
-#: ../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."
@@ -6006,7 +6006,7 @@ msgstr ""
 "Digwyddodd gwall wrth ddarllen yr arsefydliad o'r delweddau ISO. Gwiriwch "
 "eich delweddau ISO a cheisiwch eto."
 
-#: ../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?"
@@ -6014,7 +6014,7 @@ msgstr ""
 "Nid oes i weld fod gennych unrhyw ddisgiau caled ar eich system! A hoffech "
 "gyflunio dyfeisiau ychwanegol?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6025,116 +6025,116 @@ msgstr ""
 "ar gyfer %s? Os nad ydych yn gweld y gyriant disgiau rydych yn ei ddefnyddio "
 "wedi'i rhestru yma, gwasgwch F2 i gyflunio dyfeisiau ychwanegol."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Cyfeiriadur sy'n dal delweddau:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Dewiswch Raniad"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Nid yw'r ddyfais %s i weld yn cynnwys delweddau CDdROM %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Ymresymiad gwael i orchymyn dull kickstartd DG %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 "Methu canfod ffeil kickstart ar ddisg galed."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Methu darganfod pa ddisg caled yw'r disg BIOS %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Math Bysellfwrdd"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Pa fath o fysellfwrdd sydd gennych?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Gwall wrth agor y ffeil kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Gwall wrth ddarllen cynnwys y ffeil kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Gwall yn %s ar linell %d o'r ffeil kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Methu canfod ks.cfg ar y ddisg feddal gychwyn."
 
-#: ../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 "Gwall wrth agor y ffeil kickstart %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Ymresymiad gwael i orchymyn dull kickstartd %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Croeso i %s - Modd Achub"
 
-#: ../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>/<Eil-Tab> rhwng elfennau  | <Gofodnod> i ddewis | <F12> sgrin nesaf "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Dewiswch Iaith"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "CDdROM Lleol"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disg galed"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "Cyfeiriadur %s:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Croeso i %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Tarddiad Disg Ddiweddaru"
 
-#: ../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?"
@@ -6142,7 +6142,7 @@ msgstr ""
 "Mae gennych sawl dyfais a allai fod yn darddiad disg ddiweddaru.  Pa un "
 "hoffech ei defnyddio?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6151,72 +6151,72 @@ msgstr ""
 "Mae gennych sawl rhaniad a allai fod yn darddiad delwedd disg gyrrydd.  Pa "
 "un hoffech ei defnyddio?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Rhowch eich disg ddiweddaru yn /dev/%s a gwasgwch \"Iawn\" i barhau."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disg Ddiweddariadau"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Methwyd gosod disg ddiweddariadau"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Diweddariadau"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Yn darllen diweddariadau 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 "Gwall wrth agor y ffeil kickstart %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 "Nid oes gennych ddigon o RAM i arsefydlu %s ar y peiriant yma."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Dull Achub"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Dull Arsefydlu"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Pa fath o gyfrwng sy'n cynnwys y ddelwedd achub?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Pa fath o gyfrwng sy'n cynnwys y pecynnau i'w harsefydlu?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Dim gyrrydd wedi'i ganfod"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Dewiswch yrrydd"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Defnyddio disg yrrydd"
 
-#: ../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?"
@@ -6225,11 +6225,11 @@ msgstr ""
 "arsefydliad. A hoffech ddewis eich gyrrydd â llaw, neu ddefnyddio disg "
 "yrrydd?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Canfuwyd y dyfeisiau canlynol ar eich 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?"
@@ -6237,49 +6237,49 @@ msgstr ""
 "Ni lwythwyd unrhyw yrwyr dyfeisiau ar gyfer eich system. A hoffech lwytho "
 "rhai nawr?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Dyfeisiau"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Wedi gorffen"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Ychwanegu Dyfais"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "rhedwyd y llwythwr eisioes.  Yn dechrau plisgyn.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Yn rhedeg anaconda, y modd achub %s - arhoswch...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Yn rhedeg anaconda, yr arsefydlydd system %s - arhoswch...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Methu canfod delwedd arsefydlu %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Yn gwirio \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Yn gwirio cyfrwng nawr..."
 
-#: ../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."
@@ -6287,7 +6287,7 @@ msgstr ""
 "Methu darllen y prawfswm disg o'r disgrifydd cyfrol cynradd.  Mae'n debyg "
 "golyga hyn fod y ddisg wedi'i chreu heb adio'r prawfswm."
 
-#: ../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 "
@@ -6298,18 +6298,18 @@ msgstr ""
 "ddisg a cheisiwch eto.  Os yw'r prawf hwn yn parhau i fethu, ni ddylech "
 "barhau â'r arsefydliad."
 
-#: ../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"
@@ -6320,29 +6320,29 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Prawf Prawfswm"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Ymresymiad gwael i orchymyn dull kickstart dyfais %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Penodwyd yr ymresymiad annilys canlynol ar gyfer y gorchymyn disg gyrrydd: %"
 "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 "
@@ -6353,28 +6353,28 @@ msgstr ""
 "gyrchu eich rhwydwaith diwifr. Os nad oes rhaid defnyddio allwedd, gadewch y "
 "maes yn wag a pharhau'r â'r gosod."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Allwedd Amgryptio"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Gosodiadau Diwifr"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP Gweinydd Enwau"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Gweinydd Enwau"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6386,104 +6386,104 @@ msgstr ""
 "rhowch ef nawr. Os nad oes gennych y wybodaeth hon, gallwch adael y maes hwn "
 "yn wag ac fe fydd yr arsefydliad yn parhau."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Gwybodaeth IP Annilys"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Fe roddoch gyfeiriad IP annilys."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Gwall Rhwydwaith"
 
-#: ../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 "Roedd gwall wrth gyflunio eich rhyngwyneb rhwydwaith."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Cyflunio TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Rhaid i chi ddewis un protocol o leiaf (IPv4 neu IPv6) ar gyfer DHCP."
 
-#: ../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
 msgid "IPv4 address:"
 msgstr "Cyfeiriad IPv4:"
 
-#: ../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 "Cyfeiriad IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Gweinydd Enwau:"
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "Cyflunio TCP/IP â llaw"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Gwybodaeth ar Goll"
 
-#: ../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 ""
 "Rhaid i chi roi cyfeiriad IPv4 dilys yn ogystal â masg rhwydwaith, neu "
 "ragddodiad CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 "Rhaid i chi roi cyfeiriad IPv4 dilys yn ogystal â masg rhwydwaith, neu "
 "ragddodiad CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Yn pennu enw gwesteiwr a pharth..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Ymresymiad gwael i orchymyn rhwydwaith kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Protocol cychwyn gwael %s wedi'i benodi mewn gorchymyn rhwydwaith"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Dyfais Rwydweithio"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6491,115 +6491,115 @@ msgstr ""
 "Mae gennych sawl dyfais rwydweithio ar y system yma. Pa un hoffech chi "
 "arsefydlu drwyddi?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Enw gweinydd NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Cyfeiriadur %s:"
 
-#: ../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 "Gosod NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Enw gwesteiwr wedi ei roi, ond DNS heb ei gyflunio"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Yn nôl"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Nid oedd modd gosod y cyfeiriadur yna o'r gweinydd."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Nid yw'r cyfeiriadur i weld yn cynnwys coeden arsefydliad %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Ymresymiad gwael i orchymyn dull kickstart NFS %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 "Yn aros am gysylltiad telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Yn rhedeg anaconda drwy telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Methu nôl %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Methu nôl y ddelwedd arsefydlu."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Ymresymiad gwael i orchymyn dull kickstart Url %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Rhaid darparu ymresymiad --url i ddull kickstart Url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Dull Url anhysbys %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, fuzzy, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Rhowch allwedd osod eich fersiwn o %s."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "Cyflunio %s"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Gosod NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Rhaid i chi roi cyfeiriadur."
 
-#: ../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 "Gwesteiwr Anhysbys"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "Nid yw %s yn enw gwesteiwr dilys."
 
-#: ../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."
@@ -6607,24 +6607,24 @@ msgstr ""
 "Os ydych yn defnyddio gweinydd dirprwy HTTP rhowch enw'r gweinydd dirprwy "
 "HTTP i'w ddefnyddio."
 
-#: ../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 "Cyfluniad Pellach FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Yn llwytho gyrrydd SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Yn llwytho gyrrydd %s..."
diff --git a/po/da.po b/po/da.po
index 94cfbba3d..fba6ebcd2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -52,41 +52,41 @@ msgstr "Tryk <enter> for at få en skál"
 #: ../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 "O.k."
 
@@ -588,22 +588,22 @@ msgstr "Formaterer %s-filsystem..."
 #: ../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 "Fejl"
 
@@ -660,8 +660,8 @@ msgstr ""
 "Tryk <Enter> for at starte systemet igen."
 
 #: ../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 "Overspring"
 
@@ -998,21 +998,21 @@ msgstr "Reparér"
 
 #: ../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 "Ja"
 
 #: ../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 "Nej"
 
-#: ../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 "Prøv igen"
 
@@ -1023,8 +1023,8 @@ msgstr "Ignorér"
 #: ../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 "Annullér"
 
@@ -1895,21 +1895,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 "Tilbage"
 
 #: ../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 "Fortsæt"
 
@@ -2343,7 +2343,7 @@ msgstr "Angiv din %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Overspring indtastning af %(instkey)r"
 
-#: ../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 "Velkommen til %s"
@@ -3223,7 +3223,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Sprogvalg"
 
-#: ../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 "Hvilket sprog ønsker du at benytte under installationsprocessen?"
 
@@ -3602,7 +3602,7 @@ msgstr "En værdi kræves for feltet %s."
 msgid "Dynamic IP"
 msgstr "Dynamisk 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 "Sender forespørgsel efter IP-information for %s..."
@@ -3776,7 +3776,7 @@ msgstr "ukendt"
 msgid "Hardware address: "
 msgstr "Maskinel-adresse: "
 
-#: ../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 "Manglende protokol"
 
@@ -3785,7 +3785,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Du skal vælge mindst IPv4 eller IPv6 understøttelse."
 
 #: ../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 "Ugyldigt præfiks"
 
@@ -4018,7 +4018,7 @@ msgstr "RAID-enheder"
 msgid "None"
 msgstr "Ingenting"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Diskdrev"
 
@@ -4932,12 +4932,12 @@ msgstr "Præfiks"
 msgid "Activate on boot"
 msgstr "Aktivér ved opstart"
 
-#: ../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 "Aktivér IPv4 understøttelse"
 
-#: ../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 "Aktivér IPv6 understøttelse"
@@ -5057,7 +5057,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:"
 
@@ -5680,23 +5680,23 @@ msgstr ""
 "* Du vil ikke få programmel- og sikkerheds-opdateringer for pakker der ikke "
 "er indeholdt i dit abonnement."
 
-#: ../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 "Tjek af medie"
 
-#: ../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 "Skub cd ud"
 
-#: ../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 "
@@ -5705,7 +5705,7 @@ msgstr ""
 "Vælg \"%s\" for at afprøve den cd der sidder i drevet, eller \"%s\" for at "
 "skubbe cd-en ud og isætte en anden til afprøvning."
 
-#: ../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 "
@@ -5720,7 +5720,7 @@ msgstr ""
 "blevet testet med succes, er det ikke nødvendigt at teste hver cd igen for "
 "at bruge dem igen."
 
-#: ../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 "
@@ -5729,12 +5729,12 @@ msgstr ""
 "Jeg kunne ikke finde en %s-cd-rom i nogen af dine cdrom-drev. Indsæt %s-"
 "cd'en og tryk på %s for at prøve igen."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Cd fundet"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5745,7 +5745,7 @@ msgstr ""
 " \n"
 "Vælg %s for at overspringe afprøvning af media og starte installationen."
 
-#: ../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 "
@@ -5754,7 +5754,7 @@ msgstr ""
 "Ingen cd-skive med %s kunne findes som stemmer overens med dit startmedium. "
 "Indsæt cd-skiven med %s og tryk %s for at forsøge igen."
 
-#: ../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 "
@@ -5763,33 +5763,33 @@ msgstr ""
 "Jeg kunne ikke finde en %s-cd-rom i nogen af dine cdrom-drev. Indsæt %s-"
 "cd'en og tryk på %s for at prøve igen."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Cd ikke fundet"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Kan ikke finde kickstartfil på 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 "Kunne ikke læse katalog %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Indlæser"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Læser driverdiskette."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Kilde for driverdiskette"
 
-#: ../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?"
@@ -5797,7 +5797,7 @@ msgstr ""
 "Du har flere enheder som kan tjene som kilder for en driverdiskette. Hvilken "
 "vil du bruge?"
 
-#: ../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?"
@@ -5805,49 +5805,49 @@ msgstr ""
 "Der er flere diskafsnit på denne enhed som kan indeholde driver-disk-"
 "billedet. Hvilket vil du bruge?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Kunne ikke montere diskafsnittet"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Vælg driver-disk-billede"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Vælg filen der er dit driver-disk-billede."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Kunne ikke indlæse driverdisk fra fil."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Indsæt din driverdiskette i /dev/%s og tryk \"O.k.\" for at fortsætte."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Indsæt driverdiskette"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Kunne ikke montere driverdiskette."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Driverrutinedisketten er ugyldig for denne udgave af %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Vælg manuelt"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Indlæs en anden diskette"
 
-#: ../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 "
@@ -5857,38 +5857,38 @@ msgstr ""
 "driveren manuelt, fortsætte alligevel, eller indlæse en anden "
 "driversdiskette?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Driverdiskette"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "har du en drivrutinediskette?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Flere driverdisketter?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Vil du indlæse flere drivrutinedisketter?"
 
-#: ../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 "Kickstartsfejl"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Ukendt kickstartkilde for drivrutinediskette: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5897,7 +5897,7 @@ msgstr ""
 "Det følgende ugyldige argument blev angivet til kickstartkommandoen for "
 "drivrutinediskette: %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 "
@@ -5908,19 +5908,19 @@ msgstr ""
 "blanktegn. Hvis du ikke véd hvilke parametre du bør angive kan du "
 "overspringe denne skærm ved at trykke på knappen \"O.k.\". "
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Indtast modulparametre"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ingen drivere fundet"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Indlæs driverdiskette?"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5928,7 +5928,7 @@ msgstr ""
 "Ingen drivrutiner som kan indsættes manuelt kunne findes. Vil du bruge en "
 "drivrutinediskette?"
 
-#: ../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."
@@ -5936,26 +5936,26 @@ msgstr ""
 "Vælg den drivrutine nedenfor som du vil indlæse. Hvis den ikke findes i "
 "denne liste og du har en driverdiskette, tryk F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Angiv valfrie modulparametre"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Vælg enhedsdrivrutine at indlæse"
 
-#: ../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 "Medie fundet"
 
-#: ../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 "Lokalt installationsmedie fundet..."
 
-#: ../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 "
@@ -5964,7 +5964,7 @@ msgstr ""
 "%s-installationstræet i det katalog ser ikke ud til at stemme overens med "
 "dit startmedium."
 
-#: ../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."
@@ -5972,7 +5972,7 @@ msgstr ""
 "En fejl skete ved læsning af installation fra ISO-billederne, Kontrollér "
 "venligst dine ISO-billeder og prøv igen."
 
-#: ../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?"
@@ -5980,7 +5980,7 @@ msgstr ""
 "Du ser ikke ud til at have nogen harddiske på dit system! Vil du gerne "
 "konfigurere yderligere enheder?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5991,62 +5991,62 @@ msgstr ""
 "billederne i iso9660-format for %s? Hvis du ikke kan se det diskdrev du "
 "bruger her, så tryk på F2 for at konfigurere yderligere enheder."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Katalog indeholdende Red Hat:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Vælg partition"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Enheden %s ser ikke ud til at indeholde et %s cdrom-aftryk."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Fejlagtigt argument til HD-kickstartmetodekommandoen %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 "Kan ikke finde kickstartfil på disken."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Kan ikke finde harddisk for BIOS disk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tastaturtype"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Hvilken slags tastatur har du?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Fejl ved åbning af kickstartsfil %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Fejl ved læsning af indhold af kickstartsfil %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Fejl i %s på linje %d i kickstartsfilen %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Kan ikke finde ks.cfg på opstartsdiskette."
 
-#: ../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."
@@ -6054,53 +6054,53 @@ msgstr ""
 "Kunne ikke hente kickstart-filen. Ændr kickstart-parameteren nedenfor eller "
 "tryk Afbryd for at fortsætte som en interaktiv installation."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Fejl ved hentning af kickstartsfil"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Fejlagtigt argument til nedluknings-kickstartmetodekommandoen %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Velkommen til %s - redningstilstand"
 
-#: ../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> imellem elementer | <Mellemrum> vælg | <F12> næste side "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Vælg et sprog"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Lokal cd-rom"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Harddisk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS-katalog"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Velkommen til %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Kilde for opdateringsdiskette"
 
-#: ../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?"
@@ -6108,7 +6108,7 @@ msgstr ""
 "Du har flere enheder som kan tjene som kilder for en opdateringsdiskette. "
 "Hvilken vil du bruge?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6117,29 +6117,29 @@ msgstr ""
 "Der er flere diskafsnit på denne enhed som kan indeholde driver-disk-"
 "billedet. Hvilket vil du bruge?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Indsæt din opdateringsdiskette i /dev/%s og tryk \"O.k.\" for at fortsætte."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Opdateringsdiskette"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Kunne ikke montere opdateringsdiskette"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Opdateringer"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Læser anaconda-opdateringer..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6148,45 +6148,45 @@ msgstr ""
 "Kunne ikke hente kickstart-filen. Ændr kickstart-parameteren nedenfor eller "
 "tryk Afbryd for at fortsætte som en interaktiv installation."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Fejl ved hentning af kickstartsfil"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Du har ikke RAM nok til at installere %s på denne maskine."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Redningsmetode"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installationsmetode"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Hvilken type medium befinder rednings-billedet sig på?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Hvilken type medium befinder pakkerne, som skal installeres, sig på?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ingen driver fundet"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Vælg driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Brug en driverdiskette?"
 
-#: ../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?"
@@ -6195,11 +6195,11 @@ msgstr ""
 "installationstype. Vil du vælge din drivrutine manuelt eller bruge en "
 "driverdiskette?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "De følgende enheder er blevet fundet på dit 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?"
@@ -6207,49 +6207,49 @@ msgstr ""
 "Der er ikke indlæst nogle enhedsdrivere for dit system. Vil du gerne have "
 "nogle indlæst nu?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Enheder"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Færdig"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Tilføj enhed"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "indlæseren har allerede været kørt. Starter skal.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Kører anaconda i %s-redningstilstand - vent venligst...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Kører anaconda, %s-systeminstalleringen - vent venligst...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Kunne ikke installere det første installeringsbillede %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Tjekker \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Tjekker medie nu..."
 
-#: ../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."
@@ -6257,7 +6257,7 @@ msgstr ""
 "Kan ikke læse tjeksummen for disken for beskrivelsen af den første disk. "
 "Dette betyder nok at disken blev lavet uden at tilføje tjeksummen."
 
-#: ../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 "
@@ -6268,18 +6268,18 @@ msgstr ""
 "forsøg igen. Hvis denne test fortsætter med at mislykkes bør du ikke "
 "fortsætte installationen."
 
-#: ../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"
@@ -6290,21 +6290,21 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Test af tjeksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Fejlagtigt argument til enhedskickstartmetodekommandoen %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Både modultype og -navn skal angives til kickstartenheds-kommandoen."
 
-#: ../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"
@@ -6312,7 +6312,7 @@ msgstr ""
 "Præfiks skal være mellem 1 og 32 for IPv4-netværk eller mellem 1 og 128 for "
 "IPv6-netværk"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6324,27 +6324,27 @@ msgstr ""
 "Hvis der ikke er brug for nogen krypteringsnøgle, lad da dette felt være "
 "tomt og installeringen vil fortsætte."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Krypteringsnøgle"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Trådløs-opsætning"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Navneserver-IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Mangler navneserver"
 
-#: ../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 "
@@ -6355,56 +6355,56 @@ msgstr ""
 "information kan du lade dette felt være blankt, og installationen vil "
 "fortsætte."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ugyldig IP-information"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Du skrev en ugyldig IP-adresse."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: ../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 "Et fejl skete ved konfigurering af netværksgrænsesnittet."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfigurér TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Du skal vælge mindst en protokol (IPv4 eller IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 behøves for NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS-installationsmetode kræver IPv4-understøttelse."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4-adresse:"
 
-#: ../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-adresse:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Navneserver:"
 
-#: ../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 "
@@ -6415,44 +6415,44 @@ msgstr ""
 "accepteret. Gateway- og navneserver-felterne skal være gyldige IPv4 eller "
 "IPv6-adresser."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Manuel TCP/IP-konfiguration"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Manglende 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 ""
 "Du skal indtaste både en gyldig IPv4-adresse og en netmaske eller et CIDR-"
 "præfiks."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Du skal indtaste både en gyldig IPv6-adresse og et CIDR-præfiks."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Afgør værtsnavn og domæne..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Ugyldigt argument til 'kickstart' netværkskommando %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Ugyldig bootproto %s angivet i netværkskommando"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Netværksenhed"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6460,139 +6460,139 @@ msgstr ""
 "Du har flere netværksenheder på dette system. Hvilken vil du gerne bruge til "
 "at installere fra?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS-server navn:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s-katalog:"
 
-#: ../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-opsætning"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Værtsnavn angivet med ingen DNS konfigureret"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Dette katalog kunne ikke monteres fra serveren."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Det katalog ser ikke ud til at indeholde et %s installationstræ."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Fejlagtigt argument til NFS-kickstartmetodekommandoen %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 "Venter på telnet-forbindelse..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Kører anaconda via telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Kunne ikke hente %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Kunne ikke hente installationsbilledet."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Ugyldigt argument til URL 'kickstart' metodekommando %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Skal angive et --url-argument til Url-kickstartmetoden."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Ukendt Url-metode %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 "Konfigurér TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS-opsætning"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Du skal indtaste et katalog."
 
-#: ../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 "Ukendt vært"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s er ikke et gyldigt værtsnavn."
 
-#: ../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."
 msgstr ""
 "Hvis du bruger en HTTP-proxy så indtast navnet på den proxy, du vil benytte."
 
-#: ../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 "Yderligere FTP-opsætning"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Indlæser SCSI-driver"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Indlæser %s driver..."
diff --git a/po/de.po b/po/de.po
index fd1726779..4634e1a77 100644
--- a/po/de.po
+++ b/po/de.po
@@ -64,41 +64,41 @@ msgstr "Drücken Sie <Enter>, um eine Shell zu erhalten"
 #: ../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"
 
@@ -590,22 +590,22 @@ msgstr "Größenänderung des Dateisystem auf %s..."
 #: ../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 "Fehler"
 
@@ -661,8 +661,8 @@ msgstr ""
 "Drücken Sie <Enter>, um den Installer zu beenden."
 
 #: ../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 "Überspringen"
 
@@ -1004,21 +1004,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 "Ja"
 
 #: ../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 "Nein"
 
-#: ../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 "Wiederholen"
 
@@ -1029,8 +1029,8 @@ msgstr "Übergehen"
 #: ../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 "Abbrechen"
 
@@ -1912,21 +1912,21 @@ msgid "_Write changes to disk"
 msgstr "_Schreibe Änderungen auf Festplatte"
 
 #: ../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 "Zurück"
 
 #: ../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 "Weiter"
 
@@ -2371,7 +2371,7 @@ msgstr "Bitte geben Sie Ihre %(instkey)s ein"
 msgid "Skip entering %(instkey)s"
 msgstr "Eingabe von %(instkey)s überspringen"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Willkommen bei %s für %s"
@@ -3283,7 +3283,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Sprache auswählen"
 
-#: ../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 "Welche Sprache möchten Sie während des Installationsvorgangs verwenden?"
 
@@ -3679,7 +3679,7 @@ msgstr "Das Feld %s erfordert einen Wert."
 msgid "Dynamic IP"
 msgstr "Dynamische 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 "Sende Anforderung für IP-Informationen für %s ..."
@@ -3851,7 +3851,7 @@ msgstr "Unbekannt"
 msgid "Hardware address: "
 msgstr "Hardwareadresse: "
 
-#: ../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 "Fehlendes Protokoll"
 
@@ -3860,7 +3860,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Sie müssen mindestens IPv4- oder IPv6-Unterstützung auswählen."
 
 #: ../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 "Ungültiges Präfix"
 
@@ -4097,7 +4097,7 @@ msgstr "RAID-Geräte"
 msgid "None"
 msgstr "Keine"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Festplatten"
 
@@ -5019,12 +5019,12 @@ msgstr "Präfix"
 msgid "Activate on boot"
 msgstr "Beim Starten aktivieren"
 
-#: ../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 "IPv4-Unterstützung aktivieren"
 
-#: ../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 "IPv6-Unterstützung aktivieren"
@@ -5145,7 +5145,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:"
 
@@ -5772,22 +5772,22 @@ msgstr ""
 "* Bekommen Sie keine Software- und Sicherheits-Updates für Pakete ausserhalb "
 "Ihres Abonnements."
 
-#: ../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 "Medien-Funktionstest"
 
-#: ../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
 msgid "Eject Disc"
 msgstr "Datenträger auswerfen"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5797,7 +5797,7 @@ msgstr ""
 "Laufwerk befindet oder \"%s\", um den Datenträger auszuwerfen und einen "
 "anderen zu testen."
 
-#: ../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 "
@@ -5813,7 +5813,7 @@ msgstr ""
 "erfolgreichem Test ist es nicht notwendig, sie vor einer wiederholten "
 "Verwendung erneut zu überprüfen."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5822,11 +5822,11 @@ msgstr ""
 "Der Datenträger %s wurde in keinem Ihrer Laufwerke gefunden. Bitte legen Sie "
 "den Datenträger %s ein und drücken %s für einen erneuten Versuch."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Datenträger gefunden"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5838,7 +5838,7 @@ msgstr ""
 "Um den Test der Medien zu überspringen und die Installation zu starten, "
 "drücken Sie %s."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5848,7 +5848,7 @@ msgstr ""
 "Bitte legen Sie den Datenträger %s ein und drücken Sie %s, um es erneut zu "
 "versuchen."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5857,32 +5857,32 @@ msgstr ""
 "Der Datenträger %s wurde in keinem Ihrer Laufwerke gefunden. Bitte legen Sie "
 "den Datenträger %s ein und drücken %s für einen erneuten Versuch."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Datenträger nicht gefunden"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Kann die Kickstart-Datei nicht auf der CD-ROM finden."
 
-#: ../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 "Verzeichnis %s konnte nicht gelesen werden: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Laden"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Treiberdiskette wird gelesen ..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Quelle für die Treiberdiskette"
 
-#: ../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?"
@@ -5890,7 +5890,7 @@ msgstr ""
 "Sie verfügen über mehrere Geräte, welche als Quelle für eine Treiberdiskette "
 "dienen könnten. Welches Gerät möchten Sie verwenden?"
 
-#: ../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?"
@@ -5898,51 +5898,51 @@ msgstr ""
 "Dieses Gerät enthält mehrere Partitionen, die das Abbild der Treiberdiskette "
 "enthalten könnten. Welche möchten Sie verwenden?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Fehler beim Einhängen der Partition."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Wählen Sie das Abbild der Treiberdiskette"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Wählen Sie die Datei mit dem Abbild Ihrer Treiberdiskette."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Fehler beim Laden der Treiberdiskette aus der Datei."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Legen Sie Ihre Treiberdiskette in /dev/%s ein und drücken Sie auf \"OK\", um "
 "fortzufahren."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Legen Sie die Treiberdiskette ein"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Treiberdiskette konnte nicht eingebunden werden."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Treiberdiskette ist ungültig für das Release von %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Wählen Sie manuell aus"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Laden Sie eine andere Diskette"
 
-#: ../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 "
@@ -5952,38 +5952,38 @@ msgstr ""
 "Möchten Sie einen Treiber manuell auswählen, trotzdem fortfahren, oder eine "
 "andere Treiberdiskette laden?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Treiberdiskette"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Verfügen Sie über eine Treiberdiskette?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Mehr Treiberdisketten?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Wollen Sie weitere Treiberdisketten laden?"
 
-#: ../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-Fehler"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Ungültige Treiberdiskette im Kickstart-Befehl: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5992,7 +5992,7 @@ msgstr ""
 "Folgendes ungültiges Argument wurde im Treiberdisketten Kickstart-Befehl "
 "angegeben: %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 "
@@ -6004,19 +6004,19 @@ msgstr ""
 "welche Parameter Sie angeben sollen, können Sie diesen Bildschirm einfach "
 "durch Klicken auf \"OK\" überspringen."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Geben Sie die Parameter für das Modul ein"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Keine Treiber gefunden"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Lade Treiberdiskette"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6024,7 +6024,7 @@ msgstr ""
 "Es wurden keine Treiber zum manuellen Einfügen gefunden. Wollen Sie eine "
 "Treiberdiskette verwenden?"
 
-#: ../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."
@@ -6033,26 +6033,26 @@ msgstr ""
 "Wenn der benötigte Treiber nicht in dieser Liste enthalten ist und Sie über "
 "eine Treiberdiskette verfügen, drücken Sie F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Geben Sie die optionalen Parameter für das Modul an"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Wählen Sie den zu ladenden Gerätetreiber aus"
 
-#: ../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 "Medium gefunden"
 
-#: ../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 "Lokale Installationsmedien gefunden ..."
 
-#: ../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 "
@@ -6061,7 +6061,7 @@ msgstr ""
 "Der %s Installationsbaum in diesem Verzeichnis scheint ihrem Boot-Medium "
 "nicht zu entsprechen."
 
-#: ../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."
@@ -6069,7 +6069,7 @@ msgstr ""
 "Ein Fehler ist beim Lesen der Installation von ISO-Abbildern aufgetreten. "
 "Überprüfen Sie Ihre ISO-Abbilder, und versuchen Sie es erneut."
 
-#: ../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?"
@@ -6077,7 +6077,7 @@ msgstr ""
 "In Ihrem System sind keine Festplatten vorhanden! Möchten Sie jetzt weitere "
 "Geräte konfigurieren?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6089,61 +6089,61 @@ msgstr ""
 "nicht in dieser Liste aufgeführt ist, drücken Sie F2, um zusätzliche Geräte "
 "zu konfigurieren."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Verzeichnis, das die Abbilder enthält:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Partition auswählen"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Auf dem Gerät %s befinden sich keine Abbilder der %s CD-ROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Ungültiges Argument zum HD Kickstart-Befehl %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 "Kann die Kickstart-Datei nicht auf der Festplatte finden."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Kann Festplatte nicht finden für BIOS Laufwerk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tastaturtyp"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Bitte wählen Sie Ihren Tastaturtyp:"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Fehler beim Öffnen der Kickstart-Datei %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Fehler beim Lesen des Inhalts der Kickstart-Datei %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Fehler in %s in der Zeile %d der Kickstart-Datei %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ks.cfg konnte auf dem Wechselmedium nicht gefunden werden."
 
-#: ../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."
@@ -6152,50 +6152,50 @@ msgstr ""
 "Kickstart-Parameter unten entsprechend an oder drücken Sie auf Beenden, um "
 "mit einer interaktiven Installation fortzufahren."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Fehler beim Herunterladen der Kickstart-Datei"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Ungültiges Argument zum Abschalten des Schnellstartmethoden-Befehls %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Willkommen beim %s für %s - Rettungsmodus"
 
-#: ../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> Elemente wechseln | <Leer> Auswahl | <F12> nächste Seite"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Wählen Sie eine Sprache aus"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokale CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Festplatte"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS-Verzeichnis"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Willkommen bei %s%n für %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Quelle der Update-Diskette"
 
-#: ../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?"
@@ -6203,7 +6203,7 @@ msgstr ""
 "Sie verfügen über mehrere Geräte, die als Quelle für eine Update-Diskette "
 "dienen könnten. Welches Gerät möchten Sie verwenden?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6211,30 +6211,30 @@ msgstr ""
 "Dieses Gerät enthält mehrere Partitionen, die das Abbild der "
 "Aktualisierungsdiskette enthalten könnten. Welche möchten Sie verwenden?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Legen Sie Ihre Update-Disketten in /dev/%s ein und klicken Sie auf \"OK\", "
 "um fortzufahren."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Update-Diskette"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Update-Diskette konnte nicht eingebunden werden"
 
-#: ../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 "Anaconda-Updates werden gelesen ..."
 
-#: ../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.."
@@ -6243,46 +6243,46 @@ msgstr ""
 "den Aktualisierungsspeicherort unten entsprechend an oder drücken Sie "
 "Beenden, um ohne Aktualisierungen fortzufahren."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Fehler beim Herunterladen der Aktualisierungsabbilder"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 "Ihnen steht nicht genügend RAM zur Verfügung, um %s auf diesem Computer zu "
 "installieren."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Rettungsmethode"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installationsmethode"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Auf welchem Datenträgertyp ist die Rettungsdiskette enthalten?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Welches Medium beinhaltet die zu installierenden Pakete?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Kein Treiber gefunden"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Treiber auswählen"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Benutzen Sie eine Treiberdiskette"
 
-#: ../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?"
@@ -6291,11 +6291,11 @@ msgstr ""
 "gefunden. Möchten Sie einen Treiber manuell auswählen oder eine "
 "Treiberdiskette benutzen?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Die folgenden Geräte wurden auf Ihrem System gefunden."
 
-#: ../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?"
@@ -6303,51 +6303,51 @@ msgstr ""
 "Für Ihr System wurden keine speziellen Gerätetreiber geladen.  Sollen jetzt "
 "welche geladen werden?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Geräte"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Fertig"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Gerät hinzufügen"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Loader wurde bereits ausgeführt. Shell wird gestartet.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Anaconda %s, der %s Rettungsmodus, wird ausgeführt - bitte warten ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Anaconda %s, das %s System-Installationsprogramm, wird ausgeführt - bitte "
 "warten ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Das Installationsabbild %s kann nicht gefunden werden."
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" wird überprüft ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Medien werden jetzt überprüft ..."
 
-#: ../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."
@@ -6356,7 +6356,7 @@ msgstr ""
 "Das bedeutet wahrscheinlich, dass der Datenträger erstellt wurde, ohne die "
 "Prüfsumme hinzuzufügen."
 
-#: ../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 "
@@ -6367,11 +6367,11 @@ msgstr ""
 "reinigen Sie die CD und versuchen Sie es erneut. Sollte dieser Test auch "
 "weiterhin fehlschlagen, sollten Sie mit der Installation nicht fortfahren."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Erfolg"
 
-#: ../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 "
@@ -6381,7 +6381,7 @@ msgstr ""
 "Es sollte in Ordnung sein von diesem Medium zu installieren. Beachten Sie "
 "bitte, dass nicht alle Medien/Laufwerksfehler von media check erkannt werden."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6392,20 +6392,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Prüfsummen-Test"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Ungültiges Argument zum Treiber Kickstart-Befehl %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Ein Modulname müssen für den Befehl für das Kickstart-Gerät angegeben werden."
 
-#: ../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"
@@ -6413,7 +6413,7 @@ msgstr ""
 "Das Präfix muss zwischen 1 und 32 für IPv4-Netzwerke oder zwischen 1 und 128 "
 "für IPv6-Netzwerke liegen"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6424,27 +6424,27 @@ msgstr ""
 "Kryptoschlüssel Ihres Funknetzes an. Falls dieses keinen Schlüssel benötigt, "
 "lassen Sie das Feld frei und die Installation fährt fort."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Kryptoschlüssel"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Einstellungen für das Funknetz"
 
-#: ../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 "Fehlender 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 "
@@ -6455,56 +6455,56 @@ msgstr ""
 "entsprechenden Angaben nicht verfügen, müssen Sie in dieses Feld nichts "
 "eintragen. Die Installation wird fortgesetzt."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ungültige IP-Angaben"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Sie haben eine ungültige IP-Adresse eingegeben."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: ../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 "Bei der Konfiguration Ihres Netzwerkgerätes trat ein Fehler auf."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP konfigurieren"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Sie müssen mindestens ein Protokoll (IPv4 oder IPv6) auswählen."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 wird für NFS benötigt"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Die NFS-Installationsmethode benötigt IPv4-Unterstützung."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4-Adresse:"
 
-#: ../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-Adresse:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Nameserver:"
 
-#: ../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 "
@@ -6515,45 +6515,45 @@ msgstr ""
 "Stil zulässig. Die Felder für das Gateway und Name Server müssen gültige "
 "IPv4- oder IPv6-Adressen sein."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Manuelle TCP/IP-Konfiguration"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Fehlende Informationen"
 
-#: ../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 ""
 "Sie müssen sowohl eine gültige IPv4-Adresse als auch eine Netzwerkmaske oder "
 "ein CIDR-Präfix eingeben."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 "Sie müssen sowohl eine gültige IPv6-Adresse als auch ein CIDR-Präfix "
 "eingeben."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Rechnername und Domäne werden ermittelt ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Ungültiges Argument im Kickstart-Netzwerkbefehl %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Ungültiges Boot-Protokoll %s in Netzwerkbefehl enthalten"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Netzwerkgerät"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6561,112 +6561,112 @@ msgstr ""
 "Sie verfügen über mehrere Netzwerkgeräte in diesem System. Über welches "
 "Gerät soll jetzt installiert werden?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS-Servername:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s Verzeichnis:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Bitte geben Sie den Server-Namen und den Pfad zu den %s-Abbildern ein."
 
-#: ../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 "Rechnername ohne konfiguriertes DNS angegeben"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Abrufen"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Dieses Verzeichnis konnte nicht vom Server eingebunden werden."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Dieses Verzeichnis scheint keinen %s Installationsbaum zu enthalten."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Ungültiges Argument im NFS Kickstart-Befehl %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 "Auf telnet-Verbindung warten ..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Anaconda wird via telnet ausgeführt ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Abrufen fehlgeschlagen %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Das Installationsabbilder kann nicht abgerufen werden."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Ungültiges Argument im Url Kickstart-Befehl %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Sie müssen ein --url Argument im Url Kickstart-Befehl angeben."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Unbekannte Url Methode %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "BItte geben Sie den URL mit den %s-Abbildern auf Ihrem Server ein."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Proxy konfigurieren"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL-Setup"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Sie müssen einen URL eingeben."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL muss entweder ein FTP- oder ein HTTP-URL sein"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Unbekannter Rechner"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ist kein gültiger Rechnername."
 
-#: ../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."
@@ -6674,23 +6674,23 @@ msgstr ""
 "Geben Sie bei Verwendung eines HTTP-Proxy-Servers den Namen des HTTP-Proxy-"
 "Servers ein."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Proxy-Name:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Proxy-Port:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Weitere Einstellungen"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI-Treiber wird geladen"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s Treiber wird geladen ..."
diff --git a/po/el.po b/po/el.po
index 805256879..53496a1bc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -56,41 +56,41 @@ msgstr "Πατήστε <enter> για ένα κέλυφος"
 #: ../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 "Εντάξει"
 
@@ -595,22 +595,22 @@ msgstr "Αλλαγή μεγέθους συστήματος αρχείων στο
 #: ../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 "Σφάλμα"
 
@@ -666,8 +666,8 @@ msgstr ""
 "Πατήστε <Enter> για να τερματιστεί το πρόγραμμα εγκατάστασης."
 
 #: ../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 "Παράκαμψη"
 
@@ -1004,21 +1004,21 @@ msgstr "Διόρθωση"
 
 #: ../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 "Ναι"
 
 #: ../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 "Όχι"
 
-#: ../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 "Προσπάθεια ξανά"
 
@@ -1029,8 +1029,8 @@ msgstr "Αγνόηση"
 #: ../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 "Ακύρωση"
 
@@ -1916,21 +1916,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 "Πίσω"
 
 #: ../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 "Συνέχεια"
 
@@ -2372,7 +2372,7 @@ msgid "Skip entering %(instkey)s"
 msgstr "Παράκαμψη εισαγωγής για %(instkey)s"
 
 #
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Καλώς ήλθατε στο %s για %s"
@@ -3273,7 +3273,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Επιλογή γλώσσας"
 
-#: ../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 "Ποια γλώσσα θα θέλατε να χρησιμοποιηθεί κατά τη διαδικασία εγκατάστασης;"
 
@@ -3660,7 +3660,7 @@ msgstr "Μία τιμή απαιτείται για το πεδίο %s."
 msgid "Dynamic IP"
 msgstr "Δυναμικό 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 "Αποστολή αίτησης για πληροφορίες IP για %s..."
@@ -3833,7 +3833,7 @@ msgstr "άγνωστο"
 msgid "Hardware address: "
 msgstr "Διεύθυνση υλικού: "
 
-#: ../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 "Πρωτόκολλο που λείπει"
 
@@ -3842,7 +3842,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Πρέπει να επιλέξετε υποστήριξη για τουλάχιστον ένα πρωτόκολλο (IPv4 ή IPv6)."
 
 #: ../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 "Μη έγκυρο πρόθεμα"
 
@@ -4076,7 +4076,7 @@ msgstr "Συσκευές RAID"
 msgid "None"
 msgstr "Κανένα"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Σκληροί δίσκοι"
 
@@ -5004,12 +5004,12 @@ msgstr "Πρόθεμα"
 msgid "Activate on boot"
 msgstr "Ενεργοποίηση κατά την εκκίνηση"
 
-#: ../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 "Ενεργοποίηση υποστήριξης IPv4"
 
-#: ../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 "Ενεργοποίηση υποστήριξης IPv6"
@@ -5131,7 +5131,7 @@ msgstr "Αυτόματο 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 "Πύλη:"
 
@@ -5766,22 +5766,22 @@ 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 "Έλεγχος μέσων"
 
-#: ../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 "Δοκιμή"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Εξαγωγή δίσκου"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5790,7 +5790,7 @@ msgstr ""
 "Επιλέξτε \"%s\" για να ελέγξετε το δίσκο που βρίσκεται στον οδηγό, ή \"%s\" "
 "για να εξαχθεί ο δίσκος και να εισάγετε έναν άλλο για έλεγχο."
 
-#: ../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 "
@@ -5806,7 +5806,7 @@ msgstr ""
 "επιτυχής δεν απαιτείται επιπλέον έλεγχος την επόμενη φορά που θα τα "
 "χρησιμοποιήσετε."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5815,11 +5815,11 @@ msgstr ""
 "Ο δίσκος %s δε βρέθηκε σε κανένα από τους οδηγούς σας. Παρακαλώ εισάγετε το "
 "δίσκο %s και πατήστε %s για να ξαναπροσπαθήσετε."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Βρέθηκε δίσκος"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5832,7 +5832,7 @@ msgstr ""
 "Επιλέξτε %s για να προσπεράσετε των έλεγχο των μέσων και να ξεκινήσετε την "
 "εγκατάσταση."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5841,7 +5841,7 @@ msgstr ""
 "Δε βρέθηκε δίσκος %s που να ταιριάζει με το μέσο εκκίνησης. Παρακαλώ "
 "εισάγετε το δίσκο %s και πατήστε %s για να προσπαθήσετε ξανά."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5850,34 +5850,34 @@ msgstr ""
 "Ο δίσκος %s δD δε βρέθηκε σε κανένα από τους οδηγοOM σας. Παρακαλώ εισάγετε "
 "δίσκο το %s CD και πατήστε %s για να ξαναπροσπαθήσετε."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Δε βρέθηκε δίσκος"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Αδυναμία εύρεσης αρχείου kickstart στο 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 "Αποτυχία ανάγνωσης καταλόγου %s: %s"
 
 #
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Γίνεται φόρτωση"
 
 # gconf/gconf-internals.c:2416
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Ανάγνωση δίσκου οδηγού..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Πηγή δισκέτας οδηγού"
 
-#: ../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?"
@@ -5885,7 +5885,7 @@ msgstr ""
 "Έχετε πολλαπλές συσκευές που μπορούν να χρησιμοποιηθούν ως πηγές για δίσκο "
 "οδηγών. Ποια θέλετε να χρησιμοποιήσετε;"
 
-#: ../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?"
@@ -5894,51 +5894,51 @@ msgstr ""
 "πηγαία εικόνα οδηγών. Ποια θέλετε να χρησιμοποιήσετε;"
 
 # gconf/gconf-internals.c:2416
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Αποτυχία προσάρτησης τμήματος δίσκου."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Επιλογή εικόνας δίσκου οδηγού"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Επιλέξτε το αρχείο στο οποίο βρίσκεται η εικόνα δίσκου οδηγού."
 
 # gconf/gconf-internals.c:2416
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Αποτυχία φόρτωσης δίσκου οδηγού από αρχείο."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Εισάγετε το δίσκο οδηγών στο /dev/%s και πατήστε \"OK\" για να συνεχίσετε."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Εισαγωγή δίσκου οδηγού"
 
 # gconf/gconf-internals.c:2416
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Αποτυχία προσάρτησης δισκέτας οδηγού."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Ο οδηγός δίσκου είναι μη έγκυρος για αυτήν την έκδοση του %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Χειροκίνητη επιλογή"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Φόρτωση άλλου δίσκου"
 
-#: ../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 "
@@ -5948,38 +5948,38 @@ msgstr ""
 "επιλέξετε μη αυτόματα τον οδηγό, να συνεχίσετε ή να εισάγετε ένα άλλο δίσκο "
 "οδηγούς;"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Δίσκος οδηγού"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Έχετε δίσκο οδηγού;"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Περισσότεροι δίσκοι οδηγών;"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Θέλετε να φορτώσετε άλλους δίσκους οδηγών;"
 
-#: ../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"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Άγνωστη πηγή driver disk kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5988,7 +5988,7 @@ msgstr ""
 "Καθορίστηκε η ακόλουθη άκυρη παράμετρος για την εντολή kickstart driver "
 "disk: %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 "
@@ -5999,19 +5999,19 @@ msgstr ""
 "άρθρωμα %s  χωρίζοντας τις με κενά. Αν δε γνωρίζετε τι παραμέτρους πρέπει να "
 "δώσετε, προσπεράστε αυτήν την οθόνη πατώντας το κουμπί \"Εντάξει\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Εισαγωγή παραμέτρων Module"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Δε βρέθηκαν οδηγοί"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Φόρτωση δίσκου οδηγού"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6019,7 +6019,7 @@ msgstr ""
 "Δε βρέθηκαν οδηγοί για χειροκίνητη εισαγωγή. Θέλετε να χρησιμοποιήσετε ένα "
 "δίσκο με οδηγούς;"
 
-#: ../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."
@@ -6027,26 +6027,26 @@ msgstr ""
 "Παρακαλώ επιλέξτε παρακάτω τον οδηγό που θέλετε να χρησιμοποιήσετε. Αν δεν "
 "εμφανίζεται και έχετε ήδη ένα δίσκο με οδηγούς πατήστε F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Καθορισμός προαιρετικών παραμέτρων"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Επιλογή οδηγού συσκευής για φόρτωση"
 
-#: ../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 "Εντοπίστηκε μέσο"
 
-#: ../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 "Εντοπίστηκε μέσο τοπικής εγκατάστασης..."
 
-#: ../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 "
@@ -6055,7 +6055,7 @@ msgstr ""
 "Το δέντρο εγκατάστασης του %s σε αυτόν τον κατάλογο δε φαίνεται να ταιριάζει "
 "με τα μέσα εκκίνησης σας."
 
-#: ../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."
@@ -6063,7 +6063,7 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά την ανάγνωση των αρχείων εγκατάστασης από τις εικόνες "
 "ISO. Παρακαλώ ελέγξτε τις εικόνες ISO και προσπαθήστε ξανά."
 
-#: ../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?"
@@ -6071,7 +6071,7 @@ msgstr ""
 "Δε φαίνεται να έχετε σκληρούς δίσκους στο σύστημα σας! Θέλετε να ρυθμίσετε "
 "επιπρόσθετες συσκευές;"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6082,64 +6082,64 @@ msgstr ""
 "το %s; Αν δε βλέπετε καταχωρημένο εδώ τον οδηγό δίσκου που χρησιμοποιείτε, "
 "πατήστε F2 για να ρυθμίσετε επιπλέον συσκευές."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Κατάλογος με εικόνες: "
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Επιλογή τμήματος δίσκου"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Η συσκευή %s δε φαίνεται να περιέχει εικόνες %s CDROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Εσφαλμένο όρισμα για την εντολή μεθόδου του HD kickstart %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 "Αδυναμία εύρεσης αρχείου kickstart στο σκληρό δίσκο."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Αδυναμία εύρεσης σκληρού δίσκου για BIOS disk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Τύπος πληκτρολογίου"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Τι είδος πληκτρολογίου έχετε;"
 
 # gconf/gconfd.c:1676
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Σφάλμα ανοίγματος αρχείου kickstart %s: %s"
 
 # gconf/gconfd.c:1676
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Σφάλμα ανάγνωσης αποθηκευμένου αρχείου kickstart %s: %s"
 
 # gconf/gconfd.c:1676
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Σφάλμα στο %s στη γραμμή %d του αρχείου kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Αδυναμία εύρεσης ks.cfg στα αφαιρούμενα μέσα."
 
-#: ../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."
@@ -6149,52 +6149,52 @@ msgstr ""
 "διαδραστική εγκατάσταση."
 
 # gconf/gconfd.c:1676
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Σφάλμα λήψης αρχείου kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Εσφαλμένο όρισμα για την εντολή μεθόδου τερματισμού του kickstart %s: %s"
 
 #
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Καλώς ήλθατε στο %s για %s - Λειτουργία διάσωσης (rescue)"
 
-#: ../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> Αλλαγή πεδίου     | <Space> επιλογή | <F12> επόμενη οθόνη "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Επιλέξτε μία γλώσσα"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Τοπικό CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Σκληρός δίσκος"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Κατάλογος NFS"
 
 #
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Καλώς ήλθατε στο %s%n για %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Ενημέρωση πηγής δίσκου"
 
-#: ../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?"
@@ -6202,7 +6202,7 @@ msgstr ""
 "Έχετε πολλαπλές συσκευές οι οποίες θα μπορούσαν να είναι πηγές δημιουργίας "
 "ενός δίσκου με ενημερώσεις. Ποια θα θέλατε να χρησιμοποιήσετε;"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6211,31 +6211,31 @@ msgstr ""
 "Υπάρχουν πολλαπλά τμήματα δίσκου στη συσκευή που μπορούν να περιέχουν την "
 "πηγαία εικόνα οδηγών. Ποια θέλετε να χρησιμοποιήσετε;"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Εισάγετε το δίσκο με τις ενημερώσεις στο /dev/%s και πατήστε \"OK\" για να "
 "συνεχίσετε."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Δίσκος ενημερώσεων"
 
 # gconf/gconf-internals.c:2416
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Αποτυχία προσάρτησης δίσκου ενημερώσεων"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Ανανεώσεις"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Ανάγνωση ενημερώσεων anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6246,46 +6246,46 @@ msgstr ""
 "διαδραστική εγκατάσταση."
 
 # gconf/gconfd.c:1676
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Σφάλμα λήψης αρχείου kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Δεν έχετε αρκετή RAM για να εγκαταστήσετε το %s σε αυτό το σύστημα."
 
 #
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Μέθοδος Rescue"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Μέθοδος εγκατάστασης"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Τι είδος μέσου περιέχει την εικόνα rescue;"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Τι είδος μέσου περιέχει τα πακέτα που θα εγκατασταθούν;"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Δε βρέθηκε οδηγός"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Επιλογή οδηγού"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Χρήση ενός δίσκου οδηγού"
 
-#: ../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?"
@@ -6294,11 +6294,11 @@ msgstr ""
 "εγκατάστασης. Θα θέλατε να επιλέξετε μη αυτόματα τον κατάλληλο οδηγό ή να "
 "χρησιμοποιήσετε ένα δίσκο με οδηγούς;"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Οι ακόλουθες συσκευές βρέθηκαν στο σύστημά σας."
 
-#: ../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?"
@@ -6306,53 +6306,53 @@ msgstr ""
 "Δεν έχουν φορτωθεί οδηγοί συσκευών για το σύστημα σας.  Θα θέλατε να "
 "φορτωθεί κάποιος τώρα;"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Συσκευές"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Έγινε"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Προσθήκη συσκευής"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ο φορτωτής έχει ήδη εκτελεστεί.  Έναρξη κελύφους.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "Εκτέλεση του anaconda %s, το περιβάλλον διάσωσης του %s - παρακαλώ "
 "περιμένετε...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Εκτελείται το anaconda %s, η εφαρμογή εγκατάστασης συστήματος %s - παρακαλώ "
 "περιμένετε ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Δε βρέθηκε η εικόνα εγκατάστασης %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Έλεγχος \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Έλεγχος μέσων τώρα..."
 
-#: ../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."
@@ -6361,7 +6361,7 @@ msgstr ""
 "τόμου.  Κατά πάσα πιθανότητα αυτό σημαίνει πως ο δίσκος δημιουργήθηκε χωρίς "
 "άθροισμα ελέγχου."
 
-#: ../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 "
@@ -6372,11 +6372,11 @@ msgstr ""
 "προσπαθήστε ξανά.  Αν ι δοκιμή συνέχιση να αποτυγχάνει τότε μην συνεχίσετε "
 "την εγκατάσταση."
 
-#: ../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 "
@@ -6386,7 +6386,7 @@ 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"
@@ -6397,23 +6397,23 @@ msgstr ""
 "\n"
 "   %s;"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Έλεγχος αθροίσματος ελέγχου"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Λάθος όρισμα στην εντολή της μεθόδου έναρξης της συσκευής %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Πρέπει να οριστούν τόσο ο τύπος του αρθρώματος όσο και το όνομα του για την "
 "εντολή συσκευής kickstart."
 
-#: ../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"
@@ -6421,7 +6421,7 @@ msgstr ""
 "Το πρόθεμα πρέπει να είναι από 1 μέχρι 32 για δίκτυα IPv4 ή από 1 μέχρι 128 "
 "για δίκτυα IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6433,27 +6433,27 @@ msgstr ""
 "δίκτυο σας. Αν δε χρειάζεται κλειδί, αφήστε κενό το πεδίο και η εγκατάσταση "
 "θα προχωρήσει."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Κλειδί κρυπτογράφησης"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Ασύρματες ρυθμίσεις"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP εξυπηρετητή ονομάτων"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Λείπει ο εξυπηρετητής ονομάτων"
 
-#: ../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 "
@@ -6465,58 +6465,58 @@ msgstr ""
 "πληροφορία, μπορείτε να αφήσετε αυτό το πεδίο κενό και η εγκατάσταση θα "
 "συνεχίσει."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Μη έγκυρες πληροφορίες IP"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Εισάγατε μη έγκυρη διεύθυνση IP."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Σφάλμα δικτύου"
 
-#: ../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 "Εμφανίστηκε ένα σφάλμα κατά τη ρύθμιση της διεπαφής δικτύου σας."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Ρύθμιση TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα πρωτόκολλο (IPv4 ή IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "Το IPv4 είναι απαραίτητο για NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Η μέθοδος εγκατάστασης NFS απαιτεί υποστήριξη IPv4."
 
 #
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Διεύθυνση IPv4:"
 
-#: ../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:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Εξυπηρετητής ονομάτων:"
 
-#: ../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 "
@@ -6527,43 +6527,43 @@ msgstr ""
 "χωρισμένων με τελείες ή το πρόθεμα τύπου CIDR. Τα πεδία για την πύλη και τον "
 "εξυπηρετητή ονομάτων πρέπει να είναι έγκυρες διευθύνσεις IPv4 ή IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Μη αυτόματη ρύθμιση TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Ελλειπείς πληροφορίες"
 
-#: ../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 ""
 "Πρέπει να εισάγετε τόσο μια έγκυρη διεύθυνση IPv4 όσο και μια μάσκα δικτύου "
 "ή πρόθεμα CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Πρέπει να εισάγετε τόσο μια έγκυρη διεύθυνση IPv6 όσο και ένα πρόθεμα CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Καθορισμός ονόματος συστήματος και τομέα..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Εσφαλμένο όρισμα για την εντολή δικτύου του kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Καθορίστηκε εσφαλμένη bootproto %s στην εντολή δικτύου"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Συσκευή δικτύου"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6571,113 +6571,113 @@ msgstr ""
 "Έχετε πολλές συσκευές δικτύου σε αυτό το σύστημα. Ποια θα θέλατε να "
 "χρησιμοποιήσετε για την εγκατάσταση;"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Όνομα εξυπηρετητή NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s κατάλογος:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Παρακαλώ εισάγετε το όνομα του εξυπηρετητή και την τοποθεσία για τις εικόνες σας του %s."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Ρύθμιση NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Καθορίστηκε όνομα συστήματος χωρίς ρύθμιση DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Ανάκτηση"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Δεν είναι δυνατή η προσάρτηση του καταλόγου από τον εξυπηρετητή."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Ο κατάλογος δε φαίνεται να περιέχει ένα δέντρο εγκατάστασης %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Εσφαλμένο όρισμα για την εντολή μεθόδου του NFS kickstart %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 "Αναμονή για σύνδεση telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Εκτέλεση anaconda μέσω telnet..."
 
 # gconf/gconf-internals.c:2416
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Αδυναμία ανάκτησης %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Αδυναμία ανάκτησης της εικόνας εγκατάστασης."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Εσφαλμένη παράμετρος για την εντολή μεθόδου Url kickstart %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Θα πρέπει να δώσετε -- μια παράμετρο url  για τη μέθοδο Url kickstart."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Άγνωστη μέθοδος 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
 msgid "Configure proxy"
 msgstr "Ρύθμιση proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Ρύθμιση URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Πρέπει να εισάγετε ένα URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "Το URL πρέπει να εισαχθεί σαν ένα ftp ή http URL"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Άγνωστο σύστημα"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "Το %s δεν είναι ένα έγκυρο όνομα συστήματος."
 
-#: ../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."
@@ -6685,23 +6685,23 @@ msgstr ""
 "Αν χρησιμοποιείτε ένα διακομιστή HTTP proxy εισάγετε το όνομα του διακομιστή "
 "HTTP proxy server που θα χρησιμοποιηθεί."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Όνομα proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Θύρα proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Επιπλέον ρυθμίσεις"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Γίνεται φόρτωση οδηγού SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Φόρτωση οδηγού %s..."
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..."
diff --git a/po/es.po b/po/es.po
index 6a416e284..58b073c55 100644
--- a/po/es.po
+++ b/po/es.po
@@ -125,86 +125,86 @@ msgstr "Presione <intro> para entrar a un shell"
 #: ../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
+#: ../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 "Aceptar"
 
@@ -903,41 +903,41 @@ msgstr "Redimensionando el sistema de archivo en %s ..."
 #: ../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"
 
@@ -1020,9 +1020,9 @@ msgstr ""
 #: ../rescue.py:305
 #: ../rescue.py:307
 #: ../textw/upgrade_text.py:132
-#: ../loader2/cdinstall.c:200
-#: ../loader2/cdinstall.c:203
-#: ../loader2/method.c:393
+#: ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:203
+#: ../loader/method.c:393
 msgid "Skip"
 msgstr "Omitir"
 
@@ -1388,9 +1388,9 @@ msgstr "Fijar"
 #: ../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 "Si"
 
@@ -1418,8 +1418,8 @@ msgstr "Si"
 #: ../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"
 
@@ -1429,14 +1429,14 @@ 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
+#: ../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 "Volver a intentar"
 
@@ -1482,11 +1482,11 @@ msgstr "Ignorar"
 #: ../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 "Cancelar"
 
@@ -2687,28 +2687,28 @@ msgstr "_Guardar cambios al disco"
 # ../textw/silo_text.py:110 ../textw/userauth_text.py:185
 #: ../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 "Anterior"
 
@@ -2719,9 +2719,9 @@ msgstr "Anterior"
 #: ../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
+#: ../loader/cdinstall.c:117
+#: ../loader/cdinstall.c:125
+#: ../loader/driverdisk.c:440
 msgid "Continue"
 msgstr "Continuar"
 
@@ -3252,7 +3252,7 @@ msgstr "Omitiendo el ingreso %(instkey)s"
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
 #: ../text.py:564
-#: ../loader2/lang.c:63
+#: ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Bienvenido a %s para %s"
@@ -4384,7 +4384,7 @@ msgstr "Selección del idioma"
 # ../iw/language_gui.py:49 ../textw/language_text.py:39
 #: ../iw/language_gui.py:76
 #: ../textw/language_text.py:45
-#: ../loader2/lang.c:374
+#: ../loader/lang.c:374
 msgid "What language would you like to use during the installation process?"
 msgstr "¿Qué idioma le gustaría usar durante el proceso de instalación?"
 
@@ -4872,8 +4872,8 @@ msgstr "IP Dinámico"
 # ../loader/net.c:414 ../loader/net.c:739
 # ../loader/net.c:414 ../loader/net.c:739
 #: ../iw/netconfig_dialog.py:177
-#: ../loader2/net.c:416
-#: ../loader2/net.c:860
+#: ../loader/net.c:416
+#: ../loader/net.c:860
 #, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "Enviando petición de información IP para %s..."
@@ -5146,7 +5146,7 @@ msgstr "Dirección de hardware:"
 # ../loader/net.c:404
 #: ../iw/network_gui.py:778
 #: ../textw/network_text.py:228
-#: ../loader2/net.c:820
+#: ../loader/net.c:820
 msgid "Missing Protocol"
 msgstr "Falta Protocolo"
 
@@ -5162,7 +5162,7 @@ msgstr "Debe seleccionar al menos soporte para IPv4 o IPv6."
 #: ../iw/network_gui.py:843
 #: ../iw/network_gui.py:849
 #: ../textw/network_text.py:74
-#: ../loader2/net.c:92
+#: ../loader/net.c:92
 msgid "Invalid Prefix"
 msgstr "Prefijo Inválido"
 
@@ -5550,7 +5550,7 @@ msgstr "Ninguno"
 # ../loader/loader.c:816
 # ../loader/loader.c:816
 #: ../iw/partition_gui.py:816
-#: ../loader2/hdinstall.c:334
+#: ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Discos duros"
 
@@ -6710,13 +6710,13 @@ msgid "Activate on boot"
 msgstr "Activar al inicio"
 
 #: ../textw/network_text.py:149
-#: ../loader2/net.c:730
+#: ../loader/net.c:730
 #: tmp/netpostconfig.glade.h:9
 msgid "Enable IPv4 support"
 msgstr "Activar soporte IPv4"
 
 #: ../textw/network_text.py:156
-#: ../loader2/net.c:743
+#: ../loader/net.c:743
 #: tmp/netpostconfig.glade.h:10
 msgid "Enable IPv6 support"
 msgstr "Activar soporte IPv6"
@@ -6885,7 +6885,7 @@ msgstr "DHCPv6"
 # ../iw/network_gui.py:251
 # ../iw/network_gui.py:251
 #: ../textw/network_text.py:678
-#: ../loader2/net.c:1055
+#: ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Gateway:"
 
@@ -7755,34 +7755,34 @@ msgstr ""
 "* Puede resultar en una instalación no soportada/no certificada de Linux para Empresas de Red Hat.\n"
 "* No obtendrá actualizaciónes de software y de seguridad para paquetes no incluídos en su suscripción."
 
-#: ../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 "Control de medios"
 
 # ../textw/xconfig_text.py:155 ../textw/xconfig_text.py:164
 # ../textw/xconfig_text.py:159 ../textw/xconfig_text.py:168
 # ../textw/xconfig_text.py:159 ../textw/xconfig_text.py:168
-#: ../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
 msgid "Eject Disc"
 msgstr "Expulsar Disco"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject the disc and insert another for testing."
 msgstr "Escoja \"%s\" para probar el disco que está en la unidad, o \"%s\" para expulsar el disco e introducir otro para probarlo."
 
-#: ../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 \"%s\". Testing each disc is not strictly required, however it is highly recommended.  Minimally, the discs should be tested prior to using them for the first time. After they have been successfully tested, it is not required to retest each disc prior to using it again."
 msgstr "Si desea probar discos adicionales, inserte el siguiente y presione \"%s\". No se requiere probar cada disco, pero es por cierto recomendado hacerlo. Mínimamente, debe probar los discos antes de usarlos por primera vez. Después de que la prueba ha sido pasada con éxito, no es necesario probar cada disco antes de usarlos de nuevo."
@@ -7790,7 +7790,7 @@ msgstr "Si desea probar discos adicionales, inserte el siguiente y presione \"%s
 # ../loader/loader.c:968
 # ../loader/loader.c:968
 # ../loader/loader.c:968
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid "The %s disc was not found in any of your drives. Please insert the %s disc and press %s to retry."
 msgstr "El disco %s no ha sido encontrado en ninguna de las unidades. Introduzca el disco %s y pulse %s para reintentar."
@@ -7798,11 +7798,11 @@ msgstr "El disco %s no ha sido encontrado en ninguna de las unidades. Introduzca
 # ../partitioning.py:1465
 # ../partitioning.py:1485
 # ../partitioning.py:1488
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disco Encontrado"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -7816,7 +7816,7 @@ msgstr ""
 # ../loader/loader.c:968
 # ../loader/loader.c:968
 # ../loader/loader.c:968
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid "No %s disc was found which matches your boot media.  Please insert the %s disc and press %s to retry."
 msgstr "El disco %s no ha sido encontrado en ninguna de las unidades de arranque. Introduzca el disco %s y presione %s para reintentarlo."
@@ -7824,7 +7824,7 @@ msgstr "El disco %s no ha sido encontrado en ninguna de las unidades de arranque
 # ../loader/loader.c:968
 # ../loader/loader.c:968
 # ../loader/loader.c:968
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid "The %s disc was not found in any of your CDROM drives. Please insert the %s disc and press %s to retry."
 msgstr "El disco %s no ha sido encontrado en ninguna de las unidades de CDROM. Introduzca el disco %s y presione %s para volver a intentarlo."
@@ -7832,20 +7832,20 @@ msgstr "El disco %s no ha sido encontrado en ninguna de las unidades de CDROM. I
 # ../partitioning.py:1465
 # ../partitioning.py:1485
 # ../partitioning.py:1488
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disco no Encontrado"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "No se puede encontrar el archivo kickstart en el CDROM."
 
 # ../loader/loader.c:536 ../loader/loader.c:2238
 # ../loader/loader.c:536 ../loader/loader.c:2238
 # ../loader/loader.c:536 ../loader/loader.c:2238
-#: ../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 "No se pudo leer el directorio %s: %s"
@@ -7853,68 +7853,68 @@ msgstr "No se pudo leer el directorio %s: %s"
 # ../loader/devices.c:513
 # ../loader/devices.c:513
 # ../loader/devices.c:513
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Cargando"
 
 # ../loader/devices.c:260
 # ../loader/devices.c:260
 # ../loader/devices.c:260
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Leyendo el disco de controladores..."
 
 # ../loader/devices.c:532
 # ../loader/devices.c:532
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:230
-#: ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230
+#: ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Fuente de disco de controladores"
 
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
-#: ../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?"
 msgstr "Tiene múltiples dispositivos que pueden servir como fuentes para un disco de controladores. ¿Cuál le gustaría utilizar?"
 
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
-#: ../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?"
 msgstr "Hay múltiples particiones en este dispositivo que podrían  contener la imagen del controlador de disco. ¿Cuál le gustaría utilizar?"
 
 # ../loader/pcmcia.c:114
 # ../loader/pcmcia.c:114
 # ../loader/pcmcia.c:114
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Falló al montar la partición."
 
 # ../iw/fdisk_gui.py:93
 # ../iw/fdisk_gui.py:93
 # ../iw/fdisk_gui.py:93
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Seleccione la imagen del controlador del disco"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Seleccione el archivo que es su imagen de controlador de disco."
 
 # ../loader/devices.c:260
 # ../loader/devices.c:260
 # ../loader/devices.c:260
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Falló al montar el disco de controladores desde el archivo."
 
 # ../loader/devices.c:239
 # ../loader/devices.c:239
 # ../loader/devices.c:239
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Introduzca su disco de controladores en /dev/%s y pulse \"Aceptar\" para continuar. "
@@ -7922,87 +7922,87 @@ msgstr "Introduzca su disco de controladores en /dev/%s y pulse \"Aceptar\" para
 # ../loader/devices.c:532
 # ../loader/devices.c:532
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Inserte el disco de controladores"
 
 # ../loader/devices.c:260
 # ../loader/devices.c:260
 # ../loader/devices.c:260
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Falló al montar el disco de controladores."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "El disco de controladores es inválido para esta versión de %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Escoja manualmente"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Cargue otro disco"
 
-#: ../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 driver disk?"
 msgstr "No se encontraron dispositivos del tipo apropiado en este disco de controladores. Le gustaría seleccionar manualmente el controlador, continuar o cargar otro disco?"
 
 # ../loader/devices.c:532
 # ../loader/devices.c:532
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disco de controladores"
 
 # ../loader/devices.c:232
 # ../loader/devices.c:232
 # ../loader/devices.c:232
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "¿Tiene un disco de drivers?"
 
 # ../loader/devices.c:532
 # ../loader/devices.c:532
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Más discos de controladores?"
 
 # ../loader/devices.c:232
 # ../loader/devices.c:232
 # ../loader/devices.c:232
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "¿Desea cargar más discos de controladores? "
 
 # ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107
 # ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107
 # ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107
-#: ../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 "Error Kickstart"
 
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Fuente del controlador del disco del método kickstart desconocida: %s"
@@ -8010,7 +8010,7 @@ msgstr "Fuente del controlador del disco del método kickstart desconocida: %s"
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid "The following invalid argument was specified for the kickstart driver disk command: %s:%s"
 msgstr "Se especificó el siguiente argumento inválido para el comando  del controlador de disco de kickstart: %s: %s"
@@ -8018,7 +8018,7 @@ msgstr "Se especificó el siguiente argumento inválido para el comando  del con
 # ../loader/devices.c:86
 # ../loader/devices.c:86
 # ../loader/devices.c:86
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid "Please enter any parameters which you wish to pass to the %s module separated by spaces.  If you don't know what parameters to supply, skip this screen by pressing the \"OK\" button."
 msgstr "Por favor introduzca cualquier parámetro que desee pasar al módulo  %s separado con espacios. Si no sabe qué parámetros dar, sáltese esta pantalla pulsando el botón \"Aceptar\"."
@@ -8026,86 +8026,86 @@ msgstr "Por favor introduzca cualquier parámetro que desee pasar al módulo  %s
 # ../loader/devices.c:91
 # ../loader/devices.c:91
 # ../loader/devices.c:91
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Introduzca los parámetros del módulo"
 
 # ../partitioning.py:1465
 # ../partitioning.py:1485
 # ../partitioning.py:1488
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "No se encontró el driver "
 
 # ../loader/devices.c:232
 # ../loader/devices.c:232
 # ../loader/devices.c:232
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Cargue un disco de controladores"
 
-#: ../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 "No se encontraron controladores para insertar manualmente. ¿Le gustaría usar un disco de controladores?"
 
 # ../loader/devices.c:327
 # ../loader/devices.c:327
 # ../loader/devices.c:327
-#: ../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."
 msgstr "Por favor seleccione el controlador que desea cargar. Si el driver que necesita no aparece en esta lista y usted tiene un disco de controladores aparte, por favor pulse F2."
 
 # ../loader/devices.c:336
 # ../loader/devices.c:336
 # ../loader/devices.c:336
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Especifique los argumentos opcionales de los módulos"
 
 # ../iw/fdisk_gui.py:93
 # ../iw/fdisk_gui.py:93
 # ../iw/fdisk_gui.py:93
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Seleccione el dispositivo controlador a cargar "
 
 # ../mouse.py:273 ../xserver.py:44
 # ../mouse.py:273 ../xserver.py:44
 # ../mouse.py:274 ../xserver.py:44
-#: ../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 detectada"
 
-#: ../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 "Se ha detectado media de instalación local..."
 
-#: ../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 media."
 msgstr "El árbol de instalación %s en ese directorio parece no coincidir con su media de arranque."
 
-#: ../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."
 msgstr "Se ha producido un error al leer la instalación desde las imágenes ISO. Compruebe sus imágenes ISO e inténtelo de nuevo. "
 
 # ../loader/loader.c:817
 # ../loader/loader.c:817
 # ../loader/loader.c:817
-#: ../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?"
 msgstr "¡Parece ser que no tiene discos duros en el sistema! ¿Le gustaría configurar dispositivos adicionales?"
 
 # ../loader/loader.c:817
 # ../loader/loader.c:817
 # ../loader/loader.c:817
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid "What partition and directory on that partition hold the CD (iso9660) images for %s? If you don't see the disk drive you're using listed here, press F2 to configure additional devices."
 msgstr "¿Qué partición y directorio de esa partición soportan las imágenes del CD (iso9660) para %s?  Si no ve el driver del disco que está usando, pulse F2 para configurar los dispositivos adicionales."
@@ -8113,21 +8113,21 @@ msgstr "¿Qué partición y directorio de esa partición soportan las imágenes
 # ../loader/loader.c:845
 # ../loader/loader.c:845
 # ../loader/loader.c:845
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Directorio que contiene imágenes:"
 
 # ../loader/loader.c:865
 # ../loader/loader.c:865
 # ../loader/loader.c:865
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Selección de la Partición"
 
 # ../loader/loader.c:913
 # ../loader/loader.c:913
 # ../loader/loader.c:913
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "El dispositivo %s no contiene las imágenes de los CDROM de %s."
@@ -8135,7 +8135,7 @@ msgstr "El dispositivo %s no contiene las imágenes de los CDROM de %s."
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Argumento erróneo para el comando HD kickstart %s: %s"
@@ -8143,12 +8143,12 @@ msgstr "Argumento erróneo para el comando HD kickstart %s: %s"
 # ../image.py:63
 # ../image.py:63
 # ../image.py:63
-#: ../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 "No se puede encontrar el archivo kickstart en el disco duro."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "No se pudo encontrar el disco duro para el disco BIOS %s"
@@ -8156,21 +8156,21 @@ msgstr "No se pudo encontrar el disco duro para el disco BIOS %s"
 # ../loader/lang.c:594
 # ../loader/lang.c:606
 # ../loader/lang.c:606
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tipo de teclado"
 
 # ../loader/lang.c:595
 # ../loader/lang.c:607
 # ../loader/lang.c:607
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "¿Qué tipo de teclado tiene?"
 
 # ../loader/kickstart.c:59
 # ../loader/kickstart.c:59
 # ../loader/kickstart.c:59
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Error al abrir el archivo kickstart %s: %s"
@@ -8178,7 +8178,7 @@ msgstr "Error al abrir el archivo kickstart %s: %s"
 # ../loader/kickstart.c:69
 # ../loader/kickstart.c:69
 # ../loader/kickstart.c:69
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Error al leer el contenido del archivo kickstart %s: %s"
@@ -8186,7 +8186,7 @@ msgstr "Error al leer el contenido del archivo kickstart %s: %s"
 # ../loader/kickstart.c:108
 # ../loader/kickstart.c:108
 # ../loader/kickstart.c:108
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Error en %s en la línea %d del fichero kickstart %s."
@@ -8194,25 +8194,25 @@ msgstr "Error en %s en la línea %d del fichero kickstart %s."
 # ../loader/loader.c:2208
 # ../loader/loader.c:2208
 # ../loader/loader.c:2208
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "No puedo encontrar ks.cfg en el disco extraíble."
 
-#: ../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 "No se pudo descargar el archivo kickstart. Por favor modifique el parámetro kickstart de abajo o presione Cancelar para proceder como instalación interactiva."
 
 # ../loader/kickstart.c:59
 # ../loader/kickstart.c:59
 # ../loader/kickstart.c:59
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Error al descargar el archivo kickstart"
 
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Argumento erróneo para apagar el comando de método  kickstart %s: %s"
@@ -8220,7 +8220,7 @@ msgstr "Argumento erróneo para apagar el comando de método  kickstart %s: %s"
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Bienvenido a %s para %s - Modo Rescate"
@@ -8228,43 +8228,43 @@ msgstr "Bienvenido a %s para %s - Modo Rescate"
 # ../loader/lang.c:41 ../loader/loader.c:188
 # ../loader/lang.c:41 ../loader/loader.c:188
 # ../loader/lang.c:41 ../loader/loader.c:188
-#: ../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> entre elementos | <Espacio> seleccionar | <F12> siguiente "
 
 # ../loader/lang.c:298
 # ../loader/lang.c:297
 # ../loader/lang.c:297
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Elija un idioma"
 
 # ../loader/loader.c:123
 # ../loader/loader.c:123
 # ../loader/loader.c:123
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD Local"
 
 # ../loader/loader.c:131
 # ../loader/loader.c:131
 # ../loader/loader.c:131
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disco duro"
 
 # ../loader/net.c:173 ../loader/urls.c:194
 # ../loader/net.c:173 ../loader/urls.c:194
 # ../loader/net.c:173 ../loader/urls.c:194
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Directorio NFS"
 
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Bienvenido a %s%n para %s"
@@ -8272,29 +8272,29 @@ msgstr "Bienvenido a %s%n para %s"
 # ../loader/loader.c:2300
 # ../loader/loader.c:2300
 # ../loader/loader.c:2300
-#: ../loader2/loader.c:374
-#: ../loader2/loader.c:410
+#: ../loader/loader.c:374
+#: ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Disco de actualización "
 
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
-#: ../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?"
 msgstr "Tiene múltiples dispositivos que pueden servir como fuentes para discos de actualización. ¿Cuál le gustaría usar?"
 
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid "There are multiple partitions on this device which could contain the update disk image.  Which would you like to use?"
 msgstr "Hay múltiples particiones en este dispositivo que podrían  contener la imagen del disco de actualización. ¿Cuál le gustaría utilizar?"
 
 # ../loader/loader.c:2301
 # ../loader/loader.c:2301
 # ../loader/loader.c:2301
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Introduzca su disco de actualización en /dev/%s  y presione \"Aceptar\" para continuar. "
@@ -8302,46 +8302,46 @@ msgstr "Introduzca su disco de actualización en /dev/%s  y presione \"Aceptar\"
 # ../loader/loader.c:2300
 # ../loader/loader.c:2300
 # ../loader/loader.c:2300
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disco de actualización"
 
 # ../loader/devices.c:260
 # ../loader/devices.c:260
 # ../loader/devices.c:260
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Falló al montar el disco de actualización"
 
 # ../loader/loader.c:2321
 # ../loader/loader.c:2321
 # ../loader/loader.c:2321
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Actualizaciones"
 
 # ../loader/loader.c:2321
 # ../loader/loader.c:2321
 # ../loader/loader.c:2321
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Leyendo actualizaciones de 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 "No se pudo descargar la imágen de actualización. Por favor modifique la ubicación de la actualización de abajo o presione Cancelar para proceder sin actualizaciones."
 
 # ../loader/kickstart.c:59
 # ../loader/kickstart.c:59
 # ../loader/kickstart.c:59
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Error al descargar la imágen de actualizaciones"
 
 # ../loader/loader.c:2524
 # ../loader/loader.c:2524
 # ../loader/loader.c:2524
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "No posee suficiente RAM para instalar %s en esta máquina."
@@ -8349,67 +8349,67 @@ msgstr "No posee suficiente RAM para instalar %s en esta máquina."
 # ../loader/loader.c:1482
 # ../loader/loader.c:1482
 # ../loader/loader.c:1482
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Método de Rescate"
 
 # ../loader/loader.c:1483
 # ../loader/loader.c:1483
 # ../loader/loader.c:1483
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Método de instalación"
 
 # ../loader/loader.c:1485
 # ../loader/loader.c:1485
 # ../loader/loader.c:1485
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "¿Qué tipo de dispositivo contiene la imagen de rescate?"
 
 # ../loader/loader.c:1487
 # ../loader/loader.c:1487
 # ../loader/loader.c:1487
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "¿Qué tipo de dispositivo contiene los paquetes para ser instalados?"
 
 # ../partitioning.py:1465
 # ../partitioning.py:1485
 # ../partitioning.py:1488
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "No se encontró el driver"
 
 # ../iw/fdisk_gui.py:93
 # ../iw/fdisk_gui.py:93
 # ../iw/fdisk_gui.py:93
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Seleccione el controlador"
 
 # ../loader/devices.c:232
 # ../loader/devices.c:232
 # ../loader/devices.c:232
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Use un disco de controladores"
 
-#: ../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?"
 msgstr "No pudo encontrar ningún dispositivo del tipo requerido para esta instalación. Le gustaría seleccionar manualmente su controlador o usar un disco de controlador? "
 
 # ../loader/loader.c:371
 # ../loader/loader.c:371
 # ../loader/loader.c:371
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Se han encontrado los siguientes dispositivos en su sistema."
 
 # ../loader/loader.c:399
 # ../loader/loader.c:399
 # ../loader/loader.c:399
-#: ../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 "No se han cargado controladores de dispositivos para su sistema. ¿Desearía cargar alguno en este momento? "
 
@@ -8419,25 +8419,25 @@ msgstr "No se han cargado controladores de dispositivos para su sistema. ¿Desea
 # ../loader/loader.c:321 ../loader/loader.c:382 ../loader/loader.c:398
 # ../loader/devices.c:230 ../loader/devices.c:237 ../loader/devices.c:358
 # ../loader/loader.c:321 ../loader/loader.c:382 ../loader/loader.c:398
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Dispositivos"
 
 # ../loader/loader.c:373 ../loader/loader.c:398
 # ../loader/loader.c:373 ../loader/loader.c:398
 # ../loader/loader.c:373 ../loader/loader.c:398
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Hecho"
 
 # ../loader/loader.c:373 ../loader/loader.c:398
 # ../loader/loader.c:373 ../loader/loader.c:398
 # ../loader/loader.c:373 ../loader/loader.c:398
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Añadir dispositivo"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ya se ejecutó el cargador. Arrancando el shell.\n"
@@ -8445,7 +8445,7 @@ msgstr "ya se ejecutó el cargador. Arrancando el shell.\n"
 # ../loader/loader.c:3019
 # ../loader/loader.c:3019
 # ../loader/loader.c:3019
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Ejecutando anaconda %s, el modo de rescate %s - por favor espere...\n"
@@ -8453,7 +8453,7 @@ msgstr "Ejecutando anaconda %s, el modo de rescate %s - por favor espere...\n"
 # ../loader/loader.c:3019
 # ../loader/loader.c:3019
 # ../loader/loader.c:3019
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Ejecutando anaconda %s - el instalador del sistema %s - por favor espere...\n"
@@ -8461,41 +8461,41 @@ msgstr "Ejecutando anaconda %s - el instalador del sistema %s - por favor espere
 # ../loader/loader.c:1214
 # ../loader/loader.c:1214
 # ../loader/loader.c:1214
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Incapaz de encontrar la imagen de instalación %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Comprobar \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Se están comprobando los medios..."
 
-#: ../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."
 msgstr "Incapaz de leer el total de control del descriptor de volument primario. Estosignifica probablemente que el disco ha sido creado sin añadir el total de control. "
 
-#: ../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 again.  If this test continues to fail you should not continue the install."
 msgstr "La imagen que acaba de probar tiene errores. Esto puede ser debido a un archivo descargado dañado o a un disco con errores. Si aplica, por favor limpie el disco en inténtelo nuevamente. Si esta prueba continúa fallando, debería suspender la instalación. "
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Exito"
 
-#: ../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 "La imágen que se acaba de probar fue verificada con éxito. Debe poderse instalar sin problemas desde este medio. Note que no todos los errores de medio/disco se pueden detectar con el chequeo de medios."
 
 # ../iw/package_gui.py:35 ../packages.py:42
 # ../iw/package_gui.py:35 ../packages.py:42
 # ../iw/package_gui.py:35 ../packages.py:43
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -8506,14 +8506,14 @@ msgstr ""
 "\n"
 "...%s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Control de integridad"
 
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Mal argumento para el dispositivo del comando del método kickstart %s: %s"
@@ -8521,15 +8521,15 @@ msgstr "Mal argumento para el dispositivo del comando del método kickstart %s:
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Se debe especificar el nombre de módulo para el comando de dispositivo de kickstart."
 
-#: ../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 "El prefijo debe estar entre 1 y 32 para redes IPv4 o entre 1 y 128 para redes IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid "%s is a wireless network adapter.  Please provide the ESSID and encryption key needed to access your wireless network.  If no key is needed, leave this field blank and the install will continue."
 msgstr "%s  es un adaptador inalámbrico. Por favor, indique el ESSID y la llave de cifrado para acceder a su red inalámbrica. Si no se necesita una llave, deje el campo en blanco y la instalación continuará."
@@ -8537,97 +8537,97 @@ msgstr "%s  es un adaptador inalámbrico. Por favor, indique el ESSID y la llave
 # ../loader/loader.c:308
 # ../loader/loader.c:308
 # ../loader/loader.c:308
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Llave de cifrado"
 
 # ../loader/devices.c:77
 # ../loader/devices.c:77
 # ../loader/devices.c:77
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Configuración inalámbrica"
 
 # ../loader/net.c:262
 # ../loader/net.c:262
 # ../loader/net.c:262
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP del servidor de nombres"
 
 # ../loader/net.c:266 ../loader/net.c:804
 # ../loader/net.c:266 ../loader/net.c:804
 # ../loader/net.c:266 ../loader/net.c:804
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Falta el Servidor de Nombres"
 
 # ../loader/net.c:267
 # ../loader/net.c:267
 # ../loader/net.c:267
-#: ../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 leave the field blank and the install will continue."
 msgstr "La petición de IP devolvió información de configuración, pero no incluyó un servidor de nombres DNS. Si no tiene esta información, puede dejar este campo en blanco y la instalación continuará."
 
 # ../loader/net.c:277
 # ../loader/net.c:277
 # ../loader/net.c:277
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Información IP no válida"
 
 # ../loader/net.c:278
 # ../loader/net.c:278
 # ../loader/net.c:278
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Ha introducido una dirección IP no válida"
 
 # ../textw/userauth_text.py:21
 # ../textw/userauth_text.py:22
 # ../textw/userauth_text.py:22
-#: ../loader2/net.c:589
-#: ../loader2/net.c:695
+#: ../loader/net.c:589
+#: ../loader/net.c:695
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: ../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 "Hubo un error al configurar su interfase de red."
 
 # ../loader/net.c:373
 # ../loader/net.c:373
 # ../loader/net.c:373
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configurar TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Debe seleccionar al menos un protocolo (IPv4 o IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "Se necesita IPv4 para NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "El método de instalación NFS necesita soporte IPv4."
 
 # ../loader/net.c:309 ../textw/network_text.py:82
 # ../loader/net.c:309 ../textw/network_text.py:82
 # ../loader/net.c:309 ../textw/network_text.py:82
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Dirección IPv4:"
 
-#: ../loader2/net.c:962
-#: ../loader2/net.c:1014
+#: ../loader/net.c:962
+#: ../loader/net.c:1014
 #: tmp/netconfig.glade.h:1
 #: tmp/netpostconfig.glade.h:1
 msgid "/"
@@ -8636,18 +8636,18 @@ msgstr "/"
 # ../loader/net.c:309 ../textw/network_text.py:82
 # ../loader/net.c:309 ../textw/network_text.py:82
 # ../loader/net.c:309 ../textw/network_text.py:82
-#: ../loader2/net.c:1002
+#: ../loader/net.c:1002
 msgid "IPv6 address:"
 msgstr "Dirección IPv6:"
 
 # ../loader/net.c:266 ../loader/net.c:804
 # ../loader/net.c:266 ../loader/net.c:804
 # ../loader/net.c:266 ../loader/net.c:804
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Servidor de nombres:"
 
-#: ../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 "Ingrese la dirección y prefijo IPv4 y/o IPv6 (dirección / prefijo). Para IPv4, la máscara de red puede ser con el estilo de la cuaterna separada por puntos o el estilo CIDR. En los campos puerta de enlace y nombre del servidor deben haber direcciones IPv4 o IPv6 válidas."
 
@@ -8657,43 +8657,43 @@ msgstr "Ingrese la dirección y prefijo IPv4 y/o IPv6 (dirección / prefijo). Pa
 # ../textw/silo_text.py:224
 # ../textw/silo_text.py:39 ../textw/silo_text.py:112
 # ../textw/silo_text.py:224
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Configuración manual de TCP/IP"
 
 # ../loader/net.c:404
 # ../loader/net.c:404
 # ../loader/net.c:404
-#: ../loader2/net.c:1224
-#: ../loader2/net.c:1230
+#: ../loader/net.c:1224
+#: ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Falta de información"
 
 # ../loader/net.c:405
 # ../loader/net.c:405
 # ../loader/net.c:405
-#: ../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 "Debe introducir una dirección IPv4 y una máscara de red o prefijo CIDR válidas."
 
 # ../loader/net.c:405
 # ../loader/net.c:405
 # ../loader/net.c:405
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Debe ingresar una dirección IPv6 y un prefijo CIDR válidos."
 
 # ../loader/net.c:611
 # ../loader/net.c:611
 # ../loader/net.c:611
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Determinando nombre de host y dominio..."
 
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Argumento erróneo para el comando de red kickstart %s: %s "
@@ -8701,7 +8701,7 @@ msgstr "Argumento erróneo para el comando de red kickstart %s: %s "
 # ../loader/net.c:756
 # ../loader/net.c:756
 # ../loader/net.c:756
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "bootproto erróneo %s especificado en el comando de red"
@@ -8709,33 +8709,33 @@ msgstr "bootproto erróneo %s especificado en el comando de red"
 # ../loader/loader.c:1057
 # ../loader/loader.c:1057
 # ../loader/loader.c:1057
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Dispositivo de Red"
 
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
 # ../loader/loader.c:1058
-#: ../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 "Tiene múltiples dispositivos de red en el sistema. ¿Cuáles le gustaría instalar?"
 
 # ../loader/net.c:170
 # ../loader/net.c:170
 # ../loader/net.c:170
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nombre del servidor NFS:"
 
 # ../loader/net.c:173 ../loader/urls.c:194
 # ../loader/net.c:173 ../loader/urls.c:194
 # ../loader/net.c:173 ../loader/urls.c:194
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Directorio %s:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Por favor, ingrese el nombre del servidor y el camino a sus imágenes %s."
@@ -8743,33 +8743,33 @@ msgstr "Por favor, ingrese el nombre del servidor y el camino a sus imágenes %s
 # ../loader/net.c:179
 # ../loader/net.c:179
 # ../loader/net.c:179
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Configuración NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Nombre de host especificado sin DNS configurado"
 
 # ../loader/urls.c:103
 # ../loader/urls.c:103
 # ../loader/urls.c:103
-#: ../loader2/nfsinstall.c:215
-#: ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215
+#: ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Recuperando"
 
 # ../loader/loader.c:1146
 # ../loader/loader.c:1146
 # ../loader/loader.c:1146
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Este directorio no pudo ser montado desde el servidor"
 
 # ../loader/loader.c:1141
 # ../loader/loader.c:1141
 # ../loader/loader.c:1141
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Este directorio no parece contener un árbol de instalación %s ."
@@ -8777,7 +8777,7 @@ msgstr "Este directorio no parece contener un árbol de instalación %s ."
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Argumento erróneo para el comando kickstart NFS %s: %s"
@@ -8785,26 +8785,26 @@ msgstr "Argumento erróneo para el comando kickstart NFS %s: %s"
 # ../textw/firewall_text.py:99
 # ../textw/firewall_text.py:99
 # ../textw/firewall_text.py:99
-#: ../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 "A la espera de una conexión telnet..."
 
 # ../loader/loader.c:3019
 # ../loader/loader.c:3019
 # ../loader/loader.c:3019
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Ejecución de anaconda a través de telnet..."
 
 # ../loader/urls.c:90 ../loader/urls.c:98
 # ../loader/urls.c:90 ../loader/urls.c:98
 # ../loader/urls.c:90 ../loader/urls.c:98
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Imposible extraer %s://%s/%s. "
@@ -8812,31 +8812,31 @@ msgstr "Imposible extraer %s://%s/%s. "
 # ../loader/loader.c:1214
 # ../loader/loader.c:1214
 # ../loader/loader.c:1214
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "No se puede recuperar la imagen de instalación."
 
 # ../loader/net.c:723
 # ../loader/net.c:723
 # ../loader/net.c:723
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Argumento erróneo para el comando kickstart Url %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Debe suministrar un argumento  --url para el método Url kickstart."
 
 # ../textw/xconfig_text.py:564
 # ../textw/xconfig_text.py:576
 # ../textw/xconfig_text.py:576
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Método %s Url desconocido "
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Por favor, ingrese el URL que contenga las imágenes %s en su servidor."
@@ -8844,39 +8844,39 @@ msgstr "Por favor, ingrese el URL que contenga las imágenes %s en su servidor."
 # ../loader/net.c:373
 # ../loader/net.c:373
 # ../loader/net.c:373
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Configurar proxy"
 
 # ../loader/net.c:179
 # ../loader/net.c:179
 # ../loader/net.c:179
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Configuración de URL"
 
 # ../loader/urls.c:242
 # ../loader/urls.c:242
 # ../loader/urls.c:242
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Debe ingresar una URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "La URL debe ser una URL ftp o http"
 
 # ../loader/urls.c:247
 # ../loader/urls.c:247
 # ../loader/urls.c:247
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Host desconocido"
 
 # ../loader/urls.c:248
 # ../loader/urls.c:248
 # ../loader/urls.c:248
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s no es un nombre de host válido."
@@ -8884,36 +8884,36 @@ msgstr "%s no es un nombre de host válido."
 # ../loader/urls.c:333
 # ../loader/urls.c:333
 # ../loader/urls.c:333
-#: ../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."
 msgstr "Si está usando un servidor proxy HTTP introduzca el nombre del servidor proxy HTTP que va a usar."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Nombre de Proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Puerto Proxy:"
 
 # ../loader/urls.c:226
 # ../loader/urls.c:226
 # ../loader/urls.c:226
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Configuración Adicional"
 
 # ../loader/windows.c:46
 # ../loader/windows.c:46
 # ../loader/windows.c:46
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Carga del driver SCSI"
 
 # ../loader/devices.c:513 ../loader/windows.c:47
 # ../loader/devices.c:513 ../loader/windows.c:47
 # ../loader/devices.c:513 ../loader/windows.c:47
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Carga del driver %s..."
diff --git a/po/et.po b/po/et.po
index 31eeb00d1..2dcecf4d4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -50,41 +50,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 "Olgu"
 
@@ -570,22 +570,22 @@ msgstr "%s failisüsteemi vormindamine..."
 #: ../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 "Viga"
 
@@ -641,8 +641,8 @@ msgstr ""
 "Alglaadimiseks vajuta <Enter>."
 
 #: ../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 "Jäta vahele"
 
@@ -949,21 +949,21 @@ msgstr "Paranda"
 
 #: ../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 "Jah"
 
 #: ../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 "Ei"
 
-#: ../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 "Proovi uuesti"
 
@@ -974,8 +974,8 @@ msgstr "Eira"
 #: ../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 "Loobu"
 
@@ -1824,21 +1824,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 "Tagasi"
 
 #: ../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 "Jätka"
 
@@ -2251,7 +2251,7 @@ msgstr "Sisesta kettagrupi (volume group) nimi"
 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 "Tere tulemast %s"
@@ -3141,7 +3141,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Keele valik"
 
-#: ../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 "Millist keelt kasutatakse installeerimisel?"
 
@@ -3512,7 +3512,7 @@ msgstr "Väljal \"%s\" peab olema väärtus."
 msgid "Dynamic IP"
 msgstr "Dünaamiline 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 "IP informatsiooni päringu saatmine %s jaoks..."
@@ -3697,7 +3697,7 @@ msgstr "Tundmatu"
 msgid "Hardware address: "
 msgstr "Riistvara aadress:"
 
-#: ../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 "Puuduv grupp"
@@ -3708,7 +3708,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Installeerida tuleb vähemalt üks keel."
 
 #: ../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 "Vigane IP string"
@@ -3943,7 +3943,7 @@ msgstr "RAID seadmed"
 msgid "None"
 msgstr "Pole"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Kõvakettad"
 
@@ -4849,12 +4849,12 @@ msgstr "Vigane IP string"
 msgid "Activate on boot"
 msgstr "Aktiveeritakse alglaadimisel"
 
-#: ../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 ""
@@ -4982,7 +4982,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 "Lüüs:"
 
@@ -5607,23 +5607,23 @@ 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 "Andmekandja kontroll"
 
-#: ../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 "Väljasta 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 "
@@ -5632,7 +5632,7 @@ msgstr ""
 "Vali \"%s\" lugejas oleva CD kontrollimiseks või \"%s\" CD väljutamiseks ja "
 "järgmise CD sisestamiseks."
 
-#: ../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 "
@@ -5642,7 +5642,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 "
@@ -5651,12 +5651,12 @@ msgstr ""
 "%s CD-d ei ole üheski CD lugejas. Palun sisesta %s CD ja vajuta uuesti "
 "proovimiseks %s."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Leiti CD"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5667,7 +5667,7 @@ msgstr ""
 "\n"
 "Vajuta %s installatsiooni alustamiseks CD-d kontrollimata."
 
-#: ../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 "
@@ -5676,7 +5676,7 @@ msgstr ""
 "Buutandmekandjaga klappivat %s CD-d ei leitud. Sisesta %s CD ja vajuta "
 "uuesti proovimiseks %s."
 
-#: ../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 "
@@ -5685,40 +5685,40 @@ msgstr ""
 "%s CD-d ei ole üheski CD lugejas. Palun sisesta %s CD ja vajuta uuesti "
 "proovimiseks %s."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD-d ei leitud"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "CD-lt ei leitud kiirstardi (kickstart) faili."
 
-#: ../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 "Kataloogi %s lugemine ebaõnnestus. %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Laadimine"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Draiveriketta lugemine..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Draiveriketta asukoht"
 
-#: ../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?"
 msgstr ""
 "Draiveriketta asukohaks sobivaid seadmeid on mitu.  Millist soovid kasutada?"
 
-#: ../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?"
@@ -5726,50 +5726,50 @@ msgstr ""
 "Kettal on mitu partitsiooni, millel võib olla ketta tõmmis. Millist soovid "
 "kasutada?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Partitsiooni ühendamine ebaõnnestus."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Vali ketta tõmmis"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Vali oma ketta tõmmise fail."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Draiveriketta laadimine failist ebaõnnestus."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sisesta draiveriketas seadmesse /dev/%s ja vajuta jätkamiseks \"Olgu\"."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Sisesta draiveriketas"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Draiveriketta ühendamise viga"
 
-#: ../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 "Vali käsitsi"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Loe järgmine ketas"
 
-#: ../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 "
@@ -5778,38 +5778,38 @@ msgstr ""
 "Draiverikettalt ei leitud ühtegi antud tüüpi seadet.  Kas soovid draiverit "
 "käsitsi valida, jätkata või proovida mõnda muud draiveriketast?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Draiveriketas"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Kas sul on draiveriketas?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Veel draiverikettaid?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Kas proovida veel mõnda draiveriketast?"
 
-#: ../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 "Kiirstardi viga"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Tundmatu draiveriketta kiirstardi asukoht: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5817,7 +5817,7 @@ msgid ""
 msgstr ""
 "Kiirstardi draiveriketta käsule edastati järgmine vigane korraldus: %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 "
@@ -5828,19 +5828,19 @@ msgstr ""
 "parameetrid ei ole täpselt teada, siis sulge see aken vajutades nuppu \"Olgu"
 "\".  Lubatavate parameetrite kohta saab infot F1 klahvi abil."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Mooduli parameetrite sisestamine"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Draivereid ei leitud"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Draiveriketta laadimine"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5848,7 +5848,7 @@ msgstr ""
 "Käsitsi paigaldamiseks ei leitud ühtegi draiverit.  Kas soovid kasutada "
 "draiveriketast?"
 
-#: ../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."
@@ -5856,26 +5856,26 @@ msgstr ""
 "Vali laetav draiver.  Kui seda ei ole nimistus ja sul on draiveriketas, siis "
 "vajuta F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Määra mooduli täiendavad parameetrid"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Laetava draiveri valik"
 
-#: ../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 "Andmekandja tuvastatud"
 
-#: ../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 "Kohalik installeerimise andmekandja tuvastatud..."
 
-#: ../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 "
@@ -5883,7 +5883,7 @@ msgid ""
 msgstr ""
 "Antud kataloogis olev %s installatsioonipuu ei klapi buutandmekandjaga."
 
-#: ../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."
@@ -5891,7 +5891,7 @@ msgstr ""
 "Viga installeerimisinfo lugemisel ISO tõmmistelt. Kontrolli ISO tõmmiseid ja "
 "proovi uuesti."
 
-#: ../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?"
@@ -5899,7 +5899,7 @@ msgstr ""
 "Arvutis ei tuvastatud ühtegi kõvaketast! Kas soovid täiendavaid seadmeid "
 "seadistada?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5910,123 +5910,123 @@ msgstr ""
 "tõmmised? Kui kettaseade ei ole siin ära toodud, siis vajuta F2 täiendavate "
 "seadmete seadistamiseks."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Tõmmiste kataloog:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Partitsiooni valimine"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Seadmelt %s ei leitud %s CD-de tõmmiseid."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Vigane argument kõvaketta kiirstardi meetodi käsule %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 "Kõvakettalt ei leitud kiirstardi faili."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Ei leia kõvaketast BIOS ketta %s jaoks"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Klaviatuuri tüüp"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Millist tüüpi klaviatuuri kasutad?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Viga kiirstardi faili %s avamisel: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Viga kiirstardi faili %s sisu lugemisel: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Viga %s-s (rida %d kiirstardi failis %s)."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Alglaadimiskettalt ei leitud ks.cfg faili."
 
-#: ../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 "Viga kiirstardi faili %s avamisel: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Vigane argument kiirstardi seiskamise meetodi käsule %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Tere tulemast %s - Pääste olek"
 
-#: ../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> elementide vahel  | <Tühik> valib | <F12> järgmine ekraan "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Vali keel"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Kohalik CDROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Kõvaketas"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s kataloog:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Tere tulemast %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Uuendustega ketta asukoht"
 
-#: ../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?"
 msgstr ""
 "Mitu seadet võib sisaldada uuendustega ketast. Millist neist soovid kasutada?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6035,73 +6035,73 @@ msgstr ""
 "Kettal on mitu partitsiooni, millel võib olla ketta tõmmis. Millist soovid "
 "kasutada?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sisesta uuendustega ketas seadmesse /dev/%s ja vajuta jätkamiseks \"Olgu\"."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Uuendustega ketas"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Uuendustega ketta ühendamine ebaõnnestus"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Uuendused"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Anaconda uuenduste lugemine..."
 
-#: ../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 "Viga kiirstardi faili %s avamisel: %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 "%s installeerimiseks pole piisavalt mälu."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Päästeviis"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installatsiooniviis"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Mis tüüpi andmekandja sisaldab päästetõmmist?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Mis tüüpi andmekandja sisaldab installeeritavaid pakette?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Draiverit ei leitud"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Vali draiver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Kasuta draiveriketast"
 
-#: ../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?"
@@ -6109,59 +6109,59 @@ msgstr ""
 "Ei leitud installatsioonitüübile vastavaid seadmeid.  Kas soovid draiverit "
 "käsitsi valida või kasutada draiveriketast?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Arvutis tuvastati järgmised seadmed."
 
-#: ../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 "Hetkel ei ole laetud ühtegi draiverit.  Kas soovid mõnda laadida?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Seadmed"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Valmis"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Lisa seade"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "laadija on juba käivitatud.  Shell-i laadimine.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Anaconda käivitamine %s päästeolekus  - palun oota...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "%s installatsiooniprogrammi anaconda käivitamine - palun oota...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Ei suudetud leida installeerimise tõmmist %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" kontrollimine..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Andmekandja kontrollimine..."
 
-#: ../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."
@@ -6169,7 +6169,7 @@ msgstr ""
 "Viga ketta kontrollsumma lugemisel esmaselt ketta deskriptorilt.  "
 "Tõenäoliselt on kettale jäänud kontrollsumma lisamata."
 
-#: ../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 "
@@ -6183,18 +6183,18 @@ msgstr ""
 "proovida.  Kui kontrollimine ikka ebaõnnestub, siis tuleks installeerimine "
 "katkestada."
 
-#: ../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"
@@ -6205,28 +6205,28 @@ msgstr ""
 "\n"
 "...%s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Kontrollsumma test"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Vigane argument seadme kiirstardi meetodi käsule %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Kiirstardi draiveriketta käsule edastati järgmine vigane korraldus: %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 "
@@ -6237,28 +6237,28 @@ msgstr ""
 "krüpteerimisvõti. Kui võtit ei ole vaja, siis jäta see tühjaks ning "
 "installeerimine jätkub."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Krüpteerimisvõti"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Traadita ühenduse seaded"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Nimeserveri IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Nimeserver"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6269,245 +6269,245 @@ msgstr ""
 "infot. Kui sa tead, mis asi on nimeserver, siis sisesta info ise. Kui sul ei "
 "ole seda infot, siis jäta väli tühjaks ja installatsioon jätkub."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Vigane IP informatsioon"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Sa sisestasid vigase IP aadressi."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Parool puudub"
 
-#: ../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 "Viga sihtketaste tühjendamisel.  Duplitseerimine ebaõnnestus."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Seadista TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Installeerida tuleb vähemalt üks keel."
 
-#: ../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 "IP aadress:"
 
-#: ../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 "IP aadress:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Nimeserver"
 
-#: ../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 "z/IPL seadistamine"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Informatsioon puudub"
 
-#: ../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 "Nii IP aadress kui ka võrgumask peavad olema sobivad."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Nii IP aadress kui ka võrgumask peavad olema sobivad."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Arvutinime ja domeeni tuvastamine..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Vigane argument kiirstardi võrgukäsule %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Vigane bootproto %s võrgukäsus"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Võrguseade"
 
-#: ../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 ""
 "Arvutis on mitu võrguseadet. Millist soovid installeerimiseks kasutada?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS serveri nimi:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s kataloog:"
 
-#: ../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 Seadistus"
 
-#: ../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 "Otsimine"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Seda kataloogi ei saa serverist ühendada."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Tundub, et see kataloog ei sisalda %s installeerimise puud."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Vigane argument NFS kiirstardi meetodi käsule %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 "Telneti ühenduse ootamine..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Anaconda käivitamine telneti kaudu..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s ei saada kätte: //%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Installi tõmmist ei saada kätte."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Vigane argument Url kiirstardi meetodi käsule %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url kiirstardi meetodile tuleb anda --url argument."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Tundmatu Url meetod %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 "Seadista TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS Seadistus"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Sa pead sisestama kataloogi."
 
-#: ../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 "Tundmatu arvuti"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ei ole sobiv arvutinimi."
 
-#: ../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."
 msgstr "Kui sa kasutad HTTP puhverserverit, siis sisesta selle nimi."
 
-#: ../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 "Edasine FTP seadistus"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI draiveri laadimine"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Laetakse draiverit %s..."
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 83cab6a11..6b14e4108 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -81,41 +81,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 "Onartu"
 
@@ -603,22 +603,22 @@ msgstr "%s fitxategitza egituratzen..."
 #: ../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 "Akatsa"
 
@@ -685,8 +685,8 @@ msgstr ""
 # ../textw/bootdisk_text.py:73 ../textw/lilo_text.py:30
 # ../textw/silo_text.py:25
 #: ../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 "Jauzi"
 
@@ -1020,8 +1020,8 @@ msgstr ""
 # ../textw/bootdisk_text.py:38 ../textw/partitioning_text.py:218
 #: ../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 "Bai"
 
@@ -1037,15 +1037,15 @@ msgstr "Bai"
 # ../textw/partitioning_text.py:218
 #: ../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 "Ez"
 
 # ../libfdisk/fsedit.c:1439 ../loader/net.c:254 ../loader/net.c:379
-#: ../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 "Saiatu Berriz"
 
@@ -1063,8 +1063,8 @@ msgstr ""
 #: ../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 "Etsi"
 
@@ -2063,22 +2063,22 @@ msgstr ""
 # ../textw/userauth_text.py:165 ../textw/userauth_text.py:196
 # ../textw/userauth_text.py:287
 #: ../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 "Atzera"
 
 # ../textw/partitioning_text.py:154 ../textw/partitioning_text.py:155
 #: ../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 "Jarraitu"
 
@@ -2499,7 +2499,7 @@ msgstr ""
 
 # ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:38 ../text.py:879
 # ../text.py:914
-#: ../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 "Ongietorria"
@@ -3477,7 +3477,7 @@ msgid "Language Selection"
 msgstr "Hizkuntzaren Hautaketa"
 
 # ../text.py:63
-#: ../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 "Ezarketak dirauen bitartean, zein hizkuntza erabiltzea nahi duzu?"
 
@@ -3877,7 +3877,7 @@ msgid "Dynamic IP"
 msgstr "IP Dinamikoa"
 
 # ../loader/net.c:389 ../loader/net.c:660
-#: ../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
 #, fuzzy, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "IP argibide eskaera bidaltzen..."
@@ -4087,7 +4087,7 @@ msgid "Hardware address: "
 msgstr "IP Helbidea:"
 
 # ../loader/net.c:379
-#: ../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 "Azalpenak Galdu dira"
@@ -4100,7 +4100,7 @@ msgstr "Hizkuntza bat Hautatu"
 
 # ../loader/net.c:254
 #: ../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 "IP -ren balio erabilkaitza"
@@ -4401,7 +4401,7 @@ msgid "None"
 msgstr "Amaituta"
 
 # ../loader/loader.c:656
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Disko Gogorrak"
 
@@ -5368,12 +5368,12 @@ msgstr "IP -ren balio erabilkaitza"
 msgid "Activate on boot"
 msgstr "Abiatzerakoan Piztu"
 
-#: ../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 ""
@@ -5519,7 +5519,7 @@ msgid "DHCPv6"
 msgstr ""
 
 # ../iw/network_gui.py:211
-#: ../textw/network_text.py:678 ../loader2/net.c:1055
+#: ../textw/network_text.py:678 ../loader/net.c:1055
 #, fuzzy
 msgid "Gateway:"
 msgstr "Pasabidea"
@@ -6271,31 +6271,31 @@ 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 ""
 
 # ../gui.py:365 ../gui.py:605
-#: ../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
 #, fuzzy
 msgid "Test"
 msgstr "Hurrengoa"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -6306,7 +6306,7 @@ msgid ""
 msgstr ""
 
 # ../loader/loader.c:853
-#: ../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 "
@@ -6317,12 +6317,12 @@ msgstr ""
 "\"zapaldu."
 
 # ../libfdisk/fsedit.c:1041
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Disko Gogorrik ez da aurkitu"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -6331,7 +6331,7 @@ msgid ""
 msgstr ""
 
 # ../loader/loader.c:853
-#: ../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 "
@@ -6342,7 +6342,7 @@ msgstr ""
 "\"zapaldu."
 
 # ../loader/loader.c:853
-#: ../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 "
@@ -6353,40 +6353,40 @@ msgstr ""
 "\"zapaldu."
 
 # ../libfdisk/fsedit.c:1041
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Disko Gogorrik ez da aurkitu"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
 # ../loader/loader.c:2073
-#: ../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 "%s direktorioa irakurtzean %s akatsa"
 
 # ../loader/loader.c:439 ../loader/loader.c:441
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Gaineratzen"
 
 # ../loader/devices.c:237
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 #, fuzzy
 msgid "Reading driver disk..."
 msgstr "Diskoa lotzerakoan porrot egin du."
 
 # ../loader/devices.c:503
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 #, fuzzy
 msgid "Driver Disk Source"
 msgstr "Disko Tramankulua"
 
 # ../loader/loader.c:941
-#: ../loader2/driverdisk.c:231
+#: ../loader/driverdisk.c:231
 #, fuzzy
 msgid ""
 "You have multiple devices which could serve as sources for a driver disk.  "
@@ -6394,7 +6394,7 @@ msgid ""
 msgstr "Zure sistemak sareko tramankulu asko ditu. Zein ezartzea nahi duzu?"
 
 # ../loader/loader.c:941
-#: ../loader2/driverdisk.c:263
+#: ../loader/driverdisk.c:263
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the driver "
@@ -6402,29 +6402,29 @@ msgid ""
 msgstr "Zure sistemak sareko tramankulu asko ditu. Zein ezartzea nahi duzu?"
 
 # ../loader/devices.c:237
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 #, fuzzy
 msgid "Failed to mount partition."
 msgstr "Diskoa lotzerakoan porrot egin du."
 
 # ../iw/fdisk_gui.py:109
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 #, fuzzy
 msgid "Select driver disk image"
 msgstr "'fdisk'-ek zein disko landu behar du?"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr ""
 
 # ../loader/devices.c:237
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 #, fuzzy
 msgid "Failed to load driver disk from file."
 msgstr "Diskoa lotzerakoan porrot egin du."
 
 # ../loader/devices.c:216
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, fuzzy, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
@@ -6432,18 +6432,18 @@ msgstr ""
 "zapaldu."
 
 # ../loader/devices.c:503
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 #, fuzzy
 msgid "Insert Driver Disk"
 msgstr "Disko Tramankulua"
 
 # ../loader/devices.c:237
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Diskoa lotzerakoan porrot egin du."
 
 # ../loader/devices.c:244
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, fuzzy, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr ""
@@ -6451,16 +6451,16 @@ msgstr ""
 "du balio."
 
 # ../text.py:935
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 #, fuzzy
 msgid "Manually choose"
 msgstr "Disko Zatiteka eskuz egin"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
@@ -6468,47 +6468,47 @@ msgid ""
 msgstr ""
 
 # ../loader/devices.c:503
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 #, fuzzy
 msgid "Driver disk"
 msgstr "Disko Tramankulua"
 
 # ../loader/devices.c:209
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Kontrolatzaileen diskorik bai?"
 
 # ../loader/devices.c:503
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 #, fuzzy
 msgid "More Driver Disks?"
 msgstr "Disko Tramankulua"
 
 # ../loader/devices.c:209
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 #, fuzzy
 msgid "Do you wish to load any more driver disks?"
 msgstr "Kontrolatzaileen diskorik bai?"
 
 # ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107
-#: ../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-en akatsa"
 
 # ../loader/net.c:644
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, fuzzy, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
 # ../loader/net.c:644
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, fuzzy, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -6516,7 +6516,7 @@ msgid ""
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
 # ../loader/devices.c:86
-#: ../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 "
@@ -6528,31 +6528,31 @@ msgstr ""
 "hurrengo pantalaira joateko \"Onartu\" botoitxoa orain zapaldu."
 
 # ../loader/devices.c:91
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 #, fuzzy
 msgid "Enter Module Parameters"
 msgstr "Moduluaren Agerbideak"
 
 # ../libfdisk/fsedit.c:1041
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 #, fuzzy
 msgid "No drivers found"
 msgstr "Disko Gogorrik ez da aurkitu"
 
 # ../loader/devices.c:209
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 #, fuzzy
 msgid "Load driver disk"
 msgstr "Kontrolatzaileen diskorik bai?"
 
-#: ../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 ""
 
 # ../loader/devices.c:304
-#: ../loader2/driverselect.c:191
+#: ../loader/driverselect.c:191
 #, fuzzy
 msgid ""
 "Please select the driver below which you wish to load.  If it does not "
@@ -6563,31 +6563,31 @@ msgstr ""
 "F2 zapaldu, mesedez."
 
 # ../loader/devices.c:313
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 #, fuzzy
 msgid "Specify optional module arguments"
 msgstr "Moduarentzako agerbideak zehaztu"
 
 # ../iw/fdisk_gui.py:109
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 #, fuzzy
 msgid "Select Device Driver to Load"
 msgstr "'fdisk'-ek zein disko landu behar du?"
 
 # ../xserver.py:26
-#: ../loader2/hdinstall.c:80 ../loader2/nfsinstall.c:168
-#: ../loader2/urlinstall.c:274
+#: ../loader/hdinstall.c:80 ../loader/nfsinstall.c:168
+#: ../loader/urlinstall.c:274
 #, fuzzy
 msgid "Media Detected"
 msgstr "Xagurik ez da topatu"
 
-#: ../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 ""
 
-#: ../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 "
@@ -6595,7 +6595,7 @@ msgid ""
 msgstr ""
 
 # ../libfdisk/fsedit.c:1355 ../libfdisk/fsedit.c:1435
-#: ../loader2/hdinstall.c:253
+#: ../loader/hdinstall.c:253
 #, fuzzy
 msgid ""
 "An error occured reading the install from the ISO images. Please check your "
@@ -6603,7 +6603,7 @@ msgid ""
 msgstr "%s-ko zati-taula irakurtzean akats bat gertatu da. Akatsa hau izan da:"
 
 # ../loader/loader.c:657
-#: ../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?"
@@ -6612,7 +6612,7 @@ msgstr ""
 "bategokitzerik nahi dozu?"
 
 # ../loader/loader.c:671
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, fuzzy, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6625,99 +6625,99 @@ msgstr ""
 "egokitu."
 
 # ../loader/loader.c:685
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Irudiak dauzkan direktorioa:"
 
 # ../loader/loader.c:705
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Disko-zatia Hautatu"
 
 # ../loader/loader.c:753
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, fuzzy, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s tramankulua Red Hat Linux-eko CDROM irudietan ez da ageri."
 
 # ../loader/net.c:644
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, fuzzy, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
 # ../image.py:53
-#: ../loader2/hdinstall.c:541 ../loader2/hdinstall.c:597
+#: ../loader/hdinstall.c:541 ../loader/hdinstall.c:597
 #, fuzzy
 msgid "Cannot find kickstart file on hard drive."
 msgstr "Ezarketaren irudia disko gogrrera bidaltzen..."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr ""
 
 # ../loader/lang.c:57
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Teklatu Mota"
 
 # ../loader/lang.c:577
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Zein teklatu mota daukazu?"
 
 # ../loader/kickstart.c:59
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, fuzzy, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s kickstart fitxategia irekitzean %s akatsa gertatu da"
 
 # ../loader/kickstart.c:69
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s kickstart fitxategiaren edukinak irakurtzean %s akatsa"
 
 # ../loader/kickstart.c:108
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, fuzzy, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%d. lerroan akatsa ( %s kickstart fitxategian)."
 
 # ../loader/loader.c:2027
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Abiatze disketean 'ks.cfg' ezin izan da aurkitu."
 
-#: ../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 ""
 
 # ../loader/kickstart.c:59
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 #, fuzzy
 msgid "Error downloading kickstart file"
 msgstr "%s kickstart fitxategia irekitzean %s akatsa gertatu da"
 
 # ../loader/net.c:644
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, fuzzy, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
 # ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:38 ../text.py:879
 # ../text.py:914
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Ongietorria"
 
 # ../loader/lang.c:338 ../loader/loader.c:148
-#: ../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 ""
@@ -6725,42 +6725,42 @@ msgstr ""
 "hurrengo pantaila "
 
 # ../loader/lang.c:287
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Hizkuntza bat Hautatu"
 
 # ../loader/loader.c:121
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Bertoko 'CDROM'-a"
 
 # ../loader/loader.c:129
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disko Gogorra"
 
 # ../loader/net.c:152 ../loader/urls.c:191
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "Red Hat-en direktorioa:"
 
 # ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:38 ../text.py:879
 # ../text.py:914
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Ongietorria"
 
 # ../loader/loader.c:2135
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 #, fuzzy
 msgid "Update Disk Source"
 msgstr "Eguneraketako diskoa"
 
 # ../loader/loader.c:941
-#: ../loader2/loader.c:375
+#: ../loader/loader.c:375
 #, fuzzy
 msgid ""
 "You have multiple devices which could serve as sources for an update disk.  "
@@ -6768,7 +6768,7 @@ msgid ""
 msgstr "Zure sistemak sareko tramankulu asko ditu. Zein ezartzea nahi duzu?"
 
 # ../loader/loader.c:941
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6776,102 +6776,102 @@ msgid ""
 msgstr "Zure sistemak sareko tramankulu asko ditu. Zein ezartzea nahi duzu?"
 
 # ../loader/loader.c:2136
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, fuzzy, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Jarraitzeko eguneraketa diskete bat sartu eta \"Onartu\" zapaldu."
 
 # ../loader/loader.c:2135
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Eguneraketako diskoa"
 
 # ../loader/devices.c:237
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 #, fuzzy
 msgid "Failed to mount updates disk"
 msgstr "Diskoa lotzerakoan porrot egin du."
 
 # ../loader/loader.c:2149
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Eguneraketak"
 
 # ../loader/loader.c:2149
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "'Anaconda'-ren eguneraketak irakurtzen..."
 
-#: ../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 ""
 
 # ../loader/kickstart.c:59
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "%s kickstart fitxategia irekitzean %s akatsa gertatu da"
 
 # ../loader/lang.c:287
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, fuzzy, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Hizkuntza bat Hautatu"
 
 # ../loader/loader.c:1390
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Berreskuraketa Bidea"
 
 # ../loader/loader.c:1391
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Ezarketa Bidea"
 
 # ../loader/loader.c:1393
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Berreskuratze irudia zein tramankulutan dago?"
 
 # ../loader/loader.c:1395
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Ezarketako Sortak zein tramankulutan daude?"
 
 # ../libfdisk/fsedit.c:1041
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 #, fuzzy
 msgid "No driver found"
 msgstr "Disko Gogorrik ez da aurkitu"
 
 # ../iw/fdisk_gui.py:109
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 #, fuzzy
 msgid "Select driver"
 msgstr "'fdisk'-ek zein disko landu behar du?"
 
 # ../loader/devices.c:209
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 #, fuzzy
 msgid "Use a driver disk"
 msgstr "Kontrolatzaileen diskorik bai?"
 
-#: ../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?"
 msgstr ""
 
 # ../loader/loader.c:325
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 #, fuzzy
 msgid "The following devices have been found on your system."
 msgstr "Zure sisteman ondoko tramankulu hauek aurkitu dira:"
 
 # ../loader/loader.c:353
-#: ../loader2/loader.c:1417
+#: ../loader/loader.c:1417
 #, fuzzy
 msgid ""
 "No device drivers have been loaded for your system.  Would you like to load "
@@ -6882,79 +6882,79 @@ msgstr ""
 
 # ../loader/devices.c:207 ../loader/devices.c:214 ../loader/devices.c:333
 # ../loader/loader.c:275 ../loader/loader.c:336 ../loader/loader.c:352
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Tramankuluak"
 
 # ../loader/loader.c:327 ../loader/loader.c:352
 # ../textw/partitioning_text.py:64
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Amaituta"
 
 # ../loader/loader.c:327 ../loader/loader.c:352
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Tramankulua Gehitu"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
 # ../loader/loader.c:2149
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "'Anaconda'-ren eguneraketak irakurtzen..."
 
 # ../loader/loader.c:2149
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "'Anaconda'-ren eguneraketak irakurtzen..."
 
 # ../loader/loader.c:1136
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, fuzzy, c-format
 msgid "Unable to find install image %s"
 msgstr "Ezarketako bigarren irudia lortzea ezinezkoa izan dal."
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -6962,29 +6962,29 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
 # ../loader/net.c:644
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, fuzzy, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
 # ../loader/net.c:644
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
-#: ../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 "
@@ -6993,34 +6993,34 @@ msgid ""
 msgstr ""
 
 # ../loader/loader.c:262
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 #, fuzzy
 msgid "ESSID"
 msgstr "SCSI"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr ""
 
 # ../loader/devices.c:77
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 #, fuzzy
 msgid "Wireless Settings"
 msgstr "Denetatik"
 
 # ../loader/net.c:239
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Izen Zerbitzariaren IP -a"
 
 # ../loader/net.c:243 ../loader/net.c:725
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Zerbitzari Izena"
 
 # ../loader/net.c:244
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -7033,68 +7033,68 @@ msgstr ""
 "ezarketarekin jarraitu."
 
 # ../loader/net.c:254
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "IP -ren balio erabilkaitza"
 
 # ../loader/net.c:255
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "IP helbide erabilkaitza idatzi duzu."
 
 # ../text.py:887 ../text.py:955
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Sarearen Egituraketa"
 
-#: ../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 ""
 
 # ../loader/net.c:34
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP Egokitu"
 
 # ../loader/lang.c:287
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Hizkuntza bat Hautatu"
 
-#: ../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 ""
 
 # ../loader/net.c:284 ../textw/network_text.py:69
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 #, fuzzy
 msgid "IPv4 address:"
 msgstr "IP Helbidea:"
 
-#: ../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 ""
 
 # ../loader/net.c:284 ../textw/network_text.py:69
-#: ../loader2/net.c:1002
+#: ../loader/net.c:1002
 #, fuzzy
 msgid "IPv6 address:"
 msgstr "IP Helbidea:"
 
 # ../loader/net.c:243 ../loader/net.c:725
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Zerbitzari Izena"
 
-#: ../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 "
@@ -7103,191 +7103,191 @@ msgstr ""
 
 # ../text.py:923 ../textw/silo_text.py:28 ../textw/silo_text.py:101
 # ../textw/silo_text.py:213
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 #, fuzzy
 msgid "Manual TCP/IP Configuration"
 msgstr "SILO-ren Egokitzaketa"
 
 # ../loader/net.c:379
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Azalpenak Galdu dira"
 
 # ../loader/net.c:380
-#: ../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 "IP helbide eta sare-mozorro baliagarriak idatzi behar dituzu."
 
 # ../loader/net.c:380
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "IP helbide eta sare-mozorro baliagarriak idatzi behar dituzu."
 
 # ../loader/net.c:532
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Ostalariaren izen eta jabetza zehazten..."
 
 # ../loader/net.c:644
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, fuzzy, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
 # ../loader/net.c:677
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Sare aginduan zehaztutako %s abiatze hizketa-araua okerra"
 
 # ../loader/loader.c:940
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Sareko Tramankulua"
 
 # ../loader/loader.c:941
-#: ../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 "Zure sistemak sareko tramankulu asko ditu. Zein ezartzea nahi duzu?"
 
 # ../loader/net.c:149
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS zerbitzariaren izena:"
 
 # ../loader/net.c:152 ../loader/urls.c:191
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, fuzzy, c-format
 msgid "%s directory:"
 msgstr "Red Hat-en direktorioa:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr ""
 
 # ../loader/net.c:158
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS-ren Egituraketa"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr ""
 
 # ../loader/urls.c:100
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Berreskuratzen"
 
 # ../loader/loader.c:1028
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 #, fuzzy
 msgid "That directory could not be mounted from the server."
 msgstr "Zerbitzaritik direktorio hori ezin izan dut lotu"
 
 # ../loader/loader.c:1023
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, fuzzy, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Badirudi direktorio horrek Red Hat-eko ezarketa zuhaitzik ez daukala."
 
 # ../loader/net.c:644
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, fuzzy, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
 # ../iw/account_gui.py:274 ../libfdisk/newtfsedit.c:1445
 # ../textw/userauth_text.py:195
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 #, fuzzy
 msgid "Telnet"
 msgstr "Ezabatu"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
 # ../loader/loader.c:2149
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 #, fuzzy
 msgid "Running anaconda via telnet..."
 msgstr "'Anaconda'-ren eguneraketak irakurtzen..."
 
 # ../loader/urls.c:88 ../loader/urls.c:95
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s ezin izan da lortu: %s"
 
 # ../loader/loader.c:1127
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 #, fuzzy
 msgid "Unable to retrieve the install image."
 msgstr "Ezarketako lehen irudia lortzea ezinezkoa izan da."
 
 # ../loader/net.c:644
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, fuzzy, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "%s kickstart-eko %s sare aginduak argumentu okerra"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
 # ../libfdisk/newtfsedit.c:486
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, fuzzy, c-format
 msgid "Unknown Url method %s"
 msgstr "Ezezaguna"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr ""
 
 # ../loader/net.c:34
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "TCP/IP Egokitu"
 
 # ../loader/net.c:158
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS-ren Egituraketa"
 
 # ../loader/urls.c:239
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Direktorio bat idatzi behar duzu."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr ""
 
 # ../loader/urls.c:244
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Ostalari Ezezaguna"
 
 # ../loader/urls.c:245
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s Ostalariaren izena baliogabea da."
 
 # ../loader/urls.c:322
-#: ../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."
@@ -7295,27 +7295,27 @@ msgstr ""
 "HTTP proxy zerbitzaria erabiltzen ari bazara, erabili beharreko HTTP proxy "
 "zerbitzariaren izena idatzi."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr ""
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr ""
 
 # ../loader/urls.c:223
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 #, fuzzy
 msgid "Further Setup"
 msgstr "FTP Egituratu"
 
 # ../loader/windows.c:46
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI kontrolatzailea bereganatzen"
 
 # ../loader/windows.c:47
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s kontrolatzailea bereganatzen..."
diff --git a/po/fa.po b/po/fa.po
index 8e120f5a7..3a4791a6d 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -53,41 +53,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 "تأیید"
 
@@ -564,22 +564,22 @@ msgstr "در حال قالب‌بندی سیستم پرونده‌ای ‎%s..."
 #: ../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 "خطا"
 
@@ -635,8 +635,8 @@ msgstr ""
 "برای راه‌اندازی مجدد سیستم خود کلید <ورود> را فشار دهید."
 
 #: ../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 "پرش"
 
@@ -943,21 +943,21 @@ msgstr "ترمیم"
 
 #: ../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 "بله"
 
 #: ../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 "خیر"
 
-#: ../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 "دوباره سعی شود"
 
@@ -968,8 +968,8 @@ msgstr "نادیده گرفته شود"
 #: ../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 "انصراف"
 
@@ -1817,21 +1817,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 "عقب"
 
 #: ../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 "ادامه"
 
@@ -2254,7 +2254,7 @@ msgstr "لطفاً نام گروه جلد را وارد کنید."
 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 "به %s خوش آمدید"
@@ -3121,7 +3121,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "انتخاب زبان"
 
-#: ../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 "در طی روند نصب می‌خواهید از چه زبانی استفاده کنید؟"
 
@@ -3494,7 +3494,7 @@ msgstr "مقداری برای فیلد «%s» لازم است."
 msgid "Dynamic IP"
 msgstr "‏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 "در حال فرستادن درخواست برای اطلاعات IP‏ برای %s..."
@@ -3680,7 +3680,7 @@ msgstr "نامعلوم"
 msgid "Hardware address: "
 msgstr "نشانی سخت‌افزاری:"
 
-#: ../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 "گروه ناموجود"
@@ -3690,7 +3690,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 "رشتهٔ IP‏ نامعتبر"
@@ -3927,7 +3927,7 @@ msgstr "دستگاه‌های RAID"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "‌دیسک‌گردان‌های سخت"
 
@@ -4849,12 +4849,12 @@ msgstr "رشتهٔ IP‏ نامعتبر"
 msgid "Activate on boot"
 msgstr "فعال کردن هنگام راه‌اندازی"
 
-#: ../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 ""
@@ -4982,7 +4982,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 "دروازه:"
 
@@ -5603,23 +5603,23 @@ 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 "بررسی رسانه"
 
-#: ../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 "آزمایش"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "بیرون دادن سی‌دی"
 
-#: ../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 "
@@ -5628,7 +5628,7 @@ msgstr ""
 "برای آزمایش سی‌دی داخل دیسک‌گردان روی دکمهٔ «%s»، و برای بیرون دادن سی‌دی و داخل "
 "کردن سی‌دی دیگری برای آزمایش روی دکمهٔ «%s» کلیک کنید."
 
-#: ../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 "
@@ -5638,7 +5638,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 "
@@ -5647,12 +5647,12 @@ msgstr ""
 "سی‌دی %s در هیچ یک از سی‌دی‌گردان‌های شما پیدا نشد. لطفاً سی‌دی %s را وارد کنید و "
 "برای تلاش مجدد روی دکمهٔ «%s» کلیک کنید."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "سی‌دی پیدا شد"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5663,7 +5663,7 @@ msgstr ""
 "\n"
 "برای پرش از آزمایش رسانه و شروع نصب روی دکمهٔ %s کلیک کنید."
 
-#: ../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 "
@@ -5672,7 +5672,7 @@ msgstr ""
 "هیچ سی‌دی %s که با رسانهٔ راه‌اندازی شما تطبیق کند پیدا نشد. لطفاً سی‌دی %s را "
 "وارد کنید و برای تلاش مجدد روی دکمهٔ %s کلیک کنید."
 
-#: ../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 "
@@ -5681,33 +5681,33 @@ msgstr ""
 "سی‌دی %s در هیچ یک از سی‌دی‌گردان‌های شما پیدا نشد. لطفاً سی‌دی %s را وارد کنید و "
 "برای تلاش مجدد روی دکمهٔ «%s» کلیک کنید."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "سی‌دی پیدا نشد"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "نمی‌توان پروندهٔ راه‌اندازی را روی سی‌دی یافت."
 
-#: ../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 "خواندن شاخهٔ %s شکست خورد: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "در حال بار کردن"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "در حال خواندن دیسک گرداننده..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "مبدأ دیسک گرداننده"
 
-#: ../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?"
@@ -5715,7 +5715,7 @@ msgstr ""
 "شما دارای چندین دستگاه هستید که می‌توانند به عنوان مبدأ دیسک گرداننده عمل "
 "کنند. از کدام یک می‌خواهید استفاده کنید؟"
 
-#: ../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?"
@@ -5723,51 +5723,51 @@ msgstr ""
 "چند افراز روی این دستگاه است که می‌تواند حاوی تصویر دیسک گرداننده باشند. از "
 "کدام یک می‌خواهید استفاده کنید؟"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "سوار کردن افراز شکست خورد."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "انتخاب تصویر دیسک گرداننده"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "بار کردن تصویر دیسک گرداننده از پرونده شکست خورد."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "دیسک گردانندهٔ خود را در ‎/dev/%s وارد کنید و  برای ادامه روی دکمهٔ «تأیید» کلیک "
 "کنید."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "دیسک گرداننده را وارد کنید"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "سوار کردن دیسک گرداننده شکست خورد."
 
-#: ../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 "انتخاب دستی"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "بار کردن یک دیسک دیگر"
 
-#: ../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 "
@@ -5777,38 +5777,38 @@ msgstr ""
 "دستی گرداننده را انتخاب کنید، با وجود پیدا نشدن گرداننده ادامه دهید، یا دیسک "
 "گردانندهٔ دیگری را بار کنید؟"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "دیسک گرداننده"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "آیا دیسک گرداننده دارید؟"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "دیسک گردانندهٔ دیگری هست؟"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "آیا می‌خواهید دیسک‌های گردانندهٔ دیگری را بار کنید؟"
 
-#: ../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 "خطای راه‌اندازی"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "مبدأ نامعلوم راه‌اندازی دیسک گرداننده: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5817,7 +5817,7 @@ msgstr ""
 "آرگومان‌های نامعتبر زیر برای فرمان راه‌اندازی دیسک گرداننده مشخص شده بودند: %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 "
@@ -5825,19 +5825,19 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "پارامترهای پیمانه را وارد کنید"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "گرداننده‌ای پیدا نشد"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "بار کردن دیسک گرداننده"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5845,7 +5845,7 @@ msgstr ""
 "هیچ گرداننده‌ای پیدا نشد که دستی وارد شود. آیا می‌خواهید از دیسک گرداننده "
 "استفاده کنید؟"
 
-#: ../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."
@@ -5853,26 +5853,26 @@ msgstr ""
 "لطفاً گرداننده‌ای را که می‌خواهید بار کنید از فهرست زیر انتخاب کنید. اگر چیزی "
 "ظاهر نشد و شما دیسک گرداننده‌ای دارید، F2 را فشار دهید."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "آرگومان‌های اختیاری پیمانه را مشخص کنید"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "گردانندهٔ دستگاه را انتخاب کنید تا بار شود"
 
-#: ../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 "رسانه تشخیص داده شد"
 
-#: ../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 "رسانهٔ نصب محلی کشف شد..."
 
-#: ../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 "
@@ -5880,7 +5880,7 @@ msgid ""
 msgstr ""
 "به نظر نمی‌رسد درخت نصب %s در این شاخه با رسانهٔ راه‌اندازی شما مطابق باشد."
 
-#: ../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."
@@ -5888,7 +5888,7 @@ msgstr ""
 "هنگام خواندن نصب از تصاویر ایزو خطایی رخ داد. لطفاً تصاویر ایزو خود را بررسی "
 "کرده و دوباره امتحان کنید."
 
-#: ../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?"
@@ -5896,7 +5896,7 @@ msgstr ""
 "به‌نظر نمی‌رسد که هیچ دیسک سختی روی سیستم‌تان داشته باشید! آیا می‌خواهید "
 "دستگاه‌های اضافی را پیکربندی کنید؟"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5907,115 +5907,115 @@ msgstr ""
 "دیسک‌گردانی که از آن استفاده می‌کنید اینجا فهرست نشده است، F2 را برای پیکربندی "
 "دستگاه‌های بیشتر فشار دهید."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "شاخهٔ حاوی تصاویر:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "انتخاب افراز"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "به‌نظر نمی‌رسد دستگاه %s حاوی تصاویر سی‌دی %s باشد."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "آرگومان بد برای فرمان روش راه‌اندازی دیسک سخت %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 "نمی‌توان پروندهٔ راه‌اندازی را روی دیسک سخت پیدا کرد."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "نمی‌توان دیسک سخت را برای دیسک BIOS ‏%s پیدا کرد"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "نوع صفحه‌کلید"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "چه نوع صفحه‌کلیدی دارید؟"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "خطا در باز کردن پروندهٔ راه‌اندازی %s:‏ %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "خطا در خواندن محتویات پروندهٔ راه‌اندازی %s: ‏%s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "خطا در %s در سطر %Id پروندهٔ راه‌اندازی %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "نمی‌توان ks.cfg را در دیسک نرم راه‌اندازی پیدا کرد."
 
-#: ../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 "خطا در باز کردن پروندهٔ راه‌اندازی %s:‏ %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "آرگومان بد برای فرمان روش راه‌اندازی دیسک سخت %s : %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "به %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> بین اجزا  | <Space> انتخاب | <F12> صفحهٔ بعد "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "یک زبان انتخاب کنید"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "سی‌دی محلی"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "دیسک سخت"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "شاخهٔ %s:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "به %s خوش آمدید"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "به‌هنگام‌سازی مبدأ دیسک"
 
-#: ../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?"
@@ -6023,7 +6023,7 @@ msgstr ""
 "شما چند دستگاه دارید که می‌توانند به عنوان مبدأ دیسک به‌هنگام‌سازی مورد استفاده "
 "قرار بگیرند. از کدام یک می‌خواهید استفاده کنید؟"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6032,74 +6032,74 @@ msgstr ""
 "چند افراز روی این دستگاه است که می‌تواند حاوی تصویر دیسک گرداننده باشند. از "
 "کدام یک می‌خواهید استفاده کنید؟"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "دیسک به‌هنگام‌سازی خود را در ‎/dev/%s وارد کنید و برای ادامه روی دکمهٔ «تأیید» "
 "کلیک کنید."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "دیسک به‌هنگام‌سازی"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "سوار کردن دیسک به‌هنگام‌سازی شکست خورد"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "به‌هنگام‌سازی"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "در حال خواندن به‌هنگام‌سازی‌های آناکوندا..."
 
-#: ../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 "خطا در باز کردن پروندهٔ راه‌اندازی %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 "شما برای نصب %s روی این رایانه به اندازهٔ کافی حافظهٔ RAM ندارید."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "روش نجات"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "روش نصب"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "چه نوع رسانه‌ای حاوی تصویر نجات است؟"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "چه نوع رسانه‌ای حاوی بسته‌هایی است که باید نصب شوند؟"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "گرداننده‌ای پیدا نشد"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "انتخاب گرداننده"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "استفاده از دیسکِ گرداننده"
 
-#: ../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?"
@@ -6108,11 +6108,11 @@ msgstr ""
 "می‌خواهید گردانندهٔ خود را دستی انتخاب کنید یا از یک دیسکِ گرداننده استفاده "
 "کنید؟"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "دستگاه‌های زیر در سیستم شما پیدا شده‌اند."
 
-#: ../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?"
@@ -6120,49 +6120,49 @@ msgstr ""
 "هیچ گردانندهٔ دستگاهی برای سیستم‌تان بار نشده است. آیا می‌خواهید حالا یک "
 "گرداننده بار کنید؟"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "دستگاه‌ها"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "انجام شد"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "اضافه کردن دستگاه"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "بارکننده قبلاً اجرا شده است. پوسته آغاز می‌شود.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "در حال اجرای آناکوندا، حالت نجات %s ‐ لطفاً صبر کنید...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "در حال اجرای آناکوندا، برنامهٔ نصب سیستم %s ‐ لطفاً صبر کنید...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "تصویر نصب %s پیدا نشد"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "در حال بررسی «%s»..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "حالا در حال بررسی رسانه..."
 
-#: ../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."
@@ -6170,25 +6170,25 @@ msgstr ""
 "خواندن مجموعِ مقابله‌ای دیسک از توصیفگرِ جلدِ اصلی ممکن نیست. این احتمالاً به این "
 "معنیاست که دیسک بدون اضافه کردن مجموع مقابله‌ای ایجاد شده است."
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -6199,29 +6199,29 @@ msgstr ""
 "\n"
 "‏   %s؟"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "آزمایش مجموع مقابله‌ای"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "آرگومان بد برای فرمان روش راه‌اندازی دستگاه %s : %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "آرگومان‌های نامعتبر زیر برای فرمان راه‌اندازی دیسک گرداننده مشخص شده بودند: %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 "
@@ -6232,28 +6232,28 @@ msgstr ""
 "به شبکهٔ بی‌سیم‌تان را وارد کنید. اگر کلید لازم نیست، فیلد آن را خالی بگذارید و "
 "نصب ادامه پیدا خواهد کرد."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "‎ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "کلید رمزنگاری"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "تنظیمات بی‌سیم"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "نشانی IP کارگزار نام"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "کارگزار نام"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6265,105 +6265,105 @@ msgstr ""
 "کنید. اگر چنین اطلاعاتی ندارید، می‌توانید این فیلد را خالی بگذارید و نصب را "
 "ادامه دهید."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "اطلاعات IP‏ نامعتبر است"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "نشانی IP نامعتبری وارد کرده‌اید."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 "هنگام پاک کردن دیسک‌گردان‌های هدف خطایی پیش آمد. همانندسازی شکست خورد."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "پیکربندی TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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 "نشانی 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 "نشانی IP:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "کارگزار نام"
 
-#: ../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 "پیکربندی z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "اطلاعات کم است"
 
-#: ../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 "باید هم نشانی IP معتبر و هم نقاب شبکه را وارد کنید."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "باید هم نشانی IP معتبر و هم نقاب شبکه را وارد کنید."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "در حال تعیین نام و دامنهٔ میزبان..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "آرگومان بد برای فرمان شبکه‌ای راه‌اندازی %s: ‏%s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "دستگاه شبکه‌ای"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6371,115 +6371,115 @@ msgstr ""
 "شما چند دستگاه شبکهٔ مختلف روی این سیستم دارید. از طریق کدام یک می‌خواهید نصب "
 "کنید؟"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "نام کارگزار NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "شاخهٔ %s:"
 
-#: ../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"
 
-#: ../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 "در حال بازیابی"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "سوار کردن این شاخه از کارگزار ممکن نشد."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "به نظر نمی‌رسد که این شاخه درخت نصب %s داشته باشد."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "آرگومان بد برای فرمان روش راه‌اندازی NFS ‏%s : %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "تِلنِت"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "در انتظار برای اتصال تِلنِت..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "در حال اجرای آناکوندا از طریق تِلنِت..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "بازیابی ‎%s://%s/%s/%s‏ ممکن نیست."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "بازیابی تصویر نصب ممکن نیست."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "آرگومان بد برای فرمان روش راه‌اندازی نشانی اینترنتی %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "باید یک آرگومان ‎--url به روش راه‌اندازی نشانی اینترنتی بدهید."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "روش نشانی اینترنتی نامعلوم %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 "پیکربندی TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "برپاسازی NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "باید شاخه‌ای وارد کنید."
 
-#: ../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 "میزبان نامعلوم"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s نام میزبان معتبری نیست."
 
-#: ../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."
@@ -6487,24 +6487,24 @@ msgstr ""
 "اگر از کارگزار پیشکار HTTP استفاده می‌کنید، نام کارگزار پیشکار HTTP مورد "
 "استفاده را وارد کنید."
 
-#: ../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 "برپاسازی بیشتر FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "در حال بار کردن گردانندهٔ SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "در حال بار کردن گردانندهٔ %s..."
diff --git a/po/fi.po b/po/fi.po
index bce8edb0c..60dc21e97 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -82,41 +82,41 @@ msgstr "Paina <enter> päästäksesi komentoriville"
 #: ../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"
 
@@ -667,22 +667,22 @@ msgstr "Muutetaan osion %s tiedostojärjestelmän kokoa..."
 #: ../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 "Virhe"
 
@@ -746,8 +746,8 @@ msgstr ""
 # ../textw/bootdisk_text.py:90 ../textw/silo_text.py:36
 # ../textw/upgrade_text.py:118
 #: ../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 "Ohita"
 
@@ -1102,8 +1102,8 @@ msgstr "Korjaa"
 # ../textw/constants_text.py:32 ../textw/upgrade_text.py:252
 #: ../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 "Kyllä"
 
@@ -1115,15 +1115,15 @@ msgstr "Kyllä"
 # ../textw/upgrade_text.py:259
 #: ../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 "Ei"
 
 # ../gui.py:112 ../loader/net.c:277 ../loader/net.c:404 ../text.py:284
-#: ../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 "Uudelleen"
 
@@ -1143,8 +1143,8 @@ msgstr "Jätä huomiotta"
 #: ../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 "Peru"
 
@@ -2128,22 +2128,22 @@ msgstr "_Kirjoita muutokset levylle"
 # ../textw/confirm_text.py:38 ../textw/constants_text.py:28
 # ../textw/silo_text.py:110 ../textw/userauth_text.py:185
 #: ../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 "Takaisin"
 
 # ../rescue.py:99
 #: ../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 "Jatka"
 
@@ -2624,7 +2624,7 @@ msgid "Skip entering %(instkey)s"
 msgstr "Ohita tämän tiedon syöttäminen: %(instkey)s"
 
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s (%s) - tervetuloa"
@@ -3615,7 +3615,7 @@ msgid "Language Selection"
 msgstr "Kielen valinta"
 
 # ../iw/language_gui.py:49 ../textw/language_text.py:39
-#: ../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 "Mitä kieltä asennuksen aikana käytetään?"
 
@@ -4037,7 +4037,7 @@ msgid "Dynamic IP"
 msgstr "Dynaaminen IP"
 
 # ../loader/net.c:414 ../loader/net.c:739
-#: ../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 "Pyydetään IP-tietoja laitteelle %s..."
@@ -4238,7 +4238,7 @@ msgid "Hardware address: "
 msgstr "Laitteisto-osoite: "
 
 # ../loader/net.c:404
-#: ../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 "Puuttuva protokolla"
 
@@ -4248,7 +4248,7 @@ msgstr "Ainakin IPv4- tai IPv6-tuki on valittava."
 
 # ../loader/net.c:277
 #: ../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 "Virheellinen etuliite"
 
@@ -4532,7 +4532,7 @@ msgid "None"
 msgstr "Ei yhtään"
 
 # ../loader/loader.c:816
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Kiintolevyt"
 
@@ -5548,12 +5548,12 @@ msgstr "Etuliite"
 msgid "Activate on boot"
 msgstr "Ota käyttöön käynnistyksessä"
 
-#: ../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 "Ota käyttöön IPv4-tuki"
 
-#: ../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 "Ota käyttöön IPv6-tuki"
@@ -5687,7 +5687,7 @@ msgid "DHCPv6"
 msgstr "DHCPv6"
 
 # ../iw/network_gui.py:251
-#: ../textw/network_text.py:678 ../loader2/net.c:1055
+#: ../textw/network_text.py:678 ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Yhdyskäytävä:"
 
@@ -6403,23 +6403,23 @@ msgstr ""
 "* Et saa ohjelmisto- ja turvallisuuspäivityksiä paketeille, jotka eivät "
 "kuulu tilaukseesi."
 
-#: ../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 "Asennusmedian tarkastus"
 
 # ../textw/xconfig_text.py:159 ../textw/xconfig_text.py:168
-#: ../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 "Tarkasta"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Poista levy"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -6428,7 +6428,7 @@ msgstr ""
 "Valitse ”%s” tarkastaaksesi asemassa olevan levyn, tai ”%s” poistaaksesi sen "
 "ja syöttääksesi toisen levyn testausta varten."
 
-#: ../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 "
@@ -6444,7 +6444,7 @@ msgstr ""
 "levyä ennen seuraavaa käyttökertaa."
 
 # ../loader/loader.c:968
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -6454,11 +6454,11 @@ msgstr ""
 "yrittääksesi uudelleen."
 
 # ../partitioning.py:1493
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Levy löytyi"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -6470,7 +6470,7 @@ msgstr ""
 "Tarkastuksen ohitus ja asennuksen aloitus: %s."
 
 # ../loader/loader.c:968
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -6480,7 +6480,7 @@ msgstr ""
 "yrittääksesi uudelleen."
 
 # ../loader/loader.c:968
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -6490,37 +6490,37 @@ msgstr ""
 "s yrittääksesi uudelleen."
 
 # ../partitioning.py:1493
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Levyä ei löytynyt"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "CD:ltä ei löydy kickstart-tiedostoa."
 
 # ../loader/loader.c:536 ../loader/loader.c:2238
-#: ../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 "Virhe luettaessa hakemistoa %s: %s"
 
 # ../loader/devices.c:513
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Ladataan"
 
 # ../loader/devices.c:513 ../loader/windows.c:47
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Ladataan ajurilevykettä..."
 
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Ajurilevykkeen lähde"
 
 # ../loader/loader.c:1058
-#: ../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?"
@@ -6529,7 +6529,7 @@ msgstr ""
 "Mitä niistä käytetään?"
 
 # ../loader/loader.c:1058
-#: ../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?"
@@ -6538,54 +6538,54 @@ msgstr ""
 "levykuvalle. Mitä niistä käytetään?"
 
 # ../loader/devices.c:260
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Osion liittäminen epäonnistui."
 
 # ../iw/fdisk_gui.py:93
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Valitse ajurilevykkeen levykuva"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Valitse ajurilevykuvan sisältävä tiedosto."
 
 # ../loader/devices.c:260
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Ajurilevykkeen lataaminen tiedostosta epäonnistui."
 
 # ../loader/devices.c:239
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Syötä ajurilevyke /dev/%s:iin ja jatka painamalla ”OK”."
 
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Syötä ajurilevyke"
 
 # ../loader/devices.c:260
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Ajurilevykkeen liittäminen epäonnistui."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Ajurilevyke ei kelpaa tälle %s:n julkaisulle."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Manuaalinen valinta"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Lataa toinen levyke"
 
-#: ../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 "
@@ -6595,42 +6595,42 @@ msgstr ""
 "ajuri manuaalisesti, jatketaanko silti, vai ladataanko toinen levyke?"
 
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Ajurilevyke"
 
 # ../loader/devices.c:232
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Onko Teillä ajurilevyke?"
 
 # ../loader/devices.c:532
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Lisää ajurilevykkeitä?"
 
 # ../loader/devices.c:232
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Haluatko ladata lisää ajurilevykkeitä?"
 
 # ../loader/kickstart.c:58 ../loader/kickstart.c:68 ../loader/kickstart.c:107
-#: ../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-virhe"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Tuntematon ajurilevykkeen kickstart-lähde: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -6640,7 +6640,7 @@ msgstr ""
 "argumentti: %s:%s"
 
 # ../loader/devices.c:86
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -6652,21 +6652,21 @@ msgstr ""
 "ohittaa tämän ruudun painamalla ”OK”-painiketta."
 
 # ../loader/devices.c:91
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Syötä moduulin parametrit"
 
 # ../partitioning.py:1493
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ajureita ei löytynyt"
 
 # ../loader/devices.c:232
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Lataa ajurilevyke"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6675,7 +6675,7 @@ msgstr ""
 "ajurilevykettä?"
 
 # ../loader/devices.c:327
-#: ../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."
@@ -6684,34 +6684,34 @@ msgstr ""
 "olemassa erillinen ajurilevyke, paina F2."
 
 # ../loader/devices.c:336
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Valitse moduulin parametrit"
 
 # ../iw/fdisk_gui.py:93
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Valitse ladattava ajuri"
 
-#: ../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 "Tallenne havaittu"
 
-#: ../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 "Paikallinen asennustallenne havaittu..."
 
-#: ../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 "
 "media."
 msgstr "%sn asennuspuu tässä hakemistossa ei täsmää käynnistysmedian kanssa."
 
-#: ../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."
@@ -6720,7 +6720,7 @@ msgstr ""
 "yritä uudelleen."
 
 # ../loader/loader.c:817
-#: ../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?"
@@ -6729,7 +6729,7 @@ msgstr ""
 "ylimääräisiä laitteita?"
 
 # ../loader/loader.c:831
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6741,71 +6741,71 @@ msgstr ""
 "painamalla F2."
 
 # ../loader/loader.c:845
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Levykuvat sisältävä hakemisto:"
 
 # ../loader/loader.c:865
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Valitse osio"
 
 # ../loader/loader.c:913
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Laite %s ei näytä sisältävän %s -levykuvatiedostoja."
 
 # ../loader/net.c:723
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Virheellinen parametri kiintolevy-kickstartin komennolle %s: %s"
 
 # ../image.py:63
-#: ../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 "Kickstart-tiedostoa ei löydy kiintolevyltä."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS-levylle %s ei löydy kiintolevyä"
 
 # ../loader/lang.c:606
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Näppäimistön tyyppi"
 
 # ../loader/lang.c:607
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Millainen näppäimistö koneessa on?"
 
 # ../loader/kickstart.c:59
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Virhe avattaessa kickstart-tiedostoa %s: %s"
 
 # ../loader/kickstart.c:69
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Virhe luettaessa kickstart-tiedoston %s sisältöä: %s"
 
 # ../loader/kickstart.c:108
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Virhe kohdassa %s rivillä %d kickstart-tiedostossa %s."
 
 # ../loader/loader.c:2208
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Irrotettavalta medialta ei löydy tiedostoa ks.cfg."
 
-#: ../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."
@@ -6814,62 +6814,62 @@ msgstr ""
 "parametria tai paina Peru jatkaaksesi vuorovaikutteisena asennuksena."
 
 # ../loader/kickstart.c:59
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Virhe ladattaessa kickstart-tiedostoa"
 
 # ../loader/net.c:723
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Virheellinen parametri sammutus-kickstartin komennolle %s: %s"
 
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s (%s) - tervetuloa pelastustilaan"
 
 # ../loader/lang.c:41 ../loader/loader.c:188
-#: ../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> vaihtaa kohtaa  | <Väli> valitsee | <F12> seuraava "
 
 #
 # ../loader/lang.c:297
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Valitse kieli"
 
 # ../loader/loader.c:123
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Paikallinen CD/DVD"
 
 # ../loader/loader.c:131
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Kiintolevy"
 
 # ../loader/net.c:173 ../loader/urls.c:194
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS-hakemisto"
 
 # ../iw/welcome_gui.py:21 ../iw/welcome_gui.py:48
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n (%s) - tervetuloa"
 
 # ../loader/loader.c:2300
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Päivityslevykkeen lähde"
 
 # ../loader/loader.c:1058
-#: ../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?"
@@ -6878,7 +6878,7 @@ msgstr ""
 "päivityslevykkeelle. Mitä niistä käytetään?"
 
 # ../loader/loader.c:1058
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6887,32 +6887,32 @@ msgstr ""
 "päivityslevykuvalle. Mitä niistä käytetään?"
 
 # ../loader/loader.c:2301
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Syötä päivityslevyke laitteeseen /dev/%s ja jatka painamalla ”OK”."
 
 # ../loader/loader.c:2300
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Päivityslevyke"
 
 # ../loader/devices.c:260
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Päivityslevykkeen liittäminen epäonnistui."
 
 # ../loader/loader.c:2321
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Päivitykset"
 
 # ../loader/loader.c:2321
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Luen asennusohjelma päivityksiä"
 
-#: ../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.."
@@ -6921,53 +6921,53 @@ msgstr ""
 "paina Peru jatkaaksesi ilman päivityksiä."
 
 # ../loader/kickstart.c:59
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Virhe ladattaessa päivityslevykuvaa"
 
 # ../loader/loader.c:2524
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 "Tässä koneessa ei ole tarpeeksi keskusmuistia, jotta %s voitaisiin asentaa."
 
 # ../loader/loader.c:1482
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Pelastusmenetelmä"
 
 # ../loader/loader.c:1483
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Asennusmenetelmä"
 
 # ../loader/loader.c:1485
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Minkälainen tallenne sisältää pelastusdatan?"
 
 # ../loader/loader.c:1487
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Minkälainen tallenne sisältää asennettavat paketit?"
 
 # ../partitioning.py:1493
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ajuria ei löytynyt"
 
 # ../iw/fdisk_gui.py:93
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Valitse ajuri"
 
 # ../loader/devices.c:232
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Käytä ajurilevykettä"
 
-#: ../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?"
@@ -6975,12 +6975,12 @@ msgstr ""
 "Tälle asennustyypille tarvittavia laitteita ei löytynyt. Haluatko "
 "manuualisesti valita ajurin tai käyttää ajurilevykettä?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Järjestelmästä löydettiin seuraavat laitteet."
 
 # ../loader/loader.c:399
-#: ../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?"
@@ -6990,55 +6990,55 @@ msgstr ""
 
 # ../loader/devices.c:230 ../loader/devices.c:237 ../loader/devices.c:358
 # ../loader/loader.c:321 ../loader/loader.c:382 ../loader/loader.c:398
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Laitteet"
 
 # ../loader/loader.c:373 ../loader/loader.c:398
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Valmis"
 
 # ../loader/loader.c:373 ../loader/loader.c:398
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Lisää laite"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "latain on jo ajettu. Käynnistetään kuori.\n"
 
 # ../loader/loader.c:3019
 # fuzzy, c-format
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Käynnistetään anaconda %s, %s -pelastustila - odota hetki...\n"
 
 # ../loader/loader.c:3019
 # fuzzy, c-format
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Käynnistetään anaconda %s, %s -asennusohjelma - odota hetki...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Asennuksen levykuvaa %s ei löydy"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Tarkastetaan ”%s”..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Tarkastetaan tallennetta..."
 
-#: ../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."
@@ -7046,7 +7046,7 @@ msgstr ""
 "Levyn tarkistussummaa ei löydy. Tämä todennäköisesti merkitsee, että levy "
 "luotiin lisäämättä tarkistussummaa."
 
-#: ../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 "
@@ -7056,11 +7056,11 @@ msgstr ""
 "rikkinäinen levy. Voit puhdista levyn ja kokeilla uudelleen. Jos virhe ei "
 "poistu, älä jatka asennusta."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Onnistui"
 
-#: ../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 "
@@ -7069,7 +7069,7 @@ msgstr ""
 "Tarkastettu levy on kunnossa. Tältä levyltä pitäisi pystyä tekemään asennus. "
 "Tarkastus ei kuitenkaan löydä kaikkia levyjen ja asemien virheitä."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -7080,21 +7080,21 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Tarkistussumman laskenta"
 
 # ../loader/net.c:723
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Virheellinen parametri laite-kickstartin komennolle %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Kickstart-laitekomennolle on määritettävä sekä moduulin nimi."
 
-#: ../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"
@@ -7102,7 +7102,7 @@ msgstr ""
 "Etuliitteen on oltava väliltä 1-32 IPv4-verkoille tai väliltä 1-128 IPv6-"
 "verkoille"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -7113,31 +7113,31 @@ msgstr ""
 "ESSID ja salausavain. Jos avainta ei tarvita, jätä tämä kohta tyhjäksi, ja "
 "asennus jatkuu."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Salausavain"
 
 # ../loader/devices.c:77
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Langattomat asetukset"
 
 # ../loader/net.c:262
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Nimipalvelimen IP"
 
 # ../loader/net.c:266 ../loader/net.c:804
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Nimipalvelin puuttuu"
 
 # ../loader/net.c:267
-#: ../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 "
@@ -7148,62 +7148,62 @@ msgstr ""
 "huolimatta."
 
 # ../loader/net.c:277
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Virheelliset IP-tiedot"
 
 # ../loader/net.c:278
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Syötit virheellisen IP-osoitteen."
 
 # ../textw/userauth_text.py:22
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: ../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 "Verkkoliitännän asetuksia tehtäessä tapahtui virhe."
 
 # ../loader/net.c:373
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfiguroi TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Valitse ainakin yksi protokolla (IPv4 tai IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS vaatii IPv4:n"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS-asennustapa vaatii IPv4-tuen."
 
 # ../loader/net.c:309 ../textw/network_text.py:82
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4-osoite:"
 
-#: ../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 "/"
 
 # ../loader/net.c:309 ../textw/network_text.py:82
-#: ../loader2/net.c:1002
+#: ../loader/net.c:1002
 msgid "IPv6 address:"
 msgstr "IPv6-osoite:"
 
 # ../loader/net.c:266 ../loader/net.c:804
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Nimipalvelin:"
 
-#: ../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 "
@@ -7216,17 +7216,17 @@ msgstr ""
 
 # ../textw/silo_text.py:39 ../textw/silo_text.py:112
 # ../textw/silo_text.py:224
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Manuaalinen TCP/IP:n asetus"
 
 # ../loader/net.c:404
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Puuttuvat tiedot"
 
 # ../loader/net.c:405
-#: ../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 ""
@@ -7234,189 +7234,189 @@ msgstr ""
 "etuliite."
 
 # ../loader/net.c:405
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "On syötettävä sekä kelvollinen IPv6-osoite että CIDR-etuliite."
 
 # ../loader/net.c:611
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Selvitetään koneen ja verkkoalueen nimeä..."
 
 # ../loader/net.c:723
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Virheellinen parametri kickstartin network-komennolle %s: %s"
 
 # ../loader/net.c:756
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Epäkelpo käynnistysprotokolla %s network-käskyssä"
 
 # ../loader/loader.c:1057
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Verkkolaite"
 
 # ../loader/loader.c:1058
-#: ../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 "Koneessa on useita verkkolaitteita. Minkä kautta haluat asentaa?"
 
 # ../loader/net.c:170
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS-palvelimen nimi:"
 
 # ../loader/net.c:173 ../loader/urls.c:194
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s -hakemisto:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Syötä palvelimen nimi ja polku %s -asennuskuviin."
 
 # ../loader/net.c:179
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS:n määrittely"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Konenimi annettu mutta DNS-asetuksia ei ole tehty"
 
 # ../loader/urls.c:103
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Haen"
 
 # ../loader/loader.c:1146
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Kyseisen hakemiston liittäminen palvelimelta ei onnistunut"
 
 # ../loader/loader.c:1141
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Hakemistosta ei löydy %s -asennushakemistopuuta."
 
 # ../loader/net.c:723
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Virheellinen parametri NFS-kickstartin komennolle %s: %s"
 
 # ../textw/firewall_text.py:99
-#: ../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 "Odotetaan telnet-yhteyttä..."
 
 # ../loader/loader.c:3019
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Suoritetaan Anacondaa telnetin kautta..."
 
 # ../loader/urls.c:90 ../loader/urls.c:98
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Haku epäonnistui: %s://%s/%s."
 
 # ../loader/loader.c:1214
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Asennusohjelman ensimmäisen osan noutaminen ei onnistu"
 
 # ../loader/net.c:723
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Virheellinen parametri URL-kickstartin komennolle %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "URL-kickstart vaatii --url-argumentin."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Tuntematon URL-tyyppi %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Syötä URL, joka sisältää %s -levykuvat palvelimellasi."
 
 # ../loader/net.c:373
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Konfiguroi välityspalvelin"
 
 # ../loader/net.c:179
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL-asetus"
 
 # ../loader/urls.c:242
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "On annettava URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL:n on oltava ftp- tai http-URL"
 
 # ../loader/urls.c:247
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Tuntematon kone"
 
 # ../loader/urls.c:248
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ei ole kelvollinen konenimi."
 
 # ../loader/urls.c:333
-#: ../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."
 msgstr ""
 "Jos käytät HTTP-välityspalvelinta, syötä käytettävän välityspalvelimen nimi."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Välityspalvelimen nimi:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Välityspalvelimen portti:"
 
 # ../loader/urls.c:226
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Lisäasetukset"
 
 # ../loader/windows.c:46
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Ladataan SCSI-ajuria"
 
 # ../loader/devices.c:513 ../loader/windows.c:47
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Ladataan %s-ajuria..."
diff --git a/po/fr.po b/po/fr.po
index 4dea46cbe..d89ebf09f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -59,41 +59,41 @@ msgstr "Appuyez sur <Entrée> pour ouvrir un interpréteur de commandes"
 #: ../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 "Valider"
 
@@ -589,22 +589,22 @@ msgstr "Redimensionnement du système de fichiers sur %s..."
 #: ../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 "Erreur"
 
@@ -660,8 +660,8 @@ msgstr ""
 "Appuyez sur <Entrée> pour quitter le programme d'installation."
 
 #: ../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 "Ignorer"
 
@@ -1002,21 +1002,21 @@ msgstr "Corriger"
 
 #: ../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 "Oui"
 
 #: ../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 "Non"
 
-#: ../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 "Réessayer"
 
@@ -1027,8 +1027,8 @@ msgstr "Ignorer"
 #: ../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 "Annuler"
 
@@ -1913,21 +1913,21 @@ msgid "_Write changes to disk"
 msgstr "_Écrire les modifications sur le disque"
 
 #: ../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 "Précédent"
 
 #: ../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 "Poursuivre"
 
@@ -2377,7 +2377,7 @@ msgstr "Veuillez saisir votre %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Passer la saisie de la %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Bienvenue dans %s pour %s"
@@ -3302,7 +3302,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Sélection de la langue"
 
-#: ../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 "Quelle langue souhaitez-vous utiliser durant le processus d'installation ?"
 
@@ -3679,7 +3679,7 @@ msgstr "Une valeur est nécessaire pour le champ « %s »."
 msgid "Dynamic IP"
 msgstr "IP dynamique"
 
-#: ../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 "Envoi d'une requête pour des informations sur l'IP de %s..."
@@ -3853,7 +3853,7 @@ msgstr "inconnu"
 msgid "Hardware address: "
 msgstr "Adresse matérielle : "
 
-#: ../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 "Protocole manquant"
 
@@ -3862,7 +3862,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Vous devez choisir au moins un protocole IPv4 ou IPv6."
 
 #: ../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 "Préfixe invalide"
 
@@ -4097,7 +4097,7 @@ msgstr "Périphériques RAID"
 msgid "None"
 msgstr "Aucun"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Disques durs"
 
@@ -5026,12 +5026,12 @@ msgstr "Préfixe"
 msgid "Activate on boot"
 msgstr "Activation au démarrage"
 
-#: ../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 "Activer le support IPv4"
 
-#: ../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 "Activer le support IPv6"
@@ -5152,7 +5152,7 @@ msgstr "IPv6 automatique"
 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 "Passerelle :"
 
@@ -5778,22 +5778,22 @@ msgstr ""
 "* Vous ne pourrez pas obtenir les logiciels et les mises à jour de sécurité "
 "des paquetages qui ne sont pas inclus dans votre abonnement."
 
-#: ../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 "Contrôle du support"
 
-#: ../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
 msgid "Eject Disc"
 msgstr "Éjecter le disque"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5802,7 +5802,7 @@ msgstr ""
 "Sélectionnez « %s » pour vérifier le disque présent dans le lecteur ou « %"
 "s » pour éjecter le disque et en introduire un autre afin de le contrôler."
 
-#: ../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 "
@@ -5817,7 +5817,7 @@ msgstr ""
 "leur première utilisation. Une fois testés, il n'est pas nécessaire de les "
 "tester à nouveau avant de les réutiliser."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5826,11 +5826,11 @@ msgstr ""
 "Le disque %s n'a été trouvé dans aucun de vos lecteurs. Veuillez insérer le "
 "disque %s et cliquer sur %s pour essayer à nouveau."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disque détecté"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5842,7 +5842,7 @@ msgstr ""
 "Sélectionnez %s pour sauter la vérification du média et démarrer "
 "l'installation."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5851,7 +5851,7 @@ msgstr ""
 "Le disque %s n'a pas été trouvé dans votre lecteur de démarrage. Veuillez "
 "insérer le disque %s et cliquer sur %s pour essayer à nouveau."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5860,32 +5860,32 @@ msgstr ""
 "Le disque %s n'a été trouvé dans aucun de vos lecteurs de CD-ROM. Veuillez "
 "insérer le disque %s et cliquer sur %s pour essayer à nouveau."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disque non trouvé"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Impossible de trouver le fichier kickstart sur le CD-ROM."
 
-#: ../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 "La lecture du répertoire %s a échoué : %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Chargement"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Lecture de la disquette de pilotes en cours..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Source de la disquette de pilotes"
 
-#: ../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?"
@@ -5893,7 +5893,7 @@ msgstr ""
 "De multiples périphériques pourraient servir de sources pour une disquette "
 "de pilotes. Lequel voulez-vous utiliser ?"
 
-#: ../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?"
@@ -5901,51 +5901,51 @@ msgstr ""
 "Il existe plusieurs partitions sur ce périphérique qui pourraient contenir "
 "l'image de disque du pilote. Laquelle voulez-vous utiliser ?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Le montage de la partition a échoué."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Sélectionner l'image de disquette de pilotes"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Choisissez le fichier qui correspond à l'image de votre disquette de pilotes."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "La lecture de la disquette de pilotes depuis le fichier a échoué."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Insérez votre disquette de pilotes dans /dev/%s et cliquez sur « Valider » "
 "pour continuer."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Insérer la disquette de pilotes"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Le montage de la disquette de pilotes a échoué."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Le disque de pilotes n'est pas compatible avec cette version de %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Choisir manuellement"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Charger une autre disquette"
 
-#: ../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 "
@@ -5955,38 +5955,38 @@ msgstr ""
 "pilotes. Voulez-vous choisir le pilote manuellement, continuer ou charger "
 "une autre disquette de pilotes ?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disquette de pilotes"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Disposez-vous d'une disquette de pilotes ?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Disquettes de pilotes supplémentaires ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Souhaitez-vous charger d'autres disquettes de pilotes ?"
 
-#: ../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 "Erreur Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Source de la disquette de pilotes kickstart inconnue : %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5995,7 +5995,7 @@ msgstr ""
 "Le paramètre invalide suivant a été indiqué dans la commande de la disquette "
 "de pilotes kickstart %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 "
@@ -6006,19 +6006,19 @@ msgstr ""
 "des espaces. Si vous ne savez pas quels paramètres fournir, passez "
 "simplement à l'écran suivant en cliquant sur le bouton « Valider »."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Saisissez les paramètres du module"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Aucun pilote n'a été trouvé"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Charger une disquette de pilotes"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6026,7 +6026,7 @@ msgstr ""
 "Aucun pilote à insérer manuellement n'a été détecté. Souhaitez-vous utiliser "
 "une disquette de pilotes ?"
 
-#: ../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."
@@ -6035,26 +6035,26 @@ msgstr ""
 "charger. Si le pilote dont vous avez besoin ne figure pas dans cette liste "
 "et que vous avez une disquette de pilotes, appuyez sur F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Indiquez les arguments du module optionnels"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Sélectionnez le pilote de périphérique à charger"
 
-#: ../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 "Média détecté"
 
-#: ../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 "Média d'installation local détecté..."
 
-#: ../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 "
@@ -6063,7 +6063,7 @@ msgstr ""
 "L'arborescence d'installation de %s contenue dans ce répertoire ne semble "
 "pas correspondre à votre support de démarrage."
 
-#: ../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."
@@ -6071,7 +6071,7 @@ msgstr ""
 "Une erreur s'est produite lors de la lecture de l'installation à partir des "
 "images ISO. Vérifiez vos images ISO et essayez à nouveau."
 
-#: ../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?"
@@ -6079,7 +6079,7 @@ msgstr ""
 "Aucun disque dur n'a été détecté sur votre système ! Voulez-vous configurer "
 "des périphériques supplémentaires ?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6091,61 +6091,61 @@ msgstr ""
 "figure pas dans la liste, appuyez sur F2 afin de configurer des "
 "périphériques supplémentaires."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Répertoire contenant les images :"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Sélection de la partition"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Le périphérique %s ne semble pas contenir des images de CD-ROM %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Paramètre incorrect dans la commande méthode HD de kickstart %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 "Impossible de trouver le fichier kickstart sur le disque dur."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Impossible de trouver le disque dur pour le disque BIOS %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Type de clavier"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Quel type de clavier utilisez-vous ?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Erreur lors de l'ouverture du fichier kickstart %s : %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Erreur lors de la lecture du contenu du fichier kickstart %s : %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Erreur dans %s à la ligne %d du fichier kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Impossible de trouver ks.cfg sur le média amovible."
 
-#: ../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."
@@ -6154,52 +6154,52 @@ msgstr ""
 "paramètres de kickstart ci-dessous ou de cliquer sur « Annuler » pour "
 "procéder à une installation interactive."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Erreur lors du téléchargement du fichier kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Paramètre incorrect pour arrêter la commande méthode de kickstart %s : %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Bienvenue à %s pour %s - Mode de dépannage"
 
-#: ../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> Changer d'élément  | <Espace> Sélectionner |<F12> Écran "
 "suivant "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Choisir une langue"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD local"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disque dur"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Répertoire NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Bienvenue dans %s%n pour %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Source de la disquette de mise à jour"
 
-#: ../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?"
@@ -6207,7 +6207,7 @@ msgstr ""
 "De multiples périphériques pourraient servir de source pour une disquette de "
 "mise à jour. Lequel voulez-vous utiliser pour l'installation ?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6215,30 +6215,30 @@ msgstr ""
 "Il existe plusieurs partitions sur ce périphérique qui pourraient contenir "
 "l'image du disque de mise à jour. Laquelle voulez-vous utiliser ?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Introduisez la disquette de mise à jour dans /dev/%s, puis cliquez sur "
 "« Valider » pour continuer."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disquette de mises à jour"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Le montage de la disquette de mise à jour a échoué."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Lecture des mises à jour 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.."
@@ -6247,44 +6247,44 @@ msgstr ""
 "paramètres des mises à jour ci-dessous ou cliquer sur « Annuler » pour "
 "procéder à une installation sans mises à jour."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Erreur lors du téléchargement de l'image de mises à jour."
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Vous n'avez pas assez de mémoire vive pour installer %s sur cette machine."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Méthode de dépannage"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Méthode d'installation"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Quel type de support contient l'image de dépannage ?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Quel type de support contient les paquetages à installer ?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Aucun pilote n'a été trouvé"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Sélectionner le pilote"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Utiliser une disquette de pilotes"
 
-#: ../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?"
@@ -6293,11 +6293,11 @@ msgstr ""
 "d'installation. Voulez-vous manuellement sélectionner votre pilote ou voulez-"
 "vous utiliser une disquette de pilotes ?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Les périphériques suivants ont été détectés sur votre système."
 
-#: ../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?"
@@ -6305,51 +6305,51 @@ msgstr ""
 "Aucun pilote de périphérique n'a été chargé pour votre système. Voulez-vous "
 "en charger un maintenant ?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Périphériques"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Terminé"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Ajouter un périphérique"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "le chargeur a déjà été exécuté. Démarrage de l'interpréteur de commandes.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Démarrage d'anaconda %s, en mode dépannage %s - veuillez patienter...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Exécution d'anaconda %s, le programme d'installation du système %s - "
 "veuillez patienter...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Impossible de trouver l'image d'installation %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Vérification de « %s »..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Vérification du média..."
 
-#: ../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."
@@ -6358,7 +6358,7 @@ msgstr ""
 "descripteur de volume. Le disque a probablement été créé sans ajout de la "
 "somme de contrôle."
 
-#: ../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 "
@@ -6369,11 +6369,11 @@ msgstr ""
 "réparez le disque et essayez de nouveau. Si ce test est toujours négatif, "
 "vous ne devriez pas poursuivre l'installation."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Réussi"
 
-#: ../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 "
@@ -6384,7 +6384,7 @@ msgstr ""
 "médias ou de lecteurs ne peuvent être détectées par la vérification du "
 "support."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6395,24 +6395,24 @@ msgstr ""
 "\n"
 "   %s ?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Contrôle d'intégrité"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 "Le paramètre incorrect suivant a été indiqué pour la commande méthode device "
 "de kickstart %s : %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Le nom du module doit être indiqué pour la commande de périphérique "
 "kickstart."
 
-#: ../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"
@@ -6420,7 +6420,7 @@ msgstr ""
 "La valeur du préfixe doit être comprise entre 0 et 32 pour les réseaux IPv4 "
 "et entre 1 et 128 pour les réseaux IPv6."
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6432,27 +6432,27 @@ msgstr ""
 "n'est \n"
 "nécessaire, laissez ce champ vide et l'installation se poursuivra."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Clé de chiffrement"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Paramètres du réseau sans fil"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Adresse IP du serveur de noms"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Serveur de noms manquant"
 
-#: ../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 "
@@ -6463,56 +6463,56 @@ msgstr ""
 "pas de cette information, vous pouvez laisser ce champ vide ; l'installation "
 "se poursuivra."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Adresse IP non valide"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Vous avez saisi une adresse IP non valide."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Erreur réseau"
 
-#: ../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 "Une erreur est survenue lors de la configuration de votre interface réseau."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configuration TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Vous devez choisir au moins un protocole (IPv4 ou IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 nécessaire à NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "L'installation par NFS nécessite la gestion de l'IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Adresse IPv4 :"
 
-#: ../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 "Adresse IPv6 :"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Serveur de noms :"
 
-#: ../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 "
@@ -6523,43 +6523,43 @@ msgstr ""
 "style CIDR. Les champs pour le passerelle et le nom du serveur doivent être "
 "des adresses IPv4 ou IPv6 valides."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Configuration TCP/IP manuelle"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Informations manquantes"
 
-#: ../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 ""
 "Vous devez saisir une adresse IPv4 et un masque réseau ou préfixe CIDR "
 "valide."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Vous devez saisir une adresse Iv6P et un préfixe CIDR valides."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Recherche du nom de l'hôte et du domaine..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Paramètre incorrect dans la commande network de kickstart %s : %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Protocole de démarrage %s incorrect indiqué dans la commande network"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Périphérique de connexion réseau"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6567,112 +6567,112 @@ msgstr ""
 "Ce système comprend plusieurs périphériques réseau. Lequel souhaitez-vous "
 "utiliser pour l'installation ?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nom du serveur NFS :"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Répertoire %s :"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Saisissez le nom du serveur et le chemin vers vos %s images."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Configuration NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Le nom d'hôte est indiqué sans DNS configuré"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Ce répertoire n'a pas pu être monté depuis le serveur."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Ce répertoire ne semble pas contenir une arborescence d'installation %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Paramètre incorrect dans la commande méthode NFS de kickstart %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 "En attente de la connexion telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Exécution d'anaconda par telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Impossible de récupérer %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Impossible de récupérer l'image d'installation."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Paramètre incorrect dans la commande méthode Url de kickstart %s : %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Fournir un argument --url pour la méthode Url kickstart"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Méthode Url inconnue %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Veuillez saisir l'URL contenant les %s images sur votre serveur."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Configurer le proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Configuration de l'URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Vous devez saisir une URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "L'URL doit être soit un serveur FTP soit un serveur HTTP."
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Hôte inconnu"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s n'est pas un nom d'hôte valide."
 
-#: ../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."
@@ -6680,23 +6680,23 @@ msgstr ""
 "Si vous utilisez un serveur proxy HTTP, saisissez le nom du serveur proxy à "
 "utiliser."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Nom du proxy :"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Port du proxy :"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Configuration avancée"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Chargement du pilote SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Chargement du disque %s..."
diff --git a/po/gl.po b/po/gl.po
index 62de0e014..9232f1c88 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -44,41 +44,41 @@ msgstr "Prema <intro> para obter unha 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 "Aceptar"
 
@@ -512,22 +512,22 @@ msgstr "Erro ó montar o sistema de ficheiros en %s: %s"
 #: ../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 "Erro"
 
@@ -574,8 +574,8 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -818,21 +818,21 @@ msgstr ""
 
 #: ../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 "Sí"
 
 #: ../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 "Non"
 
-#: ../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 ""
 
@@ -843,8 +843,8 @@ msgstr "Ignorar"
 #: ../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 "Cancelar"
 
@@ -1594,21 +1594,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 ""
 
 #: ../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 "Continuar"
 
@@ -1981,7 +1981,7 @@ msgstr ""
 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 "Benvido a %s"
@@ -2789,7 +2789,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Selección de Lingua"
 
-#: ../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 ""
 
@@ -3127,7 +3127,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3296,7 +3296,7 @@ msgstr "Descoñecido"
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3305,7 +3305,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3529,7 +3529,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4299,12 +4299,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4427,7 +4427,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 ""
 
@@ -5003,29 +5003,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -5035,19 +5035,19 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Non Se Atoparon Unidades"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5055,146 +5055,146 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "non se atopou %s"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5202,69 +5202,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5272,269 +5272,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Benvido a %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5542,26 +5542,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5569,260 +5569,260 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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 "Configuración do Rato"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr ""
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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 "Configurar %s"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 6c9c5c1fc..2abc936b3 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -73,41 +73,41 @@ msgstr "શેલ માટે <enter> દબાવો"
 #: ../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 "બરાબર"
 
@@ -575,22 +575,22 @@ msgstr "%s પર ફાઈલસિસ્ટમનું માપ બદલી
 #: ../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 "ભૂલ"
 
@@ -645,8 +645,8 @@ msgstr ""
 "સ્થાપકમાંથી બહાર નીકળવા માટે <Enter> દબાવો."
 
 #: ../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 "છોડી દો"
 
@@ -971,21 +971,21 @@ msgstr "સુધારો"
 
 #: ../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 "હા"
 
 #: ../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 "ના"
 
-#: ../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 "પુનઃપ્રયાસ"
 
@@ -996,8 +996,8 @@ msgstr "અવગણો"
 #: ../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 "નકારો"
 
@@ -1832,21 +1832,21 @@ msgid "_Write changes to disk"
 msgstr "ફેરફારો ડિસ્કમાં લખો (_W)"
 
 #: ../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 "પાછળ"
 
 #: ../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 "ચાલુ રાખો"
 
@@ -2255,7 +2255,7 @@ msgstr "મહેરબાની કરીને તમારી %(instkey)s દ
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s દાખલ કરવાનું છોડી દો"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s માં %s માટે સ્વાગત છે"
@@ -3124,7 +3124,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "ભાષા પસંદગી"
 
-#: ../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 "સ્થાપનની પ્રક્રિયા દરમ્યાન તમે કઈ ભાષા પસંદ કરવા માંગો છો?"
 
@@ -3492,7 +3492,7 @@ msgstr "ક્ષેત્ર %s માટે જરૂરી કિંમત."
 msgid "Dynamic IP"
 msgstr "ઉમદા 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 "%s માટે IP જાણકારીની માંગણી મોકલી રહ્યા છીએ..."
@@ -3663,7 +3663,7 @@ msgstr "અજ્ઞાત"
 msgid "Hardware address: "
 msgstr "હાર્ડવેર સરનામું: "
 
-#: ../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 "ગુમ થયેલ પ્રોટોકોલ"
 
@@ -3672,7 +3672,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "તમારે ઓછામાં ઓછો IPv4 અથવા IPv6 આધાર સ્પષ્ટ કરવો જ પડશે."
 
 #: ../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 "અયોગ્ય પૂર્વગ"
 
@@ -3900,7 +3900,7 @@ msgstr "RAID ઉપકરણો"
 msgid "None"
 msgstr "કંઈ નહિં"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "હાર્ડ ડ્રાઈવો"
 
@@ -4782,12 +4782,12 @@ msgstr "પૂર્વગ"
 msgid "Activate on boot"
 msgstr "બુટ વખતે સક્રિય કરો"
 
-#: ../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 "IPv4 આધાર સક્રિય કરો"
 
-#: ../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 "IPv6 આધાર સક્રિય કરો"
@@ -4907,7 +4907,7 @@ msgstr "આપોઆપ 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 "ગેટવે:"
 
@@ -5520,22 +5520,22 @@ 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 "મીડિયા ચકાસણી"
 
-#: ../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 "ચકાસણી"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ડિસ્ક બહાર કાઢો"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5544,7 +5544,7 @@ msgstr ""
 "વર્તમાનમાં જે ડિસ્ક ડ્રાઈવમાં છે તેને ચકાસવા માટે \"%s\" પસંદ કરો, અથવા ડિસ્કને બહાર "
 "કાઢવા માટે \"%s\" પસંદ કરો અન ચકાસણી માટે બીજી દાખલ કરો."
 
-#: ../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 "
@@ -5558,7 +5558,7 @@ msgstr ""
 "વખત વાપરવા પહેલાં ચકાસાયેલ હોવી જોઈએ. તેઓ સફળતાપૂર્વક ચકાસાઈ જાય પછી, દરેક ડિસ્કને "
 "ફરીથી વાપરવા પહેલાં ચકાસવાની જરૂર નથી."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5567,11 +5567,11 @@ msgstr ""
 "%s ડિસ્ક તમારી કોઈપણ ડ્રાઈવો પર મળી નહિં. મહેરબાની કરીને %s ડિસ્ક દાખલ કરો અને "
 "પુનઃપ્રયાસ કરવા માટે %s દબાવો."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ડિસ્ક મળી"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5582,7 +5582,7 @@ msgstr ""
 "\n"
 "મીડિયા ચકાસણી રદ કરવા માટે %s પસંદ કરો અને સ્થાપન શરુ કરો."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5591,7 +5591,7 @@ msgstr ""
 "કોઈ %s ડિસ્ક મળી નથી કે જે તમારી બુટ મીડિયા સાથે બંધબેસે. મહેરબાની કરીને %s ડિસ્ક દાખલ "
 "કરો અને પુનઃપ્રયાસ કરવા માટે %s દબાવો."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5600,32 +5600,32 @@ msgstr ""
 "%s ડિસ્ક તમારી કોઈપણ CDROM ડ્રાઈવ પર મળી નથી. મહેરબાની કરીને %s ડિસ્ક દાખલ કરો અને "
 "પુનઃપ્રયાસ કરવા માટે %s દબાવો."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ડિસ્ક મળી નથી"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "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 "ડિરેક્ટરી %s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "લાવી રહ્યા છીએ"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ડ્રાઈવર ડિસ્ક વાંચી રહ્યા છીએ..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ડ્રાઈવર ડિસ્ક સ્રોત"
 
-#: ../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?"
@@ -5633,7 +5633,7 @@ msgstr ""
 "તમારી પાસે ઘણા બધા ઉપકરણો છે કે જે સ્રોત તરીકે ડ્રાઈવર ડિસ્ક માટે સેવા આપે છે. તમે કયા "
 "પ્રકારનું વાપરવા માંગો છો?"
 
-#: ../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?"
@@ -5641,49 +5641,49 @@ msgstr ""
 "ત્યાં આ ઉપકરણ પર ઘણા બધા પાર્ટીશનો છે કે જે ડ્રાઈવર ડિસ્ક ઈમેજ સમાવે છે. તમે કયું વાપરવા "
 "માંગો છો?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "પાર્ટીશન માઉન્ટ કરવામાં નિષ્ફળ."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ડ્રાઈવર ડિસ્ક ઈમેજ પસંદ કરો"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ફાઈલમાંથી ડ્રાઈવર ડિસ્ક લાવવામાં નિષ્ફળ."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "તમારી ડ્રાઈવર ડિસ્ક /dev/%s માં દાખલ કરો અને ચાલુ રાખવા માટે \"બરાબર\" બટન દબાવો."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ડ્રાઈવર ડિસ્ક દાખલ કરો"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ડ્રાઈવર ડિસ્ક માઉન્ટ કરવામાં નિષ્ફળ."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s ના આ પ્રકાશન માટે ડ્રાઈવર ડિસ્ક અયોગ્ય છે."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "જાતે પસંદ કરો"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "બીજી ડિસ્ક લાવો"
 
-#: ../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 "
@@ -5693,45 +5693,45 @@ msgstr ""
 "કરવા માંગો છો, કોઈપણ રીતે ચાલુ રાખવા માંગો છો, અથવા બીજી ડ્રાઈવર ડિસ્ક લાવવા માંગો "
 "છો?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ડ્રાઈવર ડિસ્ક"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "શું તમારી પાસે ડ્રાઈવર ડિસ્ક છે?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "વધુ ડ્રાઈવર ડિસ્ક?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "શું તમે કોઈપણ વધુ ડ્રાઈવર ડિસ્ક લાવવા માંગો છો?"
 
-#: ../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 "કિકસ્ટાર્ટ ભૂલ"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "અજ્ઞાત ડ્રાઈવર ડિસ્ક કિકસ્ટાર્ટ સ્રોત: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "નીચેની અયોગ્ય દલીલો કિકસ્ટાર્ટ ડ્રાઈવર ડિસ્ક આદેશ દ્વારા સ્પષ્ટ કરાયેલ છે: %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 "
@@ -5742,25 +5742,25 @@ msgstr ""
 "કરવા માંગો.  જો તમે જાણતા નહિં હોય કે કયા પરિમાણો પૂરા પાડવા જોઈએ, તો \"બરાબર\" "
 "બટન દબાવીને આ સ્ક્રીન રદ કરો."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "મોડ્યુલ પરિમાણો દાખલ કરો"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "કોઈ ડ્રાઈવરો મળ્યા નથી"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ડ્રાઈવર ડિસ્ક લાવો"
 
-#: ../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 "કોઈ ડ્રાઈવરો જાતે દાખલ કરવા માટે મળ્યા નથી. શું તમે ડ્રાઈવર ડિસ્ક વાપરવા માંગો છો?"
 
-#: ../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."
@@ -5768,33 +5768,33 @@ msgstr ""
 "નીચેનામાંથી ડ્રાઈવર પસંદ કરો કે જે તમે લાવવા માંગતા હોય. જો તે નહિં દેખાય અને તમારી પાસે "
 "ડ્રાઈવર ડિસ્ક હોય, તો F2 દબાવો."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "વૈકલ્પિક મોડ્યુલ દલીલો સ્પષ્ટ કરો"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "લાવવા માટે ઉપકરણ ડ્રાઈવર પસંદ કરો"
 
-#: ../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 "મીડિયા મળી આવી"
 
-#: ../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 "સ્થાનિક સ્થાપન માધ્યમ મળી આવ્યું..."
 
-#: ../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 "
 "media."
 msgstr "તે ડિરેક્ટરીમાંનુ %s સ્થાપન ટ્રી તમારુ બુટ મીડિયા સરખાવે એમ લાગતું નથી."
 
-#: ../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."
@@ -5802,7 +5802,7 @@ msgstr ""
 "ISO ઈમેજોમાંથી સ્થાપન વાંચવામાં ભૂલ ઉદ્ભવી. મહેરબાની કરીને તમારી ISO ઈમેજો ચકાસો અને "
 "ફરીથી પ્રયત્ન કરો."
 
-#: ../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?"
@@ -5810,7 +5810,7 @@ msgstr ""
 "તમારી સિસ્ટમ પર તમારી પાસે હાર્ડ ડ્રાઈવ હોય એમ લાગતું નથી! શું તમે વધારાના ઉપકરણો "
 "રુપરેખાંકિત કરવા માંગો છો?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5821,61 +5821,61 @@ msgstr ""
 "અંહિ તમે વાપરી રહેલ ડિસ્ક ડ્રાઈવ નીચેની યાદીમાં નહિં જોતા હોય, તો વધારાના ઉપકરણો "
 "રુપરેખાંકિત કરવા માટે F2 દબાવો."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ડિરેક્ટરીને સમાવતી ઈમેજો:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "પાર્ટીશન પસંદ કરો"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "ઉપકરણ %s એ %s CDROM ઈમેજો સમાવે એમ લાગતું નથી."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD કિકસ્ટાર્ટ પદ્ધતિ આદેશ %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 "હાર્ડ ડ્રાઈવ પર કિકસ્ટાર્ટ ફાઈલ શોધી શકતા નથી."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS ડિસ્ક %s માટે હાર્ડ ડ્રાઈવ શોધી શકતા નથી"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "કીબોર્ડનો પ્રકાર"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "તમારી પાસે કયા પ્રકારનું કીબોર્ડ છે?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "કિકસ્ટાર્ટ ફાઈલ %s ખોલવામાં ભૂલ: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "કિકસ્ટાર્ટ ફાઈલ %s ના સમાવિષ્ટો વાંચવામાં ભૂલ: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s માં લીટી %d પર કિકસ્ટાર્ટ ફાઈલ %s માં ભૂલ છે."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ks.cfg ને દૂર કરી શકાય તેવા માધ્યમ પર શોધી શકતા નથી."
 
-#: ../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."
@@ -5883,50 +5883,50 @@ msgstr ""
 "કિકસ્ટાર્ટ ફાઈલ ડાઉનલોડ કરવામાં અસમર્થ.  મહેરબાની કરીને નીચે કિકસ્ટાર્ટ પરિમાણ સુધારો "
 "અથવા પૂછપરછવાળા સ્થાપન તરીકે પ્રક્રિયા કરવા માટે રદ કરો દબાવો."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "કિકસ્ટાર્ટ ફાઈલ ડાઉનલોડ કરવામાં ભૂલ"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "કિકસ્ટાર્ટ પદ્ધતિ આદેશ %s માટે બંધ કરવાની ખરાબ દલીલ: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s માં સ્વાગત છે %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> વસ્તુઓ વચ્ચે  | <Space> પસંદ કરે | <F12> આગળની સ્ક્રીન "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ભાષા પસંદ કરો"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "સ્થાનિક CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "હાર્ડ ડ્રાઈવ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS ડિરેક્ટરી"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n માં સ્વાગત છે %s માટે"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "સુધારા ડિસ્ક સ્રોત"
 
-#: ../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?"
@@ -5934,7 +5934,7 @@ msgstr ""
 "તમારી પાસે ઘણા બધા ઉપકરણો છે કે જે સુધારા ડિસ્ક માટે સ્રોત તરીકે વર્તે છે. તમે કઈ વાપરવા "
 "માંગો છો?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -5942,28 +5942,28 @@ msgstr ""
 "આ ઉપકરણ પર ઘણાબધા પાર્ટીશનો છે કે જે સુધારા ડિસ્ક ઈમેજ સમાવી શક્યા હશે.  તમે કયું વાપરવા "
 "ઈચ્છો છો?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "તમારી સુધારેલ ડિસ્ક /dev/%s માં દાખલ કરો અને \"બરાબર\" પર ક્લિક કરીને ચાલુ રાખો."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "ડિસ્ક સુધારે છે"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "સુધારા ડિસ્ક માઉન્ટ કરવામાં નિષ્ફળ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "સુધારાઓ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "એનાકોન્ડા સુધારા વાંચી રહ્યા છીએ..."
 
-#: ../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.."
@@ -5971,44 +5971,44 @@ msgstr ""
 "સુધારાઓ ઈમેજ ડાઉનલોડ કરવામાં અસમર્થ.  મહેરબાની કરીને સુધારાઓ સ્થાન નીચે સુધારો અથવા "
 "સુધારાઓ વિના પ્રક્રિયા કરવા માટે રદ કરો દબાવો.."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "સુધારાઓ ઈમેજ ડાઉનલોડ કરવામાં ભૂલ"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "તમારી પાસે આ મશીન પર %s સ્થાપિત કરવા માટે પૂરતી RAM નથી."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "જોખમી પદ્ધતિ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "સ્થાપન પદ્ધતિ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "કયા પ્રકારની મીડિયા જોખમી ઈમેજને સમાવે છે?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "કયા પ્રકારના મીડિયા સ્થાપન કરવા માટેના પેકેજો સમાવે છે?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "કોઈ ડ્રાઈવર મળ્યા નથી"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ડ્રાઈવર પસંદ કરો"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ડ્રાઈવર ડિસ્ક વાપરો"
 
-#: ../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?"
@@ -6016,59 +6016,59 @@ msgstr ""
 "આ સ્થાપન પ્રકાર માટે જરુરી પ્રકારનાં કોઈ ઉપકરણો શોધવામાં અસમર્થ. શું તમે જાતે તમારા "
 "ડ્રાઈવરો પસંદ કરવા માંગો છો અથવા ડ્રાઈવર ડિસ્ક?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "તમારી સિસ્ટમ પર નીચેના ઉપકરણો મળી આવ્યા છે."
 
-#: ../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 "તમારી સિસ્ટમ માટે કોઈ ઉપકરણ ડ્રાઈવરો લવાયા હતા. શું તમે કોઈપણ હમણાં લાવવા માંગો છો?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ઉપકરણો"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "પૂર્ણ થયું"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ઉપકરણ ઉમેરો"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "લોડર પહેલાથી જ ચાલી રહ્યું છે. શેલ શરુ કરી રહ્યા છીએ.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "એનાકોન્ડા %s, ને %s rescue mode માં ચલાવી રહ્યા છીએ - મહેરબાની કરીને રાહ જુઓ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "એનાકોન્ડા %s, %s સિસ્ટમ સ્થાપક ચલાવી રહ્યા છીએ - મહેરબાની કરીને રાહ જુઓ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "સ્થાપન ઈમેજ %s શોધવામાં અસમર્થ"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" ચકાસી રહ્યા છીએ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "મીડિયા હમણાં ચકાસી રહ્યા છીએ..."
 
-#: ../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."
@@ -6076,7 +6076,7 @@ msgstr ""
 "પ્રાથમિક વોલ્યુમ ડિસ્ક્રિપ્ટરમાંથી ડિસ્ક ચેકસમ વાંચવામાં અસમર્થ. આનો અર્થ કદાચ એ થાય કે "
 "ડિસ્ક ચેકસમ ઉમેર્યા વગર બનાવાઈ હતી."
 
-#: ../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 "
@@ -6086,11 +6086,11 @@ msgstr ""
 "શકે.  જો લાગુ પડી શકે, તો મહેરબાની કરીને ડિસ્ક સાફ કરો અને ફરીથી પ્રયાસ કરો.  જો આ "
 "ચકાસણી નિષ્ફળ જવાનું ચાલુ રાખે તો તમારે સ્થાપન ચાલુ રાખવું જોઈએ નહિં."
 
-#: ../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 "
@@ -6100,7 +6100,7 @@ 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"
@@ -6111,20 +6111,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "ચેકસમ ચકાસણી"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "ઉપકરણ કિકસ્ટાર્ટ પદ્ધતિ આદેશ માટે %s ખરાબ દલીલ: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "મોડ્યુલ નામ કિકસ્ટાર્ટ ઉપકરણ આદેશ માટે સ્પષ્ટ થવું જ જોઈએ."
 
-#: ../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"
@@ -6132,7 +6132,7 @@ msgstr ""
 "IPv4 નેટવર્કો માટે પૂર્વગ ૧ અને ૩૨ ની વચ્ચે જ હોવો જોઈએ અને IPv6 નેટવર્કો માટે ૧ અને ૧૨૮ "
 "ની વચ્ચે જ હોવો જોઈએ"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6143,27 +6143,27 @@ msgstr ""
 "તમારા વાયરલેસ નેટવર્કને ચલાવવા માટે જરુરી છે.  જો કોઈ કી જરુરી ના હોય, તો આ ક્ષેત્ર "
 "ખાલી છોડો અને સ્થાપન ચાલુ રહેશે."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "એનક્રિપ્શન કી"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "વાયરલેસ સુયોજનો"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "નામસર્વર IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "ગુમ થયેલ નામસર્વર"
 
-#: ../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 "
@@ -6172,56 +6172,56 @@ msgstr ""
 "તમારી IP સરનામા અરજીએ રૂપરેખાંકન જાણકારી આપી, પરંતુ તેણે નામસર્વર સરનામું સમાવ્યું ન હતું. "
 "જો તમારી પાસે આ જાણકારી નહિં હોય, તો તમે ક્ષેત્રને ખાલી રાખી શકો અને સ્થાપન ચાલુ રહેશે."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "અમાન્ય IP જાણકારી"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "તમે અમાન્ય IP સરનામુ દાખલ કરેલ છે."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "નેટવર્ક ભૂલ"
 
-#: ../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 "તમારું નેટવર્ક ઈન્ટરફેસ રૂપરેખાંકિત કરવા માટે ત્યાં ભૂલ હતી."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP રુપરેખાંકિત કરો"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "તમારે ઓછામાં ઓછો એક પ્રોટોકોલ પસંદ કરવો જ જોઈએ (IPv4 અથવા IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS માટે IPv4 જરૂરી છે"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS સ્થાપન પદ્ધતિ માટે IPv4 આધાર જરૂરી છે."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 સરનામું:"
 
-#: ../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 સરનામું:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "નામ સર્વર:"
 
-#: ../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 "
@@ -6231,41 +6231,41 @@ msgstr ""
 "quad નેટમાસ્ક અથવા CIDR-શૈલી પૂર્વગ સ્વીકાર્ય છે. ગેટવે અને નામ સર્વર ક્ષેત્રો માન્ય IPv4 "
 "અથવા IPv6 સરનામાઓ હોવા જ જોઈએ."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "સ્વયં TCP/IP રૂપરેખાંકન"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "ખોવાયેલ જાણકારી"
 
-#: ../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 "તમારે માન્ય IPv4 સરનામું અને નેટવર્ક માસ્ક અથવા CIDR પૂર્વગ બંને દાખલ કરવું જ પડશે."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "તમારે માન્ય IPv6 સરનામું અને CIDR પૂર્વગ બંને દાખલ કરવા જ જોઈએ."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "યજમાન નામ અને ડોમેઈન નક્કી કરી રહ્યા છીએ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "કિકસ્ટાર્ટ નેટવર્ક આદેશ %s માટે ખરાબ દલીલ: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "નેટવર્ક આદેશમાં ખરાબ બુટપ્રોટો %s સ્પષ્ટ કરેલ છે"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "નેટવર્કીંગ ઉપકરણ"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6273,112 +6273,112 @@ msgstr ""
 "તમારી પાસે આ સિસ્ટમ પર ઘણી બધા નેટવર્ક ઉપકરણો છે. તમે તેના દ્વારા કયા સ્થાપિત કરવા "
 "માંગો છો?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS સર્વર નામ:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ડિરેક્ટરી:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "મહેરબાની કરીને તમારી %s ઈમેજોનું સર્વર નામ અને પાથ દાખલ કરો."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS સુયોજન"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "કોઈપણ DNS રૂપરેખાંકન વિના યજમાનનામ સ્પષ્ટ થયેલ છે"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "મેળવી રહ્યા છીએ"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "સર્વરમાંથી તે ડિરેક્ટરી માઉન્ટ કરી શકાઈ નથી."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "તે ડિરેક્ટરી %s સ્થાપન ટ્રી સમાવે એમ લાગતું નથી."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS કિકસ્ટાર્ટ પદ્ધતિને આદેશ %s ની ખોટી દલીલ: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "ટેલનેટ"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "ટેલનેટના સંપર્ક માટે રાહ જોઈ રહ્યા છીએ..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "એનાકોન્ડાને ટેલનેટ દ્વારા ચલાવી રહ્યા છીએ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s://%s/%s પ્રાપ્ત કરવામાં અસમર્થ."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "સ્થાપન ઈમેજ મેળવવા માટે સમર્થ નથી."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url કિકસ્ટાર્ટ પદ્ધતિના આદેશ %s ને ખોટી દલીલ: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url કિકસ્ટાર્ટ પદ્ધતિને --url દલીલ પૂરી પાડો જ."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "અજ્ઞાત 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 "મહેરબાની કરીને તમારા સર્વર પર %s ઈમેજો સમાવતી URL દાખલ કરો."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "પ્રોક્સી રૂપરેખાંકિત કરો"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL સુયોજન"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "તમારે URL દાખલ કરવી જ પડશે."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL ક્યાં તો ftp અથવા http URL હોવી જ જોઈએ"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "અજ્ઞાત યજમાન"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s એ માન્ય યજમાન નામ નથી."
 
-#: ../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."
@@ -6386,23 +6386,23 @@ msgstr ""
 "જો તમે HTTP પ્રોક્સી સર્વર વાપરી રહ્યા હોય તો વાપરવા માટેના HTTP પ્રોક્સી સર્વરનું નામ "
 "દાખલ કરો."
 
-#: ../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
 msgid "Further Setup"
 msgstr "આગળનું સુયોજન"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ડ્રાઈવર લાવી રહ્યા છીએ"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s ડ્રાઈવર લાવી રહ્યા છીએ..."
diff --git a/po/he.po b/po/he.po
index 7074b934a..2e5b9cdd9 100644
--- a/po/he.po
+++ b/po/he.po
@@ -49,41 +49,41 @@ msgstr "יש להקיש <enter> לקבלת שורת פקודה"
 #: ../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 "כן"
 
@@ -519,22 +519,22 @@ msgstr "שינוי גודל מערכת קבצים על %s..."
 #: ../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 "שגיאה"
 
@@ -589,8 +589,8 @@ msgstr ""
 "נא להקיש <Enter> בכדי לצאת מתכנית ההתקנה."
 
 #: ../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 "דלג"
 
@@ -866,21 +866,21 @@ msgstr "תקן"
 
 #: ../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 "כן"
 
 #: ../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 "לא"
 
-#: ../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 "נסה שנית"
 
@@ -891,8 +891,8 @@ msgstr "התעלם"
 #: ../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 "בטל"
 
@@ -1646,21 +1646,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 "אחורה"
 
 #: ../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 "המשך"
 
@@ -2024,7 +2024,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2824,7 +2824,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "בחירת שפה"
 
-#: ../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 "?באיזה שפה תרצה להשתמש בתהליך ההתקנה"
 
@@ -3162,7 +3162,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3324,7 +3324,7 @@ msgstr "לא ידוע"
 msgid "Hardware address: "
 msgstr "כתובת חמרה:"
 
-#: ../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 "פרוטוקול חסר"
 
@@ -3333,7 +3333,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3555,7 +3555,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4319,12 +4319,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 "הפעל תמיכת IPv4"
 
-#: ../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 "הפעל תמיכת IPv6"
@@ -4440,7 +4440,7 @@ msgstr ""
 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 ""
 
@@ -5011,29 +5011,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -5043,18 +5043,18 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5062,145 +5062,145 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5208,69 +5208,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5278,268 +5278,268 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5547,26 +5547,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5574,257 +5574,257 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "שרת שמות מתחם חסר"
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP הגדר"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "הגדרות ידניות לתצורת TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 "חובה לכתוב הן כתובת IPv4 חוקית והן מסכת רשת או קידומת CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "חובה לכתוב הן כתובת IPv6 חוקית והן מסכת רשת או קידומת CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "התקן רשת"
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr "הגדרת מתווך רשת"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 "מארח לא ידוע"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "הוא לא שם מארח תקף %s "
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index ece315655..ca10b748a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -65,41 +65,41 @@ msgstr "एक शैल के लिये <enter> दबायें"
 #: ../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 "ठीक"
 
@@ -574,22 +574,22 @@ msgstr "%s पर फाइल सिस्टम को फिर आकार
 #: ../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 "त्रुटि"
 
@@ -644,8 +644,8 @@ msgstr ""
 "अपने सिस्टम को रिबूट करने के लिए <Enter> दबायें."
 
 #: ../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 "छोड़ें"
 
@@ -974,21 +974,21 @@ msgstr "सही"
 
 #: ../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 "हां"
 
 #: ../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 "नहीं"
 
-#: ../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 "पुनः प्रयास करें"
 
@@ -999,8 +999,8 @@ msgstr "छोड़ें"
 #: ../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 "रद्द करें"
 
@@ -1841,21 +1841,21 @@ msgid "_Write changes to disk"
 msgstr "डिस्क में बदलाव लिखें (_W)"
 
 #: ../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 "पीछे"
 
 #: ../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 "जारी रखें"
 
@@ -2268,7 +2268,7 @@ msgstr "कृपया अपना %(instkey)s डालें"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s डालना छोडें"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s में %s के लिए आपका स्वागत है"
@@ -3138,7 +3138,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "भाषा चुनाव"
 
-#: ../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 "अधिष्ठापन प्रक्रिया के समय आप कौन सी भाषा का प्रयोग करना चाहते हैं?"
 
@@ -3508,7 +3508,7 @@ msgstr "%s क्षेत्र के लिए एक मान आवश्�
 msgid "Dynamic IP"
 msgstr "गतिशील 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 "%s के लिए IP जानकारी के लिए निवेदन भेज रहा है..."
@@ -3679,7 +3679,7 @@ msgstr "अज्ञात"
 msgid "Hardware address: "
 msgstr "हार्डवेयर पता: "
 
-#: ../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 "गुम प्रोटोकॉल"
 
@@ -3688,7 +3688,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "आपको कम से कम IPv4 या IPv6) समर्थन जरूर चुनें."
 
 #: ../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 "अमान्य उपसर्ग"
 
@@ -3918,7 +3918,7 @@ msgstr "RAID युक्तियां"
 msgid "None"
 msgstr "कोई नहीं "
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "हार्ड ड्राइव"
 
@@ -4800,12 +4800,12 @@ msgstr "उपसर्ग"
 msgid "Activate on boot"
 msgstr "बूट पर सक्रिय करें"
 
-#: ../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 "IPv4 समर्थन सक्रिय करें"
 
-#: ../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 "IPv6 समर्थन सक्रिय करें"
@@ -4924,7 +4924,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 "गेटवे:"
 
@@ -5533,22 +5533,22 @@ msgstr ""
 "* यह Red Hat Enterprise Linux के एक असमर्थित/अप्रमाणित परिणाम देगा.\n"
 "* आपको सॉफ्टवेयर व सुरक्षा अद्यतन नहीं मिल पायेंगे जो संकुल शामिल नहीं होंगे आपकी सदस्यता में."
 
-#: ../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 "माध्यम जांच"
 
-#: ../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 "जांचें"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "डिस्क बाहर निकालें"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5557,7 +5557,7 @@ msgstr ""
 "चालन में वर्तमान में डिस्क जाँच के लिए \"%s\" चुनें या \"%s\" डिस्क निकालने के लिए और जाँच "
 "करने के लिए अन्य डालें."
 
-#: ../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 "
@@ -5571,7 +5571,7 @@ msgstr ""
 "प्रयोग करने से पहले पहली बार जांचा जाना चाहिये. उन्हें सफलतापूर्वक जांचे जाना के बाद, हर "
 "डिस्क को इसे पहले प्रयोग करने के लिये फिर जांचना जरूरी है."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5580,11 +5580,11 @@ msgstr ""
 "आपके किसी भी चालन में %s डिस्क नहीं मिला था. कृपया %s डिस्क डालें और पुनःप्रयास के लिए %"
 "s दबाएँ."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "डिस्क मिला"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5595,7 +5595,7 @@ msgstr ""
 "\n"
 "मीडिया जाँच को छोड़ने के लिए %s चुनें और अधिष्ठापन प्रारंभ करें."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5604,7 +5604,7 @@ msgstr ""
 "कोई भी %s डिस्क नहीं मिला जो आपके बूट माध्यम से मिलान करता है. कृपया %s CD डिस्क और "
 "पुनःप्रयास के लिए %s दबाएँ."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5613,32 +5613,32 @@ msgstr ""
 "आपके किसी भी CDROM चालन में %s डिस्क नहीं मिला था. कृपया %s डिस्क डालें और पुनःप्रयास के "
 "लिए %s दबाएँ."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "डिस्क नहीं मिला"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "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 "%s निर्देशिका पढ़ने में असफल: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "लोड हो रहा है"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "चालन डिस्क पढ़ रहा है..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "चालन डिस्क स्रोत "
 
-#: ../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?"
@@ -5646,7 +5646,7 @@ msgstr ""
 "आपके पास बहु युक्तियाँ हैं जो एक चालन डिस्क के लिए स्रोतों जैसी सेवा कर सकती हैं. आप कौन-सा "
 "उपयोग करना चाहेंगे?"
 
-#: ../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?"
@@ -5654,49 +5654,49 @@ msgstr ""
 "इस उपकरण पर कई विभाजन हैं, जो चालन डिस्क विंब को रख सकती हैं.  आप कौन-सा उपयोग "
 "करना चाहते हैं?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "विभाजन डिस्क आरोहण में असफल"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "चालन डिस्क विंब चुनें"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "फाइल से चालन डिस्क आरोहण में असफल"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "आपकी चालन डिस्क /dev/%s में डालें और जारी रखने के लिए \"ठीक\" दबाएँ."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "चालन डिस्क डालें "
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "चालन डिस्क आरोहण में असफल"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s के इस रिलीज के लिये ड्राइवर डिस्क अवैध है."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "दस्ती रूप से चुनें"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "दूसरी डिस्क भारित करें"
 
-#: ../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 "
@@ -5705,45 +5705,45 @@ msgstr ""
 "इस चालन डिस्क पर उचित प्रकार की युक्तियां नहीं मिली . क्या आप दस्ती रूप से से चालन "
 "छाँटना चाहते हैं, फिर भी जारी रहें, या अन्य कोई चालन डिस्क भारित करें?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "चालन डिस्क"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "क्या आपके पास एक चालन डिस्क है?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "अधिक चालन डिस्क?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "क्या आप और अधिक चालन डिस्क भारित करना चाहते हैं?"
 
-#: ../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 "किकस्टार्ट त्रुटि "
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "अज्ञात चालन डिस्क किकस्टार्ट स्रोत: %s "
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "निम्नांकित अमान्य तर्क किकस्टार्ट डिस्क कमांड के लिए निर्दिष्ट था: %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 "
@@ -5753,19 +5753,19 @@ msgstr ""
 "कृपया कोई पैरामीटर दाखिल करें जो स्थानों के द्वारा पृथक %s मॉडयूल को भेजना चाहते हैं. यदि "
 "आप नहीं जानते हैं कि कौन-सा पैरामीटर भेजें \"ठीक\" बटन दबाकर इस स्क्रीन को छोडें ."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "मॉडयूल पैरामीटरों को दाखिल करें"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "कोई चालक नहीं मिला"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "चालक डिस्क भारित करें"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5773,7 +5773,7 @@ msgstr ""
 "दस्ती रूप से रूप से डालने के लिए कोई चालक नहीं मिला था. क्या आप चालक डिस्क प्रयोग करना "
 "पसंद करेंगे?"
 
-#: ../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."
@@ -5781,33 +5781,33 @@ msgstr ""
 "कृपया नीचे से चालन चुनें जो आप भारित करना चाहते हैं. यदि यह नहीं आता और आपके पास चालन "
 "डिस्क है, F2 दबाएँ."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "वैकल्पिक मॉडयूल तर्क निर्दिष्ट करें"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "भारण के लिए युक्ति चालक चुनें"
 
-#: ../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 "माध्यम खोजा गया"
 
-#: ../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 "स्थानीय अधिष्ठापन माध्यम खोजा गया..."
 
-#: ../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 "
 "media."
 msgstr "ऐसा नहीं लगता है कि उस निर्देशिका में %s अधिष्ठापन तरू आपके बूट माध्यम से मिलान करता है."
 
-#: ../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."
@@ -5815,7 +5815,7 @@ msgstr ""
 "ISO बिंबों से अधिष्ठापन पढ़ने में एक त्रुटि घटित हुआ है. कृपया अपने ISO बिंबों को जाँचें और "
 "पुनःप्रयास करें."
 
-#: ../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?"
@@ -5823,7 +5823,7 @@ msgstr ""
 "ऐसा नहीं लगता है कि आपके सिस्टम पर कोई हार्डड्राइव हैं! क्या आप अतिरिक्त युक्तियों का "
 "विन्यास करना चाहते हैं?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5834,61 +5834,61 @@ msgstr ""
 "रखता हैं? यदि आप यहां सूचीबद्ध डिस्क चालन नहीं देख रहे हैं, अतिरिक्त युक्तियों के विन्यास के "
 "लिए F2 दबाएँ."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "बिंबों को रखने वाली निर्देशिका:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "विभाजन चुनें"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "लगता है कि %s उपकरण में %s CDROM विंब समाहित नहीं हैं."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD किकस्टार्ट विधि कमांड %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 "हार्ड ड्राइव पर किकस्टार्ट फाइल मिल नहीं सका."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS डिस्क %s के लिए हार्ड ड्राइव नहीं पा सकता है"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "कुंजीपटल प्रकार "
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "आपके पास कौन-से प्रकार का कुंजीपटल है?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s किकस्टार्ट फाइल खोलने में त्रुटि: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s किकस्टार्ट फाइल की सामग्री पढ़ने में त्रुटि: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s किकस्टार्ट फाइल की %d रेखा पर %s त्रुटि."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "विस्थापनीय मीडिया पर ks.cfg खोज नहीं सकता है."
 
-#: ../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."
@@ -5896,50 +5896,50 @@ msgstr ""
 "किकस्टार्ट फाइल डाउनलोड करने में असमर्थ.  नीचे किकस्टार्ट पैरामीटर निर्दिष्ट करें या एक "
 "अंतःक्रियात्मक अधिष्ठापन के लिये आगे बढ़ें."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "किकस्टार्ट फाइल डाउनलोड करने में त्रुटि"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "किकस्टार्ट विधि कमांड %s को बंद करने के लिए गलत तर्क: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s में %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> तत्वों के बीच          | <स्थान> चुनें        | <F12> आगे स्क्रीन"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "एक भाषा छाँटें"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "स्थानीय CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "हार्ड ड्राइव"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS निर्देशिका"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n में %s के लिए स्वागत है"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "डिस्क स्रोत का अद्यतन करें"
 
-#: ../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?"
@@ -5947,7 +5947,7 @@ msgstr ""
 "आपके पास बहु युक्तियाँ हैं जो एक अद्यतन डिस्क के लिए स्रोतों जैसी सेवा करेगी. आप कौन-सा "
 "उपयोग करना पसंद करेंगे?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -5955,28 +5955,28 @@ msgstr ""
 "इस युक्ति पर कई विभाजन हैं, जो अद्यतन डिस्क बिंब को रख सकती हैं.  आप कौन-सा उपयोग "
 "करना चाहते हैं?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "आपकी अद्यतन डिस्क को /dev/%s में डालें और जारी रखने के लिए \"ठीक\" दबाएं."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "डिस्क का अद्यतन करता है"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "अद्यतन डिस्क आरोहण में असफल"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "अद्यतन"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "एनाकोंडा अद्यतनों को पढ़ रहा है..."
 
-#: ../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.."
@@ -5984,44 +5984,44 @@ msgstr ""
 "अद्यतन चित्र डाउनलोड करने में असमर्थ.  नीचे अद्यतन स्थान रूपांतरित करें या अद्यतन के साथ आगे "
 "बढ़ने के लिए रद्द करें को दबाएं.."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "अद्यतन चित्र डाउनलोड करने में त्रुटि"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "इस मशीन पर %s अधिष्ठापित करने के लिए पर्याप्त RAM नहीं है."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "बचाव विधि"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "अधिष्ठापन विधि"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "किस प्रकार के माध्यम में सुरक्षा बिंब समाहित है?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "किस प्रकार के माध्यम में अधिष्ठापन के लिए संकुल समाहित है? "
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "कोई चालक नहीं मिला "
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "चालक चुनें"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "एक चालक डिस्क का प्रयोग करें"
 
-#: ../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?"
@@ -6029,11 +6029,11 @@ msgstr ""
 "इस अधिष्ठापन प्रकार के लिए आवश्यक कोई युक्तियाँ प्रकार पाने में असमर्थ. क्या आप चालक को "
 "दस्ती रूप से चुनना चाहते हैं या एक चालक डिस्क का उपयोग करना चाहते हैं?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "निम्नांकित युक्तियाँ आपके सिस्टम पर मिली हैं."
 
-#: ../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?"
@@ -6041,49 +6041,49 @@ msgstr ""
 "कोई भी युक्ति चालक आपके सिस्टम पर भारित नहीं हुआ है. क्या अब आप किसी का भारण करना "
 "पसंद करेंगे?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "युक्तियां"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "संपन्न"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "युक्ति जोड़ें"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "भारक पहले चलाया जा चुका है.  शैल प्रारंभ कर रहा है.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "एनाकोंडा %s चला रहा है, %s बचाव मोड - कृपया प्रतीक्षा करें...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "%s एनाकोंडा चला रहा है, %s सिस्टम अधिष्ठापक - कृपया प्रतीक्षा करें...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "%s अधिष्ठापन बिंब ढ़ूढ़नें में असमर्थ"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" को जांच कर रहा है...."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "अब माध्यम की जांच की जा रही है......"
 
-#: ../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."
@@ -6091,7 +6091,7 @@ msgstr ""
 "प्राथमिक आयतन निरूपक से डिस्क checksum पढ़ने में असमर्थ. प्रायः इसका अर्थ हो सकता है कि "
 "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 "
@@ -6101,11 +6101,11 @@ msgstr ""
 "लागू हो, कृपया डिस्क साफ करें और पुनः प्रयास करें. यदि यह जाँच लगातार असफल है, आप "
 "अधिष्ठापन जारी न रखें."
 
-#: ../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 "
@@ -6115,7 +6115,7 @@ 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"
@@ -6126,20 +6126,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "चेकसम परीक्षा"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "%s युक्ति किकस्टार्ट प्रक्रिया कमांड को बुरा तर्क: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "किकस्टार्ट युक्ति कमांड के लिये मॉड्यूल नाम को जरूर निर्दिष्ट किया जाना चाहिए."
 
-#: ../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"
@@ -6147,7 +6147,7 @@ msgstr ""
 "उपसर्ग को जरूर IPv4 संजाल के लिये 1 और 32 के बीच या IPv6 संजाल के लिये 1 और 128 के बीच "
 "होना चाहिये"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6158,27 +6158,27 @@ msgstr ""
 "गोपन कुंजी उपलब्ध कराएं.  अगर कुंजी की जरूरत नहीं है, इस क्षेत्र को खाली छोड़ें और अधिष्ठापन "
 "को जारी रहने दें."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "गोपन कुंजी"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "बेतार जमावट"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "नामसर्वर IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "गुम नामसर्वर"
 
-#: ../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 "
@@ -6188,56 +6188,56 @@ msgstr ""
 "था. यदि आपके पास यह सूचना नहीं है, आप इस क्षेत्र को खाली छोड़ सकते हैं और अधिष्ठापन जारी "
 "करेगा."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "अमान्य IP जानकारी"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "आपने एक अमान्य IP पता दिया है."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "संजाल त्रुटि"
 
-#: ../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 "आपके संजाल अंतरफलक विन्यासन में एक त्रुटि थी."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP का विन्यास करें"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "आपको कम से कम एक प्रोटोकॉल (IPv4 या IPv6) जरूर चुनना चाहिये."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 NFS के लिये जरूरी"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS अधिष्ठापन विधि के लिये IPv4 समर्थन जरूरी."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 पता:"
 
-#: ../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 पता:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "नामसर्वर:"
 
-#: ../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 "
@@ -6247,152 +6247,152 @@ msgstr ""
 "quad नेटमास्क या CIDR-शैली उपसर्ग स्वीकार्य है. गेटवे और नेमसर्वर क्षेत्र को जरूर वैध IPv4 "
 "या IPv6 पता रहना चाहिये."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "दस्ती TCP/IP विन्यास"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "जानकारी गुम गई"
 
-#: ../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 "आप जरूर एक वैध IPv4 पता और संजाल मास्क या CIDR प्रत्यय डालें."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "आपको जरूर वैध IPv6 पता और CIDR उपसर्ग दोनों के लिये डालना चाहिये."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "मेजबाननाम और डोमेन निर्धारित कर रहा है..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "%s किकस्टार्ट संजाल कमांड को बुरा तर्क: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "संजाल कमांड में बेकार %s बूटप्रोटो निर्दिष्ट है"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "संजाल युक्ति"
 
-#: ../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 "इस सिस्टम पर आपके पास बहु संजाल युक्तियाँ हैं. आप किससे होकर अधिष्ठापन करना पसंद करेंगे?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS सर्वर नामः"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s निर्देशिका:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "सर्वर नाम और आपके %s चित्र का पथ कृपया दाखिल करें."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS व्यवस्था"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "बिना DNS विन्यस्त किये मेजबाननाम निर्दिष्ट"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "पुनःप्राप्त कर रहा है"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "उस निर्देशिका का आरोहण सर्वर से नहीं हो सका."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "उस निर्देशिका में %s अधिष्ठापन तरू समाहित दिखाई नहीं देता है."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "%s NFS किकस्टार्ट विधि कमांड को बुरा तर्क: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "टेलनेट"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "टेलनेट संबंधन के लिए प्रतीक्षा कर रहा है..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "एनाकोंडा द्वारा टेलनेट चला रहा है...."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s पुनःप्राप्ति में असमर्थ://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "अधिष्ठापन बिंब पुनःप्राप्ति में असमर्थ."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr " %s Url किकस्टार्ट विधि कमांड को बुरा तर्क: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url किकस्टार्ट विधि को एक --url तर्क अवश्य दें."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "अज्ञात 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 "%s चित्र को आपके सर्वर पर समाहित करता URL दाखिल करें."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "प्रॉक्सी विन्यस्तविन्यस्त करें"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL सेटअप"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "आप जरूर URL दाखिल करें."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL या तो ftp या http URL जरूर होना चाहिए"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "अज्ञात मेजबान"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s एक उचित मेजबाननाम नहीं है. "
 
-#: ../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."
@@ -6400,23 +6400,23 @@ msgstr ""
 "यदि आप एक HTTP प्राक्सी सर्वर प्रयोग कर रहे हैं तो प्रयोग के लिए HTTP प्राक्सी सर्वर का "
 "नाम दाखिल करें."
 
-#: ../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
 msgid "Further Setup"
 msgstr "अगला सेटअप"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI चालन भारित कर रहा है"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s चालक लोड कर रहा है..."
diff --git a/po/hr.po b/po/hr.po
index 53c836351..d763f0227 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -45,41 +45,41 @@ msgstr "Za ljusku pritisnite <ENTER>"
 #: ../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 "U redu"
 
@@ -579,22 +579,22 @@ msgstr "Oblikovanje datotečnog sustava %s ..."
 #: ../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 "Pogreška"
 
@@ -651,8 +651,8 @@ msgstr ""
 "Za izlazak iz instalacijskog programa pritisnite tipku <Enter>."
 
 #: ../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 "Preskoči"
 
@@ -988,21 +988,21 @@ msgstr "Popravi"
 
 #: ../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 "Da"
 
 #: ../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 "Ne"
 
-#: ../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 "Ponovi"
 
@@ -1013,8 +1013,8 @@ msgstr "Ignoriraj"
 #: ../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 "Odustani"
 
@@ -1889,21 +1889,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 "Povratak"
 
 #: ../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 "Nastavi"
 
@@ -2340,7 +2340,7 @@ msgstr "Unesite svoj %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Preskoči unošenje %(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 "Dobro došli u %s"
@@ -3229,7 +3229,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Odabir jezika"
 
-#: ../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 "Koji jezik želite upotrebljavati tijekom instalacijskog postupka?"
 
@@ -3608,7 +3608,7 @@ msgstr "Potrebno je unijeti vrijednost u polju %s."
 msgid "Dynamic IP"
 msgstr "Dinamički 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 "Slanje zahtijeva o IP podacima za %s..."
@@ -3779,7 +3779,7 @@ msgstr "nepoznato"
 msgid "Hardware address: "
 msgstr "Hardverska adresa:"
 
-#: ../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 "Nedostaje protokol"
 
@@ -3788,7 +3788,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Potrebno je odabrati podršku za IPv4 ili IPv6."
 
 #: ../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 "Neispravan prefiks"
 
@@ -4024,7 +4024,7 @@ msgstr "RAID uređaji"
 msgid "None"
 msgstr "Nijedan"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Tvrdi diskovi"
 
@@ -4950,12 +4950,12 @@ msgstr "Prefiks"
 msgid "Activate on boot"
 msgstr "Aktiviraj tijekom pokretanja"
 
-#: ../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 "Omogući IPv4 podršku"
 
-#: ../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 "Omogući IPv6 podršku"
@@ -5075,7 +5075,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 "Pristupnik:"
 
@@ -5700,22 +5700,22 @@ msgstr ""
 "* Nećete primati softverska i sigurnosna ažuriranja paketa koji nisu "
 "obuhvaćeni vašom pretplatom."
 
-#: ../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 "Provjera medija"
 
-#: ../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
 msgid "Eject Disc"
 msgstr "Izbaci disk"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5724,7 +5724,7 @@ msgstr ""
 "Za ispitivanje medija koji se trenutno nalazi u uređaju odaberite \"%s\", "
 "ili \"%s\" za izbacivanje i umetanje drugog medija koji će biti ispitan."
 
-#: ../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 "
@@ -5738,7 +5738,7 @@ msgstr ""
 "barem prije njihove prve upotrebe.  Nakon uspješne provjere neće biti "
 "potrebno ponovo provjeravati svaki CD prije njegove upotrebe."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5747,11 +5747,11 @@ msgstr ""
 "Disk %s nije pronađen niti u jednom uređaju. Umetnite disk %s i kliknite %s "
 "za ponovni pokušaj."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disk je pronađen"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5763,7 +5763,7 @@ msgstr ""
 "Kako biste preskočili ispitivanja medija i pokrenuli instalaciju odaberite %"
 "s."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5772,7 +5772,7 @@ msgstr ""
 "Nije pronađen disk %s koji bi odgovarao vašem pokretačkom mediju. Umetnite "
 "disk %s i odaberite %s za ponovni pokušaj."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5781,32 +5781,32 @@ msgstr ""
 "Disk %s nije pronađen niti u jednom uređaju. Umetnite disk %s i kliknite %s "
 "za ponovni pokušaj."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disk nije pronađen"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Na CD mediju nije moguće pronaći kickstart datoteku."
 
-#: ../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 "Pogreška tijekom čitanja mape %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Učitavanje"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Čitanje upravljačkog diska..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Izvor upravljačkog diska"
 
-#: ../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?"
@@ -5814,7 +5814,7 @@ msgstr ""
 "Imate višestruke uređaje koji bi mogli poslužiti kao izvor za disk s "
 "upravljačkim programima. Koji od njih želite upotrijebiti?"
 
-#: ../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?"
@@ -5822,51 +5822,51 @@ msgstr ""
 "Na ovom uređaju postoji nekoliko particija koje bi mogli sadržavati presliku "
 "upravljačkih programa. Koju od njih želite upotrijebiti?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Pristupanje particiji nije uspjelo."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Odaberite presliku upravljačkog diska"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Odaberite datoteku koja je preslika diska s upravljačkim programima."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Učitavanje diska s upravljačkim programima iz datoteke nije uspjelo."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Umetnite disk s upravljačkim programima u uređaj /dev/%s i kliknite \"U redu"
 "\" za nastavak."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Umetnite upravljački disk"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Pristupanje upravljačkom disku nije uspjelo."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Disk s upravljačkim programima nije ispravan za ovo izdanje %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Ručni odabir"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Učitajte drugi 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 "
@@ -5876,38 +5876,38 @@ msgstr ""
 "ručno odabrati upravljački program, ipak nastaviti ili učitati drugi disk s "
 "upravljačkim programima?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Upravljački disk"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Imate li disk s upravljačkim programima?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Imate li još diskova?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Želite li učitati još koji disk s upravljačkim programima?"
 
-#: ../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 pogreška"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Nepoznati kickstart izvor diska s upravljačkim programima: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5916,7 +5916,7 @@ msgstr ""
 "Određeni su sljedeći neispravni argumenti za kickstart naredbu diska s "
 "upravljačkim programima: %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 "
@@ -5927,19 +5927,19 @@ msgstr ""
 "Ukoliko ne znate koje je parametre potrebno proslijediti, ovaj zaslon "
 "preskočite klikanjem gumba \"U redu\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Unesite parametre modula"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Upravljački programi nisu pronađeni"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Učitaj upravljački 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?"
@@ -5947,7 +5947,7 @@ msgstr ""
 "Nisu pronađeni upravljački programi za ručno postavljanje. Želite li "
 "upotrijebiti disk s upravljačkim programima?"
 
-#: ../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."
@@ -5955,26 +5955,26 @@ msgstr ""
 "S donjeg popisa odaberite upravljački program koji želite učitati. Ako nije "
 "na popisu, a imate disk s upravljačkim programom, pritisnite F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Određivanje dodatnih argumenata modula"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Odabir upravljačkog programa uređaja"
 
-#: ../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 "Pronađen je medij"
 
-#: ../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 "Pronađen je lokalni instalacijski medij..."
 
-#: ../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 "
@@ -5983,7 +5983,7 @@ msgstr ""
 "Izgleda da instalacijsko stablo %s u toj mapi ne odgovara vašem mediju za "
 "pokretanje sustava."
 
-#: ../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."
@@ -5991,7 +5991,7 @@ msgstr ""
 "Došlo je do pogreške tijekom čitanja instalacije s ISO preslika. Provjerite "
 "ISO preslike i ponovo pokušajte."
 
-#: ../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?"
@@ -5999,7 +5999,7 @@ msgstr ""
 "Izgleda da nemate niti jedan tvrdi disk na vašem sustavu! Želite li "
 "konfigurirati dodatne uređaje?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6010,62 +6010,62 @@ msgstr ""
 "Ako disk koji upotrebljavate nije vidljiv na ovom popisu, pritisnite F2 za "
 "konfiguriranje dodatnih uređaja."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Mapa koja sadrži preslike diskova:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Odaberite particiju"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Izgleda da uređaj %s ne sadrži preslike %s CD-a."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Loš argument za HD kickstart naredbu načina %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 "Kickstart datoteku nije moguće pronaći na tvrdom disku."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Nije moguće pronaći tvrdi disk u skladu s diskom iz BIOS-a: %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Vrsta tipkovnice"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Koju vrstu tipkovnice imate?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Pogreška tijekom otvaranja kickstart datoteke %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Pogreška tijekom čitanja sadržaja kickstart datoteke %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Pogreška pri %s u retku %d kickstart datoteke %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Na pokretačkoj disketi nije moguće pronaći ks.cfg."
 
-#: ../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."
@@ -6074,53 +6074,53 @@ msgstr ""
 "donjem polju ili kliknite \"Odustani\" kako biste nastavili u obliku "
 "interaktivne instalacije."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Pogreška tijekom preuzimanja kickstart datoteke"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Loš argument za kickstart naredbu načina gašenja %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Dobrodošli u %s - Spašavanje"
 
-#: ../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> između elemenata  | <razmaknica> odabir | <F12> sljedeći "
 "zaslon"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Odaberite jezik"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokalni CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Tvrdi disk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS mapa"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Dobro došli u %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Izvor diska s ažuriranjima"
 
-#: ../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?"
@@ -6128,7 +6128,7 @@ msgstr ""
 "Imate višestruke uređaje koji bi mogli poslužiti kao izvor diska s "
 "ažuriranjima. Koji od njih želite upotrijebiti?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6137,30 +6137,30 @@ msgstr ""
 "Na ovom uređaju postoji nekoliko particija koje bi mogli sadržavati presliku "
 "upravljačkih programa. Koju od njih želite upotrijebiti?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Umetnite diskove s ažuriranjima u /dev/%s i pritisnite \"U redu\" za "
 "nastavak."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disk s ažuriranjima"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Pristupanje disku s ažuriranjima nije uspjelo."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Ažuriranja"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Čitanje Anaconda ažuriranja..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6170,45 +6170,45 @@ msgstr ""
 "donjem polju ili kliknite \"Odustani\" kako biste nastavili u obliku "
 "interaktivne instalacije."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Pogreška tijekom preuzimanja kickstart datoteke"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Na ovom računalo nema dovoljno radne memorije za instalaciju %s."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Spašavanje"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Instalacija"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Koja vrsta medija sadrži presliku diska za spašavanje?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Koja vrsta medija sadrži pakete za instaliranje?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Upravljački program nije pronađen"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Odaberite upravljački program"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Upotrijebi upravljački 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?"
@@ -6217,11 +6217,11 @@ msgstr ""
 "Želite li ručno odabrati upravljački program ili upotrijebiti disk s "
 "upravljačkim programima?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Sljedeći su uređaji pronađeni na sustavu."
 
-#: ../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?"
@@ -6229,50 +6229,50 @@ msgstr ""
 "Upravljački programi za vaš sustav nisu učitani. Želite li sad učitati neki "
 "program?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Uređaji"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Gotovo"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Dodaj uređaj"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Pokretač je već bio pokrenut. Pokretanje korisničke ljuske.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Pokretanje Anaconde, %s način spašavanja - Pričekajte...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Pokretanje Anaconde, instalacijskog program sustava %s - pričekajte...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Nije moguće pronaći instalacijsku presliku %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Provjeravanje \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Provjeravanje medija..."
 
-#: ../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."
@@ -6280,7 +6280,7 @@ msgstr ""
 "Kontrolni iznos s primarnog opisa volumena nije moguće pročitati. To "
 "vjerojatno znači da je disk izrađen bez dodavanja kontrolnog iznosa."
 
-#: ../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 "
@@ -6291,18 +6291,18 @@ msgstr ""
 "oslobodite prostor na disku i pokušajte ponovo. Ako se tijekom ispitivanja "
 "nastave pojavljivati pogreške ne biste trebali nastaviti s instalacijom."
 
-#: ../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"
@@ -6313,22 +6313,22 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Provjera kontrolnog iznosa"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Loš argument za kickstart naredbu načina uređaja %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Za kickstart naredbu uređaja potrebno je navesti i vrstu i naziv modula."
 
-#: ../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"
@@ -6336,7 +6336,7 @@ msgstr ""
 "Prefiks mora biti između 1 i 32 za IPv4 mreže, odnosno između 1 i 128 za "
 "IPv6 mreže"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6347,27 +6347,27 @@ msgstr ""
 "ESSID i ključ šifriranja. Ako ključ nije potreban, polje ostavite "
 "neispunjenim i instalacija će biti nastavljena."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Ključ šifriranja"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Postavke bežičnih uređaja"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP poslužitelja naziva"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Nedostaje poslužitelj naziva"
 
-#: ../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 "
@@ -6377,56 +6377,56 @@ msgstr ""
 "sadržavao adresu poslužitelj naziva. Ako nemate taj podatak, ovo polje "
 "možete ostaviti neispunjenim i instalacija će biti nastavljena."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Neispravan IP podatak"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Unijeli ste neispravnu IP adresu."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Mrežna pogreška"
 
-#: ../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 "Tijekom konfiguriranja mrežnog sučelja došlo je do pogreške."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfiguriranje TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Potrebno je odabrati najmanje jedan protokol (IPv4 ili IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 je potreban za NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Način instaliranje putem NFS zahtjeva IPv4 podršku."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 adresa:"
 
-#: ../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 adresa:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Poslužitelj naziva:"
 
-#: ../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 "
@@ -6437,42 +6437,42 @@ msgstr ""
 "prefiks u CIDR stilu. Polja pristupnika i poslužitelja naziva moraju biti "
 "valjane IPv4 ili IPv6 adrese."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ručna TCP/IP konfiguracija"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Nedostaje podatak"
 
-#: ../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 "Potrebno unijeti valjanu IPv4 adresu i mrežnu masku ili CIDR prefiks."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Potrebno unijeti i valjanu IPv6 adresu i CIDR prefiks."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Određivanje naziva i domene..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Loš argument za kickstart mrežnu naredbu %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "U mrežnoj je naredbi određen loš protokol pokretanja sustava %s"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Mrežni uređaj"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6480,115 +6480,115 @@ msgstr ""
 "Na ovom sustavu postoji nekoliko mrežnih uređaja. Putem kojeg od njih želite "
 "izvršiti instalaciju? "
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Naziv NFS poslužitelja:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s mapa:"
 
-#: ../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 "NSF postavke"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Određen je naziv poslužitelja bez DNS konfiguracije"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Dohvaćanje"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Ovoj mapi nije moguće pristupiti s poslužitelja."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Izgleda da ova mapa ne sadrži %s instalacijsko stablo."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Loš argument za NFS kickstart naredbu načina %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 "Čekanje uspostavljanja telnet veze..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Pokretanje Anaconde putem Telneta..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Nije moguće dohvatiti %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Nije moguće dohvatiti instalacijsku presliku."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Loš argument za URL kickstart naredbu načina %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Potrebno je unijeti ---url argument za URL kickstart način."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Nepoznat URL način %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 "Konfiguriranje TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NSF postavke"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Potrebno je unijeti mapu."
 
-#: ../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 "Nepoznato računalo"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s nije ispravan naziv računala."
 
-#: ../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."
@@ -6596,24 +6596,24 @@ msgstr ""
 "Ako upotrebljavate HTTP proxy poslužitelj, unesite naziv HTTP proxy "
 "poslužitelja."
 
-#: ../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 "Dodatne FTP postavke"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Učitavanje SCSI upravljačkih programa"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Učitavanje upravljačkog programa %s..."
diff --git a/po/hu.po b/po/hu.po
index 249c9af1e..4c4cd19f6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -49,41 +49,41 @@ msgstr "Nyomja meg az <Enter> billentyűt, ha parancsértelmezőt szeretne"
 #: ../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"
 
@@ -583,22 +583,22 @@ msgstr "%s fájlrendszer formázása..."
 #: ../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 "Hiba"
 
@@ -654,8 +654,8 @@ msgstr ""
 "Nyomja meg az <Enter>-t a számítógép újraindításához."
 
 #: ../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 "Kihagyás"
 
@@ -993,21 +993,21 @@ msgstr "Javítás"
 
 #: ../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 "Igen"
 
 #: ../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 "Nem"
 
-#: ../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 "Újra"
 
@@ -1018,8 +1018,8 @@ msgstr "Figyelmen kívül hagyás"
 #: ../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 "Mégsem"
 
@@ -1893,21 +1893,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 "Vissza"
 
 #: ../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 "Folytatás"
 
@@ -2344,7 +2344,7 @@ msgstr "Adja meg ezt: %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s megadásának kihagyása"
 
-#: ../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 "Üdvözöljük - %s"
@@ -3226,7 +3226,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Nyelv kiválasztása"
 
-#: ../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 "Melyik nyelvet szeretné használni a telepítés alatt?"
 
@@ -3605,7 +3605,7 @@ msgstr "Meg kell adni egy értéket a(z) \"%s\" mezőhöz."
 msgid "Dynamic IP"
 msgstr "Dinamikus IP-cím"
 
-#: ../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 "%s IP-adatainak lekérdezése..."
@@ -3779,7 +3779,7 @@ msgstr "ismeretlen"
 msgid "Hardware address: "
 msgstr "Hardvercím: "
 
-#: ../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 "Hiányzó protokoll"
 
@@ -3788,7 +3788,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Legalább az IPv4- vagy az IPv6-támogatást ki kell választania."
 
 #: ../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 "Érvénytelen előtag"
 
@@ -4029,7 +4029,7 @@ msgstr "RAID-eszköz"
 msgid "None"
 msgstr "Egyik sem"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Merevlemezes meghajtók"
 
@@ -4949,12 +4949,12 @@ msgstr "Előtag"
 msgid "Activate on boot"
 msgstr "Bekapcsolás induláskor"
 
-#: ../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 "IPv4-támogatás engedélyezése"
 
-#: ../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 "IPv6-támogatás engedélyezése"
@@ -5074,7 +5074,7 @@ msgstr "Automatikus 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 "Átjáró:"
 
@@ -5697,23 +5697,23 @@ msgstr ""
 "- az Ön előfizetésében nem szereplő csomagok szoftver- és biztonsági "
 "frissítéseihez nem fog tudni hozzájutni"
 
-#: ../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 "Az adathordozó ellenőrzése"
 
-#: ../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 "Próba"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "A CD kilökése"
 
-#: ../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 "
@@ -5722,7 +5722,7 @@ msgstr ""
 "Válassza a(z) \"%s\" opciót a meghajtóban levő CD ellenőrzéséhez, vagy a(z) "
 "\"%s\" opciót a CD kilökéséhez, újabb tesztelendő lemez behelyezéséhez."
 
-#: ../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 "
@@ -5737,7 +5737,7 @@ msgstr ""
 "előtt érdemes a CD-ket tesztelni. Amennyiben már sikeresen tesztelve lettek, "
 "nem szükséges az újbóli tesztelés."
 
-#: ../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 "
@@ -5746,12 +5746,12 @@ msgstr ""
 "Egyik CD-ROM-meghajtóban sem található a(z) \"%s\" CD-lemez. Tegye be a(z) "
 "\"%s\" CD-t, és nyomja meg a(z) %s gombot a folytatáshoz."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "A telepítőprogram CD-lemezt talált"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5762,7 +5762,7 @@ msgstr ""
 "\n"
 "\"%s\" választása esetén a lemez tesztelése kimarad, elkezdődik a telepítés."
 
-#: ../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 "
@@ -5771,7 +5771,7 @@ msgstr ""
 "Nem található megfelelő \"%s\" CD-lemez. Tegye be a(z) \"%s\" CD-t, és "
 "nyomja meg a(z) %s gombot."
 
-#: ../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 "
@@ -5780,33 +5780,33 @@ msgstr ""
 "Egyik CD-ROM-meghajtóban sem található a(z) \"%s\" CD-lemez. Tegye be a(z) "
 "\"%s\" CD-t, és nyomja meg a(z) %s gombot a folytatáshoz."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Nem található CD"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Nem található Kickstart-fájl a CD-lemezen."
 
-#: ../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 "Hiba történt a(z) %s könyvtár olvasásakor: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Betöltés"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "A meghajtóprogram-lemez olvasása..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "A meghajtólemez forrása"
 
-#: ../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?"
@@ -5814,7 +5814,7 @@ msgstr ""
 "Több olyan eszköz található a gépben, amely meghajtóprogram-lemezt "
 "tartalmazhat. Melyiket szeretné használni?"
 
-#: ../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?"
@@ -5822,51 +5822,51 @@ msgstr ""
 "Több olyan partíció található ezen az eszközön, amely tartalmazhatja a "
 "meghajtóprogram-lemez képmását. Melyiket szeretné használni?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Nem sikerült csatlakoztatni a partíciót."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Válassza ki a meghajtólemez-képmást"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Válassza ki a fájlt, amely a meghajtólemez képmása."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Nem sikerült betölteni a meghajtó-képmást a fájlból."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Helyezze be a meghajtóprogram-lemezt a(z) /dev/%s meghajtóba, majd a "
 "folytatáshoz nyomja meg az \"OK\" gombot."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Helyezze be a meghajtóprogram-lemezt"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Nem sikerült csatlakoztatni a meghajtólemezt."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "A meghajtóprogram-lemez érvénytelen a(z) %s ezen kiadásához."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Kézi kiválasztás"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Másik lemez betöltése"
 
-#: ../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 "
@@ -5876,38 +5876,38 @@ msgstr ""
 "kiválasztani a meghajtóprogramot, inkább továbblép vagy betölt egy másik "
 "meghajtólemezt?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Meghajtóprogram-lemez"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Szeretne meghajtólemezt használni?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Van még meghajtólemez?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Szeretne további meghajtólemezt betölteni?"
 
-#: ../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-hiba"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Ismeretlen meghajtólemez (Kickstart-forrás): %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5916,7 +5916,7 @@ msgstr ""
 "A következő érvénytelen argumentum volt megadva a Kickstart-meghajtólemez "
 "egyik parancsában: %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 "
@@ -5927,19 +5927,19 @@ msgstr ""
 "elválasztva. Ha nem tudja, milyen paraméterekre van szükség, lépjen tovább a "
 "következő képernyőre az \"OK\" gombbal."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Modulparaméterek"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nem található meghajtóprogram"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Meghajtólemez használata"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5947,7 +5947,7 @@ msgstr ""
 "Nem található kézzel beszúrható meghajtóprogram. Meghajtólemezt szeretne "
 "használni?"
 
-#: ../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."
@@ -5955,26 +5955,26 @@ msgstr ""
 "Válassza ki alább a betölteni kívánt meghajtóprogramot. Ha nem jelenik meg, "
 "és rendelkezik meghajtólemezzel, nyomja meg az F2 gombot."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Modulargumentumok megadása"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Válassza ki a betöltendő meghajtóprogramot"
 
-#: ../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 "Adathordozó detektálva"
 
-#: ../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 "Helyi telepítési adathordozó detektálva..."
 
-#: ../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 "
@@ -5983,7 +5983,7 @@ msgstr ""
 "A könyvtárban található %s telepítési fa nem felel meg a rendszerindító "
 "lemeznek."
 
-#: ../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."
@@ -5991,7 +5991,7 @@ msgstr ""
 "Hiba történt a telepítési adatok olvasásakor (az ISO-képmásból). Ellenőrizze "
 "az ISO-képmásokat és próbálkozzon újra."
 
-#: ../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?"
@@ -5999,7 +5999,7 @@ msgstr ""
 "Úgy tűnik, nincs egyetlen merevlemezes meghajtó sem a rendszerben. Kíván "
 "további eszközöket beállítani?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6010,62 +6010,62 @@ msgstr ""
 "a %s rendszerhez? Ha nem látja a listában a használt meghajtót, nyomja meg "
 "az F2-t további eszközök beállításához."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "A telepítőkészletet tartalmazó könyvtár:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Válasszon partíciót"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "A(z) %s eszköz nem tartalmaz %s CD-ROM-os telepítőlemezeket."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Hibás argumentum a(z) %s HD Kickstart-parancsnál: %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 "Nem található Kickstart-fájl a merevlemezen."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Nem található merevlemez a(z) %s BIOS-lemezhez"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Billentyűzettípus"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Milyen típusú billentyűzete van?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Hiba történt a(z) %s Kickstart-fájl megnyitásakor: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Hiba történt a(z) %s Kickstart-fájl tartalmának beolvasásakor: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Hiba (%s, %d. sor) a(z) %s Kickstart-fájlban."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Nem található a ks.cfg fájl a rendszerindító floppyn."
 
-#: ../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."
@@ -6074,53 +6074,53 @@ msgstr ""
 "paramétert, vagy - ha interaktív módon szeretné folytatni a telepítést - "
 "nyomja meg a Mégsem gombot."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Hiba történt a Kickstart-fájl letöltésekor"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Hibás argumentum a(z) %s lezárási Kickstart-parancsnál: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Üdvözöljük - %s (helyreállítási mód)"
 
-#: ../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>/<AltTab> elemek között |<Szóköz> kiválaszt |<F12> következő képernyő "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Válasszon egy nyelvet"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "CD-ROM-meghajtó (helyi)"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Merevlemez"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS-könyvtár"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Üdvözöljük - %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "A frissítőlemez forrása"
 
-#: ../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?"
@@ -6128,7 +6128,7 @@ msgstr ""
 "Több olyan eszköz van a rendszerben, mely tartalmazhatja a frissítőlemezt. "
 "Melyiket szeretné használni?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6137,30 +6137,30 @@ msgstr ""
 "Több olyan partíció található ezen az eszközön, amely tartalmazhatja a "
 "meghajtóprogram-lemez képmását. Melyiket szeretné használni?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Helyezze be a frissítőlemezt a /dev/%s eszközbe, majd a folytatáshoz nyomja "
 "meg az \"OK\" gombot."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Frissítőlemez"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Nem sikerült csatlakoztatni a frissítőlemezt."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Frissítések"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Az Anaconda frissítéseinek olvasása..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6170,45 +6170,45 @@ msgstr ""
 "paramétert, vagy - ha interaktív módon szeretné folytatni a telepítést - "
 "nyomja meg a Mégsem gombot."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Hiba történt a Kickstart-fájl letöltésekor"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Nincs elég memória a gépben a(z) %s telepítéséhez."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Helyreállítási módszer"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Telepítési módszer"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Milyen típusú médián van a helyreállítási képmás?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Milyen típusú médián vannak a telepítendő csomagok?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nem található meghajtóprogram"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Válassza ki a meghajtóprogramot"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Meghajtólemez használata"
 
-#: ../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?"
@@ -6216,62 +6216,62 @@ msgstr ""
 "Nem található a telepítési típusnak megfelelő eszköz a gépben. Ki szeretné "
 "választani a szükséges meghajtóprogramot vagy meghajtólemezt?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "A következő eszközök találhatók a rendszerben."
 
-#: ../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 "Egy eszközmeghajtó sincs betöltve. Be szeretne most tölteni egyet?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Eszközök"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Kész"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Eszköz hozzáadása"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "A betöltő már lefutott. Elindul a parancsértelmező.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "Az Anaconda elindult (%s helyreállítási módban) - egy kis türelmet kérek...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Az Anaconda elindult (%s rendszertelepítési módban) - egy kis türelmet "
 "kérek...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Nem található ez a telepítési képmás: %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" ellenőrzése..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Az adathordozó ellenőrzése folyik..."
 
-#: ../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."
@@ -6280,7 +6280,7 @@ msgstr ""
 "ellenőrzőösszegét. Ez valószínűleg azt jelenti, hogy a lemez ellenőrzőösszeg "
 "nélkül lett elkészítve."
 
-#: ../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 "
@@ -6290,18 +6290,18 @@ msgstr ""
 "vagy lemezhiba. Ha mód van rá, tisztítsa meg a lemezt és próbálkozzon újra. "
 "Ne folytassa a telepítést, ha a teszt továbbra sem sikeres."
 
-#: ../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"
@@ -6312,22 +6312,22 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Az ellenőrzőösszegek vizsgálata"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Hibás argumentum a \"device\" Kickstart-parancsban (%s): %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Modultípust és nevet is meg kell adni a \"device\" Kickstart-parancsban."
 
-#: ../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"
@@ -6335,7 +6335,7 @@ msgstr ""
 "Az előtagnak 1 és 32 között kell lennie IPv4-alapú hálózatok esetén, illetve "
 "1 és 128 között az IPv6-alapú hálózatoknál."
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6346,27 +6346,27 @@ msgstr ""
 "eléréséhez szükséges ESSID-t és titkosítási kulcsot. Ha nem kell titkosítási "
 "kulcsot használni, hagyja üresen a mezőt, a telepítés folytatódik."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Titkosítási kulcs"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Vezeték nélküli beállítások"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Névkiszolgáló IP-címe"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Hiányzó névkiszolgáló"
 
-#: ../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 "
@@ -6377,56 +6377,56 @@ msgstr ""
 "névkiszolgáló címét, akkor üresen hagyhatja azt a mezőt - a telepítés "
 "folytatódni fog."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Érvénytelen IP-információ"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Érvénytelen IP-címet adott meg."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: ../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 "Hiba történt a hálózati csatoló beállítása közben."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP-beállítások"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Legalább egy protokollt (IPv4 vagy IPv6) ki kell választania."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS-hez IPv4 szükséges"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Az NFS-es telepítési módszer IPv4-támogatást igényel."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4-cím:"
 
-#: ../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-cím:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Névkiszolgáló:"
 
-#: ../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 "
@@ -6437,44 +6437,44 @@ msgstr ""
 "CIDR-stílusú előtag. Az átjárót és a névkiszolgálót megadó mezőkben érvényes "
 "IPv4- vagy IPv6-címeknek kell szerepelni."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Kézi TCP/IP-beállítások"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Hiányzó információ"
 
-#: ../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 ""
 "Meg kell adnia egy érvényes IPv4-címet, valamint vagy egy alhálózati "
 "maszkot, vagy egy CIDR-előtagot."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Meg kell adnia egy érvényes IPv6-címet és egy CIDR-előtagot."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Gépnév és tartomány megállapítása..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Hibás argumentum a \"network\" Kickstart-parancsban (%s): %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Hibás bootproto (%s) van megadva a 'network' parancsban"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Hálózati eszköz"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6482,138 +6482,138 @@ msgstr ""
 "Több hálózati eszköz van a rendszerben. Melyiken keresztül szeretné "
 "elvégezni a telepítést?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS-kiszolgálónév:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s-könyvtár:"
 
-#: ../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-beállítás"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Gépnév lett megadva beállított DNS nélkül"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Letöltés"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "A megadott könyvtárat nem sikerült csatlakoztatni"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "A könyvtár nem tartalmaz %s-telepítőkészletet."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Hibás argumentum az \"NFS\" Kickstart-parancsban (%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 "Várakozás a Telnet-kapcsolatra..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Az Anaconda elindítása Telneten keresztül..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Nem sikerült letölteni: %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Nem sikerült letölteni a telepítési képmást."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Hibás argumentum a(z) %s Url Kickstart-parancsban: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Meg kell adni egy --url argumentumot az Url Kickstart-parancshoz."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Ismeretlen Url-eljárás: %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 "TCP/IP-beállítások"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS-beállítás"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Meg kell adnia egy könyvtárat."
 
-#: ../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 "Ismeretlen gép"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s nem érvényes gépnév."
 
-#: ../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."
 msgstr "Ha HTTP proxykiszolgálót használ, akkor adja meg annak nevét."
 
-#: ../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 "További FTP-beállítás"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI-meghajtóprogram betöltése"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "A(z) %s-meghajtóprogram betöltése folyik..."
diff --git a/po/hy.po b/po/hy.po
index dd337173a..9370bf2bb 100644
--- a/po/hy.po
+++ b/po/hy.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 "OK"
 
@@ -488,22 +488,22 @@ msgstr "Ֆորմատավորում ենք %s ֆայլ սիստեմը..."
 #: ../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 "Սխալ"
 
@@ -551,8 +551,8 @@ msgid ""
 msgstr ""
 
 #: ../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 "Բաց թողնել"
 
@@ -795,21 +795,21 @@ msgstr "Ուղղել"
 
 #: ../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 "Այո"
 
 #: ../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 "Ոչ"
 
-#: ../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 "Կրկնել"
 
@@ -820,8 +820,8 @@ msgstr "Անտեսել"
 #: ../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 ""
 
@@ -1561,21 +1561,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 "Ետ"
 
 #: ../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 ""
 
@@ -1941,7 +1941,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2728,7 +2728,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr ""
 
-#: ../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 ""
 
@@ -3067,7 +3067,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr "Դինամիկ 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 ""
@@ -3232,7 +3232,7 @@ msgstr "Չճանաչված հոսթ"
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3241,7 +3241,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 "Սխալ IP տեղեկություններ"
@@ -3466,7 +3466,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4240,12 +4240,12 @@ msgstr "Սխալ IP տեղեկություններ"
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4366,7 +4366,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 "Միջանցք՝"
 
@@ -4947,29 +4947,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4979,19 +4979,19 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CDն գտնված է"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -4999,146 +4999,146 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CDն գտնված է"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Տեղադրե՛ք դրայվեր-դիսկը"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Այլ դիսկ բեռնել"
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5146,69 +5146,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Դրայվերներ չեն գտնվել"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5216,270 +5216,270 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Ստեղնաշարի տիպ"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Ընտրեք լեզուն"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Լոկալ CDROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Կոշտ սկավառակ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Այս մեքենայի վրա %s տեղադրելու համար բավարար RAM չունեք։"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Վերականգման եղանակ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Տեղադրման եղանակ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Դրայվեր չի գտնվել"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Ընտրել դրայվեր"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Դրայվեր-դիսկ օգտագործել"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Սարքեր"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Ավարտված"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Սարք ավելացնել"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5487,26 +5487,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5514,263 +5514,263 @@ msgid ""
 "field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Կոդավորման բանալի"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Նեյմսերվեր"
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Սխալ IP տեղեկություններ"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Դուք սխալ IP հասցե եք մուտքագրել։"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Բացակայող տեղեկություններ"
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Դուք սխալ IP հասցե եք մուտքագրել։"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "Տելնետ"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr ""
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "FTP պարամետրեր"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Դուք պետք է պանակ նշեք։"
 
-#: ../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 "Չճանաչված հոսթ"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%sը վավեր հոսթնեյմ չի։"
 
-#: ../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."
 msgstr ""
 
-#: ../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 "Հավելյալ FTP պարամետրեր"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 0d76f7e74..60d67dda8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -50,41 +50,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 "OK"
 
@@ -577,22 +577,22 @@ msgstr "Memformat %s sistem berkas..."
 #: ../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 "Kesalahan"
 
@@ -649,8 +649,8 @@ msgstr ""
 "Tekan <Enter> untuk mem-boot ulang sistem anda."
 
 #: ../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 "Lewati"
 
@@ -959,21 +959,21 @@ msgstr "Perbaikan"
 
 #: ../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 "Ya"
 
 #: ../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 "Tidak"
 
-#: ../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 "Ulangi"
 
@@ -984,8 +984,8 @@ msgstr "Abaikan"
 #: ../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 "Batal"
 
@@ -1843,21 +1843,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 "Kembali"
 
 #: ../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 "Lanjutkan"
 
@@ -2282,7 +2282,7 @@ msgstr "Isikan nama kelompok volume."
 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 "Selamat Datang di %s"
@@ -3170,7 +3170,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Pemilihan Bahasa"
 
-#: ../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 "bahasa apa yang ingin anda pergunakan selama proses instalasi?"
 
@@ -3547,7 +3547,7 @@ msgstr "Sebuah nilai diperlukan untuk field \"%s\"."
 msgid "Dynamic IP"
 msgstr "IP Dinamik"
 
-#: ../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 "Mengirimkan permintaan informasi IP untuk %s..."
@@ -3734,7 +3734,7 @@ msgstr "Tidak diketahui"
 msgid "Hardware address: "
 msgstr "Alamat Perangkat keras:"
 
-#: ../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 "Kelompok yang hilang"
@@ -3745,7 +3745,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Anda harus memilih paling tidak satu bahasa untuk menginstal."
 
 #: ../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 "String IP salah"
@@ -3982,7 +3982,7 @@ msgstr "Divais RAID"
 msgid "None"
 msgstr "Tidak ada"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Hard Drive"
 
@@ -4899,12 +4899,12 @@ msgstr "String IP salah"
 msgid "Activate on boot"
 msgstr "Aktifkan pada saat 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 ""
 
-#: ../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 ""
@@ -5033,7 +5033,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 "Gateway:"
 
@@ -5653,23 +5653,23 @@ 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 "Cek Media"
 
-#: ../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 "Uji"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Keluarkan 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 "
@@ -5678,7 +5678,7 @@ msgstr ""
 "Pilih \"%s\" untuk test CD yang ada di drive atau \"%s\" untuk eject CD dan "
 "memasukkan CD lain guna pengetesan."
 
-#: ../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 "
@@ -5688,7 +5688,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 "
@@ -5697,12 +5697,12 @@ msgstr ""
 "CD %s tidak ditemukan di drive CDROM. Mohon masukkan CD %s dan tekan %s "
 "untuk lanjut."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD Berhasil Ditemukan"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5713,7 +5713,7 @@ msgstr ""
 "\n"
 "Pilih %s untuk melewati test media dan mulai instalasi."
 
-#: ../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 "
@@ -5722,7 +5722,7 @@ msgstr ""
 "Tidak ada CD %s yang cocok dengan media boot Anda. Masukkan CD %s dan tekan %"
 "s untuk coba lagi."
 
-#: ../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 "
@@ -5731,33 +5731,33 @@ msgstr ""
 "CD %s tidak ditemukan di drive CDROM. Mohon masukkan CD %s dan tekan %s "
 "untuk lanjut."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD Tidak Ditemukan"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Tidak dapat menemukan berkas kickstart dalam 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 "Gagal membaca direktori %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 "Membaca disk driver..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Sourcer Disk Driver"
 
-#: ../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?"
@@ -5765,7 +5765,7 @@ msgstr ""
 "Anda punya divais lebih dari satu yang bisa digunakan sebagai sumber atau "
 "disket driver. Yang mana ingin Anda gunakan?"
 
-#: ../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?"
@@ -5773,50 +5773,50 @@ msgstr ""
 "Ada partisi lebih dari satu yang bisa saja berisi disk driver. Mana yang "
 "ingin digunakan?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Gagal me-mount partisi."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Pilih driver disk image"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Pilih berkas yang berisi image disk driver."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Gagal menggunakan disket driver dari berkas."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Masukkan disket driver anda ke /dev/%s dan tekan \"OK\" untuk melanjutkan."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Masukkan Disket Driver"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Gagal memount disket driver."
 
-#: ../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 "Pilih secara manual"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Gunakan disk yang lain"
 
-#: ../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 "
@@ -5825,45 +5825,45 @@ msgstr ""
 "Tidak ada divais dengen jenis yang cocok dengan driver. Apakah Anda ingin "
 "memilih manual, lanjut, atau masukkan disk driver lain?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disket Driver"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Anda punya disk driver?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Disk Driver yang lain?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Anda inging menggunakan disk driver yang lain?"
 
-#: ../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 "Kesalahan pada Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Tidak diketahui disk driver sumber kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "Argument berikut invalid untuk perintah driver disk kickstart: %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 "
@@ -5874,26 +5874,26 @@ msgstr ""
 "dengan spasi. Jika tidak tahu parameter yang diperlukan, lewati layar ini "
 "dengan menekan tombol \"OK\". "
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Masukkan Parameter Modul"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Tidak ada driver yang ditemukan"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "MenLoad disk driver"
 
-#: ../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 ""
 "Tidak ada driver yangditemukan. Apakah Anda ingin menggunakan disk driver?"
 
-#: ../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."
@@ -5901,33 +5901,33 @@ msgstr ""
 "Pilih driver berikut yang akan diaktifkan. Jika tidak muncul, dan anda punya "
 "disk driver, tekan F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Tentukan modul untuk argumentasi yang tidak diharuskan"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Pilif Driver Divais untuk Diaktifkan"
 
-#: ../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 terdeteksi"
 
-#: ../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 "Media instalasi lokal terdeteksi..."
 
-#: ../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 "
 "media."
 msgstr "Tree instalasi %s tidak cocok dengan media boot Anda."
 
-#: ../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."
@@ -5935,7 +5935,7 @@ msgstr ""
 "Terjadi error saat membaca image ISO. Mohon cek berkas ISO Anda dan coba "
 "lagi."
 
-#: ../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?"
@@ -5943,7 +5943,7 @@ msgstr ""
 "Anda sepertinya tidak mempunya hardisk dalam sistem anda! Maukah anda "
 "melakukan konfigurasi untuk divais tambahan?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5954,118 +5954,118 @@ msgstr ""
 "(iso9660) untuk %s? Jika anda tidak drive disk yang anda gunakan disini, "
 "tekan F2 untuk melakukan konfigurasi divais tambahan."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Direktori tempat menyimpan image:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Pilih Partisi"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Device %s kelihatannya tidak berisi CDROM %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 "Argumentasi yang kurang bagus untuk perintah metode kickstart HD %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 "Tidak dapat menemukan berkas kickstart dalam hard drive"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Tidak menemukan hardisk untuk %s disk BIOS"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tipe Keyboard"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "apa tipe keyboard yang anda miliki?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Kesalahan membuka berkas kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Kesalahan membaca isi berkas kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Kesalahan pada %s pada baris ke %d dari berkas kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Tidak dapat menemukan ks.cfg dalam floppy boot"
 
-#: ../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 "Kesalahan membuka berkas kickstart %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 "Argumentasi yang kurang bagus untuk perintah metode kickstart shutdown %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Selamat datang di %s - Modus Penyelamatan"
 
-#: ../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> antar elemen | <Space> Memilih | <F12> layar selanjutnya "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Pilih Bahasa"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "CDROM Lokal"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Hard drive"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "Direktori %s:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Selamat Datang di %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Disk Source diUpdate"
 
-#: ../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?"
@@ -6073,7 +6073,7 @@ msgstr ""
 "Anda mempunyai banyak divais yang bisa dijadikan sebagai sumber dari disk "
 "update. Mana yang akan anda gunakan?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6082,73 +6082,73 @@ msgstr ""
 "Ada partisi lebih dari satu yang bisa saja berisi disk driver. Mana yang "
 "ingin digunakan?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Masukkan disk update anda ke /dev/%s dan tekan \"OK\" untuk melanjutkan."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disket Update"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Gagal me-mount disk update"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Update"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Membaca update 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 "Kesalahan membuka berkas kickstart %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 "Anda tidak memiliki cukup RAM untuk menginstal %s di mesin ini."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Metode Penyelamatan"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Metode Instalasi"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Tipe media yang mana yang berisikan image untuk penyelamatan?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Tipe media apa yang berisikan paket-paket yang akan diinstall?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Tidak ada driver yang ditemukan"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Pilih driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Pergunakan disket driver"
 
-#: ../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?"
@@ -6157,11 +6157,11 @@ msgstr ""
 "ini. Maukah anda memilih secara manual driver atau disk driver yang akan "
 "anda gunakan ?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Divais berikut ini telah ditemukan pada sistem anda."
 
-#: ../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?"
@@ -6169,49 +6169,49 @@ msgstr ""
 "Tidak ada divais dari driver yang di pakai untuk sistem anda. Akankah anda "
 "memakai beberapa sekarang?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Divais"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Selesai"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Tambah Divais"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Loader telah jalan. Shell dimulai.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Menjalankan anaconda, mode penyelamatan %s - silahkan tunggu...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Menjalankan anaconda, instaler sistem %s - silahkan tunggu...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Tidak dapat menemukan instal image %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Pengecekan \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Dilakukan pengechekan media, sekarang ..."
 
-#: ../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."
@@ -6219,25 +6219,25 @@ msgstr ""
 "Tidak bisa membaca checksum disk dari diskriptor volume yang utama. Yang "
 "bisa diartikan disk ini dibuat tanpa menambahkan checksumnya."
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -6248,28 +6248,28 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Tes Checksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 "Argumentasi yang kurang bagus untuk perintah metode kickstart divais %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Argument berikut invalid untuk perintah driver disk kickstart: %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 "
@@ -6280,28 +6280,28 @@ msgstr ""
 "enkripsi yang diperlukan untuk mengakses jaringan wireless. Jika kunci tidak "
 "dibutuhkan , kosongi saja dan instalasi akan dilanjutkan."
 
-#: ../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 "Setting Wireless"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP Nameserver"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Nameserver"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6313,110 +6313,110 @@ msgstr ""
 "silakan masukan sekarang. Jika anda tidak mengetahuinya, anda dapat kosongi "
 "dan instalasi akan dilanjutkan."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Informasi IP tidak valid"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Anda memasukkan alamat IP yang tidak valid."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Tanpa pasword"
 
-#: ../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 ""
 "Terjadi kesalahan saat membersihkan pada drive taregt. Penggadaan, gagal."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfigurasi TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Anda harus memilih paling tidak satu bahasa untuk menginstal."
 
-#: ../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 "Alamat 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 "Alamat IP:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Nameserver"
 
-#: ../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 "z/IPL Konfigurasi"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Informasi Kurang"
 
-#: ../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 "Anda harus memasukkan alamat IP dan netmask yang valid"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Anda harus memasukkan alamat IP dan netmask yang valid"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Menentukan nama host dan domain..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 "Argumentasi yang kurang bagus untuk perintah jaringan metode kickstart  %s: %"
 "s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "%s bad bootproto akan dispesifikasikan pada perintah jaringan"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Device Jaringan"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6424,117 +6424,117 @@ msgstr ""
 "Anda mempunyai banya divais jaringan pada sistem. Mana yang anda akan "
 "install ?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nama server NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Direktori %s:"
 
-#: ../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 "Setup 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 "Mengambil"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Direktori tersebut tidak dapat dimount dari server."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Direktori itu tampaknya tidak mengandung pohon instalasi %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 "Argumentasi yang kurang bagus untuk perintah metode kickstart NFS %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 "Menunggu koneksi telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Menjalankan anaconda melalui telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Gagal mengambil %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Gagal mengambil image instal."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 "Argumentasi yang kurang bagus untuk perintah metode kickstart URL %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Harus menyertakan argumen --url untuk metode kickstart Url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Metode Url %s tidak diketahui"
 
-#: ../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 "Konfigurasi TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Setup NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Anda harus memasukkan nama direktori."
 
-#: ../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 "Host tidak diketahui"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s merupakan nama host yang tidak valid."
 
-#: ../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."
@@ -6542,24 +6542,24 @@ msgstr ""
 "Jika anda mempergunakan server proxy HTTP masukkan nama server proxy HTTP "
 "yang akan dipergunakan"
 
-#: ../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 "Setup FTP Lebih lanjut"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Memanggil driver SCSI "
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "MenLoad driver %s ..."
diff --git a/po/ilo.po b/po/ilo.po
index 79647d3a7..25cbff8d7 100644
--- a/po/ilo.po
+++ b/po/ilo.po
@@ -44,41 +44,41 @@ msgstr "Talmeganyo ti <ENTER> tapno maipakita ti 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 "Mayat"
 
@@ -588,22 +588,22 @@ msgstr "Rimsua ti biddut iti pannakaisagpat ti sistema ti intar iti %s: %s"
 #: ../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 "Biddut"
 
@@ -659,8 +659,8 @@ msgstr ""
 "Talmeganyo ti <ENTER> tapno marugian manen ti sistema."
 
 #: ../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 "Laktawen"
 
@@ -1001,21 +1001,21 @@ msgstr "Isaad"
 
 #: ../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 "Wen"
 
 #: ../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 "Saan"
 
-#: ../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 "Padasen manen"
 
@@ -1026,8 +1026,8 @@ msgstr "Bay-an"
 #: ../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 "Ukasen"
 
@@ -1907,21 +1907,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 "Agatras"
 
 #: ../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 "Ipatuloy"
 
@@ -2359,7 +2359,7 @@ msgstr "Inagananyo man ti grupo ti tomo."
 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 "%s"
@@ -3270,7 +3270,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Pakapilian ti Pagsasao"
 
-#: ../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 "Ania a pagsasao a kayatyo nga aramaten iti panaginstala?"
 
@@ -3652,7 +3652,7 @@ msgstr "Nasken ti pateg maipaay ti blangko a \"%s\"."
 msgid "Dynamic IP"
 msgstr "Agsabsabali nga 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 "Ipatultulod ti dawat ti datos ti IP maipaay ti %s..."
@@ -3832,7 +3832,7 @@ msgstr "Saan nga Am-ammo"
 msgid "Hardware address: "
 msgstr "Pagtaengan ti hardware: %s"
 
-#: ../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 "Nalabsan a Protokol"
 
@@ -3844,7 +3844,7 @@ msgstr ""
 "IPv6) maipaay ti DHCP."
 
 #: ../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 "Saan a Matutop nga Unlapi"
 
@@ -4081,7 +4081,7 @@ msgstr "Aparato ti RAID"
 msgid "None"
 msgstr "Awan"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Harddrive"
 
@@ -5025,12 +5025,12 @@ msgstr "IPv6/Unlapi"
 msgid "Activate on boot"
 msgstr "Ilukat iti panagrubbuat"
 
-#: ../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 "Irugi ti panagisayangkat ti IPv4"
 
-#: ../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 "Irugi ti panagisayangkat ti IPv6"
@@ -5159,7 +5159,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 "Pagbaetan:"
 
@@ -5794,23 +5794,23 @@ 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 "Panagpaneknek ti Media"
 
-#: ../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 "Sukimaten"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Iparuar ti 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 "
@@ -5819,7 +5819,7 @@ msgstr ""
 "Pilienyo ti \"%s\" tapno masukimat ti CD nga agdinama a nakaisengngat, wenno "
 "\"%s\" tapno maiparuar ti CD, santo isengngatyou sabali a mapaneknekan."
 
-#: ../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 "
@@ -5834,7 +5834,7 @@ msgstr ""
 "maaramat ida. Kalpasandanto masukimat, saan a nasken a masukimat manen ti "
 "tunggal maysa a CD sakbay maaramatda manen. "
 
-#: ../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 "
@@ -5843,12 +5843,12 @@ msgstr ""
 "Saan a maduktalan ti %s a CD iti uneg ti aniaman a CDROM a driveyo. "
 "Isengnatyo ti %s a CD, sanyonto talmegan ti '%s' tapno mapadasen manen."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Nabirokan ti CD"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5861,7 +5861,7 @@ msgstr ""
 "Pilienyo ti '%s' ket malaktaw ti panagpaneknekan ti warnakan, santo irugi ti "
 "panaginstala."
 
-#: ../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 "
@@ -5870,7 +5870,7 @@ msgstr ""
 "Awan ti nabirokan a %s a CD nga agbaya iti pagirugi a warnakan. Iyunegyo ti %"
 "s CD sayonto talmegan ti %s tapno mapadas manen."
 
-#: ../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 "
@@ -5879,33 +5879,33 @@ msgstr ""
 "Saan a maduktalan ti %s a CD iti uneg ti aniaman a CDROM a driveyo. "
 "Isengnatyo ti %s a CD, sanyonto talmegan ti '%s' tapno mapadasen manen."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Saan a mabirokan ti CD"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Saan a mabirokan ti intar ti kickstart iti 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 "Saan a nabasa ti directorio a %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Iyaw-awit"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Basbasaen ti disk ti agtengngel..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Pagtataudan ti Disk ti Agtengngel"
 
-#: ../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?"
@@ -5913,7 +5913,7 @@ msgstr ""
 "Adda ti dadduma nga aparato a makaserbi a kas punganay maipaay ti disk ti "
 "pagtengnel. Ania ti kayatyo nga aramaten?"
 
-#: ../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?"
@@ -5921,51 +5921,51 @@ msgstr ""
 "Adda ti dadduma a benneg kadaytoy nga aparato a makalaon iti imahen ti disk "
 "ti pagtengngel. Ania ti kayatyo nga aramaten?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Saan a maisagpat ti benneg."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Pilien ti imahen ti disk ti agtengngel"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Pilienyo ti intar nga imahen ti disk ti pagtengngel."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Saan a maawit nga aggapu ti intar ti disk ti pagtengngel."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sengngetanyo ti /dev/%s ti disk ti pagtengngel, sayonto talmegan ti \"OK\" "
 "tapno ipatuloy."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Ipastrekyo ti disk ti agtengngel"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Saan a maisagpat ti disk ti agtengngel."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Saan a matutop daytoy a disk maipaay daytoy a pannakaibbat ti %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Pilien a demano"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Awiten ti sabali a 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 "
@@ -5975,38 +5975,38 @@ msgstr ""
 "Kayatyo nga agpili a demano iti pagtengngel, agpatuloy met laeng, wenno "
 "agawit iti sabali a disk ti pagtengngel?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disk ti agtengngel"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Adda ti diskyo ti agtengngel?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Ad-adu ti Disk ti Agtengnel?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Kayatyo nga awiten pay ti ad-adu a disk ti pagtengngel? "
 
-#: ../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 "Biddut ti Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Saan nga am-ammo a punganay ti disk ti pagtengnel ti kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -6015,7 +6015,7 @@ msgstr ""
 "Naituding ti sumaruno a saan a matutop nga argumento maipaay ti pammilin ti "
 "disk ti pagtengngel ti kickstart: %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 "
@@ -6026,19 +6026,19 @@ msgstr ""
 "ti module a %s. No saanyo ammo ania a parametro nga maikkan, laktawen a "
 "talmegan ti \"Mayat\" daytoy a pantalia."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Isuratyo ti Parametro ti Module"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Awan ti naduktalan a pagtengngel"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Awiten ti disk ti agtengngel"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6046,7 +6046,7 @@ msgstr ""
 "Awan ti nadukatalan a pagtengngel a maisengngat a demano. Kayatyo ti "
 "agaramat iti disk ti pagtengngel?"
 
-#: ../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."
@@ -6054,26 +6054,26 @@ msgstr ""
 "Pilieny ti pagtengngel nga adda ti baba a kayatyo nga awiten. No saan a "
 "makit ket adda kadakayo ti disk ti pagtengngel, talmeganyo ti 'F2'."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Ituding ti opsional nga argumento ti module"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Pilien ti Pagtengngel ti Aparato a Maawit"
 
-#: ../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 "Naduktalan ti Media"
 
-#: ../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 "Naduktalan ti lokal a warnakan ti panaginstala..."
 
-#: ../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 "
@@ -6082,7 +6082,7 @@ msgstr ""
 "Saan nga agpada ti kayo ti instalasion ti %s nga adda kadayta a direktorio "
 "ti warnakan ti panagrubbuat."
 
-#: ../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."
@@ -6090,14 +6090,14 @@ msgstr ""
 "Rimsua ti biddut iti pannakabasa ti pakainstala nga aggapu ti imahen nga "
 "ISO. Sukimatenyo ti imahen nga ISO, sayonto padasen manen."
 
-#: ../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?"
 msgstr ""
 "Awan ti harddrive ti sistema. Kayatyo nga idalimanek ti dadduma nga aparato?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6108,120 +6108,120 @@ msgstr ""
 "(ISO9660) nga imahen ti %s? No saan a makita ti drive ti disk a ar-aramtenyo "
 "ditoy, talmeganyo ti 'F2' tapno maidalimanek ti nayon nga aparato."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Direktorio nga aglallaon iti imahen:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Pilien ti Benneg"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 "Agar-arup nga saan a linlinaon ti aparato a %s ti %s nga CDROM nga imahen."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Madi ti argumento ti wagas a pammilin a %s ti HD kickstart: %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 "Saan a masarakan ti harddrive ti intar ti kickstart."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Saan a maduktalan ti nalagda a harddrive maipaay ti disk a %s ti BIOS"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Kita ti Teklado"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Ania a kita ti tekladoyo?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Rimsua ti biddut iti pannakabasa ti kickstart nga intar a %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Rimsua ti biddut iti pannakabasa ti intar a %s ti kickstart: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Rimsua ti biddut iti %s ti linia a %d ti intar %s ti kickstart."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Saan a maduktalan ti pangrubbuat a floppy ti ks.cfg."
 
-#: ../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 "Rimsua ti biddut iti pannakabasa ti kickstart nga intar a %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 "Naikkan ti madi nga argumento ti pangiddep a pammilin a %s ti wagas ti "
 "kickstart: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s - Panalak a Wagas"
 
-#: ../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> Baet ti Banag  | <Space> Agpili | <F12> Sumaruno a "
 "Pantalia "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Pilienyo ti Pagsasao"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Lokal a CDROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Harddrive"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s a direktorio:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Ipadama ti Pagtataudan ti Disk"
 
-#: ../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?"
@@ -6229,7 +6229,7 @@ msgstr ""
 "Add ti dadduma nga aparato a makaserbi a kas ti punganay maipaay ti disk ti "
 "panagpadama?Ania ti kayatyo nga aramaten?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6238,74 +6238,74 @@ msgstr ""
 "Adda ti dadduma a benneg kadaytoy nga aparato a makalaon iti imahen ti disk "
 "ti pagtengngel. Ania ti kayatyo nga aramaten?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sengngatanyo ti /dev/%s ti disk ti panagpasayaat, sayonto talmeganyo ti "
 "'Mayat' tapno agpatuloy."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Ipadama ti disk"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Saan a naisagpat ti disk ti pamagdama"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Pagpadama"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Basbasaen ti pagpadama ti 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 "Rimsua ti biddut iti pannakabasa ti kickstart nga intar a %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 "Kurang ti RAM tapno mainstalaan daytoy a makina ti %s."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Panagisalakan"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "panaginstala"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Ania ti kita ti warnakan nga aglallaon iti pangisalakan nga imahen?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Ania ti kita ti warnakan nga aglallaon iti pakete a mainstalato?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Awan ti nabirokan nga agtengngel"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Pilien ti agtengngel"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Aramaten ti disk ti agtengnel"
 
-#: ../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?"
@@ -6314,11 +6314,11 @@ msgstr ""
 "a kita ti panaginstala. Kayatyo ti agpili a demano ti pagtengngel wenno "
 "agaramat ti disk ti agtengnel?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Naduktalan ti sistema ti sumaruno nga aparato. "
 
-#: ../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?"
@@ -6326,52 +6326,52 @@ msgstr ""
 "Awan ti naawit a pagtengngel ti aparato maipaay ti sistema. Kayatyo nga "
 "awiten ita?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Aparato"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Nalpas"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Inayon ti Aparato"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "nagtarayen ti pagawit. Ipaan-andar ti 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 ""
 "Ipatartaray ti Anaconda, ti pansalak a wagas ti sistema a %s - Aguraykayo "
 "man...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Ipatartaray ti Anaconda, ti paginstala ti sistema a %s - Aguraykayo man...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Saan a maduktalan ti panginstala nga imahen ti %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Agsuksukimat iti \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Sukimaten ti warnakan ita..."
 
-#: ../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."
@@ -6379,7 +6379,7 @@ msgstr ""
 "Saan a mabasa ti panenglan ti disk aggapu ti kangrunaan pagilawlawag ti "
 "tomo. Kayat a sawen, naparsua a saan a nadagup ti panenglan a dagup ti disk."
 
-#: ../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 "
@@ -6389,18 +6389,18 @@ msgstr ""
 "pakayulog wenno nadadael ti disk. No mayanatup, dalusanyo ti disk, sayonto "
 "padasen manen. No agkarapalia, saanyo ipatuloy ti panaginstala."
 
-#: ../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"
@@ -6411,23 +6411,23 @@ msgstr ""
 "\n"
 "    %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Panagpaneknek ti Panenglan"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Madi ti argumento ti pammilin a %s ti aparato ti kickstart a wagas: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Naituding ti sumaruno a saan a matutop nga argumento maipaay ti pammilin ti "
 "disk ti pagtengngel ti kickstart: %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"
@@ -6435,7 +6435,7 @@ msgstr ""
 "Naksen nga agbaet ti unlapi iti 1 ken 32 maipaay ti IPv4 nga iket wenno 1 "
 "ken 128 maipaay ti IPv6 nga iket."
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6446,28 +6446,28 @@ msgstr ""
 "encryption a nasken a maaramat ti iket nga awan ti alambre. No saan a "
 "nasken, bay-anyo a kalakaw daytoy a kampo, santo agpatuloy ti panaginstala."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Klabe ti Encryption"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Pakaitudingan ti Wireless"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP ti Serbidor ti Nagan"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Serbidor ti nagan"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6479,106 +6479,106 @@ msgstr ""
 "serbidor ti nagan, isuratyo ita. No saanyo ammo daytoy nga impormasion, "
 "mabay-anyo a kalakaw daytoy a kampo, santo agpatuloy ti panaginstala."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Saan a Matutop ti Impormasion ti IP"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Naidatag ti saan a matutop a pagtaengan a IP."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Biddut ti Iket"
 
-#: ../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 "Rimsua ti biddut iti panagidadalimanek ti pagsilpuan ti iket."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Panagidalimanek ti TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 "Nasken a mapili ti saan a nakurkurang ngem maysa a protokol (IPv4 wenno "
 "IPv6) maipaay ti DHCP."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "Masapul ti IPv4 maipaay ti NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Tuntonen ti wagas ti panaginstala ti NFS ti pannakaipakat ti IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 a Pagtaengan:"
 
-#: ../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 a Pagtaengan:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Serbidor ti Nagnagan:"
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "Panagidalimanek a Demano ti TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Nalabsan a datos"
 
-#: ../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 ""
 "Nasken a maisurat isuda a dua a matutop a IPv4 a pagtaengan ken maskara ti "
 "iket wenno unlapi ti CIDR. "
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 "Nasken a maisurat isuda a dua a matutop a IPv6 a pagtaengan ken unlapi ti "
 "CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Ikedkedding ti nagan ti host ken ti sakup..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Madi ti argumento ti pammilin a %s ti iket ti kickstart: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Madi ti booproto a %s a naituding iti pammilin ti iket"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Pangiket nga Aparato"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6586,116 +6586,116 @@ msgstr ""
 "Lallaonen ti sistema ti adu a pangiket nga aparato. Ania ti pagbaetan ti "
 "panaginstala?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nagan ti NFS a serbidor:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s a direktorio:"
 
-#: ../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 "Pannakaituding ti NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Naituding ti nagan ti host ket awan ti naidalimanek a DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Inal-ala"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Saan a naisagpatan gapu ti serbidor dayta a direktorio."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 "Agar-arup a saan a lallaonen dayta direktorio ti puno ti panaginstala ti %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Madi ti argumento ti pammilin a %s ti wagas ti NFS a kickstart: %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 "Ur-urayen ti telnet a panilpo..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Ipatartaray ti Anaconda babaen ti telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Saan a maala ti %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Saan a maala ti imahen ti panaginstala."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Madi ti argumento ti URL a pammilin a %s ti wagas ti kickstart: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Nasken a maikkanan ti URL a wagas ti kickstart ti --url nga argumento."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Saan nga am-ammo a URL a wagas a %s "
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, fuzzy, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Idatagyo ti pangrehistro a tulbek ti bersionyo ti %s."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "Idalimanek ti %s"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Pannakaituding ti NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Masapol a maisurat ti direktorio."
 
-#: ../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 "Saan nga am-ammo a host"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "Ti %s ket saan a matutop a nagan ti host."
 
-#: ../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."
@@ -6703,24 +6703,24 @@ msgstr ""
 "No ar-aramatenyo ti HTTP a pannakaserbidor, isuratyo ti nagan ti HTTP a "
 "pannakaserbidor nga maaramatto."
 
-#: ../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 "Dadduma a Pannakaituding ti FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Iyawit ti pagtengngel ti SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Aw-awiten ti %s a driver..."
diff --git a/po/is.po b/po/is.po
index 9a257e821..a93d2e4cf 100644
--- a/po/is.po
+++ b/po/is.po
@@ -46,41 +46,41 @@ msgstr "Sláðu á <enter> til að fá skél"
 #: ../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 "Í lagi"
 
@@ -575,22 +575,22 @@ msgstr "Forsníð %s skráakerfið..."
 #: ../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 "Villa"
 
@@ -646,8 +646,8 @@ msgstr ""
 "Sláðu á <Enter> til að loka uppsetningarforritinu."
 
 #: ../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 "Sleppa"
 
@@ -978,21 +978,21 @@ msgstr "Laga"
 
 #: ../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 "Já"
 
 #: ../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 "Nei"
 
-#: ../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 "Reyna aftur"
 
@@ -1003,8 +1003,8 @@ msgstr "Hunsa"
 #: ../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 "Hætta við"
 
@@ -1869,21 +1869,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 "Til baka"
 
 #: ../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 "Halda áfram"
 
@@ -2310,7 +2310,7 @@ msgstr "Vinsamlegast sláðu inn %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Sleppa %(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 "Velkomin(n) í %s"
@@ -3188,7 +3188,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Veljið tungumál"
 
-#: ../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 "Hvaða tungumál viltu nota meðan á uppsetningu stendur?"
 
@@ -3565,7 +3565,7 @@ msgstr "Gildi vantar í sviðið %s."
 msgid "Dynamic IP"
 msgstr "Lausbundið 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 "Sendi beiðni um IP stillingar fyrir %s..."
@@ -3735,7 +3735,7 @@ msgstr "Óþekkt"
 msgid "Hardware address: "
 msgstr "Vélbúnaðarvistfang: "
 
-#: ../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 "Samskiptamáta vantar"
 
@@ -3744,7 +3744,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Þú verður að velja amk. IPv4 eða IPv6 stuðning."
 
 #: ../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 "Ógillt forskeyti"
 
@@ -3978,7 +3978,7 @@ msgstr "RAID tæki"
 msgid "None"
 msgstr "Ekkert"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Harðir diskar"
 
@@ -4890,12 +4890,12 @@ msgstr "Forskeyti"
 msgid "Activate on boot"
 msgstr "Virkja við ræsingu"
 
-#: ../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 "Virkja IPv4 stuðning"
 
-#: ../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 "Virkja IPv6 stuðning"
@@ -5015,7 +5015,7 @@ msgstr "Sjálfvirkt 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 "Gátt:"
 
@@ -5633,22 +5633,22 @@ msgstr ""
 "* muntu ekki fá aðgang í hugbúnaðar og öryggisuppfærslur sem áskriftin þín "
 "veitir þér rétt á."
 
-#: ../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 "Yfirfara disk"
 
-#: ../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 "Prófa"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Henda út disk"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5657,7 +5657,7 @@ msgstr ""
 "Veldu \"%s\" til að yfirfara diskinn sem er núna í drifinu eða \"%s\" til að "
 "henda honum út og yfirfara annann disk."
 
-#: ../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 "
@@ -5672,7 +5672,7 @@ msgstr ""
 "þeir eru notaðir í fyrsta skipti. Eftir það þarftu ekki að yfirfara þá þegar "
 "þeir eru notaðir aftur."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5681,11 +5681,11 @@ msgstr ""
 "%s diskurinn fannst ekki í neinu af drifunum þínum. Vinsamlegast settu %s "
 "diskinn í viðeigandi drif og veldu %s til að reyna aftur."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Diskur fundinn"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5696,7 +5696,7 @@ msgstr ""
 "\n"
 "Veldu %s til að sleppa yfirferðinni og hefja uppsetninguna."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5705,7 +5705,7 @@ msgstr ""
 "%s diskurinn sem passar við ræsidiskinn fannst ekki. Vinsamlegast settu %s "
 "diskinn í viðeigandi drif og veldu %s til að reyna aftur."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5714,32 +5714,32 @@ msgstr ""
 "%s diskurinn fannst ekki í neinu af geisladrifunum þínum. Vinsamlegast settu "
 "%s diskinn í viðeigandi drif og veldu '%s' til að reyna aftur."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Diskur fannst ekki"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Gat ekki fundið hraðuppsetningarskrá á geisladisknum."
 
-#: ../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 "Gat ekki lesið möppuna %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Les inn"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Les rekladiskinn..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Staðsetning rekladisks"
 
-#: ../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?"
@@ -5747,7 +5747,7 @@ msgstr ""
 "Þú hefur fleiri en eitt drif í vélinni þinni sem nota má fyrir "
 "rekladiskling. Hvert þeirra viltu nota við uppsetninguna?"
 
-#: ../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?"
@@ -5755,50 +5755,50 @@ msgstr ""
 "Þú hefur fleiri en ein disksneið í vélinni þinni sem gæti innihaldið "
 "rekladiskmyndina. Hvert þeirra viltu reyna?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Gat ekki tengt disksneiðina."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Veldu rekladiskmynd."
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Veldu skrána sem er með rekladiskmyndina."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Gat ekki lesið rekladisklinginn úr skrá."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Settu rekladisklinginn í /dev/%s og veldu \"Í lagi\" til að halda áfram."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Settu rekladiskinn í drifið"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Gat ekki tengt rekladisklinginn."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Rekladiskurinn er ógildur fyrir þessa útgáfu af %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Velja handvirkt"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Setja annan 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 "
@@ -5807,38 +5807,38 @@ msgstr ""
 "Engin tæki af réttri tegund fundust á þessum rekladisk. Viltu velja rekil "
 "handvirkt, halda áfram eða lesa inn annann rekladisk?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Rekladiskur"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Ertu með rekladisk?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Fleiri rekladisklinga?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Viltu lesa inn fleiri rekladisklinga?"
 
-#: ../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 villa"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "óleyfilegt staðsetning rekladisks: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5847,7 +5847,7 @@ msgstr ""
 "Eftirfarandi er óleyfilegt viðfang við rekladiskskipun hraðuppsetningar: %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 "
@@ -5858,19 +5858,19 @@ msgstr ""
 "aðskilin með orðabilum. Ef þú veist ekki hvaða viðföng á að nota getur þú "
 "sleppt þessum skjá með því að velja \"Í lagi\" hnappinn."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Skáðu inn viðföng kjarnarekla"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Engir rekilar fundust"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Nota rekladisk"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5878,7 +5878,7 @@ msgstr ""
 "Engir reklar fundust sem hægt er að setja inn handvirkt. Viltu reyna að nota "
 "rekladisk?"
 
-#: ../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."
@@ -5886,26 +5886,26 @@ msgstr ""
 "Hvaða rekil viltu reyna? Ef rekillinn sem þú þarft er ekki á þessum lista og "
 "þú ert með sérstakann rekladiskling veldu þá F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Gefðu upp viðföng kjarnarekla ef þarf"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Veldu rekil til að lesa inn"
 
-#: ../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 "Diskur fannst"
 
-#: ../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 "Staðbundnar uppsetningarskrár fundust..."
 
-#: ../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 "
@@ -5914,7 +5914,7 @@ msgstr ""
 "%s uppsetningartréð í þessari möppu virðist ekki passa við ræsidisklinginn "
 "þinn."
 
-#: ../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."
@@ -5922,7 +5922,7 @@ msgstr ""
 "Villa kom upp þegar reynt var að lesa uppsetningarforritið úr ISO diskmynd. "
 "Vinsamlegast athugaðu diskmyndirnar og reyndu aftur."
 
-#: ../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?"
@@ -5930,7 +5930,7 @@ msgstr ""
 "Þú virðist ekki vera með neina harða diska í vélinni! Viltu stilla önnur "
 "tæki?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5941,62 +5941,62 @@ msgstr ""
 "af %s? Ef þú sérð ekki diskinn í listanum ýttu þá á F2 til að bæta við "
 "tækjum."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Mappa sem inniheldur diskmyndirnar:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Veldu disksneið"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Tækið %s virðist ekki innihalda %s geisladiskmyndir."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Óleyfilegt viðfang við HD skipun hraðuppsetningar %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 "Gat ekki fundið hraðuppsetningarskrá á harða disknum."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Finn ekki harða drifið fyrir BIOS diskinn %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Stillingar lyklaborðs"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Hvernig lyklaborð ertu með?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Villa við opnun hraðuppsetningarskrár %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Villa við lestur hraðuppsetningarskráar %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Villa í %s á línu %d í hraðuppsetningarskrá %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Gat ekki fundið ks.cfg á ræsidisklingnum."
 
-#: ../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."
@@ -6005,52 +6005,52 @@ msgstr ""
 "hraðuppsetningar að neðan eða smelltu á hætta við til að fara í gagnvirka "
 "uppsetningu."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Villa við opnun hraðuppsetningarskrár"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Óleyfilegt viðfang við shutdown skipun hraðuppsetningar %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Velkomin(n) í %s - Björgunarham"
 
-#: ../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> milli atriða      | <Bilslá> velur  | <F12> næsti skjár "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Veldu tungumál"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Staðbundið geisladrif"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Harðir diskar"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS mappa"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Velkomin(n) í %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Staðsetning uppfærsludisks"
 
-#: ../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?"
@@ -6058,7 +6058,7 @@ msgstr ""
 "Þú hefur fleiri en eitt tæki í vélinni þinni sem gætu hentað fyrir "
 "uppfærsludisk.  Hvert þeirra viltu nota?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6067,29 +6067,29 @@ msgstr ""
 "Þú hefur fleiri en ein disksneið í vélinni þinni sem gæti innihaldið "
 "rekladiskmyndina. Hvert þeirra viltu reyna?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Settu uppfærsludisklinginn í /dev/%s og veldu \"Í lagi\" til að halda áfram."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Uppfærsludiskur"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Gat ekki tengt uppfærsludisklinginn"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Uppfærslur"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Les inn uppfærslur fyrir anacondu..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6099,45 +6099,45 @@ msgstr ""
 "hraðuppsetningar að neðan eða smelltu á hætta við til að fara í gagnvirka "
 "uppsetningu."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Villa við opnun hraðuppsetningarskrár"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Það er ekki nægjanlegt vinnsluminni í vélinni til að setja upp %s."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Gerð neyðardisklings"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Tegund uppsetningar"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Á hverskonar miðli er neyðardisklingurinn?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Á hvernig miðli eru pakkarnir sem setja á upp?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Engin rekill fannst"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Veldu rekil"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Nota rekladiskling"
 
-#: ../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?"
@@ -6145,60 +6145,60 @@ msgstr ""
 "Engin tæki fundust til að framkvæma þessa tegund af uppsetningu.  Viltu "
 "velja rekil handvirkt eða nota rekladiskling?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Eftirfarandi tæki hafa fundist í vélinni þinni."
 
-#: ../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 ""
 "Það eru engir sérstakir tækjareklar í notkun. Viltu lesa einhverja inn núna?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Tæki"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Búið"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Bæta við tæki"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "lesarinn hefur þegar verið keyrður. Ræsi skel.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Keyri anaconda, %s björgunartólið - Vinsamlegast bíðið...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Keyri anaconda, %s kerfisuppsetningatólið - Vinsamlegast bíðið...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Get ekki sótt uppsetningardiskmyndina %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Fer yfir \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Fer yfir diskmyndina..."
 
-#: ../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."
@@ -6206,7 +6206,7 @@ msgstr ""
 "Get ekki lesið gátsummu diskmyndarinnar. Þetta þýðir að diskurinn var "
 "líklega búinn til án hennar."
 
-#: ../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 "
@@ -6217,18 +6217,18 @@ msgstr ""
 "að hreinsa diskinn og reyna aftur.  Ef þetta próf heldur áfram að takast "
 "ekki ættir þú ekki að halda áfram uppsetningunni."
 
-#: ../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"
@@ -6239,22 +6239,22 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Gátsummupróf"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Óleyfilegt viðfang við tækjaskipun hraðuppsetningar %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Bæði heiti og gerð rekils þarf að gefa upp í tækjaskipun hraðuppsetningar."
 
-#: ../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"
@@ -6262,7 +6262,7 @@ msgstr ""
 "Forskeytið verður að vera milli 1 og 32 fyrir IPv4 net eða milli 1 og 128 "
 "fyrir IPv6 net"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6273,27 +6273,27 @@ msgstr ""
 "dulritunarlykil þann sem þarf til að nota þráðlausa netið. Ef þessi gildi "
 "eru óþörf má skilja við þetta tómt og uppsetningin mun halda áfram."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Dulritunarlykill"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Stillingar þráðlausra neta"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP vistfang nafnaþjóns"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Nafnaþjón vantar"
 
-#: ../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 "
@@ -6303,56 +6303,56 @@ msgstr ""
 "upplýsingar um nafnaþjóna. Ef þú hefur ekki þessar upplýsingar máttu skilja "
 "þetta eftir autt og uppsetningin mun halda áfram."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ógildar IP upplýsingar"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Þú gafst upp ógilt IP vistfang."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Netvilla"
 
-#: ../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 "Það kom upp villa við að stilla netkortið þitt."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Stillingar TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Þú verður að velja amk. einn samskiptamála (IPv4 eða IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS krefst IPv4"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS uppsetning krefst IPv4 stuðnings."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 vistfang:"
 
-#: ../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 vistfang:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Nafnaþjónn:"
 
-#: ../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 "
@@ -6362,43 +6362,43 @@ msgstr ""
 "Fyrir IPv4 má slá inn netmöskva eða CIDR forskeyti. Bæði gáttin og "
 "nafnaþjónarnir verða að vera gildar IPv4 eða IPv6 vistföng."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Handvirkar TCP/IP stillingar"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Upplýsingar vantar"
 
-#: ../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 ""
 "Þú verður að gefa upp gilt IPv4 vistfang og netmöskva eða CIDR forskeyti."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Þú verður að gefa upp gilt IPv6 vistfang og CIDR forskeyti."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Reyni að ákvarða vélarheiti og netlén..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "óleyfilegt viðfang við netskipun hraðuppsetningar %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Óleyfileg ''bootproto' %s í netskipun hraðuppsetningar"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Netkort"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6406,139 +6406,139 @@ msgstr ""
 "Þú hefur fleiri en eitt netkort í vélinni þinni. Hvert þeirra viltu nota við "
 "uppsetninguna?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS þjónn:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s mappa:"
 
-#: ../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 Stillingar"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Vélarheiti gefið upp án réttra DNS stillinga"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Sæki"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Ekki tókst að tengja þetta skráakerfi frá þjóninum."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Þetta skráakerfi virðist ekki innihalda %s uppsetningartré."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "óleyfilegt viðfang við NFS skipun hraðuppsetningar %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 "Bíð eftir telnet tengingu..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Keyri anaconda gegnum telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Gat ekki sótt %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Get ekki sótt uppsetningardiskmyndina"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "óleyfilegt viðfang við Url skipun hraðuppsetningar %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 "Þú verður að gefa upp --url viðfangið við Url hraðuppsetningaraðferðina."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Óþekkt Url skipun %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 "Stillingar TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS Stillingar"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Þú verður að nefna möppu."
 
-#: ../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 "Óþekkt vél"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s er ekki gilt heiti vélar."
 
-#: ../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."
 msgstr "Ef þú vilt nota vefsel þarftu að gefa upp heiti þess hér."
 
-#: ../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 "Frekari FTP stillingar"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Les inn SCSI rekil"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Les inn %s rekilinn..."
diff --git a/po/it.po b/po/it.po
index 03546b9ae..baa2c80da 100644
--- a/po/it.po
+++ b/po/it.po
@@ -58,41 +58,41 @@ msgstr "Premere <invio> per una 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"
 
@@ -583,22 +583,22 @@ msgstr "Ridimensionamento filesystem su %s..."
 #: ../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 "Errore"
 
@@ -653,8 +653,8 @@ msgstr ""
 "Premere <Invio> per uscire dal programma d'installazione."
 
 #: ../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 "Ignora"
 
@@ -996,21 +996,21 @@ msgstr "Correzione"
 
 #: ../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 "Sì"
 
 #: ../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 "Riprova"
 
@@ -1021,8 +1021,8 @@ msgstr "Ignora"
 #: ../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 "Annulla"
 
@@ -1891,21 +1891,21 @@ msgid "_Write changes to disk"
 msgstr "_Scrivi i cambiamenti su disco"
 
 #: ../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 "Indietro"
 
 #: ../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 "Continua"
 
@@ -2340,7 +2340,7 @@ msgstr "Si prega di inserire la %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Salta l'immissione della %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Benvenuti in %s per %s"
@@ -3245,7 +3245,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Selezione della lingua"
 
-#: ../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 "Quale lingua si desidera usare durante il processo d'installazione?"
 
@@ -3623,7 +3623,7 @@ msgstr "E' richiesto un valore per il campo %s."
 msgid "Dynamic IP"
 msgstr "IP dinamico"
 
-#: ../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 "Invio richiesta per le informazioni IP per %s..."
@@ -3794,7 +3794,7 @@ msgstr "sconosciuto"
 msgid "Hardware address: "
 msgstr "Indirizzo hardware: "
 
-#: ../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 "Protocollo mancante"
 
@@ -3803,7 +3803,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Selezionare almeno il supporto IPv4 o IPv6."
 
 #: ../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 "Prefisso non valido"
 
@@ -4034,7 +4034,7 @@ msgstr "Dispositivi RAID"
 msgid "None"
 msgstr "Nessuno"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Dischi fissi"
 
@@ -4954,12 +4954,12 @@ msgstr "Prefisso"
 msgid "Activate on boot"
 msgstr "Attiva all'avvio"
 
-#: ../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 "Abilita il supporto IPv4"
 
-#: ../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 "Abilita il supporto IPv6"
@@ -5080,7 +5080,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:"
 
@@ -5704,22 +5704,22 @@ msgstr ""
 "* Non si sarà in grado di ottenere aggiornamenti software e di sicurezza per "
 "i pacchetti non inclusi nella propria sottoscrizione."
 
-#: ../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 "Controllo media"
 
-#: ../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 "Controllo"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Espelli disco"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5728,7 +5728,7 @@ msgstr ""
 "Scegliere \"%s\" per controllare il disco attualmente inserito nell'unità, o "
 "\"%s\" per espellere il disco e inserirne un altro per il test."
 
-#: ../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 "
@@ -5743,7 +5743,7 @@ msgstr ""
 "controllati almeno una volta prima di usarli.  Dopo averli controllati con "
 "successo, non é necessario ricontrollarli prima di usarli di nuovo."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5752,11 +5752,11 @@ msgstr ""
 "Il disco %s non è stato trovato in nessuno dei lettori. Si prega di inserire "
 "il disco %s e premere %s per riprovare."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disco trovato"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5767,7 +5767,7 @@ msgstr ""
 "\n"
 "Scegliere %s per saltare l'esame dei supporti e avviare l'installazione."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5776,7 +5776,7 @@ msgstr ""
 "Non è stato trovato alcun disco %s che corrisponda al media di avvio. "
 "Inserire il disco %s e premere %s per riprovare."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5785,32 +5785,32 @@ msgstr ""
 "Il disco %s non è stato trovato in nessun lettore. Si prega di inserire il "
 "disco %s e premere %s per riprovare."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disco non trovato"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Impossibile trovare il file kickstart sul 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 "Impossibile leggere la cartella %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Caricamento"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Lettura del dischetto dei driver..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Sorgente del Dischetto dei driver"
 
-#: ../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?"
@@ -5818,7 +5818,7 @@ msgstr ""
 "Sono presenti più dispositivi che potrebbero essere usati come un disco dei "
 "driver. Quale si desidera usare?"
 
-#: ../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?"
@@ -5826,49 +5826,49 @@ msgstr ""
 "Sono presenti su questo dispositivo partizioni multiple, che sono in grado "
 "di contenere l'immagine del disco driver. Quale si desidera usare?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Impossibile montare la partizione."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Scegliere l'immagine del disco driver"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Selezionare il file immagine del disco driver."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Impossibile montare dal file il dischetto del driver ."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Inserire il dischetto dei driver in /dev/%s e premere \"OK\" per continuare."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Inserire il dischetto dei driver"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Impossibile montare il dischetto dei driver."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Il dischetto driver non è valido per questa versione di %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Scegliere manualmente"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Carica un altro disco"
 
-#: ../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 "
@@ -5878,45 +5878,45 @@ msgstr ""
 "dischetto dei driver.  Si desidera selezionare manualmente il driver, "
 "continuare comunque, o caricare un altro dischetto dei driver?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Dischetto del driver"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Disponete di un dischetto dei driver?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Ci sono altri Dischetti dei driver?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Si desidera caricare altri dischetti dei driver?"
 
-#: ../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 "Errore Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Sorgente del dischetto driver del kickstart sconosciuta: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "Argomento non corretto per il comando kickstart dischetto del driver: %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 "
@@ -5927,19 +5927,19 @@ msgstr ""
 "separati da spazi.  In caso di dubbi sui parametri da indicare, passare "
 "direttamente alla schermata successiva premendo il pulsante \"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Inserire Parametri del modulo"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nessun driver trovato"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Caricamento dischetto dei driver"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5947,7 +5947,7 @@ msgstr ""
 "Nessun driver trovato per l'inserimento manuale.  Si desidera usare un'altro "
 "dischetto dei driver?"
 
-#: ../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."
@@ -5955,26 +5955,26 @@ msgstr ""
 "Selezionate il driver da utilizzare. Se il driver desiderato non è in elenco "
 "e siete in possesso di un dischetto dei driver, premere il tasto F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Specifica i parametri facoltativi dei moduli"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Selezionare il driver dei dispositivi da utilizzare"
 
-#: ../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 rilevato"
 
-#: ../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 "Rilevato media d'installazione locale..."
 
-#: ../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 "
@@ -5983,7 +5983,7 @@ msgstr ""
 "L'albero d'installazione %s nella cartella interessata, non corrisponde al "
 "media utilizzato per il boot."
 
-#: ../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."
@@ -5991,7 +5991,7 @@ msgstr ""
 "Si è verificato un errore di lettura dell'installazione dalle immagini ISO. "
 "Controllare le immagini ISO e riprovare."
 
-#: ../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?"
@@ -5999,7 +5999,7 @@ msgstr ""
 "Non sono stati trovati i dischi fissi all'interno del sistema! Configurare "
 "dispositivi aggiuntivi?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6010,61 +6010,61 @@ msgstr ""
 "immagini CD (iso9660) per %s? Se l'unità disco in uso non è in elenco, "
 "premere F2 per configurare altri dispositivi."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Cartella contenente le immagini:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Selezionare la partizione"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Il dispositivo %s non sembra contenere le immagini CD-ROM %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Argomento non corretto per un comando del metodo HD kickstart %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 "Il file kickstart non si trova sul disco fisso."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Impossibile trovare un disco fisso per il disco BIOS %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tipo di tastiera"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Quale tipo di tastiera si utilizza?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Errore di apertura del file kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Errore nella lettura del contenuto del file kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Errore in %s sulla linea %d del file kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Impossibile trovare ks.cfg sul media rimovibile."
 
-#: ../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."
@@ -6073,50 +6073,50 @@ msgstr ""
 "parametro kickstart qui sotto o premere Cancella per procedere come un "
 "installazione interattiva."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Errore nel download del file kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Argomento non corretto per terminare un comando del metodo kickstart %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Benvenuti in %s per %s - Modalità di salvataggio"
 
-#: ../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> fra elementi | <Space> seleziona | <F12> schermata succ."
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Selezione della lingua"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD locale"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disco fisso"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Cartella NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Benvenuti in %s%n per %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Sorgente disco per aggiornamenti"
 
-#: ../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?"
@@ -6124,7 +6124,7 @@ msgstr ""
 "Sono presenti più dispositivi che possono essere usati come dischi per "
 "aggiornamenti. Quale si desidera usare?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6132,30 +6132,30 @@ msgstr ""
 "Su questo dispositivo ci sono più partizioni che possono contenere "
 "l'immagine disco di aggiornamento. Quale si desidera usare?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Inserire il disco degli aggiornamenti in /dev/%s e premere \"OK\" per "
 "continuare."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disco degli aggiornamenti"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Impossibile montare il disco degli aggiornamenti"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Lettura in corso degli aggiornamenti di 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.."
@@ -6164,46 +6164,46 @@ msgstr ""
 "modificare la locazione degli aggiornamenti qui sotto o premere Annulla per "
 "procedere senza aggiornamenti.."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr ""
 "Si è verificato un errore durante il download dell'immagine degli "
 "aggiornamenti"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Memoria RAM insufficiente per installare %s sul computer."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Metodo rescue"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Metodo d'installazione"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Che tipo di media contiene l'immagine rescue?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Che tipo di media contiene i pacchetti da installare?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nessun driver trovato"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Scegliere il driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Utilizzate un dischetto dei driver"
 
-#: ../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?"
@@ -6212,63 +6212,63 @@ msgstr ""
 "tipo d'installazione. Si desidera selezionare un driver manualmente oppure "
 "utilizzare un disco dei driver?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Sono stati trovati i seguenti dispositivi all'interno del sistema."
 
-#: ../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 "Non è stato caricato alcun driver dei dispositivi nel sistema. Caricarli ora?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Eseguito"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Aggiungi dispositivo"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Il loader è stato già eseguito.  Avvio della shell.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "Esecuzione di anaconda %s, il %s modalità di salvataggio - si prega di "
 "attendere...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Esecuzione di anaconda %s, il %s sistema di installazione - attendere "
 "prego...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Impossibile trovare l'immagine di installazione %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Controllo di \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Controllo del supporto in corso."
 
-#: ../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."
@@ -6276,7 +6276,7 @@ msgstr ""
 "Impossibile leggere il checksum del disco dal descrittore di volume "
 "primario. Il disco è stato probabilmente creato senza aggiungere il 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 "
@@ -6287,11 +6287,11 @@ msgstr ""
 "pulire il disco e provare di nuovo.  Se questa verifica continua a fallire "
 "si prega di non continuare l'installazione."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Successo"
 
-#: ../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 "
@@ -6301,7 +6301,7 @@ msgstr ""
 "possibile installare da questo media.  Si noti che non tutti gli errori di "
 "media/disco possono essere rilevati con questo controllo."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6312,22 +6312,22 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Controllo checksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Argomento errato per il comando del metodo dispositivo del kickstart %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Un nome di modulo deve essere specificato per il comando del dispositivo di "
 "kickstart."
 
-#: ../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"
@@ -6335,7 +6335,7 @@ msgstr ""
 "I prefissi devono essere compresi fra 1 e 32 per le reti IPv4 o 1 e 128 per "
 "le reti IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6347,27 +6347,27 @@ msgstr ""
 "suddetta chiave non è necessaria, lasciare questo campo vuoto, e procedere "
 "con l'installazione."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Chiave di codifica"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Impostazioni di tipo wireless"
 
-#: ../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 "Nameserver mancante"
 
-#: ../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 "
@@ -6378,56 +6378,56 @@ msgstr ""
 "conoscenza di questa informazione, è possibile lasciare il campo vuoto e "
 "l'installazione continuerà."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Informazione IP non corretta"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "E' stato inserito un indirizzo IP non valido."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: ../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 "Si è verificato un errore durante la configurazione dell'interfaccia di rete."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configurazione TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Selezionare almeno un protocollo (IPv4 o IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 è necessario per NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Il metodo di installazione NFS richiede il supporto IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Indirizzo IPv4:"
 
-#: ../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 "Indirizzo IPv6:"
 
-#: ../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 "
@@ -6438,41 +6438,41 @@ msgstr ""
 "prefisso CIDR. Il gateway ed il campo name server devono essere indirizzi "
 "validi IPv4 o IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Configurazione manuale TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Informazioni mancanti"
 
-#: ../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 "Inserire un indirizzo IPv4 valido ed una maschera di rete o prefisso CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Inserire sia un indirizzo IPv6 valido che un prefisso CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Ricerca hostname e dominio..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Argomento errato per il comando di rete del kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Bootproto %s specificato nel comando di rete errato"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Dispositivo di rete"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6480,112 +6480,112 @@ msgstr ""
 "Sono presenti più dispositivi di rete su questo sistema. Attraverso quale si "
 "desidera effettuare l'installazione?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nome del server NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Cartella %s:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Si prega di inserire il nome del server ed il percorso alle immagini %s."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Impostazioni NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Hostname specificato senza DNS configurato"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Recupero in corso"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Non è stato possibile montare la cartella dal server."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "La cartella non contiene un'albero di installazione %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Argomento errato per il comando del metodo NFS del kickstart %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 "Attesa connessione telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Esecuzione di anaconda via telnet."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Impossibile recuperare %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Impossibile caricare l'immagine per l'installazione."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Argomento errato per il comando del metodo Url del kickstart %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Fornire un argomento --url al metodo Url del kickstart."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Metodo Url sconosciuto %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Si prega di inserire l'URL contenente le immagini %s sul server."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Configura proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Impostazione URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Si deve inserire un URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "L'URL deve essere di tipo ftp o http"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Host sconosciuto"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s non è un hostname valido."
 
-#: ../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."
@@ -6593,23 +6593,23 @@ msgstr ""
 "Se viene usato un server proxy HTTP, inserire il nome del server proxy HTTP "
 "da utilizzare."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Nome proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Porta proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Ulteriori impostazioni"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Caricamento driver SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Caricamento del driver %s..."
diff --git a/po/ja.po b/po/ja.po
index 04c595ebb..9238c3802 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -58,41 +58,41 @@ msgstr "シェルを起動するには、<enter> を押してください。"
 #: ../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"
 
@@ -574,22 +574,22 @@ msgstr "ファイルシステム %s のリサイズ中..."
 #: ../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 "エラー"
 
@@ -644,8 +644,8 @@ msgstr ""
 "[Enter] を押してインストーラを終了してください。"
 
 #: ../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 "スキップする"
 
@@ -976,21 +976,21 @@ msgstr "修正"
 
 #: ../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 "はい"
 
 #: ../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 "いいえ"
 
-#: ../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 "再試行"
 
@@ -1001,8 +1001,8 @@ msgstr "無視"
 #: ../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 "取り消し"
 
@@ -1860,21 +1860,21 @@ msgid "_Write changes to disk"
 msgstr "変更をディスクに書き込む (_W)"
 
 #: ../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 "戻る"
 
 #: ../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 "続行"
 
@@ -2307,7 +2307,7 @@ msgstr "%(instkey)s を入力してください。"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s の入力をスキップ"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s (%s 用)へようこそ"
@@ -3195,7 +3195,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "言語の選択"
 
-#: ../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 "インストール時に使用する言語を選択してください。"
 
@@ -3569,7 +3569,7 @@ msgstr "フィールド %s には値が必要です。"
 msgid "Dynamic IP"
 msgstr "動的 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 "%s の IP 情報の要求を送信中..."
@@ -3740,7 +3740,7 @@ msgstr "不明"
 msgid "Hardware address: "
 msgstr "ハードウェアのアドレス: "
 
-#: ../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 "見つからないプロトコル"
 
@@ -3749,7 +3749,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "少なくとも、 IPv4 または IPv6 サポートを選択しなくてはなりません。"
 
 #: ../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 "無効なプレフィックス"
 
@@ -3979,7 +3979,7 @@ msgstr "RAID デバイス"
 msgid "None"
 msgstr "なし"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ハードドライブ"
 
@@ -4887,12 +4887,12 @@ msgstr "プレフィックス"
 msgid "Activate on boot"
 msgstr "起動時にアクティブにする"
 
-#: ../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 "IPv4 サポートを有効にする"
 
-#: ../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 "IPv6 サポートを有効にする"
@@ -5011,7 +5011,7 @@ msgstr "自動 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 "ゲートウェイ:"
 
@@ -5629,22 +5629,22 @@ 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 "メディアチェック"
 
-#: ../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 "テスト"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ディスク取り出し"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5653,7 +5653,7 @@ msgstr ""
 "現在ドライブに入っているディスクをテストするには \"%s\" を選び、 ディスクを取"
 "り出して別のディスクを挿入してテストをするには。 \"%s\" を選びます。"
 
-#: ../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 "
@@ -5667,7 +5667,7 @@ msgstr ""
 "推奨します。最低でも、はじめて使用する前にはテストを行ってください。テストが"
 "成功したら、再度使用する前に各ディスクをテストする必要はありません。"
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5676,11 +5676,11 @@ msgstr ""
 "いずれのドライブにも %s ディスク は見つかりませんでした。%s ディスクを挿入し"
 "てから、%s を押して再試行してください。"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ディスク が見つかりました"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5691,7 +5691,7 @@ msgstr ""
 "\n"
 "メディアテストをスキップするには %s を選択して、インストールを開始します。"
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5700,7 +5700,7 @@ msgstr ""
 "ブートメディアに適合する %s ディスクが見つかりませんでした。%s ディスクを挿入"
 "してから %s を 押して再試行してください。"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5709,32 +5709,32 @@ msgstr ""
 "いずれの CDROM ドライブにも %s ディスクは見つかりませんでした。%s ディスクを"
 "挿入してから、%s を押して再試行してください。"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ディスクが見つかりません"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "ディスクROM 上にキックスタートファイルが見つかりません。"
 
-#: ../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 "%s ディレクトリの読み込みに失敗: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "読み込み中"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ドライバーディスクを読み込み中..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ドライバーディスクソース"
 
-#: ../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?"
@@ -5742,7 +5742,7 @@ msgstr ""
 "ドライバーディスク用のソースとして使用できるデバイスが複数あります。使用する"
 "デバイスを指定してください。"
 
-#: ../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?"
@@ -5750,49 +5750,49 @@ msgstr ""
 "このデバイスにはドライバーディスクのイメージを格納できるパーティションが複数"
 "あります。使用するパーティションを指定してください。"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "パーティションのマウントに失敗しました。"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ドライバーディスクイメージを選択してください"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ファイルからのドライバーディスク読み込みに失敗しました。"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "ドライバーディスクを /dev/%s に挿入し、「OK」 を押して続行します。"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ドライバーディスクを挿入"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ドライバーディスクのマウントに失敗しました。"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "この %s のリリースにはドライバーディスクは無効です。"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "手動で選択"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "別のディスクをロード"
 
-#: ../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 "
@@ -5802,45 +5802,45 @@ msgstr ""
 "動でドライバーを選択する、このまま続行する、別のドライバーディスクを読み込"
 "む、のいずれかを指定してください。"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ドライバーディスク"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "ドライバーディスクがありますか?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "他のドライバーディスク?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "他のドライバーディスクを読み込みますか?"
 
-#: ../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 "キックスタートエラー"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "キックスタートの元となるドライバーディスクが不明です: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "キックスタートのドライバーディスクコマンドに不正な引数が指定されました: %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 "
@@ -5851,19 +5851,19 @@ msgstr ""
 "ターを使用するのかわからない場合、「OK」 ボタンを押してこの画面をスキップして"
 "ください。"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "モジュールパラメーターを入力"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ドライバーが見つかりません"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ドライバーディスクの読み込み"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5871,7 +5871,7 @@ msgstr ""
 "手動で挿入するドライバーが見つかりませんでした。ドライバーディスクを使用しま"
 "すか?"
 
-#: ../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."
@@ -5879,26 +5879,26 @@ msgstr ""
 "読み込むドライバーを下記から選択してください。必要なドライバーが表示されてい"
 "ないがドライバーディスクがある場合、<F2> を押してください。"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "オプションのモジュール引数を指定してください"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "読み込むデバイスドライバーを選択してください"
 
-#: ../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 "検出されたメディア"
 
-#: ../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 "ローカルのインストールメディアが検出されました..."
 
-#: ../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 "
@@ -5907,7 +5907,7 @@ msgstr ""
 "そのディレクトリの %s インストールツリーはブートメディアと適合しないようで"
 "す。"
 
-#: ../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."
@@ -5915,13 +5915,13 @@ msgstr ""
 "ISO イメージからのインストールを読み込み中にエラーが発生しました。ISO イメー"
 "ジを確認してからやり直してください。"
 
-#: ../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?"
 msgstr "このシステムにはハードドライブがないようです。追加デバイスの設定を行いますか?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5932,61 +5932,61 @@ msgstr ""
 "ション内のディレクトリを指定してください。一覧に使用しているディスクドライブ"
 "がなければ、 F2 を押して追加デバイスの設定を行ってください。"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "イメージを格納しているディレクトリ:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "パーティションを選択してください"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "デバイス %s には %s ディスクROM イメージが含まれていないようです。"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD キックスタートコマンド %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 "ハードドライブにキックスタートファイルが見つかりません。"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS ディスク %s 用のハードドライブが見つかりません"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "キーボードの種類"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "ご使用のキーボードの種類を指定してください。"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "キックスタートファイル %sを開く際にエラー発生: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "キックスタートファイル %s の読み込み時にエラー発生: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s のエラーが %d 行目(キックスタートファイル %s の)で発生しました。"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "リムーバブルメディアに ks.cfg が見つかりません。"
 
-#: ../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."
@@ -5995,50 +5995,50 @@ msgstr ""
 "トパラメーターを変更するか、対話インストールとして続行するために Cancel を押"
 "してください。"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "キックスタートファイルをダウンロードする際にエラー発生"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "キックスタートコマンド %s のシャットダウンに対する引数が不正です: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s (%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> 項目間の移動 | <Space> 選択 | <F12> 次の画面 "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "言語を選択してください"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "ローカル CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ハードドライブ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS ディレクトリ:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n (%s 用)へようこそ"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "ディスクソースの更新"
 
-#: ../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?"
@@ -6046,7 +6046,7 @@ msgstr ""
 "更新ディスク用のソースとして使用できるデバイスが複数あります。使用するデバイ"
 "スを指定してください。"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6054,28 +6054,28 @@ msgstr ""
 "このデバイスにはアップデートディスクイメージを含んでいるかもしれないパーティ"
 "ションが複数あります。使用するパーティションを指定してください。"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "更新ディスクを /dev/%s に挿入してから 「OK」 を押して続行します。"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "更新ディスク"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "更新ディスクのマウントに失敗しました"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "更新"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "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.."
@@ -6083,44 +6083,44 @@ msgstr ""
 "アップデートイメージをダウンロードできません。以下のアップデートの場所を編集"
 "するか、キャンセルを押してアップデートを中止してください。"
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "アップデートイメージのダウンロード中にエラー発生"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "このマシンには %s のインストールに十分な RAM がありません。"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "レスキュー方法"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "インストール方法"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "レスキューイメージが格納されているメディアタイプを指定してください。"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "インストール対象パッケージを含むメディアを指定してください。"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ドライバーが見つかりません"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ドライバーを選択してください"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ドライバーディスクを使用する"
 
-#: ../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?"
@@ -6128,11 +6128,11 @@ msgstr ""
 "このインストールタイプに必要な種類のデバイスを見つけることができません。  手"
 "動でドライバーを選択しますか、またはドライバーディスクを使用しますか?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "システム上で次のデバイスが検出されました。"
 
-#: ../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?"
@@ -6140,49 +6140,49 @@ msgstr ""
 "デバイスドライバーはシステムにロードされていません。ドライバーをロードします"
 "か?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "デバイス"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "終了"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "デバイスの追加"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ローダーはすでに実行されています。シェルの起動中です。\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "anaconda %s を %s レスキューモードで実行中 - しばらくお待ちください...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "anaconda %s・%s システムインストーラーを実行中 - しばらくお待ちください...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "インストールイメージ %s を検出できません。"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" のチェック中..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "現在メディアをチェック中..."
 
-#: ../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."
@@ -6190,7 +6190,7 @@ msgstr ""
 "プライマリボリュームディスクリプターからディスクチェックサムを読み込めませ"
 "ん。 恐らく、このディスクはチェックサムを追加しないで作成されています。"
 
-#: ../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 "
@@ -6200,11 +6200,11 @@ msgstr ""
 "スク不良が原因の可能性があります。可能ならディスクを清掃してからやり直してく"
 "ださい。このテストが失敗を繰り返す場合、インストールは中止すべきです。"
 
-#: ../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 "
@@ -6214,7 +6214,7 @@ 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"
@@ -6225,20 +6225,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "チェックサムテスト"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "デバイスキックスタートのコマンド %s に対する引数が不正です: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "モジュール名がキックスタートデバイスコマンドに指定されていません。"
 
-#: ../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"
@@ -6246,7 +6246,7 @@ msgstr ""
 "プレフィックスは、IPv4 ネットワークなら 1 から 32 まで、IPv6 ネットワークな"
 "ら 1 から 128 までの数値にしなければなりません。"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6257,27 +6257,27 @@ msgstr ""
 "に必要な ESSID と暗号キーを入力してください。暗号キーが必要ない場合は、この"
 "フィールドを空白にしたままインストールを続行します。"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "暗号キー"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "ワイヤレスの設定"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "ネームサーバーの IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "ネームサーバーの欠落"
 
-#: ../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 "
@@ -6287,56 +6287,56 @@ msgstr ""
 "ませんでした。もしこの情報を持っていないなら、このフィールドを空白にしてイン"
 "ストールを続行できます。"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "無効な IP 情報"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "無効な IP アドレスが入力されました。"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: ../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 "ネットワークインターフェースの設定中にエラーが発生しました。"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP の設定"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "少くともプロトコルを 1 つ選択しなければなりません (IPv4 または IPv6)。"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS には IPv4 が必要です"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS インストールを行うには IPv4 のサポートが必要になります。"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 アドレス:"
 
-#: ../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 アドレス:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "ネームサーバー:"
 
-#: ../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 "
@@ -6347,43 +6347,43 @@ msgstr ""
 "CIDR 形式のプレフィックスが可能です。ゲートウェイとネームサーバーのフィールド"
 "は、必ず有効な IPv4 または IPv6 アドレスでなければなりません。"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "手動による TCP/IP 設定"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "情報が不足しています"
 
-#: ../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 ""
 "有効な IPv4 アドレスとネットマスクまたは CIDR プレフィックスの両方を入力する"
 "必要があります。"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "有効な IPv6 アドレスと CIDR プレフィックスの両方を入力する必要があります。"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ホスト名とドメインを確定中..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "キックスタートネットワークコマンド %s に対する引数が不正です: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "ネットワークコマンドで不正な bootproto %s が指定されました"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "ネットワーク構築デバイス"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6391,112 +6391,112 @@ msgstr ""
 "このシステムには複数のネットワークデバイスが存在します。インストールの際に使"
 "用するデバイスを選択してください。"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS サーバー名:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ディレクトリ:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "%s イメージへのパスとサーバー名を入力してください。"
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS 設定"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "ホスト名は DNS 設定しないと指定できません"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "取り込み中"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "そのディレクトリはサーバーからマウントできませんでした。"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "そのディレクトリは %s のインストールツリーを含んでいないようです。"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS キックスタートコマンド %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 "telnet 接続の待機中..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "telnet 経由で anaconda を実行中..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s://%s/%s の取り込みができません。"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "インストールイメージを取り込むことができません。"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url キックスタートコマンド %s に対する引数が不正です: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url キックスタート方法には、 --url の引数を使用する必要があります。"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "%s は不明な Url 方法です"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "イメージ %s を含んでいるサーバーのアドレスを入力してください。"
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "プロキシの設定"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URLの設定"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "URLを入力してください。"
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL は ftp か http のものである必要があります。"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "不明なホスト"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s は有効なホスト名ではありません。"
 
-#: ../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."
@@ -6504,23 +6504,23 @@ msgstr ""
 "HTTP プロキシサーバーを使用している場合、使用する HTTP プロキシサーバーの名前"
 "を入力してください。"
 
-#: ../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
 msgid "Further Setup"
 msgstr "詳細設定"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ドライバーを読み込み中"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s ドライバーを読み込み中..."
diff --git a/po/ka.po b/po/ka.po
index 537420fb9..de1fa6dd3 100644
--- a/po/ka.po
+++ b/po/ka.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 "OK"
 
@@ -487,22 +487,22 @@ msgstr ""
 #: ../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 "შეცდომა"
 
@@ -550,8 +550,8 @@ msgid ""
 msgstr ""
 
 #: ../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 "გამოტოვება"
 
@@ -795,21 +795,21 @@ msgstr "შესწორება"
 
 #: ../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 "კი"
 
 #: ../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 "არა"
 
-#: ../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 "გამეორება"
 
@@ -820,8 +820,8 @@ msgstr "იგნორირება"
 #: ../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 "შეწყვეტა"
 
@@ -1557,21 +1557,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 "უკან"
 
 #: ../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 "გაგრძელება"
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2729,7 +2729,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "ენის არჩევა"
 
-#: ../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 ""
 
@@ -3069,7 +3069,7 @@ msgstr "%s ველისთვის მნიშვნელობის მ�
 msgid "Dynamic IP"
 msgstr "დინამიური 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 ""
@@ -3234,7 +3234,7 @@ msgstr "უცნობი"
 msgid "Hardware address: "
 msgstr "აპარატურული მისამართი:"
 
-#: ../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 ""
 
@@ -3243,7 +3243,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3470,7 +3470,7 @@ msgstr ""
 msgid "None"
 msgstr "არა"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "მყარი დისკები"
 
@@ -4242,12 +4242,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr "ჩატვირთვისას აქტივირება"
 
-#: ../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 "IPv4-ის მხარდაჭერის ჩართვა"
 
-#: ../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 "IPv6-ის მხარდაჭერის ჩართვა"
@@ -4370,7 +4370,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 ""
 
@@ -4950,29 +4950,29 @@ 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 "მატარებლის შემოწმება"
 
-#: ../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 "ტესტი"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4982,19 +4982,19 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD ნაპოვნია"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5002,146 +5002,146 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD ნაპოვნია"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "დრაივერის დისკი"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "გაქვთ დრაივერის დისკი?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5149,69 +5149,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5219,269 +5219,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "დირექტორია რომელიც შეიცავს გამოსახულებებს:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "კლავიატურის ტიპი"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "აირჩიეთ ენა"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "მყარი დისკი"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "მოწყობილობები"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "დასრულებულია"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "მოწყობილობის დამატება"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5489,26 +5489,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5516,260 +5516,260 @@ msgid ""
 "field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "კოდირების გასაღები"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "პა"
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP-ის კონფიგურირება"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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 "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
 msgid "IPv6 address:"
 msgstr ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ჰოსტის სახელის და დომენის განსაზღვრა..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "ქსელური მოწყობილობა"
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS სერვერის სახელი:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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 "TCP/IP-ის კონფიგურირება"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 8ac16be7e..65b5d5f8a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -62,41 +62,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 "ಸರಿ"
 
@@ -570,22 +570,22 @@ msgstr "%s ನಲ್ಲಿ ಕಡತ ವ್ಯವಸ್ಥೆಯನ್ನು ಮ
 #: ../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 "ದೋಷ"
 
@@ -640,8 +640,8 @@ msgstr ""
 "ಅನುಸ್ಥಾಪಕದಿಂದ ನಿರ್ಗಮಿಸಲು <Enter> ಅನ್ನು ಒತ್ತಿರಿ."
 
 #: ../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 "ಉಪೇಕ್ಷಿಸಿ"
 
@@ -972,21 +972,21 @@ msgstr "ಸರಿಮಾಡು"
 
 #: ../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 "ಹೌದು"
 
 #: ../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 "ಇಲ್ಲ"
 
-#: ../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 "ಮರುಪ್ರಯತ್ನಿಸು"
 
@@ -997,8 +997,8 @@ msgstr "ಕಡೆಗಣಿಸು"
 #: ../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 "ರದ್ದುಗೊಳಿಸು"
 
@@ -1855,21 +1855,21 @@ msgid "_Write changes to disk"
 msgstr "ಮಾರ್ಪಾಡುಗಳನ್ನು ಡಿಸ್ಕ್‍ಗೆ ಬರೆ(_W)"
 
 #: ../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 "ಹಿಂದಕ್ಕೆ"
 
 #: ../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 "ಮುಂದುವರೆ"
 
@@ -2285,7 +2285,7 @@ msgstr "ದಯವಿಟ್ಟು ನಿಮ್ಮ %(instkey)s ಅನ್ನು ನ
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s ಅನ್ನು ನಮೂದಿಸುವುದನ್ನು ಬಿಟ್ಟು ತೆರಳು"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s ಗಾಗಿ %s ಗೆ ಸುಸ್ವಾಗತ"
@@ -3179,7 +3179,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "ಭಾಷೆಯ ಆಯ್ಕೆ"
 
-#: ../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 "ಅನುಸ್ಥಾಪನಾ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ ಯಾವ ಭಾಷೆಯನ್ನು ಬಳಸಬೇಕೆಂದಿದ್ದೀರಿ?"
 
@@ -3551,7 +3551,7 @@ msgstr "ಕ್ಷೇತ್ರ %s ಗೆ ಒಂದು ಮೌಲ್ಯದ ಅಗ�
 msgid "Dynamic IP"
 msgstr "ಸಕ್ರಿಯ 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 "%s ನ IP ಮಾಹಿತಿಗಾಗಿ ನಿವೇದನೆಯನ್ನು ಕಳುಹಿಸುತ್ತಿದ್ದೇನೆ..."
@@ -3722,7 +3722,7 @@ msgstr "ಗೊತ್ತಿಲ್ಲದ"
 msgid "Hardware address: "
 msgstr "ಯಂತ್ರಾಂಶ ವಿಳಾಸ:"
 
-#: ../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 "ಕಾಣೆಯಾದ ಪ್ರಕ್ರಮ"
 
@@ -3731,7 +3731,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "IPv4 ಅಥವಾ IPv6 ಸಮರ್ಥನೆಗಳಲ್ಲಿ ನೀವು ಒಂದಾದರೂ ಪ್ರಕ್ರಮವನ್ನು ಆರಿಸಿಬೇಕು."
 
 #: ../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 "ಅಮಾನ್ಯ IP ಪೂರ್ವಪ್ರತ್ಯಯ"
 
@@ -3961,7 +3961,7 @@ msgstr "RAID ಸಾಧನಗಳು"
 msgid "None"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ಹಾರ್ಡ್ ಡ್ರೈವ್‍ಗಳು"
 
@@ -4858,12 +4858,12 @@ msgstr "ಪೂರ್ವಪ್ರತ್ಯಯ"
 msgid "Activate on boot"
 msgstr "ಬೂಟ್ ಆದಾಗ ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../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 "IPv4 ಸಮರ್ಥನೆಯನ್ನು ಕ್ರಿಯಾಶೀಲಗೊಳಿಸಿ"
 
-#: ../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 "IPv6 ಸಮರ್ಥನೆಯನ್ನು ಕ್ರಿಯಾಶೀಲಗೊಳಿಸಿ"
@@ -4983,7 +4983,7 @@ msgstr "ಸ್ವಯಂಚಾಲಿತ 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 "ಮಾಹಿತಿದ್ವಾರ:"
 
@@ -5604,22 +5604,22 @@ 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 "ಮಾಧ್ಯಮ ಪರಿಶೀಲನೆ"
 
-#: ../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 "ಪರೀಕ್ಷಿಸು"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ಡಿಸ್ಕ್‍ ಅನ್ನು ಹೊರತಳ್ಳು"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5628,7 +5628,7 @@ msgstr ""
 "ಪ್ರಸ್ತುತ ಡ್ರೈವಿನಲ್ಲಿರುವ ಡಿಸ್ಕನ್ನು ಪರೀಕ್ಷಿಸಲು \"%s\" ಆರಿಸಿಕೊಳ್ಳಿ, ಇಲ್ಲವೇ ಡಿಸ್ಕನ್ನು "
 "ಹೊರತಳ್ಳಿ ಮತ್ತೊಂದನ್ನು ಪರೀಕ್ಷೆಗೆ ಒಳಪಡಿಸಲು \"%s\" ಆರಿಸಿಕೊಳ್ಳಿ."
 
-#: ../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 "
@@ -5643,7 +5643,7 @@ msgstr ""
 "ಪರೀಕ್ಷಣೆಗೊಳಪಡಿಸಿ. ಒಮ್ಮೆ ಸಫಲವಾಗಿ ಪರೀಕ್ಷಣೆಯನ್ನು ಕೈಗೊಂಡಲ್ಲಿ, ಪ್ರತಿ ಡಿಸ್ಕ್‍ಗಳನ್ನು "
 "ಉಪಯೋಗಿಸುವ ಮೊದಲು ಮತ್ತೆ ಮರುಪರೀಕ್ಷಿಸಬೇಕಾಗುವುದಿಲ್ಲ."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5652,11 +5652,11 @@ msgstr ""
 "%s ಡಿಸ್ಕ್‍ ನಿಮ್ಮ ಯಾವುದೇ ಡ್ರೈವ್‍ಗಳಲ್ಲೂ ಕಂಡುಬರಲಿಲ್ಲ. ಮರುಪ್ರಯತ್ನಿಸಲು, ದಯವಿಟ್ಟು %s ಡಿಸ್ಕನ್ನು "
 "ತೂರಿಸಿ %s ಒತ್ತಿರಿ."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ಡಿಸ್ಕ್‍ ಕಂಡುಬಂದಿತು"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5667,7 +5667,7 @@ msgstr ""
 "\n"
 "ಮಾಧ್ಯಮದ ಪರೀಕ್ಷಣೆಯನ್ನು ಉಪೇಕ್ಷಿಸಲು ಅನುಸ್ಥಾಪನೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು %s ಆರಿಸಿಕೊಳ್ಳಿ."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5676,7 +5676,7 @@ msgstr ""
 "ನಿಮ್ಮ ಬೂಟ್ ಮಾಧ್ಯಮಕ್ಕೆ ಸರಿಹೊಂದುವ %s ಡಿಸ್ಕ್‍ ಕಂಡುಬರಲಿಲ್ಲ. ಮರುಪ್ರಯತ್ನಿಸಲು ದಯವಿಟ್ಟು %s "
 "ಡಿಸ್ಕನ್ನು ತೂರಿಸಿ %s ಒತ್ತಿರಿ."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5685,32 +5685,32 @@ msgstr ""
 "%s ಡಿಸ್ಕ್‍ ನಿಮ್ಮ ಯಾವುದೇ ಸೀಡಿರಾಮ್ ಡ್ರೈವ್‍ಗಳಲ್ಲೂ ಕಂಡುಬರಲಿಲ್ಲ. ಮರುಪ್ರಯತ್ನಿಸಲು, ದಯವಿಟ್ಟು %s "
 "ಡಿಸ್ಕನ್ನು ತೂರಿಸಿ %s ಒತ್ತಿರಿ."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ಡಿಸ್ಕ್‍ ಕಂಡುಬಂದಿಲ್ಲ"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "ಸಿಡಿರಾಮ್ ನಲ್ಲಿ ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಕಡತ ಕಾಣಬರುತ್ತಿಲ್ಲ."
 
-#: ../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 "%s: %s ನಿರ್ದೇಶಿಕೆಯನ್ನು ಓದುವುದು ವಿಫಲವಾಯಿತು"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ಚಾಲಕ ಡಿಸ್ಕನ್ನು ಓದಲಾಗುತ್ತಿದೆ..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ಚಾಲಕ ಡಿಸ್ಕ್‍ ಆಕರ"
 
-#: ../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?"
@@ -5718,7 +5718,7 @@ msgstr ""
 "ಚಾಲಕ ಡಿಸ್ಕ್‍ಗೆ ಆಕರವಾಗಬಹುದಾದಂತಹ ಹಲವಾರು ಸಾಧನಗಳು ನಿಮ್ಮಲ್ಲಿವೆ.  ನೀವು ಯಾವುದನ್ನು "
 "ಬಳಸಲಿಚ್ಛಿಸುತ್ತೀರಿ?"
 
-#: ../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?"
@@ -5726,49 +5726,49 @@ msgstr ""
 "ಚಾಲಕ ಡಿಸ್ಕ್‍ನ ಚಿತ್ರಿಕೆಯನ್ನು ಹೊಂದಿರಬಹುದಾದ ಹಲವಾರು ವಿಭಾಗಗಳು ಈ ಸಾಧನದಲ್ಲಿವೆ.  ನೀವು "
 "ಯಾವುದನ್ನು ಬಳಸಲು ಇಚ್ಛಿಸುತ್ತೀರಿ?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "ವಿಭಾಗದ ಆರೋಹಿಸುವಿಕೆ ವಿಫಲವಾಯಿತು."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ಚಾಲಕ ಡಿಸ್ಕ್‍ನ ಚಿತ್ರಿಕೆಯನ್ನು ಆರಿಸಿ"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ಚಾಲಕ ಡಿಸ್ಕನ್ನು ಕಡತದಿಂದ ಲೋಡ್‍ ಮಾಡುವುದು ವಿಫಲವಾಯಿತು."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "ಮುಂದುವರೆಯಲು ಚಾಲಕ ಡಿಸ್ಕ್‍  /dev/%s ನಲ್ಲಿ ಅಳವಡಿಸಿ \"ಸರಿ\" ಒತ್ತಿರಿ."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ಚಾಲಕ ಡಿಸ್ಕನ್ನು ಅಳವಡಿಸಿ"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ಚಾಲಕ ಡಿಸ್ಕ್‍ ಅನ್ನು ಆರೋಹಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s ಈ ಬಿಡುಗಡೆಗೆ ಚಾಲಕ ಡಿಸ್ಕ್‍ ಅಮಾನ್ಯವಾಗಿದೆ."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "ಸ್ವಹಸ್ತದಿಂದ ಆರಿಸಿ"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "ಮತ್ತೊಂದು ಡಿಸ್ಕನ್ನು ಲೋಡ್ ಮಾಡಿ"
 
-#: ../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 "
@@ -5778,45 +5778,45 @@ msgstr ""
 "ಆರಿಸಿಕೊಳ್ಳಲಿಚ್ಛಿಸುತ್ತೀರೆ, ಅಥವಾ ಏನಾದರಾಗಲಿ, ಮುಂದುವರೆಯುವುದೇ, ಅಥವಾ ಮತ್ತೊಂದು ಚಾಲಕ "
 "ಡಿಸ್ಕನ್ನು ಲೋಡ್ ಮಾಡುವುದೆ?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ಚಾಲಕ ಡಿಸ್ಕ್‍"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "ನಿಮ್ಮ ಬಳಿ ಚಾಲಕ ಡಿಸ್ಕ್‍ ಇದೆಯೇ?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "ಹೆಚ್ಚು ಚಾಲಕ ಡಿಸ್ಕ್‍ ಇವೆಯೇ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "ನೀವು ಇನ್ನೂ ಕೆಲವು ಚಾಲಕ ಡಿಸ್ಕ್‍ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲು ಇಚ್ಛಿಸುತ್ತೀರೇನು?"
 
-#: ../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 "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ದೋಷ"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಚಾಲಕ ಡಿಸ್ಕ್‍ ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಆಕರ: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಚಾಲಕ ಡಿಸ್ಕ್‍ ಆದೇಶಕ್ಕೆ ಕೆಳಕಂಡ ಅಮಾನ್ಯ ಆದಾನಗಳು ನಿರ್ದೇಶಿಸಲ್ಪಟ್ಟವು: %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 "
@@ -5827,19 +5827,19 @@ msgstr ""
 "ಯಾವ ಪ್ರಮಿತಿಗಳನ್ನು ಪೂರೈಸಬೇಕೆಂದು ಗೊತ್ತಿಲ್ಲದಿದ್ದರೆ, ಈ ತೆರೆಯನ್ನು \"ಸರಿ\" ಗುಂಡಿಯನ್ನೊತ್ತುವ "
 "ಮೂಲಕ ಉಪೇಕ್ಷಿಸಿ."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "ಘಟಕ ಪ್ರಮಿತಿಗಳನ್ನು ನಮೂದಿಸಿ"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ಯಂತ್ರಚಾಲಕಗಳು ಕಂಡುಬರಲಿಲ್ಲ"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ಚಾಲಕ ಡಿಸ್ಕ್‍ ಅನ್ನು ಲೋಡ್ ಮಾಡಿ"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5847,7 +5847,7 @@ msgstr ""
 "ಸ್ವಹಸ್ತದಿಂದ ಅಳವಡಿಸಲು ಯಾವುದೇ ಚಾಲಕಗಳು ಕಾಣಬರಲಿಲ್ಲ. ನೀವು ಚಾಲಕ ಡಿಸ್ಕ್‍ ಅನ್ನು ಬಳಸಲು "
 "ಇಚ್ಛಿಸುತ್ತೀರೇನು?"
 
-#: ../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."
@@ -5855,33 +5855,33 @@ msgstr ""
 "ದಯವಿಟ್ಟು ನೀವು ಲೋಡ್ ಮಾಡಬೇಕೆಂದಿರುವ ಚಾಲಕವನ್ನು ಕೆಳಗೆ ಆರಿಸಿ.  ಅದು ಕಂಡುಬರದಿದ್ದಲ್ಲಿ ಹಾಗು "
 "ನಿಮ್ಮ ಬಳಿ ಚಾಲಕಗಳ ಡಿಸ್ಕ್‍ ಇದ್ದಲ್ಲಿ F2 ಒತ್ತಿರಿ."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "ಘಟಕಕ್ಕೆ ಐಚ್ಛಿಕ ಆದಾನಗಳನ್ನು ನಿರ್ದೇಶಿಸಿ"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "ಲೋಡ್ ಮಾಡಬೇಕಾದ ಚಾಲಕಗಳ ಡಿಸ್ಕ್ ಅನ್ನು ಆರಿಸಿ"
 
-#: ../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 "ಮಾಧ್ಯಮವು ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ"
 
-#: ../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 "ಸ್ಥಳೀಯ ಅನುಸ್ಥಾಪನಾ ಮಾಧ್ಯಮವು ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ..."
 
-#: ../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 "
 "media."
 msgstr "ಆ ಕಡತಕೋಶದಲ್ಲಿರುವ %s ಅನುಸ್ಥಾಪನಾವೃಕ್ಷ ನಿಮ್ಮ ಬೂಟ್ ಮಾಧ್ಯಮಗಳೊಂದಿಗೆ ಹೊಂದುವಂತೆ ತೋರುತ್ತಿಲ್ಲ."
 
-#: ../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."
@@ -5889,7 +5889,7 @@ msgstr ""
 "ISO ಚಿತ್ರಿಕೆಗಳಿಂದ ಅನುಸ್ಥಾಪನೆಯನ್ನು ಓದುವಾಗ ದೋಷಕಂಡುಬಂದಿತು. ನಿಮ್ಮ ISO ಚಿತ್ರಿಕೆಗಳನ್ನು "
 "ಪರಿಶೀಲಿಸಿ ಮರುಪ್ರಯತ್ನಿಸಿ."
 
-#: ../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?"
@@ -5897,7 +5897,7 @@ msgstr ""
 "ನಿಮ್ಮ ಗಣಕದಲ್ಲಿ ಯಾವುದೇ ಹಾರ್ಡ್ ಡ್ರೈವ್‍ಗಳು ಇದ್ದಂತಿಲ್ಲ! ಹೆಚ್ಚುವರಿ ಸಾಧನಗಳನ್ನು ಸಂರಚಿಸಲು "
 "ಇಚ್ಛಿಸುತ್ತೀರೇನು?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5908,61 +5908,61 @@ msgstr ""
 "ಬಳಸುತ್ತಿರುವ ಡಿಸ್ಕ್‍ ಡ್ರೈವ್ ಇಲ್ಲಿ ಪಟ್ಟಿಯಾಗಿರದಿದ್ದರೆ, ಹೆಚ್ಚುವರಿ ಸಾಧನಗಳನ್ನು ಸಂರಚಿಸಲು F2 "
 "ಒತ್ತಿರಿ."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ಚಿತ್ರಿಕೆಗಳನ್ನು ಹೊಂದಿರುವ ಕಡತಕೋಶ:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "ವಿಭಾಗವನ್ನು ಆರಿಸಿ"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "ಸಾಧನ %s , %s ನ ಸೀಡಿರಾಮ್ ಚಿತ್ರಿಕೆಗಳನ್ನು ಹೊಂದಿರುವಂತೆ ಕಾಣುವುದಿಲ್ಲ."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ವಿಧಾನ ಆದೇಶ %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 "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಕಡತವು ಹಾರ್ಡ್ ಡ್ರೈವ್‍ನಲ್ಲಿ ಕಾಣಸಿಗುತ್ತಿಲ್ಲ."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS ಡಿಸ್ಕ್‍ %s ಗೆ ಹಾರ್ಡ್ ಡ್ರೈವ್ ಕಾಣಸಿಗುತ್ತಿಲ್ಲ"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "ಕೀಲಿಕೈಮಣೆ ಶೈಲಿ"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "ನಿಮ್ಮ ಬಳಿ ಯಾವ ರೀತಿಯ ಕೀಲಿಕೈಮಣೆ ಇದೆ?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಕಡತ %s: %s ಅನ್ನು ತೆರೆಯುವಾಗ ದೋಷ ಕಂಡುಬಂದಿದೆ"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಕಡತ %s: %s ಓದುವಾಗ ದೋಷ ಕಂಡುಬಂದಿದೆ"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s ನಲ್ಲಿ ದೋಷ, %d ಸಾಲಿನಲ್ಲಿ, ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಕಡತ %s ನಲ್ಲಿ ಕಂಡುಬಂದಿದೆ."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ತೆಗೆಯಬಹುದಾದ ಮಾಧ್ಯಮದಲ್ಲಿ ks.cfg ಕಾಣಸಿಗುತ್ತಿಲ್ಲ."
 
-#: ../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."
@@ -5970,50 +5970,50 @@ msgstr ""
 "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಕಡತವನ್ನು ಡೌನ್ ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿಲ್ಲ.  ಈ ಕೆಳಗೆ ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ನಿಯತಾಂಕಗಳನ್ನು "
 "ಮಾರ್ಪಡಿಸಿ ಅಥವ ಒಂದು ಸಂವಾದಾತ್ಮಕ ಅನುಸ್ಥಾಪನೆಯಲ್ಲಿ ಮುಂದುವರೆಯಲು ರದ್ದು ಮಾಡು ಅನ್ನು ಒತ್ತಿ."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಕಡತವನ್ನು ಡೌನ ಲೋಡ್ ಮಾಡು ವಾಗ ದೋಷ ಕಂಡುಬಂದಿದೆ"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ವಿಧಾನ ಆದೇಶ %s: %s ಅನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಲು ಅಮಾನ್ಯವಾದ ಆದಾನ"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s ಗೆ %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> ಅಂಶಗಳ ನಡುವೆ  | <Space> ಆರಿಸುತ್ತದೆ | <F12> ಮುಂದಿನ ತೆರೆ "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ಭಾಷೆಯೊಂದನ್ನು ಆರಿಸಿರಿ"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "ಸ್ಥಳೀಯ CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ಹಾರ್ಡ್‌ ಡ್ರೈವ್"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS ಕಡತಕೋಶ"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n ಗೆ %s ಗಾಗಿ ಸುಸ್ವಾಗತ"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "ಡಿಸ್ಕ್‍ ಆಕರವನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಿ"
 
-#: ../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?"
@@ -6021,7 +6021,7 @@ msgstr ""
 "ಅಪ್ಡೇಟ್ ಡಿಸ್ಕ್‍ ಆಕರಗಳಾಗಬಲ್ಲ ಹಲವಾರು ಸಾಧನಗಳನ್ನು ನೀವು ಹೊಂದಿದ್ದೀರಿ. ನೀವು ಯಾವುದನ್ನು "
 "ಬಳಸಲಿಚ್ಛಿಸುತ್ತೀರಿ?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6029,28 +6029,28 @@ msgstr ""
 "ಈ ಸಾಧನದಲ್ಲಿ ಅಪ್‍ಡೇಟ್ ಡಿಸ್ಕ್‍ ಚಿತ್ರಿಕೆಯನ್ನು ಹೊಂದಿರಬಹುದಾದ ಅನೇಕ ವಿಭಾಗಗಳು ಇವೆ.  ನೀವು "
 "ಯಾವುದನ್ನು ಬಳಸಲು ಇಚ್ಛಿಸುತ್ತೀರಿ?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "ಮುಂದುವರೆಯಲು /dev/%s ಗೆ ಅಪ್‍ಡೇಟ್‍ಗಳ ಡಿಸ್ಕನ್ನು ಅಳವಡಿಸಿ \"ಸರಿ\" ಒತ್ತಿರಿ."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "ಅಪ್‍ಡೇಟ್‍ಗಳ ಡಿಸ್ಕ್‍"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "ಅಪ್‍ಡೇಟ್‍ಗಳ ಡಿಸ್ಕನ್ನು ಆರೋಹಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "ಅಪ್‍ಡೇಟ್‍ಗಳು"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "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.."
@@ -6058,46 +6058,46 @@ msgstr ""
 "ಅಪ್ಡೇಟ್‍ಗಳ ಚಿತ್ರಿಕೆಯನ್ನು ಡೌನ್ ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿಲ್ಲ.  ದಯವಿಟ್ಟು ಈ ಕೆಳಗೆ ಅಪ್ಡೇಟ್‍ಗಳ ಸ್ಥಳವನ್ನು "
 "ಮಾರ್ಪಡಿಸಿ ಅಥವ ಒಂದು ಅಪ್ಡೇಟ್‍ಗಳಿಲ್ಲದೆ ಮುಂದುವರೆಯಲು ರದ್ದು ಮಾಡು ಅನ್ನು ಒತ್ತಿ."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "ಅಪ್ಡೇಟ್‍ಗಳ ಚಿತ್ರಿಕೆಯನ್ನು ಡೌನ ಲೋಡ್ ಮಾಡುವಾಗ ದೋಷ ಕಂಡುಬಂದಿದೆ"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 "ಈ ಯಂತ್ರದಲ್ಲಿ %s ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಲು ನಿಮ್ಮ ಬಳಿ ಅಗತ್ಯವಾದಷ್ಟು ಪ್ರಾಥಮಿಕ ಸ್ಮೃತಿ (RAM) "
 "ಇದ್ದಂತಿಲ್ಲ."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "ಪಾರುಗಾಣಿಸುವಿಕೆಯ ವಿಧಾನ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "ಅನುಸ್ಥಾಪನಾ ವಿಧಾನ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "ಯಾವ ರೀತಿಯ ಮಾಧ್ಯಮ ಪಾರುಗಾಣಿಸುವ ಚಿತ್ರಿಕೆಯನ್ನು ಹೊಂದಿದೆ?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ಯಾವ ರೀತಿಯ ಮಾಧ್ಯಮ, ಅನುಸ್ಥಾಪಿಸಬೇಕಾದ ಸಂಗ್ರಹಗಳನ್ನು ಹೊಂದಿದೆ?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ಯಂತ್ರಚಾಲಕ ಕಾಣಸಿಗಲಿಲ್ಲ"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ಯಂತ್ರಚಾಲಕವನ್ನು ಆರಿಸಿ"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ಚಾಲಕ ಡಿಸ್ಕನ್ನು ಬಳಸಿ"
 
-#: ../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?"
@@ -6105,11 +6105,11 @@ msgstr ""
 "ಈ ಅನುಸ್ಥಾಪನಾ ವಿಧಾನಕ್ಕೆ ಅಗತ್ಯವಾದ ಯಾವ ಸಾಧನಗಳೂ ಕಂಡುಬರಲಿಲ್ಲ.  ನೀವು ಸ್ವತಃ ಚಾಲಕವನ್ನು "
 "ಆರಿಸಿಕೊಳ್ಳಲಿಚ್ಛಿಸುವಿರೇ ಅಥವಾ ಚಾಲಕ ಡಿಸ್ಕನ್ನು ಬಳಸಲಿಚ್ಛಿಸುವಿರೇ?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "ನಿಮ್ಮ ಗಣಕದಲ್ಲಿ ಈ ಕೆಳಕಂಡ ಸಾಧನಗಳು ಕಂಡುಬಂದಿವೆ."
 
-#: ../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?"
@@ -6117,49 +6117,49 @@ msgstr ""
 "ನಿಮ್ಮ ಗಣಕಕ್ಕೆ ಯಾವುದೇ ಚಾಲಕಗಳನ್ನೂ ಲೋಡ್ ಮಾಡಲಾಗಿಲ್ಲ.  ಈಗ ಯಾವುದನ್ನಾದರೂ ಲೋಡ್ ಮಾಡಲು "
 "ಇಚ್ಛಿಸುತ್ತೀರೇ?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ಸಾಧನಗಳು"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "ಸಂಪೂರ್ಣ"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ಸಾಧನವನ್ನು ಸೇರಿಸಿ"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ಲೋಡರನ್ನು ಈಗಾಗಲೇ ಕಾರ್ಯಗತಗೊಳಿಸಲಾಗಿದೆ.  ಶೆಲ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "%s ಅನಕೊಂಡಾ, %s ಪಾರುಗಾಣಿಸುವ ವಿಧಾನದಲ್ಲಿ ಚಾಲಿತಗೊಳ್ಳುತ್ತಿದೆ - ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "%s ಅನಕೊಂಡಾ, %s ಗಣಕ ಅನುಸ್ಥಾಪಕವು ಚಾಲಿತಗೊಳ್ಳುತ್ತಿದೆ - ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "ಅನುಸ್ಥಾಪನಾ ಚಿತ್ರಿಕೆ %s ಕಾಣಸಿಗುತ್ತಿಲ್ಲ"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" ಅನ್ನು ಪರಿಶೀಲಿಸುತ್ತಿದ್ದೇನೆ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "ಮಾಧ್ಯಮಗಳನ್ನು ಈಗ ಪರಿಶೀಲಿಸುತ್ತಿದ್ದೇನೆ..."
 
-#: ../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."
@@ -6167,7 +6167,7 @@ msgstr ""
 "ಪ್ರಾಥಮಿಕ ಪರಿಮಾಣ ಡಿಸ್ಕ್ರಿಪ್ಟರಿನಿಂದ ಡಿಸ್ಕಿನ checksum ಅನ್ನು ಓದಲಾಗುತ್ತಿಲ್ಲ.  ಬಹುಶಃ ಇದು, "
 "ಡಿಸ್ಕ್‍ 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 "
@@ -6177,11 +6177,11 @@ msgstr ""
 "ದೋಷಯುಕ್ತ ಡಿಸ್ಕ್‍ ಇರಬಹುದು. ಸಾಧ್ಯವಿದ್ದಲ್ಲಿ ದಯವಿಟ್ಟು ಡಿಸ್ಕನ್ನು ಸ್ವಚ್ಛಗೊಳಿಸಿ ಮರುಪ್ರಯತ್ನಸಿ. ಈ "
 "ಪರೀಕ್ಷಣೆ ಮತ್ತೆ ಮತ್ತೆ ವಿಫಲವಾದರೆ, ನೀವು ಅನುಸ್ಥಾಪನೆಯೊಂದಿಗೆ ಮುಂದುವರೆಯಬಾರದು."
 
-#: ../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 "
@@ -6191,7 +6191,7 @@ 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"
@@ -6202,20 +6202,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "ತಾಳೆಮೊತ್ತ ಪರೀಕ್ಷೆ"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "ಸಾಧನ ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ವಿಧಾನ ಆದೇಶ %s: %s ಕ್ಕೆ ಅಮಾನ್ಯವಾದ ಆದಾನ"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಸಾಧನ ಆಜ್ಞೆಗಾಗಿ ಒಂದು ಮಾಡ್ಯೂಲಿನ ಹೆಸರನ್ನು ನಿಶ್ಚಿತ ಪಡಿಸಬೇಕು."
 
-#: ../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"
@@ -6223,7 +6223,7 @@ msgstr ""
 "ಪೂರ್ವಪ್ರತ್ಯಯವು IPv4 ಜಾಲಗಳಿಗೆ ೧ ಮತ್ತು ೩೨ ರ ನಡುವಿನಲ್ಲಿರಬೇಕು ಅಥವಾ IPv6 ಜಾಲಗಳಿಗೆ ೧ "
 "ಮತ್ತು ೧೨೮ ರ ನಡುವಿನಲ್ಲಿರಬೇಕು"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6234,27 +6234,27 @@ msgstr ""
 "ಅಗತ್ಯವಾದ ESSID ಮತ್ತು ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಕೈಯನ್ನು ನೀಡಿ.  ಕೀಲಿಕೈನ ಅವಶ್ಯಕತೆ ಇಲ್ಲದಿದ್ದರೆ ಈ "
 "ಕ್ಷೇತ್ರವನ್ನು ಖಾಲಿಯಾಗಿ ಬಿಡಿ, ಅನುಸ್ಥಾಪನೆ ಮುಂದುವರೆಯುತ್ತದೆ."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಕೈ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "ನಿಸ್ತಂತು ಸಂಯೋಜನೆಗಳು"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "ನಾಮಪರಿಚಾರಕದ IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "ನಾಮಪರಿಚಾರಕ ಕಾಣೆಯಾಗಿದೆ"
 
-#: ../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 "
@@ -6264,56 +6264,56 @@ msgstr ""
 "ನಾಮಪರಿಚಾರಕ ವಿಳಾಸವನ್ನೊಳಗೊಂಡಿಲ್ಲ. ನಿಮ್ಮ ಬಳಿ ಈ ಮಾಹಿತಿ ಇರದಿದ್ದರೆ, ಈ ಕ್ಷೇತ್ರವನ್ನು "
 "ಖಾಲಿಯಾಗಿ ಬಿಡಬಹುದು, ಅನುಸ್ಥಾಪನೆ ಮುಂದುವರೆಯುತ್ತದೆ."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "ಅಮಾನ್ಯ IP ಮಾಹಿತಿ"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "ನೀವು ಅಮಾನ್ಯ IP ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿದಿರಿ."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "ಜಾಲ ದೋಷ"
 
-#: ../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 "ನಿಮ್ಮ ಜಾಲ ಅಂತರಮುಖವನ್ನು ಸಂರಚಿಸುವಾಗ ದೋಷ ಕಂಡುಬಂದಿದೆ."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP ಸಂರಚಿಸಿ"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "ನೀವು ಒಂದಾದರೂ ಪ್ರೋಟೋಕಾಲನ್ನು ಆರಿಸಿಕೊಳ್ಳಬೇಕು (IPv4 ಅಥವಾ IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFSಗೆ IPv4ನ ಅವಶ್ಯಕತೆಯಿದೆ"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS ಅನುಸ್ಥಾಪನಾ ಕ್ರಮಕ್ಕೆ IPv4ನ ಬೆಂಬಲ ಬೇಕಿದೆ ."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ವಿಳಾಸ:"
 
-#: ../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 ವಿಳಾಸ:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "ನಾಮಪರಿಚಾರಕ:"
 
-#: ../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 "
@@ -6324,41 +6324,41 @@ msgstr ""
 "ಮಾನ್ಯವಾದವಾಗಿರುತ್ತವೆ.  gateway ಹಾಗು ನಾಮ ಪರಿಚಾರಕ ಕ್ಷೇತ್ರಗಳು ಒಂದು ಸಮಂಜಸವಾದ IPv4 ಅಥವ "
 "IPv6 ವಿಳಾಸಗಳನ್ನು ಹೊಂದಿರಬೇಕು."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "ಸ್ವಹಸ್ತ TCP/IP ಸಂರಚನೆ"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "ಕಾಣೆಯಾದ ಮಾಹಿತಿ"
 
-#: ../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 "ನೀವು ಮಾನ್ಯವಾದ IPv4 ವಿಳಾಸ ಹಾಗೂ ಜಾಲಮುಸುಕನ್ನು ಅಥವಾ CIDR ಪೂರ್ವಪ್ರತ್ಯಯವನ್ನು ನಮೂದಿಸಬೇಕು."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "ನೀವು ಮಾನ್ಯವಾದ IPv6 ವಿಳಾಸ ಹಾಗೂ CIDR ಪೂರ್ವಪ್ರತ್ಯಯ ಎರಡನ್ನೂ ನಮೂದಿಸಬೇಕು."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ಆತಿಥೇಯನಾಮ ಮತ್ತು ವ್ಯಾಪ್ತಿಯನ್ನು ನಿಶ್ಚಯಿಸುತ್ತಿದ್ದೇನೆ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ಜಾಲ ಆದೇಶ %s: %s ಗೆ ಅಮಾನ್ಯವಾದ ಆರ್ಗ್ಯುಮೆಂಟ್"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "ಜಾಲಬಂಧ ಆದೇಶದಲ್ಲಿ ಅಮಾನ್ಯ bootproto %s ಅನ್ನು ನಿಗದಿಗೊಳಿಸಲಾಗಿದೆ"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "ಜಾಲಬಂಧ ಸಾಧನ"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6366,112 +6366,112 @@ msgstr ""
 "ನಿಮ್ಮ ಗಣಕದಲ್ಲಿ ಹಲವಾರು ಜಾಲಸಾಧನಗಳಿವೆ. ನೀವು ಇವುಗಳಲ್ಲಿ ಯಾವುದನ್ನು ಅನುಸ್ಥಾಪಿಸಿಕೊಳ್ಳಲು "
 "ಇಚ್ಛಿಸುತ್ತೀರಿ?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS ಪರಿಚಾರಕದ ಹೆಸರು:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ಕಡತಕೋಶ:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "ನಿಮ್ಮ %s ಚಿತ್ರಿಕೆಗಳಿಗಾಗಿನ ಪರಿಚಾರಕದ ಹೆಸರು ಹಾಗು ಮಾರ್ಗವನ್ನು ನಮೂದಿಸಿ."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS ಸಂಯೋಜನೆ"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS ಸಂರಚನೆಯಾಗದೆ ಆತಿಥೇಯನಾಮವು ನಿಗದಿಗೊಳಿಸಲ್ಪಟ್ಟಿದೆ"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "ಮರುಪಡೆಯುತ್ತಿದ್ದೇನೆ"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ಆ ಕಡತ ಕೋಶವನ್ನು ಪರಿಚಾರಕದಿಂದ ಆರೋಹಿಸಲಾಗಲಿಲ್ಲ."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ಆ ಕಡತಕೋಶವು %s ಅನುಸ್ಥಾಪನಾ ವೃಕ್ಷವನ್ನು ಒಳಗೊಂಡಂತೆ ಕಾಣುವುದಿಲ್ಲ."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ವಿಧಾನ %s: %s ಗೆ ಅಮಾನ್ಯ ಆರ್ಗ್ಯುಮೆಂಟ್"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "ಟೆಲ್‍ನೆಟ್"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "ಟೆಲ್‍ನೆಟ್ ಸಂಪರ್ಕಕ್ಕಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "ಅನಕೊಂಡಾವನ್ನು ಟೆಲ್ನೆಟ್ ಮೂಲಕ ಕಾರ್ಯಗತಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s ಅನ್ನು ಮರಳಿಪಡೆಯಲಾಗಲಿಲ್ಲ: //%s/%s/"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ಅನುಸ್ಥಾಪನಾ ಚಿತ್ರಿಕೆಯನ್ನು ಮರುಪಡೆಯಲಾಗಲಿಲ್ಲ."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ವಿಧಾನ ಆದೇಶ %s: %s ಗೆ ಅಮಾನ್ಯ ಆರ್ಗ್ಯುಮೆಂಟ್"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url ಕಿಕ್‍ಸ್ಟಾರ್ಟ್ ವಿಧಾನಕ್ಕೆ ಒಂದು --url ಆರ್ಗ್ಯುಮೆಂಟ್ ಅನ್ನು ನೀಡಲೇಬೇಕು."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "ಗೊತ್ತಿಲ್ಲದ 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 "ನಿಮ್ಮ ಪರಿಚಾರಕದಲ್ಲಿರುವ %s ಚಿತ್ರಿಕೆಗಳಿಗಾಗಿನ URL ಅನ್ನು ನಮೂದಿಸಿ."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "ಪ್ರಾಕ್ಸಿಯನ್ನು ಸಂರಚಿಸಿ"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL ಸಂಯೋಜನೆ"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "ನೀವು ಒಂದು URL ಅನ್ನು ನಮೂದಿಸಬೇಕು."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL ಒಂದು ftp ಅಥವ http URL ಆಗಿರಬೇಕು"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಅತಿಥೇಯ"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ಒಂದು ಮಾನ್ಯ ಆತಿಥೇಯನಾಮವಲ್ಲ."
 
-#: ../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."
@@ -6479,23 +6479,23 @@ msgstr ""
 "ನೀವುHTTP ಪ್ರಾತಿನಿಧಿಕ ಪರಿಚಾರಕವನ್ನು ಬಳಸುತ್ತಿದ್ದಲ್ಲಿ, ಬಳಸಬೇಕಾದ HTTP ಪ್ರಾತಿನಿಧಿಕ "
 "ಪರಿಚಾರಕದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
 
-#: ../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
 msgid "Further Setup"
 msgstr "ಹೆಚ್ಚುವರಿ ಸಂಯೋಜನೆ"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ಚಾಲಕ ಲೋಡ್ ಆಗುತ್ತಿದೆ"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "ಚಾಲಕ %s ಲೋಡ್ ಆಗುತ್ತಿದೆ..."
diff --git a/po/ko.po b/po/ko.po
index 60a7636bd..7ed1ebad3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -54,41 +54,41 @@ msgstr "쉘을 원하시면 <enter> 키를 입력하십시오"
 #: ../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 "확인"
 
@@ -567,22 +567,22 @@ msgstr "%s 상의 파일시스템 크기 조정 중..."
 #: ../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 "오류"
 
@@ -637,8 +637,8 @@ msgstr ""
 "<Enter> 키를 누르시면, 시스템을 재부팅합니다."
 
 #: ../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 "스킵"
 
@@ -969,21 +969,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 "예"
 
 #: ../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 "아니오"
 
-#: ../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 "재시도"
 
@@ -994,8 +994,8 @@ msgstr "무시"
 #: ../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 "취소"
 
@@ -1851,21 +1851,21 @@ msgid "_Write changes to disk"
 msgstr "디스크에 변경 사항 기록(_W) "
 
 #: ../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 "뒤로"
 
 #: ../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 "진행 "
 
@@ -2282,7 +2282,7 @@ msgstr "%(instkey)s을 입력해 주십시오"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s 입력 생략"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr " %s 용 %s에 오신것을 환영합니다  "
@@ -3156,7 +3156,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "언어 선택"
 
-#: ../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 "설치 과정에서 사용하실 언어를 선택해 주십시오"
 
@@ -3524,7 +3524,7 @@ msgstr "%s 항목을 반드시 입력하셔야 합니다."
 msgid "Dynamic IP"
 msgstr "동적 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 "%s에 대한 IP 정보를 요청하고 있습니다..."
@@ -3695,7 +3695,7 @@ msgstr "알 수 없음"
 msgid "Hardware address: "
 msgstr "하드웨어 주소: "
 
-#: ../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 "프로토콜 부재"
 
@@ -3704,7 +3704,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "최소 하나의 IPv4 또는 IPv6을 선택하셔야 합니다."
 
 #: ../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 "잘못된 접두부(Prefix)"
 
@@ -3932,7 +3932,7 @@ msgstr "RAID 장치"
 msgid "None"
 msgstr "없음"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "하드 드라이브"
 
@@ -4824,12 +4824,12 @@ msgstr "접두부"
 msgid "Activate on boot"
 msgstr "부팅시 활성화"
 
-#: ../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 "IPv4 지원 활성화"
 
-#: ../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 "IPv6 지원 활성화"
@@ -4949,7 +4949,7 @@ msgstr "자동 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 "게이트웨이:"
 
@@ -5559,22 +5559,22 @@ 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 "미디어 체크"
 
-#: ../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 "테스트"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "디스크 꺼내기"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5583,7 +5583,7 @@ msgstr ""
 "\"%s\"를 선택하여 현재 드라이브 상에 있는 디스크를 테스트 하시거나 \"%s\"를 "
 "선택하여 그 디스크를 꺼내고 다른 것을 넣어 테스트하십시오."
 
-#: ../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 "
@@ -5597,7 +5597,7 @@ msgstr ""
 "최소한 디스크를 처음 사용하기 전에 테스트해보셔야 합니다. 성공적으로 테스트"
 "를 마치면, 다음 사용시 다시 테스트할 필요가 없습니다."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5606,11 +5606,11 @@ msgstr ""
 "드라이브에서 %s 디스크를 찾을 수 없습니다. %s 디스크를 넣고 %s를 눌러 다시 시"
 "도해 주십시오."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "디스크를 찾았습니다"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5621,7 +5621,7 @@ msgstr ""
 "\n"
 "%s를 선택하여 미디어 테스트를 건너뛰고 설치를 시작합니다."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5630,7 +5630,7 @@ msgstr ""
 "부팅 매체에 적합한 %s 디스크를 찾을 수 없습니다.  %s 디스크를 넣고 %s를 눌러 "
 "다시 시도해 주십시오."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5639,32 +5639,32 @@ msgstr ""
 "CDROM 드라이브에서 %s 디스크를 찾을 수 없습니다. %s 디스크를 넣고 %s를 눌러 "
 "다시 시도해 주십시오."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "디스크를 찾을 수 없습니다"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "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 "%s 디렉토리를 읽는데 실패했습니다: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "로딩 중"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "드라이버 디스켓을 읽는 중입니다..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "드라이버 디스켓 소스"
 
-#: ../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?"
@@ -5672,7 +5672,7 @@ msgstr ""
 "시스템에서 드라이버 디스켓 소스로 사용될 수 있는 장치를 여러개 발견했습니"
 "다.  어떤 장치를 사용하시겠습니까?"
 
-#: ../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?"
@@ -5680,49 +5680,49 @@ msgstr ""
 "이 장치에서 드라이버 디스크 이미지가 포함된 파티션을 여러개 발견했습니다. 어"
 "느 파티션을 사용하시겠습니까?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "파티션을 마운트하는데 실패했습니다."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "드라이버 디스켓 이미지를 선택해 주십시오."
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "파일에서 드라이버 디스켓을 읽어오는데 실패했습니다."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "드라이버 디스켓을 /dev/%s에 넣으신 후 \"확인\" 버튼을 눌러주십시오."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "드라이버 디스켓을 넣어 주십시오."
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "드라이버 디스켓을 마운트하는데 실패했습니다."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s의 출시 버젼에 대해 드라이버 디스켓이 잘못되었습니다."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "직접 선택"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "다른 디스켓을 읽어 들입니다."
 
-#: ../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 "
@@ -5732,38 +5732,38 @@ msgstr ""
 "를 선택하시거나 상관없이 계속 진행하시겠습니까? 또는 다른 드라이버 디스켓을 "
 "읽어들이는 방법을 선택하시겠습니까?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "드라이버 디스켓"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "드라이버 디스켓을 갖고 계십니까?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "드라이버 디스켓이 더 있습니까?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "더 많은 드라이버 디스켓을 로딩하시겠습니까?"
 
-#: ../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 "킥스타트 오류"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "알 수 없는 드라이버 디스켓 킥스타트 소스: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5772,7 +5772,7 @@ msgstr ""
 "킥스타트 드라이버 디스켓 명령에 다음과 같은 잘못된 인수 값이 지정되었습니다: "
 "%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 "
@@ -5783,19 +5783,19 @@ msgstr ""
 "수로 전달할 값을 정확히 모르신다면, 지금 \"확인\" 버튼을 눌러 다음 화면으로 "
 "진행하시기 바랍니다."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "모듈 매개변수를 입력해 주십시오"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "드라이버를 찾을 수 없음"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "드라이버 디스켓을 읽어 오기"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5803,7 +5803,7 @@ msgstr ""
 "수동으로 삽입할 드라이버를 찾지 못했습니다.  드라이버 디스켓을 사용하시겠습니"
 "까?"
 
-#: ../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."
@@ -5811,33 +5811,33 @@ msgstr ""
 "아래에서 사용하실 드라이버를 선택해 주십시오.  필요하신 드라이버가 이 목록에"
 "는 없고 별도의 드라이버 디스켓을 가지고 계시다면, F2를 누르십시오."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "옵션인 모듈 인자를 지정해 주십시오."
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "실행할 장치 드라이버를 선택해 주십시오."
 
-#: ../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 "매체가 검색되었습니다"
 
-#: ../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 "로컬 설치 매체가 검색되었습니다..."
 
-#: ../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 "
 "media."
 msgstr "해당 디렉토리에서 %s 설치에 사용될 경로가 부팅 매체와 일치하지 않습니다."
 
-#: ../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."
@@ -5845,13 +5845,13 @@ msgstr ""
 "ISO 이미지들에서 설치를 읽어오는데 오류가 발생했습니다. ISO 이미지들을 확인하"
 "시고 다시 시도해 주십시오."
 
-#: ../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?"
 msgstr "시스템에서 하드 드라이브를 찾을 수 없습니다! 추가할 장치를 설정하시겠습니까?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5862,61 +5862,61 @@ msgstr ""
 "기에 작성된 목록에 사용하시는 디스크 드라이브를 찾을 수 없다면, F2 키를 눌러"
 "서 추가 장치 설정을 선택해 주십시오."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "이미지가 있는 디렉토리:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "파티션 선택"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s 장치에는 %s CDROM 이미지가 없는 것 같습니다."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD 킥스타트 방식 명령 %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 "하드 드라이브에서 킥스타트 파일을 찾을 수 없습니다."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "바이오스 디스크 %s를 위한 하드 드라이브를 찾을수 없습니다"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "키보드 유형"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "사용하고 계신 키보드를 선택해 주십시오"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s 킥스타트 파일을 여는 도중 오류가 발생했습니다: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "킥스타트 파일 %s 의 내용을 읽는 도중 오류가 발생되었습니다: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s에서 오류가 발생했습니다. 줄번호: %d, 킥스타트 파일: %s"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "이동식 미디어에 있는 ks.cfg 파일을 찾을 수 없습니다.  "
 
-#: ../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."
@@ -5924,50 +5924,50 @@ msgstr ""
 "킥스타트 파일을 다운로드할 수 없습니다. 아래의 킥스타트 매개변수를 수정하시거"
 "나 또는 취소 버튼을 눌러 대화식 설치를 실행하시기 바랍니다."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "킥스타트 파일을 다운로드하는 도중 오류가 발생했습니다"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "킥스타트 방식을 종료하는 명령 %s에 잘못된 인수 값이 지정되었습니다: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s 용 %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> 항목 이동   |   <Space> 선택   |   <F12> 다음 화면"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "언어 선택"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "로컬 CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "하드 드라이브"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS 디렉토리"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n에 (%s 용) 오신것을 환영합니다 "
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "업데이트 디스켓 소스"
 
-#: ../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?"
@@ -5975,7 +5975,7 @@ msgstr ""
 "업데이트 디스켓 소스로 사용 가능한 장치가 여러개 발견되었습니다. 어떤 장치를 "
 "사용하시겠습니까?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -5983,28 +5983,28 @@ msgstr ""
 "이 장치에서 업데이트 디스크 이미지가 포함된 파티션을 여러개 발견했습니다. 어"
 "느 파티션을 사용하시겠습니까? "
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "업데이트 디스켓을 /dev/%s에 넣으신 후, \"확인\" 버튼을 눌러주십시오."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "업데이트 디스켓"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "업데이트 디스켓을 마운트하는데 실패했습니다."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "업데이트"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "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.."
@@ -6012,44 +6012,44 @@ msgstr ""
 "업데이트 이미지를 다운로드할 수 없습니다. 아래의 업데이트 위치를 수정하시거"
 "나 또는 취소 버튼을 눌러 업데이트없이 실행하시기 바랍니다. "
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "업데이트 이미지를 다운로드하는 도중 오류가 발생했습니다"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "현재 이 시스템의 램 용량으로는 %s를 설치하실 수 없습니다."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "복구 방법"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "설치 방법"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "복구 이미지가 있는 매체를 지정해 주십시오"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "설치할 패키지가 있는 매체를 지정해 주십시오"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "드라이버를 찾을 수 없음"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "드라이버를 선택해 주십시오."
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "드라이버 디스켓을 사용"
 
-#: ../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?"
@@ -6057,11 +6057,11 @@ msgstr ""
 "이 설치 타입에 필요한 장치 유형에 맞는 장치를 찾을 수 없습니다.직접 드라이버"
 "를 선택하시겠습니까? 아니면 드라이버 디스켓을 사용하시겠습니까?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "시스템에서 다음의 장치를 찾았습니다."
 
-#: ../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?"
@@ -6069,49 +6069,49 @@ msgstr ""
 "시스템에 어떠한 장치 드라이버도 로딩되지 않았습니다. 지금 장치를 로딩하시겠습"
 "니까? "
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "장치"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "완료"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "장치 추가"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "로더는 이미 실행 중입니다.  쉘을 시작합니다.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "%s 복구 모드로 anaconda %s 실행 중 - 잠시만 기다려 주십시오...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "%s 시스템 설치 프로그램인 anaconda %s 실행 중 - 잠시만 기다려 주십시오...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "%s 설치 이미지를 읽어올 수 없습니다"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\"를 확인 중..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "현재 미디어를 확인중..."
 
-#: ../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."
@@ -6119,7 +6119,7 @@ msgstr ""
 "원시 볼륨 서술자로부터 디스크 첵섬을 읽어들이는데 실패했습니다.  아마 이것은 "
 "첵섬을 추가하지 않은채로 디스크를 작성했기 때문입니다."
 
-#: ../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 "
@@ -6129,11 +6129,11 @@ msgstr ""
 "된 것 같습니다.  만일 그렇다면, 디스크를 닦으신 후 다시 시도해 주십시오.  만"
 "일 테스트가 계속 실패한다면 , 설치를 중지하셔야 합니다."
 
-#: ../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 "
@@ -6143,7 +6143,7 @@ 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"
@@ -6154,20 +6154,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "첵섬 테스트"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "장치 킥스타트 방식 명령 %s에 잘못된 인수 값이 지정되었습니다: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "킥스타트 장치 명령에 해당하는 모듈 이름을 반드시 지정해야 합니다.  "
 
-#: ../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"
@@ -6175,7 +6175,7 @@ msgstr ""
 "접두부는 IPv4 네트워크에 대해 1에서 32 사이의 값이거나 IPv6 네트워크에 대해 1"
 "에서 123 사이의 값이어야 합니다"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6186,27 +6186,27 @@ msgstr ""
 "증키를 입력해주십시오.  키를 사용하지 않는 경우 빈 칸으로 두시고 계속 설치를 "
 "진행하십시오."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "인증키"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "무선 설정"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "네임서버 IP 주소"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "네임서버 부재"
 
-#: ../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 "
@@ -6216,56 +6216,56 @@ msgstr ""
 "주소가 포함되어 있지 않습니다. 이와 관련된 사항에 대해 잘 모르실 경우에는 빈 "
 "칸으로 놔두시고, 설치를 계속 진행하시기 바랍니다."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "IP 주소 오류"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "잘못된 IP 주소를 입력하셨습니다."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "네트워크 오류"
 
-#: ../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 "네트워크 인터페이스를 설정하는 도중 오류가 발생하였습니다."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP 설정"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "최소 하나의 프로토콜 (IPv4 또는 IPv6)을 선택하셔야 합니다."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS에 대해 IPv4 필요"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS 설치 방식은 IPv4 지원을 필요로 합니다."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 주소:"
 
-#: ../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 주소:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "네임서버:"
 
-#: ../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 "
@@ -6275,41 +6275,41 @@ msgstr ""
 "로 구분된 네 개의 숫자로된 넷마스크이거나 또는 CIDR 형식의 접두부이어야 합니"
 "다. 게이트웨이 및 네임서버 항목은 올바른 IPv4 또는 IPv6 주소여야 합니다."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "수동 TCP/IP 설정"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "정보 부족"
 
-#: ../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 "올바른 IPv4 주소와 넷마스크 또는 CIDR 접두부(prefix)를 입력해 주십시오."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "올바른 IPv6 주소와 CIDR 접두부(prefix)를 입력해 주십시오."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "호스트명과 도메인을 설정하고 있습니다..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "킥스타트 네트워크 명령 %s 에 잘못된 인수 값이 지정되었습니다: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "네트워크 명령에 잘못된 bootproto %s (이)가 지정되었습니다"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "네트워크 장치"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6317,112 +6317,112 @@ msgstr ""
 "시스템에서 하나 이상의 네트워크 장치가 발견되었습니다. 어떤 장치로 설치하시겠"
 "습니까?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS 서버 명:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s 디렉토리:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "%s 이미지에 서버 이름 및 경로를 입력해 주시기 바랍니다. "
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS 설정"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS가 설정되지 않은 상태에서 호스트명이 지정됨"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "읽는 중"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "서버의 해당 디렉토리를 마운트할 수 없습니다 "
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "해당 디렉토리에서 %s 설치에 관련된 파일을 찾을 수 없습니다."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS 킥스타트 방식 명령 %s 에 잘못된 인수 값이 지정되었습니다: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "텔넷"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "텔넷 접속을 기다리고 있습니다..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "텔넷을 통해 anaconda를 실행중..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s (을)를 읽어올 수 없습니다: //%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "설치 이미지를 읽어올 수 없습니다"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url 킥스타트 방식 명령 %s 에 잘못된 인수 값이 지정되었습니다: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url 킥스타트 방식 명령에 --url 인자를 지정하셔야 합니다."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "알 수 없는 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 "서버에서 %s 이미지가 있는 URL을 입력해 주시기 바랍니다. "
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "프록시 설정 "
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL 설정"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "URL을 입력해 주십시오. "
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL은 ftp 또는 http URL이어야 합니다 "
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "알 수 없는 호스트"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s (은)는 잘못된 호스트명입니다."
 
-#: ../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."
@@ -6430,23 +6430,23 @@ msgstr ""
 "HTTP 프록시 서버를 사용하고 계시다면, HTTP 프록시 서버의 이름을 입력해 주시"
 "기 바랍니다."
 
-#: ../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
 msgid "Further Setup"
 msgstr "추가 설정 "
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI 드라이버 로딩 중"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s 드라이버를 로딩하고 있습니다..."
diff --git a/po/ku.po b/po/ku.po
index 88d8fa9ff..ba137ee68 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -43,41 +43,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 ""
 
@@ -483,22 +483,22 @@ msgstr ""
 #: ../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 ""
 
@@ -545,8 +545,8 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -788,21 +788,21 @@ msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
-#: ../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 ""
 
@@ -813,8 +813,8 @@ msgstr ""
 #: ../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 ""
 
@@ -1542,21 +1542,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 ""
 
 #: ../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 ""
 
@@ -1922,7 +1922,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2701,7 +2701,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr ""
 
-#: ../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 ""
 
@@ -3039,7 +3039,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3201,7 +3201,7 @@ msgstr ""
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3210,7 +3210,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3434,7 +3434,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4202,12 +4202,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4323,7 +4323,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 ""
 
@@ -4895,29 +4895,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4927,18 +4927,18 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -4946,145 +4946,145 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5092,69 +5092,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5162,269 +5162,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5432,26 +5432,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5459,258 +5459,258 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr ""
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr ""
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/lo.po b/po/lo.po
index 45a6d0fcd..9ccfef254 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -43,41 +43,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 ""
 
@@ -483,22 +483,22 @@ msgstr ""
 #: ../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 ""
 
@@ -545,8 +545,8 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -788,21 +788,21 @@ msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
-#: ../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 ""
 
@@ -813,8 +813,8 @@ msgstr ""
 #: ../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 ""
 
@@ -1542,21 +1542,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 ""
 
 #: ../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 ""
 
@@ -1922,7 +1922,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2701,7 +2701,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr ""
 
-#: ../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 ""
 
@@ -3039,7 +3039,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3201,7 +3201,7 @@ msgstr ""
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3210,7 +3210,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3434,7 +3434,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4202,12 +4202,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4323,7 +4323,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 ""
 
@@ -4895,29 +4895,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4927,18 +4927,18 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -4946,145 +4946,145 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5092,69 +5092,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5162,269 +5162,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5432,26 +5432,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5459,258 +5459,258 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr ""
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr ""
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 89b65c4fc..92464e2ee 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -45,41 +45,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 "OK"
 
@@ -503,22 +503,22 @@ msgstr "Formatuoja %s failų sistemą..."
 #: ../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 "Klaida"
 
@@ -566,8 +566,8 @@ msgid ""
 msgstr ""
 
 #: ../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 "Praleisti"
 
@@ -812,21 +812,21 @@ msgstr ""
 
 #: ../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 "Taip"
 
 #: ../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 "Ne"
 
-#: ../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 "Pakartot"
 
@@ -837,8 +837,8 @@ msgstr "Ignoruot"
 #: ../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 "Atšaukti"
 
@@ -1596,21 +1596,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 "Atgal"
 
 #: ../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 "Pratęsti"
 
@@ -1983,7 +1983,7 @@ msgstr "Pasirinkite prisijungimo tipą:"
 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 "Sveiki atvykę į %s"
@@ -2824,7 +2824,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Kalbos Pasirinkimas"
 
-#: ../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 "Kokios kalbos pageidaujate instaliacijos metu?"
 
@@ -3164,7 +3164,7 @@ msgstr "Reikšmė reikalinga \"%s\"."
 msgid "Dynamic IP"
 msgstr "Dinaminis 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 "Siunčia užklausa dėl IP informacijos %s..."
@@ -3337,7 +3337,7 @@ msgstr "Nežinoma"
 msgid "Hardware address: "
 msgstr "IP adresas:"
 
-#: ../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 "Nerasta Grupė"
@@ -3348,7 +3348,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Jūs turite pasirinkti bent vieną kalbą."
 
 #: ../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 "Neteisingas IP stringas"
@@ -3578,7 +3578,7 @@ msgstr "RAID Įrenginiai"
 msgid "None"
 msgstr "Jokia"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Kieti Diskai"
 
@@ -4365,12 +4365,12 @@ msgstr "Neteisingas IP stringas"
 msgid "Activate on boot"
 msgstr "Aktyvuoti starto(boot) metu"
 
-#: ../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 ""
@@ -4496,7 +4496,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 "Šliuzas(Gateway):"
 
@@ -5093,30 +5093,30 @@ 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 "Medija Testas"
 
-#: ../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 "Testas"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Išmesti CD"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -5126,19 +5126,19 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD Rastas"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5146,149 +5146,149 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD nerastas"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Negali rasti kikstarto bylos CDROM'e."
 
-#: ../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 "Nepavyko nuskaityti direktorijos %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Krauna"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Skaito tvarkyklių(driver) diską..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 #, fuzzy
 msgid "Failed to mount partition."
 msgstr "Nepavyko prijungti (mount) atnaujinimų disko"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 #, fuzzy
 msgid "Select driver disk image"
 msgstr "Pasirinkti tvarkyklę (driver)"
 
-#: ../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 "Nepavyko prijungti(mount) tvark. diską."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Įdėkite Tvarkyklių(Driver) Diską"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Nepavyko prijungti(mount) tvark. diską."
 
-#: ../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 "Rankinis pasirinkimas"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Krauti kitą 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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Tvarkyklės diskas"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Ar jūs turite tvarkyklės(driver) diską?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Daugiau Tvarkyklių Diskų?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Ar jūs norite dar užkrauti papildomų tvark. diskų?"
 
-#: ../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 "Kikstart Klaida"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5296,50 +5296,50 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Įveskite Modulio Parametrus"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nerasta tvarkyklių(drivers)"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Kraunama tvarkyklių (driver) diskas"
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Įveskite papildomus modulio argumentus"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Pasirinkite Įrenginio Tvarkyklę Užkrauti"
 
-#: ../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 "Medija Rasta"
 
-#: ../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 "Lokalaus instaliavimo medija rasta..."
 
-#: ../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 "
@@ -5347,7 +5347,7 @@ msgid ""
 msgstr ""
 "%s instaliacijos medis direktorijoje neatitinka jūsų starto(boot) medijos."
 
-#: ../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."
@@ -5355,7 +5355,7 @@ msgstr ""
 "Klaida, skaitant ISO atvaizdus(images). Prašau patikrinti jūsų ISO atvaizdus"
 "(images) ir bandyti dar kartą."
 
-#: ../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?"
@@ -5363,7 +5363,7 @@ msgstr ""
 "Nemato kieto disko įrenginių jūsų sistemoje! Ar jūs norite konfiguruot "
 "papildomus įrenginius?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5374,257 +5374,257 @@ msgstr ""
 "(images)  %s? Jei jūs nematote disko įrenginių šiam sąraše, tada spauskite "
 "F2, kad konfiguruot papildomus įrenginius."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Direktorija, turinti atvaizdus(images):"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Pasirinkite Particiją"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Įrenginys %s neturi %s CDROM atvaizdų (images)."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Blogas argumentas HD kikstart metodo komandoje %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 "Negali rasti kikstart bylos kietam diske."
 
-#: ../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 "Klaviatūrų Tipai"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Kokį klaviatūros tipą jūs turite?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Klaida atidarant kikstart bylą %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Klaida, skaitant turinį kikstarto bylos %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Klaida %s eilutėje %d kikstarto byloje %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Negali rasti ks.cfg startiniame diskelyje."
 
-#: ../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 "Klaida atidarant kikstart bylą %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, fuzzy, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Blogas argumentas HD kikstart metodo komandoje %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Sveiki atvykę į %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> tarp elementų  | <Space> pažymi | <F12> sek. ekranas "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Pasirinkite Kalbą"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Lokalus CDROM"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Kietas diskas"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s direktorija:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Sveiki atvykę į %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Atnaujinimų Diskai"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Nepavyko prijungti (mount) atnaujinimų disko"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Atnaujinimai"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Nuskaito anakondos atnaujinimus..."
 
-#: ../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 "Klaida atidarant kikstart bylą %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 "Jūs neturi pakankamai atminties (RAM), kad instaliuoti %s į šią mašiną"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Atstatymo Metodas"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Instaliacijos metodas"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nerasta tvrarkyklių (driver)"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Pasirinkti tvarkyklę (driver)"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Naudoti tvarkyklių (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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Įrenginiai"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Atlikta"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Pridėti įrenginį"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Negalima rasti atvaizdo (image) %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Tikrinama \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Tikrinama medija dabar..."
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
@@ -5637,18 +5637,18 @@ msgstr ""
 "blogo parsiuntimo ar blogo disko. Jei dėl disko, pabandykit nuvalyti diska "
 "ir pabandykite vėl. Jei vėl klaida, jūs negalėsite tęsti instaliacijos."
 
-#: ../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"
@@ -5659,26 +5659,26 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Patikrinimo testas"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5686,135 +5686,135 @@ 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 "Papildomi Nustatymai"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Vardų serverio IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Vardų serveris"
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Neteisinga IP Informacija"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Jūs įvedėte neteisingą IP adresą"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Supervartotojo(Root) Slaptažodis"
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfiguruoti TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Jūs turite pasirinkti bent vieną kalbą."
 
-#: ../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 "IP adresas:"
 
-#: ../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 "IP adresas:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Vardų serveris"
 
-#: ../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 "z/IPL Nustatymai"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Trūksta Informacijos"
 
-#: ../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 "Jūs turite įvesti teisingus IP adresą ir potinklį(netmask)."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Jūs turite įvesti teisingus IP adresą ir potinklį(netmask)."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Nustatoma hosto vardas ir domeinas..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Blogas argumentas į kikstarto tinklo komandą %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Neteisingas bootproto %s tinklo komandoje"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Tinklo įrenginiai"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -5822,116 +5822,116 @@ msgstr ""
 "Jūs turite keletą tinklo plokščių sistemoje. Per kurią norite pradėti "
 "instaliaciją?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS serverio vardas:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s direktorija:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, fuzzy, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Prašau pasirinkti monitoriu prijungtą į jūsų komp."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS Nustatymai"
 
-#: ../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 "Gaunama"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Ši direktorija negali būti prijungta (mount) iš serverio."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Direktorija neturi neturi %s instaliacijos medžio."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Neteisingas argumentas Url kikstart methodo komandai %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 "Laukiama telnet prisijungimo..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "paleidžiama anakonda per telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Negalima gauti %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Negalima gauti instaliavimo atvaizdo (image)."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Neteisingas argumentas Url kikstart methodo komandai %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Turite įvesti --url argumentą, naudojant Url kikstart metodą."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Nežinomas Url metodas %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 "Konfiguruoti %s"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS Nustatymai"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Jūs turite įvesti serverio vardą."
 
-#: ../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
 #, fuzzy
 msgid "Unknown Host"
 msgstr "Nežinoma"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, fuzzy, c-format
 msgid "%s is not a valid hostname."
 msgstr "Įspėjimas: %s - neteisingas portas."
 
-#: ../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."
@@ -5939,25 +5939,25 @@ msgstr ""
 "Jeigu Jūs naudojate HTTP proxy serverį, tada įveskite HTTP proxy serverio "
 "vardą, kurį naudosite."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 #, fuzzy
 msgid "Proxy Name:"
 msgstr "ar naudoti:"
 
-#: ../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 "FTP Nustatymai"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Kraunas SCSI tvarkyklę"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Krauna %s tvarkyklę(driver)..."
diff --git a/po/lv.po b/po/lv.po
index 4e1b10ed1..055eb31aa 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -48,41 +48,41 @@ msgstr "Nospiediet <enter>, lai pārietu uz komandrindas režīmu"
 #: ../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 "Kļūda datņu sistēmas montēšanā uz %s: %s"
 #: ../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 "Kļūda"
 
@@ -650,8 +650,8 @@ msgstr ""
 "Nospiediet <Enter>, lai pārstartētu sistēmu."
 
 #: ../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 "Izlaist"
 
@@ -983,21 +983,21 @@ msgstr "Labot"
 
 #: ../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 "Jā"
 
 #: ../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 "Nē"
 
-#: ../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 "Atkārtot"
 
@@ -1008,8 +1008,8 @@ msgstr "Ignorēt"
 #: ../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 "Atcelt"
 
@@ -1855,21 +1855,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 "Atpakaļ"
 
 #: ../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 "Turpināt"
 
@@ -2302,7 +2302,7 @@ msgstr "Lūdzu ievadiet sadaļu grupas vārdu."
 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 "Laipni aicināti %s"
@@ -3190,7 +3190,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Valodas izvēle"
 
-#: ../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 "Kādu valodu vēlaties izmantot sistēmas uzstādīšanas procesā?"
 
@@ -3567,7 +3567,7 @@ msgstr "Nepieciešama vērtība laukā \"%s\"."
 msgid "Dynamic IP"
 msgstr "Dinamiska 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 "Sūta IP informācijas pieprasījumu par %s..."
@@ -3743,7 +3743,7 @@ msgstr "Nezināms"
 msgid "Hardware address: "
 msgstr "Ierīces adrese: %s"
 
-#: ../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 "Trūkstoša grupa"
@@ -3753,7 +3753,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 "Nekorekts prefikss"
 
@@ -3986,7 +3986,7 @@ msgstr "RAID ierīces"
 msgid "None"
 msgstr "Nekas"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Cietņi"
 
@@ -4891,12 +4891,12 @@ msgstr "IPv6/Prefikss"
 msgid "Activate on boot"
 msgstr "Aktivizēt ielādējot sistēmu"
 
-#: ../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 "Ieslēgt IPv4 atbalstu"
 
-#: ../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 "Ieslēgt IPv6 atbalstu"
@@ -5021,7 +5021,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 ""
 
@@ -5618,29 +5618,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -5650,19 +5650,19 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Diski nav atrasti"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5670,146 +5670,146 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "%s nav atrasts"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Nevar atrast kickstart failu uz 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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Ielādējas"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5817,69 +5817,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Ievadiet moduļa parametrus"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5887,270 +5887,270 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 "Nevar atrast kickstart failu uz cietā diska."
 
-#: ../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 "Klaviatūras veids"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Kāds klaviatūras tips Jums ir?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Kļūda atverot kickstart failu %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr "Kļūda lejuplādējot kickstart failu"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Izvēlieties valodu"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Cietais disks"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Laipni aicināti %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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 "Kļūda Kickstart konfigurācijas apstrādes laikā"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Jūms pietrūkst RAM, lai uzstādītu %s uz šīs mašīnas."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Uz Jūsu sistēmas ir atrastas sekojošas ierīces."
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Ierīces"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Izdarīts"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Pievienot ierīci"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Darbojas anaconda %s, %s sistēmas uzstādītājs - lūdzu uzgaidiet...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Pārbauda \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -6158,26 +6158,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -6185,265 +6185,265 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Vārdu serveris"
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Tīkla kļūda"
 
-#: ../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 "Kļūme klonēšanā: kļūme rezultātu diska dzēšanā."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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 "IP adrese"
 
-#: ../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 "IP adrese"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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 "ZFCP iestatīšana"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "'%s' nav korekta IPv6 adrese."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Tīkla ierīce"
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS servera nosaukums:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 "Gaida telnet pieslēgumu..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Anaconda strādā caur telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, fuzzy, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Lūdzu ievadiet Jūsu %s kopijas reģistrācijas atslēgu."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "Iestatīt %s"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL uzstādīšana"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Jums jāievada URL."
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/mai.po b/po/mai.po
index ee05244c0..a442cf4fb 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -50,41 +50,41 @@ msgstr "एकटा शैल क' लेल <enter> दाबू"
 #: ../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 "बेस"
 
@@ -572,22 +572,22 @@ msgstr "%s फाइल सिस्टमकेँ संरूपित कए
 #: ../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 "त्रुटि"
 
@@ -643,8 +643,8 @@ msgstr ""
 "अपन सिस्टमकेँ रिबूट करबा क' लेल <Enter> दाबू."
 
 #: ../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 "छोड़ू"
 
@@ -973,21 +973,21 @@ msgstr "सही"
 
 #: ../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 "हँ"
 
 #: ../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 "नहि"
 
-#: ../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 "पुनः प्रयास करू"
 
@@ -998,8 +998,8 @@ msgstr "छोड़ू"
 #: ../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 "रद्द"
 
@@ -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 "पाछाँ"
 
 #: ../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 "जारी राखू"
 
@@ -2285,7 +2285,7 @@ msgstr "कृप्या अपन %(instkey)s प्रविष्ट कर
 msgid "Skip entering %(instkey)s"
 msgstr "%(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 "%sमे स्वागत अछि"
@@ -3148,7 +3148,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "भाषा चुनाव"
 
-#: ../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 "अधिष्ठापन प्रक्रिया क' समय अहाँ कओन भाषाक प्रयोग कएनाइ चाहैत छी?"
 
@@ -3520,7 +3520,7 @@ msgstr "%s क्षेत्र क' लेल एकटा मान आवश
 msgid "Dynamic IP"
 msgstr "गतिशील 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 "%s क' लेल IP जानकारी क' लेल निवेदन भेज रहल अछि..."
@@ -3691,7 +3691,7 @@ msgstr "अज्ञात"
 msgid "Hardware address: "
 msgstr "हार्डवेयर पता: "
 
-#: ../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 "गुम प्रोटोकॉल"
 
@@ -3700,7 +3700,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "अहाँक कम सँ कम IPv4 अथवा IPv6) समर्थन जरूर चुनू."
 
 #: ../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 "अमान्य उपसर्ग"
 
@@ -3935,7 +3935,7 @@ msgstr "RAID युक्तिसभ"
 msgid "None"
 msgstr "कोनो नहि"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "हार्ड ड्राइव"
 
@@ -4831,12 +4831,12 @@ msgstr "उपसर्ग"
 msgid "Activate on boot"
 msgstr "बूट पर सक्रिय करू"
 
-#: ../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 "IPv4 समर्थन सक्रिय करू"
 
-#: ../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 "IPv6 समर्थन सक्रिय करू"
@@ -4955,7 +4955,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 "गेटवे:"
 
@@ -5568,22 +5568,22 @@ msgstr ""
 "* ई Red Hat Enterprise Linux क' एकटा असमर्थित/अप्रमाणित परिणाम देत.\n"
 "* अहाँक सोफ्टवेयर आ सुरक्षा अद्यतन नहि भेट सकत जे संकुल सामिल नहि हाएब अहाँक सदस्यतामे."
 
-#: ../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 "माध्यम जाँच"
 
-#: ../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 "जाँचू"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "डिस्क बाहर निकालू"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5592,7 +5592,7 @@ msgstr ""
 "चालनमे वर्तमानमे डिस्क जाँच क' लेल \"%s\" चुनू अथवा \"%s\" डिस्क निकालबाक लेल आओर जाँच "
 "करबा क' लेल आन प्रविष्ट करू."
 
-#: ../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 "
@@ -5606,7 +5606,7 @@ msgstr ""
 "डिस्ककेँ ओकर प्रयोग करब सँ पहिले पहलुक बार जाँचल जएनाइ चाही. ओकरा सफलतापूर्वक जाँचल "
 "जएनाइ क' बाद, सभ डिस्ककेँ एकरा पहिले प्रयोग करबा क' लेल फिनु जाँचनाइ जरूरी अछि."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5615,11 +5615,11 @@ msgstr ""
 "अहाँक कोनो चालनमे %s डिस्क नहि भेटल छल. कृप्या %s डिस्क प्रविष्ट करू आओर पुनःप्रयास क' "
 "लेल %s दाबू."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "डिस्क भेटल"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5630,7 +5630,7 @@ msgstr ""
 "\n"
 "मीडिया जाँचकेँ छोड़ब क' लेल %s चुनू आओर अधिष्ठापन प्रारंभ करू."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5639,7 +5639,7 @@ msgstr ""
 "कोनो %s डिस्क नहि भेटल जे अहाँक बूट माध्यम सँ मिलान करैत अछि. कृप्या %s CD डिस्क आओर "
 "पुनःप्रयास क' लेल %s दाबू."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5648,32 +5648,32 @@ msgstr ""
 "अहाँक कोनो CDROM चालनमे %s डिस्क नहि भेटल छल. कृप्या %s डिस्क प्रविष्ट करू आओर "
 "पुनःप्रयास क' लेल %s दाबू."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "डिस्क नहि भेटल"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "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 "%s निर्देशिका पढ़एमे असफल: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "लोड भ' रहल अछि"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "चालन डिस्क पढ़ि रहल अछि..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "चालन डिस्क स्रोत "
 
-#: ../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?"
@@ -5681,7 +5681,7 @@ msgstr ""
 "अहाँक पास बहु युक्तिसभ अछि जे एकटा चालन डिस्क क' लेल स्रोत जहिना सेवा कए सकैत छी. अहाँ "
 "कओन उपयोग कएनाइ चाहब?"
 
-#: ../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?"
@@ -5689,49 +5689,49 @@ msgstr ""
 "एहि अओजार पर कइ विभाजन अछि, जे चालन डिस्क विंबकेँ राखि सकैत अछि. अहाँ कओन उपयोग "
 "कएनाइ चाहैत छी?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "विभाजन डिस्क आरोहणमे असफल"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "चालन डिस्क विंब चुनू"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "फाइल सँ चालन डिस्क आरोहणमे असफल"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "अहाँक चालन डिस्क /dev/%sमे प्रविष्ट करू आओर जारी राखबाक लेल \"ठीक\" दाबू."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "चालन डिस्क प्रविष्ट करू "
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "चालन डिस्क आरोहणमे असफल"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s क' एहि रिलीज क' लेल ड्राइवर डिस्क अवैध अछि."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "दस्ती रूपसँ चुनू"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "दोसर डिस्क भारित करू"
 
-#: ../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 "
@@ -5740,45 +5740,45 @@ msgstr ""
 "एहि चालन डिस्क पर उचित प्रकारक युक्तिसभ नहि भेटल. की अहाँ दस्ती रूप सँ चालन छाँटनाइ "
 "चाहैत छी, फिनु जारी रहू, अथवा आन कोनो चालन डिस्क भारित करू?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "चालन डिस्क"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "की अहाँक पास एकटा चालन डिस्क अछि?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "अधिक चालन डिस्क?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "की अहाँ आओर बेसी चालन डिस्क भारित कएनाइ चाहैत छी?"
 
-#: ../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 "किकस्टार्ट त्रुटि "
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "अज्ञात चालन डिस्क किकस्टार्ट स्रोत: %s "
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "निम्नांकित अमान्य तर्क किकस्टार्ट डिस्क कमांड क' लेल निर्दिष्ट छल: %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 "
@@ -5788,19 +5788,19 @@ msgstr ""
 "कृप्या कोनो पैरामीटर दाखिल करू जे स्थानसभक द्वारा पृथक %s मॉडयूलकेँ भेजनाए चाहैत छी. जँ "
 "अहाँ नहि जानैत छी जे कओन पैरामीटर भेजब \"ठीक\" बटन दाबि कए एहि स्क्रीनकेँ छोड़ू ."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "मॉडयूल पैरामीटरसभकेँ दाखिल करू"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "कोनो चालक नहि भेटल"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "चालक डिस्क भारित करू"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5808,7 +5808,7 @@ msgstr ""
 "दस्ती रूप सँ प्रविष्ट करबाक लेल कोनो चालक नहि भेटल छल. की अहाँ चालक डिस्क प्रयोग कएनाइ "
 "पसिन्न करब?"
 
-#: ../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."
@@ -5816,26 +5816,26 @@ msgstr ""
 "कृप्या नीच्चाँ सँ चालन चुनू जे अहाँ भारित कएनाइ चाहैत छी. जँ ई नहि आएत आओर अहाँक पास "
 "चालन डिस्क अछि. F2 दाबू."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "वैकल्पिक मॉडयूल तर्क निर्दिष्ट करू"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "भारण क' लेल युक्ति चालक चुनू"
 
-#: ../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 "माध्यम खोजल गेल"
 
-#: ../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 "स्थानीय अधिष्ठापन माध्यम खोजल गेल..."
 
-#: ../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 "
@@ -5843,7 +5843,7 @@ msgid ""
 msgstr ""
 "एहन नहि लागैत अछि जे ओए निर्देशिकामे %s अधिष्ठापन तरू अहाँक बूट माध्यम सँ मिलान करैत अछि."
 
-#: ../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."
@@ -5851,7 +5851,7 @@ msgstr ""
 "ISO बिंबसभसँ अधिष्ठापन पढ़एमे एकटा त्रुटि घटित भेल अछि. कृप्या अपन ISO बिंबसभकेँ जाँचू आओर "
 "पुनःप्रयास करू."
 
-#: ../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?"
@@ -5859,7 +5859,7 @@ msgstr ""
 "एहन नहि लागैत अछि जे अहाँक सिस्टम पर कोनो हार्डड्राइव अछि! की अहाँ अतिरिक्त युक्तिसभक "
 "बिन्यास कएनाइ चाहैत छी?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5870,62 +5870,62 @@ msgstr ""
 "अछि? जँ अहाँ एतय सूचीबद्ध डिस्क चालन नहि देखि रहल छी, अतिरिक्त युक्तिसभक बिन्यास क' लेल "
 "F2 दाबू."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "बिंबसभकेँ राखए बला निर्देशिका:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "विभाजन चुनू"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "लागैत अछि जे %s अओजारमे %s CDROM विंब समाहित नहि अछि."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD किकस्टार्ट विधि कमांड %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 "हार्ड ड्राइव पर किकस्टार्ट फाइल भेटि नहि सकल."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS डिस्क %s क' लेल हार्ड ड्राइव नहि पाबि सकैत अछि"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "कुँजीपटल प्रकार "
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "अहाँक पास कओन प्रकारक कुँजीपटल अछि?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s किकस्टार्ट फाइल खोलएमे त्रुटि: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s किकस्टार्ट फाइलक सामग्री पढ़एमे त्रुटि: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s किकस्टार्ट फाइलक %d रेखा पर %s त्रुटि."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "बूट फ्लापी पर ks.cfg खोज नहि सकल."
 
-#: ../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."
@@ -5933,52 +5933,52 @@ msgstr ""
 "किकस्टार्ट फाइल डाउनलोड करबामे असमर्थ. नीच्चाँ किकस्टार्ट पैरामीटर निर्दिष्ट करू अथवा "
 "एकटा अंतःक्रियात्मक अधिष्ठापन क' लेल आगाँ बढ़ू."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "किकस्टार्ट फाइल डाउनलोड करबामे त्रुटि"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "किकस्टार्ट विधि कमांड %sकेँ बन्न करबाक लेल गलत तर्क: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%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> तत्वसभक बीच          | <स्थान> चुनू        | <F12> आगाँ स्क्रीन"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "एकटा भाषा छाँटू"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "स्थानीय CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "हार्ड ड्राइव"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS निर्देशिका"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%sमे स्वागत अछि"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "डिस्क स्रोतक अद्यतन करू"
 
-#: ../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?"
@@ -5986,7 +5986,7 @@ msgstr ""
 "अहाँक पास बहु युक्तिसभ अछि जे एकटा अद्यतन डिस्क क' लेल स्रोत जेहन सेवा करत. अहाँ ककरा "
 "उपयोग कएनाइ पसिन्न करब?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -5995,28 +5995,28 @@ msgstr ""
 "एहि अओजार पर कइ विभाजन अछि, जे चालन डिस्क विंबकेँ राखि सकैत अछि. अहाँ कओन उपयोग "
 "कएनाइ चाहैत छी?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "अहाँक अद्यतन डिस्ककेँ /dev/%sमे प्रविष्ट करू आओर जारी राखबाक लेल \"ठीक\" दाबू."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "डिस्कक अद्यतन करैत अछि"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "अद्यतन डिस्क आरोहणमे असफल"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "अद्यतन"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "एनाकोंडा अद्यतनसभकेँ पढ़ि रहल अछि..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6025,45 +6025,45 @@ msgstr ""
 "किकस्टार्ट फाइल डाउनलोड करबामे असमर्थ. नीच्चाँ किकस्टार्ट पैरामीटर निर्दिष्ट करू अथवा "
 "एकटा अंतःक्रियात्मक अधिष्ठापन क' लेल आगाँ बढ़ू."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "किकस्टार्ट फाइल डाउनलोड करबामे त्रुटि"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "एहि मसीन पर %s अधिष्ठापित करबाक लेल पर्याप्त RAM नहि अछि."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "बचाव विधि"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "अधिष्ठापन विधि"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "कओन प्रकार क' माध्यममे सुरक्षा बिंब समाहित अछि?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "कओन प्रकार क' माध्यममे अधिष्ठापन क' लेल संकुल समाहित अछि. "
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "कोनो चालक नहि भेटल"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "चालक चुनू"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "एकटा चालक डिस्कक प्रयोग करू"
 
-#: ../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?"
@@ -6071,11 +6071,11 @@ msgstr ""
 "एहि अधिष्ठापन प्रकार क' लेल आवश्यक कोनो युक्तिसभ प्रकार पाबैमे असमर्थ. की अहाँ चालककेँ "
 "दस्ती रूपसँ चुननाइ चाहैत छी अथवा एकटा चालक डिस्कक उपयोग कएनाइ चाहैत छी?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "निम्नांकित युक्तिसभ अहाँक सिस्टम पर भेटल अछि."
 
-#: ../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?"
@@ -6083,49 +6083,49 @@ msgstr ""
 "कोनो युक्ति चालक अहाँक सिस्टम पर भारित नहि भेल अछि. की आब अहाँ कोनो क' भारण कएनाइ "
 "पसिन्न करबे?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "युक्तिसभ"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "संपन्न"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "युक्ति जोड़ू"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "भारक पहिले चलाओल जाए चुकल अछि.  शैल प्रारंभ कए रहल अछि.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "एनाकोंडा चलाए रहल अछि. %s बचाव मोड - कृप्या प्रतीक्षा करू...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "एनाकोंडा चलाए रहल अछि. %s सिस्टम अधिष्ठापक - कृप्या प्रतीक्षा करू...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "%s अधिष्ठापन बिंब खोजएमे असमर्थ"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\"केँ जाँचि कए रहल अछि...."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "आब माध्यमक जाँचि कएल जाए रहल अछि......"
 
-#: ../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."
@@ -6133,7 +6133,7 @@ msgstr ""
 "प्राथमिक आयतन निरूपक सँ डिस्क checksum पढ़एमे असमर्थ. प्रायः एकर अर्थ भ' सकैत अछि जे "
 "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 "
@@ -6143,18 +6143,18 @@ msgstr ""
 "अछि. जँ लागू हुए, कृप्या डिस्क साफ करू आओर पुनः प्रयास करू. जँ ई जाँच लगातार असफल अछि. "
 "अहाँ अधिष्ठापन जारी नहि राखू."
 
-#: ../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"
@@ -6165,21 +6165,21 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "चेकसम परीक्षा"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "%s युक्ति किकस्टार्ट प्रक्रिया कमांडकेँ अदलाह तर्क: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "मॉड्यूल प्रकार आओर नामकेँ किकस्टार्ट युक्ति कमांड क' लेल निर्दिष्ट कएल जाएत."
 
-#: ../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"
@@ -6187,7 +6187,7 @@ msgstr ""
 "उपसर्गकेँ जरूर IPv4 संजाल क' लेल 1 आओर 32 क' बीच अथवा IPv6 संजाल क' लेल 1 आओर 128 क' "
 "बीच होनाइ चाही"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6198,27 +6198,27 @@ msgstr ""
 "आओर गोपन कुँजी उपलब्ध कराबू.  जँ कुँजीक जरूरत नहि अछि. एहि क्षेत्रकेँ खाली छोड़ू आओर "
 "अधिष्ठापन केँ जारी रहए दिअ'."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "गोपन कुँजी"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "बेतार जमावट"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "नामसर्वर IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "गुम नामसर्वर"
 
-#: ../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 "
@@ -6228,56 +6228,56 @@ msgstr ""
 "छल. जँ अहाँक पास ई सूचना नहि अछि. अहाँ एहि क्षेत्रकेँ खाली छोड़ि सकैत छी आओर अधिष्ठापन "
 "जारी करताह."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "अमान्य IP जानकारी"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "अहाँने एकटा अमान्य IP पता देल अछि."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "संजाल त्रुटि"
 
-#: ../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 "अहाँक संजाल अंतरफलक बिन्यासनमे एकटा त्रुटि छल."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP क' बिन्यास करू"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "अहाँक कम सँ कम एकटा प्रोटोकॉल (IPv4 अथवा IPv6) जरूर चुननाइ चाही."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 NFS क' लेल जरूरी"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS अधिष्ठापन विधि क' लेल IPv4 समर्थन जरूरी."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 पता:"
 
-#: ../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 पता:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "नामसर्वर:"
 
-#: ../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 "
@@ -6287,42 +6287,42 @@ msgstr ""
 "quad नेटमास्क अथवा CIDR-शैली उपसर्ग स्वीकार्य अछि. गेटवे आओर नेमसर्वर क्षेत्रकेँ जरूर वैध "
 "IPv4 अथवा IPv6 पता रहनाइ चाही."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "दस्ती TCP/IP बिन्यास"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "जानकारी गुमल"
 
-#: ../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 "अहाँ जरूर एकटा वैध IPv4 पता आओर संजाल मास्क अथवा CIDR प्रत्यय प्रविष्ट करू."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "अहाँक जरूर वैध IPv6 पता आओर CIDR उपसर्ग दुनू क' लेल देनाइ चाही."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "मेजबाननाम आओर डोमेन निर्धारित कए रहल अछि..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "%s किकस्टार्ट संजाल कमांडकेँ अदलाह तर्क: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "सँजाल कमांडमे बेकार %s बूटप्रोटो निर्दिष्ट अछि"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "सँजाल युक्ति"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6330,115 +6330,115 @@ msgstr ""
 "एहि सिस्टम पर अहाँक पास बहु संजाल युक्तिसभ अछि. अहाँ ककरासँ भ' कए अधिष्ठापन कएनाइ "
 "पसिन्न करब?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS सर्वर नामः"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s निर्देशिका:"
 
-#: ../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 व्यवस्था"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "बिनु DNS विन्यस्त कएल मेजबाननाम निर्दिष्ट"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "फिनु प्राप्त कए रहल अछि"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ओए निर्देशिका क' आरोहण सर्वर सँ नहि भ' सकल."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ओए निर्देशिकामे %s अधिष्ठापन तरू समाहित देखाइ नहि देत अछि."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "%s NFS किकस्टार्ट विधि कमांडकेँ अदलाह तर्क: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "टेलनेट"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "टेलनेट संबंधन क' लेल प्रतीक्षा कए रहल अछि..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "एनाकोंडा द्वारा टेलनेट चलाए रहल अछि...."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s पुनःप्राप्तिमे असमर्थ ://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "अधिष्ठापन बिंब पुनःप्राप्तिमे असमर्थ."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr " %s Url किकस्टार्ट विधि कमांडकेँ अदलाह तर्क: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url किकस्टार्ट विधिकेँ एकटा --url तर्क अवश्य दिअ'."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "अज्ञात 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 "TCP/IP क' बिन्यास करू"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS व्यवस्था"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "अहाँ एकटा निर्देशिका अवश्य दिअ'."
 
-#: ../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 "अज्ञातमेजबान"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s एकटा उचितमेजबाननाम नहि अछि. "
 
-#: ../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."
@@ -6446,24 +6446,24 @@ msgstr ""
 "जँ अहाँ एकटा HTTP प्राक्सी सर्वर प्रयोग कए रहल छी तँ प्रयोग क' लेल HTTP प्राक्सी सर्वरक "
 "नाम दाखिल करू."
 
-#: ../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 "अगिला FTP व्यवस्था "
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI चालन भारित कए रहल अछि"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s चालक लोड कए रहल अछि..."
diff --git a/po/mk.po b/po/mk.po
index 673cda88e..bd23434b6 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -54,41 +54,41 @@ msgstr "За конзола притиснете <enter>"
 #: ../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 "Во ред"
 
@@ -593,22 +593,22 @@ msgstr "Форматирање на %s датотечниот систем..."
 #: ../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 "Грешка"
 
@@ -664,8 +664,8 @@ msgstr ""
 "Притиснете <Enter> излез од инсталерот."
 
 #: ../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 "Прескокни"
 
@@ -999,21 +999,21 @@ msgstr "Поправи"
 
 #: ../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 "Да"
 
 #: ../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 "Не"
 
-#: ../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 "Обиди се повторно"
 
@@ -1024,8 +1024,8 @@ msgstr "Игнорирај"
 #: ../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 "Откажи"
 
@@ -1902,21 +1902,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 "Назад"
 
 #: ../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 "Продолжи"
 
@@ -2358,7 +2358,7 @@ msgstr "Ве молам внесете го Вашиот %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Прескокни го внесувањето %(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 "Добредојдовте во %s"
@@ -3259,7 +3259,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Избор на јазик"
 
-#: ../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 "Кој јазик сакате да го користите при инсталацијата?"
 
@@ -3637,7 +3637,7 @@ msgstr "Потребна е вредност за полето „%s“."
 msgid "Dynamic IP"
 msgstr "Динамичка 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 "Испраќам барање за информација за IP за %s..."
@@ -3808,7 +3808,7 @@ msgstr "непознато"
 msgid "Hardware address: "
 msgstr "Хардверска адреса: "
 
-#: ../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 "Недостасува протокол"
 
@@ -3817,7 +3817,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Мора да изберете барем IPv4 или IPv6 подршка."
 
 #: ../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 "Невалиден префикс"
 
@@ -4056,7 +4056,7 @@ msgstr "RAID уреди"
 msgid "None"
 msgstr "Ништо"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Тврди дискови"
 
@@ -4979,12 +4979,12 @@ msgstr "Префикс"
 msgid "Activate on boot"
 msgstr "Активирај при подигнување на системот"
 
-#: ../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 "Овозможи „IPv4“  поддршка"
 
-#: ../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 "Овозможи „IPv4“ поддршка"
@@ -5105,7 +5105,7 @@ msgstr "Авто. 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 "Премин:"
 
@@ -5726,22 +5726,22 @@ 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 "Проверка на медиумот"
 
-#: ../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 "Тест"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Извади го дискот"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5750,7 +5750,7 @@ msgstr ""
 "Одберете „%s“ за да го тестирате дискот во уредот, или „%s“ за да го "
 "извадите дискот и да внесете друг за тестирање."
 
-#: ../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 "
@@ -5765,7 +5765,7 @@ msgstr ""
 "за инсталација за прв пат. Откако успешно ќе се тестираат, не е потребно да "
 "ги тестиратесите дискови одделно."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5774,11 +5774,11 @@ msgstr ""
 "Дискот %s не беше пронајден во ниеден од Вашите уреди. Ве молам внесете го "
 "дискот %s и притиснете %s за да пробате повторно."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Дискот е пронајден"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5789,7 +5789,7 @@ msgstr ""
 "\n"
 "Одберете %s за да го прескокнете тестот и да ја започнете инсталацијата."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5798,7 +5798,7 @@ msgstr ""
 "Не беше пронајден %s дискот кое што се совпаѓа со медиумот за подигнување.  "
 "Ве молам внесете го дискот %s и притиснете %s за да пробате повторно."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5807,32 +5807,32 @@ msgstr ""
 "Дискот %s не беше пронајден во ниеден од Вашите уреди. Ве молам внесете го "
 "дискот %s и притиснете %s за да пробате повторно."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Дискот не е пронајден"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Не можам да ја најдам датотеката за kickstart на 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 "Не успеав да го прочитам директориумот %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Вчитувам"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Го читам дискот со драјвер..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Извор на дискот со драјвер"
 
-#: ../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?"
@@ -5840,7 +5840,7 @@ msgstr ""
 "Имате повеќе уреди од кои можат да послужат како драјвер диск.  Кој од нив "
 "сакате да го употребите?"
 
-#: ../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?"
@@ -5848,52 +5848,52 @@ msgstr ""
 "Постојат повеќе партиции на овој уред кои што го содржат драјверот за "
 "сликата од дискот.  Која сакате да ја користите?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Не успеав да ја монтирам партицијата."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Одберете слика на дискот со драјвер"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "Не успеав да го вчитам дискот со драјвер од датотека."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Внесете го Вашиот диск со драјвери во /dev/%s и притиснете „Во ред“ за да "
 "продолжите."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Внесете диск со драјвери"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Не успеав да го монтирам дискот со драјвери."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Дискот со драјвери е невалиден за ова издание на %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Изберете рачно"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Вчитај друг диск"
 
-#: ../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 "
@@ -5903,38 +5903,38 @@ msgstr ""
 "сакатерачно да го изберете драјверот, да продолжите или да вчитате друг "
 "дисксо драјвери?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Диск со драјвер"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Дали имате диск со драјвери?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Уште дискови со драјвери?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Дали сакате да вчитате уште дискови со драјвери?"
 
-#: ../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"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Непознат извор на дискот со драјвери за kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5943,7 +5943,7 @@ msgstr ""
 "Следниов аргумент беше одреден за командата на дискот со драјвер за "
 "kickstart: %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 "
@@ -5954,19 +5954,19 @@ msgstr ""
 "модулот %sодделени со запирки.  Ако не знаете кои параметри да ги дадете, "
 "прескокнете го овој екрансо притискање на копчето „Во ред“."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Внесете ги параметрите за модулот"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Не беа пронајдени драјвери"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Вчитај диск со драјвер"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5974,7 +5974,7 @@ msgstr ""
 "Не беа пронајдени драјвери за рачно внесување.  Дали сакате да пробате со "
 "диск со драјвери?"
 
-#: ../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."
@@ -5982,26 +5982,26 @@ msgstr ""
 "Ве молам одберете го драјверот кој што сакате да го вчитате.  Доколку тој не "
 "се појави, а Вие имате диск со драјвер, притиснете F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Одреди додатни аргументи за модулите"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Одберете драјвер за уредот за вчитување"
 
-#: ../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 "Детектиран уред"
 
-#: ../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 "Детектиран е локален инсталационен уред..."
 
-#: ../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 "
@@ -6010,7 +6010,7 @@ msgstr ""
 "Инсталационото %s дрво во тој директориум не се совпаѓа со Вашиот медиум за "
 "подигнување."
 
-#: ../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."
@@ -6018,7 +6018,7 @@ msgstr ""
 "Се појави грешка при читање на инсталацијата од ISO сликите. Ве молам "
 "проверете ги ISO сликите и пробајте повторно."
 
-#: ../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?"
@@ -6026,7 +6026,7 @@ msgstr ""
 "Изгледа дека немате тврди дискови на Вашиот систем! Дали сакате да "
 "конфигурирате додатни уреди?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6036,62 +6036,62 @@ msgstr ""
 "Во која партиција се CD (iso9660) сликите за %s? Ако не го гледате дискот "
 "кој го користите овде, притиснете на F2 за конфигурирање на додатни уреди."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Директориум со слики:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Одбери партиција"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Уредот %s изгледа дека не содржи %s CD-ROM слики."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Лош параметар во метод командата на ХД кикстарт %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 "Не можам да ја најдам датотеката за kickstart на тврдиот диск."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Не можам да го најдам тврдиот диск за BIOS дискот %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Вид на тастатура"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Каков вид на тастатура имате?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Грешка при отворање на датотеката за kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Грешка при читање на содржините од датотеката за kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Грешка во %s на линијата %d од датотеката за kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Не можам да го пронајдам ks.cfg на дискетата за подигнување."
 
-#: ../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."
@@ -6100,53 +6100,53 @@ msgstr ""
 "kickstart параметрот подолу или притиснете на „Откажи“ за да продолжите со "
 "интерактивната инсталација."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Грешка при преземање на датотеката за kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Лош параметар за исклучување на метод командата на кикстарт %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Добредојдовте во %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> движење помеѓу елементи  | <Space> одбира | <F12> следен "
 "екран "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Одберете јазик"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Локален CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Тврд диск"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS директориум"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Добредојдовте во %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Извор за диск за надградба"
 
-#: ../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?"
@@ -6154,7 +6154,7 @@ msgstr ""
 "Имате повеќе уреди кои што би можеле да служат како извори за диск за "
 "надградба.  Кои сакате да ги користите?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6163,30 +6163,30 @@ msgstr ""
 "Постојат повеќе партиции на овој уред кои што го содржат драјверот за "
 "сликата од дискот.  Која сакате да ја користите?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Внесете го Вашиот диск со надградби во /dev/%s и притиснете \"Во ред\" за да "
 "продолжите."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Диск со надградби"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Не успеав да го монтирам дискот со надградби"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Надградби"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Ги читам надградбите за anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6196,46 +6196,46 @@ msgstr ""
 "kickstart параметрот подолу или притиснете на „Откажи“ за да продолжите со "
 "интерактивната инсталација."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Грешка при преземање на датотеката за kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Немате доволно RAM за да инсталирате %s на оваа машина."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Метод за спасување"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Метод на инсталација"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Кој тип на медиум ја содржи сликата за спасување?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 "Кој тип на медиум ги содржи пакетите кои што треба да бидат инсталирани?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Не беа пронајдени драјвери"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Одбери драјвер"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Користи диск со драјвери"
 
-#: ../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?"
@@ -6243,11 +6243,11 @@ msgstr ""
 "Не можам да пронајдам уреди потребни за овој тип на инсталација.  Дали "
 "сакате рачно да одберете драјвер или пак да внесете диск со драјвер?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Следниве уреди беа најдени на Вашиот систем."
 
-#: ../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?"
@@ -6255,51 +6255,51 @@ msgstr ""
 "Не се вчитани никакви драјвери за уредите на Вашиот систем.  Дали сакате да "
 "ги вчитате сега?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Уреди"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Завршено"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Додај уред"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "подигнувачот е веќе извршен.  Подигнувам школка.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "Ја извршувам anaconda, %s во режим за спасување - ве молам почекајте...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Ја извршувам anaconda, %s системскиот инсталер - ве молам почекајте...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Не можам да ја најдам сликата за инсталација %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Проверувам „%s“..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Сега ги проверувам медиумите..."
 
-#: ../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."
@@ -6308,7 +6308,7 @@ msgstr ""
 "примарниот простор.  Ованајверојатно значи дека дискот беше креиран без "
 "додавање на проверка на сума."
 
-#: ../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 "
@@ -6319,18 +6319,18 @@ msgstr ""
 "повторно. Доколку овој тест не успее уште еднаш не треба да продолжувате со "
 "инсталирањето."
 
-#: ../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"
@@ -6341,21 +6341,21 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Тест за проверка на податоците"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Лош аргумент на командата за kicksatart методот %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "За командата за kickstart уредот мора да се одреди и типот и името,"
 
-#: ../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"
@@ -6363,7 +6363,7 @@ msgstr ""
 "Префиксот треба да е помеѓу 1 и 32 за IPv4 мрежи или помеѓу 1 и 128 заIPv6 "
 "мрежи"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6374,27 +6374,27 @@ msgstr ""
 "енкрипција потребен за да пристапите на вашата безжична мрежа.  Доколку нема "
 "потреба од клуч, оставете го полето празно и инсталацијата ќе продолжи."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Клуч за енкрипција"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Безжични подесувања"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP на сервер за имиња"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Недостасува сервер за имиња"
 
-#: ../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 "
@@ -6405,56 +6405,56 @@ msgstr ""
 "за имиња, внесете го сега, или пак оставете го тоа поле празно и продолжете "
 "со инсталацијата."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Невалидна IP информација"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Внесовте невалидна IP адреса."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Мрежна грешка"
 
-#: ../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 "Се појави грешка при конфигурирањето на Вашиот мрежен интерфејс."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Конфигурација на TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Мора да одберете најмалку еден протокол (IPv4 или IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "„IPv4“ потребно за „NFS“"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Методот за инсталација со NFS бара IPv4 поддршка."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 адреса:"
 
-#: ../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 адреса:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Сервер за имиња:"
 
-#: ../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 "
@@ -6464,43 +6464,43 @@ msgstr ""
 "прифатливи се нет маска со четири точки или префикс од стилот CIDR. Полињата "
 "на серверотза премин и за имиња мора да биде валидна IPv4 или IPv6 адреса."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Рачна конфигурација на TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Недостасува информација"
 
-#: ../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 ""
 "Мора да внесете валидна IPv4 адреса и мрежна маска или пак CIDR префикс."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Мора да внесете валидна IPv6 адреса и CIDR префикс."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Одредувам име на хост и домен..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Лош аргумент за мрежната команда за kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Лош bootproto %s одреден во мрежната команда"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Уред за поврзување во мрежа"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6508,115 +6508,115 @@ msgstr ""
 "Имате повеќе мрежни уреди на овој систем. Преку кој од нив сакате да "
 "инсталирате?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Име на NFS сервер:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s директориум:"
 
-#: ../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 поставки"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Името на хостот е одредено без конфигурирање на DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Повторно обид"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Директориумот не може да биде монтиран од серверот."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Тој директориум изгледа дека не го содржи инсталационото дрво за %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Лош аргумент на командата за NFS kickstart методот: %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 "Чекам за воспоставување на врската преку telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Подигнување на програмата anaconda преку telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Не можам да вратам %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Не можам да ја вратам инсталационата слика."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Лош аргумент на командата за url kickstart методот %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Морате да му додадете аргумент --url на kickstart методот."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Непозната 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 "Конфигурација на TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS поставки"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Мора да го внесете директориумот."
 
-#: ../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 "Непознат хост"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s е невалиден хост."
 
-#: ../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."
@@ -6624,24 +6624,24 @@ msgstr ""
 "Доколку користите HTTP прокси сервер, внесете го името на HTTP прокси "
 "серверот за употреба."
 
-#: ../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 "FTP за понатамошно поставување"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Во вчитувам драјверот за SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Вчитувам %s драјвер..."
diff --git a/po/ml.po b/po/ml.po
index cdf735358..3d4cdedfa 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -53,41 +53,41 @@ msgstr "ഒരു ഷെല്ലിനായി <enter> അമറ്‍ത്�
 #: ../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 "ശരി"
 
@@ -573,22 +573,22 @@ msgstr "%s-ലുള്ള ഫയല്‍സിസ്റ്റമിന്റ�
 #: ../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 "തെറ്റ്"
 
@@ -643,8 +643,8 @@ msgstr ""
 "ഇന്‍സ്റ്റോളറില്‍ നിന്നും പുറത്ത് കടക്കുന്നതിനായി <Enter> അമറ്‍ത്തുക."
 
 #: ../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 "വിട്ടുകളയുക"
 
@@ -974,21 +974,21 @@ msgstr "ശരിയാക്കുക"
 
 #: ../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 "ഉവ്വ്"
 
 #: ../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 "ഇല്ല"
 
-#: ../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 "വിണ്ടും ശ്രമിക്കുക"
 
@@ -999,8 +999,8 @@ msgstr "അവഗണിക്കുക"
 #: ../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 "റദ്ദാക്കുക"
 
@@ -1865,21 +1865,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 "പുറകോട്ട്"
 
 #: ../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 "മുന്നോട്ട് പോവുക"
 
@@ -2309,7 +2309,7 @@ msgstr "നിങ്ങളുടെ %(instkey)s നല്‍കുക"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s നല്‍കുന്നത് ഉപേക്ഷിക്കുക"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s ലേക്ക് സ്വാഗതം, %s-നായി"
@@ -3204,7 +3204,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "ഭാഷ തിരഞ്ഞെടുക്കുക"
 
-#: ../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 "ഇന്‍സ്റ്റലേഷനുവേണ്ടി നിങ്ങള്‍ ആഗ്രഹിക്കുന്ന ഭാഷ ഏത്?"
 
@@ -3581,7 +3581,7 @@ msgstr "%s എന്ന ഫീല്‍ഡിന് മൂല്യം അനി
 msgid "Dynamic IP"
 msgstr "ഡൈനാമിക്ക് 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 "%sനുളള IP വിലരങ്ങള്‍ക്കായി റിക്ക്വസ്റ്റ് അയക്കുന്നു..."
@@ -3752,7 +3752,7 @@ msgstr "അപരിചിതം "
 msgid "Hardware address: "
 msgstr "ഹാറ്‍ഡ്‌വെയറിന്‍റെ വിലാസം: %s"
 
-#: ../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 "സന്പ്രദായം ലഭ്യമല്ല"
 
@@ -3761,7 +3761,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "നിങ്ങള്‍ IPv4 അല്ലെങ്കില്‍ IPv6-നുളള പിന്തുണ എങ്കിലും തിരഞ്ഞെടുക്കേണ്ടതുണ്ട്."
 
 #: ../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 "അസാധുവായ പ്രിഫിക്സ്"
 
@@ -3993,7 +3993,7 @@ msgstr "RAID ഡിവൈസുകള്‍"
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ഹാര്‍ഡ് ഡ്രൈവുകള്‍"
 
@@ -4891,12 +4891,12 @@ msgstr "പ്രിഫിക്സ്"
 msgid "Activate on boot"
 msgstr "ബൂട്ട് ചെയ്യുന്പോള്‍ ആക്റ്റിവേറ്റ് ആകുക"
 
-#: ../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 "IPv4-നുളള പിന്തുണ സജ്ജമാക്കുക"
 
-#: ../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 "IPv6-നുളള പിന്തുണ സജ്ജമാക്കുക"
@@ -5016,7 +5016,7 @@ msgstr "ഓട്ടോ 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 "ഗേറ്റ്വേ:"
 
@@ -5633,22 +5633,22 @@ 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 "മീഡിയ ചെക്ക്"
 
-#: ../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 "‍ടെസ്റ്റ്"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ഡിസ്ക് പുറത്തെടുക്കുക"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5657,7 +5657,7 @@ msgstr ""
 "നിലവില്‍ ഡ്രൈവിലുളള ഡിസ്ക് പരീക്ഷിക്കുന്നതിനായി \"%s\", അല്ലെങ്കില്‍, ഡിസ്ക് പുറത്തെടുത്ത് മറ്റൊന്ന് "
 "പരീക്ഷിക്കുന്നതിനായി \"%s\" തിരഞ്ഞെടുക്കുക."
 
-#: ../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 "
@@ -5671,7 +5671,7 @@ msgstr ""
 "ഉപയോഗിക്കുന്നതിന് മുന്പ് ഡിസ്കുകള്‍ പരിശോധിക്കുക, പിന്നീട് അവ ഉപയോഗിക്കുന്പോള്‍ പരീക്ഷുന്നതിന്‍റെ "
 "ആവശ്യമില്ല."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5680,11 +5680,11 @@ msgstr ""
 "നിങ്ങളുടെ ഒരു ഡ്രൈവുകളിലും %s ഡിസ്ക് ലഭ്യമായില്ല. ദയവായി %s എന്ന ഡിസ്ക് ഡ്രൈവില്‍ ഇട്ട് %s "
 "അമര്‍ത്തി വീണ്ടും ശ്രമിക്കുക."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ഡിസ്ക് കണ്ടുകിട്ടി"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5695,7 +5695,7 @@ msgstr ""
 "\n"
 "മീഡിയാ പരീക്ഷണം ഉപേക്ഷിച്ച് ഇന്‍സ്റ്റലേഷന്‍ തുടങ്ങുന്നതിനായി %s തിരഞ്ഞെടുക്കുക."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5704,7 +5704,7 @@ msgstr ""
 "നിങ്ങളുടെ ബൂട്ട് മീഡിയായുമായി പൊരുത്തമുളള %s ഡിസ്ക് ലഭ്യമായില്ല. ദയവായി %s എന്ന ഡിസ്ക് "
 "ഡ്രൈവില്‍ ഇട്ട് %s അമര്‍ത്തി വീണ്ടും ശ്രമിക്കുക."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5713,39 +5713,39 @@ msgstr ""
 "ഒരു CDROM ഡ്രൈവുകളിലും %s ഡിസ്ക് ലഭ്യമായില്ല. ദയവായി %s എന്ന ഡിസ്ക് ഡ്രൈവില്‍ ഇട്ട് %s "
 "അമര്‍ത്തി വീണ്ടും ശ്രമിക്കുക."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ഡിസ്ക് കണ്ടുകിട്ടിയില്ല"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "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 "%s ഡയറക്ടറി റീഡ് ചെയ്യുന്നതില്‍ പിഴവ്: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "ലോഡിംങ്"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "റീഡര്‍ സിസ്ക്ക് റീഡ് ചെയ്യുന്നു..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ഡ്രൈവര്‍ ഡിസ്ക്ക് സോഴ്സ്"
 
-#: ../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?"
 msgstr ""
 "ഒരു ഡ്രൈവര്‍ ഡിസ്കിന് ഉറവിടമായി അനേഘം ഡിവൈസുകള്‍ ലഭ്യമാണ്.  നിങ്ങള്‍ക്ക് ഇതില്‍ ഏത് ഉപയോഗിക്കണം?"
 
-#: ../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?"
@@ -5753,49 +5753,49 @@ msgstr ""
 "ഈ ഡിവൈസില്‍ ഡ്രൈവര്‍ ഡിസ്ക് ഇമേജ് അടങ്ങുന്ന അനവധി പാര്‍ട്ടീഷനുകള്‍ ലഭ്യമാണ്.  നിങ്ങള്‍ക്ക് ഇതില്‍ ഏത് "
 "തിരഞ്ഞെടുക്കണം?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "പാര്‍ട്ടീഷന്‍ മൌണ്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ഡ്രൈവര്‍ ഡിസ്ക്ക് ഇമേജ് തിരഞ്ഞെടുക്കുക"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ഫയലില്‍ നിന്നും ഡ്രൈവര്‍ ഡിസ്ക് ലോഡ് ചെയ്യുന്നതില്‍ പരാജയം."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "/dev/%s-ലേക്ക് നിങ്ങളുടെ ഡ്രൈവര്‍ ഡിസ്ക് ഇട്ട്, തുടരുന്നതിനായി \"ശരി\" അമര്‍ത്തുക."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ഡ്രൈവര്‍ ഡിസ്ക്ക് നിക്ഷേപിക്കുക"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ഡ്രൈവര്‍ ഡിസ്ക്ക് മൌണ്ട് ചെയ്യുന്നതില്‍ പിഴവ്"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s-ന്‍റെ ഈ റിലീസിന് ഡ്രൈവര്‍ ഡിസ്ക് അസാധുവാണ്."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "കംപ്യൂട്ടര്‍ തനിയെ തിരഞ്ഞെടുക്കുക"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "മറ്റൊരു ഡിസ്ക്ക് ലോഡ് ചെയ്യുക"
 
-#: ../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 "
@@ -5804,45 +5804,45 @@ msgstr ""
 "ശരിയായ രീതിയിലുളള ഡിവൈസുകള്‍ നിങ്ങളുടെ ഡ്രൈവര്‍ ഡിസ്കില്‍ ലഭ്യമായില്ല. നിങ്ങള്‍ക്ക് സ്വയം ഒരു "
 "ഡ്രൈവര്‍ തിരഞ്ഞെടുത്ത് തുടരണമോ അതോ മറ്റൊരു ഡിസ്ക് ലോഡ് ചെയ്യണമോ?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ഡ്രൈവര്‍ ഡിസ്ക്ക് "
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "നിങ്ങള്‍ക്ക് ഒരു ഡ്രൈവര്‍ ഡിസ്ക്ക് ഉണ്ടോ?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "കൂടുതല്‍ ഡ്രൈവര്‍ ഡിസ്ക്ക് ഉണ്ടോ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "നിങ്ങള്‍ ഇനിയും ഡ്രൈവര്‍ ഡിസ്ക്കുകള്‍ ലോഡ് ചെയ്യണമോ?"
 
-#: ../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 "കിക്ക് സ്റ്റാര്‍ട്ടില്‍ പിഴവ്"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "അപരിചിതമായ ഡ്രൈവര്‍ ഡിസ്കിന്‍റെ കിക്ക് സ്റ്റാര്‍ട്ട് ഉറവിടം: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "കിക്ക് സ്റ്റാര്‍ട്ട് ഡ്രൈവര്‍ ഡിസ്ക് കമാന്‍ഡിനായി കൊടുത്തിരുന്ന തെറ്റായ ആര്‍ഗ്യുമെന്‍റ്: %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 "
@@ -5853,26 +5853,26 @@ msgstr ""
 "ദയവായി നല്‍കുക.  നിങ്ങള്‍ക്ക് ഏത് പരാമീറ്ററുകള്‍ നല്‍കണം എന്നറിയില്ല എങ്കില്‍, \"ശരി\" എന്ന ബട്ടണ്‍ "
 "അമര്‍ത്തി ഈ സ്ക്രീന്‍ മറികടക്കുക."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "ഘടകത്തിനുളള പരാമീറ്ററുകള്‍ നല്‍കുക"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ഡ്രൈവറുകള്‍ ലഭ്യമല്ല"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ഡ്രൈവര്‍ ഡിസ്ക്ക് ലോഡ് ചെയ്യുക"
 
-#: ../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 ""
 "നിങ്ങള്‍ക്ക് സ്വയം ചേര്‍ക്കുന്നതിനായി ഡ്രൈവുകള്‍ ലഭ്യമല്ല.  നിങ്ങള്‍ക്ക് ഒരു ഡ്രൈവര്‍ ഡിസ്ക് ഉപയോഗിക്കണമോ?"
 
-#: ../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."
@@ -5881,33 +5881,33 @@ msgstr ""
 "നിങ്ങള്‍ക്ക് ആവശ്യമുളളത് ഇവിടെ ലഭ്യമല്ല, മാത്രമല്ല നിങ്ങളുടെ പക്കല്‍ ഒരു ഡ്രൈവര്‍ ഡിസ്ക് ഉണ്ട് എങ്കില്‍ "
 "ദയവായി F2 അമര്‍ത്തുക."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "മറ്റ് ഘടക ആര്‍ഗ്യുമെന്‍റുകള്‍ വ്യക്തമാക്കുക"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "ലോഡ് ചെയ്യുന്നതിനായി ഡിവൈസ് ഡ്രൈവര്‍ തിരഞ്ഞെടുക്കുക"
 
-#: ../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 "മീഡിയ കണ്ടുകിട്ടി"
 
-#: ../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 "ലോക്കല്‍ ഇന്‍സ്റ്റലേഷന്‍ മീഡിയ കണ്ടുകിട്ടി..."
 
-#: ../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 "
 "media."
 msgstr "പറഞ്ഞിരിക്കുന്ന ഡയറക്ടറിയില്‍ ഉളള %s ഇന്‍സ്റ്റലേഷന്‍ ട്രീ ബൂട്ട് മീഡിയായുമായി പൊരുത്തമില്ല."
 
-#: ../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."
@@ -5915,14 +5915,14 @@ msgstr ""
 "ഇന്‍സ്റ്റോളില്‍ നിന്നും ISO ഇമേജുകള്‍ വായിക്കുന്നതില്‍ പിഴവ്. ദയവായി നിങ്ങളുടെ  ISO ഇമേജുകള്‍ "
 "ദയവായി പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക."
 
-#: ../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?"
 msgstr ""
 "നിങ്ങളുടെ സിസ്റ്റമില്‍ ഹാര്‍ഡ് ഡ്രൈവുകള്‍ ലഭ്യമല്ല! നിങ്ങള്‍ക്ക് അഡീഷണല്‍ ഡിവൈസുകള്‍ ക്രമീകരിക്കണമോ?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5933,61 +5933,61 @@ msgstr ""
 "അടങ്ങുന്നത് ? നിങ്ങള്‍ക്ക് ഡിസ്ക് ഡ്രൈവുകള്‍ ലഭ്യമല്ലെങ്കില്‍, ഇവിടെ കാണിച്ചിരിക്കുന്നവയാണ് നിങ്ങള്‍ "
 "ഉപയോഗിക്കുന്നത്. അഡീഷണല്‍ ഡിവൈസുകള്‍ ക്രമീകരിക്കണമെങ്കില്‍, F2 അമര്‍ത്തുക."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ഇമേജ് അടങ്ങുന്ന ഡയറക്ടറി:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "പാര്‍ട്ടീഷന്‍ തിരഞ്ഞെടുക്കുക"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "ഡിവൈസ് %s-ല്‍ %s CDROM ഇമേജുകള്‍ ലഭ്യമല്ല."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD കിക്ക് സ്റ്റാര്‍ട്ട് മാര്‍ഗ്ഗത്തിലുളള കമാന്‍ഡ് %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 "ഹാര്‍ഡ് ഡ്രൈവില്‍ കിക്ക് സ്റ്റാര്‍ട്ട് ഫയല്‍ ലഭ്യമല്ല."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS ഡിസ്ക് %s-നുളള ഹാര്‍ഡ് ഡ്രൈവ് ലഭ്യമല്ല"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "ഏത് തരം കീബോര്‍ഡ് ആണ് ഉപയോഗിക്കുന്നത"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "നിങ്ങളുടെ കീ ബോര്‍ഡ് ഏത് തരത്തിലുളളതാണ്?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "കിക്ക് സ്റ്റാര്‍ട്ട് ഫയല്‍ %s തുറക്കുന്നതില്‍ പിശക്: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "കിക്ക് സ്റ്റാര്‍ട്ട് ഫയല്‍ %s-ലുളള ഉളളടക്കം വായിക്കുന്നതില്‍ പിശക്: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "കിക്ക് സ്റ്റാര്‍ട്ട് ഫയല്‍ %s-ല്‍ %d-ആം വരിയിലുളള %s-ല്‍ പിശക്"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "മാറ്റുവാന്‍ സാധ്യമാകുന്ന മീഡിയായില്‍ ks.cfg ലഭ്യമല്ല."
 
-#: ../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."
@@ -5996,52 +5996,52 @@ msgstr ""
 "കിക്ക്സ്റ്റാറ്‍ട്ട് പരാമീറ്ററില്‍ മാറ്റം വരുത്തുക അല്ലെങ്കില്‍ ഒരു ഇന്‍ററാക്ടീവ് ഇന്‍സ്റ്റലേഷനായി "
 "റദ്ദാക്കുക എന്ന ബട്ടണ്‍ അമറ്‍ത്തുക."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "കിക്ക് സ്റ്റാര്‍ട്ട് ഫയല്‍ ഡൌണ്‍ലോട് ചെയ്യുന്നതില്‍ പിശക്"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "കിക്ക് സ്റ്റാര്‍ട്ട് കമാന്‍ഡ് %s അടച്ചു പൂട്ടുന്നതിനുളള ആര്‍ഗ്യുമെന്‍റ് തെറ്റാണ്: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s-ലേക്ക് സ്വാഗതം, %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> between elements  | <Space> selects | <F12> next screen "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ഒരു ഭാഷ തിരഞ്ഞെടുക്കുക"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "ലോക്കല്‍ CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ഹാര്‍ഡ് ഡ്രൈവ്"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS ഡയറക്ടറി"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n-ലേക്ക് സ്വാഗതം, %s-നായി"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "ഡിസ്കിന്‍റെ ഉറവിടം പുതുക്കുക"
 
-#: ../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?"
@@ -6049,7 +6049,7 @@ msgstr ""
 "ഒരു അപ്ഡേറ്റ് ഡിസ്കിന് ഉറവിടമായി നിങ്ങള്‍ക്ക് അനവധി ഡിവൈസുകള്‍ ലഭ്യമാണ്.  നിങ്ങള്‍ക്ക് ഇവയില്‍ ഏതാണ് "
 "ഉപയോഗിക്കേണ്ടത്?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6057,29 +6057,29 @@ msgstr ""
 "ഈ ഡിവൈസില്‍ പുതുക്കിയ ഡിസ്ക് ഇമേജ് അടങ്ങുന്ന അനവധി പാര്‍ട്ടീഷനുകള്‍ ലഭ്യമാണ്.  നിങ്ങള്‍ക്ക് ഇതില്‍ ഏത് "
 "തിരഞ്ഞെടുക്കണം?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "നിങ്ങളുടെ അപ്ഡേറ്റുകള്‍ ഉളള ഡിസ്ക് /dev/%s-ലേക്ക് ഇടുക. തുടരുന്നതിനായി \"ശരി\" അമര്‍ത്തുക."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "ഡിസ്ക്ക് അപ്ഡേറ്റ് ചെയ്യുക"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "അപ്ഡേറ്റുകളുടെ ഡിസ്ക് മൌണ്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "അപ്ഡേറ്റുകള്‍"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "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.."
@@ -6088,44 +6088,44 @@ msgstr ""
 "സ്ഥാനങ്ങളില്‍ മാറ്റം വരുത്തുക അല്ലെങ്കില്‍ പരിഷ്കാരങ്ങളില്ലാതെ മുമ്പോട്ട് പോകുന്നതിനായിറദ്ദാക്കുക "
 "എന്ന ബട്ടണ്‍ അമര്‍ത്തുക."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "പരിഷ്കരിച്ച ഇമേജ് ഡൌണ്‍ലോട് ചെയ്യുന്നതില്‍ പിശക്"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "ഈ കംപ്യൂട്ടറില്‍ %s ഇന്‍സ്റ്റോള്‍ ചെയ്യുന്നതിന് ആവശ്യമുളള RAM നിങ്ങള്‍ക്ക് ലഭ്യമല്ല."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "റെസ്ക്യൂ മെഥേഡ്"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "ഇന്‍സ്റ്റലേഷന്‍ മെഥേഡ്"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "റെസ്ക്യൂ ഇമേജ് ഏത് തരത്തിലുളള മീഡിയായില്‍ ലഭ്യമാണ്?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്യുവാനുളള പാക്കേജുകള്‍ ഏത് തരത്തിലുളള മീഡിയായില്‍ ലഭ്യമാണ്?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ഡ്രൈവര്‍ ലഭ്യമല്ല"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ഡ്രൈവര്‍ തിരഞ്ഞെടുക്കുക"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ഡ്രൈവര്‍ ഡിസ്ക്ക് ഉപയോഗിക്കുക"
 
-#: ../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?"
@@ -6133,11 +6133,11 @@ msgstr ""
 "ഈ ഇന്‍സ്റ്റലേഷന്‍ രീതിയ്ക്ക് ആവശ്യമുളള തരത്തിലുളള ഒരു ഡിവൈസുകളും ലഭ്യമല്ല.  നിങ്ങള്‍ക്ക് നിങ്ങളുടെ "
 "ഡ്രൈവര്‍ തനിയേ തിരഞ്ഞെടുക്കുകയോ ഒരു ഡ്രൈവര്‍ ഡിസ്ക് ഉപയോഗിക്കുകയോ ചെയ്യണമോ?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "ഇവയാണ് നിങ്ങളുടെ സിസ്റ്റത്തില്‍ ലഭ്യമായ ഡിവൈസുകള്‍."
 
-#: ../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?"
@@ -6145,49 +6145,49 @@ msgstr ""
 "നിങ്ങളുടെ സിസ്റ്റത്തിന് ആവശ്യമുളള ഡിവൈസ് ഡ്രൈവറുകള്‍ ലോഡ് ചെയ്തിട്ടില്ല. നിങ്ങള്‍ക്ക് അവ ഏതേലും "
 "ഇപ്പോള്‍ ലോഡ് ചെയ്യണമോ?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ഡിവൈസുകള്‍"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "ചെയ്ത് കഴിഞ്ഞിരിക്കുന്നു"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ഡിവൈസ് ചേര്‍ക്കുക"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ലോഡര്‍ പ്രവര്‍ത്തനത്തിലാണ്.  ഷെല്‍ ആരംഭിക്കുന്നു.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "അനക്കോന്‍ഡാ %s പ്രവര്‍ത്തിക്കുന്നു, %s റെസ്ക്യൂ മോഡ് - ദയവായി കാത്തിരിക്കുക...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "അനക്കോന്‍ഡാ %s പ്രവര്‍ത്തിക്കുന്നു, %s സിസ്റ്റം ഇന്‍സ്റ്റോളര്‍ - ദയവായി കാത്തിരിക്കുക...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "ഇന്‍സ്റ്റോള്‍ ഇമേജ്     %s ലഭ്യമല്ല"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" പരിശോധിക്കുന്നു..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "ഇപ്പോള്‍ മീഡിയ പരിശോധിക്കുന്നു..."
 
-#: ../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."
@@ -6195,7 +6195,7 @@ msgstr ""
 "പ്രൈമറി വോള്യം ഡിസ്ക്രിപ്റ്ററില്‍ നിന്നും ചെക്ക് സം വായിക്കുവാന്‍ സാധ്യമായില്ല.  ഇതിനര്‍ത്ഥം, "
 "ചെക്ക് സം ചേര്‍ക്കാതെയാണ് ഡിസ്ക് നിര്‍മ്മിച്ചത് എന്നാണ്."
 
-#: ../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 "
@@ -6205,11 +6205,11 @@ msgstr ""
 "കാരണം.  സാധ്യമെങ്കില്‍, ദയവായി ഡിസ്ക് വെടിപ്പാക്കി വീണ്ടും ശ്രമിക്കുക.  നിങ്ങളുടെ ഈ പരീക്ഷണം "
 "വീണ്ടും പരാജയപ്പെടുന്നു എങ്കില്‍, ദയവായി ഇന്‍സ്റ്റലേഷന്‍ നിര്‍ത്തുക."
 
-#: ../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 "
@@ -6219,7 +6219,7 @@ 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"
@@ -6230,20 +6230,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "ചെക്ക്സം ടെസ്റ്റ്"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "ഡിവൈസ് കിക്ക് സറ്റാര്‍ട്ട് മാര്‍ഗ്ഗത്തിനുളള കമാന്‍ഡ് %s-ന് തെറ്റായ ആര്‍ഗ്യുമെന്‍റ്: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "കിക്ക് സ്റ്റാര്‍ട്ട് ഡിവൈസ് കമാന്‍ഡിനായി ഒരു ഘടകത്തിന്റെ നാമം നല്‍കേണ്ടതാകുന്നു."
 
-#: ../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"
@@ -6251,7 +6251,7 @@ msgstr ""
 "IPv4 നെറ്റ്‍വര്‍ക്കള്‍ക്കുളള പ്രിഫിക്സ് 1-നും 32-നും മദ്ധ്യത്തിലും IPv6 നെറ്റ്‍വര്‍ക്കള്‍ 1-നും 128-നും "
 "മദ്ധ്യത്തിലും ആയിരിക്കേണ്ടതാണ്."
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6262,27 +6262,27 @@ msgstr ""
 "പ്രവേശിക്കുന്നതിനായി, ദയവായി ESSID-യും എന്‍ക്രിപ്ഷന്‍ കീയും നല്‍കുക.  കീ ആവശ്യമില്ലായെങ്കില്‍, ഈ "
 "ഫീള്‍ഡില്‍ ഒന്നും എഴുതേണ്ട, ഇന്‍സ്റ്റലേഷന്‍ തുടരുന്നുതാണ്."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "എന്‍ക്രിപ്ഷന്‍ കീ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "വൈര്‍ലസ്സ് സെറ്റിംങുകള്‍"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "നെയിംസര്‍വര്‍ IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "നെയിംസര്‍വര്‍ ലഭ്യമല്ല"
 
-#: ../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 "
@@ -6292,56 +6292,56 @@ msgstr ""
 "അതില്‍ ഒരു നെയിം സര്‍വര്‍ അടങ്ങുന്നില്ല. നിങ്ങള്‍ക്ക് അറിയില്ല എന്നുണ്ടെങ്കില്‍, ഈ ഫീള്‍ഡ് ശൂന്യമാക്കി "
 "ഇടുക, ഇന്‍സ്റ്റലേഷന്‍ തുടരുന്നതമാണ്."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "തെറ്റായ IP വിവരം"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "തെറ്റായ IP അഡ്രസ്സ് ആണ് നിങ്ങള്‍ എന്‍റര്‍ ചെയ്തിരിക്കുന്നത്."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "നെറ്റ്‍വര്‍ക്ക് പിശക്"
 
-#: ../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 "നിങ്ങളുടെ നെറ്റ്‍വര്‍ക്കിനുളള സംയോജക ഘടകം ക്രമീകരിക്കുന്നതില്‍ പിശക്."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP കോണ്‍ഫിഗര്‍ ചെയ്യുക"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "നിങ്ങള്‍ ഒരു സന്പ്രദായം (IPv4 അല്ലെങ്കില്‍ IPv6) എങ്കിലും തിരഞ്ഞെടുക്കേണ്ടതുണ്ട്."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS-ന് ആവശ്യമുളള IPv4"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS ഇന്‍സ്റ്റലേഷന്‍ രീതിയ്ക്ക് IPv4 പിന്തുണ ആവശ്യമുണ്ട്."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 അഡ്രസ്സ്:"
 
-#: ../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 അഡ്രസ്സ്:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "നെയിം സര്‍വര്‍:"
 
-#: ../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 "
@@ -6351,42 +6351,42 @@ msgstr ""
 "dotted-quad നെറ്റ്മാസ്ക് അല്ലെങ്കില്‍ CIDR-മാതൃകയിലുളള പ്റിഫിക്സ് സ്വീകാര്യമാണ്. ഗേറ്റ് വേയും "
 "നെയിം സറ്‍വറിനുമുളള ഫീള്‍ഡുകള്‍ IPv4 അല്ലെങ്കില്‍ IPv6 വിലാസങ്ങള്‍ക്ക് ശരിയായിരിക്കണം."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "മാനുവല്‍ TCP/IP കോണ്‍ഫിഗറേഷന്‍"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "ലഭ്യമല്ലാത്ത വിവരം"
 
-#: ../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 "നിങ്ങള്‍ ശരിയായ IPv4 അഡ്രസ്സും നെറ്റ്‍വര്‍ക്ക് മാസ്കും CIDR പ്രിഫിക്സും നല്‍കേണ്ടതാണ്."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "നിങ്ങള്‍ ശരിയായ IPv൬ വിലാസവും ഒരു CIDR പ്രിഫിക്സും നല്‍കേണ്ടതാണ്."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ഡൊമൈനും ഹോസ്റ്റ്നെയിമും കണ്ടുപിടിക്കുന്നു..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "നെറ്റ്‍വര്‍ക്ക് കമാന്‍ഡ് %s കിക്ക് സ്റ്റാര്‍ട്ട് ചെയ്യുന്നതിനായി തെറ്റായ ആര്‍ഗ്യുമെന്‍റ്: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "നെറ്റ്‍വര്‍ക്ക് കമാന്‍ഡില്‍ തെറ്റായ bootproto %s പറഞ്ഞിരിക്കുന്നു"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "നെറ്റ്വര്‍ക്കിങ് ഡിവൈസ്"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6394,112 +6394,112 @@ msgstr ""
 "നിങ്ങളുടെ സിസ്റ്റത്തില്‍ ഒന്നില്‍ കൂടുതല്‍ നെറ്റ്വര്‍ക്ക് ഡിവൈസുകള്‍ ലഭ്യമാണ്. ഏതില്‍ കൂടിയാണ് നിങ്ങള്‍ക്ക് "
 "ഇന്‍സ്റ്റോള്‍ ചെയ്യേണ്ടത്?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS സര്‍വര്‍ നെയിം:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ഡയറക്ടറി:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "ദയവായി സര്‍വറിന്റെ പേരും നിങ്ങളുടെ %s ഇമേജുകളിലേക്കുമുള്ള പാഥ് നല്‍കുക."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS സെറ്റപ്പ്"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS കോണ്‍ഫിഗര്‍ ചെയ്യാതെ ഹോസ്റ്റനെയിം പറഞ്ഞിരിക്കുന്നു"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "ലഭ്യമാക്കുന്നു"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "സര്‍വറില്‍ നിന്നും ഡയറക്ടറി മൌണ്ട് ചെയ്യുവാനായില്ല."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ഡയറക്ടറിയ്ക്ക് ഒരു %s ഇന്‍സ്റ്റലേഷന്‍ ട്രീ ലഭ്യമല്ല."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS കിക്ക്സ്റ്റാര്‍ട്ട് മെഥേഡ് കമാന്‍ഡ്  %sലേക്ക് തെറ്റായ ആര്‍ഗ്യുമെന്‍റ്: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "ടെല്‍നറ്റ്"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "ടെല്‍നറ്റ് കണക്ഷനായി കാത്തിരിക്കുന്നു..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "ടെല്‍നറ്റ് വഴി anaconda പ്രവര്‍ത്തിപ്പിക്കുന്നു..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ഇന്‍സ്റ്റോള്‍ ഇമേജ് ലഭ്യമാക്കുവാന്‍ അസാധ്യം."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "കിക്ക്സ്റ്റാര്‍ട്ട് മെഥേഡ് കമാന്‍ഡ്  %sലേക്ക് തെറ്റായ ആര്‍ഗ്യുമെന്‍റ് :%s് മെഥേഡിനായുളള --url "
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url കിക്ക്സ്റ്റാര്‍ട്ട് മെഥേഡിനായുളള --url ആര്‍ഗ്യുമെന്‍റ് കൊടുത്തിരിക്കണം."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "അപരിചിതമായ 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 "നിങ്ങളുടെ സര്‍വറില്‍ %s അടങ്ങുന്ന യുആര്‍എല്‍ ദയവായി നല്‍കുക."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "പ്രോക്സി ക്രമികരിക്കുക"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "യുആര്‍എല്‍ ക്രമികരണം"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "നിങ്ങള്‍ ഒരു യുആര്‍എല്‍ നല്‍കേണ്ടതാകുന്നു."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "യുആര്‍എല്‍ ഒന്നുകില്‍ ftp അല്ലെങ്കില്‍ http യുആര്‍എല്‍ ആയിരിക്കണം."
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "അപരിചിതമായ ഹോസ്റ്റ്"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s അസാധുവായ ഹോസ്റ്റ്നെയിം ആണ്."
 
-#: ../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."
@@ -6507,23 +6507,23 @@ msgstr ""
 "HTTP പ്രോക്സി സര്‍വര്‍ ആണ് നിങ്ങള്‍ ഉപയോഗിക്കുന്നത് എങ്കില്‍ ആ HTTP പ്രോക്സി സര്‍വറിന്‍റെ പേര് എന്‍റര്‍ "
 "ചെയ്യുക."
 
-#: ../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
 msgid "Further Setup"
 msgstr "കൂടുതല്‍ ക്രമികരണം"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ഡ്രൈവര്‍ ലോഡ് ചെയ്യുന്നു"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s എന്ന ഡ്രൈവര്‍ ലോഡ് ചെയ്യുന്നു..."
diff --git a/po/mr.po b/po/mr.po
index 4e08c9087..238fe7edb 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -52,41 +52,41 @@ msgstr "शेलसाठी <enter> दाबा"
 #: ../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 "ठीक "
 
@@ -558,22 +558,22 @@ msgstr "%s वरील फाइलप्रणालीस पुन्ह आ
 #: ../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 "चूक"
 
@@ -628,8 +628,8 @@ msgstr ""
 "तुमची प्रणाली रीबूट करण्यासाठी <Enter> दाबा."
 
 #: ../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 "टाळा"
 
@@ -958,21 +958,21 @@ msgstr "दुरूस्त करा"
 
 #: ../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 "होय"
 
 #: ../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 "नाही"
 
-#: ../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 "पुनः प्रयत्न"
 
@@ -983,8 +983,8 @@ msgstr "दुर्लक्ष करा"
 #: ../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 "रद्द करा"
 
@@ -1823,21 +1823,21 @@ msgid "_Write changes to disk"
 msgstr "डीस्कवरील बदलाव करीता लिहा (_W)"
 
 #: ../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 "मागे"
 
 #: ../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 "चालू ठेवा"
 
@@ -2246,7 +2246,7 @@ msgstr "कृपया %(instkey)s दाखल करा"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s दाखलन दूर्लक्ष्य करा"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s करीता %s वर आपले स्वागत आहे"
@@ -3122,7 +3122,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "भाषा निवड"
 
-#: ../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 "प्रतिष्ठापन प्रक्रिये दरम्यान तुम्हांस कोणती भाषा वापरायला आवडेल?"
 
@@ -3489,7 +3489,7 @@ msgstr "%s या क्षेत्रासाठी मूल्य हवे
 msgid "Dynamic IP"
 msgstr "गतिक 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 "%s च्या IP माहितीसाठी विनंती पाठवली जातेय..."
@@ -3660,7 +3660,7 @@ msgstr "अपरिचित"
 msgid "Hardware address: "
 msgstr "हार्डवेअर पत्ता: "
 
-#: ../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 "प्रोटोकॉल सापडत नाहीये"
 
@@ -3669,7 +3669,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "तुम्ही किमान IPv4 किंवा IPv6 निवडायला हवा."
 
 #: ../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 "अयोग्य पूर्वपद"
 
@@ -3899,7 +3899,7 @@ msgstr "RAID यंत्रे"
 msgid "None"
 msgstr "काही नाही"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "हार्ड ड्राइव्स"
 
@@ -4781,12 +4781,12 @@ msgstr "पूर्वपद"
 msgid "Activate on boot"
 msgstr "बूट होताना कार्यान्वीत करा"
 
-#: ../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 "IPv4 आधार कार्यान्वित करा"
 
-#: ../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 "IPv6 आधार कार्यान्वित करा"
@@ -4905,7 +4905,7 @@ msgstr "आपोआप 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 "गेटवे:"
 
@@ -5517,22 +5517,22 @@ 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 "माध्यम तपासणी"
 
-#: ../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 "कसोटी"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "सीडी बाहेर काढा"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5541,7 +5541,7 @@ msgstr ""
 "सध्या ड्राइवमध्ये असलली डीस्क तपासण्यासाठी \"%s\" निवडा, किंवा \"%s\" सीडी बाहेर "
 "काढून  दुसरी तपासण्यासाठी दाखल करण्यासाठी निवडा."
 
-#: ../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 "
@@ -5555,7 +5555,7 @@ msgstr ""
 "सीडी पहिल्या वेळी वापरण्यापुर्वी तपासलेली असावी. त्या यशस्वीपणे तपासून झाल्यानंतर, प्रत्येक "
 "सीडी पुन्हा वापरण्यापुर्वी तपासण्याची आवश्यकता नाही."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5564,11 +5564,11 @@ msgstr ""
 "%s डीस्क तुमच्या कोणत्याही ड्राइववर सापडली नाही. कृपया %s सीडी दाखल करा आणि पुन्हा "
 "प्रयत्न करण्यासाठी %s दाबा."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "डीस्क सापडली"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5579,7 +5579,7 @@ msgstr ""
 "\n"
 "माध्यम तपासणी टाळून प्रतिष्ठापन सुरू करण्यासाठी %s निवडा."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5588,7 +5588,7 @@ msgstr ""
 "तुमच्या बूट माध्यमाशी जुळणारी %s डीस्क सापडली नाही. कृपया %s डीस्क दाखल करा आणि पुन्हा "
 "प्रयत्न करण्यासाठी %s दाबा."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5597,32 +5597,32 @@ msgstr ""
 "%s डीस्क तुमच्या कोणत्याही CDROM ड्राइववर सापडली नाही. कृपया %s सीडी दाखल करा आणि "
 "पुन्हा प्रयत्न करण्यासाठी %s दाबा."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "डीस्क सापडली नाही"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "किकस्टार्ट फाइल 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 "निर्देशिका %s वाचण्यात अयशस्वी: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "भारित करतोय"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "चालक डिस्क वाचत आहे..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "चालक डिस्क स्रोत"
 
-#: ../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?"
@@ -5630,7 +5630,7 @@ msgstr ""
 "चालक डिस्कसाठी स्रोत म्हणून वापरण्यासारखी अनेक यंत्रे तुमच्याकडे आहेत. तुम्हास कोणते वापरणे "
 "आवडेल?"
 
-#: ../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?"
@@ -5638,49 +5638,49 @@ msgstr ""
 "चालक डिस्क प्रतिमा ज्यात असू शकते अशी अनेक विभाजने या यंत्रावर आहेत. त्यापैकी कोणते तुम्हास "
 "वापरायला आवडेल?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "विभाजन आरोहित करण्यात अयशस्वी."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "चालक डिस्क प्रतिमा निवडा"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "चालक डिस्क फाइलमधून भारित करण्यास अयशस्वी."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "तुमची चालक डिस्क /dev/%s मध्ये दाखल करा आणि पुढे जाण्यासाठी \"ठीक\" वर दाबा."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "चालक डिस्क दाखल करा"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "चालक डिस्क आरोहित करण्यात अपयश."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s च्या या प्रकाशनासाठी ड्राइवर डिस्क अवैध आहे."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "स्वहस्ते निवडा"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "वेगळी डिस्क भारित करा"
 
-#: ../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 "
@@ -5689,45 +5689,45 @@ msgstr ""
 "या चालक डिस्कवर योग्य प्रकारची यंत्रे सापडली नाही. तुम्हास स्वहस्ते चालक निवडणे, कसेही पुढे "
 "जाणे, किंवा वेगळी चालक डिस्क भारित करणे आवडेल काय?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "चालक डिस्क"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "तुमच्याकडे चालक डिस्क आहे का?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "आणखी चालक डिस्क?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "तुम्ही आणखी काही चालक डिस्क भारित करू इच्छिता?"
 
-#: ../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 "किकस्टार्ट चूक"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "अपरिचित चालक डिस्क किकस्टार्ट स्रोत: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "किकस्टार्ट चालक डिस्क आज्ञा %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 "
@@ -5737,25 +5737,25 @@ msgstr ""
 "कृपया तुम्ही %s विभागास देऊ इच्छित असलेले पॅरामीटर स्थानांद्वारे पृथक करून दाखल करावेत. जर "
 "तुम्हास माहित नाही कोणते पॅरामीटर द्यावे तर \"ठीक\" हे बटन दाबून हे पटल टाळा ."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "विभाग पॅरामीटर दाखल करा"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "चालक सापडले नाही"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "चालक डिस्क भारित करा"
 
-#: ../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 "स्वहस्ते दाखल करण्यासाठी चालक सापडले नाहीत? तुम्हास चालक डिस्क वापरायला आवडेल काय?"
 
-#: ../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."
@@ -5763,33 +5763,33 @@ msgstr ""
 "कृपया ज्या चालकाखाली भारित करायचे तो निवडा. जर तो दिसत नाहीये आणि तुमच्याकडे चालक "
 "डिस्क आहे, तर F2 दाबा."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "पर्यायी विभाग आर्ग्यूमेंट्स दर्शवा"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "भारित करायचा यंत्र चालक निवडा"
 
-#: ../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 "माध्यम शोधले"
 
-#: ../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 "स्थनिक प्रतिष्ठापन माध्यम शोधले..."
 
-#: ../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 "
 "media."
 msgstr "त्या निर्देशिकेमधील %s प्रतिष्ठापन वृक्ष तुमच्या बूट माध्यमाशी जुळत असल्याचे वाटत नाही."
 
-#: ../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."
@@ -5797,13 +5797,13 @@ msgstr ""
 "प्रतिष्ठापन ISO प्रतिमांमधून वाचताना चूक उद्भवली. कृपया तुमच्या ISO प्रतिमा तपासून पहा "
 "आणि पुन्हा प्रयत्न करा."
 
-#: ../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?"
 msgstr "तुमच्या प्रणालीवर एकही हार्ड ड्राइव असल्याचे वाटत नाही! तुम्हास अतिरिक्त यंत्रे रचणे आवडेल?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5814,61 +5814,61 @@ msgstr ""
 "निर्देशिकेत आहेत? जर तुम्ही वापरत असलेली डिस्क ड्राइव येथे निर्दिष्ट नसेल, तर अतिरिक्त "
 "यंत्रांची रचना करण्यासाठी F2 दाबा."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "प्रतिमा धारक निर्देशिका:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "विभाजन निवडा"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s यंत्रात %s CDROM प्रतिमा असल्याचे जाणवत नाही."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD किकस्टार्ट पद्धत आज्ञा %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 "किकस्टार्ट फाइल हार्ड ड्राइववर सापडू शकली नाही."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS डिस्क %s साठी हार्ड ड्राइव सापडू शकली नाही"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "कळफलक प्रकार"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "तुमच्याकडे कोणत्या प्रकारचा कळफलक आहे?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "किकस्टार्ट फाइल %s उघडताना चूक: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "किकस्टार्ट फाइल %s चा मजकूर वाचताना चूक: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "किकस्टार्ट फाइल %3$s च्या %2$d ओळीवर %1$s चूक."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "काढूण टाकण्याजोगी मिडीया वर ks.cfg शोधू शकत नाही."
 
-#: ../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."
@@ -5876,50 +5876,50 @@ msgstr ""
 "कीकस्टार्ट फाइल डाउनलोड करु शकला नाही.  कृपया खालील कीकस्टार्ट घटक संपादित करा किंवा "
 "संवादपटू प्रतिष्ठापनास रद्दा करा दाबा."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "किकस्टार्ट फाइल उघडताना चूक"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "किकस्टार्ट पद्धती आज्ञा %s ला बंद करण्यासाठी वाईट आर्ग्यूमेंट: %s "
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s करीता %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>तत्वांदरम्यान  | <Space> निवडतो | <F12> पुढील पटल "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "भाषा निवडा"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "स्थानिक CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "हार्ड ड्राइव"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS संचयीका"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%3$s करीता %1$s%2$n वर आपले स्वागत आहे"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "अपडेट डिस्क स्रोत"
 
-#: ../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?"
@@ -5927,7 +5927,7 @@ msgstr ""
 "अपडेट्स डिस्कचे स्रोत म्हणून वापरण्यासारखी अनेक यंत्रे तुमच्याकडे आहेत. तुम्हास कोणते वापरणे "
 "आवडेल?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -5935,28 +5935,28 @@ msgstr ""
 "अद्ययावत डीस्क प्रतिमा समाविष्टीत या साधनावर अनेक विभाजन आहेत.  तुम्हाला कुठले वापरायचे "
 "आहे?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "तुमची अपडेट्स डिस्क /dev/%s मध्ये दाखल करा आणि पुढे जाण्यासाठी \"ठीक\" दाबा ."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "अपडेट्स डिस्क"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "अपडेट्सची डिस्क आरोहित करण्यात अयशस्वी"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "अपडेट्स"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "ऍनाकोंडा अपडेट्स वाचतोय..."
 
-#: ../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.."
@@ -5964,44 +5964,44 @@ msgstr ""
 "अद्ययवात प्रतिमा डाउनलोड करता आले नाही.  कृपया खालील स्थीत अद्ययावत संपादीत करा "
 "किंवा अद्ययवात विना पुढे जायचे असल्यास रद्द करा वर क्लिक करा.."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "अद्ययावत प्रतिमा डाऊनलोड करतेवेळी त्रुटी आढळली"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "या मशीनवर %s प्रतिष्ठापित करण्यासाठी तुमच्याकडे पुरेसा RAM नाही."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "बचाव पद्धत"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "प्रतिष्ठापन पद्धत"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "बचाव प्रतिमा कोणत्या प्रकारच्या माध्यमात आहे?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "प्रतिष्ठापित करायची संकुले कोणत्या प्रकारच्या माध्यमात आहेत?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "एकही चालक सापडला नाही"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "चालक निवडा"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "चालक डिस्क वापरा"
 
-#: ../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?"
@@ -6009,59 +6009,59 @@ msgstr ""
 "या प्रतिष्ठापन प्रकारासाठी आवश्यक प्रकारची यंत्रे शोधण्यास असमर्थ.  तुम्हास स्वहस्ते चालक "
 "निवडणे किंवा चालक डिस्क वापरणे आवडेल काय?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "खालील यंत्रे तुमच्या प्रणालीवर सापडली आहेत."
 
-#: ../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 "तुमच्या प्रणालीसाठी कोणताही यंत्र चालक भारित केलेला नाही? तुम्हास आता भारित करणे आवडेल?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "यंत्रे"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "पूर्ण"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "यंत्र जोडा"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "लोडर आधिच कार्यरत आहे. शेल सुरू करत आहे.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "anaconda %s, %s बचाव पध्दती चालवीत आहे - कृपया थांबा...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "anaconda %s, %s प्रणाली प्रतिष्ठापक - कृपया थांबा...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "प्रतिष्ठापन प्रतिमा %s शोधण्यास असमर्थ"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" तपासतोय..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "माध्यम आता तपासत आहे..."
 
-#: ../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."
@@ -6069,7 +6069,7 @@ msgstr ""
 "प्रथमिक खंड वर्णनकारातून डिस्क चेकसम वाचण्यास असमर्थ. याचा अर्थ कदाचित डिस्क चेकसम न "
 "जोडताच निर्माण केली असावी."
 
-#: ../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 "
@@ -6079,11 +6079,11 @@ msgstr ""
 "शकते.  लागू होत असल्यास, कृपया डीस्क तपासा व पुन्हा प्रयत्न करा.  चाचणी वारंवार अपयशी "
 "ठरत असल्यास प्रतिष्ठापन पुढे चालू ठेवू नका."
 
-#: ../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 "
@@ -6093,7 +6093,7 @@ 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"
@@ -6104,20 +6104,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "चेकसम परीक्षा"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "यंत्र किकस्टार्ट पद्धती आज्ञा %s ला वाईट आर्ग्यूमेंट: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "कीकस्टार्ट साधन आदेश करीता विभाग नाव निर्देशीत केले पाहिजे."
 
-#: ../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"
@@ -6125,7 +6125,7 @@ msgstr ""
 "IPv4 संजाळांसाठी पूर्वपद १ आणि ३२ च्या दरम्यान किंवा IPv6 संजाळांसाठी १ आणि १२८ च्या "
 "दरम्यान असावे"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6136,27 +6136,27 @@ msgstr ""
 "आणि सांकेतीकरण(एनक्रिप्शन) किल्ली द्या. जर किल्लीची गरज नसेल, तर ही जागा मोकळी सोडा "
 "आणि प्रतिष्ठापन चालू राहील."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "सांकेतीकरण किल्ली"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "बिनतारी रचना"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "नामसेवक IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "नामसेवक सापडत नाही"
 
-#: ../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 "
@@ -6166,56 +6166,56 @@ msgstr ""
 "नव्हता. जर तुम्हास तुमचा नामसेवक माहित असेल, तर कृपया तो आता दाखल करा. जर तुमच्याकडे "
 "ही माहिती नसेल, तर तुम्ही ही जागा मोकळी सोडू शकता आणि प्रतिष्ठापन चालू राहील."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "अवैध IP माहिती"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "तुम्ही अवैध IP पत्ता दाखल केलाय."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "संजाळ चूक"
 
-#: ../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 "तुमचे संजाळ इंटरफेस व्यूहरचित करताना चूक झाली होती."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP रचा"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "तुम्ही किमान एक प्रोटोकॉल (IPv4 किंवा IPv6) निवडायला हवा."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS साठी IPv4 आवश्यक"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS प्रतिष्ठापन पद्धतीस IPv4 आधार आवश्यक."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 पत्ता:"
 
-#: ../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 पत्ता:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "नामसेवक:"
 
-#: ../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 "
@@ -6225,174 +6225,174 @@ msgstr ""
 "quad नेटमास्क किंवा CIDR-शैलीचे पूर्वपद स्वीकारले जातात. गेटवे व सर्वर नाम कक्ष वैध IPv4 "
 "किंवा IPv6 पत्ते असायला हवे."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "स्वहस्ते TCP/IP व्यूहरचना"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "हरवलेली माहिती"
 
-#: ../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 "तुम्ही एक वैध IPv4 पत्ता आणि संजाळ मास्क किंवा CIDR पुर्वपद दाखल करायलाच हवे."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "तुम्ही वैध IPv6 पत्ता व CIDR पुर्वपद हे दोन्ही दाखल करायला हवे."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "यजमाननाम आणि क्षेत्र ठरवत आहे..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "किकस्टार्ट संजाळ आज्ञा %s ला वाईट आर्ग्यूमेंट: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "संजाळ आज्ञेमध्ये वाईट %s बूटप्रोटो दर्शवलाय"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "संजाळ यंत्र"
 
-#: ../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 "तुमच्या प्रणालीवर अनेक संजाळ यंत्रे आहेत. तुम्हास कोणत्याने प्रतिष्ठापन करणे आवडेल?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS सेवक नाम:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s निर्देशिका:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "कृपया तुमच्या %s प्रतिमा करीता सर्वर नाव व मार्ग प्रविष्ट करा."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS व्यवस्था"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "यजमाननाम विना DNS व्यूहरचनेच्या दर्शविण्यात आले"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "हुडकून काढत आहे"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ती निर्देशिका सेवकावरून आरोहित करता आली नाही."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "त्या निर्देशिकेमध्ये %s प्रतिष्ठापन वृक्ष असल्याचे जाणवत नाही."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS किकस्टार्ट पद्धती आज्ञा %s ला वाईट आर्ग्यूमेंट: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "टेलनेट"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "टेलनेट जोडणीची वाट पाहत आहे..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "ऍनाकोंडा टेलनेट द्वारे चालवत आहे..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s प्राप्त करू शकत नाही://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "प्रतिष्ठापन प्रतिमा हुडकण्यास असमर्थ."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url किकस्टार्ट पद्धती आज्ञा %s ला वाईट आर्ग्यूमेंट: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url किकस्टार्ट पद्धतीस --url आर्ग्यूमेंट पुरवायलाच हवे."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "अपरिचित 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 "कृपया तुमच्या सर्वर वरील %s प्रतिमा समाविष्टीत URL प्रविष्ट करा."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "प्रॉक्सी संयोजीत करा"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL मांडणी"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "तुम्ही URL प्रविष्ट केले पाहिजे."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL ftp किंवा http URL पैकी असायला हवे"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "अपरिचित यजमान"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s हे वैध यजमान नाम नाही."
 
-#: ../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."
 msgstr "जर तुम्ही HTTP प्रॉक्झी सेवक वापरत असाल तर HTTP प्रॉक्झी सेवकाचे वापरायचे नाव दाखल करा."
 
-#: ../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
 msgid "Further Setup"
 msgstr "पुढील मांडणी"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ड्राइव भारित करत आहे"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s चालक भारित करत आहे..."
diff --git a/po/ms.po b/po/ms.po
index 41d5cb27a..db24fbc6f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -60,86 +60,86 @@ msgstr "Tekan <enter> untuk shell"
 #: ../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
+#: ../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"
 
@@ -640,41 +640,41 @@ msgstr "dikemaskini pada %(date)s"
 #: ../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 "Ralat"
 
@@ -732,9 +732,9 @@ msgstr ""
 #: ../rescue.py:305
 #: ../rescue.py:307
 #: ../textw/upgrade_text.py:132
-#: ../loader2/cdinstall.c:200
-#: ../loader2/cdinstall.c:203
-#: ../loader2/method.c:393
+#: ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:203
+#: ../loader/method.c:393
 msgid "Skip"
 msgstr "Langkah"
 
@@ -1021,9 +1021,9 @@ msgstr "Tetap"
 #: ../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 "Ya"
 
@@ -1033,22 +1033,22 @@ msgstr "Ya"
 #: ../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 "Tidak"
 
 #: ../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
+#: ../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 "Ulangi"
 
@@ -1067,11 +1067,11 @@ msgstr "Abaikan"
 #: ../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 "Batal"
 
@@ -1861,28 +1861,28 @@ msgstr "Tidak dapat menulis kepada fail %s"
 
 #: ../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 "Undur"
 
@@ -1890,9 +1890,9 @@ msgstr "Undur"
 #: ../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
+#: ../loader/cdinstall.c:117
+#: ../loader/cdinstall.c:125
+#: ../loader/driverdisk.c:440
 msgid "Continue"
 msgstr "Teruskan"
 
@@ -2253,7 +2253,7 @@ msgid "Skip entering %(instkey)s"
 msgstr "Langkau soalselidik pengguna"
 
 #: ../text.py:564
-#: ../loader2/lang.c:63
+#: ../loader/lang.c:63
 #, fuzzy, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Selamat Datang ke Fedora!"
@@ -3097,7 +3097,7 @@ msgstr "Pilihan Bahasa"
 
 #: ../iw/language_gui.py:76
 #: ../textw/language_text.py:45
-#: ../loader2/lang.c:374
+#: ../loader/lang.c:374
 msgid "What language would you like to use during the installation process?"
 msgstr "Bahasa apa yang anda ingin gunakan ketika proses pemasangan?"
 
@@ -3467,8 +3467,8 @@ msgid "Dynamic IP"
 msgstr "IP Dinamik"
 
 #: ../iw/netconfig_dialog.py:177
-#: ../loader2/net.c:416
-#: ../loader2/net.c:860
+#: ../loader/net.c:416
+#: ../loader/net.c:860
 #, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "Menghantar permintaan maklumat IP bagi %s..."
@@ -3659,7 +3659,7 @@ msgstr "Alamat perkakasan:"
 
 #: ../iw/network_gui.py:778
 #: ../textw/network_text.py:228
-#: ../loader2/net.c:820
+#: ../loader/net.c:820
 msgid "Missing Protocol"
 msgstr "Protokol Tiada"
 
@@ -3672,7 +3672,7 @@ msgstr ""
 #: ../iw/network_gui.py:843
 #: ../iw/network_gui.py:849
 #: ../textw/network_text.py:74
-#: ../loader2/net.c:92
+#: ../loader/net.c:92
 #, fuzzy
 msgid "Invalid Prefix"
 msgstr "Nama path tidak sah."
@@ -3919,7 +3919,7 @@ msgid "None"
 msgstr "Tiada"
 
 #: ../iw/partition_gui.py:816
-#: ../loader2/hdinstall.c:334
+#: ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Pemacu Keras"
 
@@ -4740,14 +4740,14 @@ msgid "Activate on boot"
 msgstr "Aktifkan semasa boot"
 
 #: ../textw/network_text.py:149
-#: ../loader2/net.c:730
+#: ../loader/net.c:730
 #: tmp/netpostconfig.glade.h:9
 #, fuzzy
 msgid "Enable IPv4 support"
 msgstr "Sokongan Rangkaian Dailup"
 
 #: ../textw/network_text.py:156
-#: ../loader2/net.c:743
+#: ../loader/net.c:743
 #: tmp/netpostconfig.glade.h:10
 #, fuzzy
 msgid "Enable IPv6 support"
@@ -4887,7 +4887,7 @@ msgid "DHCPv6"
 msgstr "DHCPv6"
 
 #: ../textw/network_text.py:678
-#: ../loader2/net.c:1055
+#: ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Gateway:"
 
@@ -5453,45 +5453,45 @@ msgid ""
 "* You will not get software and security updates for packages not included 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 "Pemeriksaan Media"
 
-#: ../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 "Ujian"
 
-#: ../loader2/cdinstall.c:96
-#: ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96
+#: ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Lenting Cakera"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject the disc and insert another for testing."
 msgstr "Pilih \"%s\" untuk menguji cakera yang berada di pemacu, atau \"%s\" untuk melentingkan cakera dan memasukkan yang lain untuk diuji."
 
-#: ../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 \"%s\". Testing each disc is not strictly required, however it is highly recommended.  Minimally, the discs should be tested prior to using them for the first time. After they have been successfully tested, it is not required to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid "The %s disc was not found in any of your drives. Please insert the %s disc and press %s to retry."
 msgstr "Cakera %s tidak dijumpai pada sebarang pemacu anda. Sila masukkan cakera %s dan tekan %s untuk cuba semula."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Cakera Dijumpai"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5502,460 +5502,460 @@ msgstr ""
 "\n"
 "Pilih %s untuk melangkau ujian media dan mulakan pemasangan."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid "No %s disc was found which matches your boot media.  Please insert the %s disc and press %s to retry."
 msgstr "Tiada cakera %s dijumpai yang sepadan dengan media boot anda.  Sila masukkan cakera %s dan tekan %s untuk cuba semula."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid "The %s disc was not found in any of your CDROM drives. Please insert the %s disc and press %s to retry."
 msgstr "Cakera %s tidak dijumpai pada sebarang pemacu CDROM anda. Sila masukkan cakera %s dan tekan %s untuk cuba semula."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Cakera Tidak Dijumpai"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Tidak menjumpai fail kickstart pada 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 "Gagal membaca direktori %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Memuatkan"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Membaca cakera jurupacu..."
 
-#: ../loader2/driverdisk.c:230
-#: ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230
+#: ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Sumber Cekera Jurupacu"
 
-#: ../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?"
 msgstr "Anda mempunyai banyak peranti yang boleh melayan sebagai sumber bagi cakera jurupacu. Yang mana anda ingin guna?"
 
-#: ../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?"
 msgstr "Terdapat beberapa partisyen pada peranti ini yang mungkin mengandungi imej cakera pemandu.  Yang mana anda hendak gunakan?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Gagal untuk melekapkan partisyen."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Pilih imej cakera pemandu"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Pilih fail yang merupakan imej cakera pemandu anda."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Gagal untuk memuatkan cakera pemandu daripada fail."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Masukkan cekera pemandu anda kedalam /dev/%s dan tekan \"OK\" untuk meneruskan."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Masukkan Cekera Jurupacu"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Gagal untuk melekapkan cakera jurupacu"
 
-#: ../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 "Pilih secara manual"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Muatkan cakera lain"
 
-#: ../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 driver disk?"
 msgstr "Tiada peranti jenis sesuai dijumpai pada cakera jurupacu anda. Adakah anda ingin memilih jurupacu secara manual, teruskan juga, atau muatkan cakera jurupacu lain?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Cekera jurupacu"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Anda ada Cekera jurupacu?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Lebih Cekera Jurupacu?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Adakah anda ingin memuatkan cekera jurupacu lagi?"
 
-#: ../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 "Ralat Kickstart"
 
 # lom
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Sumber cakera jurupacu kickstart tidak diketahui: %s"
 
 # lom
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid "The following invalid argument was specified for the kickstart driver disk command: %s:%s"
 msgstr "Hujah tidak sah berikut telah menyatakan arahan cakera jurupacu kickstart: %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 separated by spaces.  If you don't know what parameters to supply, skip this screen by pressing the \"OK\" button."
 msgstr "Sila masukkan sebarang parameter yang anda hendak berikan kepada modul %s diselang dengan ruang.  Jika anda tidak tahu parameter apa untuk diberikan, langkau skrin ini dengan menekan butang \"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Masukkan Parameter Modul"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Tiada jurupacu dijumpai"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Muatkan cekera jurupacu"
 
-#: ../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 "Tiada jurupacu dijumpai untuk dimasukkan secara manual. Adakah anda ingin menggunakan cakera jurupacu?"
 
-#: ../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."
 msgstr "Sila pilih jurupacu dibawah yang anda ingin muatkan. Jika ia tidak kelihatan dan anda mempunyai cakera jurupacu, tekan F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Nyatakan hujah modul opsyenal"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Pilih Pemacu Peranti untuk Dimuatkan"
 
-#: ../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 Dikesan"
 
-#: ../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 "Media pemasangan lokal dikesan..."
 
-#: ../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 media."
 msgstr "Pepohon pemasangan  %s  pada direktori itu nampaknya tidak sepadan dengan media but anda."
 
-#: ../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."
 msgstr "Ralat berlaku bila membaca pemasang dari imej ISO. Sila periksa imej ISO dan cuba lagi."
 
-#: ../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?"
 msgstr "Anda nampaknya tidak mempunyai sebarang cekera keras pada sistem anda! Adakah anda ingin mengkonfigurasikan peranti tambahan?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid "What partition and directory on that partition hold the CD (iso9660) images for %s? If you don't see the disk drive you're using listed here, press F2 to configure additional devices."
 msgstr "Apa partisyen dan direktori yang mengandungi imej  CD (iso9660) bagi %s? Jika anda tidak nampak pemacu cakera yang anda guna tersenarai di sini, tekan F2 untuk mengkonfigurasi peranti tambahan."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Direktori mengendungi imej:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Pilih Partisyen"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Peranti %s nampaknya tidak mengandungi imej CDROM %s."
 
 # lom
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Hujah teruk untuk kickstart HD arahan kaedah %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 "Tidak dapat menjumpai fail kickstart pada pemacu keras."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Tidak dapat mencari cakera keras untuk cakera BIOS %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Jenis papan kekunci"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Apa jenis papan kekunci yang anda ada?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Ralat membuka fail kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Ralat membaca kandungan fail kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Ralat pada %s pada baris %d bagi fail kickstart%s"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Tidak menjumpai ks.cfg pada cakera but."
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr "Ralat memuatturun fail kickstart"
 
 # lom
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Hujah teruk untuk mematikan arahan kaedah kickstart %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Selamat datang ke %s - Mod Menyelamat"
 
-#: ../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> Antara unsur   |  <Space> pilih   |  <F12> Skrin seterusnya "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Pilih Bahasa"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD Tempatan"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Pemacu keras"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Direktori NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Selamat Datang ke Fedora!"
 
-#: ../loader2/loader.c:374
-#: ../loader2/loader.c:410
+#: ../loader/loader.c:374
+#: ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Sumber Cakera Kemaskini"
 
-#: ../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?"
 msgstr "Anda mempunyai banyak peranti yang boleh melayan sebagai sumber bagi cakera jkemaskini. Yang mana anda ingin guna?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid "There are multiple partitions on this device which could contain the update disk image.  Which would you like to use?"
 msgstr "Terdapat beberapa partisyen pada peranti ini yang mungkin mengandungi imej cakera pemandu.  Yang mana anda hendak gunakan?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Masukkan cekara kemaskini ke /dev/%s  dan tekan \"OK\" untuk meneruskan."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Kemaskini Cakera"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Gagal untuk melekapkan cakera kemaskini"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Kemaskini"
 
 # libgnomeui/gnome-icon-sel.c:348
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Membaca kemaskini 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 "Ralat memuatturun fail kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Anda tidak mempunyai cukup RAM untuk memasang %s pada mesin ini."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Kaedah Penyelamatan"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Kaedah Pemasangan"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Jenis apa media yang mengandungi imej penyelamat?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Apa jenis media yang mengandungi pakej untuk dipasang?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Tiada jurupacu dijumpai"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Pilih jurupacu"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Guna cekera jurupacu?"
 
-#: ../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?"
 msgstr "Tidak dapat menjumpai sebarang peranti bagi jenis yang diperlukan bagi jenis pemasangan ini.  Adakah anda ingin memilih jurupacu anda secara manual atau menggunakan cakera jurupacu?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Peranti  berikut dijumpai pada sistem anda."
 
-#: ../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 "Tiada jurupacu peranti dimuatkan bagi sistem anda. Adakah anda ingin memuatkan apa-apa sekarang?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Peranti"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Selesai"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Tambah Peranti"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "pemuat sudah dilaksanakan.  Memulakan 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 "Melaksanakan anaconda, mod menyelamat %s  - sila tunggu...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Melaksanakan anaconda, pemasang sistem %s  - sila tunggu...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Tidak dapat menjumpai imej pemasangan %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Memeriksa \"%s\" ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Memeriksa media sekarang..."
 
-#: ../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."
 msgstr "Tidak dapat membaca checksum cakera daripada penghurai volum utama. Ini mungkin bermaksud cakera dicipta tanpa menambah 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 again.  If this test continues to fail you should not continue the install."
 msgstr "Imej yang baru diuji mengandungi ralat. Ini mungkin kerana pemuaturunan rosak atau cakera teruk. Jika boleh, cuba bersihkan cakera dan cuba lagi.  Jika ujian ini terus gagal anda patut tidak meneruskan pemasangan ini."
 
-#: ../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"
@@ -5966,288 +5966,288 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Ujian Checksum"
 
 # lom
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Hujah teruk bagi arahan kaedah kickstart peranti %s:%s"
 
 # lom
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Kedua-dua jenis modul dan nama mesti dinyatakan untuk arahan peranti kickstart."
 
-#: ../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 key needed to access your wireless network.  If no key is needed, leave this field blank and the install will continue."
 msgstr "%s adalah adapter rangkaian wireless.  Sila berikan ESSID dan kekunci enkripsi yang diperlukan untuk mengakses rangkaian wireless anda.  Jika tiada kekunci diperlukan, biarkan medan ini kosong dan pemasangan akan diteruskan."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Kekunci Enkripsi"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Tetapan Wireless"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP Pelayan Nama"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Pelayan Nama Tiada"
 
-#: ../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 leave the field blank and the install will continue."
 msgstr "Permintaan alamat IP anda memulangkan maklumat tetapan, tetapi ia tidak menyertakan alamat pelayan nama. Jika anda tidak mempunyai maklumat ini, anda boleh membiarkan medan tersebut kosong dan pemasangan akan diteruskan."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Maklumat IP tidak sah"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Anda memasukkan alamat IP yang tidak sah."
 
-#: ../loader2/net.c:589
-#: ../loader2/net.c:695
+#: ../loader/net.c:589
+#: ../loader/net.c:695
 msgid "Network Error"
 msgstr "Ralat Rangkaian"
 
-#: ../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 "Terdapat ralat menetapkan antaramuka rangkaian anda."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfigurasikan TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 diperlukan untuk NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr ""
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Alamat IPv4:"
 
-#: ../loader2/net.c:962
-#: ../loader2/net.c:1014
+#: ../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 "Alamat IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Pelayan Nama:"
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "Tetapan TCP/IP Manual"
 
-#: ../loader2/net.c:1224
-#: ../loader2/net.c:1230
+#: ../loader/net.c:1224
+#: ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Maklumat Hilang"
 
-#: ../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 "Anda mesti masukkan kedua-dua alamat IPv4 dan mask rangkaian atau prefiks CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Anda mesti masukkan kedua-dua alamat IPv6 dan prefiks CIDR yang sah."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Menentukan nama hos dan domain..."
 
 # lom
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Hujah teruk untuk kickstart arahan rangkaian %s:%s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Bootproto teruk %s dinyatakan pada arahan rangkaian"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Peranti Rangkaian"
 
-#: ../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 "Anda mempunyai banyak peranti rangkaian pada sistem ini. Melalui yang mana anda ingin pasang?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nama pelayan NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Direktori %s:"
 
-#: ../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 "Tetapan 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 "Menerima"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Direktori tidak dapat dilekapkan daripada pelayan."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Direktori nampaknya tidak mengandungi pepohon pemasangan %s."
 
 # lom
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Hujah teruk untuk kickstart NFS arahan kaedah %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 "Menunggu sambungan telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Melaksanakan anaconda melalui telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "&Lompat ke hiperlink"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Tidak dapat menerima imej pemasangan."
 
 # lom
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Hujah teruk untuk kickstart Url arahan kaedah %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Mesti membekalkan hujah --url untuk kaedah kickstart Url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Kaedah Url tidak diketahui %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 "Konfigur pelayan proksi yang digunakan"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Tetapan Halaman"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Anda mesti masukkan direktori."
 
-#: ../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 "Hos tidak diketahui"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s adalah nama hos yang tidak sah"
 
-#: ../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."
 msgstr "Jika anda menggunakan pelayan proksi HTTP, masukkan nama pelayan proksi HTTP untuk digunakan."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 #, fuzzy
 msgid "Proxy Name:"
 msgstr "Nama Medan"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 #, fuzzy
 msgid "Proxy Port:"
 msgstr "Proksi Rangkaian"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 #, fuzzy
 msgid "Further Setup"
 msgstr "Tetapan Halaman"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Memuatkan jurupacu SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Memuatkan jurupacu %s..."
diff --git a/po/my.po b/po/my.po
index 26ab12fd3..d918c2f23 100644
--- a/po/my.po
+++ b/po/my.po
@@ -43,41 +43,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 ""
 
@@ -483,22 +483,22 @@ msgstr ""
 #: ../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 ""
 
@@ -545,8 +545,8 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -788,21 +788,21 @@ msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
-#: ../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 ""
 
@@ -813,8 +813,8 @@ msgstr ""
 #: ../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 ""
 
@@ -1542,21 +1542,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 ""
 
 #: ../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 ""
 
@@ -1922,7 +1922,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2701,7 +2701,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr ""
 
-#: ../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 ""
 
@@ -3039,7 +3039,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3201,7 +3201,7 @@ msgstr ""
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3210,7 +3210,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3434,7 +3434,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4202,12 +4202,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4323,7 +4323,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 ""
 
@@ -4895,29 +4895,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4927,18 +4927,18 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -4946,145 +4946,145 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5092,69 +5092,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5162,269 +5162,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5432,26 +5432,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5459,258 +5459,258 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr ""
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr ""
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index d8660a24d..9f1f57bd1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -45,41 +45,41 @@ msgstr "Trykk <linjeskift> for et skall"
 #: ../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"
 
@@ -564,22 +564,22 @@ msgstr "Endrer størrelse for filsystem på %s..."
 #: ../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 "Feil"
 
@@ -634,8 +634,8 @@ msgstr ""
 "Trykk <Linjeskift> for å avslutte installasjonen."
 
 #: ../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 "Hopp over"
 
@@ -968,21 +968,21 @@ msgstr "Fiks"
 
 #: ../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 "Ja"
 
 #: ../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 "Nei"
 
-#: ../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 "Prøv igjen"
 
@@ -993,8 +993,8 @@ msgstr "Overse"
 #: ../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 "Avbryt"
 
@@ -1854,21 +1854,21 @@ msgid "_Write changes to disk"
 msgstr "S_kriver endringer til disk"
 
 #: ../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 "Tilbake"
 
 #: ../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 "Fortsett"
 
@@ -2292,7 +2292,7 @@ msgstr "Vennligst oppgi ditt %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Hopp over å angi %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Velkommen til %s for %s"
@@ -3182,7 +3182,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Valg av språk"
 
-#: ../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 "Hvilket språk ønsker du å bruke under installeringen?"
 
@@ -3556,7 +3556,7 @@ msgstr "En verdi er krevet for feltet «%s»."
 msgid "Dynamic IP"
 msgstr "Dynamisk 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 "Sender forespørsel om IP-informasjon for %s..."
@@ -3727,7 +3727,7 @@ msgstr "ukjent"
 msgid "Hardware address: "
 msgstr "Maskinvareadresse: "
 
-#: ../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 "Mangler protokoll"
 
@@ -3736,7 +3736,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Du må velge støtte for enten IPv4 eller IPv6."
 
 #: ../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 "Ugyldig prefiks"
 
@@ -3969,7 +3969,7 @@ msgstr "_RAID-enheter"
 msgid "None"
 msgstr "Ingen"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Harddisker"
 
@@ -4876,12 +4876,12 @@ msgstr "Prefiks"
 msgid "Activate on boot"
 msgstr "Aktiver ved oppstart"
 
-#: ../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 "Aktiver støtte for IPv4"
 
-#: ../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 "Aktiver støtte for IPv6"
@@ -5001,7 +5001,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:"
 
@@ -5623,22 +5623,22 @@ msgstr ""
 "* Du vil ikke få program- og sikkerhetsoppdateringer for pakker som ikke "
 "inngår i ditt abonnement."
 
-#: ../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 "Mediasjekk"
 
-#: ../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
 msgid "Eject Disc"
 msgstr "Løs ut disk"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5647,7 +5647,7 @@ msgstr ""
 "Velg \"%s\" for å teste disken som er i stasjonen, eller «%s» for å løse ut "
 "disken og sette inn en ny for testing."
 
-#: ../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 "
@@ -5662,7 +5662,7 @@ msgstr ""
 "de har blitt testet og ingen feil ble funnet, er det ikke nødvendig å teste "
 "hver CD før neste gang de skal brukes."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5671,11 +5671,11 @@ msgstr ""
 "%s CDen ble ikke funnet i noen av dine enheter. Sett inn %s CDen og trykk %s "
 "for å forsøke på nytt"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Plate funnet"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5686,7 +5686,7 @@ msgstr ""
 "\n"
 "Velg %s for å hoppe over denne testen og starte installasjonen."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5695,7 +5695,7 @@ msgstr ""
 "Fant ingen %s-CD som passer ditt oppstartsmedium. Sett inn %s-CDen og trykk %"
 "s for å prøve på nytt"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5704,32 +5704,32 @@ msgstr ""
 "%s CDen ble ikke funnet i noen av dine CD-ROM-stasjoner. Sett inn %s CDen og "
 "press %s for å forsøke på nytt"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disk ikke funnet"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Kan ikke finne kickstart-fil på CD-ROM."
 
-#: ../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 "Kunne ikke lese katalog %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Laster"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Leser driverdisk..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Kilde for driverdisk"
 
-#: ../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?"
@@ -5737,7 +5737,7 @@ msgstr ""
 "Du har flere enheter som kan være kilde for en driverdisk. Hvilken vil du "
 "bruke?"
 
-#: ../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?"
@@ -5745,49 +5745,49 @@ msgstr ""
 "Det er flere partisjoner på denne stasjonen som kan inneholde "
 "driverdisketten. Hvilken vil du bruke?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Kunne ikke montere partisjonen."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Velg driverdisk"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Velg filen som er din driverdiskett."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Kunne ikke laste driverdiskett fra fil."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Sett inn driverdisken i /dev/%s og trykk «OK» for å fortsette."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Sett inn driverdisk"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Kunne ikke montere driverdisketten."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Driverdisken er ugyldig for denne versjonen av %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Velg manuelt"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Last en annen 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 "
@@ -5796,38 +5796,38 @@ msgstr ""
 "Ingen enheter av passende type ble funnet på denne driverdisketten. Vil du "
 "velge driveren manuelt, fortsette likevel, eller laste en ny driverdiskett?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Driverdisk"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Har du en driverdisk?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Flere driverdisker?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Ønsker du å laste flere driverdisker?"
 
-#: ../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-feil"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Ukjent kickstart-kilde for driverdisk: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5836,7 +5836,7 @@ msgstr ""
 "Følgende ugyldig argument ble oppgitt for kommando for driverdisk i "
 "kickstart: %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 "
@@ -5847,19 +5847,19 @@ msgstr ""
 "med mellomrom. Hvis du ikke vet hvilke parametere du skal oppgi, kan du "
 "hoppe over denne skjermen ved å trykke «OK»-knappen."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Oppgi parametere for moduler"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ingen drivere funnet"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Last driverdisk"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5867,7 +5867,7 @@ msgstr ""
 "Ingen drivere ble funnet for manuell innlasting. Vil du bruke en "
 "driverdiskett?"
 
-#: ../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."
@@ -5875,26 +5875,26 @@ msgstr ""
 "Vennligst velg hvilken driver du vil laste. Trykk F2 hvis driveren du "
 "trenger ikke finnes på denne listen og du har en driverdiskett."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Spesifiser alternative parametere for modul"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Velg enhetsdriver som skal lastes"
 
-#: ../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 "Medie funnet"
 
-#: ../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 "Lokalt installasjonsmedie funnet..."
 
-#: ../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 "
@@ -5903,7 +5903,7 @@ msgstr ""
 "Installasjonstreet for %s i denne katalogen passer ikke med ditt "
 "oppstartsmedium."
 
-#: ../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."
@@ -5911,7 +5911,7 @@ msgstr ""
 "En feil oppstod ved lesing av installasjonen fra ISO-filene. Sjekk ISO-"
 "filene og prøv på nytt."
 
-#: ../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?"
@@ -5919,7 +5919,7 @@ msgstr ""
 "Det ser ikke ut som om du har noen harddisker på systemet ditt! Ønsker du å "
 "konfigurere flere enheter?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5930,61 +5930,61 @@ msgstr ""
 "filene (iso9660) for %s? Hvis du ikke ser disken du bruker på denne listen, "
 "trykk F2 for å konfigurere flere enheter."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Katalog som inneholder bilder:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Velg partisjon"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Enhet %s ser ikke ut til å inneholde CD-ROM bilder for %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Ugyldig argument til HD-kommando for kickstart %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 "Kan ikke finne kickstart-fil på harddisken."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Kan ikke finne harddisk for BIOS-disk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tastaturtype"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Hvilken type tastatur har du?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Feil under åpning av kickstart-fil %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Feil under lesing av innholdet i kickstart-fil %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Feil i %s på linje %d i kickstart-fil %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Kan ikke finne ks.cfg på avtagbart medie."
 
-#: ../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."
@@ -5992,52 +5992,52 @@ msgstr ""
 "Kan ikke laste ned kickstart-filen. Vennligst endre kickstart-parametrene "
 "under, eller velg \"Avbryt\" for å fortsette som en interaktiv installasjon."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Feil under nedlasting av kickstart-fil"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Ugyldig argument til kommando for nedstenging av kickstart %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Velkommen til %s for %s - redningsmodus"
 
-#: ../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> mellom elementer  | <Mellomrom> velger | <F12> neste skjerm "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Velg et språk"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokal CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Harddisk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS-katalog"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Velkommen til %s%n for %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Oppdater diskkilde"
 
-#: ../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?"
@@ -6045,7 +6045,7 @@ msgstr ""
 "Du har flere enheter som kan tjene som kilde for en oppdateringsdisk. "
 "Hvilken vil du bruke?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6053,29 +6053,29 @@ msgstr ""
 "Det er flere partisjoner på denne enheten som kan inneholde diskbildet for "
 "driveroppdateringer. Hvilken vil du bruke?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sett inn oppdateringsdisketten i /dev/%s og trykk «OK» for å fortsette."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Oppdateringsdiskett"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Kunne ikke montere oppdateringsdisketten"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Leser anaconda-oppdateringer..."
 
-#: ../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.."
@@ -6083,44 +6083,44 @@ msgstr ""
 "Kan ikke laste ned oppdateringsbildet. Vennligst endre lokasjonen under, "
 "eller velg «Avbryt» for å fortsette uten oppdateringer."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Feil under nedlasting av oppdateringsbilde"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Du har ikke nok RAM til å installere %s på denne maskinen."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Redningsmetode"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installasjonsmetode"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Hvilken type media inneholder redningsbildet?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Hvilken type media inneholder pakkene som skal installeres?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ingen driver funnet"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Velg driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Bruk en driverdisk"
 
-#: ../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?"
@@ -6128,61 +6128,61 @@ msgstr ""
 "Kan ikke finne noen enhter av typen som kreves for denne installasjonstypen. "
 "Vil du velge din driver manuelt eller bruke en driverdiskett?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Følgende enheter ble funnet på ditt 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?"
 msgstr ""
 "Ingen enhetsdrivere er lastet for ditt system. Ønsker du å gjøre dette nå?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Enheter"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Legg til enhet"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "laster er allerede kjørt. Starter skall.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Kjører anaconda %s, feilrettingsmodus for %s - vennligst vent...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Kjører anaconda %s, installeringsprogrammet for %s - vennligst vent...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Fant ikke installasjonsbilde %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Kontrollerer \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Sjekker medium nå..."
 
-#: ../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."
@@ -6190,7 +6190,7 @@ msgstr ""
 "Klarte ikke å lese CDens sjekksum fra primær volum-beskrivelse. Dette betyr "
 "sannsynligvis at at CDen ble laget uten å legge inn sjekksum."
 
-#: ../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 "
@@ -6200,18 +6200,18 @@ msgstr ""
 "nedlasting eller en dårlig plate. Hvis mulig, rens CD'en og prøv igjen. Hvis "
 "denne testen fortsatt feiler bør du ikke fortsette installasjonen."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Suksess"
 
-#: ../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"
@@ -6222,20 +6222,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Test av sjekksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Ugyldig argument til enhetskommando for kickstart %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Navn på modul må oppgis for enhetskommandoen for kickstart."
 
-#: ../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"
@@ -6243,7 +6243,7 @@ msgstr ""
 "Prefiks må være mellom 1 og 32 for IPv4-nettverk eller mellom 1 og 128 for "
 "IPv6-nettverk"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6254,27 +6254,27 @@ msgstr ""
 "som kreves for å aksessere ditt trådløse nettverk. Hvis ingen nøkkel kreves "
 "kan du la dette feltet stå tomt og fortsette installasjonen."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Krypteringsnøkkel"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Innstillinger for trådløst nettverk"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Navnetjeners IP-adresse"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Navnetjener mangler"
 
-#: ../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 "
@@ -6285,56 +6285,56 @@ msgstr ""
 "denne informasjonen, kan du la dette feltet stå tomt og installasjonen vil "
 "fortsette."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ugyldig IP-informasjon"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Du skrev inn en ugyldig IP-adresse."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: ../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 "Det oppsto en feil under konfigurasjon av nettverksgrensesnittet."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfigurer TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Du må velge minst en protokoll (IPv4 eller IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 kreves for NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS-installasjonsmetoden krever støtte for IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4-adresse:"
 
-#: ../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-adresse:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Navnetjener:"
 
-#: ../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 "
@@ -6344,44 +6344,44 @@ msgstr ""
 "erpunkt-kvadruppel nettmaske eller prefiks i CIDR-stil tillatt. Feltet "
 "gateway og navnetjener må være gyldige IPv4- eller IPv6-adresser."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Manuell TCP/IP-konfigurasjon"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Manglende informasjon"
 
-#: ../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 ""
 "Du må skrive inn en gyldig IPv4-adresse og en nettmaske eller et CIDR-"
 "prefiks."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Du må skrive inn både en gyldig IPv6-adresse og et CIDR-prefiks."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Undersøker vertsnavn og domene..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Ugyldig argument til nettverks-kommando for kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Ugyldig bootproto %s spesifisert i nettverkskommandoen"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Nettverksenhet"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6389,112 +6389,112 @@ msgstr ""
 "Du har flere nettverksenheter på dette systemet. Hvilken enhet skal du bruke "
 "til installasjonen?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Navn på NFS-tjener:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Katalog for %s:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Vennligst oppgi navn på tjener og sti til dine %s-bilder."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS-oppsett"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Vertsnavn oppgitt men DNS er ikke konfigurert"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Henter"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Den katalogen kunne ikke monteres fra tjeneren."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Den katalogen ser ikke ut til å inneholde et %s-installasjonstre."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Ugyldig argument til NFS-kommando for kickstart %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 "Venter på telnet-forbindelse..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Kjører anaconda via telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Kan ikke hente %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Kunne ikke hente installasjonsbildet."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Ugyldig argument til kommando for URL-kickstartmetode %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Må oppgi et --url argument til kickstartmetoden for URL."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Ukjent URL-metode %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Vennligst oppgi URL som inneholder bildene for %s på din tjener."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Konfigurer proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL-oppsett"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Du må oppgi en URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL må være enten ftp eller http"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Ukjent vert"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s er ikke et gyldig vertsnavn."
 
-#: ../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."
@@ -6502,23 +6502,23 @@ msgstr ""
 "Hvis du bruker en HTTP-proxytjener, skriv inn navnet til HTTP-proxytjeneren "
 "som skal brukes."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Navn på proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Port for proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Videre oppsett"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Laster SCSI-driver"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Laster driver %s..."
diff --git a/po/ne.po b/po/ne.po
index 203e6428b..29cc1ca18 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -50,41 +50,41 @@ msgstr "शेलका लागि<enter> थिच्नुहोस्"
 #: ../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 "ठीक छ"
 
@@ -567,22 +567,22 @@ msgstr "%s फाइल प्रणाली ढाँचाबद्ध गर
 #: ../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 "त्रुटि"
 
@@ -638,8 +638,8 @@ msgstr ""
 "स्थापक अन्त्य गर्न <Enter> थिच्नुहोस् ।"
 
 #: ../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 "फड्काउनुहोस्"
 
@@ -968,21 +968,21 @@ msgstr "निश्चित गर्नुहोस्"
 
 #: ../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 "हो"
 
 #: ../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 "होइन"
 
-#: ../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 "पुन: प्रयास गर्नुहोस्"
 
@@ -993,8 +993,8 @@ msgstr "उपेक्षा गर्नुहोस्"
 #: ../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 "रद्द गर्नुहोस्"
 
@@ -1846,21 +1846,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 "पछाडि"
 
 #: ../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 "जारी राख्नुहोस्"
 
@@ -2275,7 +2275,7 @@ msgstr "कृपया तपाईँको %(instkey)s प्रविष्�
 msgid "Skip entering %(instkey)s"
 msgstr "प्रविष्ट गरिरहेको %(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 "%s मा स्वागत छ"
@@ -3150,7 +3150,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "भाषा चयन"
 
-#: ../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 "तपाईँ स्थापना प्रक्रियामा कस्तो भाषा प्रयोग गर्न चाहनुहुन्छ ?"
 
@@ -3521,7 +3521,7 @@ msgstr "फाँट %s का लागि मान आवश्यक छ ।
 msgid "Dynamic IP"
 msgstr "गतिशील आईपी"
 
-#: ../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 "%s का लागि आईपी जानकारीको अनुरोध पठाइदैछ..."
@@ -3692,7 +3692,7 @@ msgstr "अज्ञात"
 msgid "Hardware address: "
 msgstr "हार्डवेयर ठेगाना: "
 
-#: ../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 "हराइरहेको प्रोटोकल"
 
@@ -3701,7 +3701,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "तपाईँले कम्तिमा IPv4 वा IPv6 समर्थन चयन गर्नुपर्छ ।"
 
 #: ../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 "अवैध उपसर्ग"
 
@@ -3933,7 +3933,7 @@ msgstr "रेड यन्त्र"
 msgid "None"
 msgstr "कुनै पनि होइन"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "हार्डड्राइभ"
 
@@ -4835,12 +4835,12 @@ msgstr "उपसर्ग"
 msgid "Activate on boot"
 msgstr "बुटमा सक्रिय गर्नुहोस्"
 
-#: ../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 "IPv4 समर्थन सक्षम पार्नुहोस्"
 
-#: ../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 "IPv6 समर्थन सक्षम पार्नुहोस्"
@@ -4960,7 +4960,7 @@ msgstr "स्वाचलित 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 "गेटवे:"
 
@@ -5576,22 +5576,22 @@ 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 "मिडिया जाँच"
 
-#: ../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 "परीक्षण"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "डिस्क निकाल्नुहोस्"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5600,7 +5600,7 @@ msgstr ""
 "ड्राइभमा हालै डिस्क परीक्षण गर्न \"%s\" रोज्नुहोस्, वा डिस्क निकाल्नु र परीक्षणका लागि "
 "अर्को घुसाउँन \"%s\" रोज्नुहोस् ।"
 
-#: ../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 "
@@ -5614,7 +5614,7 @@ msgstr ""
 "छ । सामान्य रूपमा डिस्कहरू पहिलो पटक प्रयोग गर्नका लागि परीक्षण गरिन्छ । तिनीहरूको "
 "सफलतापूर्वक परीक्षण पछि, फेरि प्रयोग गर्न यसलाई परीक्षण गर्न आवश्यक छैन ।"
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5623,11 +5623,11 @@ msgstr ""
 "%s डिस्क तपाईँको कुनै ड्राइभमा पनि फेला परेन । कृपया %s डिस्क घुसाउनुहोस् र फेरि प्रयास "
 "गर्न %s थिच्नुहोस् ।"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "डिस्क फेला पर्यो"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5638,7 +5638,7 @@ msgstr ""
 "\n"
 "मिडिया परीक्षण फड्काउन र स्थापना सुरु गर्न %s रोज्नुहोस् ।"
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5647,7 +5647,7 @@ msgstr ""
 "तपाईँको बुट मिडियासँग मेल खाने कुनै %s डिस्क फेला परेन । कृपया %s डिस्क घुसाउनुहोस् र फेरि "
 "प्रयास गर्न %s थिच्नुहोस् ।"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5656,32 +5656,32 @@ msgstr ""
 "%s डिस्क तपाईँको कुनै सीडीरोम ड्राइभमा फेला परेन । कृपया %s डिस्क घुसाउनुहोस् र फेरि "
 "प्रयास गर्न %s थिच्नुहोस् ।"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "डिस्क फेला परेन"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "सीडीरोममा किकस्टार्ट फाइल फेला पार्न सकिँदैन ।"
 
-#: ../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 "डाइरेक्टरी %s पढ्न असफल भयो: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "लोड हुँदैछ"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ड्राइभर डिस्क पढ्दैछ..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ड्राइभर डिस्क स्रोत"
 
-#: ../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?"
@@ -5689,7 +5689,7 @@ msgstr ""
 "तपाईँसँग बहुँविध यन्त्रहरू छन् जसले ड्राइभर डिस्कका लागि स्रोतको रूपमा सेवा गर्न सक्छ । तपाईँ "
 "कुन प्रयोग गर्न चाहनुहुन्छ ?"
 
-#: ../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?"
@@ -5697,50 +5697,50 @@ msgstr ""
 "त्यहाँ यो यन्त्र बहुँविध विभाजनहरू छन् जसले ड्राइभर डिस्क छवि समाविष्ट गर्न सक्छ । तपाईँ कुन "
 "प्रयोग गर्न चाहनुहुन्छ ?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "विभाजन माउन्ट गर्न असफल भयो ।"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ड्राइभर डिस्क छवि चयन गर्नुहोस्"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "फाइलबाट ड्राइभर डिस्क लोड गर्न असफल भयो ।"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "/dev/%s मा तपाईँको ड्राइभर डिस्क घुसाउनुहोस् र जारी राख्न \"ठीक छ\" बटन थिच्नुहोस् ।"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ड्राइभर डिस्क घुसाउनुहोस्"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ड्राइभर डिस्क माउन्ट गर्न असफल भयो ।"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s को यो निस्काशनका लागि ड्राइभर डिस्क अवैध छ ।"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "म्यानुअल रूपमा रोज्नुहोस्"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "अर्को डिस्क लोड गर्नुहोस्"
 
-#: ../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 "
@@ -5749,38 +5749,38 @@ msgstr ""
 "यो ड्राइभर डिस्कमा उपयुक्त प्रकारको कुनै यन्त्र फेला परेन । तपाईँ म्यानुअल रूपमा ड्राइभर चयन "
 "गर्न चाहनुहुन्छ, जे भएपनि जारी राख्न चाहनुहुन्छ, वा अर्को ड्राइभर डिस्क लोड गर्न चाहनुहुन्छ ?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ड्राइभर डिस्क"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "तपाईँसँग ड्राइभर डिस्क छ ?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "अझ धेरै ड्राइभर डिस्क छ ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "तपाईँ अरू धेरै ड्राइभर डिस्क लोड गर्न चाहनुहुन्छ ?"
 
-#: ../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 "किकस्टार्ट त्रुटि"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "अज्ञात ड्राइभर डिस्क किकस्टार्ट स्रोत: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5788,7 +5788,7 @@ msgid ""
 msgstr ""
 "निम्न अवैध तर्क किकस्टार्ट ड्राइभर डिस्क आदेशका लागि निर्दिष्ट गरिएको थियो: %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 "
@@ -5799,26 +5799,26 @@ msgstr ""
 "परिमिति प्रविष्ट गर्नुहोस् । यदि तपाईँलाई पठाइने परिमितिबारे थाहा छैन भने, \"ठीक छ\" "
 "बटन थिचेर यो पर्दा फड्काउनुहोस् ।"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "मोड्युल परिमिति प्रविष्ट गर्नुहोस्"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "कुनै ड्राइभर फेला परेन"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ड्राइभर डिस्क लोड गर्नुहोस्"
 
-#: ../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 ""
 "म्यानुअल रूपमा घुसाउँन कुनै ड्राइभरहरू फेला परेन । तपाईँ ड्राइभर डिस्क प्रयोग गर्न चाहनुहुन्छ ?"
 
-#: ../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."
@@ -5826,33 +5826,33 @@ msgstr ""
 "कृपया तपाईँले लोड गर्न चाहनुभएको तलको ड्राइभर चयन गर्नुहोस् । यदि यो देखापरेन र तपाईँसँग "
 "ड्राइभर डिस्क छ भने, F2 थिच्नुहोस् ।"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "वैकल्पिक मोड्युल तर्क निर्दिष्ट गर्नुहोस्"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "लोड गर्न यन्त्र ड्राइभर चयन गर्नुहोस्"
 
-#: ../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 "मिडिया पत्ता लाग्यो"
 
-#: ../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 "स्थानीय स्थापना मिडिया पत्ता लाग्यो..."
 
-#: ../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 "
 "media."
 msgstr "त्यो डाइरेक्टरी भएको %s स्थापना ट्री तपाईँको बुट मिडियासँग मेल खाएको देखिँदैन ।"
 
-#: ../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."
@@ -5860,7 +5860,7 @@ msgstr ""
 "आईएसओ छविहरूबाट स्थापना पढ्दा एउटा त्रुटि देखापर्यो । कृपया तपाईँको आईएसओ छवि जाँच "
 "गर्नुहोस् र फेरि प्रयास गर्नुहोस् ।"
 
-#: ../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?"
@@ -5868,7 +5868,7 @@ msgstr ""
 "तपाईँको आफ्नो प्रणालीमा कुनै हार्डड्राइभ भएजस्तो देखिँदैन! तपाईँ प यन्त्रहरू कन्फिगर गर्न "
 "चाहनुहुन्छ ?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5879,62 +5879,62 @@ msgstr ""
 "यदि तपाईँले यहाँ सूचीबद्ध भएको तपाईँले प्रयोग गरिरहनुभएको डिस्क ड्राइभ देख्नुभएन भने, थप "
 "यन्त्रहरू कन्फिगर गर्न F2 थिच्नुहोस् ।"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "डाइरेक्टरी समात्ने छविहरू:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "विभाजन चयन गर्नुहोस्"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "यन्त्र %s ले %s सीडीरोम छविहरू समाविष्ट गर्ने जस्तो देखिँदैन ।"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "एचडी किकस्टार्ट विधि आदेशमा खराब तर्क %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 "हार्डड्राइभमा किकस्टार्ट फाइल फेला पार्न सकिँदैन ।"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS डिस्क %s का लागि हार्डड्राइभ फेला पार्न सकिँदैन"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "कुञ्जीपाटी प्रकार"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "तपाईँसँग कस्तो प्रकारको कुञ्जीपाटी छ ?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "किकस्टार्ट फाइल खोल्दा त्रुटि %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "किकस्टार्ट फाइलको सामग्रीहरू पढ्दा त्रुटि %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "किकस्टार्ट फाइल %s को %d रेखामा %s मा त्रुटि ।"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "बुट फ्लपीमा ks.cfg फेला पार्न सकिँदैन ।"
 
-#: ../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."
@@ -5942,51 +5942,51 @@ msgstr ""
 "किकस्टार्ट फाइल डाउनलोड गर्न असक्षम । कृपया तलको किकस्टार्ट परिमिति परिमार्जन गर्नुहोस् "
 "वा एउटा अन्तरक्रियात्मक स्थापनाको रूपमा प्रक्रिया गर्न 'रद्द गर्नुहोस्' बटन थिच्नुहोस् ।"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "किकस्टार्ट फाइल डाउनलोड गर्दा त्रुटि"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "किकस्टार्ट विधि आदेश बन्द गर्न खराब तर्क %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%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> तत्वहरू बीच  | <Space> चयन गर्दछ | <F12> पछिल्लो पर्दा"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "भाषा रोज्नुहोस्"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "स्थानीय सीडी/डीभीडी"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "हार्डड्राइभ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "एनएफएस डाइरेक्टरी"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s मा स्वागत छ"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "डिस्क स्रोत अद्यावधिक गर्नुहोस्"
 
-#: ../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?"
@@ -5994,7 +5994,7 @@ msgstr ""
 "तपाईँसँग बहुँविध यन्त्रहरू छन् जसले एउटा अद्यावधिक डिस्कका लागि स्रोतको रूपमा सेवा गर्न सक्छ "
 "। तपाईँ कुन प्रयोग गर्न चाहनुहुन्छ ?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6003,29 +6003,29 @@ msgstr ""
 "त्यहाँ यो यन्त्र बहुँविध विभाजनहरू छन् जसले ड्राइभर डिस्क छवि समाविष्ट गर्न सक्छ । तपाईँ कुन "
 "प्रयोग गर्न चाहनुहुन्छ ?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "/dev/%s मा तपाईँको अद्यावधिक डिस्क घुसाउनुहोस् र जारी राख्न \"ठीक छ\" बटन थिच्नुहोस् ।"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "डिस्क अद्यावधिक गर्दछ"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "अद्यावधिक डिस्क माउन्ट गर्न असफल भयो"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "अद्यावधिकहरू"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "एनोकन्डा अद्यावधिकहरू पढ्दैछ..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6034,45 +6034,45 @@ msgstr ""
 "किकस्टार्ट फाइल डाउनलोड गर्न असक्षम । कृपया तलको किकस्टार्ट परिमिति परिमार्जन गर्नुहोस् "
 "वा एउटा अन्तरक्रियात्मक स्थापनाको रूपमा प्रक्रिया गर्न 'रद्द गर्नुहोस्' बटन थिच्नुहोस् ।"
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "किकस्टार्ट फाइल डाउनलोड गर्दा त्रुटि"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "तपाईँसँग यो मेशिनमा %s स्थापना गर्न पर्याप्त र्याम छैन ।"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "छुटकरा विधि"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "स्थापना विधि"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "छुटेको छविले कस्तो खालको मिडिया समाविष्ट गर्दछ ?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "स्थापना गर्नका लागि प्याकेजहरूले कस्तो खालको मिडिया समाविष्ट गर्दछ ?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ड्राइभर फेला परेन"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ड्राइभर चयन गर्नुहोस्"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ड्राइभर डिस्क प्रयोग गर्नुहोस्"
 
-#: ../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?"
@@ -6080,11 +6080,11 @@ msgstr ""
 "यो स्थापना प्रकारका लागि आवश्यक परेको जस्तो कुनै यन्त्रहरू फेला पार्न असक्षम भयो । तपाईँ "
 "म्यानुअल तरीकाले आफ्नो ड्राइभर चयन गर्न चाहनुहुन्छ वा ड्राइभर डिस्क प्रयोग गर्न चाहनुहुन्छ?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "निम्न यन्त्रहरू तपाईँको प्रणालीमा फेला पर्यो ।"
 
-#: ../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?"
@@ -6092,49 +6092,49 @@ msgstr ""
 "तपाईँको प्रणालीका लागि कुनै यन्त्र ड्राइभरहरू लोड गरिएको छैन । तपाईँ अहिले कुनै लोड गर्न "
 "चाहनुहुन्छ ?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "यन्त्र"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "पूरा भयो"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "यन्त्र थप्नुहोस्"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "लोडर पहिल्यै चलाइएको छ । शेल सुरु गर्दै ।\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "एनोकन्डा चलाउँदै, %s छुटकरा मोड - कृपया प्रतिक्षा गर्नुहोस्...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "एनोकन्डा चलाउँदै, %s प्रणाली स्थापक - कृपया प्रतिक्षा गर्नुहोस्...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "स्थापना छवि %s फेला पार्न असक्षम"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" जाँच गर्दैछ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "अहिले मिडिया जाँच गर्दैछ..."
 
-#: ../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."
@@ -6142,7 +6142,7 @@ msgstr ""
 "प्राथमिक भोल्युम वर्णनकर्ताबाट डिस्क चेकसम पढ्न असक्षम भयो । यसको अर्थ सम्भवत डिस्क चेकसम "
 "थप नगरी सिर्जना गरिएको थियो ।"
 
-#: ../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 "
@@ -6152,18 +6152,18 @@ msgstr ""
 "सक्छ । यदि अनुकूल भएमा, कृपया डिस्क खाली गर्नुहोस् र फेरि प्रयास गर्नुहोस् । यदि यो "
 "परीक्षण जारी रहेमा तपाईँले स्थापना जारी राख्नुहुने छैन ।"
 
-#: ../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"
@@ -6174,21 +6174,21 @@ msgstr ""
 "\n"
 "   %s ?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "चेकसम परीक्षण"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "यन्त्र किकस्टार्ट विधि आदेशमा खराब तर्क %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "किकस्टार्ट यन्त्र आदेशका लागि दुवै मोड्युल प्रकार र नाम निर्दिष्ट गरिनुपर्छ ।"
 
-#: ../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"
@@ -6196,7 +6196,7 @@ msgstr ""
 "उपसर्ग IPv4 सञ्जालका लागि १ र ३२ को बीचमा वा IPv6 सञ्जालका लागि १ र १२८ को "
 "बीचमा हुनुपर्छ"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6207,27 +6207,27 @@ msgstr ""
 "ESSID र गुप्तिकरण कुञ्जी उपलब्ध गराउनुहोस् । यदि कुञ्जी आवश्यक परेन भने, यो फाँट खाली "
 "छोड्नुहोस् र स्थापना जारी रहनेछ ।"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "गुप्तिकरण कुञ्जी"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "ताररहित सेटिङ"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "नामसर्भर आईपी"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "नामसर्भर हराइरहेको छ"
 
-#: ../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 "
@@ -6237,56 +6237,56 @@ msgstr ""
 "गरेन । यदि तपाईँसँग यो जानकारी छैन भने, तपाईँले यो फाँट खाली छोड्न सक्नुहुन्छ र स्थापना "
 "जारी रहनेछ ।"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "अवैध आईपी जानकारी"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "तपाईँले एउटा अवैध आईपी ठेगाना प्रविष्ट गर्नुभयो ।"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "सञ्जाल त्रुटि"
 
-#: ../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 "त्यहाँ तपाईँको सञ्जाल इन्टरफेस कन्फिगर गर्दा एउटा त्रुटि थियो ।"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP कन्फिगर गर्नुहोस्"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "तपाईँले कम्तिमा एउटा प्रोटोकल चयन गर्नुपर्छ (IPv4 वा IPv6)"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 लाई NFS को आवश्यक पर्यो"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS स्थापना विधिलाई IPv4 समर्थनको आवश्यक पर्दछ ।"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ठेगाना:"
 
-#: ../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 ठेगाना:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "नाम सर्भर:"
 
-#: ../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 "
@@ -6296,157 +6296,157 @@ msgstr ""
 "थोप्ला लगाएको-क्वाड नेटमास्क वाCIDR-शैली उपसर्ग स्वीकार्य छन् । गेटवे र नाम सर्भर फाँट वैध "
 "IPv4 वा IPv6 ठेगानाहरू हुन् ।"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "म्यानुअल टीसीपी/आईपी कन्फिगरेसन"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "हराइरहेको जानकारी"
 
-#: ../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 "तपाईँले दुवै वैध IPv4 ठेगाना र सञ्जाल मास्क वा CIDR उपसर्ग प्रविष्ट गर्नुपर्छ ।"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "तपाईँले दुवै वैध IPv6 ठेगाना र CIDR उपसर्ग प्रविष्ट गर्नुपर्छ ।"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "होस्टनाम र डोमेन निर्धारण गर्दैछ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "किकस्टार्ट सञ्जाल आदेशमा खराब तर्क %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "सञ्जाल आदेशमा खराब बुटप्रोटो %s निर्दिष्ट गर्यो"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "सञ्जाल यन्त्र"
 
-#: ../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 ""
 "तपाईँसँग यो प्रणालीमा बहुँविध सञ्जाल यन्त्रहरू छन् । तपाईँ कुन मार्फत स्थापना गर्न चाहनुहुन्छ ?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS सर्भर नाम:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s डाइरेक्टरी:"
 
-#: ../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 सेटअप"
 
-#: ../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 "पुन: प्राप्त गर्दै"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "त्यो डाइरेक्टरी सर्भरबाट माउन्ट हुन सक्दैन ।"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "त्यो डाइरेक्टरीले %s स्थापना ट्री समाविष्ट गर्छ जस्तो देखिँदैन ।"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS किकस्टार्ट विधि आदेशमा खराब तर्क %s: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "टेलनेट"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "टेलनेट जडानका लागि प्रतिक्षा गर्दैछ..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "टेलनेट मार्फत एनोकन्डा चलाइदैछ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s://%s/%s/%s पुन: प्राप्त गर्न असक्षम ।"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "स्थापना छवि पुन: प्राप्त गर्न असक्षम ।"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "यूआरएल किकस्टार्ट विधि आदेशमा खराब तर्क %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "यूआरएल किकस्टार्ट विधिमा यूआरएल तर्क पठाउनुपर्छ ।"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "अज्ञात यूआरएल विधि %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 "TCP/IP कन्फिगर गर्नुहोस्"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS सेटअप"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "तपाईँले डाइरेक्टरी प्रविष्ट गर्नुपर्छ ।"
 
-#: ../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 "अज्ञात होस्ट"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s वैध होस्टनाम होइन ।"
 
-#: ../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."
@@ -6454,24 +6454,24 @@ msgstr ""
 "यदि तपाईँ एचटीटीपी प्रोक्सी सर्भर प्रयोग गरिरहनुभएको छ भने प्रयोग गर्नका लागि "
 "एचटीटीपी प्रोक्सी सर्भरको नाम प्रविष्ट गर्नुहोस् ।"
 
-#: ../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 "अघिल्लो FTP सेटअप"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ड्राइभर लोड हुँदैछ"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s ड्राइभर लोड हुँदैछ..."
diff --git a/po/nl.po b/po/nl.po
index cc4912eb7..5f664d153 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -55,41 +55,41 @@ msgstr "Druk op <Enter> om een shellprompt te krijgen"
 #: ../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"
 
@@ -592,22 +592,22 @@ msgstr "Aanpassen van de grootte van het bestandssysteem op %s..."
 #: ../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 "Fout"
 
@@ -663,8 +663,8 @@ msgstr ""
 "Druk op <Enter> om het installatieprogramma af te sluiten."
 
 #: ../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 "Overslaan"
 
@@ -1008,21 +1008,21 @@ msgstr "Herstellen"
 
 #: ../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 "Ja"
 
 #: ../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 "Nee"
 
-#: ../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 "Opnieuw"
 
@@ -1033,8 +1033,8 @@ msgstr "Negeren"
 #: ../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 "Annuleren"
 
@@ -1917,21 +1917,21 @@ msgid "_Write changes to disk"
 msgstr "Veranderingen naar schijf _schrijven"
 
 #: ../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 "Terug"
 
 #: ../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 "Doorgaan"
 
@@ -2371,7 +2371,7 @@ msgstr "Voer uw %(instkey)s in"
 msgid "Skip entering %(instkey)s"
 msgstr "Invoeren van %(instkey)s overslaan"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Welkom bij %s voor %s"
@@ -3283,7 +3283,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Taalkeuze"
 
-#: ../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 "Welke taal wilt u gebruiken tijdens het installatieproces?"
 
@@ -3665,7 +3665,7 @@ msgstr "Voor het veld %s is een waarde vereist."
 msgid "Dynamic IP"
 msgstr "Dynamisch 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 "Verzenden van IP-informatieverzoek voor %s..."
@@ -3837,7 +3837,7 @@ msgstr "onbekend"
 msgid "Hardware address: "
 msgstr "Hardware-adres: "
 
-#: ../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 "Ontbrekend protocol"
 
@@ -3846,7 +3846,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "U moet tenminste IPv4 of IPv6-ondersteuning kiezen."
 
 #: ../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 "Ongeldige prefix"
 
@@ -4088,7 +4088,7 @@ msgstr "RAID-opstellingen"
 msgid "None"
 msgstr "Geen"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Harde schijven"
 
@@ -5013,12 +5013,12 @@ msgstr "Prefix"
 msgid "Activate on boot"
 msgstr "Activeren bij het opstarten"
 
-#: ../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 "IPv4-ondersteuning aanzetten"
 
-#: ../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 "IPv6-ondersteuning aanzetten"
@@ -5139,7 +5139,7 @@ msgstr "Automatisch 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:"
 
@@ -5763,22 +5763,22 @@ msgstr ""
 "* Zult u geen software en beveiligingsupdates kunnen krijgen voor pakketten "
 "die niet in uw abonnement zitten."
 
-#: ../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 "Controle van mediadrager"
 
-#: ../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 "Testen"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Schijf uitwerpen"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5788,7 +5788,7 @@ msgstr ""
 "of kies \"%s\" om de schijf uit te werpen en een andere in te voeren om "
 "getest te worden."
 
-#: ../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 "
@@ -5804,7 +5804,7 @@ msgstr ""
 "getest is het niet vereist om elke schijf opnieuw te testen als u ze weer "
 "gaat gebruiken."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5813,11 +5813,11 @@ msgstr ""
 "De %s schijf werd in geen van uw stations gevonden. Voer de %s schijf in en "
 "druk op %s om opnieuw te proberen."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Schijf gevonden"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5828,7 +5828,7 @@ msgstr ""
 "\n"
 "Kies %s om de mediatest over te slaan en met de installatie te beginnen."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5837,7 +5837,7 @@ msgstr ""
 "Er is geen %s schijf gevonden overeenkomstig met uw opstartmedia. Voer de %s "
 "schijf in en druk op %s om opnieuw te proberen."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5846,32 +5846,32 @@ msgstr ""
 "De %s schijf werd in geen van uw CDROM-stations gevonden. Voer de %s schijf "
 "in en druk op %s om opnieuw te proberen."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Schijf niet gevonden"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Kan kickstart-bestand op CDROM niet vinden."
 
-#: ../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 "Lezen van map %s: %s is mislukt"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Bezig met laden"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Inlezen van stuurprogrammadiskette..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Bron van stuurprogrammadiskette"
 
-#: ../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?"
@@ -5880,7 +5880,7 @@ msgstr ""
 "extra stuurprogramma's. Welke wilt u gebruiken?"
 
 # vertaling van "disk image" naar "bestand" ok?
-#: ../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?"
@@ -5888,53 +5888,53 @@ msgstr ""
 "Er zijn meerdere partities op dit apparaat die het stuurprogrammabestand "
 "kunnen bevatten.  Welke wilt u gebruiken?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Aankoppelen van partitie mislukt."
 
 # vertaling ok?
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Stuurprogrammabestand selecteren"
 
 # vertaling ok?
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Selecteer het stuurprogrammabestand."
 
 # vertaling ok?
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Laden van stuurprogrammabestand mislukt."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Voer uw stuurprogrammadiskette in /dev/%s en druk op \"OK\" om door te gaan."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Stuurprogrammadiskette invoeren"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Aankoppelen stuurprogrammadiskette mislukt."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Stuurprogrammadiskette is ongeldig voor deze uitgave van %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Kies handmatig"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Een andere diskette inladen"
 
-#: ../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 "
@@ -5944,38 +5944,38 @@ msgstr ""
 "stuurprogrammadiskette. Wilt u handmatig een stuurprogramma selecteren, "
 "doorgaan of een andere diskette met stuurprogramma's proberen?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Stuurprogrammadiskette"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Heeft u een stuurprogrammadiskette?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Meer stuurprogrammadiskettes?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Wilt u nog meer stuurprogrammadiskettes laden?"
 
-#: ../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 fout"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Onbekende stuurprogrammadiskette kickstart-bron: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5984,7 +5984,7 @@ msgstr ""
 "Het volgende ongeldige argument was opgegeven voor het kickstart "
 "stuurprogrammadiskette commando: %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 "
@@ -5995,19 +5995,19 @@ msgstr ""
 "werking beïnvloeden. Als u niet weet welke parameters u moet opgeven, kunt u "
 "dit scherm gewoon overslaan door nu op \"OK\" te drukken."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Voer moduleparameters in"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Geen stuurprogramma's gevonden"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Stuurprogrammadiskette laden"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6015,7 +6015,7 @@ msgstr ""
 "Geen handmatige in te voeren stuurprogramma's gevonden.  Wilt u een "
 "stuurprogrammadiskette gebruiken?"
 
-#: ../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."
@@ -6024,26 +6024,26 @@ msgstr ""
 "stuurprogramma niet in de lijst voorkomt, en u hebt een aparte "
 "stuurprogrammadiskette, druk dan op F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Optionele moduleparameters opgeven"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Selecteer een stuurprogramma"
 
-#: ../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 gevonden"
 
-#: ../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 "Lokale installatiemedia gevonden..."
 
-#: ../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 "
@@ -6052,7 +6052,7 @@ msgstr ""
 "De %s installatiebestanden in die map komen niet overeen met uw opstart-"
 "medium."
 
-#: ../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."
@@ -6060,7 +6060,7 @@ msgstr ""
 "Er is een fout opgetreden bij het lezen van de ISO-images. Controleer uw ISO-"
 "images en probeer opnieuw."
 
-#: ../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?"
@@ -6068,7 +6068,7 @@ msgstr ""
 "Schijnbaar heeft u geen harde schijven in uw systeem! Wilt u andere "
 "apparaten configureren?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6079,61 +6079,61 @@ msgstr ""
 "Als u de disk drive die u gebruikt hier niet ziet, druk dan op F2 om andere "
 "apparaten te configureren."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Map die de images bevat:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Partitie selecteren"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Apparaat %s bevat blijkbaar geen %s CDROM images."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Foutief argument voor harde schijf kickstart-methode commando %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 "Kan het kickstart-bestand niet vinden op de harddisk."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Kan geen harde schijf voor BIOS schijf %s vinden"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Toetsenbordtype"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Wat voor soort toetsenbord heeft u?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Fout bij het openen van kickstart-bestand %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Fout bij het lezen van de inhoud van het kickstart-bestand %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Fout in %s (regel %d) van het kickstart-bestand %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Kon ks.cfg niet op de verwisselbare media vinden."
 
-#: ../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."
@@ -6142,53 +6142,53 @@ msgstr ""
 "parameter beneden aan of druk op Annuleren om verder te gaan als een "
 "interactieve installatie."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Fout bij het downloaden van kickstart-bestand"
 
 # vertaling ok?
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Foutief argument voor 'uitschakelen' kickstart methode commando %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Welkom bij %s voor %s - Herstelmodus"
 
-#: ../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> tussen items | <Spatie> selecteren | <F12> volgend scherm"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Kies een taal"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokale CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Harde schijf"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS-map"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Welkom bij %s%n voor %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Bron van updatediskette"
 
-#: ../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?"
@@ -6197,7 +6197,7 @@ msgstr ""
 "gebruikt kunnen worden. Welke wilt u gebruiken?"
 
 # vertaling van "disk image" naar "bestand" ok?
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6205,28 +6205,28 @@ msgstr ""
 "Er zijn meerdere partities op dit apparaat die het update-bestand kunnen "
 "bevatten.  Welke wilt u gebruiken?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Voer uw updates-diskette in /dev/%s en druk op \"OK\" om door te gaan."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Updates-diskette"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Aankoppelen update-diskette mislukt"
 
-#: ../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 "Anaconda updates worden nu gelezen..."
 
-#: ../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.."
@@ -6234,45 +6234,45 @@ msgstr ""
 "Niet in staat om het updates-bestand te downloaden. Pas de updates-locatie "
 "beneden aan of druk op Annuleren om verder te gaan zonder updates."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Fout bij het downloaden van updates-bestand"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 "U hebt te weinig RAM-geheugen in deze machine om %s te kunnen installeren."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Herstelmethode"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installatiemethode"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Op wat voor medium staat het herstel-image?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Op wat voor medium staan de te installeren pakketten?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Geen stuurprogramma gevonden"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Stuurprogramma selecteren"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Stuurprogrammadiskette gebruiken"
 
-#: ../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?"
@@ -6281,63 +6281,63 @@ msgstr ""
 "Wilt u handmatig het stuurprogramma selecteren of gebruik maken van een "
 "diskette met stuurprogramma's?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "De volgende apparaten zijn op uw systeem gevonden."
 
-#: ../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 ""
 "Er zijn geen stuurprogramma's voor uw systeem geladen. Wilt u deze nu laden?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Apparaten"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Gereed"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Apparaat toevoegen"
 
 # mooier dan: de lader is reeds uitgevoerd, en... komt op hetzelfde neer.
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Het laden is reeds gedaan.  Shell wordt nu opgestart.\n"
 
 # vertaling correct?
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Opstarten van anaconda %s, de %s herstelmodus - even geduld\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Opstarten van anaconda %s, het %s installatieprogramma - even geduld\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Kan installatie-image %s niet vinden"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Controleren van \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Medium wordt nu gecontroleerd..."
 
-#: ../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."
@@ -6346,7 +6346,7 @@ msgstr ""
 "lezen. Dit betekent waarschijnlijk dat de schijf gemaakt is zonder het "
 "toevoegen van een controlesom."
 
-#: ../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 "
@@ -6357,11 +6357,11 @@ msgstr ""
 "schoon te maken en probeer het dan opnieuw. Als de schijf wederom niet door "
 "de test komt moet u niet doorgaan met de installatie."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Succes"
 
-#: ../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 "
@@ -6371,7 +6371,7 @@ msgstr ""
 "om vanaf deze media te installeren.  Hou er rekening mee dat niet alle "
 "media- en schijffouten gedetecteerd kunnen worden door de mediacontrole."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6382,21 +6382,21 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Somcontrole-test"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Foutief argument voor schijf kickstart methode commando %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Een modulenaam moet worden opgegeven voor het kickstart-apparaat commando."
 
-#: ../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"
@@ -6404,7 +6404,7 @@ msgstr ""
 "Prefix moet tussen 1 en 32 liggen voor IPv4-netwerken of tussen 1 en 128 "
 "voor IPv6-netwerken"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6415,27 +6415,27 @@ msgstr ""
 "die nodig zijn om uw draadloos netwerk te benaderen.  Als er geen sleutel "
 "nodig is kunt u dit veld leeg laten. De installatie zal dan verder gaan."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Encryptiesleutel"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Draadloze instellingen"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Naamserver IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Ontbrekende naamserver"
 
-#: ../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 "
@@ -6445,56 +6445,56 @@ msgstr ""
 "naamserver-adres. Als u deze informatie niet hebt, kunt u het veld leeg "
 "houden en de installatie zal verder gaan."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ongeldige IP-informatie"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "U hebt een ongeldig IP-adres ingevuld."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: ../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 "Er was een fout bij het configureren van uw netwerkinterface."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP configureren"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "U moet tenminste één protocol (IPv4 of IPv6) kiezen."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 is benodigd voor NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Installatie via NFS vereist IPv4-ondersteuning."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4-adres:"
 
-#: ../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-adres:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Naamserver:"
 
-#: ../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 "
@@ -6504,44 +6504,44 @@ msgstr ""
 "zijn de netmask met 4 maal een punt of de CIDR-stijl prefix acceptabel. De "
 "gateway en naamserver velden dienen geldige IPv4 of IPv6-adressen te zijn."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Handmatige TCP/IP-configuratie"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Ontbrekende informatie"
 
-#: ../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 ""
 "U moet zowel een geldig IPv4-adres en een netwerkmasker of CIDR-prefix "
 "invoeren."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "U moet zowel een geldig IPv6-adres en een CIDR-prefix invoeren."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Computernaam en domein worden vastgesteld..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Foutief argument voor het kickstart netwerk commando %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Foutief opstartprotocol %s opgegeven in netwerkopdracht"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Netwerkapparaat"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6549,112 +6549,112 @@ msgstr ""
 "U hebt meerdere netwerkapparaten op dit systeem. Welke wilt u gebruiken voor "
 "de installatie?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS-server naam:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s map:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Voer de servernaam in en het pad naar uw %s images."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS-instellingen"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Computernaam opgegeven zonder DNS geconfigureerd"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Die map kon niet vanaf de server worden aangekoppeld."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Die map bevat kennelijk geen %s installatiebestanden."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Foutief argument voor het NFS kickstart methode commando %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 "Bezig met wachten op telnetverbinding..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Anaconda wordt via telnet opgestart..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Niet in staat om %s://%s/%s binnen te halen."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Niet in staat om het installatie-image binnen te halen."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Foutief argument voor het URL kickstart methode commando %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "U moet een --url argument meegeven voor de kickstart URL methode."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Onbekende URL methode %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Voer de URL in die de %s images op uw server bevat."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Proxy configureren"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL-instellingen"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "U moet een URL opgeven."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL moet ofwel een ftp of een http URL zijn"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Onbekende computer"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s is geen geldige computernaam."
 
-#: ../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."
@@ -6662,23 +6662,23 @@ msgstr ""
 "Als u een HTTP-proxyserver gebruikt, moet u de naam van de HTTP-proxyserver "
 "invoeren."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Proxy-naam:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Proxy-poort:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Verdere configuratie"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI-stuurprogramma wordt geladen"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Stuurprogramma %s wordt nu geladen..."
diff --git a/po/nn.po b/po/nn.po
index 43c154d74..36ec7f30c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -42,41 +42,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 "OK"
 
@@ -512,22 +512,22 @@ msgstr "Feil ved opning av fila '%1': %2"
 #: ../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 "Feil"
 
@@ -576,8 +576,8 @@ msgid ""
 msgstr ""
 
 #: ../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 "Hopp over"
 
@@ -824,21 +824,21 @@ msgstr "Rett opp"
 
 #: ../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 "Ja"
 
 #: ../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 "Nei"
 
-#: ../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 "Prøv igjen"
 
@@ -849,8 +849,8 @@ msgstr "Ignorer"
 #: ../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 "Avbryt"
 
@@ -1634,21 +1634,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 "Tilbake"
 
 #: ../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 "Fortset"
 
@@ -2032,7 +2032,7 @@ msgstr "&Skriv inn namnet ditt:"
 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 "Velkomen til KDE!"
@@ -2867,7 +2867,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Språkval"
 
-#: ../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 ""
 
@@ -3242,7 +3242,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr "Dynamisk IP-adresse"
 
-#: ../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
 #, fuzzy, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "Les brukarinformasjon ..."
@@ -3423,7 +3423,7 @@ msgstr "Ukjend"
 msgid "Hardware address: "
 msgstr "IP-adresse:"
 
-#: ../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 "Rekningsinformasjon"
@@ -3434,7 +3434,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Du må velja minst ein skrivar."
 
 #: ../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 "Ugyldig format"
@@ -3693,7 +3693,7 @@ msgstr "CD-eining"
 msgid "None"
 msgstr "Ingen"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 #, fuzzy
 msgid "Hard Drives"
 msgstr "Harddisk"
@@ -4558,12 +4558,12 @@ msgstr "Ugyldig format"
 msgid "Activate on boot"
 msgstr "Aktiver og senk"
 
-#: ../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 ""
@@ -4692,7 +4692,7 @@ msgstr ""
 msgid "DHCPv6"
 msgstr "KDCOP"
 
-#: ../textw/network_text.py:678 ../loader2/net.c:1055
+#: ../textw/network_text.py:678 ../loader/net.c:1055
 #, fuzzy
 msgid "Gateway:"
 msgstr "Gateway"
@@ -5344,29 +5344,29 @@ 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 ""
 
-#: ../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
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -5376,19 +5376,19 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Ingen disker funne"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5396,161 +5396,161 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Ingen disker funne"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../loader2/copy.c:51 ../loader2/method.c:121 ../loader2/method.c:347
+#: ../loader/copy.c:51 ../loader/method.c:121 ../loader/method.c:347
 #, fuzzy, c-format
 msgid "Failed to read directory %s: %s"
 msgstr "Kunne ikkje lesa katalog."
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 #, fuzzy
 msgid "Loading"
 msgstr "lastar"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 #, fuzzy
 msgid "Reading driver disk..."
 msgstr "Kunne ikkje lasta biletefil."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 #, fuzzy
 msgid "Driver Disk Source"
 msgstr "&Drivarar"
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 #, fuzzy
 msgid "Failed to mount partition."
 msgstr "Kunne ikkje kopla til."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 #, fuzzy
 msgid "Select driver disk image"
 msgstr "Vel felta som skal visast"
 
-#: ../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 "Kunne ikkje lasta biletefil."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 #, fuzzy
 msgid "Insert Driver Disk"
 msgstr "&Drivarar"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 #, fuzzy
 msgid "Failed to mount driver disk."
 msgstr "Kunne ikkje lasta biletefil."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, fuzzy, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr ""
 "Stien du oppga er ikkje ein gyldig katalog.\n"
 "Rett opp dette."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 #, fuzzy
 msgid "Driver disk"
 msgstr "&Drivarar"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 #, fuzzy
 msgid "Do you have a driver disk?"
 msgstr " Vil du prøva ein gong til?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 #, fuzzy
 msgid "More Driver Disks?"
 msgstr "&Drivarar"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 #, fuzzy
 msgid "Do you wish to load any more driver disks?"
 msgstr " Vil du prøva ein gong til?"
 
-#: ../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
 #, fuzzy
 msgid "Kickstart Error"
 msgstr "Kicker-feil!"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5558,69 +5558,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 #, fuzzy
 msgid "Enter Module Parameters"
 msgstr "Parametrar"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 #, fuzzy
 msgid "No drivers found"
 msgstr "Ingen disker funne"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 #, fuzzy
 msgid "Load driver disk"
 msgstr " Vil du prøva ein gong til?"
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 #, fuzzy
 msgid "Specify optional module arguments"
 msgstr "Parametrar"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 #, fuzzy
 msgid "Select Device Driver to Load"
 msgstr "Vel felta som skal visast"
 
-#: ../loader2/hdinstall.c:80 ../loader2/nfsinstall.c:168
-#: ../loader2/urlinstall.c:274
+#: ../loader/hdinstall.c:80 ../loader/nfsinstall.c:168
+#: ../loader/urlinstall.c:274
 #, fuzzy
 msgid "Media Detected"
 msgstr "Ikkje noko mus funne"
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/hdinstall.c:335
+#: ../loader/hdinstall.c:335
 #, fuzzy
 msgid ""
 "You don't seem to have any hard drives on your system! Would you like to "
@@ -5629,7 +5629,7 @@ msgstr ""
 "Du ser ikkje ut til å ha brukt KOrn før.\n"
 "Vil du ha eit standardoppsett laga for deg?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5637,219 +5637,219 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 #, fuzzy
 msgid "Directory holding images:"
 msgstr "Katalogar ..."
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 #, fuzzy
 msgid "Select Partition"
 msgstr "Vel mønster:"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, fuzzy, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%1 ser ikkje ut til å vera ein RPM-pakke"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
 #, fuzzy
 msgid "Keyboard Type"
 msgstr "Tastaturrepetisjon"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, fuzzy, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Feil ved opning av fila '%1': %2"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, fuzzy, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "feil ved lesing frå fila %1"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, fuzzy, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "feil ved lesing frå fila %1"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Finn ikkje skrifttype"
 
-#: ../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 "Feil ved opning av fila '%1': %2"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Velkomen til KDE!"
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 #, fuzzy
 msgid "Choose a Language"
 msgstr "Nytt språk"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Lokal"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 #, fuzzy
 msgid "Hard drive"
 msgstr "Harddisk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "Rotkatalog:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Velkomen til KDE!"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 #, fuzzy
 msgid "Update Disk Source"
 msgstr "Oppdater"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 #, fuzzy
 msgid "Updates Disk"
 msgstr "Oppdater"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 #, fuzzy
 msgid "Failed to mount updates disk"
 msgstr "Kunne ikkje lasta biletefil."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 #, fuzzy
 msgid "Updates"
 msgstr "Oppdater"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 #, fuzzy
 msgid "Reading anaconda updates..."
 msgstr "Les side på nytt ..."
 
-#: ../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 "Feil ved opning av fila '%1': %2"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, fuzzy, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 "Du har ikkje nok RAM til å bruka grafisk installasjon. Startar i tekstmodus."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 #, fuzzy
 msgid "Rescue Method"
 msgstr "Mottaksmetode"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 #, fuzzy
 msgid "Installation Method"
 msgstr "Installasjonskatalog"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 #, fuzzy
 msgid "What type of media contains the packages to be installed?"
 msgstr "teljer pakkar som skal installerast"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 #, fuzzy
 msgid "No driver found"
 msgstr "Ingen disker funne"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 #, fuzzy
 msgid "Select driver"
 msgstr "Vel felta som skal visast"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 #, fuzzy
 msgid "Use a driver disk"
 msgstr " Vil du prøva ein gong til?"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../loader2/loader.c:1417
+#: ../loader/loader.c:1417
 #, fuzzy
 msgid ""
 "No device drivers have been loaded for your system.  Would you like to load "
@@ -5858,75 +5858,75 @@ msgstr ""
 "Du ser ikkje ut til å ha brukt KOrn før.\n"
 "Vil du ha eit standardoppsett laga for deg?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Einingar"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 #, fuzzy
 msgid "Add Device"
 msgstr "Eining"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Køyrer autoconf/automake ..."
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Køyrer autoconf/automake ..."
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, fuzzy, c-format
 msgid "Unable to find install image %s"
 msgstr "Kunne ikkje motta fil"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 #, fuzzy
 msgid "Success"
 msgstr "Vellukka"
 
-#: ../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
 #, fuzzy, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -5934,26 +5934,26 @@ msgid ""
 "   %s?"
 msgstr "Vil du fortsetta med oppgraderinga?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5961,295 +5961,295 @@ msgid ""
 "field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 #, fuzzy
 msgid "ESSID"
 msgstr "SCSI"
 
-#: ../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 "Ymse"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 #, fuzzy
 msgid "Nameserver IP"
 msgstr "Name=X-tenar"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Name=X-tenar"
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 #, fuzzy
 msgid "Invalid IP Information"
 msgstr "Ugyldig format"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 #, fuzzy
 msgid "You entered an invalid IP address."
 msgstr "Oppgi ei gyldig e-postadresse."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Inga ISDN-støtte"
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 #, fuzzy
 msgid "Configure TCP/IP"
 msgstr "Set opp AI"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Du må velja minst ein skrivar."
 
-#: ../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 "IP-adresse:"
 
-#: ../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 "IP-adresse:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Name=X-tenar"
 
-#: ../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 "Oppsett"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 #, fuzzy
 msgid "Missing Information"
 msgstr "Rekningsinformasjon"
 
-#: ../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 "Du må oppgi ei skrivaradresse."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Du må oppgi ei skrivaradresse."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 #, fuzzy
 msgid "Determining host name and domain..."
 msgstr "Avgjer suspenderingsstatus ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 #, fuzzy
 msgid "Networking Device"
 msgstr "Nettverk"
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 #, fuzzy
 msgid "NFS server name:"
 msgstr "&Tenarnamn:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, fuzzy, c-format
 msgid "%s directory:"
 msgstr "Rotkatalog:"
 
-#: ../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
 #, fuzzy
 msgid "NFS Setup"
 msgstr "DNS-oppsett"
 
-#: ../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
 #, fuzzy
 msgid "Retrieving"
 msgstr "Omstartar"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 #, fuzzy
 msgid "That directory could not be mounted from the server."
 msgstr ""
 "Protokollen %1\n"
 "implementerar ikkje ei katalogteneste"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, fuzzy, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 "Den katalogen finst ikkje.\n"
 "Vil du laga den?"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 #, fuzzy
 msgid "Telnet"
 msgstr "Telex"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 #, fuzzy
 msgid "Running anaconda via telnet..."
 msgstr "Køyrer autoconf/automake ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Kunne ikkje motta fil"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 #, fuzzy
 msgid "Unable to retrieve the install image."
 msgstr "Kunne ikkje motta fil"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, fuzzy, c-format
 msgid "Unknown Url method %s"
 msgstr "ukjend korttype"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, fuzzy, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Vel katalogen som inneheld køyrenivåkatalogane "
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "Set opp AI"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "DNS-oppsett"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Du må skriva eit namn"
 
-#: ../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 "Ukjend vert"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, fuzzy, c-format
 msgid "%s is not a valid hostname."
 msgstr "Dette er ikkje eit gyldig filnamn.\n"
 
-#: ../loader2/urls.c:380
+#: ../loader/urls.c:380
 #, fuzzy
 msgid ""
 "If you are using a HTTP proxy server enter the name of the HTTP proxy server "
 "to use."
 msgstr "Dersom du vil bruka ein HTTP-proxytenar, oppgi adressa her."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 #, fuzzy
 msgid "Proxy Name:"
 msgstr "Brukarnamn:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 #, fuzzy
 msgid "Proxy Port:"
 msgstr "&FTP-proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 #, fuzzy
 msgid "Further Setup"
 msgstr "SMTP-oppsett"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 #, fuzzy
 msgid "Loading SCSI driver"
 msgstr "&Last drivar"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, fuzzy, c-format
 msgid "Loading %s driver..."
 msgstr "Lastar grupper ..."
diff --git a/po/nso.po b/po/nso.po
index a39e21541..16cdeabaa 100644
--- a/po/nso.po
+++ b/po/nso.po
@@ -47,41 +47,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 "Go Lokile"
 
@@ -584,22 +584,22 @@ msgstr "Go dira sebopego sa %s sa tshepedišo ya faele..."
 #: ../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 "Phošo"
 
@@ -655,8 +655,8 @@ msgstr ""
 "Kgotla <Tsena> gore o thomološe tshepedišo ya gago."
 
 #: ../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 "Taboga"
 
@@ -968,21 +968,21 @@ msgstr "Lokiša"
 
 #: ../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 "Ee"
 
 #: ../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 "Aowa"
 
-#: ../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 "Leka gape"
 
@@ -993,8 +993,8 @@ msgstr "Hlokomologa"
 #: ../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 "Khansela"
 
@@ -1876,21 +1876,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 "Morago"
 
 #: ../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 "Tšwela pele"
 
@@ -2328,7 +2328,7 @@ msgstr "Hle tsenya leina la sehlopha la bolumo."
 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 "O a amogelwa go %s"
@@ -3253,7 +3253,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Kgetho ya Leleme"
 
-#: ../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 ""
 "Ke leleme lefe leo o tla ratago go le diriša nakong ya mosepelo wo wa go "
@@ -3644,7 +3644,7 @@ msgstr "Boleng bo a nyakega bakeng sa lebala la \"%s\"."
 msgid "Dynamic IP"
 msgstr "IP e Maatla"
 
-#: ../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 "Go romela dikgopelo bakeng sa tshedimošo ya IP bakeng sa %s..."
@@ -3836,7 +3836,7 @@ msgstr "E sa tsebjwego"
 msgid "Hardware address: "
 msgstr "Aterese ya Lenaneo la Khomphuthara:"
 
-#: ../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 "Sehlopha se sa Hwetšagalego"
@@ -3848,7 +3848,7 @@ msgstr ""
 "O swanetše go kgetha bonyenyane leleme le tee leo le swanetšego go tsenywa."
 
 #: ../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 "Mothalo wa IP wo e sego wa kgonthe"
@@ -4092,7 +4092,7 @@ msgstr "Didirišwa tša RAID"
 msgid "None"
 msgstr "Ga di gona"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Di-draeve tše Thata"
 
@@ -5049,12 +5049,12 @@ msgstr "Mothalo wa IP wo e sego wa kgonthe"
 msgid "Activate on boot"
 msgstr "Diragatša ge o thoma"
 
-#: ../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 ""
@@ -5184,7 +5184,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 "Pulatsela:"
 
@@ -5826,23 +5826,23 @@ 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 "Go Lekolwa ga Methopo ya Ditaba"
 
-#: ../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 "Leka"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Ntšha 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 "
@@ -5851,7 +5851,7 @@ msgstr ""
 "Kgetha \"%s\" go leka CD yeo gona bjale e lego draeveng, goba \"%s\" gore o "
 "ntšhe CD gomme o tsenye e nngwe gore o e leke."
 
-#: ../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 "
@@ -5861,7 +5861,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 "
@@ -5870,12 +5870,12 @@ msgstr ""
 "CD ya %s ga se ya hwetšwa go le ge ele efe ya di-draeve tša gago tša CDROM. "
 "Hle tsenya CD ya %s ke moka o kgotle %s gore o leke gape."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD e Hweditšwe"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5887,7 +5887,7 @@ msgstr ""
 "\n"
 "Kgetha %s gore o taboge teko ya methopo ya ditaba ke moka o thome go tsenya."
 
-#: ../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 "
@@ -5897,7 +5897,7 @@ msgstr ""
 "ditaba ya go thoma.  Hle tsenya CD ya %s ke moka o kgotle %s gore o leke "
 "gape."
 
-#: ../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 "
@@ -5906,33 +5906,33 @@ msgstr ""
 "CD ya %s ga se ya hwetšwa go le ge ele efe ya di-draeve tša gago tša CDROM. "
 "Hle tsenya CD ya %s ke moka o kgotle %s gore o leke gape."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD ga se ya Hwetšwa"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "E ka se hwetše faele ya go thomiša go 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 "E paletšwe go bala tšhupetšo ya %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Go laiša"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Go bala tisiki ya mootledi..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Mothopo wa Tisiki ya Mootledi"
 
-#: ../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?"
@@ -5940,7 +5940,7 @@ msgstr ""
 "O na le didirišwa tše dintši tšeo di ka šomago bjalo ka methopo bakeng sa "
 "tisiki ya mootledi. Ke efe yeo o tla ratago go e diriša?"
 
-#: ../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?"
@@ -5948,51 +5948,51 @@ msgstr ""
 "Go na le dikarolo tše dintši sedirišweng se tšeo di ka bago le seswantšho sa "
 "tisiki ya mootledi. Na o ka rata go diriša?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "E paletšwe go kgobelanya karolo."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Kgetha seswantšho sa tisiki ya mootledi"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Kgetha faele yeo e lego seswantšho sa tisiki ya gago ya mootledi."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "E paletšwe go laiša tisiki ya mootledi go tšwa faeleng."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Tsenya tisiki ya gago ya mootledi go /dev/%s ke moka o kgotle \"Go Lokile\" "
 "gore o tšwele pele."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Tsenya Tisiki ya Mootledi"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "E paletšwe go kgobelanya tisiki ya mootledi."
 
-#: ../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 "Kgetha ka go itirela"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Laiša tisiki e nngwe"
 
-#: ../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 "
@@ -6002,39 +6002,39 @@ msgstr ""
 "Na o ka rata go ikgethela mootledi, tšwela pele lege go le bjalo, goba o "
 "laiše tisiki e nngwe ya mootledi?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Tisiki ya mootledi"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Na o nale tisiki ya mootledi?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Ditisiki tše Oketšegilego tša Mootledi?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 "Na o rata go laiša ditisiki le ge ele dife tše oketšegilego tša mootledi?"
 
-#: ../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 "Phošo ya go Thomiša"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Mothopo o sa tsebjwego wa go thomiša tisiki ya mootledi: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -6043,7 +6043,7 @@ msgstr ""
 "Ngangišano e latelago yeo e sego ya kgonthe e laeditšwe bakeng sa taelo ya "
 "tisiki ya mootledi ya go thomiša: %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 "
@@ -6056,19 +6056,19 @@ msgstr ""
 "go kgotla konope ya \"Go Lokile\". Lelokelelo la dikgetho tšeo di lego gona "
 "le ka hwetšwa ka go kgotla senotlelo sa F1."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Tsenya Dikarolwana tša Sebopego"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ga go na baotledi bao ba hweditšwego"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Laiša tisiki ya mootledi"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6076,7 +6076,7 @@ msgstr ""
 "Ga go na baotledi bao ba hweditšwego gore ba tsenywe ka go itirela. Na o ka "
 "rata go diriša tisiki ya mootledi?"
 
-#: ../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."
@@ -6084,26 +6084,26 @@ msgstr ""
 "Hle kgetha mootledi ka mo tlase yo o ratago go mo laiša. Ge eba a sa "
 "tšwelele gomme o na le tisiki ya mootledi, kgotla F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Laetša dingangišano tša boikgethelo tša sebopego"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Kgetha Mootledi wa Sedirišwa yo a Swanetšego go Laišwa"
 
-#: ../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 "Mothopo wa Ditaba o Utolotšwego"
 
-#: ../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 "Mothopo wa ditaba wa mo gae wa go tsenya o utolotšwego..."
 
-#: ../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 "
@@ -6112,7 +6112,7 @@ msgstr ""
 "Mohlare wa go tsenya wa %s tšhupetšong ye ga o bonagale o swana le mothopo "
 "wa gago wa ditaba wa go thoma."
 
-#: ../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."
@@ -6120,7 +6120,7 @@ msgstr ""
 "Go tšweletše phošo ge go be go balwa go tsenya go tšwa diswantšhong tša ISO. "
 "Hle lekola diswantšho tša gago tša ISO gomme o leke gape."
 
-#: ../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?"
@@ -6128,7 +6128,7 @@ msgstr ""
 "Ga o bonagale o na le di-draeve tshepedišong ya gago! Na o ka rata go fetola "
 "sebopego sa didirišwa tše oketšegilego?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6140,117 +6140,117 @@ msgstr ""
 "sa lokeletšwa mo, kgotla F2 gore o fetole sebopego sa didirišwa tše "
 "oketšegilego."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Tšhupetšo yeo e swerego diswantšho:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Kgetha Karolo"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Sedirišwa sa %s ga se bonagale se nale diswantšho tša CDROM tša %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Ngangišano e mpe go mokgwa wa go thomiša HD taelong ya %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 "E ka se hwetše faele ya go thomiša draeveng."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "E ka se hwetše draeve bakeng sa tisiki ya BIOS ya %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Mohuta wa Boroto ya Dinotlelo"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "O nale boroto ya dinotlelo ya mohuta ofe?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Phošo ya go bula faele ya go thomiša ya %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Phošo ya go bala dikagare tša faele ya go thomiša ya %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Phošo ya %s mothalading wa %d wa faele ya go thomiša ya %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "E ka se kgone go hwetša ks.cfg floping ya go thoma."
 
-#: ../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 "Phošo ya go bula faele ya go thomiša ya %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Ngangišano e mpe ya go tima mokgwa wa taelo ya go thomiša %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "O a amogelwa go %s - Mokgwa wa go Phološa"
 
-#: ../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> magareng ga dikarolwana  | <Space> e a kgetha | <F12> "
 "sekirini se latelago "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Kgetha Leleme"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "CDROM ya mo gae"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Draeve e thata"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "tšhupetšo ya %s:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "O a amogelwa go %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Kaonafatša Mothopo wa Tisiki"
 
-#: ../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?"
@@ -6258,7 +6258,7 @@ msgstr ""
 "O nale didirišwa tše dintši tšeo di ka šomago bjalo ka methopo bakeng sa "
 "tisiki ya go kaonafatša. Ke dife tšeo o tla ratago go di diriša?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6267,77 +6267,77 @@ msgstr ""
 "Go na le dikarolo tše dintši sedirišweng se tšeo di ka bago le seswantšho sa "
 "tisiki ya mootledi. Na o ka rata go diriša?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Tsenya tisiki ya gago ya go kaonafatša go /dev/%s ke moka o kgotle \"Go "
 "Lokile\" gore o tšwele pele."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Tisiki ya Dikaonafatšo"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "E paletšwe go kgobelanya tisiki ya dikaonafatšo"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Dikaonafatšo"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Go bala dikaonafatšo tša 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 "Phošo ya go bula faele ya go thomiša ya %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 "Ga o na RAM e lekanego gore o ka tsenya %s motšheneng wo."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Mokgwa wa go Phološa"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Mokgwa wa go Tsenya"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 "Ke methopo ya mohuta ofe ya ditaba yeo e nago le seswantšho sa go phološa?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 "Ke methopo ya mohuta ofe ya ditaba yeo e nago le diphuthelwana tšeo di "
 "swanetšego go tsenywa?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ga go na mootledi yo a hweditšwego"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Kgetha mootledi"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Diriša tisiki ya mootledi"
 
-#: ../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?"
@@ -6346,11 +6346,11 @@ msgstr ""
 "bakeng sa mohuta wo wa go tsenya. Na o ka rata go ikgethela mootledi wa gago "
 "goba o diriše tisiki ya mootledi?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Didirišwa tše latelago di hweditšwe tshepedišong ya gago."
 
-#: ../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?"
@@ -6358,49 +6358,49 @@ msgstr ""
 "Ga go na baotledi ba sedirišwa bao ba laišitšwego bakeng sa tshepedišo ya "
 "gago. Na go na le bao o tla ratago go ba tsenya gona bjale?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Didirišwa"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Dirilwe"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Oketša Sedirišwa"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "selaiši se šetše se dirišitšwe.  Go thoma legapi.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Go diriša anaconda, mokgwa wa go phološa wa %s - hle ema...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Go diriša anaconda, setsenyi sa tshepedišo sa %s - hle ema...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Ga e kgone go hwetša seswantšho sa go tsenya %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Go lekola \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Go lekola methopo ya ditaba gona bjale..."
 
-#: ../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."
@@ -6409,7 +6409,7 @@ msgstr ""
 "bolumo ya mathomo. Se mohlomongwe se bolela gore tisiki e hlamilwe ka ntle "
 "go hlakantšha palomoka ya go lekola."
 
-#: ../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 "
@@ -6423,18 +6423,18 @@ msgstr ""
 "hlwekiša tisiki gomme o leke gape.  Ge eba teko ye e tšwela pele go palelwa "
 "o swanetše go tšwela pele le go tsenya."
 
-#: ../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"
@@ -6445,30 +6445,30 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Teko ya Palomoka ya go Lekola"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 "Ngangišano e mpe sedirišweng sa taelo ya mokgwa wa go thomiša wa %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Ngangišano e latelago yeo e sego ya kgonthe e laeditšwe bakeng sa taelo ya "
 "tisiki ya mootledi ya go thomiša: %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 "
@@ -6480,28 +6480,28 @@ msgstr ""
 "gago yeo e se nago dithapo.  Ge eba go sa nyakege senotlelo, tlogela lebala "
 "le le sa ngwalwa selo gomme go tsenya go tla tšwela pele."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Senotlelo sa go Tsenya Khoutu"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Dipeakanyo tšeo di se nago Dithapo"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP ya seabi sa leina"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Seabi sa leina"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6514,110 +6514,110 @@ msgstr ""
 "ye, o ka tlogela lebala le le sa ngwalwa selo gomme go tsenya go tla tšwela "
 "pele."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Tshedimošo ya IP yeo e sego ya Kgonthe"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "O tsentšhitše aterese ya IP yeo e sego ya kgonthe."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Ga go na lentšu-phetišo"
 
-#: ../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 ""
 "Go bile le phošo ya go hlakiša di-draeve tše lebantšwego. Go kopiša go "
 "padile."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Fetola Sebopego sa TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 "O swanetše go kgetha bonyenyane leleme le tee leo le swanetšego go tsenywa."
 
-#: ../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 "Aterese ya 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 "Aterese ya IP:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Seabi sa leina"
 
-#: ../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 "Go Fetola Sebopego ga z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Tshedimošo yeo e sego Gona"
 
-#: ../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 "O swanetše go tsenya aterese ya kgonthe ya IP le netmask ka bobedi."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "O swanetše go tsenya aterese ya kgonthe ya IP le netmask ka bobedi."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Go lemoga leina la moswari le leina..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Ngangišano e mpe ya go thomiša taelo ya neteweke ya %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Porotokole ya go thoma e mpe ya %s e laeditšwego taelong ya neteweke"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Sedirišwa sa go dira Neteweke"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6625,115 +6625,115 @@ msgstr ""
 "O na le didirišwa tše dintši tša neteweke tshepedišong ye. Ke sefe seo o tla "
 "ratago go se tsenya?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Leina la seabi la NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "tšhupetšo ya %s:"
 
-#: ../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 "Peakanyo ya 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 "Go buša"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Tšhupetšo yeo e be e ka se kgobelanywe go tšwa seabing."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Tšhupetšo yeo ga e bonagale e nale mohlare wa go tsenya wa %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Ngangišano e mpe go mokgwa ga go thomiša NFS go %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 "Go emetšwe kgokagano ya telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Go šomiša anaconda ka telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Ga e kgone go buša %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Ga e kgone go buša seswantšho sa go tsenya."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Ngangišano e mpe go thomiša Url ya taelo ya mokgwa wa %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "O swanetše go aba ngangišano ya --url gore o thomiše mokgwa wa Url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Mokgwa o sa tsebjwego wa Url ya %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 "Fetola Sebopego sa TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Peakanyo ya NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "O swanetše go tsenya tšhupetšo."
 
-#: ../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 "Moswari yo a sa Tsebjwego"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ga se leina la moswari la kgonthe."
 
-#: ../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."
@@ -6741,24 +6741,24 @@ msgstr ""
 "Ge eba o diriša seabi sa kemedi sa HTTP tsenya leina la seabi sa kemedi sa "
 "HTTP seo se swanetšego go dirišwa."
 
-#: ../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 "Peakanyo e Oketšegilego ya FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Go laiša mootledi wa SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Go laiša mootledi wa %sr..."
diff --git a/po/or.po b/po/or.po
index c6fc035f9..6d3ee2fb5 100644
--- a/po/or.po
+++ b/po/or.po
@@ -79,41 +79,41 @@ msgstr "ଗୋଟିଏ ଆବରଣ ପାଇଁ <enter> ଦବାନ୍ତୁ
 #: ../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 "ଠିକ ଅଛି"
 
@@ -597,22 +597,22 @@ msgstr "%s ଫାଇଲ ତନ୍ତ୍ରକୁ ଫର୍ମାଟ କରୁଅ
 #: ../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 "ତୃଟି"
 
@@ -667,8 +667,8 @@ msgstr ""
 "ସ୍ଥାପକକୁ ବନ୍ଦ କରିବା ପାଇଁ <Enter> ବଟନକୁ ଦବାନ୍ତୁ।"
 
 #: ../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 "ଛାଡି ଦିଅନ୍ତୁ"
 
@@ -998,21 +998,21 @@ msgstr "ସଠିକ କରନ୍ତୁ"
 
 #: ../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 "ହଁ"
 
 #: ../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 "ନାଁ"
 
-#: ../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 "ପୁନଃପ୍ରଚେଷ୍ଟା କରନ୍ତୁ"
 
@@ -1023,8 +1023,8 @@ msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
 #: ../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 "ବାତିଲ କରନ୍ତୁ"
 
@@ -1877,21 +1877,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 "ପଛକୁ"
 
 #: ../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 "ଆଗକୁ ବଢନ୍ତୁ"
 
@@ -2313,7 +2313,7 @@ msgstr "ଦୟାକରି ଆପଣଙ୍କ %(instkey)s କୁ ଭରଣ କ�
 msgid "Skip entering %(instkey)s"
 msgstr "%(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 "%s କୁ ସ୍ବାଗତମ"
@@ -3183,7 +3183,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "ଭାଷା ଚୟନ"
 
-#: ../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 "ଏହି ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ସମୟରେ ଆପଣ କେଉଁ ଭାଷା ର ପ୍ରୟୋଗ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
@@ -3553,7 +3553,7 @@ msgstr "%s କ୍ଷେତ୍ର ପାଇଁ ଗୋଟିଏ ମୂଲ୍ଯ �
 msgid "Dynamic IP"
 msgstr "ଗତିଶୀଳ ଆଇ.ପି."
 
-#: ../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 "%s ପାଇଁ ଆଇ.ପି. ସୂଚନା ପାଇଁ ଅନୁରୋଧ ପଠାଉଛି..."
@@ -3724,7 +3724,7 @@ msgstr "ଅଜ୍ଞାତ"
 msgid "Hardware address: "
 msgstr "ହାର୍ଡୱେର ଠିକଣା: "
 
-#: ../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 "ଅନୁପସ୍ଥିତ ପ୍ରୋଟୋକଲ"
 
@@ -3733,7 +3733,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "ଆପଣ ଅତିକମରେ IPକଲ (IPv4 କିମ୍ବ ସମର୍ଥନ IPv6) ଚୟନ କରିବା ଉଚିତ।"
 
 #: ../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 "ଅବୈଧ ଉପସର୍ଗ"
 
@@ -3966,7 +3966,7 @@ msgstr "RAID ଉପକରଣ ମାନ"
 msgid "None"
 msgstr "କିଛି ନାହିଁ"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ହାର୍ଡ ଡ୍ରାଇଭ"
 
@@ -4869,12 +4869,12 @@ msgstr "ଉପସର୍ଗ"
 msgid "Activate on boot"
 msgstr "ବୁଟ କରିବା ସମୟରେ ସକ୍ରିୟଣ କରନ୍ତୁ"
 
-#: ../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 "IPv4 ସହାୟତାକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../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 "IPv6 ସହାୟତାକୁ ସକ୍ରିୟ କରନ୍ତୁ"
@@ -4994,7 +4994,7 @@ msgstr "ସ୍ବୟଂଚାଳିତ 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 "ଗେଟ-ୱେ:"
 
@@ -5613,22 +5613,22 @@ 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 "ସଞ୍ଚାରମାଧ୍ଯର ର ଯାଞ୍ଚ"
 
-#: ../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 "ପରୀକ୍ଷଣ"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ଡିସ୍କ ବାହାର କରନ୍ତୁ"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5637,7 +5637,7 @@ msgstr ""
 "ବର୍ତ୍ତମାନ ଡ୍ରାଇଭରେ ଥିବା ଡିସ୍କକୁ ପରୀକ୍ଷା କରିବା ପାଇଁ \"%s\" କୁ ଚୟନ କରନ୍ତୁ, କିମ୍ବା ଡିସ୍କ ବାହାର "
 "କରି ପରୀକ୍ଷଣ ପାଇଁ ଅନ୍ଯ ଗୋଟିଏ ଡିସ୍କକୁ ଭର୍ତ୍ତି କରିବା ପାଇଁ \"%s\" କୁ ଚୟନ କରନ୍ତୁ।"
 
-#: ../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 "
@@ -5652,7 +5652,7 @@ msgstr ""
 "ସେଗୁଡିକର ସଫଳ ପରୀକ୍ଷଣ ପରେ, ସେମାନଙ୍କୁ ପୁନର୍ବାର ବ୍ଯବହାର କରିବା ପୂର୍ବରୁ ସେଗୁଡିକର ପୁନଃପରୀକ୍ଷଣ "
 "ଆବଶ୍ୟକ ନୁହେଁ।"
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5661,11 +5661,11 @@ msgstr ""
 "ଆପଣଙ୍କ କୌଣସି CDROM ଡ୍ରାଇଭରେ %s ଡିସ୍କ ମିଳିଲା ନାହିଁ। ଦୟାକରି %s ଡିସ୍କକୁ ଭର୍ତ୍ତି କରନ୍ତୁ ଏବଂ "
 "ପୁନଃପ୍ରଚେଷ୍ଟା କରିବା ପାଇଁ %s କୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ଡିସ୍କ ମିଳିଲା"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5676,7 +5676,7 @@ msgstr ""
 "\n"
 "ମାଧ୍ଯମ ପରୀକ୍ଷଣକୁ ଏଡାଇ ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ପ୍ରାରମ୍ଭ କରିବା ପାଇଁ %s କୁ ଚୟନ କରନ୍ତୁ।"
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5685,7 +5685,7 @@ msgstr ""
 "ଆପଣଙ୍କ ବୁଟ ମାଧ୍ଯମ ସହିତ ମିଶୁଥିବା କୌଣସି %s ଡିସ୍କ ମିଳିଲା ନାହିଁ।  ଦୟାକରି %s ଡିସ୍କକୁ ଭର୍ତ୍ତି କରନ୍ତୁ ଏବଂ "
 "ପୁନଃପ୍ରଚେଷ୍ଟା କରିବା ପାଇଁ %s କୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5694,32 +5694,32 @@ msgstr ""
 "ଆପଣଙ୍କ କୌଣସି CDROM ଡ୍ରାଇଭରେ %s ଡିସ୍କ ମିଳିଲା ନାହିଁ। ଦୟାକରି %s ଡିସ୍କକୁ ଭର୍ତ୍ତି କରନ୍ତୁ ଏବଂ "
 "ପୁନଃପ୍ରଚେଷ୍ଟା କରିବା ପାଇଁ %s କୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ଡିସ୍କ ମିଳିଲା ନାହିଁ"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "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 "%s ଡିରେକ୍ଟୋରିକୁ ପଢିବାରେ ଅସଫଳ: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "ଧାରଣ କରୁଅଛି"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ଡ୍ରାଇଭର ଡିସ୍କକୁ ପଢୁଅଛି..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ଡ୍ରାଇଭର ଡିସ୍କ ଉତ୍ସ"
 
-#: ../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?"
@@ -5727,7 +5727,7 @@ msgstr ""
 "ଆପଣଙ୍କ ନିକଟରେ ଏକାଧିକ ଉପକରଣ ଅଛି ଯାହାକି ଗୋଟିଏ ଡ୍ରାଇଭର ଡିସ୍କ ପାଇଁ ଉତ୍ସ ଭାବରେ କାର୍ଯ୍ଯ "
 "କରିପାରିବ।  ଆପଣ କେଉଁ ଉପକରଣକୁ ବ୍ଯବହାର କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
-#: ../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?"
@@ -5735,50 +5735,50 @@ msgstr ""
 "ଏହି ଉପକରଣରେ ଏକାଧିକ ବିଭାଜନ ଅଛି ଯାହାକି ଡ୍ରାଇଭର ଡିସ୍କ ପ୍ରତିଛବିକୁ ଧାରଣ କରି ଥାଇପାରେ।  ଆପଣ କେଉଁ "
 "ଉପକରଣକୁ ବ୍ଯବହାର କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "ବିଭାଜନକୁ ଆରୋହିତ କରିବାରେ ବିଫଳ"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ଡ୍ରାଇଭର ଡିସ୍କ ପ୍ରତିଛବିକୁ ଚୟନ କରନ୍ତୁ"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ଫାଇଲ ରୁ ଡ୍ରାଇଭର ଡିସ୍କକୁ ଧାରଣ କରିବାରେ ଅସଫଳ।"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "ଆପଣଙ୍କ ଡ୍ରାଇଭର ଡିସ୍କକୁ /dev/%s ରେ ଭର୍ତ୍ତି କରନ୍ତୁ ଏବଂ ଆଗକୁ ବଢିବା ପାଇଁ \"ଠିକ ଅଛି\" ବଟନକୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ଡ୍ରାଇଭର ଡିସ୍କକୁ ଭର୍ତ୍ତି କରନ୍ତୁ"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ଡ୍ରାଇଭର ଡିସ୍କକୁ ମାଉଣ୍ଟ କରିବାରେ ବିଫଳ।"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s ର ଏହି ସଂସ୍କରଣ ପାଇଁ ଡ୍ରାଇଭର ଡିସ୍କ ଅବୈଧ ଅଟେ।"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "ହସ୍ତକୃତ ଭାବରେ ଚୟନ କରନ୍ତୁ"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "ଆଉ ଗୋଟିଏ ଡିସ୍କକୁ ଧାରଣ କରନ୍ତୁ"
 
-#: ../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 "
@@ -5788,38 +5788,38 @@ msgstr ""
 "କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି, ତଥାପି ଆଗକୁ ବଢିବା ପାଇଁ ଚାହୁଁଛନ୍ତି, କିମ୍ବା ଅନ୍ଯ ଗୋଟିଏ ଡିସ୍କ ଧାରଣ କରିବା ପାଇଁ "
 "ଚାହୁଁଛନ୍ତି?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ଡ୍ରାଇଭର ଡିସ୍କ"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "ଆପଣଙ୍କ ପାଖରେ ଗୋଟିଏ ଡ୍ରାଇଭର ଡିସ୍କ ଅଛି କି?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "ଅଧିକ ଡ୍ରାଇଭର ଡିସ୍କ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "ଆପଣ ଆହୁରି ଅଧିକ ଡ୍ରାଇଭର ଡିସ୍କ ଭର୍ତ୍ତି କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../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 "କିକ-ଷ୍ଟାର୍ଟ ତୃଟି"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "ଅଜଣା ଡ୍ରାଇଭର ଡିସ୍କ କିକ-ଷ୍ଟାର୍ଟ ଉତ୍ସ: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5827,7 +5827,7 @@ msgid ""
 msgstr ""
 "କିକ-ଷ୍ଟାର୍ଟ ଡ୍ରାଇଭର ଡିସ୍କ ନିର୍ଦ୍ଦେଶ ପାଇଁ ନିମ୍ନଲିଖିତ ଅବୈଧ ସ୍ବତନ୍ତ୍ରଚର ମାନ ଉଲ୍ଲେଖ କରାଯାଇଛି: %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 "
@@ -5838,19 +5838,19 @@ msgstr ""
 "ପଠାଇବା ପାଇଁ ଚାହୁଁଛନ୍ତି।  କେଉଁ ପାରାମିଟର ଯୋଗାଇବା ପାଇଁ ହେବ ଯଦି ଆପଣ ତାହା ଜାଣି ନାହାଁନ୍ତି, "
 "ତାହାହେଲେ \"ଠିକ ଅଛି\" ବଟନକୁ ଦବାଇ ଏହା ପରଦାକୁ ଏଡାଇ ଦିଅନ୍ତୁ।"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "ଏକକାଂଶ ପାରାମିଟର କୁ ଭରଣ କରନ୍ତୁ"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "କୌଣସି ଡ୍ରାଇଭର ମିଳିଲା ନାହିଁ"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ଡ୍ରାଇଭର ଡିସ୍କକୁ ଧାରଣ କରନ୍ତୁ"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5858,7 +5858,7 @@ msgstr ""
 "ହସ୍ତକୃତ ଭାବରେ ଭର୍ତ୍ତି କରିବା ପାଇଁ କୌଣସି ଡ୍ରାଇଭର ମିଳିଲା ନାହିଁ।  ଆପଣ ଗୋଟିଏ ଡ୍ରାଇଭର ଡିସ୍କକୁ ବ୍ଯବହାର "
 "କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../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."
@@ -5866,33 +5866,33 @@ msgstr ""
 "ଦୟାକରି ଆପଣ ଧାରଣ କରିବାକୁ ଚାହୁଁଥିବା ଡ୍ରାଇଭରକୁ ନିମ୍ନ ତାଲିକାରୁ ଚୟନ କରନ୍ତୁ।  ଯଦି ଏହା ଦୃଶ୍ଯମାନ ନ ହୁଏ "
 "ଏବଂ ଆପଣଙ୍କ ନିକଟରେ ଗୋଟିଏ ଡ୍ରାଇଭର ଡିସ୍କ ଅଛି, ତାହାହେଲେ F2 ଦବାନ୍ତୁ।"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "ବୈକଲ୍ପିକ ଏକକାଂଶ ତର୍କ କୁ ନିର୍ଦ୍ଦିଷ୍ଟ କରନ୍ତୁ"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "ଧାରଣ କରିବା ପାଇଁ ଉପକରଣ ଚାଳକ କୁ ଚୟନ କରନ୍ତୁ"
 
-#: ../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 "ମାଧ୍ଯମ କୁ ଖୋଜି ପାରିଲା"
 
-#: ../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 "ସ୍ଥାନୀୟ ସ୍ଥାପନ ମାଧ୍ଯମ କୁ ଖୋଜି ପାରିଲା..."
 
-#: ../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 "
 "media."
 msgstr "ସେହି ଡିରେକ୍ଟୋରିରେ ଥିବା %s ସ୍ଥାପନ ବୃକ୍ଷ ଆପଣଙ୍କ ବୁଟ ମାଧ୍ଯମ ସହିତ ମିଶୁଥିବା ପରି ଜଣାପଡୁ ନାହିଁ।"
 
-#: ../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."
@@ -5900,7 +5900,7 @@ msgstr ""
 "ISO ପ୍ରତିଛବିରୁ ସ୍ଥାପନକୁ ପଢିବା ସମୟରେ ଗୋଟିଏ ତୃଟି ପରିଲିଖିତ ହେଲା। ଦୟାକରି ଆପଣଙ୍କ ISO ପ୍ରତିଛବିକୁ ଯାଞ୍ଚ "
 "କରନ୍ତୁ ଏବଂ ପୁନର୍ବାର ପ୍ରଚେଷ୍ଟା କରନ୍ତୁ।"
 
-#: ../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?"
@@ -5908,7 +5908,7 @@ msgstr ""
 "ଆପଣଙ୍କ ତନ୍ତ୍ରରେ କୌଣସି ହାର୍ଡ ଡ୍ରାଇଭ ଥିବାପରି ଜଣାପଡୁ ନାହିଁ! ଆପଣ ଅତିରିକ୍ତ ଉପକରଣ ମାନଙ୍କୁ ବିନ୍ଯାସ "
 "କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5919,62 +5919,62 @@ msgstr ""
 "ଧାରଣ କରିଅଛି? ଏହି ତାଲିକାରେ ଆପଣ ବ୍ଯବହାର କରୁଥିବା ଡିସ୍କ ଡ୍ରାଇଭକୁ ଯଦି ଆପଣ ଦେଖୁ ନାହାଁନ୍ତି, "
 "ତାହାହେଲେ ଅତିରିକ୍ତ ଉପକରଣ ମାନଙ୍କୁ ବିନ୍ଯାସ କରିବା ପାଇଁ F2 ବଟନକୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ପ୍ରତିଛବି ମାନଙ୍କୁ ଧାରଣ କରିଥିବା ଡିରେକ୍ଟୋରି:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "ବିଭାଜନ ର ଚୟନ କରନ୍ତୁ"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s ଉପକରଣଟି %s ସି.ଡି.ରମ୍ ପ୍ରତିଛବିକୁ ଧାରଣ କରିଥିବା ଭଳି ଜଣା ପଡୁନାହିଁ।"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD କିକ୍-ଷ୍ଟାର୍ଟ ବିଧି ନିର୍ଦ୍ଦେଶ %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 "ହାର୍ଡ ଡ୍ରାଇଭ ରେ କିକ୍-ଷ୍ଟାର୍ଟ ଫାଇଲ କୁ ପାଇ ପାରିବ ନାହିଁ।"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "%s BIOS ଡିସ୍କ ପାଇଁ ହାର୍ଡ ଡ୍ରାଇଭ ଖୋଜି ପାରିବ ନାହିଁ"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "କି-ବୋର୍ଡ ପ୍ରକାର"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "ଆପଣଙ୍କ ପାଖରେ କେଉଁ ପ୍ରକାର ର କି-ବୋର୍ଡ ଅଛି?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s କିକ୍-ଷ୍ଟାର୍ଟ ଫାଇଲ କୁ ଖୋଲିବାରେ ତୃଟି: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s କିକ୍-ଷ୍ଟାର୍ଟ ଫାଇଲ ର ଅନ୍ତର୍ବସ୍ତୁ ପଢିବା ସମୟରେ ତୃଟି: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s କିକ୍-ଷ୍ଟାର୍ଟ ଫାଇଲ ର %d ରେଖା ରେ %s ତୃଟି।"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ks.cfg କୁ ବୁଟ ଫ୍ଲପି ରେ ପାଇ ପାରିବ ନାହିଁ।"
 
-#: ../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."
@@ -5982,52 +5982,52 @@ msgstr ""
 "କିକ-ଷ୍ଟାର୍ଟ ଫାଇଲକୁ ଆହରଣ କରିବାରେ ଅସମର୍ଥ।  ଦୟାକରି ତଳେ ଥିବା କିକ-ଷ୍ଟାର୍ଟ ପାରାମିଟରକୁ ବଦଳାନ୍ତୁ "
 "କିମ୍ବା ଗୋଟିଏ ପାରସ୍ପରିକ କ୍ରିୟାକ୍ଷମ ସ୍ଥାପନ କରିବା ପାଇଁ ବାତିଲ କରନ୍ତୁ ବଟନକୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "କିକ-ଷ୍ଟାର୍ଟ ଫାଇଲ ଆହରଣ କରିବା ସମୟରେ ତୃଟି"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "କିକ୍-ଷ୍ଟାର୍ଟ ବିଧି ନିର୍ଦ୍ଦେଶ %s କୁ ବନ୍ଦ କରିବା ପାଇଁ ଖରାପ ସ୍ବତନ୍ତ୍ରଚର: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%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> ତତ୍ବ ମାନଙ୍କ ମଧ୍ଯରେ  | <Space> ଚୟନ କରନ୍ତୁ | <F12> ପରବର୍ତ୍ତୀ ପରଦା "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ଗୋଟିଏ ଭାଷା ର ଚୟନ କରନ୍ତୁ"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "ସ୍ଥାନୀୟ ସି.ଡି./ଡି.ଭି.ଡି"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ହାର୍ଡ ଡ୍ରାଇଭ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS ଡିରେକ୍ଟୋରି"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s କୁ ସ୍ବାଗତମ"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "ଡିସ୍କ ଉତ୍ସକୁ ଅଦ୍ଯତନ କରନ୍ତୁ"
 
-#: ../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?"
@@ -6035,7 +6035,7 @@ msgstr ""
 "ଆପଣଙ୍କ ନିକଟରେ ଏକାଧିକ ଉପକରଣ ଅଛି ଯାହାକି ଗୋଟିଏ ଅଦ୍ଯତିତ ଡିସ୍କ ପାଇଁ ଉତ୍ସ ଭାବରେ କାର୍ଯ୍ଯ କରିପାରେ।  "
 "ଆପଣ କେଉଁ ଉପକରଣକୁ ବ୍ଯବହାର କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6044,29 +6044,29 @@ msgstr ""
 "ଏହି ଉପକରଣରେ ଏକାଧିକ ବିଭାଜନ ଅଛି ଯାହାକି ଡ୍ରାଇଭର ଡିସ୍କ ପ୍ରତିଛବିକୁ ଧାରଣ କରି ଥାଇପାରେ।  ଆପଣ କେଉଁ "
 "ଉପକରଣକୁ ବ୍ଯବହାର କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "ଆପଣଙ୍କ ଅଦ୍ଯତିତ ଡିସ୍କକୁ /dev/%s ରେ ଭର୍ତ୍ତି କରନ୍ତୁ ଏବଂ ଆଗକୁ ବଢିବା ପାଇଁ \"ଠିକ ଅଛି\" କୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "ଡିସ୍କ ର ଅଦ୍ଯତନ କରୁଅଛି"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "ଅଦ୍ଯତିତ ଡିସ୍କକୁ ଆରୋହିତ କରିବାରେ ବିଫଳ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "ଅଦ୍ଯତନ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "ଆନାକୋଣ୍ଡା ଅଦ୍ଯତନ ମାନଙ୍କୁ ପଢୁଛି..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6075,45 +6075,45 @@ msgstr ""
 "କିକ-ଷ୍ଟାର୍ଟ ଫାଇଲକୁ ଆହରଣ କରିବାରେ ଅସମର୍ଥ।  ଦୟାକରି ତଳେ ଥିବା କିକ-ଷ୍ଟାର୍ଟ ପାରାମିଟରକୁ ବଦଳାନ୍ତୁ "
 "କିମ୍ବା ଗୋଟିଏ ପାରସ୍ପରିକ କ୍ରିୟାକ୍ଷମ ସ୍ଥାପନ କରିବା ପାଇଁ ବାତିଲ କରନ୍ତୁ ବଟନକୁ ଦବାନ୍ତୁ।"
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "କିକ-ଷ୍ଟାର୍ଟ ଫାଇଲ ଆହରଣ କରିବା ସମୟରେ ତୃଟି"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "ଏହି ଉପକରଣରେ %s କୁ ସ୍ଥାପନ କରିବା ପାଇଁ ଯଥେଷ୍ଟ RAM ନାହିଁ।"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "ରକ୍ଷଣ ପ୍ରଣାଳୀ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "ସ୍ଥାପନ ପ୍ରଣାଳୀ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "ରକ୍ଷଣ ପ୍ରତିଛବି ମାନଙ୍କୁ କେଉଁ ପ୍ରକାର ର ସଞ୍ଚାରମାଧ୍ଯମ ଧାରଣ କରିଛି?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ସ୍ଥାପନ କରାଯିବା ପ୍ଯାକେଜ ମାନଙ୍କୁ କେଉଁ ପ୍ରକାର ର ସଞ୍ଚାରମାଧ୍ଯମ ଧାରଣ କରିଛି?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "କୌଣସି ଚାଳକ ମିଳିଲା ନାହିଁ"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ଚାଳକ କୁ ଚୟନ କରନ୍ତୁ"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ଗୋଟିଏ ଚାଳକ ଡିସ୍କକୁ ବ୍ଯବହାର କରନ୍ତୁ"
 
-#: ../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?"
@@ -6121,11 +6121,11 @@ msgstr ""
 "ଏହି ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ପାଇଁ ଉପଯୁକ୍ତ ପ୍ରକାରର କୌଣସି ଉପକରଣକୁ ପାଇବାରେ ଅସମର୍ଥ।  ଆପଣ ହସ୍ତକୃତ ଭାବରେ "
 "ଆପଣଙ୍କ ଡ୍ରାଇଭରକୁ ଚୟନ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି ଗୋଟିଏ ଡ୍ରାଇଭର ଡିସ୍କ ବ୍ଯବହାର କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "ନିମ୍ନଲିଖିତ ଉପକରଣ ଗୁଡିକ ଆପଣଙ୍କ ତନ୍ତ୍ରରୁ ମିଳିଲା।"
 
-#: ../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?"
@@ -6133,49 +6133,49 @@ msgstr ""
 "ଆପଣଙ୍କ ତନ୍ତ୍ର ପାଇଁ କୌଣସି ଉପକରଣ ଚାଳକ ସ୍ଥାପନ କରାଯାଇ ନାହିଁ। ଆପଣ କୌଣସି ଗୋଟିଏ ଚାଳକ କୁ ବର୍ତମାନ "
 "ଧାରଣ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ଉପକରଣ ମାନ"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "ସମ୍ପୂର୍ଣ୍ଣ"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ଉପକରଣକୁ ଯୋଗ କରନ୍ତୁ"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ଭାରକ କୁ ପୂର୍ବରୁ ଚଳାଯାଇଛି। ଆବରଣ କୁ ପ୍ରାରମ୍ଭ କରୁଅଛି।\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "ଆନାକୋଣ୍ଡା କୁ ଚଳାଉଛି, %s ରକ୍ଷଣ ଧାରା - ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "ଆନାକୋଣ୍ଡା କୁ ଚଳାଉଛି, %s ତନ୍ତ୍ର ସ୍ଥାପକ - ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "%s ସ୍ଥାପନ ପ୍ରତିଛବିକୁ ଖୋଜିବା ରେ ଅସମର୍ଥ"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" କୁ ଯାଞ୍ଚ କରୁଅଛି ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "ସଞ୍ଚାରମାଧ୍ଯମ କୁ ବର୍ତମାନ ଯାଞ୍ଚ କରୁଅଛି..."
 
-#: ../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."
@@ -6183,7 +6183,7 @@ msgstr ""
 "ପ୍ରାଥମିକ ଘନଫଳ ବର୍ଣ୍ଣନକରୁ ଡିସ୍କ ଚେକ-ଶମକୁ ପଢାବାରେ ଅସମର୍ଥ।  ଏହାର ଅର୍ଥ ସମ୍ଭବତଃ ଏହା ଯେ ଡିସ୍କରେ "
 "ଚେକ-ଶମକୁ ଯୋଗ ନକରି ଏହାକୁ ସୃଷ୍ଟି କରାଯାଇଛି।"
 
-#: ../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 "
@@ -6194,18 +6194,18 @@ msgstr ""
 "ପ୍ରଚେଷ୍ଟା କରନ୍ତୁ।  ଯଦି ଏହି ପରୀକ୍ଷଣ ବାରମ୍ବାର ବିଫଳ ହୁଏ, ତାହାହେଲେ ଆପଣ ସ୍ଥାପନ ପ୍ରକ୍ରିୟାକୁ ଜାରି "
 "ରଖିବା ଉଚିତ ନୁହେଁ।"
 
-#: ../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"
@@ -6216,21 +6216,21 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Checksum ପରୀକ୍ଷଣ"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "%s ଉପକରଣ କିକ୍-ଷ୍ଟାର୍ଟ ପ୍ରକ୍ରିୟା ନିର୍ଦ୍ଦେଶ ପାଇଁ ଖରାପ ସ୍ବତନ୍ତ୍ରଚର: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "କିକ-ଷ୍ଟାର୍ଟ ଉପକରଣ ନିର୍ଦ୍ଦେଶ ପାଇଁ ଉଭୟ ଏକକାଂଶ ପ୍ରକାର ଏବଂ ନାମ ଉଲ୍ଲେଖ କରାଯିବା ଉଚିତ।"
 
-#: ../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"
@@ -6238,7 +6238,7 @@ msgstr ""
 "IPv4 ନେଟୱାର୍କ ପାଇଁ ଉପସର୍ଗ ମୂଲ୍ଯ ୧ ଏବଂ ୩୨ ମଧ୍ଯରେ ହେବା ଉଚିତ କିମ୍ବା IPv6 ନେଟୱାର୍କ ପାଇଁ ୧ "
 "ଏବଂ ୧୨୮ ମଧ୍ଯରେ ହେବା ଉଚିତ।"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6249,27 +6249,27 @@ msgstr ""
 "ଆବଶ୍ୟକୀୟ ESSID ଏବଂ ସାଙ୍କେତିକରଣ ଚାବି ପ୍ରଦାନ କରନ୍ତୁ।  ଯଦି କୌଣସି ଚାବି ଆବଶ୍ୟକ ନୁହେଁ, ତାହାହେଲେ "
 "ଏହି ସ୍ଥାନକୁ ଖାଲି ଛାଡି ଦିଅନ୍ତୁ ଏବଂ ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ଜାରି ରହିବ।"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "ଗୋପନ ଚାବି"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "ବେତାର ବିନ୍ଯାସ"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "ନାମ ସେବକ ଆଇ.ପି."
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "ଅନୁପସ୍ଥିତ ନାମ ସେବକ"
 
-#: ../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 "
@@ -6279,56 +6279,56 @@ msgstr ""
 "କରିଲାନାହିଁ। ଯଦି ଆପଣଙ୍କ ନିକଟରେ ଏହି ସୂଚନା ନାହିଁ, ତାହାହେଲେ ଆପଣ ଏହି ସ୍ଥାନକୁ ଖାଲି ଛାଡିପାରନ୍ତି ଏବଂ "
 "ସ୍ଥାପନ ପ୍ରକ୍ରିୟା ଜାରି ରହିବ।"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "ଅବୈଧ ଆଇ.ପି. ସୂଚନା"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "ଆପଣ ଗୋଟିଏ ଅବୈଧ ଆଇ.ପି. ଠିକଣା କୁ ଭରଣ କରିଛନ୍ତି।"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "ନେଟୱାର୍କ ତୃଟି"
 
-#: ../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 "ଆପଣଙ୍କ ନେଟୱାର୍କ ଅନ୍ତରାପୃଷ୍ଠକୁ ବିନ୍ଯାସ କରିବା ସମୟରେ ଗୋଟିଏ ତୃଟି ପରିଲିଖିତ ହେଲା।"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP କୁ ବିନ୍ଯାସ କରନ୍ତୁ"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "ଆପଣ ଅତିକମରେ ଗୋଟିଏ ପ୍ରୋଟୋକଲ (IPv4 କିମ୍ବା IPv6) ଚୟନ କରିବା ଉଚିତ।"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS ପାଇଁ IPv4 ଆବଶ୍ୟକ"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS ସ୍ଥାପନ ପ୍ରଣାଳୀ IPv4 ସମର୍ଥନ ଆବଶ୍ୟକ କରିଥାଏ।"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ଠିକଣା:"
 
-#: ../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 ଠିକଣା:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "ନାମ ସେବକ:"
 
-#: ../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 "
@@ -6338,43 +6338,43 @@ msgstr ""
 "ଦ୍ବାରା ବିଭାଜିତ ନେଟମାସ୍କ କିମ୍ବା CIDR ଶୈଳୀରେ ଥିବା ଉପସର୍ଗ ଗୁଡିକ ଗ୍ରହଣୀୟ। ଗେଟ-ୱେ ଏବଂ ନାମ "
 "ସେବକ କ୍ଷେତ୍ର ଗୁଡିକ ବୈଧ IPv4 କିମ୍ବା IPv6 ଠିକଣା ହୋଇଥିବା ଉଚିତ।"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "ହସ୍ତକୃତ TCP/IP ବିନ୍ଯାସ"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "ଅନୁପସ୍ଥିତ ସୂଚନା"
 
-#: ../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 ""
 "ଆପଣ ଉଭୟ ଗୋଟିଏ ବୈଧ IPv4 ଠିକଣା ଏବଂ ଗୋଟିଏ ନେଟମାସ୍କ କିମ୍ବା CIDR ଉପସର୍ଗକୁ ଭରଣ କରିବା ଉଚିତ।"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "ଆପଣ ଉଭୟ ଗୋଟିଏ ବୈଧ IPv6 ଠିକଣା ଏବଂ ଗୋଟିଏ CIDR ଉପସର୍ଗକୁ ଭରଣ କରିବା ଉଚିତ।"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ଆଧାର ନାମ ଏବଂ ପରିସର କୁ ସ୍ଥିର କରୁଅଛି..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "ନେଟୱାର୍କ ନିର୍ଦ୍ଦେଶ %s କୁ କିକ-ଷ୍ଟାର୍ଟ କରିବା ପାଇଁ ଖରାପ ସ୍ବତନ୍ତ୍ରଚର: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "ନେଟୱାର୍କ ନିର୍ଦ୍ଦେଶରେ ଖରାପ ବୁଟପ୍ରୋଟୋ %s କୁ ଉଲ୍ଲେକ କରାଯାଇଛି"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "ନେଟୱାର୍କିଙ୍ଗ ଉପକରଣ"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6382,115 +6382,115 @@ msgstr ""
 "ଆପଣଙ୍କ ପାଖରେ ଏହି ତନ୍ତ୍ରରେ ଏକାଧିକ ନେଟୱାର୍କ ଉପକରଣ ଅଛି। ଆପଣ କାହାକୁ ସ୍ଥାପନ କରିବା ପାଇଁ "
 "ଚାହୁଁଛନ୍ତି?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS ସେବକ ନାମ:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ଡିରେକ୍ଟୋରି:"
 
-#: ../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 ବ୍ଯବସ୍ଥା"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "ଉଲ୍ଲେଖିତ ଆଧାର ନାମ କୌଣସି DNS ଦ୍ବାରା ବିନ୍ଯସ୍ତ ହୋଇନାହିଁ"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "ପୁନରୁଦ୍ଧାର କରନ୍ତୁ"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ଡିରେକ୍ଟୋରିକୁ ସେବକରୁ ଆହରଣ କରି ପାରିଲା ନାହିଁ।"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ସେହି ଡିରେକ୍ଟୋରିଟି ଗୋଟିଏ %s ସ୍ଥାପନ ବୃକ୍ଷକୁ ଧାରଣ କରିଥିବା ପରି ଜଣାପଡୁ ନାହିଁ।"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "ଏନ.ଏଫ.ଏସ. କିକ-ଷ୍ଟାର୍ଟ ପଦ୍ଧତି ନିର୍ଦ୍ଦେଶ %s ପାଇଁ ଖରାପ ସ୍ବତନ୍ତ୍ରଚର: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "ଟେଲନେଟ"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "ଟେଲନେଟ ସଂଯୋଗ ପାଇଁ ଅପେକ୍ଷା କରୁଅଛି..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "ଟେଲନେଟ ଦ୍ବାରା ଆନାକୋଣ୍ଡା କୁ ଚଳାଉଛି..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s କୁ ପୁନରୁଦ୍ଧାର କରିବାରେ ଅସମର୍ଥ://%s/%s/%s।"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ସ୍ଥାପନ ପ୍ରତିବମ୍ବ କୁ ପୁନରୁଦ୍ଧାର କରିବାରେ ଅସମର୍ଥ।"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "%s Url କିକଷ୍ଟାର୍ଟ ପ୍ରଣାଳୀ ର ସନ୍ଦେଶ ପାଇଁ ଖରାପ ସ୍ବତନ୍ତ୍ରଚର: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url କିକଷ୍ଟାର୍ଟ ପ୍ରଣାଳୀ କୁ ଗୋଟିଏ --url ସ୍ବତନ୍ତ୍ରଚର କୁ ଯୋଗାଇବା ଉଚିତ।"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "ଅଜଣା 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 "TCP/IP କୁ ବିନ୍ଯାସ କରନ୍ତୁ"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS ବ୍ଯବସ୍ଥା"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "ଆପଣ ଗୋଟିଏ ଡିରେକ୍ଟୋରି କୁ ଭରଣ କରିବା ଉଚିତ।"
 
-#: ../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 "ଅଜଣା ଆଧାର"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ଟି ଗୋଟିଏ ବୈଧ ଆଧର ନାମ ନୁହେଁ।"
 
-#: ../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."
@@ -6498,24 +6498,24 @@ msgstr ""
 "ଯଦି ଆପଣ HTTP ପ୍ରୋକ୍ସି ସେବକ ବ୍ଯବହାର କରୁଛନ୍ତି ତାହାହେଲେ ବ୍ଯବହାର୍ଯ୍ଯ HTTP ପ୍ରୋକ୍ସି ସେବକକୁ "
 "ବ୍ଯବହାର କରନ୍ତୁ।"
 
-#: ../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 "ପରବର୍ତ୍ତୀ FTP ବ୍ଯବସ୍ଥା"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ଡ୍ରାଇଭରକୁ ଧାରଣ କରୁଅଛି"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s ଚାଳକ କୁ ଧାରଣ କରୁଅଛି..."
diff --git a/po/pa.po b/po/pa.po
index 5f19abe0b..c03871e9c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -57,41 +57,41 @@ msgstr "ਇੱਕ ਸ਼ੈੱਲ ਲਈ <enter> ਦਬਾਓ"
 #: ../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 "ਠੀਕ ਹੈ"
 
@@ -555,22 +555,22 @@ msgstr "%s ਤੇ ਫਾਇਲ-ਸਿਸਟਮ ਨੂੰ ਮੁੜ-ਅਕਾਰ
 #: ../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 "ਗਲਤੀ"
 
@@ -625,8 +625,8 @@ msgstr ""
 "ਇੰਸਟਾਲਰ ਬੰਦ ਕਰਨ ਲਈ <Enter> ਦਬਾਓ।"
 
 #: ../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 "ਅਧੂਰਾ ਛੱਡੋ"
 
@@ -952,21 +952,21 @@ msgstr "ਸਥਿਰ"
 
 #: ../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 "ਹਾਂ"
 
 #: ../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 "ਨਹੀਂ"
 
-#: ../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 "ਮੁਡ਼ ਕੋਸ਼ਿਸ਼"
 
@@ -977,8 +977,8 @@ msgstr "ਅਣਡਿੱਠਾ"
 #: ../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 "ਰੱਦ ਕਰੋ"
 
@@ -1813,21 +1813,21 @@ msgid "_Write changes to disk"
 msgstr "ਤਬਦੀਲੀ ਨੂੰ ਡਿਸਕ ਤੇ ਲਿਖੋ(_W)"
 
 #: ../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 "ਪਿੱਛੇ"
 
 #: ../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 "ਜਾਰੀ ਰੱਖੋ"
 
@@ -2230,7 +2230,7 @@ msgstr "ਆਪਣੀ %(instkey)s ਕੁੰਜੀ ਦਿਓ ਜੀ"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s ਦੇਣਾ ਛੱਡੋ"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s ਵਲੋਂ %s ਲਈ ਜੀ ਆਇਆਂ ਨੂੰ"
@@ -3102,7 +3102,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "ਭਾਸ਼ਾ ਚੋਣ"
 
-#: ../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 "ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ ਦੌਰਾਨ ਤੁਸੀਂ ਕਿਹਡ਼ੀ ਭਾਸ਼ਾ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -3470,7 +3470,7 @@ msgstr "%s ਖੇਤਰ ਲਈ ਮੁੱਲ ਲੋੜੀਂਦਾ ਹੈ।"
 msgid "Dynamic IP"
 msgstr "ਡਾਇਨਾਮਿਕ 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 "%s ਲਈ IP ਜਾਣਕਾਰੀ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ..."
@@ -3637,7 +3637,7 @@ msgstr "ਅਣਜਾਣ"
 msgid "Hardware address: "
 msgstr "ਹਾਰਡਵੇਅਰ ਸਿਰਨਾਵਾਂ:"
 
-#: ../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 "ਗੁੰਮ ਪਰੋਟੋਕਾਲ"
 
@@ -3646,7 +3646,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ IPv4 ਜਾਂ IPv6 ਸਹਿਯੋਗ ਦੀ ਚੋਣ ਕਰਨੀ ਪਵੇਗੀ।"
 
 #: ../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 "ਗਲਤ ਪ੍ਰੀ-ਫਿਕਸ"
 
@@ -3876,7 +3876,7 @@ msgstr "ਰੇਡ ਜੰਤਰ"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ਹਾਰਡ ਡਰਾਈਵ"
 
@@ -4745,12 +4745,12 @@ msgstr "ਪ੍ਰੀ-ਫਿਕਸ"
 msgid "Activate on boot"
 msgstr "ਚੱਲਣ ਸਮੇਂ ਸਰਗਰਮ ਕਰੋ"
 
-#: ../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 "IPv4 ਸਹਿਯੋਗ ਯੋਗ"
 
-#: ../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 "IPv6 ਸਹਿਯੋਗ ਯੋਗ"
@@ -4869,7 +4869,7 @@ msgstr "ਆਟੋ 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 "ਗੇਟਵੇ:"
 
@@ -5469,22 +5469,22 @@ msgstr ""
 "* ਇਹ Red Hat Enterprise Linux ਦੀ ਨਾ-ਸਹਾਇਕ/ਨਾ-ਸਰਟੀਫਾਇਡ ਇੰਸਟਾਲੇਸ਼ਨ ਹੋ ਸਕਦੀ ਹੈ।\n"
 "* ਤੁਸੀਂ ਆਪਣੀ ਮੈਂਬਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਪੈਕੇਜਾਂ ਲਈ ਸਾਫਟਵੇਅਰ ਅਤੇ ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ ਨਹੀਂ ਲੈ ਸਕੋਗੇ।"
 
-#: ../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 "ਮੀਡਿਆ ਜਾਂਚ"
 
-#: ../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 "ਜਾਂਚ"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "ਡਿਸਕ ਕੱਢੋ"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5493,7 +5493,7 @@ msgstr ""
 "\"%s\" ਚੁਣੋ, ਜੇਕਰ ਡਰਾਈਵ ਵਿੱਚ ਮੌਜੂਦ ਡਿਸਕ ਦੀ ਜਾਂਚ ਕਰਨੀ ਹੈ ਜਾਂ \"%s\" ਚੁਣੋ ਤਾਂ ਕਿ ਡਿਸਕ ਨੂੰ "
 "ਬਾਹਰ ਕਰਕੇ ਹੋਰ ਸੀਡੀਆਂ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਸਕੇ।"
 
-#: ../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 "
@@ -5507,7 +5507,7 @@ msgstr ""
 "ਤਾਂ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਇਹਨਾਂ ਦੀ ਜਾਂਚ ਕਰ ਲੈਣੀ ਚਾਹੀਦੀ ਹੈ। ਇਹਨਾਂ ਦੀ ਸਫ਼ਲਤਾਪੂਰਕ ਜਾਂਚ ਹੋਣ ਉਪਰੰਤ "
 "ਹਰੇਕ ਡਿਸਕ ਨੂੰ ਮੁੜ-ਜਾਂਚਣ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5516,11 +5516,11 @@ msgstr ""
 "ਤੁਹਾਡੇ ਕਿਸੇ ਵੀ ਡਰਾਈਵ ਵਿੱਚ %s CD ਨਹੀਂ ਲੱਭੀ ਹੈ। %s CD ਪਾਉ ਜੀ ਅਤੇ ਮੁਡ਼ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ %s "
 "ਦਬਾਓ।"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "ਡਿਸਕ ਖੋਜੀ ਗਈ"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5531,7 +5531,7 @@ msgstr ""
 "\n"
 "ਮਾਧਿਅਮ ਦੀ ਜਾਂਚ ਨੂੰ ਛੱਡਣ ਅਤੇ ਇੰਸਟਾਲੇਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ %s ਚੁਣੋ।"
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5540,7 +5540,7 @@ msgstr ""
 "ਕੋਈ %s ਡਿਸਕ ਨਹੀਂ ਲੱਭੀ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬੂਟ ਮਾਧਿਅਮ ਨਾਲ ਮੇਲ਼ ਖਾਵੇ। %s ਡਿਸਕ ਪਾਉ ਅਤੇ ਮੁਡ਼ ਕੋਸ਼ਿਸ਼ "
 "ਲਈ %s ਦਬਾਓ।"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5549,32 +5549,32 @@ msgstr ""
 "ਤੁਹਾਡੀ ਕਿਸੇ ਵੀ CD-ROM ਡਰਾਈਵ ਵਿੱਚ %s ਡਿਸਕ ਨਹੀਂ ਲੱਭੀ ਹੈ। %s ਡਿਸਕ ਪਾਉ ਜੀ ਅਤੇ ਮੁਡ਼ ਕੋਸ਼ਿਸ਼ "
 "ਕਰਨ ਲਈ %s ਦਬਾਓ।"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "ਡਿਸਕ ਨਹੀਂ ਲੱਭੀ"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "CD-ROM ਤੇ ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ ਹੈ।"
 
-#: ../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 "ਡਾਇਰੈਕਟਰੀ %s ਨੂੰ ਪੜ੍ਹਨ ਵਿੱਚ ਅਸਫ਼ਲ: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ਡਰਾਈਵਰ ਡਿਸਕ ਪੜ੍ਹੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ਡਰਾਈਵਰ ਡਿਸਕ ਸਰੋਤ"
 
-#: ../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?"
@@ -5582,55 +5582,55 @@ msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਜੰਤਰ ਹਨ, ਜੋ ਕਿ ਡਰਾਈਵਰ-ਡਿਸਕ ਲਈ ਸਰੋਤ ਦਾ ਕੰਮ ਕਰ ਸਕਦੇ ਹਨ। ਕਿਹਡ਼ਾ ਤੁਸੀਂ "
 "ਵਰਤਣਾ ਚਾਹੋਗੇ?"
 
-#: ../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?"
 msgstr "ਇਹ ਜੰਤਰ ਉੱਤੇ ਕਈ ਭਾਗ ਹਨ, ਜੋ ਕਿ ਡਰਾਈਵਰ-ਡਿਸਕ ਈਮੇਜ਼ ਰੱਖਦੇ ਹੋ ਸਕਦੇ ਹਨ। ਕਿਹਡ਼ਾ ਤੁਸੀਂ ਵਰਤਣਾ ਚਾਹੋਗੇ?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "ਭਾਗ ਮਾਊਂਟ ਕਰਨ ਵਿੱਚ ਅਸਫ਼ਲ ਹੈ।"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ਡਰਾਈਵਰ ਡਿਸਕ ਈਮੇਜ਼ ਚੁਣੋ"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ਫਾਇਲ ਤੋਂ ਡਰਾਈਵਰ ਡਿਸਕ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "ਆਪਣੀ ਡਰਾਈਵਰ ਡਿਸਕ ਨੂੰ /dev/%s ਵਿੱਚ ਪਾਉ ਅਤੇ ਜਾਰੀ ਰੱਖਣ ਲਈ \"ਠੀਕ ਹੈ \" ਦਬਾਓ।"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ਡਰਾਈਵਰ ਡਿਸਕ ਪਾਓ"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "ਡਰਾਈਵਰ ਡਿਸਕ ਨੂੰ ਮਾਊਂਟ ਕਰਨ ਵਿੱਚ ਅਸਫ਼ਲ"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s ਦੇ ਇਸ ਰੀਲਿਜ਼ ਲਈ ਡਰਾਈਵਰ ਡਿਸਕ ਗਲਤ ਹੈ।"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "ਦਸਤੀ ਚੋਣ"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "ਹੋਰ ਡਿਸਕ ਲੋਡ ਕਰੋ"
 
-#: ../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 "
@@ -5639,45 +5639,45 @@ msgstr ""
 "ਡਰਾਈਵਰ-ਡਿਸਕ ਤੇ ਜੰਤਰ ਦੀ ਕੋਈ ਅਨੁਕੂਲ ਕਿਸਮ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਦਸਤੀ ਡਰਾਈਵਰ ਦੀ ਚੋਣ ਕਰਨੀ "
 "ਚਾਹੁੰਦੇ ਹੋ, ਜਾਂ ਕਿਸੇ ਤਰਾਂ ਵੀ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ ਜਾਂ ਹੋਰ ਡਰਾਈਵਰ ਡਿਸਕ ਲੋਡ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ਡਰਾਈਵਰ ਡਿਸਕ"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਡਰਾਈਵਰ ਡਿਸਕ ਹੈ?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "ਹੋਰ ਡਰਾਈਵਰ ਡਿਸਕਾਂ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "ਕੀ ਤੁਸੀਂ ਹੋਰ ਡਰਾਈਵਰ ਡਿਸਕਾਂ ਲੋਡ ਕਰਨੀਆਂ ਚਾਹੋਗੇ?"
 
-#: ../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 "ਕਿੱਕਸਟਾਰਟ ਗਲਤੀ"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "ਅਣਜਾਣ ਡਰਾਈਵਰ ਡਿਸਕ ਕਿੱਕਸਟਾਰਟ ਸਰੋਤ: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "ਕਿੱਕਸਟਾਰਟ ਡਰਾਈਵਰ ਡਿਸਕ ਕਮਾਂਡ ਲਈ ਇਹ ਗਲਤ ਮੁੱਲ ਦਿੱਤਾ ਗਿਆ ਸੀ: %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 "
@@ -5687,25 +5687,25 @@ msgstr ""
 "ਕੋਈ ਵੀ ਮੁੱਲ ਦਿਓ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ %s ਮੈਡਿਊਲ ਲਈ ਖਾਲੀ ਥਾਂ ਦੇ ਕੇ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ।  ਜੇਕਰ ਤੁਸੀਂ ਨਹੀਂ "
 "ਜਾਣਦੇ ਹੋ ਕਿ ਕਿਹੜੇ ਮੁੱਲ ਦੇਣੇ ਹਨ, ਇਹ ਪਰਦੇ ਨੂੰ \"ਠੀਕ ਹੈ\" ਦਬਾ ਕੇ ਛੱਡ ਦਿਓ।"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "ਮੈਡਿਊਲ ਪੈਰਾਮੀਟਰ ਦਿਓ"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ਕੋਈ ਡਰਾਈਵਰ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ਡਰਾਈਵਰ ਡਿਸਕ ਲੋਡ ਕਰੋ"
 
-#: ../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 "ਦਸਤੀ ਭਰਨ ਲਈ ਕੋਈ ਡਰਾਈਵਰ ਨਹੀਂ ਲੱਭਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇੱਕ ਡਰਾਈਵਰ ਡਿਸਕ ਵਰਤਣੀ ਚਾਹੋਗੇ?"
 
-#: ../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."
@@ -5713,33 +5713,33 @@ msgstr ""
 "ਹੇਠ ਦਿੱਤੇ ਡਰਾਈਵਰਾਂ ਵਿੱਚੋਂ ਆਪਣੀ ਲੋਡ਼ ਦਾ ਡਰਾਈਵਰ ਲੋਡ ਕਰਨ ਲਈ ਚੁਣੋ। ਜੇਕਰ ਇਹ ਉਪਲੱਬਧ ਨਹੀ ਹੈ ਅਤੇ "
 "ਤੁਹਾਡੇ ਕੋਲ ਡਰਾਈਵਰ-ਡਿਸਕ ਹੈ ਤਾਂ F2 ਦਬਾਓ।"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "ਚੋਣਵੇ ਮੈਡੀਊਲ ਆਰਗੂਮੈਂਟ ਦਿਓ"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "ਲੋਡ ਕਰਨ ਲਈ ਜੰਤਰ ਡਰਾਈਵਰ ਚੁਣੋ"
 
-#: ../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 "ਮੀਡਿਆ ਖੋਜਿਆ"
 
-#: ../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 "ਲੋਕਲ ਇੰਸਟਾਲੇਸ਼ਨ ਮੀਡਿਆ ਖੋਜਿਆ..."
 
-#: ../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 "
 "media."
 msgstr "%s ਇੰਸਟਾਲੇਸ਼ਨ ਲਡ਼ੀ, ਉਸ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ, ਤੁਹਾਡੇ ਬੂਟ ਮੀਡਿਆ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾ ਰਹੀ ਹੈ।"
 
-#: ../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."
@@ -5747,13 +5747,13 @@ msgstr ""
 "ਆਈਸੋ(ISO) ਈਮੇਜ਼ ਤੋਂ ਇੰਸਟਾਲ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।  ਆਪਣੇ ਆਈਸੋ (ISO) ਈਮੇਜ਼ ਦੀ ਜਾਂਚ ਕਰਕੇ ਮੁਡ਼ "
 "ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
-#: ../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?"
 msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਹਾਰਡ-ਡਰਾਈਵ ਨਹੀਂ ਜਾਪਦੀ ਹੈ! ਕੀ ਤੁਸੀਂ ਹੁਣੇ ਹੀ ਹੋਰ ਜੰਤਰ ਚੁਣਨਾ ਪਸੰਦ ਕਰੋਗੇ?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5763,61 +5763,61 @@ msgstr ""
 "ਕਿਹਡ਼ਾ ਭਾਗ ਅਤੇ ਡਾਇਰੈਕਟਰੀ ਹੈ, ਜਿਸ ਉਪੱਰ %s ਲਈ CD (iso9660) ਈਮੇਜ਼ ਸੰਭਾਲਿਆ ਹੈ? ਜੇਕਰ ਤੁਸੀਂ ਉਹ "
 "ਭਾਗ ਜਾਂ ਹਾਰਡ-ਡਿਸਕ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਵੇਖ ਰਹੇ ਹੋ ਤਾਂ ਹੋਰ ਜੰਤਰਾਂ ਨੂੰ ਜੋਡ਼ਨ ਲਈ F2 ਦਬਾਓ।"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ਈਮੇਜ਼ ਵਾਲੀ ਡਾਇਰੈਕਟਰੀ:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "ਭਾਗ ਚੁਣੋ"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "ਜੰਤਰ %s ਉੱਤੇ %s CDROM ਈਮੇਜ਼ ਨਹੀਂ ਜਾਪਦੇ ਹਨ।"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਕਮਾਂਡ %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 "ਹਾਰਡ ਡਿਸਕ ਉੱਤੇ ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ ਖੋਜ ਨਹੀਂ ਸਕੀ।"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS ਡਿਸਕ %s ਲਈ ਹਾਰਡ ਡਰਾਈਵ ਲੱਭ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "ਕੀ-ਬੋਰਡ ਕਿਸਮ"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "ਤੁਸੀਂ ਕਿਸ ਤਰ੍ਹਾਂ ਦਾ ਕੀ-ਬੋਰਡ ਵਰਤਣਾ ਚਾਹੋਗੇ?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ %s ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ %s ਦੇ ਭਾਗ ਪੜਨ ਵਿੱਚ ਅਸਫ਼ਲ: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s ਵਿੱਚ ਲਾਈਨ %d ਉੱਤੇ ਗਲਤੀ ਹੈ, ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ %s ਵਿੱਚ।"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ਹਟਾਉਣਯੋਗ-ਮਾਧਿਅਮ ਤੇ ks.cfg ਨਹੀ ਲੱਭੀ।"
 
-#: ../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."
@@ -5825,50 +5825,50 @@ msgstr ""
 "ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।  ਹੇਠਾਂ ਕਿੱਕਸਟਾਰਟ ਮੁੱਲ ਸੋਧੋ ਜਾਂ ਰੱਦ ਕਰੋ ਨੂੰ ਇੰਸਟਾਲੇਸ਼ਨ "
 "ਜਾਰੀ ਰੱਖਣ ਵਾਸਤੇ ਦੱਬੋ।"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਕਮਾਂਡ %s ਬੰਦ ਕਰਨ ਲਈ ਗਲਤ ਮੁੱਲ: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s ਵਲੋਂ %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> ਇਕਾਈਆਂ ਵਿੱਚ  | <Space> ਚੋਣ | <F12> ਅਗਲਾ ਪਰਦਾ"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ਇੱਕ ਭਾਸ਼ਾ ਚੁਣੋ"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "ਲੋਕਲ CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ਹਾਰਡ ਡਰਾਈਵ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS ਡਾਇਰੈਕਟਰੀ"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n ਵਲੋਂ %s ਲਈ ਜੀ ਆਇਆਂ ਨੂੰ"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "ਅੱਪਡੇਟ ਡਿਸਕ ਸਰੋਤ"
 
-#: ../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?"
@@ -5876,34 +5876,34 @@ msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਤੋਂ ਵੱਧ ਜੰਤਰ ਹਨ, ਜੋ ਕਿ ਅੱਪਡੇਟ ਡਿਸਕ ਲਈ ਸਰੋਤ ਦਾ ਕੰਮ ਕਰ ਸਕਦੇ ਹਨ। ਤੁਸੀਂ ਕਿਹਡ਼ਾ "
 "ਵਰਤਣਾ ਪਸੰਦ ਕਰੋਗੇ?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr "ਇਹ ਜੰਤਰ ਉੱਤੇ ਕਈ ਭਾਗ ਹਨ, ਜੋ ਕਿ ਡਰਾਈਵਰ-ਡਿਸਕ ਈਮੇਜ਼ ਰੱਖੇ ਜਾ ਸਕਦੇ ਹਨ। ਤੁਸੀਂ ਕਿਹਡ਼ਾ ਵਰਤਣਾ ਚਾਹੋਗੇ?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "ਆਪਣੀ ਅੱਪਡੇਟ ਡਿਸਕ /dev/%s ਵਿੱਚ ਪਾਓ ਅਤੇ ਜਾਰੀ ਰਹਿਣ ਲਈ \"ਠੀਕ ਹੈ\" ਦਬਾਓ।"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "ਅੱਪਡੇਟ ਡਿਸਕ"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "ਅੱਪਡੇਟ ਡਿਸਕ ਮਾਊਂਟ ਕਰਨ ਵਾਸਤੇ ਫੇਲ੍ਹ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "ਅੱਪਡੇਟ"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "ਐਨਾਕਾਂਡਾ ਅੱਪਡੇਟ ਪੜ੍ਹ ਰਿਹਾ ਹੈ..."
 
-#: ../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.."
@@ -5911,44 +5911,44 @@ msgstr ""
 "ਅੱਪਡੇਟ ਈਮੇਜ਼ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਅੱਪਡੇਟ ਸਥਿਤੀ ਸੋਧੋ ਜਾਂ ਅੱਪਡੇਟਾਂ ਤੋਂ ਬਿਨਾਂ "
 "ਜਾਰੀ ਕਰਨ ਲਈ ਰੱਦ ਕਰੋ।"
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "ਅੱਪਡੇਟ ਇਮੇਜ਼ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "ਤੁਹਾਡੀ ਮਸ਼ੀਨ ਉੱਤੇ %s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਲੋੜੀਂਦੀ ਰੈਮ (RAM) ਨਹੀਂ ਹੈ।"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "ਸੰਕਟਕਾਲੀਨ ਢੰਗ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਢੰਗ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "ਸੰਕਟਕਾਲੀਨ ਈਮੇਜ਼ ਕਿਸ ਕਿਸਮ ਦੇ ਮੀਡਿਆ ਉੱਤੇ ਹਨ?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ ਕਿਸ ਕਿਸਮ ਦੇ ਮੀਡਿਆ ਉੱਤੇ ਹਨ?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ਕੋਈ ਡਰਾਈਵਰ ਨਹੀਂ ਲੱਭਾ"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ਡਰਾਈਵਰ ਚੁਣੋ"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ਇੱਕ ਡਰਾਈਵਰ ਡਿਸਕ ਵਰਤੋ"
 
-#: ../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?"
@@ -5956,59 +5956,59 @@ msgstr ""
 "ਇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਕਿਸਮ ਲਈ ਲੋੜੀਂਦੀ ਕੋਈ ਜੰਤਰ ਦੀ ਕਿਸਮ ਨੂੰ ਖੋਜਣ ਵਿੱਚ ਅਸਫਲ ਹੈ। ਤੁਸੀਂ ਡਰਾਈਵਰ ਨੂੰ ਦਸਤੀ "
 "ਚੁਣਨਾ ਚਾਹੁੰਦੇ ਹੋ ਜਾਂ ਜੰਤਰ-ਡਿਸਕ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਇਹ ਜੰਤਰ ਖੋਜੇ ਗਏ ਹਨ।"
 
-#: ../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 "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਕੋਈ ਜੰਤਰਡਰਾਈਵਰ ਲੋਡ ਨਹੀਂ ਕੀਤੇ ਗਏ ਹਨ। ਕੀ ਤੁਸੀਂ ਕਿਸੇ ਨੂੰ ਹੁਣ ਲੋਡ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ਜੰਤਰ"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "ਸਮਾਪਤ"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ਜੰਤਰ ਸ਼ਾਮਿਲ"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ਲੋਡਰ ਤਾਂ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ। ਸ਼ੈੱਲ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ।\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "ਐਨਾਕਾਂਡਾ %s ਚੱਲ ਰਿਹਾ ਹੈ, %s ਸੰਕਟਕਾਲੀਨ ਢੰਗ - ਉਡੀਕ ਕਰੋ ਜੀ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "ਐਨਾਕਾਂਡਾ %s ਚੱਲ ਰਿਹਾ ਹੈ, %s ਸਿਸਟਮ ਇੰਸਟਾਲਰ - ਉਡੀਕ ਕਰੋ ਜੀ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "ਇੰਸਟਾਲ ਈਮੇਜ਼ %s ਦੀ ਖੋਜ ਅਸਫ਼ਲ"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" ਦੀ ਜਾਂਚ ਹੋ ਰਹੀ ਹੈ..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "ਹੁਣ ਮੀਡਿਆ ਦੀ ਜਾਂਚ ਹੋ ਰਹੀ ਹੈ..."
 
-#: ../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."
@@ -6016,7 +6016,7 @@ msgstr ""
 "ਪ੍ਰਾਇਮਰੀ ਵਾਲੀਅਮ ਵੇਰਵੇ ਤੋਂ ਡਿਸਕ ਚੈਕ-ਸਮ ਜਾਂਚਣ ਵਿੱਚ ਅਸਫਲ ਹੈ। ਇਸ ਦਾ ਅਰਥ ਹੈ ਕਿ ਡਿਸਕ ਨੂੰ ਚੈੱਕ-ਸਮ "
 "ਜੋਡ਼ੇ ਬਿਨਾਂ ਹੀ ਤਿਆਰ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../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 "
@@ -6026,11 +6026,11 @@ msgstr ""
 "ਵਰਤਣ ਯੋਗ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਡਿਸਕ ਸਾਫ ਕਰੋ ਅਤੇ ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।  ਜੇ ਜਾਂਚ ਲਗਾਤਾਰ ਫੇਲ ਹੁੰਦੀ ਰਹੀ "
 "ਤਾਂ ਤੁਹਾਨੂੰ ਇੰਸਟਾਲ ਜਾਰੀ ਨਹੀਂ ਕਰਨਾ ਚਾਹੀਦਾ।"
 
-#: ../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 "
@@ -6040,7 +6040,7 @@ 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"
@@ -6051,26 +6051,26 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "ਚੈੱਕ-ਸਮ ਦੀ ਜਾਂਚ"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "ਜੰਤਰ ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਕਮਾਂਡ %s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ ਹੈ: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "ਕਿੱਕਸਟਾਰਟ ਜੰਤਰ ਕਮਾਂਡ ਲਈ ਮੈਡਿਊਲ ਨਾਂ ਦੇਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
 
-#: ../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 "IPv4 ਨੈੱਟਵਰਕ ਲਈ ਪ੍ਰੀ-ਫਿਕਸ 1 ਤੋਂ 32 ਵਿੱਚ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ ਜਾਂ IPv6 ਲਈ 1 ਤੋਂ 128 ਤੱਕ"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6080,27 +6080,27 @@ msgstr ""
 "%s ਇੱਕ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਐਡਪਟਰ ਹੈ।  ਆਪਣੇ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਤੇ ਜਾਣ ਲਈ ESSID ਅਤੇ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ(key) "
 "ਦਿਓ, ਜੇਕਰ ਕੋਈ ਕੁੰਜੀ ਨਹੀਂ ਲੋੜੀਦੀ ਹੈ ਤਾਂ ਇਹ ਖੇਤਰ ਖਾਲੀ ਰਹਿਣ ਦਿਉ ਅਤੇ ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਰਹੇਗੀ।"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "ਵਾਇਰਲੈੱਸ ਸੈਟਿੰਗ"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "ਨਾਂ-ਸਰਵਰ IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "ਨਾਂ-ਸਰਵਰ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: ../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 "
@@ -6110,56 +6110,56 @@ msgstr ""
 "ਨਹੀਂ ਹੈ। ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਇਹ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ ਤਾਂ ਤੁਸੀਂ ਇਸ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਛੱਡ ਸਕਦੇ ਹੋ ਅਤੇ ਇੰਸਟਾਲੇਸ਼ਨ "
 "ਜਾਰੀ ਰਹੇਗੀ।"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "ਗਲਤ IP ਸਿਰਨਾਵਾਂ"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "ਤੁਸੀਂ ਗਲਤ IP ਸਿਰਨਾਵਾਂ ਭਰਿਆ ਹੈ।"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ ਹੈ"
 
-#: ../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 "ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਦੀ ਸੰਰਚਨਾ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਸੀ।"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP ਸੰਰਚਨਾ"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਪ੍ਰੋਟੋਕਾਲ ਦੀ ਚੋਣ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ। (IPv4 ਜਾਂ IPv6)।"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 NFS ਲਈ ਲੋੜੀਂਦਾ ਹੈ"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS ਇੰਸਟਾਲੇਸ਼ਨ ਢੰਗ ਲਈ IPv4 ਸਹਿਯੋਗ ਦੀ ਲੋੜ ਹੈ।"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ਸਿਰਨਾਵਾਂ:"
 
-#: ../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 ਸਿਰਨਾਵਾਂ:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "ਨਾਂ-ਸਰਵਰ:"
 
-#: ../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 "
@@ -6169,174 +6169,174 @@ msgstr ""
 "ਕਿਉਡ ਨੈਟਮਾਕਕ ਜਾਂ CIDR-ਸ਼ੈਲੀ ਪ੍ਰੀ-ਫਿਕਸ ਮੰਨਣਯੋਗ ਹਨ। ਗੇਟਵੇ ਅਤੇ ਨਾਂ ਸਰਵਰ ਖੇਤਰ IPv4 ਜਾਂ IPv6 "
 "ਸਿਰਨਾਵਾਂ ਦਿਓ।"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "ਦਸਤੀ TCP/IP ਸੰਰਚਨਾ"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "ਗੁੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../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 "ਤੁਹਾਨੂੰ ਦੋਵੇਂ ਇੱਕ ਜਾਇਜ਼ IPv4 ਸਿਰਨਾਵਾਂ ਅਤੇ ਇੱਕ ਨੈੱਟਮਾਸਕ ਜਾਂ CIDR ਪ੍ਰੀਫਿਕਸ ਦੇਣਾ ਪਵੇਗਾ।"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "ਤੁਹਾਨੂੰ ਦੋਵੇਂ ਇੱਕ ਜਾਇਜ਼ IPv6 ਸਿਰਨਾਵਾਂ ਅਤੇ ਇੱਕ CIDR ਪ੍ਰੀਫਿਕਸ ਦੇਣਾ ਪਵੇਗਾ।"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ਹੋਸਟ ਨਾਂ ਅਤੇ ਡੋਮੇਨ ਜਾਣ ਰਿਹਾ ਹੈ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "ਕਿੱਕਸਟਾਰਟ ਨੈੱਟਵਰਕ ਕਮਾਂਡ %s ਲਈ ਨਕਾਰਾ ਆਰਗੂਮੈਂਟ: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "ਨੈੱਟਵਰਕ ਕਮਾਂਡ ਵਿੱਚ ਗਲਤ ਬੂਟ-ਪਰੋਟੋਕਾਲ %s ਦਿੱਤਾ"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "ਨੈੱਟਵਰਕ ਜੰਤਰ"
 
-#: ../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 "ਇਹ ਸਿਸਟਮ ਉੱਤੇ ਜ਼ਿਆਦਾ ਨੈੱਟਵਰਕ ਜੰਤਰ ਹਨ, ਤੁਸੀਂ ਕਿਸ ਤੋਂ ਇੰਸਟਾਲ ਕਰਨਾ ਪਸੰਦ ਕਰੋਗੇ?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS ਸਰਵਰ ਨਾਂ:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ਡਾਇਰੈਕਟਰੀ:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ %s ਈਮੇਜ਼ਾਂ ਲਈ ਸਰਵਰ ਨਾਂ ਅਤੇ ਮਾਰਗ ਦਿਓ।"
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS ਸੈਟਅੱਪ"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "ਬਿਨਾਂ DNS ਸੰਰਚਨਾ ਹੀ ਮੇਜ਼ਬਾਨ ਦਿੱਤਾ ਗਿਆ"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ਉਸ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਸਰਵਰ ਤੋਂ ਮਾਊਂਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ਉਹ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਇੱਕ %s ਇੰਸਟਾਲੇਸ਼ਨ ਲਡ਼ੀ ਨਹੀਂ ਜਾਪਦੀ ਹੈ।"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਕਮਾਂਡ %s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ ਹੈ: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "ਟੇਲਨੈੱਟ"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "ਟੇਲਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਲਈ ਉਡੀਕਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "ਐਨਾਕਾਂਡਾ ਟੇਲਨੈੱਟ ਰਾਹੀਂ ਚੱਲ ਰਿਹਾ ਹੈ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s ਨੂੰ ਲੈਣ ਵਿੱਚ ਅਸਫ਼ਲ://%s/%s।"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ਇੰਸਟਾਲ ਈਮੇਜ਼ ਨੂੰ ਲੈਣ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਕਮਾਂਡ %s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ ਹੈ: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "ਇੱਕ --url ਆਰਗੂਮੈਂਟ, Url ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਲਈ ਜ਼ਰੂਰੀ ਹੈ।"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "ਅਣਜਾਣ 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 "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਸਰਵਰ ਦਾ URL ਦਿਓ ਜਿੱਥੇ %s ਮੌਜੂਦ ਹੈ।"
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL ਸੈਟਅੱਪ"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ URL ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL ਜਾਂ ਤਾਂ ftp ਜਾਂ http URL ਹੋਣਾ ਜਰੂਰੀ ਹੈ"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "ਅਣਜਾਣ ਮੇਜ਼ਬਾਨ"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ਇੱਕ ਠੀਕ ਮੇਜ਼ਬਾਨ ਨਾਂ ਨਹੀਂ ਹੈ।"
 
-#: ../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."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ HTTP ਪਰਾਕਸੀ ਸਰਵਰ ਵਰਤ ਰਹੇ ਹੋ, ਤਾਂ ਵਰਤਣ ਲਈ HTTP ਪਰਾਕਸੀ ਸਰਵਰ ਦਾ ਨਾਂ ਭਰੋ।"
 
-#: ../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
 msgid "Further Setup"
 msgstr "ਹੋਰ ਸੈਟਅੱਪ"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ਡਰਾਈਵਰ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "ਡਰਾਈਵਰ %s ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..."
diff --git a/po/pl.po b/po/pl.po
index f2dc86f5c..82b1e32b3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -55,41 +55,41 @@ msgstr "Naciśnij <enter>, aby uzyskać powłokę"
 #: ../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"
 
@@ -576,22 +576,22 @@ msgstr "Zmienianie rozmiaru systemu plików na %s..."
 #: ../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 "Błąd"
 
@@ -646,8 +646,8 @@ msgstr ""
 "Naciśnij <Enter>, aby zakończyć instalator."
 
 #: ../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 "Pomiń"
 
@@ -982,21 +982,21 @@ msgstr "Napraw"
 
 #: ../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 "Tak"
 
 #: ../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 "Nie"
 
-#: ../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 "Ponów"
 
@@ -1007,8 +1007,8 @@ msgstr "Zignoruj"
 #: ../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 "Anuluj"
 
@@ -1874,21 +1874,21 @@ msgid "_Write changes to disk"
 msgstr "_Zapisz zmiany na dysk"
 
 #: ../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 "Wstecz"
 
 #: ../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 "Dalej"
 
@@ -2322,7 +2322,7 @@ msgstr "Podaj %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Pomiń podawanie %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Witaj w systemie %s dla %s"
@@ -3216,7 +3216,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Wybór języka"
 
-#: ../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 "Jakiego języka chcesz używać w czasie instalacji?"
 
@@ -3592,7 +3592,7 @@ msgstr "W pole %s musisz wpisać wartość."
 msgid "Dynamic IP"
 msgstr "Dynamiczny 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 "Wysyłanie żądania informacji IP do %s..."
@@ -3763,7 +3763,7 @@ msgstr "nieznane"
 msgid "Hardware address: "
 msgstr "Adres sprzętu: "
 
-#: ../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 "Brakujący protokół"
 
@@ -3772,7 +3772,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Musisz wybrać przynajmniej protokół IPv4 lub IPv6."
 
 #: ../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 "Nieprawidłowy przedrostek"
 
@@ -4007,7 +4007,7 @@ msgstr "Urządzenia RAID"
 msgid "None"
 msgstr "Brak"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Dyski twarde"
 
@@ -4913,12 +4913,12 @@ msgstr "Przedrostek"
 msgid "Activate on boot"
 msgstr "Aktywuj przy uruchamianiu"
 
-#: ../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 "Włącz obsługę IPv4"
 
-#: ../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 "Włącz obsługę IPv6"
@@ -5038,7 +5038,7 @@ msgstr "Automatycznie 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 "Brama:"
 
@@ -5657,22 +5657,22 @@ msgstr ""
 "* Nie otrzymasz aktualizacji oprogramowania i bezpieczeństwa dla pakietów "
 "niezawartych w subskrypcji."
 
-#: ../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 "Sprawdzanie nośników"
 
-#: ../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 "Przetestuj"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Wysuń płytę"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5681,7 +5681,7 @@ msgstr ""
 "Wybierz \"%s\", aby przetestować płytę znajdującą się aktualnie w napędzie, "
 "lub \"%s\", aby wysunąć płytę i włożyć inną do przetestowania."
 
-#: ../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 "
@@ -5696,7 +5696,7 @@ msgstr ""
 "pierwszym użyciem. Po pomyślnym przetestowaniu nie ma potrzeby ponownie "
 "testować każdej płyty, aby ją ponownie użyć."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5705,11 +5705,11 @@ msgstr ""
 "Nie znaleziono płyty systemu %s w żadnym napędzie. Włóż płytę %s i naciśnij %"
 "s, aby ponowić."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Znaleziono płytę"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5720,7 +5720,7 @@ msgstr ""
 "\n"
 "Wybierz %s, aby pominąć test nośnika i rozpocząć instalację."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5729,7 +5729,7 @@ msgstr ""
 "Nie można znaleźć płyty startowej %s. Włóż płytę %s i naciśnij %s, aby "
 "ponowić próbę."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5738,32 +5738,32 @@ msgstr ""
 "Nie znaleziono płyty %s w żadnym napędzie CD-ROM. Włóż płytę %s i naciśnij %"
 "s, aby ponowić."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Nie znaleziono płyty"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Nie można znaleźć pliku kickstart na CD-ROM-ie."
 
-#: ../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 "Nie można odczytać folderu %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Wczytywanie"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Odczytywanie dysku ze sterownikami..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Dysk ze sterownikami"
 
-#: ../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?"
@@ -5771,7 +5771,7 @@ msgstr ""
 "W systemie jest wiele urządzeń, które mogą służyć jako źródło dysku ze "
 "sterownikami. Którego chcesz użyć?"
 
-#: ../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?"
@@ -5779,50 +5779,50 @@ msgstr ""
 "W systemie jest wiele partycji, które mogą zawierać obraz dysku ze "
 "sterownikami. Której chcesz użyć?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Zamontowanie partycji nie powiodło się."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Wybierz obraz dysku ze sterownikami"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Wybierz plik, który jest obrazem dysku ze sterownikami."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Wczytanie sterownika z pliku dysku ze sterownikami nie powiodło się."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Włóż dysk ze sterownikami do /dev/%s i naciśnij \"OK\", aby kontynuować."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Włóż dysk ze sterownikami"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Zamontowanie dysku ze sterownikami nie powiodło się."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Dysk ze sterownikami jest nieprawidłowy dla tego wydania systemu %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Wybór ręczny"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Wczytaj inny dysk"
 
-#: ../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 "
@@ -5832,38 +5832,38 @@ msgstr ""
 "chcesz samodzielnie wybrać sterownik, przejść dalej lub wczytać inny dysk ze "
 "sterownikami?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Dysk ze sterownikami"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Czy masz dysk ze sterownikami?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Więcej dysków ze sterownikami?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Czy chcesz wczytać więcej dysków ze sterownikami?"
 
-#: ../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 "Błąd kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Nieznany dysk ze źródłem kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5871,7 +5871,7 @@ msgid ""
 msgstr ""
 "Nieprawidłowy argument polecenia dysku ze sterownikami kickstart: %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 "
@@ -5882,19 +5882,19 @@ msgstr ""
 "spacjami. Jeśli nie wiesz jakie parametry podać, pomiń ten ekran, naciskając "
 "przycisk \"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Podaj parametry modułu"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nie znaleziono sterowników"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Wczytaj dysk ze sterownikami"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5902,7 +5902,7 @@ msgstr ""
 "Nie znaleziono sterowników, które można wczytać ręcznie. Czy chcesz użyć "
 "dysku ze sterownikami?"
 
-#: ../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."
@@ -5911,26 +5911,26 @@ msgstr ""
 "sterownika nie ma na tej liście, a masz osobny dysk ze sterownikami, "
 "naciśnij F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Podaj opcjonalne parametry modułu"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Wybierz sterownik do wczytania"
 
-#: ../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 "Wykryte nośniki"
 
-#: ../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 "Znaleziono lokalny nośnik instalacji..."
 
-#: ../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 "
@@ -5939,7 +5939,7 @@ msgstr ""
 "Drzewo instalacyjne systemu %s w tym folderze nie wygląda na zgodne z "
 "nośnikiem startowym."
 
-#: ../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."
@@ -5947,7 +5947,7 @@ msgstr ""
 "Podczas odczytywania instalacji z obrazów ISO wystąpił błąd. Sprawdź obrazy "
 "ISO i spróbuj ponownie."
 
-#: ../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?"
@@ -5955,7 +5955,7 @@ msgstr ""
 "Wygląda na to, że nie ma żadnego dysku twardego! Chcesz skonfigurować "
 "dodatkowe urządzenia?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5966,61 +5966,61 @@ msgstr ""
 "(ISO9660) dla systemu %s? Jeśli nie widzisz potrzebnego dysku na tej liście, "
 "naciśnij F2, aby skonfigurować dodatkowe urządzenia."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Folder zawierający obrazy:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Wybierz partycję"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Urządzenie %s nie zawiera obrazów CD-ROM %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Błędny argument polecenia metody kickstart HD %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 "Nie można znaleźć pliku kickstart na dysku twardym."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Nie można znaleźć dysku twardego odpowiadającego dyskowi %s w BIOS-ie"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Typ klawiatury"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Jakiego typu klawiatury używasz?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Błąd podczas otwierania pliku kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Błąd podczas odczytywania zawartości pliku kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Błąd w %s w wierszu %d pliku konfiguracyjnego kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Nie można znaleźć ks.cfg na nośniku wymiennym."
 
-#: ../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."
@@ -6028,52 +6028,52 @@ msgstr ""
 "Nie można pobrać pliku kickstart. Zmodyfikuj poniższy parametr kickstart lub "
 "naciśnij Anuluj, aby kontynuować jako instalacja interaktywna."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Błąd podczas pobierania pliku kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Błędny argument polecenia shutdown metody kickstart %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Witaj w trybie ratunkowym systemu %s dla %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> między elementami | <Spacja> wybór | <F12> następny ekran "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Wybierz język"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokalny CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Dysk twardy"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Folder NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Witaj w systemie %s%n dla %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Położenie dysku aktualizującego"
 
-#: ../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?"
@@ -6081,7 +6081,7 @@ msgstr ""
 "Masz w systemie kilka urządzeń, w których może znajdować się dysk "
 "aktualizacyjny. Którego chcesz użyć?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6089,29 +6089,29 @@ msgstr ""
 "W systemie jest wiele partycji, które mogą zawierać obraz dysku "
 "aktualizującego. Której chcesz użyć?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Włóż dysk aktualizujący do /dev/%s, a potem naciśnij \"OK\", aby kontynuować."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Dysk aktualizujący"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Zamontowanie dysku aktualizującego nie powiodło się"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Aktualizacje"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Odczytywanie aktualizacji anacondy..."
 
-#: ../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.."
@@ -6119,44 +6119,44 @@ msgstr ""
 "Nie można pobrać obrazu aktualizującego. Zmodyfikuj poniższe położenie "
 "aktualizacji lub naciśnij Anuluj, aby kontynuować bez aktualizacji."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Błąd podczas pobierania obrazu aktualizacyjnego"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Masz za mało RAM-u, aby zainstalować system %s na tym komputerze."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Metoda ratunku"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Metoda instalacji"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Jakiego typu nośnik zawiera obraz ratunkowy?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Jaki typ nośnika zawiera pakiety do instalacji?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nie znaleziono sterownika"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Wybierz sterownik"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Użyj dysku ze sterownikami"
 
-#: ../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?"
@@ -6164,11 +6164,11 @@ msgstr ""
 "Nie można znaleźć żadnych urządzeń potrzebnych do tego typu instalacji. Czy "
 "chcesz ręcznie wybrać sterownik lub użyć dysku ze sterownikami?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "W systemie zostały znalezione następujące urządzenia."
 
-#: ../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?"
@@ -6176,50 +6176,50 @@ msgstr ""
 "Nie wczytano żadnych specjalnych sterowników dla systemu. Czy chcesz dodać "
 "jakieś teraz?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Urządzenia"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Zrobione"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Dodaj urządzenie"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "loader został już uruchomiony. Uruchamianie powłoki.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "Uruchamianie anacondy %s, trybu ratunkowego systemu %s - proszę czekać...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Uruchamianie anacondy %s, instalatora systemu %s - proszę czekać...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Nie można znaleźć obrazu instalacyjnego %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Sprawdzanie \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Sprawdzanie nośnika..."
 
-#: ../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."
@@ -6228,7 +6228,7 @@ msgstr ""
 "podstawowego. To zapewne oznacza, że dysk utworzono bez dodania sumy "
 "kontrolnej."
 
-#: ../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 "
@@ -6239,11 +6239,11 @@ msgstr ""
 "ponownie. Jeśli test nadal nie będzie kończył się sukcesem, nie powinieneś "
 "kontynuować instalacji."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Powodzenie"
 
-#: ../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 "
@@ -6253,7 +6253,7 @@ msgstr ""
 "powinna odbyć się bez problemu. Zauważ, że nie wszystkie błędy nośnika/"
 "napędu mogą zostać wykryte przez sprawdzenie nośnika."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6264,20 +6264,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Sprawdzanie sumy kontrolnej"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Błędny argument polecenia urządzenia metody kickstart %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Nazwa modułu musi zostać podana dla polecenia urządzenia kickstart."
 
-#: ../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"
@@ -6285,7 +6285,7 @@ msgstr ""
 "Przedrostek musi być między 1 a 32 dla sieci IPv4 lub między 1 a 128 dla "
 "sieci IPv6."
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6296,27 +6296,27 @@ msgstr ""
 "uzyskać dostęp do sieci bezprzewodowej. Jeśli klucz nie jest wymagany, "
 "zostaw puste pole, a instalacja będzie kontynuowana."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Klucz szyfrujący"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Ustawienia sieci bezprzewodowej"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP serwera nazw"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Brak serwera nazw"
 
-#: ../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 "
@@ -6326,56 +6326,56 @@ msgstr ""
 "konfiguracji, ale bez adresu serwera nazw. Jeśli nie masz tej informacji, "
 "pozostaw pole puste i kontynuuj instalację."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Nieprawidłowa informacja IP"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Podano prawidłowy adres IP."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: ../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 "Podczas konfigurowania interfejsu sieciowego wystąpił błąd."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Skonfiguruj TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Musisz wybrać przynajmniej jeden protokół (IPv4 lub IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 jest wymagane dla NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Metoda instalacji NFS wymaga obsługi IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Adres IPv4:"
 
-#: ../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 "Adres IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Serwer nazw:"
 
-#: ../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,178 +6386,178 @@ msgstr ""
 "oddzielonych kropkami lub CIDR. Brama i serwer nazw muszą być prawidłowymi "
 "adresami IPv4 lub IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ręczna konfiguracja TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Brak informacji"
 
-#: ../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 ""
 "Musisz podać zarówno prawidłowy adres IPv4, jak i maskę sieci lub "
 "przedrostek CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Musisz podać zarówno prawidłowy adres IPv6, jak i przedrostek CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Ustalanie nazwy komputera i domeny..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Błędny argument polecenia sieciowego kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Błędnie podany protokół startowy %s w poleceniu sieciowym"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Urządzenie sieciowe"
 
-#: ../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 ""
 "W systemie jest wiele urządzeń sieciowych. Którego chcesz użyć do instalacji?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nazwa serwera NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Folder %s:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Podaj nazwę usługi i ścieżkę do obrazów systemu %s."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Ustawienia NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Podano nazwę komputera bez skonfigurowanego DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Nie można zamontować tego folderu z serwera."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Ten folder nie zawiera drzewa instalacyjnego systemu %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Błędny argument polecenia NFS metody kickstart %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 "Oczekiwanie na połączenie telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Uruchamianie anacondy przez telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Nie można pobrać %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Nie można pobrać obrazu instalacyjnego."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Błędny argument polecenia URL metody kickstart %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Musisz podać argument --url metodzie URL kickstart."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Nieznana metoda 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 "Podaj URL zawierający obrazy systemu %s na serwerze."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Skonfiguruj pośrednika"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Ustawienia URL-a"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Musisz podać URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL musi zawierać ftp lub http"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Nieznany komputer"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s nie jest prawidłową nazwą komputera."
 
-#: ../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."
 msgstr "Jeśli używasz serwera pośredniczącego HTTP, podaj jego nazwę."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Nazwa pośrednika:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Port pośrednika:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Dalsze ustawienia"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Wczytywanie sterownika SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Wczytywanie sterownika %s..."
diff --git a/po/pt.po b/po/pt.po
index a8932d75b..6f0577b15 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -133,41 +133,41 @@ msgstr "Carregue em <Enter> para obter uma consola"
 #: ../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"
 
@@ -669,22 +669,22 @@ msgstr "A formatar o sistema de ficheiros %s..."
 #: ../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 "Erro"
 
@@ -740,8 +740,8 @@ msgstr ""
 "Carregue em <Enter> para sair do instalador."
 
 #: ../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 "Não Efectuar"
 
@@ -1077,21 +1077,21 @@ msgstr "Corrigir"
 
 #: ../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 "Sim"
 
 #: ../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 "Não"
 
-#: ../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 "Repetir"
 
@@ -1102,8 +1102,8 @@ msgstr "Ignorar"
 #: ../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 "Cancelar"
 
@@ -1980,21 +1980,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 "Regressar"
 
 #: ../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 "Continuar"
 
@@ -2434,7 +2434,7 @@ msgstr "Por favor indique a sua %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Ignorar a introdução de %(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 "Bem-vindo ao %s"
@@ -3327,7 +3327,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Escolha de Língua"
 
-#: ../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 "Que língua gostaria de utilizar durante o processo de instalação?"
 
@@ -3709,7 +3709,7 @@ msgstr "É necessário inserir um valor no campo \"%s\"."
 msgid "Dynamic IP"
 msgstr "IP dinâmico"
 
-#: ../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 "A enviar pedido para informações sobre IP para %s..."
@@ -3880,7 +3880,7 @@ msgstr "desconhecido"
 msgid "Hardware address: "
 msgstr "Endereço de 'hardware': "
 
-#: ../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 "Protocolo em Falta"
 
@@ -3889,7 +3889,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Deverá seleccionar pelo menos o suporte para IPv4 ou IPv6."
 
 #: ../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 "Prefixo Inválido"
 
@@ -4128,7 +4128,7 @@ msgstr "Dispositivos RAID"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Discos Rígidos"
 
@@ -5059,12 +5059,12 @@ msgstr "Prefixo"
 msgid "Activate on boot"
 msgstr "Activar no arranque"
 
-#: ../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 "Activar o suporte de IPv4"
 
-#: ../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 "Activar o suporte de IPv6"
@@ -5184,7 +5184,7 @@ msgstr "IPv6 Auto"
 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':"
 
@@ -5806,22 +5806,22 @@ msgstr ""
 "* Não irá obter aplicações e actualizações de segurança para os pacotes não "
 "incluídos na sua inscrição."
 
-#: ../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 "Verificação do Suporte Físico"
 
-#: ../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 "Testar"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Ejectar o Disco"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5830,7 +5830,7 @@ msgstr ""
 "Escolha \"%s\" para testar o disco que está no leitor, ou \"%s\" para "
 "ejectar o disco e inserir outro para testes."
 
-#: ../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 "
@@ -5845,7 +5845,7 @@ msgstr ""
 "utilização dos mesmos. Após terem sido testados com sucesso, não é "
 "obrigatório testá-los de novo antes de os usar outra vez."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5854,11 +5854,11 @@ msgstr ""
 "O disco do %s não foi encontrado em nenhum dos leitores de CD-ROM. Por favor "
 "insira o disco com o %s e carregue em %s para voltar a tentar."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disco Encontrado"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5869,7 +5869,7 @@ msgstr ""
 "\n"
 "Escolha %s para não efectuar o teste e iniciar a instalação."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5879,7 +5879,7 @@ msgstr ""
 "arranque. Por favor insira o disco com o %s e carregue em %s para voltar a "
 "tentar."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5888,32 +5888,32 @@ msgstr ""
 "O disco do %s não foi encontrado em nenhum dos leitores de CD-ROM. Por favor "
 "insira o disco com o %s e carregue em %s para voltar a tentar."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disco Não Encontrado"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Não foi possível encontrar o ficheiro 'kickstart' no 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 "Não foi possível ler directoria %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "A carregar"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "A ler o disco de controladores..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Localização do Disco de Controladores"
 
-#: ../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?"
@@ -5921,7 +5921,7 @@ msgstr ""
 "Tem vários dispositivos que podem ter o disco de controladores. Qual é que "
 "deseja actualizar?"
 
-#: ../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?"
@@ -5929,51 +5929,51 @@ msgstr ""
 "Tem várias partições neste dispositivo que podem ter a imagem do disco de "
 "controladores. Qual é que deseja actualizar?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Não foi possível montar a partição."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Seleccione a imagem do disco de controladores"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Seleccione o ficheiro que é a sua imagem de disco de controladores."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Não foi possível carregar o disco de controladores do ficheiro."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Insira o disco com controladores em /dev/%s e carregue em \"OK\" para "
 "continuar."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Insira o Disco de Controladores"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Não foi possível montar o disco de controladores."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "O disco de controladores é inválido para esta versão do %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Escolher manualmente"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Carregar outro disco"
 
-#: ../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 "
@@ -5983,45 +5983,45 @@ msgstr ""
 "disco de controladores.  Quer seleccionar manualmente um controlador, "
 "continuar mesmo assim ou utilizar outro disco de controladores?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disco de controladores"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Tem um disco com controladores?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Mais Discos de Controladores?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Quer carregar mais algum disco com controladores?"
 
-#: ../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 "Erro do 'Kickstart'"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Fonte desconhecida no disco de controladores do 'kickstart': %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "Argumento inválido para o comando 'driver disk' do 'kickstart': %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 "
@@ -6032,19 +6032,19 @@ msgstr ""
 "Se não sabe que parâmetros deve passar, ignore este ecrã, carregando no "
 "botão \"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Indique os Parâmetros do Módulo"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nenhum controlador encontrado"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Carregar um disco de controladores"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -6052,7 +6052,7 @@ msgstr ""
 "Não foram encontrados controladores para inserção manual.  Deseja utilizar "
 "um disco de controladores?"
 
-#: ../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."
@@ -6060,26 +6060,26 @@ msgstr ""
 "Por favor seleccione o controlador que deseja carregar.  Se este não "
 "aparecer e você tiver um disco de controladores, carregue em F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Indique os parâmetros opcionais do módulo"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Escolha o Controlador de Dispositivo a Carregar"
 
-#: ../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 "Suporte Físico Detectado"
 
-#: ../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 "Suporte físico local de instalação detectado..."
 
-#: ../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 "
@@ -6088,7 +6088,7 @@ msgstr ""
 "A árvore de instalação do %s nessa directoria parece não condizer com o "
 "disco utilizado para arranque."
 
-#: ../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."
@@ -6096,7 +6096,7 @@ msgstr ""
 "Ocorreu um erro ao carregar a instalação das imagens ISO. Por favor "
 "verifique as imagens ISO e tente novamente."
 
-#: ../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?"
@@ -6104,7 +6104,7 @@ msgstr ""
 "O seu computador não parece ter nenhum disco rígido! Quer configurar mais "
 "algum dispositivo adicional?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6115,62 +6115,62 @@ msgstr ""
 "(iso9660) dos CDs do %s? Se não vê o disco que quer utilizar listado, "
 "carregue em F2 para configurar mais dispositivos."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Directoria que contém as imagens:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Seleccione Partição"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Dispositivo %s não parece conter as imagens dos CDROMs do %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Argumento inválido para o método 'HD' do 'kickstart' %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 "Não foi possível encontrar o ficheiro 'kickstart' no disco rígido."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Não foi possível encontrar o disco rígido para o disco %s da BIOS"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tipo de Teclado"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Que tipo de teclado é que utiliza?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Erro ao abrir o ficheiro 'kickstart' %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Erro ao ler conteúdo do ficheiro 'kickstart' %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Erro em %s na linha %d do ficheiro 'kickstart' %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Não foi possível encontrar o ficheiro ks.cfg na disquete de arranque."
 
-#: ../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."
@@ -6179,52 +6179,52 @@ msgstr ""
 "parâmetro de 'kickstart' em baixo ou carregue em Cancelar para prosseguir "
 "como uma instalação interactiva."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Erro ao obter o ficheiro 'kickstart'"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Argumento inválido para o método 'shutdown' do 'kickstart' %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Bem-vindo ao %s - Modo de Recuperação"
 
-#: ../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> entre elementos    | <Espaço> selecciona | <F12> continuar "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Escolha um Língua"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD local"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disco rígido"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Directoria de NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Bem-vindo ao %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Localização da Disquete de Actualizações"
 
-#: ../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?"
@@ -6232,7 +6232,7 @@ msgstr ""
 "Tem vários dispositivos que podem servidor de origem para um disco de "
 "actualizações. Qual é que deseja actualizar?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6241,30 +6241,30 @@ msgstr ""
 "Tem várias partições neste dispositivo que podem ter a imagem do disco de "
 "controladores. Qual é que deseja actualizar?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Insira a disquete com as actualizações em /dev/%s e carregue em \"OK\" para "
 "continuar."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disco de Actualizações"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Não foi possível montar o disco de actualizações"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Actualizações"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "A ler as actualizações do anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6274,46 +6274,46 @@ msgstr ""
 "parâmetro de 'kickstart' em baixo ou carregue em Cancelar para prosseguir "
 "como uma instalação interactiva."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Erro ao obter o ficheiro 'kickstart'"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 "Não tem memória suficiente nesta máquina para instalar o %s neste máquina."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Método de Recuperação"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Método de Instalação"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Que tipo de media contém a imagem de recuperação?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Em que tipo de formato estão os pacotes que vão ser instalados?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nenhum controlador encontrado"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Escolha o controlador"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Utilizar um disco de controladores"
 
-#: ../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?"
@@ -6322,11 +6322,11 @@ msgstr ""
 "tipo de instalação.  Quer seleccionar manualmente um controlador ou utilizar "
 "um disco de controladores?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Os seguintes dispositivos foram encontrados no seu sistema."
 
-#: ../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?"
@@ -6334,52 +6334,52 @@ msgstr ""
 "Não foi carregado qualquer controlador de dispositivo para o seu computador. "
 "Quer carregar algum agora?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Terminado"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Adicionar um Dispositivo"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "o carregador já foi executado.  A iniciar a linha de comandos.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "A executar o anaconda, no modo de recuperação do %s - aguarde por favor...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "A executar o anaconda, o programa de instalação do %s - aguarde por "
 "favor...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Não foi possível obter a imagem de instalação %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "A verificar o \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "A verificar o suporte físico..."
 
-#: ../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."
@@ -6387,7 +6387,7 @@ msgstr ""
 "Não foi possível ler o 'checksum' do disco do descritor primário do volume.  "
 "Isto provavelmente significa que o disco foi criado sem o '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 "
@@ -6398,18 +6398,18 @@ msgstr ""
 "tente novamente.  Se este teste continuar a falhar não deve continuar com a "
 "instalação."
 
-#: ../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"
@@ -6420,22 +6420,22 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Teste de 'Checksum'"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Argumento inválido para o método 'device' do 'kickstart' %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Terá de indicar o tipo e o nome do módulo no caso 'device' do 'kickstart'."
 
-#: ../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"
@@ -6443,7 +6443,7 @@ msgstr ""
 "O prefixo deverá ser entre 1 e 32, para as redes de IPv4, ou entre 1 e 128 "
 "para as redes IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6454,27 +6454,27 @@ msgstr ""
 "cifragem necessária para aceder à sua rede sem fios.  Se não for necessária "
 "chave, deixe este campo vazio e a instalação irá continuar."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Chave de Encriptação"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Configuração de Dispositivos sem Fios"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Servidor de nomes IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Servidor de Nomes em Falta"
 
-#: ../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 "
@@ -6484,56 +6484,56 @@ msgstr ""
 "servidor de nomes. Se não tem estes dados, deixe o campo em branco e a "
 "instalação irá continuar."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Informação IP Inválida"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Inserir um endereço IP inválido."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Erro da Rede"
 
-#: ../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 "Ocorreu um erro ao configurar a sua interface de rede."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configurar o TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Terá de seleccionar pelo menos um protocolo (IPv4 ou IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 Necessário para o NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "O método de instalação de NFS precisa do suporte de IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Endereço IPv4:"
 
-#: ../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 "Endereço IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Servidor de Nomes:"
 
-#: ../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 "
@@ -6544,43 +6544,43 @@ msgstr ""
 "'gateway' e do servidor de nomes deverão ser endereços válidos de IPv4 ou "
 "IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Configuração Manual do TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Informação em Falta"
 
-#: ../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 ""
 "Deve inserir um endereço IPv4 e uma máscara ou um prefixo CIDR válidos."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Deve inserir um endereço IPv6 e um prefixo CIDR válidos."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "A determinar o nome e domínio da máquina..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Argumento inválido para o comando 'network' do 'kickstart' %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "bootproto %s inválido indicado no comando network"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Dispositivo de Rede"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6588,139 +6588,139 @@ msgstr ""
 "Tem vários dispositivos de rede neste computador. Através de qual é que "
 "deseja realizar a instalação?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nome do servidor NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Directoria %s:"
 
-#: ../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 "Configuração de NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Foi indicado um nome de máquina sem o DNS configurado"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "A obter"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Não foi possível montar essa directoria do servidor."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Essa directoria não parece conter uma árvore de instalação do %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Argumento inválido para método 'NFS' do 'kickstart' %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 "A aguardar pela ligação telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "A executar o anaconda através do telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Não foi possível obter %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Não foi possível obter a imagem de instalação."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Argumento inválido para o método 'Url' do 'kickstart' %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Tem que indicar um parâmetro --url ao método 'Url' de 'kickstart'."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Método da Url desconhecido %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 "Configurar o TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Configuração de NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Tem de inserir uma directoria."
 
-#: ../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 "Servidor desconhecido"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s não é um nome de máquina válido."
 
-#: ../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."
 msgstr ""
 "Se estiver a utilizar um servidor \"proxy\" de HTTP indique o seu nome."
 
-#: ../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 "Configuração Avançada do FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "A carregar o controlador SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "A carregar o controlador %s..."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e06eea670..43418fe45 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -76,86 +76,86 @@ msgstr "Pressione <enter> para obter uma janela de comandos"
 #: ../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
+#: ../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"
 
@@ -642,41 +642,41 @@ msgstr "Redimensionando o sistema de arquivos em %s..."
 #: ../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 "Erro"
 
@@ -733,9 +733,9 @@ msgstr ""
 #: ../rescue.py:305
 #: ../rescue.py:307
 #: ../textw/upgrade_text.py:132
-#: ../loader2/cdinstall.c:200
-#: ../loader2/cdinstall.c:203
-#: ../loader2/method.c:393
+#: ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:203
+#: ../loader/method.c:393
 msgid "Skip"
 msgstr "Pular"
 
@@ -1032,9 +1032,9 @@ msgstr "Corrigir"
 #: ../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 "Sim"
 
@@ -1044,22 +1044,22 @@ msgstr "Sim"
 #: ../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 "Não"
 
 #: ../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
+#: ../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 "Repetir"
 
@@ -1078,11 +1078,11 @@ msgstr "Ignorar"
 #: ../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 "Cancelar"
 
@@ -1850,28 +1850,28 @@ msgstr "_Gravar alterações no disco"
 
 #: ../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 "Voltar"
 
@@ -1879,9 +1879,9 @@ msgstr "Voltar"
 #: ../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
+#: ../loader/cdinstall.c:117
+#: ../loader/cdinstall.c:125
+#: ../loader/driverdisk.c:440
 msgid "Continue"
 msgstr "Continuar"
 
@@ -2235,7 +2235,7 @@ msgid "Skip entering %(instkey)s"
 msgstr "Pular a inserção de %(instkey)s"
 
 #: ../text.py:564
-#: ../loader2/lang.c:63
+#: ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Bem-vindo ao %s para %s"
@@ -3053,7 +3053,7 @@ msgstr "Seleção de Idioma"
 
 #: ../iw/language_gui.py:76
 #: ../textw/language_text.py:45
-#: ../loader2/lang.c:374
+#: ../loader/lang.c:374
 msgid "What language would you like to use during the installation process?"
 msgstr "Qual idioma você deseja utilizar durante o processo de instalação?"
 
@@ -3416,8 +3416,8 @@ msgid "Dynamic IP"
 msgstr "IP dinâmico"
 
 #: ../iw/netconfig_dialog.py:177
-#: ../loader2/net.c:416
-#: ../loader2/net.c:860
+#: ../loader/net.c:416
+#: ../loader/net.c:860
 #, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "Enviando pedido para informações de IP para %s..."
@@ -3594,7 +3594,7 @@ msgstr "Endereço do hardware:"
 
 #: ../iw/network_gui.py:778
 #: ../textw/network_text.py:228
-#: ../loader2/net.c:820
+#: ../loader/net.c:820
 msgid "Missing Protocol"
 msgstr "Protocolo Faltando"
 
@@ -3607,7 +3607,7 @@ msgstr "Você deve selecionar pelo menos um tipo de suporte: IPv4 ou IPv6."
 #: ../iw/network_gui.py:843
 #: ../iw/network_gui.py:849
 #: ../textw/network_text.py:74
-#: ../loader2/net.c:92
+#: ../loader/net.c:92
 msgid "Invalid Prefix"
 msgstr "Prefixo Inválido"
 
@@ -3842,7 +3842,7 @@ msgid "None"
 msgstr "Nenhum"
 
 #: ../iw/partition_gui.py:816
-#: ../loader2/hdinstall.c:334
+#: ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Discos Rígidos"
 
@@ -4638,13 +4638,13 @@ msgid "Activate on boot"
 msgstr "Ativar na inicialização"
 
 #: ../textw/network_text.py:149
-#: ../loader2/net.c:730
+#: ../loader/net.c:730
 #: tmp/netpostconfig.glade.h:9
 msgid "Enable IPv4 support"
 msgstr "Habilitar suporte para IPv4"
 
 #: ../textw/network_text.py:156
-#: ../loader2/net.c:743
+#: ../loader/net.c:743
 #: tmp/netpostconfig.glade.h:10
 msgid "Enable IPv6 support"
 msgstr "Habilitar suporte para IPv6"
@@ -4768,7 +4768,7 @@ msgid "DHCPv6"
 msgstr "DHCPv6"
 
 #: ../textw/network_text.py:678
-#: ../loader2/net.c:1055
+#: ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Gateway:"
 
@@ -5337,45 +5337,45 @@ msgstr ""
 "* Pode resultar numa instalação não suportada ou não certificada do Red Hat Enterprise Linux.\n"
 "* Você não receberá atualizações de programas e de segurança para pacotes não inclusos na sua subscrição."
 
-#: ../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 "Verificação da Mídia"
 
-#: ../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 "Testar"
 
-#: ../loader2/cdinstall.c:96
-#: ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96
+#: ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Ejetar Disco"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject the disc and insert another for testing."
 msgstr "Escolha \"%s\" para testar o disco que está na unidade ou \"%s\" para ejetar o disco e inserir outro para testes."
 
-#: ../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 \"%s\". Testing each disc is not strictly required, however it is highly recommended.  Minimally, the discs should be tested prior to using them for the first time. After they have been successfully tested, it is not required to retest each disc prior to using it again."
 msgstr "Se você quiser testar mídias adicionais, insira o próximo disco e pressione \"%s\". Testar cada disco não é estritamente necessário, porém é altamente recomendável. No mínimo, os discos devem ser testados antes de serem usados pela primeira vez. Depois que forem testados com sucesso, não é necessário testar novamente cada disco quando for usá-los posteriormente."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid "The %s disc was not found in any of your drives. Please insert the %s disc and press %s to retry."
 msgstr "O disco %s não foi encontrado em nenhum dos seus drives. Por favor, insira o disco %s e pressione %s para tentar novamente."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disco Encontrado"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5386,452 +5386,452 @@ msgstr ""
 "\n"
 "Selecione %s para pular o teste e iniciar a instalação."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid "No %s disc was found which matches your boot media.  Please insert the %s disc and press %s to retry."
 msgstr "O disco %s que condiz com a sua mídia de inicialização não foi encontrado. Por favor, insira o disco %s e pressione %s para tentar novamente."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid "The %s disc was not found in any of your CDROM drives. Please insert the %s disc and press %s to retry."
 msgstr "O disco %s não foi encontrado em nenhuma das unidades de CDROM. Por favor, insira o disco %s e pressione %s para tentar novamente."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disco Não Encontrado"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Não foi possível encontrar o arquivo kickstart no 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 "Não foi possível ler o diretório %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Carregando"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Lendo disco de drivers..."
 
-#: ../loader2/driverdisk.c:230
-#: ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230
+#: ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Origem do Disco de Drivers"
 
-#: ../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?"
 msgstr "Você tem vários dispositivos que podem servir de origem para um disco de drivers. Qual você deseja utilizar?"
 
-#: ../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?"
 msgstr "Você tem várias partições neste dispositivo que podem conter a imagem do disco de drivers. Qual você deseja usar?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Não foi possível montar a partição."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Selecione a imagem do disco de drivers"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Selecione o arquivo que é a sua imagem do disco de drivers."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Não foi possível montar o disco de drivers a partir do arquivo."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Insira o seu disco de drivers em /dev/%s e pressione \"OK\" para continuar."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Insira o Disco de Drivers"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Não foi possível montar o disco de drivers."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Este disco de drivers não é válido para esta versão do %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Escolher manualmente"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Carregar outro disco"
 
-#: ../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 driver disk?"
 msgstr "Nenhum dispositivo do tipo apropriado foi encontrado neste disco de drivers. Você prefere selecionar o driver manualmente, continuar assim mesmo ou carregar outro disco?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disco de drivers"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Você tem um disco de drivers?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Mais Discos de Drivers?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Você deseja carregar outros discos de drivers?"
 
-#: ../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 "Erro do Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Fonte kickstart do disco de drivers desconhecida: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid "The following invalid argument was specified for the kickstart driver disk command: %s:%s"
 msgstr "O argumento inválido a seguir foi especificado no comando kickstart do disco de drivers: %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 separated by spaces.  If you don't know what parameters to supply, skip this screen by pressing the \"OK\" button."
 msgstr "Por favor, insira todos os parâmetros que você deseja passar para o módulo %s separados por espaços. Se você não sabe os parâmetros a fornecer, pule esta tela pressionando o botão \"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Insira os Parâmetros do Módulo"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nenhum driver encontrado"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Carregar disco de drivers"
 
-#: ../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 "Nenhum driver foi encontrado para inserção manual. Deseja utilizar um disco de drivers?"
 
-#: ../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."
 msgstr "Por favor, selecione o driver que você deseja carregar abaixo. Se ele não aparecer e você tiver um disco de drivers, pressione F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Especifique os parâmetros opcionais do módulo"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Selecione o Driver do Dispositivo a Carregar"
 
-#: ../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 "Mídia Detectada"
 
-#: ../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 "Mídia de instalação local detectada..."
 
-#: ../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 media."
 msgstr "A árvore de instalação do %s neste diretório não parece combinar com a mídia de inicialização."
 
-#: ../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."
 msgstr "Ocorreu um erro ao ler a instalação a partir das imagens ISO. Por favor, verifique as imagens ISO e tente novamente."
 
-#: ../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?"
 msgstr "O seu computador parece não ter nenhuma unidade de disco rígido! Você deseja configurar algum dispositivo adicional?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid "What partition and directory on that partition hold the CD (iso9660) images for %s? If you don't see the disk drive you're using listed here, press F2 to configure additional devices."
 msgstr "Em qual partição e em qual diretório desta partição encontram-se as imagens (iso9660) dos CDs do %s? Se você não vê a unidade que está utilizando listada aqui, pressione F2 para configurar dispositivos adicionais."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Diretório que contém as imagens:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Selecione a Partição"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "O dispositivo %s não parece conter as imagens dos CD-ROMs do %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Argumento inválido no comando do método kickstart do HD %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 "Não foi possível encontrar o arquivo kickstart no disco rígido."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Não foi possível encontrar o disco rígido para o disco %s da BIOS"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tipo de Teclado"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Que tipo de teclado você tem?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Erro ao abrir o arquivo kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Erro ao ler o conteúdo do arquivo kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Erro em %s na linha %d do arquivo kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Não foi possível encontrar o ks.cfg na mídia removível."
 
-#: ../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 "Não foi possível baixar o arquivo kickstart. Por favor, modifique o parâmetro do kickstart abaixo ou pressione Cancelar para proceder como uma instalação interativa."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Erro ao baixar arquivo kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Argumento inválido para o método de desligamento do kickstart com o comando %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Bem-vindo ao %s para %s - Modo de Recuperação"
 
-#: ../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> alterna seleção  | <Espaço> seleciona | <F12> continuar "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Escolha um Idioma"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD Local"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Disco rígido"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Diretório NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Bem-vindo ao %s%n para %s"
 
-#: ../loader2/loader.c:374
-#: ../loader2/loader.c:410
+#: ../loader/loader.c:374
+#: ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Origem do Disco de Atualizações"
 
-#: ../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?"
 msgstr "Você tem vários dispositivos que podem servir de origem para um disco de atualizações. Qual deles você deseja utilizar?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid "There are multiple partitions on this device which could contain the update disk image.  Which would you like to use?"
 msgstr "Há várias partições neste dispositivo que podem conter a imagem do disco de atualização. Qual você deseja usar?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Insira o disco de atualizações em /dev/%s e pressione \"OK\" para continuar."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disco de Atualizações"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Falha ao montar o disco de atualizações"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Atualizações"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Lendo atualizações do 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 "Não foi possível baixar a imagem de atualizações. Por favor, modifique abaixo a localização das atualizações ou pressione \"Cancelar\" para proceder sem atualizações."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Erro ao baixar a imagem de atualizações"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Não há memória RAM suficiente para instalar o %s nesta máquina."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Método de Recuperação"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Método de Instalação"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Que tipo de mídia contém a imagem de recuperação?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Que tipo de mídia contém os pacotes a serem instalados?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nenhum driver encontrado"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Selecione o driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Utilizar um disco de drivers"
 
-#: ../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?"
 msgstr "Não foi possível encontrar nenhum dispositivo do tipo necessário para esta instalação. Você gostaria de selecionar seu driver manualmente ou usar um disco de drivers?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Os seguintes dispositivos foram encontrados em seu sistema."
 
-#: ../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 "Nenhum driver de dispositivo foi carregado para o seu sistema. Você deseja carregar algum agora?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Concluído"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Adicionar Dispositivo"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "o carregador já foi executado. Iniciando janela de comandos.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Executando o Anaconda %s, o modo de recuperação do %s - por favor aguarde...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Executando o Anaconda %s, o instalador do sistema %s - por favor aguarde...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Não foi possível encontrar a imagem de instalação %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Verificando \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Verificando mídia..."
 
-#: ../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."
 msgstr "Não foi possível ler o checksum do descritor de volume primário. Isto provavelmente significa que o disco foi criado sem um 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 again.  If this test continues to fail you should not continue the install."
 msgstr "A imagem testada possui erros. Isto pode ser devido a problemas com o download ou com o disco. Se possível, limpe o disco e tente novamente. Se este teste continuar falhando você não deve continuar a instalação."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Sucesso"
 
-#: ../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 "A imagem que acabou de ser testada foi verificada com sucesso. Está OK instalar a partir dessa mídia. Note que nem todos os erros de mídia/drive podem ser detectados pela verificação."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -5842,276 +5842,276 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Teste de Consistência"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Argumento inválido no comando do método kickstart do dispositivo %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "O nome do módulo deve ser especificado para o comando kickstart do dispositivo."
 
-#: ../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 "O prefixo deve ser entre 1 e 32 para redes IPv4 ou entre 1 e 128 para redes IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid "%s is a wireless network adapter.  Please provide the ESSID and encryption key needed to access your wireless network.  If no key is needed, leave this field blank and the install will continue."
 msgstr "%s é um adaptador de rede sem fio. Por favor, defina o ESSID e a chave de criptografia necessária para acessar a sua rede sem fio. Se nenhuma chave é necessária, deixe este campo em branco e a instalação irá continuar."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Chave de Criptografia"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Configurações da Rede Sem Fio"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP do servidor de nomes"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Servidor de nomes faltando"
 
-#: ../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 leave the field blank and the install will continue."
 msgstr "O seu pedido de endereço IP retornou informações de configuração, mas não incluiu um servidor de nomes. Se você não tem esta informação, deixe o campo em branco e a instalação continuará."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Informação de IP Inválida"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Você inseriu um endereço IP inválido."
 
-#: ../loader2/net.c:589
-#: ../loader2/net.c:695
+#: ../loader/net.c:589
+#: ../loader/net.c:695
 msgid "Network Error"
 msgstr "Erro de Rede"
 
-#: ../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 "Ocorreu um erro ao configurar a sua interface de rede."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configurar TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Você deve selecionar pelo menos um protocolo (IPv4 ou IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 necessário para o NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "O método de instalação NFS requer suporte para IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Endereço IPv4:"
 
-#: ../loader2/net.c:962
-#: ../loader2/net.c:1014
+#: ../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 "Endereço IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Servidor de Nomes:"
 
-#: ../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 "Insira o endereço e o prefixo (endereço / prefixo) IPv4 e/ou IPv6. Para IPv4, são aceitas a máscara de rede dotted-quad ou o prefixo no estilo CIDR. Os campos gateway e servidor de nomes devem conter endereços IPv4 ou IPv6 válidos."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Configuração manual de TCP/IP"
 
-#: ../loader2/net.c:1224
-#: ../loader2/net.c:1230
+#: ../loader/net.c:1224
+#: ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Informação Faltando"
 
-#: ../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 "Você deve inserir um endereço IPv4 válido e uma máscara de rede ou um prefixo CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Você deve inserir um endereço IPv6 e um prefixo CIDR válidos."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Determinando o nome e domínio da máquina..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Argumento inválido para o comando de rede kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Protocolo de inicialização %s inválido especificado no comando de rede"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Dispositivo de Rede"
 
-#: ../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 "Há vários dispositivos de rede neste sistema. Através de qual deles você deseja realizar a instalação?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Nome do servidor NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Diretório %s:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Por favor, insira o nome do servidor e o caminho para as suas imagens do %s."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Configuração do NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Nome da máquina especificado sem DNS configurado"
 
-#: ../loader2/nfsinstall.c:215
-#: ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215
+#: ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Obtendo"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Não foi possível montar esse diretório a partir do servidor."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Esse diretório não parece conter uma árvore de instalação do %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Argumento inválido para o comando do método kickstart do NFS %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 "Aguardando a conexão telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Executando o Anaconda via telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Não foi possível obter %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Não foi possível obter a imagem de instalação."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Argumento inválido para o comando do método kickstart URL %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Deve indicar um parâmetro --url ao método kickstart URL."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Método URL %s desconhecido"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Por favor, insira a URL que contém as imagens do %s no seu servidor."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Configurar proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Configuração da URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Você deve inserir uma URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "A URL deve ser um ftp ou http"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Máquina Desconhecida"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s não é um nome de máquina válido."
 
-#: ../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."
 msgstr "Se você estiver utilizando um servidor proxy de HTTP insira o seu nome."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Nome do Proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Porta do Proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Mais Configurações"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Carregando driver SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Carregando driver %s..."
diff --git a/po/ro.po b/po/ro.po
index 601b813be..6682745d8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -56,41 +56,41 @@ msgstr "Apăsaţi «Enter» pentru o linie de comandă"
 #: ../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"
 
@@ -590,22 +590,22 @@ msgstr "Se formatează sistemul de fişiere %s..."
 #: ../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 "Eroare"
 
@@ -661,8 +661,8 @@ msgstr ""
 "Apăsaţi «Enter» pentru a ieşi din programul de instalare."
 
 #: ../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 "Sari"
 
@@ -997,21 +997,21 @@ msgstr "Repară"
 
 #: ../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 "Da"
 
 #: ../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 "Nu"
 
-#: ../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 "Reîncercare"
 
@@ -1022,8 +1022,8 @@ msgstr "Ignoră"
 #: ../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 "Anulare"
 
@@ -1896,21 +1896,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 "Înapoi"
 
 #: ../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 "Continuare"
 
@@ -2346,7 +2346,7 @@ msgstr "Vă rugăm introduceţi %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Evită introducerea a  %(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 "Bine aţi venit în %s"
@@ -3231,7 +3231,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Alegerea limbii de instalare"
 
-#: ../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 "Ce limbă doriţi să folosiţi pe parcursul procesului de instalare?"
 
@@ -3609,7 +3609,7 @@ msgstr "Câmpul „%s” trebuie completat."
 msgid "Dynamic IP"
 msgstr "Adresă IP dinamică"
 
-#: ../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 "Trimit cererea pentru informaţiile IP pentru %s..."
@@ -3780,7 +3780,7 @@ msgstr "necunoscut"
 msgid "Hardware address: "
 msgstr "Adresă fizică:"
 
-#: ../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 "Protocol lipsă"
 
@@ -3789,7 +3789,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Trebuie să selectaţi suport pentru măcar unul dintre IPv4 sau IPv6."
 
 #: ../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 "Prefix invalid"
 
@@ -4024,7 +4024,7 @@ msgstr "Dispozitive RAID"
 msgid "None"
 msgstr "Nimic"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Unităţi de disc"
 
@@ -4955,12 +4955,12 @@ msgstr "Prefix"
 msgid "Activate on boot"
 msgstr "Activează la pornire"
 
-#: ../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 "Activează suportul IPv4"
 
-#: ../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 "Activează suportul IPv6"
@@ -5080,7 +5080,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:"
 
@@ -5708,22 +5708,22 @@ msgstr ""
 "* Nu veţi primi actualizări de securitate şi de programe pentru pachetele "
 "care nu sunt incluse în abonamentul dumneavoastră."
 
-#: ../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 "Testare mediu"
 
-#: ../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
 msgid "Eject Disc"
 msgstr "Scoate discul"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5732,7 +5732,7 @@ msgstr ""
 "Alegeţi „%s” pentru a testa discul aflat acum în unitate, sau „%s” pentru a-"
 "l scoate şi a introduce altul pentru testare."
 
-#: ../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 "
@@ -5747,7 +5747,7 @@ msgstr ""
 "După ce au fost testate cu succes, nu mai este necesar să testaţi din nou "
 "fiecare disc."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5756,11 +5756,11 @@ msgstr ""
 "Discul %s nu a fost găsit în niciuna dintre unităţile dumneavoastră de citit "
 "discuri. Vă rugăm introduceţi discul %s şi apăsaţi %s pentru a reîncerca."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "S-a găsit un disc"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5771,7 +5771,7 @@ msgstr ""
 "\n"
 "Apăsaţi %s pentru a sări peste acest pas şi pentru a începe instalarea."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5781,7 +5781,7 @@ msgstr ""
 "pornire.  Vă rugăm să introduceţi discul %s şi să apăsaţi %s pentru a "
 "reîncerca."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5791,32 +5791,32 @@ msgstr ""
 "discuri. Vă rugăm să introduceţi discul %s şi să apăsaţi %s pentru a "
 "reîncerca."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Nu s-a găsit un disc"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Nu se găseşte fişierul kickstart pe 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 "Nu s-a putut citi directorul %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Se încarcă"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Se citeşte discul cu drivere..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Sursa discului cu drivere"
 
-#: ../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?"
@@ -5824,7 +5824,7 @@ msgstr ""
 "Acest sistem are mai multe dispozitive care pot servi ca sursă pentru discul "
 "de drivere.  Pe care doriţi să îl folosiţi?"
 
-#: ../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?"
@@ -5832,50 +5832,50 @@ msgstr ""
 "Pe acest dispozitiv sunt mai multe partiţii care ar putea conţine o imagine "
 "de disc cu drivere.  Pe care doriţi să o folosiţi?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Eşuare la montarea partiţiei."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Selectaţi imaginea discului cu drivere"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Selectaţi fişierul care este imaginea discului cu drivere."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Eşuare la încărcarea discului cu drivere din fişier."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Introduceţi discul cu drivere în /dev/%s şi apăsaţi „OK” pentru a continua."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Introduceţi discul cu drivere"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Nu s-a putut monta discul cu drivere."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Disc cu driver invalid pentru această ediţie %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Alegere manuală"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Încarcă alt disc"
 
-#: ../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 "
@@ -5885,38 +5885,38 @@ msgstr ""
 "Doriţi să selectaţi manual driverul, să continuaţi oricum sau să încărcaţi "
 "alt disc cu drivere?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disc cu drivere"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Aveţi un disc cu drivere?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Mai multe discuri cu drivere?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Mai aveţi un disc cu drivere de încărcat?"
 
-#: ../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 "Eroare Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Sursă kickstart necunoscută pentru discul de drivere: %s "
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5925,7 +5925,7 @@ msgstr ""
 "Următorul argument invalid a fost specificat pentru comanda kickstart a "
 "discul de drivere: %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 "
@@ -5936,19 +5936,19 @@ msgstr ""
 "de spaţii.  Dacă nu ştiţi ce parametri să pasaţi, săriţi peste acest pas "
 "apăsând butonul „OK”."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Introduceţi parametrii modulului"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nu s-a găsit niciun driver"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Încarcă disc cu drivere"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5956,7 +5956,7 @@ msgstr ""
 "Nu s-a găsit nici un driver de inserat manual.  Doriţi să folosiţi un disc "
 "cu drivere?"
 
-#: ../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."
@@ -5964,26 +5964,26 @@ msgstr ""
 "Vă rugăm alegeţi de mai jos driverul pe care doriţi să-l încărcaţi.  Dacă "
 "acesta nu apare şi aveţi o un disc cu drivere, apăsaţi F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Specificaţi argumente opţionale pentru modul"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Alegeţi un driver de dispozitiv pentru a fi încărcat"
 
-#: ../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 "S-a detectat un mediu"
 
-#: ../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 "S-a detectat un mediu de instalare local..."
 
-#: ../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 "
@@ -5992,7 +5992,7 @@ msgstr ""
 "Arborele de instalare %s din acel director nu pare să corespundă cu mediul "
 "dumneavoastră de pornire."
 
-#: ../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."
@@ -6000,7 +6000,7 @@ msgstr ""
 "A apărut o eroare la citirea instalării de pe imaginile ISO. Vă rugăm "
 "verificaţi imaginile ISO şi încercaţi din nou."
 
-#: ../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?"
@@ -6008,7 +6008,7 @@ msgstr ""
 "Se pare că nu aveţi nicio unitate de disc pe sistemul dumneavoastră! Doriţi "
 "să configuraţi alte periferice?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6019,62 +6019,62 @@ msgstr ""
 "(iso9660) pentru %s? Dacă nu vedeţi unitatea de disc pe care o folosiţi în "
 "această listă, apăsaţi F2 pentru a configura periferice adiţionale."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Directorul cu imagini:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Selectaţi o partiţie"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Dispozitivul %s nu pare să conţină %s imagini CDROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Argument eronat pentru comanda HD în kickstart %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 "Nu se găseşte fişierul kickstart pe discul dur."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Nu se găseşte unitatea pentru discul BIOS %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tipul tastaturii"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Ce model de tastatură aveţi?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Eroare la deschiderea fişierului kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Eroare la citirea conţinutului fişierului kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Eroare în %s la linia %d a fişierului kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Nu se găseşte fişierul ks.cfg pe discheta de pornire."
 
-#: ../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."
@@ -6083,52 +6083,52 @@ msgstr ""
 "kickstart mai jos sau apăsaţi renunţă pentru a continua cu o instalare "
 "interactivă."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Eroare la descărcarea fişierului kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 "Argument incorect pentru terminarea unei comenzi a metodei kickstart %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Bun venit în %s - Recuperare"
 
-#: ../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> mută | <Space> selectare | <F12> ecranul următor "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Alegeţi o limbă"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "CD/DVD local"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Unitate de disc"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Directorul NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Bine aţi venit în %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Sursa discului cu actualizări"
 
-#: ../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?"
@@ -6136,7 +6136,7 @@ msgstr ""
 "Acest sistem are mai multe dispozitive care ar putea servi ca sursă pentru "
 "discul de actualizare.  Pe care doriţi să-l utilizaţi?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6145,30 +6145,30 @@ msgstr ""
 "Pe acest dispozitiv sunt mai multe partiţii care ar putea conţine o imagine "
 "de disc cu drivere.  Pe care doriţi să o folosiţi?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Introduceţi discul cu actualizări în /dev/%s şi apăsaţi „OK” pentru a "
 "continua."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disc cu actualizări"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Nu s-a putut monta discul cu actualizări"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Actualizări"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Se încarcă actualizările anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6178,45 +6178,45 @@ msgstr ""
 "kickstart mai jos sau apăsaţi renunţă pentru a continua cu o instalare "
 "interactivă."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Eroare la descărcarea fişierului kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Nu aveţi destul RAM pentru a instala %s pe această maşină."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Metodă de recuperare"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Metodă de instalare"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Ce tip de mediu conţine imaginea de recuperare?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Ce tip de mediu conţine pachetele care urmează a fi instalate?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nu s-a găsit nici un driver"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Selectaţi driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Foloseşte o dischetă cu drivere"
 
-#: ../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?"
@@ -6224,11 +6224,11 @@ msgstr ""
 "Nu s-a găsit nici un dispozitiv de tipul necesar pentru aceast tip de "
 "instalare.  Doriţi să alegeţi driverul sau să folosiţi un disc cu dirvere?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "S-au găsit următoarele dispozitive în sistemul dumneavoastră."
 
-#: ../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?"
@@ -6236,50 +6236,50 @@ msgstr ""
 "Nu s-a încărcat nici un driver specific pentru acest sistem.  Doriţi să "
 "încărcaţi unul acum?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Dispozitive"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Gata"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Adaugă dispozitiv"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "programul de pornire fost deja rulat. Pornesc linia de comandă.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Se rulează anaconda, modul de recuperare %s - vă rugăm aşteptaţi...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Se rulează anaconda, sistemul de instalare %s - vă rugăm aşteptaţi...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Nu se găseşte imaginea de instalare %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Se testează „%s”..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Se testează mediul acum..."
 
-#: ../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."
@@ -6288,7 +6288,7 @@ msgstr ""
 "primar.  Această înseamnă că probabil discul a fost creat fără o sumă de "
 "control."
 
-#: ../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 "
@@ -6299,18 +6299,18 @@ msgstr ""
 "curăţaţi discul şi încercaţi din nou.  Dacă acest test continuă să eşueze nu "
 "ar trebui să continuaţi cu instalarea."
 
-#: ../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"
@@ -6321,23 +6321,23 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Test sumă de control"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Argument eronat pentru comanda device în kickstart %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "Atât nume şi tipul modulului trebuie specificate pentru comanda "
 "dispozitivului kickstart."
 
-#: ../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"
@@ -6345,7 +6345,7 @@ msgstr ""
 "Prefixul trebuie să fie între 1 şi 32 pentru reţele IPv4 şi între 1 şi 128 "
 "pentru reţele IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6356,27 +6356,27 @@ msgstr ""
 "necesare pentru a accesa reţeaua dumneavoastră wireless.  Dacă nu este "
 "necesară o cheie, lăsaţi acest câmp gol şi instalarea va continua."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Cheie de criptare"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Setări wireless"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP server de nume"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Server de nume lipsă"
 
-#: ../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 "
@@ -6386,56 +6386,56 @@ msgstr ""
 "inclus şi un server de nume DNS. Dacă nu aveţi această informaţie, puteţi "
 "lăsa acest câmp gol şi instalarea va continua."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Informaţie IP incorectă"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Aţi introdus o adresă IP incorectă."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Eroare de reţea"
 
-#: ../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 "A apărut e eroarea la configurarea interfeţei cu reţeaua."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Configurare TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Trebuie să specificaţi cel puţin un protocol (IPv4 sau IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 este necesar pentru NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Metoda de instalare NFS necesită suport IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Adresă IPv4:"
 
-#: ../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 "Adresă IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Server de nume:"
 
-#: ../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 "
@@ -6446,44 +6446,44 @@ msgstr ""
 "sau prefixul în stil CIDR. Gateway-ul şi numele serverului trebuie să fie "
 "adrese valide IPv4 sau IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Configurare manuală TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Informaţie lipsă"
 
-#: ../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 ""
 "Trebuie să introduceţi o adresă IPv4 validă precum şi o mască de reţea sau "
 "un prefix CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Trebuie să introduceţi o adresă IPv6 şi un prefix CIDR valide."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Se determină numele gazdei şi a domeniului..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Argument eronat pentru comanda network în kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "bootproto %s invalid în comanda network"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Dispozitiv de reţea"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6491,115 +6491,115 @@ msgstr ""
 "Acest sistem are mai multe dispozitive de reţea. Pe care dintre ele doriţi "
 "să-l folosiţi pentru o instalare prin reţea?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Numele serverului NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Directorul %s:"
 
-#: ../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 "Configurare NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Nume de gazdă specificat fără niciun DNS configurat"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Se aduce"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Acel director nu a putut fi montat de pe server."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Acel director nu pare să conţină un arbore de instalare %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Argument eronat pentru comanda NFS în kickstart %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 "Se aşteaptă o conexiune prin telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Se rulează anaconda prin telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Nu se poate citi %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Nu se poate obţine imaginea de instalare."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Argument eronat pentru comanda Url în kickstart %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Metoda kickstart Url trebuie să primească un argument --url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Metodă Url necunoscută %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 "Configurare TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Configurare NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Trebuie să introduceţi un director."
 
-#: ../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 "Gazdă necunoscută"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s nu este un nume valid de gazdă."
 
-#: ../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."
@@ -6607,24 +6607,24 @@ msgstr ""
 "Dacă folosiţi un server proxy HTTP introduceţi numele acestui server pentru "
 "a fi folosit."
 
-#: ../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 "Setare ulterioară FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Se încarcă driverul SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Se încarcă driverul %s..."
diff --git a/po/ru.po b/po/ru.po
index 57ec85dff..b7f8568bf 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -56,41 +56,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 "OК"
 
@@ -572,22 +572,22 @@ msgstr "Изменение размера файловой системы на %
 #: ../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 "Ошибка"
 
@@ -642,8 +642,8 @@ msgstr ""
 "Нажмите <Enter> для выхода из программы установки."
 
 #: ../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 "Пропустить"
 
@@ -977,21 +977,21 @@ msgstr "Исправить"
 
 #: ../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 "Да"
 
 #: ../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 "Нет"
 
-#: ../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 "Повторить"
 
@@ -1002,8 +1002,8 @@ msgstr "Игнорировать"
 #: ../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 "Отмена"
 
@@ -1861,21 +1861,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 "Назад"
 
 #: ../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 "Продолжить"
 
@@ -2309,7 +2309,7 @@ msgstr "Введите свой %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Пропустить ввод %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Добро пожаловать в %s для %s"
@@ -3210,7 +3210,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Выбор языка"
 
-#: ../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 "Какой язык должен использоваться в процессе установки?"
 
@@ -3589,7 +3589,7 @@ msgstr "Требуется значение для поля %s."
 msgid "Dynamic IP"
 msgstr "Динамический 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 "Посылается запрос конфигурации IP для %s..."
@@ -3762,7 +3762,7 @@ msgstr "неизвестен"
 msgid "Hardware address: "
 msgstr "Аппаратный адрес:"
 
-#: ../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 "Отсутствует протокол"
 
@@ -3771,7 +3771,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Необходимо выбрать как минимум один протокол (IPv4 или IPv6)."
 
 #: ../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 "Неверный префикс"
 
@@ -4004,7 +4004,7 @@ msgstr "Устройства RAID"
 msgid "None"
 msgstr "Ничего"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Жесткие диски"
 
@@ -4911,12 +4911,12 @@ msgstr "Префикс"
 msgid "Activate on boot"
 msgstr "Активизировать при загрузке"
 
-#: ../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 "Включить поддержку IPv4"
 
-#: ../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 "Включить поддержку IPv6"
@@ -5036,7 +5036,7 @@ msgstr "Авто 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 "Шлюз:"
 
@@ -5651,22 +5651,22 @@ msgstr ""
 "несертифицированной.\n"
 "* Вы не получите обновлений пакетов, не включенных в вашу подписку."
 
-#: ../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 "Проверка носителя"
 
-#: ../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 "Проверка"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Извлечь диск"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5675,7 +5675,7 @@ msgstr ""
 "Нажмите \"%s\" для проверки находящегося в устройстве CD или \"%s\" для "
 "извлечения CD и установки другого диска для тестирования."
 
-#: ../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 "
@@ -5690,7 +5690,7 @@ msgstr ""
 "использованием. После успешного тестирования не требуется тестировать их "
 "повторно перед каждым использованием."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5699,11 +5699,11 @@ msgstr ""
 "Диск %s не был обнаружен в устройствах CD-ROM. Вставьте диск %s и нажмите %s "
 "для продолжения."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Диск обнаружен"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5714,7 +5714,7 @@ msgstr ""
 "\n"
 "Нажмите %s, чтобы пропустить проверку носителя и запустить установку."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5723,7 +5723,7 @@ msgstr ""
 "Диск %s не был обнаружен в устройствах CD-ROM. Вставьте диск %s и нажмите %s "
 "для повторной попытки."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5732,32 +5732,32 @@ msgstr ""
 "Диск %s не был обнаружен в устройствах CD-ROM. Вставьте диск %s и нажмите %s "
 "для продолжения."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Диск не обнаружен"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Не удается найти файл kickstart на 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 "Ошибка чтения каталога %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Загрузка"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Чтение диска с драйверами..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Источник диска драйверов"
 
-#: ../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?"
@@ -5765,7 +5765,7 @@ msgstr ""
 "В вашей системе имеется несколько устройств, в которые может быть вставлен "
 "диск драйверов. Какое устройство использовать?"
 
-#: ../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?"
@@ -5773,49 +5773,49 @@ msgstr ""
 "На данном устройстве находятся несколько разделов, которые могут содержать "
 "образ диска с драйверами. Какой из разделов использовать?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Ошибка монтирования раздела."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Выберите образ диска с драйверами"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "Ошибка загрузки диска с драйверами из файла."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Вставьте диск драйверов в /dev/%s и нажмите \"OK\" для продолжения."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Вставьте Диск драйверов"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Ошибка монтирования диска драйверов."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Диск драйверов не подходит для этого выпуска %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Выбрать вручную"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Загрузить другой диск"
 
-#: ../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 "
@@ -5825,38 +5825,38 @@ msgstr ""
 "выбрать драйвер вручную, продолжить все равно или загрузить другой диск "
 "драйверов?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Диск драйверов"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "У вас есть диск с драйвером?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Дополнительные диски"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Загрузить дополнительные диски драйверов?"
 
-#: ../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"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Неизвестный источник драйвера диска kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5865,7 +5865,7 @@ msgstr ""
 "Следующий некорректный аргумент был передан kickstart команде driver disk: %"
 "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 "
@@ -5877,26 +5877,26 @@ msgstr ""
 "экран, нажав клавишу \"ОК\". Список доступных параметров можно узнать, нажав "
 "клавишу F1."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Введите параметры модуля"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Драйверы не найдены"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Загрузка диска драйверов"
 
-#: ../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 ""
 "Драйверы для загрузки вручную не были найдены. Использовать диск драйверов?"
 
-#: ../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."
@@ -5904,26 +5904,26 @@ msgstr ""
 "Выберите из списка драйвер, который необходимо загрузить. Если драйвера нет "
 "в списке и у вас есть диск драйверов, нажмите F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Указать дополнительные параметры модулей"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Выберите драйвер устройства"
 
-#: ../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 "Обнаружен носитель"
 
-#: ../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 "Обнаружен локальный установочный носитель..."
 
-#: ../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 "
@@ -5932,7 +5932,7 @@ msgstr ""
 "Установочное дерево %s в этом каталоге не соответствует вашему загрузочному "
 "диску."
 
-#: ../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."
@@ -5940,7 +5940,7 @@ msgstr ""
 "Произошла ошибка чтения установки из образов ISO. Проверьте ваши образы ISO "
 "и попробуйте еще раз."
 
-#: ../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?"
@@ -5948,7 +5948,7 @@ msgstr ""
 "В вашей системе не обнаружен ни один жесткий диск. Будете ли вы настраивать "
 "дополнительные устройства?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5959,61 +5959,61 @@ msgstr ""
 "(iso9660) для %s. Если необходимый диск отсутствует в списке, нажмите F2 для "
 "настройки дополнительных устройств."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Каталог, содержащий образы:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Выбор раздела"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Похоже, что устройство %s не содержит образы %s CDROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Неверный аргумент команды kickstart HD-метода %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 "Не удается найти файл kickstart на жестком диске."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Не удается найти жесткий диск, определенный в BIOS как %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Тип клавиатуры"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Укажите тип клавиатуры"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Ошибка открытия файла kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Ошибка чтения содержимого файла kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Ошибка в %s в строке %d файла kickstart %s"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Не удалось найти ks.cfg на загрузочной дискете."
 
-#: ../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."
@@ -6021,52 +6021,52 @@ msgstr ""
 "Невозможно загрузить файл kickstart. Измените параметр kickstart или нажмите "
 "Отмена для продолжения в интерактивном режиме."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Ошибка загрузки файла kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Неверный аргумент команды kickstart для выключения %s: :%s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Добро пожаловать в %s для %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> между элементами | <Space> выбор | <F12> следующий экран "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Выберите язык"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Локальный CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Жесткий диск"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Каталог NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Добро пожаловать в %s%n для %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Источник диска обновлений"
 
-#: ../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?"
@@ -6074,7 +6074,7 @@ msgstr ""
 "В вашей системе имеется несколько устройств, каждое из которых может служить "
 "источником диска обновлений.  Какое устройство использовать?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6082,28 +6082,28 @@ msgstr ""
 "На данном устройстве находятся несколько разделов, которые могут содержать "
 "образ диска с драйверами. Какой из разделов использовать?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Вставьте диск обновлений в /dev/%s и нажмите \"OK\" для продолжения."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Диск обновлений"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Ошибка монтирования диска обновлений"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Обновления"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Чтение обновлений 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.."
@@ -6111,44 +6111,44 @@ msgstr ""
 "Невозможно загрузить образ с обновлениями. Укажите другое расположение "
 "обновлений или нажмите «Отмена» для продолжения без установки обновлений."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Ошибка загрузки образа обновлений"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Недостаточно ОЗУ для установки %s на этой машине."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Метод восстановления"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Метод установки"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Какой носитель содержит спасательный образ?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Носитель какого типа содержит пакеты для установки?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Драйвер не найден"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Выберите драйвер"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Использовать диск драйверов"
 
-#: ../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?"
@@ -6156,62 +6156,62 @@ msgstr ""
 "Не удается найти ни одно устройство, необходимое для этого типа установки.  "
 "Хотите ли вы выбрать драйвер вручную или использовать диск драйверов?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "В вашей системе были найдены следующие устройства."
 
-#: ../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 ""
 "Не загружен ни один драйвер устройств. Вы хотите загрузить какой-либо сейчас?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Устройства"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Готово"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Добавить устройство"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Загрузчик уже выполнялся.  Запускается оболочка.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "Запускается anaconda %s, режим восстановления %s, подождите, пожалуйста...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Запускается anaconda %s, программа установки %s, подождите, пожалуйста...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Не удается найти установочный образ %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Проверка \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Проверяется носитель..."
 
-#: ../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."
@@ -6220,7 +6220,7 @@ msgstr ""
 "Это скорее всего означает, что диск был создан без добавления контрольной "
 "суммы."
 
-#: ../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 "
@@ -6230,11 +6230,11 @@ msgstr ""
 "сбой при загрузке или поврежденный диск.  Если это возможно, протрите диск и "
 "попробуйте еще раз. Если ошибка повторяется, не следует продолжать установку."
 
-#: ../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 "
@@ -6243,7 +6243,7 @@ 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"
@@ -6254,20 +6254,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Проверка контрольной суммы"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Неверный аргумент device команды kickstart  %s: :%s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Команде kickstart должно быть передано имя модуля."
 
-#: ../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"
@@ -6275,7 +6275,7 @@ msgstr ""
 "Значение префикса должно быть в диапазоне от 1 до 32 для сетей IPv4 или от 1 "
 "до 128 для сетей IPv6."
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6286,27 +6286,27 @@ msgstr ""
 "шифрования, необходимые для доступа к вашей беспроводной сети.  Если ключ не "
 "требуется, оставьте данное поле пустым и продолжите установку."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Ключ шифрования"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Настройки беспроводной сети"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP сервера имен"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Сервер имен не указан"
 
-#: ../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 "
@@ -6317,56 +6317,56 @@ msgstr ""
 "Если такой информации нет, оставьте это поле пустым и установка будет "
 "продолжена."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Неверная информация о IP"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Введен неверный адрес IP."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: ../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 "Ошибка при конфигурации сетевого интерфейса."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Настройка TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Необходимо выбрать как минимум один протокол (IPv4 или IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 необходим для NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Метод установки по NFS требует наличия поддержки IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Адрес IPv4:"
 
-#: ../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:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Сервер имен:"
 
-#: ../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 "
@@ -6377,42 +6377,42 @@ msgstr ""
 "в стиле CIDR. Поля для шлюза и сервера имен должны содержать корректные "
 "адреса IPv4 или IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ручная настройка TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Недостаточно информации"
 
-#: ../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 "Необходимо ввести корректный адрес IPv4 и маску сети или префикс CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Необходимо ввести корректный адрес IPv6 и префикс CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Определение имени узла и домена..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Неверный аргумент сетевой команды kickstart %s: :%s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "В сетевой команде неверно указан bootproto %s"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Сетевое устройство"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6420,134 +6420,134 @@ msgstr ""
 "В вашей системе имеется несколько сетевых адаптеров. Какой из них должен "
 "использоваться для установки?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Имя сервера NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Каталог %s:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Введите имя сервера и путь к образам %s."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Настройка NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Указано имя компьютера без настройки DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Получение"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Этот каталог не может быть смонтирован с сервера."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Этот каталог не содержит установочное дерево %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Неверный аргумент NFS метода kickstart %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 "Ожидание соединения telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Запуск anaconda по telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Не удается получить %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Невозможно получить установочный образ."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Неверный аргумент URL метода kickstart %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Для Url метода необходимо передать параметр --url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Неизвестный метод 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 "Введите URL-ссылку к образам %s на вашем сервере."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Настройка прокси"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Настройка URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Вы должны указать URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL-ссылка должна содержать адрес FTP или HTTP."
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Неизвестный сервер"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s не является допустимым именем сервера."
 
-#: ../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."
 msgstr "Если вы используете HTTP proxy-сервер, укажите его имя или адрес IP."
 
-#: ../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
 msgid "Further Setup"
 msgstr "Дальнейшая настройка"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Загрузка драйвера SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Загружается драйвер %s..."
diff --git a/po/si.po b/po/si.po
index 1ece230c2..b173d3114 100644
--- a/po/si.po
+++ b/po/si.po
@@ -51,41 +51,41 @@ msgstr " shell එකක් සඳහා <enter> ඔබන්න"
 #: ../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 "හරි"
 
@@ -579,22 +579,22 @@ msgstr "%s ගොනු පද්ධතිය ව්‍යුහගත කරම
 #: ../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 "දෝශයකි"
 
@@ -650,8 +650,8 @@ msgstr ""
 "කරුණාකර පද්ධතිය නැවත ක්‍රියාත්මක කිරීම සඳහා <Enter> සූචකය ඔබන්න."
 
 #: ../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 "මඟ හරින්න"
 
@@ -982,21 +982,21 @@ msgstr "සකස් කරන්න"
 
 #: ../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 "හරි"
 
 #: ../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 "නැත"
 
-#: ../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 "නැවත උත්සහ කරන්න"
 
@@ -1007,8 +1007,8 @@ msgstr "නොසලකා හරින්න"
 #: ../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 "අවලංගු කරන්න"
 
@@ -1848,21 +1848,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 "ආපසු"
 
 #: ../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 "දිගටම කරගෙන යන්න"
 
@@ -2278,7 +2278,7 @@ msgstr "කරුණාකර පරිමාවේ කණ්ඩය සඳහා
 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 "%s වෙත සාදරයෙන් පිළිගනිමු"
@@ -3152,7 +3152,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "භාශාව තෝරා ගැනීම"
 
-#: ../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 "ස්ථාපනය කිරීමේදී භාවිතා කිරීමට ඔබ කැමති කිනම් භාශාවද?"
 
@@ -3526,7 +3526,7 @@ msgstr "\"%s\" සඳහා අගයක් නියම කල යුතු ව
 msgid "Dynamic IP"
 msgstr "ගතික 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 "%s සඳහා අවශ්‍ය IP තොරතුරු විමසමින්..."
@@ -3705,7 +3705,7 @@ msgstr "හඳුනා නොගත්"
 msgid "Hardware address: "
 msgstr "දෘඪාංග ලිපිනය: %s"
 
-#: ../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 "වාහකය අස්ථාන ගතවී ඇත"
 
@@ -3715,7 +3715,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "DHCP සඳහා ඔබ විසින් අවම වශයෙන් එක් වාහකයක්වත් තෝරාගත යුතු වේ (IPv4 or IPv6) "
 
 #: ../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 "ඈඳිය සාවද්‍යයි"
 
@@ -3948,7 +3948,7 @@ msgstr "RAID උපාංග"
 msgid "None"
 msgstr "කිසිවක් නොමැත"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "දෘඪාංග උපකරණ"
 
@@ -4850,12 +4850,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr "ක්‍රියාත්මක කිරීමේදී සක්‍රිය කරන්න"
 
-#: ../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 "IPv4 පහසුකම සක්‍රීය කරන්න"
 
-#: ../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 "IPv6 පහසුකම සක්‍රීය කරන්න"
@@ -4972,7 +4972,7 @@ msgstr "ස්වයංක්‍රීය 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 "බිහිදොර:"
 
@@ -5594,22 +5594,22 @@ 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 "මාධ්‍ය පරීක්‍ෂාව"
 
-#: ../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 "පරික්‍ෂා කරන්න"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "තැටිය ඉවතට ගන්න"
 
-#: ../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 "
@@ -5618,7 +5618,7 @@ msgstr ""
 "ධාාවකය තුල තිබෙන සංයුක්ත තැටිය පරික්‍ෂා කිරීම සඳහා \"%s\" ඔබන්න,නැතහොත් සංයුක්ත තැටිය ඉවත් "
 "කර වෙනෙකක් පරික්‍ෂා කිරීම සඳහා  \"%s\"ඔබන්න.."
 
-#: ../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 "
@@ -5632,7 +5632,7 @@ 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 "
@@ -5641,11 +5641,11 @@ msgstr ""
 "%s සංයුක්ත තැටිය ඔබේ සංයුක්ත තැටි ධාවකයන් තුල සොයාගත නොහැකි විය. නැවත උත්සහ කිරීම සඳහා "
 "කරුණාකර %s සංයුක්ත තැටිය ඇතුලත් කර %s ඔබන්න"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "සංයුක්ත තැටිය සොයා ගැනින"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5656,7 +5656,7 @@ msgstr ""
 "\n"
 "මාධ්‍ය පරීක්‍ෂාව මඟ හැර ස්ථාපනය කරගෙන යාම සඳහා %s ඔබන්න."
 
-#: ../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 "
@@ -5665,7 +5665,7 @@ msgstr ""
 "ඇරඹුම් මාධ්‍ය සමඟ සමපාත වන %s සංයුක්ත තැටිය සොයා ගත නොහැකි විය.  කරුණාකර %s සංයුක්ත තැටිය "
 "ඇතුල් කර නැවත උත්සහ කිරීමට %s ඔබන්න."
 
-#: ../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 "
@@ -5674,32 +5674,32 @@ msgstr ""
 "%s සංයුක්ත තැටිය ඔබේ සංයුක්ත තැටි ධාවකයන් තුල සොයාගත නොහැකි විය. නැවත උත්සහ කිරීම සඳහා "
 "කරුණාකර %s සංයුක්ත තැටිය ඇතුලත් කර %s ඔබන්න"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "තැටිය සොයාගත නොහැකි විය"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "kickstart ගොනුව සංයුක්ත තැටිය තුල සොයාගත නොහැකි විය"
 
-#: ../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 "%s: %s බහලුම කියවීමට අපොහොසත් විය"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "රුවමින්"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ධාවකයේ තැටිය කියවමින්..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ධාවක තැටියේ මූලාශ්‍රය"
 
-#: ../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?"
@@ -5707,7 +5707,7 @@ msgstr ""
 "ඔබ සතුව ධාවක තැටිය ලෙස යොදාගත හැකි ධාවක මූලයන් කීපයක් තිබේ.  මින් කවරක්ද භාවිත කිරීමට ඔබ "
 "බලාපොරොත්තු වන්නේ?"
 
-#: ../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?"
@@ -5715,49 +5715,49 @@ msgstr ""
 "මෙම උපාංගය තුල තැටි ධාවක පිළිඹුව ඇතුලත් කොටස් කීපයක් තිබේ, ඔබ මින් කවර කොටසක්ද භාවිතා කිරීමට "
 "කැමති වන්නේ?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "කොටස සවිකිරීමට අසමත් විය"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ධාවක තැටියේ පිළිඹුව තෝරන්න"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "ගොනුව තුලින් ධාවක තැටි රුවීමට අපොහොසත් විය"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "ඔබේ ධාවක තැටිය /dev/%s තුලට ඇතුල් කර ඉදිරියට යාම සඳහා \"හරි\" සූචකය ඔබන්න"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ධාවකයේ තැටිය ඇතුල් කරන්න"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "දහාවක තැටිය සවිකිරීමට අපොහොසත් විය"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s නිකුතුව සඳහා ධාවක තැටිය වලංගු නොවේ"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "අතින් තෝරාගන්න"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "වෙනත් තැටියක් රුවන්න"
 
-#: ../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 "
@@ -5767,38 +5767,38 @@ msgstr ""
 "මෙම ධාවකය තෝරා ගැනීමටද, කෙසේ හෝ දිගටම කරගෙන යාමටද නැතහොත් වෙනත් ධාවක තැටියක් භාවිත "
 "කිරීමටද ??"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ධාවක තැටිය"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "ධාවකය සඳහා තැටියක් ඔබ සතුව තිබේද ? "
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "තවත් ධාවක සඳහා තැටි ඔබ සතුව තිබේද ? ?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "තව ධාහක තැටි රුවීමට ඔබ කැමතිද?"
 
-#: ../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 "kickstart මූලාශය අඩංගු හඳුනා නොගත් ධාවක තැටියකි: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5806,7 +5806,7 @@ msgid ""
 msgstr ""
 "kickstart ධාවක තැටි සඳහා වන විධානයක් ලෙස පහත සඳහන් සාවද්‍ය අගය ලබා දී ඇත: %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 "
@@ -5817,19 +5817,19 @@ msgstr ""
 "මේ සඳහා ලබා දිය යුතු පරාමිතියන් ගැන අව බෝධයක් නොමැති නම් මීලඟ තිරයට පිවිසීම සඳහා \"OK\" "
 "බොත්තම ඔබන්න."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "මොඩියුලය සඳහා වන පරාමිතියන් ඇතුල් කරන්න"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ධාවකයන් සොයාගත නොහැකි විය"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "ධාහකයට අදාල තැටිය රුවන්න"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5837,7 +5837,7 @@ msgstr ""
 "ඔබ විසින් අතින් ඇතුලත් කිරීම සඳහා අවශ්‍ය ධාවකයන් සොයාගත නොහැකි විය. ධාවක තැටියක් භාවිත කිරීමට "
 "ඔබ කැමතිද?"
 
-#: ../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."
@@ -5845,33 +5845,33 @@ msgstr ""
 "රුවීම සඳහා භාවිත කිරිමමට කැමති ධාවකය පහත ලැයිස්තුවෙන් තෝරා ගන්න. එය එහි නොමැති නම් ඒ සඳහා "
 "ධාවක තැටියක් ඇත්නම් F2 ඔබන්න"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "අතිරේක මොඩියුල් සඳහා පරාමිතියන් නියම කරන්න"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "රුවනය කිරීමට අවශ්‍ය උපාංග ධාවකය තෝරන්න"
 
-#: ../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 "මාධ්‍යය හඳුනා ගනු ලැබීය"
 
-#: ../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 "දේශීය ස්ථාපන මාධ්‍යයක් හඳුනාගැනින..."
 
-#: ../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 "
 "media."
 msgstr "බහලුම තුල තිබෙන %s ස්ථාපන රුක ඔබේ ඇරඹුම් මාධ්‍ය හා සමපාත නොවේ."
 
-#: ../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."
@@ -5879,13 +5879,13 @@ msgstr ""
 "ස්ථාපනය සඳහා ISO පිළිඹුවන් කිය වීමේදී දෝශයක් ඇති විය. කරුණාකර ඔබේ ISO පිළිඹුව පරීක්‍ෂා කර නැවත "
 "උත්සහ කරන්න."
 
-#: ../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?"
 msgstr "ඔබේ පද්ධතිය තුල දෘඩ තැටියක් නොමැති බව පෙනී යයි! අමතර උපාංගයන් මානන්න ඔබට අවශ්‍යද?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5895,114 +5895,114 @@ msgstr ""
 "%s සඳහා වන සංයුක්ත තැටි  (iso9660) පිළිඹුවන් ඇත්තේ කුමන කොටසේ හා බහලුමේද? ඔබ විසින් භාවිත "
 "කරන ධාවකය මෙම ලැයිස්තුව තුල නොවේ නම් එය මාන කිරීම සඳහා F2 ඔබන්න."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "බහලුම තුල රඳවාගෙන තිබෙන පිළිඹුවන්:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "කොටස තෝරන්න"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s උපාංගය සතුව %s සංයුක්ත තැටි පිලිඹුව නොමැති බව පෙනී යයි"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD kickstart විධාන ක්‍රමය සඳහා වැරදි පරාමිතියන් %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 "දෘඪ තැටිය තුල kickstart ගොනුව සොයා ගැනීමට නොහැක"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "%s BIOS තැටිය සඳහා වන දෘඪ තැටිය සොයාගත නොහැකි විය"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "යතුරු පුවරුවේ වර්ගය"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "ඔබ සතුව ඇත්තේ කිනම් ආකාරයක යතුරු පුවරුවක්ද ?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s: %s kickstart ගොනුව විවෘත කිරීමේදී දෝශයක් ඇතිවිය"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s: %s kickstart  ගොනුවේ අන්තර්ගතය කියවීමේදී දෝශයක් හට ගැනුනි."
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr " %3$s kickstart ගොනුවේ %1$s තුල %2$d පේලියේ දෝශයක් ඇතිවිය"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ආරම්භක නම්‍ය තැටය තුල ks.cfg  ගොනුව සොයා ගත නොහැක"
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr "kickstart ගොනුව විවෘත කිරීමේදී දෝශයක් ඇතිවිය"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "kickstart ක්‍රම විධානය වසා දැමීම සඳහා භාවිත කරන ලද පරාමිතය සාවද්‍යය %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%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> වෙනත් අඩවියකට ඇතුල් වීමට | <Space> තෝරා ගැනීමට | <F12> මීලඟ තිරය "
 "සඳහා"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "භාශාවක් තෝරාගන්න"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "දේශීය  CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "දෘඪ තැටිය"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS බහලුම:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s වෙත සාදරයෙන් පිළිගනිමු"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "තැටියේ මූලාශ්‍රය නවීකරණය කරන්න"
 
-#: ../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?"
@@ -6010,7 +6010,7 @@ msgstr ""
 "නවීකරණ තැටය සඳහා මූලාශ්‍රයන් ලෙස ක්‍රියා කල හැකි උපාංග කිහිපයක් ඔබ සතුව තිබේ, මේ සඳහා "
 "භාවිතා කිරීමට කැමති මින් කවරක්ද?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6019,72 +6019,72 @@ msgstr ""
 "මෙම උපාංගය තුල තැටි ධාවක පිළිඹුව ඇතුලත් කොටස් කීපයක් තිබේ, ඔබ මින් කවර කොටසක්ද භාවිතා කිරීමට "
 "කැමති වන්නේ?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "නවීකරණ දත්තයන් අඩංගු තැටිය /dev/%s තුලට යොමු කර \"හරි\" බොත්තම ඔබන්න "
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "නවීකරණය සඳහා අවශ්‍ය දත්තයන් අඩංගු තැටිය"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "නවීකරණ දත්තයන් අඩංගු තැටිය සවි කිරීමට අපොහොසත් විය"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "නවීකරණයන්"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "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 "kickstart ගොනුව විවෘත කිරීමේදී දෝශයක් ඇතිවිය"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "%s ස්ථාපනය සඳහා ප්‍රමාණවත් RAM මෙම පරිගණකය තුල නොමැත"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "ගලවා ගැනීමේ ක්‍රමය"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "ස්ථාපනය කලයුතු ආකාරය"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "ගලවා ගැනීමේ පිළිඹුව තිබෙන්නේ කිනම් ආකාරයක මාධ්‍යකද ? "
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ස්ථාපනය කිරීමට අවශ්‍ය ඇසුරුම් ඇඩංගුව තිබෙන්නේ කිනම් වර්ගයක මාධ්‍යක් තුලද?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ධාවකයක් සොයාගත නොහැකි විය"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ධාවකයක් තෝරාගන්න"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ධාවක තැටියක් භාවිත කරන්න"
 
-#: ../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?"
@@ -6092,60 +6092,60 @@ msgstr ""
 "මෙම ආකාරයෙන් ස්ථාපනය කරගෙන යාම සඳහා අවශ්‍ය උපාංගයන් සොයාගත නොහැකි විය.ඔබට අවශ්‍ය "
 "ධාවකය අතින් තෝරා ගැනීමට ඔබ කැමති නැතහොත් ධාහක තැටියක් භාවිත කිරීමටද?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "ඔබේ පද්ධතිය තුල තිබෙන පහත දැක්වෙන උපාංගයන් හඳුනාගනු ලැබීය"
 
-#: ../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 ""
 "කිසිදු උපාංග ධාවකයක් ඔබේ පද්ධතිය තුලට රුවා නොමැත. එය මේ අවස්ථාවේ සිදු කිරීමට ඔබ කැමතිද?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ධාවකයන්"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "නිම කලා"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "උපාංගය එකතු කරන්න"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "රුවනය මේ වන විට ක්‍රියාත්මකව පවතී. 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 "anaconda ක්‍රියාත්මක වෙමින් පවතී, %s ගලවා ගැනීමේ ප්‍රකාරය - කරුණාකර රැඳී සිටින්න...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "anaconda ක්‍රියාත්මක වෙමින් පවතී, %s පද්ධතියේ ස්ථාපකය - කරුණාකර රැඳී සිටින්න...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "ස්ථාපනයන් අඩංගු පිළිඹුව සොයාගත නොහැකි විය %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "පරීක්‍ෂාකරමින් \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "මාධ්‍ය පරික්‍ෂා කරමින් පවතී..."
 
-#: ../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."
@@ -6153,7 +6153,7 @@ msgstr ""
 "ප්‍රාථමික පරිමා විස්තරය තුලින් තැටියේ තිර අගය කියවීමට නොහැක. තිර අගය ඇතුල් නොකොට තැටිය සාදා "
 "තිබීම මීට හේතු විය හැක."
 
-#: ../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 "
@@ -6163,18 +6163,18 @@ msgstr ""
 "නරක් වී තිබීම මීට හේතු විය හැක. යෝග්‍ය වන්නේ නම් තැටිය පවිත්‍ර කර නැවත උත්සහ කර බලන්න. මෙම "
 "පරීක්‍ෂාව දිගින් දිගටම අසමත් වන්නේ නම් ස්ථාපනය නතරකර දැමීම වඩාත් සුදුසු වේ."
 
-#: ../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"
@@ -6185,29 +6185,29 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "තිර අගය පරීක්‍ෂා කිරීම"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "kickstart ධාවකයේ විධාන ක්‍රමය සඳහා සපයා ඇත්තේ සාවද්‍ය පරාමිතියකි %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "kickstart ධාවක තැටි සඳහා වන විධානයක් ලෙස පහත සඳහන් සාවද්‍ය අගය ලබා දී ඇත: %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 ""
 "IPv4 ජාල සඳහා පෙර ඈඳිය 1 සහ 32 අතර විය යුතුය නැතහොත් IPv6 ජාල සඳහා 1 සහ 128 විය යුතුය"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6218,27 +6218,27 @@ msgstr ""
 "සහ සංකේත යතුර ලබා දෙන්න. සංකේත යතුරක් අනවශ්‍ය නම් මෙය හිස්ව තබන්න, ස්ථාපනය දිගටම සිදුකරගෙන "
 "යනු ඇත."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "සංකේත යතුර"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "රැහැන් රහිත සැකසුම"
 
-#: ../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 ""
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6249,217 +6249,217 @@ msgstr ""
 "nameserverවිස්තරනොමැත. ඔබේ nameserver විස්තර දන්නෙහි නම් කරුණාකර එය ඇතුල් කරන්න. ඔබ සතුව "
 "මෙම විසෙතර නොමැති නම් මෙය හිස්ව තබන්න, ස්ථාපනය දිගටම කරගෙන යනු ඇත."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "IP දත්තයන් සාවද්‍යයි"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "ඔබ විසින් ඇතුලත් කරන ලද IP ලිපිනය සාවද්‍යයි."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "ජාල සම්බන්ධතාවයේ දෝශයක්"
 
-#: ../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 "ඔබගේ පරිගණක ජාලය මාන කිරීමේදී  දෝශයක් ඇති විය"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP මානන්න"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "DHCP සඳහා ඔබ විසින් අවම වශයෙන් එක් වාහකයක්වත් තෝරාගත යුතු වේ (IPv4 or IPv6) "
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS සඳහා IPv4 අවශ්‍ය වේ"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS ආකාරයෙන් ස්ථාපනය කිරීම සඳහා IPv4 සහය අවශ්‍ය වේ"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 ලිපිනය:"
 
-#: ../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 ලිපිනය:"
 
-#: ../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 "
 "gateway and name server fields must be valid IPv4 or IPv6 addresses."
 msgstr ""
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "TCP/IP අතින් මානන්න"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "අවශ්‍ය කරන තොරතුරු අස්ථාන ගතවී ඇත"
 
-#: ../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 ""
 "ඔබ විසින් වලංගු IPv4 ලිපිනයක් සහ network mask(ජාල වැස්මක්) එකකෙ හෝ CIDR පෙර ඈඳියක් ඇතුල් "
 "කල යුතු වේ"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "ඔබ විසින් වලංගු IPv6 ලිපිනයක් සහ CIDR පෙර ඈඳියක් ඇතුල් කල යුතු වේ."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ධාරක නාමය සහ දාමය තහවුරු කර ගනිමින්..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart ජාල විධානය සඳහා ලබා දී ඇත්තේ වැරදි පරාමිතියකි %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "ජාල විධානය තුල වැරදි bootproto %s සපයා ඇත"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "ජාල සම්බන්ධක උපකරණය"
 
-#: ../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 ""
 "මෙම පද්ධතිය සතුව ජාල සම්බන්ධක උපකරණ කීපයක් ඇත. ඔබට ස්ථාපනය කිරීමට අවශ්‍යව ඇත්තේ මිනෙ කවරක්ද?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS සේවා දායක නම:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s බහලුම:"
 
-#: ../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 සකසුරුවම් කිරීම"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS නිසි ලෙස මාන නොකර ධාරක නාමයක් සපයා ඇත"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "ලබාගනිමින්"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "සේවා දායකය තුලින් බහලුම ඈඳිමට නොහැකිය"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "බහලුම තුල %s ස්ථාපන රුක නොමැති බහ හැඟී යැයි."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS ත්‍රිව්ර ආරම්භක ක්‍රම විධානය සඳහා වැරදි විස්තාරකයක් සපයා ඇත %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 "telnet සම්බන්ධතාව ලැබෙන තෙක් කල් ගත කරමින්..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "telnet හරහා anaconda ක්‍රියාත්මක කරමින්..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s://%s/%s/%s ලබාගැනීමට නොහැක."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ස්ථාපන පිලිඹුව ලබා ගැනීමට නොහැකි විය."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url kickstart ක්‍රම විධානය සඳහා ලබා දී ඇත්තේ වැරදි පරාමිතියකි %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "ඔබ විසින් --url පරාමිතියක් Url kickstart ක්‍රමය සඳහා ලබා දිය යුතු වේ."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "හඳුනා නොගත් 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 "TCP/IP මානන්න"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS සකසුරුවම් කිරීම"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "ඔබ විසින් බහලුමක් ඇතුලත් කල යුතුය"
 
-#: ../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 "හඳුනා නොගත් ධාරකයකි"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s වලංගු ධාරක නාමයක් නොවේ"
 
-#: ../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."
@@ -6467,24 +6467,24 @@ msgstr ""
 "ඔබ විසින් HTTP ප්‍රොක්සි සේවා දායකයක් බාවිත කරන්නේ නම් භාවිත කල යුතු HTTP ප්‍රොක්සි සේවා "
 "දායකයේ නම ඇතුලත් කරන්න."
 
-#: ../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 "FTP වැඩිදුර සකසුරුවම් කිරීම"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI ධාවකය රුවමින්"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s ධාවකය රුවමින්..."
diff --git a/po/sk.po b/po/sk.po
index 52410cd18..dfa866c5d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -50,41 +50,41 @@ msgstr "Stlačte <enter> pre 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"
 
@@ -567,22 +567,22 @@ msgstr "Mení sa veľkosť súborového systému na %s..."
 #: ../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 "Chyba"
 
@@ -637,8 +637,8 @@ msgstr ""
 "Stlačte <Enter> pre ukončenie inštalačného programu."
 
 #: ../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 "Vynechať"
 
@@ -972,21 +972,21 @@ msgstr "Oprava"
 
 #: ../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 "Áno"
 
 #: ../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 "Nie"
 
-#: ../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 "Znova"
 
@@ -997,8 +997,8 @@ msgstr "Ignorovať"
 #: ../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 "Zrušiť"
 
@@ -1859,21 +1859,21 @@ msgid "_Write changes to disk"
 msgstr "_Zapísať zmeny na disk"
 
 #: ../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 "Späť"
 
 #: ../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 "Pokračovať"
 
@@ -2301,7 +2301,7 @@ msgstr "Prosím zadajte vaše %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Preskočiť zadávanie %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Víta vás %s pre %s"
@@ -3194,7 +3194,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Výber jazyka"
 
-#: ../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 "Ktorý jazyk má byť použitý počas procesu inštalácie?"
 
@@ -3569,7 +3569,7 @@ msgstr "Hodnota je vyžadovaná pre položku %s."
 msgid "Dynamic IP"
 msgstr "Dynamické 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 "Posiela sa žiadosť o IP informáciu pre %s..."
@@ -3740,7 +3740,7 @@ msgstr "neznámy"
 msgid "Hardware address: "
 msgstr "Hardvérová adresa:"
 
-#: ../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 "Chýbajúci protokol"
 
@@ -3749,7 +3749,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Musíte zvoliť aspoň jeden protokol (IPv4 alebo IPv6)."
 
 #: ../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 "Neplatná predpona"
 
@@ -3985,7 +3985,7 @@ msgstr "RAID zariadenia"
 msgid "None"
 msgstr "Nič"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Pevné disky"
 
@@ -4890,12 +4890,12 @@ msgstr "Predpona"
 msgid "Activate on boot"
 msgstr "Aktivovať pri štarte systému"
 
-#: ../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 "Povoliť podporu IPv4"
 
-#: ../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 "Povoliť podporu IPv6"
@@ -5015,7 +5015,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 "Brána:"
 
@@ -5633,22 +5633,22 @@ msgstr ""
 "* Nebudete získavať softvér a bezpečnostné aktualizácie pre balíky "
 "nezahrnuté vo vašej registrácii."
 
-#: ../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 "Kontrola média"
 
-#: ../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 "Testovať"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Vysunúť disk"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5657,7 +5657,7 @@ msgstr ""
 "Zvoľte \"%s\" pre kontrolu disku v mechanike, alebo \"%s\" pre vysunutie a "
 "vloženie iného disku na kontrolu."
 
-#: ../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 "
@@ -5672,7 +5672,7 @@ msgstr ""
 "prvýkrát. Ak tieto boli už úspešne overené, nie je nutné opätovne "
 "kontrolovať každý disk pri ďalšom použití."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5681,11 +5681,11 @@ msgstr ""
 "V žiadnej z vašich mechaník nebol nájdený disk s %s. Vložte prosím disk %s a "
 "stlačte %s pre nový pokus."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disk nájdený"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5696,7 +5696,7 @@ msgstr ""
 "\n"
 "Zvoľte %s pre preskočenie kontroly média a spustenie inštalácie."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5705,7 +5705,7 @@ msgstr ""
 "V žiadnej z vašich zavádzacích mechaník nebol nájdený disk %s.  Vložte "
 "prosím disk %s a stlačte %s pre opakovanie."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5714,32 +5714,32 @@ msgstr ""
 "V žiadnej z vašich mechaník nebol nájdený disk %s. Vložte prosím disk %s a "
 "stlačte %s pre nový pokus."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disk nenájdený"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Na CDROM sa nepodarilo nájsť kickstart súbor."
 
-#: ../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 "Nepodarilo sa prečítať adresár %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Načítanie"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Načítava sa disk s ovládačmi..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Zdroj disku s ovládačmi"
 
-#: ../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?"
@@ -5747,7 +5747,7 @@ msgstr ""
 "Máte viacero zariadení, ktoré môžu obsahovať zdroje disku s ovládačmi.  "
 "Ktoré chcete použit?"
 
-#: ../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?"
@@ -5755,50 +5755,50 @@ msgstr ""
 "Na tomto disku je viacero oddielov, ktoré môžu obsahovať obraz disku s "
 "ovládačmi.  Ktorý chcete použiť?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Nepodarilo sa pripojiť oddiel."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Zvoľte obraz disku s ovládačom"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Zvoľte súbor, ktorý je obrazom vášho ovládača disku."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Nemôžem načítať disk s ovládačmi zo súboru."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Vložte váš disk s ovládačmi do /dev/%s a stlačte \"Ok\" pre pokračovanie."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Vložte disk s ovládačmi"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Pripojenie disku s ovládačmi zlyhalo."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Disk s ovládačmi nie je pre vydanie %s správny."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Manuálny výber"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Zaviesť iný 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 "
@@ -5808,38 +5808,38 @@ msgstr ""
 "Chcete ručne zvoliť ovládač a pokračovať aj tak, alebo načítať iný disk s "
 "ovladačmi?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disk s ovládačmi"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Máte disk s ovládačmi?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Viac diskov s ovládačmi?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Chcete zaviesť nejaké ďalšie disky s ovládačmi?"
 
-#: ../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 "Chyba kickstart-u"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Neznámy zdroj disku ovládača kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5848,7 +5848,7 @@ msgstr ""
 "Následujúci nesprávny parameter bol zadaný pre príkaz disku ovládača "
 "kickstart: %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 "
@@ -5859,19 +5859,19 @@ msgstr ""
 "medzerami. Pokiaľ ich nepoznáte, preskočte túto obrazovku stlačením tlačítka "
 "\"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Zadajte parametre modulu"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Neboli nájdené žiadne ovládače"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Zaviesť disk s ovládačmi"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5879,7 +5879,7 @@ msgstr ""
 "Neboli nájdené žiadné ovládače pre ručné zavedenie.  Chcete použiť disk s "
 "ovladačom?"
 
-#: ../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."
@@ -5887,26 +5887,26 @@ msgstr ""
 "Zvoľte prosím ovládač, ktorý si želáte načítať. Ak nie je uvedený a máte "
 "disk s ovládačmi, stlačte F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Zadajte voliteľné parametre modulu"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Vyberte disk s ovládačmi, ktorý chcete zaviesť"
 
-#: ../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 "Médium nájdené"
 
-#: ../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 "Lokálne inštalačné médium nájdené..."
 
-#: ../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 "
@@ -5915,7 +5915,7 @@ msgstr ""
 "Inštalačný strom %s v tomto priečinku sa zrejme nezhoduje s vaším zavádzacím "
 "médiom."
 
-#: ../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."
@@ -5923,7 +5923,7 @@ msgstr ""
 "Počas načítavania inštalácie z ISO obrazov sa vyskytla chyba. Prosím "
 "skontrolujte ISO obrazy a skúste to znova."
 
-#: ../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?"
@@ -5931,7 +5931,7 @@ msgstr ""
 "Zdá sa, že na vašom systéme nemáte žiadne pevné disky! Želáte si "
 "nakonfigurovať prídavné zariadenia?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5942,61 +5942,61 @@ msgstr ""
 "%s? Ak tu nevidíte diskové zariadenie, ktoré práve používate, stlačte F2 pre "
 "konfiguráciu ďalších zariadení."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Adresár obsahujúci obrazy:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Výber oddielu"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Zariadenie %s zrejme neobsahuje obrazy %s CDROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Chybný parameter pre príkaz kickstartu %s spúšťaný z pevného disku: %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 "Nepodarilo sa nájsť súbor pre kickstart na pevnom disku."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Nemožno nájsť pevný disk pre disk BIOS-u %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Typ klávesnice"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Aký typ klávesnice máte?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Chyba pri otváraní kickstart súboru %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Chyba pri čítaní obsahu kickstart súboru %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Chyba v %s na riadku %d kickstart súboru %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Na vymeniteľnom médiu nie je možné nájsť súbor ks.cfg."
 
-#: ../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."
@@ -6005,52 +6005,52 @@ msgstr ""
 "parametre rýchleho štartu alebo kliknite na Zrušiť pre vykonanie "
 "interaktívnej inštalácie."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Chyba pri sťahovaní kickstart súboru"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Chybný parameter kickstart príkazu metódy shutdown %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Víta vás %s pre %s - záchranný režim"
 
-#: ../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> medzi položkami   | <Space> vyberá  |  <F12> nasl. obr. "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Výber jazyka"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokálne CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Pevný disk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Priečinok NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Víta vás %s%n pre %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Zdroj s diskom aktualizácií"
 
-#: ../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?"
@@ -6058,7 +6058,7 @@ msgstr ""
 "Máte viacero zariadení, ktoré môžu obsahovať zdroje pre disk aktualizácii.  "
 "Ktoré chcete použiť?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6066,29 +6066,29 @@ msgstr ""
 "Na tomto disku je viacero oddielov, ktoré môžu obsahovať obraz disku s "
 "aktualizáciami.  Ktorý chcete použiť?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Vložte disk s aktualizáciou do /dev/%s a stlačte \"Ok\" pre pokračovanie."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disk s aktualizáciou"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Nepodarilo sa pripojiť disk s aktualizáciou"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Aktualizácie"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Načítanie aktualizácií anakondy..."
 
-#: ../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.."
@@ -6097,44 +6097,44 @@ msgstr ""
 "umiestnenie zktualizácie alebo kliknite na Zrušiť pre pokračovanie bez "
 "aktualizácií."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Chyba pri sťahovaní obrazu aktualizácií"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Nemáte dostatok RAM pre inštaláciu %s na tomto počítači."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Záchranná metóda"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Spôsob inštalácie"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Aký typ média obsahuje záchranný obraz systému?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Aký typ média obsahuje balíky, ktoré si želáte nainštalovať?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ovládače neboli nájdené"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Zvoľte ovládač"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Použiť disk s ovládačmi"
 
-#: ../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?"
@@ -6142,11 +6142,11 @@ msgstr ""
 "Nepodarilo sa nájsť žiaden typ disku potrebný pre tento typ inštalácie.  "
 "Chcete ručne zvoliť ovládač alebo použiť disk s ovládačom?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Vo vašom systéme boli nájdené nasledujúce zariadenia."
 
-#: ../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?"
@@ -6154,49 +6154,49 @@ msgstr ""
 "Pre váš systém neboli načítané žiadne ovládače. Želáte si teraz nejaké "
 "zaviesť?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Zariadenia"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Pridať zariadenie"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "zavádzač je už spustený.  Spúšťa sa príkazový riadok.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Spúšťa sa anaconda %s, záchranný režim %s - prosím čakajte...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Spúšťa sa anaconda %s, inštalátor systému %s - prosím čakajte...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Nepodarilo sa nájsť inštalačný obraz %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Kontrola \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Teraz sa kontroluje médium..."
 
-#: ../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."
@@ -6204,7 +6204,7 @@ msgstr ""
 "Nepodarilo sa načítať kontrolný súčet disku z hlavného popisovača zväzku. To "
 "pravdepodobne znamená, že disk bol vytvorený bez kontrolnej sumy."
 
-#: ../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 "
@@ -6214,11 +6214,11 @@ msgstr ""
 "poškodený disk. Ak je to možné, vyčistite disk a skúste to znova. Ak test "
 "opätovne zlyhá, nemali by ste pokračovať v inštalácii."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Úspech"
 
-#: ../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 "
@@ -6227,7 +6227,7 @@ msgstr ""
 "Práve skontrolovaný obraz bol úspešne overený.  Malo by byť v poriadku "
 "inštalovať z tohto média.  Poznámka: test média nemusí odhaliť všetky chyby."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6238,20 +6238,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Test kontrolnej sumy"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Chybný argument kickstart príkazu metódy device %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Pre príkaz zariadenia kickstart musí byť zadaný názov aj názov modulu."
 
-#: ../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"
@@ -6259,7 +6259,7 @@ msgstr ""
 "Predpona musí byť medzi 1 a 32 pre siete IPv4 alebo medzi 1 a 128 pre siete "
 "IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6270,27 +6270,27 @@ msgstr ""
 "potrebný pre prístup do bezdrôtovej siete. Ak kľúč nie je potrebný, "
 "ponechajte túto položku prázdnu a pokračujte v inštalácii."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Šifrovací kľúč"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Bezdrôtové nastavenia"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP pre menný server"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Chýbajúci menný server"
 
-#: ../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 "
@@ -6300,56 +6300,56 @@ msgstr ""
 "táto neobsahuje adresu doménového servera. Ak nemáte túto informáciu k "
 "dispozicii, môžete túto položku nechať prázdnu a pokračovať v inštalácii."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Neplatná IP informácia"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Zadali ste neplatnú IP adresu."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Sieťová chyba"
 
-#: ../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 "Nastala chyba pri konfigurácii sieťového rozhrania."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfigurácia TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Musíte zvoliť aspoň jeden protokol (IPv4 alebo IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "Pre NFS je požadované IPv4"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Inštalačná metóda NFS vyžaduje podporu IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 adresa:"
 
-#: ../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 adresa:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Menný 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 "
@@ -6359,154 +6359,154 @@ msgstr ""
 "akceptovateľná štvor-oktetová maska siete alebo predpona štýlu CIDR. Položky "
 "brány a doménového servera musia obsahovať platné IPv4 alebo IPv6 adresy."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ručná konfigurácia TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Chýbajúca informácia"
 
-#: ../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 "Musíte zadať platnú IPv4 adresu aj sieťovú masku alebo CIDR predponu."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Musíte zadať platnú IPv6 adresu ako aj CIDR predponu."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Zisťuje sa názov počítača a domény..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Chybný parameter pre sieťový príkaz kickstartu %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Chybný štartovací protokol %s v sieťovom príkaze"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Sieťové zariadenie"
 
-#: ../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 ""
 "Na vašom systéme je viac sieťových zariadení. Cez ktoré si želáte inštalovať?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Názov NFS servera:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s adresár:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Prosím zadajte názov servra a cestu k vašim %s obrazom."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "Nastavenie NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Názov počítača je zadaný, ale DNS nebolo nakonfigurované"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Získava sa"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Nie je možné pripojiť ten adresár zo servera."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Ten adresár zrejme neobsahuje inštalačný strom %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Chybný argument kickstart príkazu metódy NFS %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 "Čakanie na telnet spojenie..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Spúšťam anacondu cez telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Nepodarilo sa získať %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Nepodarilo sa získať inštalačný obraz."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Chybný argument kickstart príkazu metódy Url %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Musíte poskytnúť argument --url pre kickstart url metódu."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Neznáma metóda 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 "Prosím zadajte URL obsahujúcu %s obrazy na vašom servri."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Konfigurácia proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Nastavenie URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Musíte zadať URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL musí byť platná http alebo ftp URL"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Neznámy počítač"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s nie je platný názov počítača"
 
-#: ../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."
@@ -6514,23 +6514,23 @@ msgstr ""
 "Pokiaľ používate HTTP proxy, zadajte názov HTTP proxy servera, ktorý chcete "
 "použiť."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Názov proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Port proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Ďalšie nastavenie"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Načítava sa SCSI ovládač"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Načítava sa ovládač %s..."
diff --git a/po/sl.po b/po/sl.po
index 8d5c95e50..9f9eecfa9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -60,41 +60,41 @@ msgstr "Pritisni <enter> za ukazno vrstico"
 #: ../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 "Naprej"
 
@@ -588,22 +588,22 @@ msgstr "Formatiranje datotečnega sistema %s ..."
 #: ../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 "Napaka"
 
@@ -659,8 +659,8 @@ msgstr ""
 "Pritisnite <Enter> za izhod iz namestitvenega programa."
 
 #: ../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 "Preskoči"
 
@@ -993,21 +993,21 @@ msgstr "Popravi"
 
 #: ../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 "Da"
 
 #: ../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 "Ne"
 
-#: ../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 "Ponovno"
 
@@ -1018,8 +1018,8 @@ msgstr "Prezri"
 #: ../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 "Prekliči"
 
@@ -1888,21 +1888,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 "Nazaj"
 
 #: ../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 "Nadaljuj"
 
@@ -2328,7 +2328,7 @@ msgstr "Vnesite svoje namestitvene ključe %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Preskočite svoje namestitvene ključe %(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 "Dobrodošli v %s"
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Izbira jezika"
 
-#: ../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 "Kateri jezik bi radi uporabljali med namestitvijo?"
 
@@ -3587,7 +3587,7 @@ msgstr "Za polje \"%s\" morate vpisati vrednost."
 msgid "Dynamic IP"
 msgstr "Dinamični 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 "Pošiljam zahtevo po podatkih IP za %s..."
@@ -3758,7 +3758,7 @@ msgstr "neznano"
 msgid "Hardware address: "
 msgstr "Strojni naslov:"
 
-#: ../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 "Manjka protokol"
 
@@ -3767,7 +3767,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Izbrati morate vsaj enega izmed IPv4 ali IPv6."
 
 #: ../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 "Neveljavna predpona"
 
@@ -4003,7 +4003,7 @@ msgstr "Naprave RAID"
 msgid "None"
 msgstr "Nič"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Trdi diski"
 
@@ -4915,12 +4915,12 @@ msgstr "Predpona"
 msgid "Activate on boot"
 msgstr "Aktiviraj ob zagonu"
 
-#: ../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 "Omogoči IPv4"
 
-#: ../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 "Omogoči IPv6"
@@ -5040,7 +5040,7 @@ msgstr "Samodejni 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 "Prehod:"
 
@@ -5657,22 +5657,22 @@ msgstr ""
 "* Za pakete na katere niste naročeni ne boste dobili programskih ali "
 "varnostnih popravkov."
 
-#: ../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 "Preskus nosilca"
 
-#: ../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 "Preskus"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Izvrzi Medij"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5681,7 +5681,7 @@ msgstr ""
 "Izberite \"%s\" za preskus nedija, ki je trenutno v pogonu, ali \"%s\", da "
 "izvržete medij in vstavite drugega za preskus."
 
-#: ../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 "
@@ -5695,7 +5695,7 @@ msgstr ""
 "vsaj pred prvo uporabo. Ko ste jih enkrat preverili, tega postopka ni več "
 "potrebno ponoviti."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5704,11 +5704,11 @@ msgstr ""
 "Medija %s ni moč najti v nobenem od vaših pogonov. Prosimo, vstavite medij %"
 "s in pritisnite %s za vnovičen poskus."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Medij Najden"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5719,7 +5719,7 @@ msgstr ""
 "\n"
 "Pritisnite %s za preskok preskusa medija in začetek namestitve."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5728,7 +5728,7 @@ msgstr ""
 "Medija %s, ki bi ustrezal vašemu zagonskemu mediju, ni moč najti. Vstavite "
 "medij %s in pritisnite %s za vnovičen poskus."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5737,32 +5737,32 @@ msgstr ""
 "Medija %s ni moč najti v nobenem od vaših pogonov. Vstavite medij %s in "
 "pritisnite %s za vnovičen poskus."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Medij ni bil najden"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Na CDROM-u ni moč najti datoteke za hitro namestitev"
 
-#: ../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 "Ne moremo brati imenika %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Nalaganje"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Disk z gonilniki se prebira..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Izvor diska z gonilniki"
 
-#: ../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?"
@@ -5770,7 +5770,7 @@ msgstr ""
 "Imate več naprav, ki lahko služijo kot izvori za disk z gonilniki.  Katero "
 "bi radi uporabljali?"
 
-#: ../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?"
@@ -5778,51 +5778,51 @@ msgstr ""
 "Na tej napravi je več razdelkov, ki bi lahko vsebovali sliko diska z "
 "gonilniki.  Katerega bi radi uporabljali?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Razdelka ni moč priklopiti."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Izberite sliko diska z gonilniki"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Izberite datoteko, ki je slika vaša diska z gonilniki."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Nalaganje diska z gonilniki iz datoteke ni uspelo."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Vstavite disketo z gonilnikom v /dev/%s in pritisnite \"Naprej\" za "
 "nadaljevanje."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Vstavite disk z gonilniki"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Diskete ni moč priklopiti."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Disk z gonilniki je neprimeren za to izdajo %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Ročno izberi"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Naloži drug 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 "
@@ -5831,38 +5831,38 @@ msgstr ""
 "Na tem disku z gonilniki ni najti naprav primerne vrste.  Bi radi ročno "
 "izbrali gonilnik, vseeno nadaljevali, ali naložili drug disk z gonilniki?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Disk z gonilniki"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Ali imate disketo z gonilnikom?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Več diskov z gonilniki?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Ali želite naložiti še več diskov z gonilniki?"
 
-#: ../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 "Napaka 'hitre namestitve'"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Neznan vir z gonilniki za hitro namestitev: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5871,7 +5871,7 @@ msgstr ""
 "Naslednji neveljaven argument je bil določen za ukaz hitrega zagona diska z "
 "gonilniki: %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 "
@@ -5882,19 +5882,19 @@ msgstr ""
 "Če ne veste kakšne parametre bi podali, preskočite ta zaslon s pritiskom na "
 "gumb \"Naprej\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Vnesite parametre modulov"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ni najdenih gonilnikov"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Naloži disk z gonilniki"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5902,7 +5902,7 @@ msgstr ""
 "Ni najti gonilnikov za ročno vstavljanje.  Bi radi uporabili disk z "
 "gonilniki?"
 
-#: ../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."
@@ -5910,26 +5910,26 @@ msgstr ""
 "Spodaj izberite gonilnik, ki ga želite naložiti.  Če gonilnika ni v seznamu "
 "in imate posebno disketo z gonilnikom, pritisnite F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Določi dodatne parametre modulu"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Izberite gonilnik, ki se naj naloži"
 
-#: ../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 "Nosilec zaznan"
 
-#: ../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 "Zaznan krajevni namestitvenij nosilec..."
 
-#: ../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 "
@@ -5938,7 +5938,7 @@ msgstr ""
 "Ni videti, da bi namestitveno drevo za %s v tem imeniku ustrezalo vašemu "
 "zagonskemu nosilcu."
 
-#: ../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."
@@ -5946,7 +5946,7 @@ msgstr ""
 "Med branjem namestitve s slik ISO je prišlo do napake. Prosim, preverite "
 "svoje slike ISO in poskusite znova."
 
-#: ../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?"
@@ -5954,7 +5954,7 @@ msgstr ""
 "Ni videti, da bi imeli na sistemu trde diske! Bi radi nastavili dodatne "
 "naprave?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5965,62 +5965,62 @@ msgstr ""
 "Če ne vidite diskovnega pogona, ki ste ga tukaj navedli, pritisnite F2 za "
 "nastavitev dodatnih naprav."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Imenik s slikami:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Izberite razdelitev"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Videti je, kot da naprava %s ne vsebuje medijev %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Slab parameter za ukaz hitre namestitve %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 "Na trdem disku ni moč najti datoteke za hitro namestitev"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Ni moč najti diskovnega pogona za disk BIOS %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Vrsta tipkovnice"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Kakšno tipkovnico imate?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Napaka pri odpiranju datoteke za hitro namestitev %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Napaka pri branju vsebine datoteke za hitro namestitev %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Napaka v %s v vrstici %d datoteke za hitro namestitev %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Ne moremo najti ks.cfg na zagonski disketi."
 
-#: ../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."
@@ -6028,52 +6028,52 @@ msgstr ""
 "Ne morem prenesti datoteke kickstart. Spremenite parametre kickstart ali pa "
 "izberite 'Preklic' in nadaljujte z interaktivno namestitvijo."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Napaka pri prenosu datoteke kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Slab parameter za ustavitveni ukaz hitre namestitve %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Dobrodošli v %s - način za reševanje"
 
-#: ../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> med elementi    | <Space> izbere  | <F12> naslednji zaslon"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Izberite jezik"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Krajevni CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Trdi disk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Imenik NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Dobrodošli v %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Vir diska s popravki"
 
-#: ../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?"
@@ -6081,7 +6081,7 @@ msgstr ""
 "Imate več naprav, ki bi lahko služile kot vir diska s popravki. Katero "
 "napravo bi radi uporabili?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6090,29 +6090,29 @@ msgstr ""
 "Na tej napravi je več razdelkov, ki bi lahko vsebovali sliko diska z "
 "gonilniki.  Katerega bi radi uporabljali?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Vstavite disk s popravki v /dev/%s in pritisnite \"Naprej\" za nadaljevanje."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Popravki"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Diska s popravki ni moč priklopiti"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Popravki"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Berem popravke anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6121,45 +6121,45 @@ msgstr ""
 "Ne morem prenesti datoteke kickstart. Spremenite parametre kickstart ali pa "
 "izberite 'Preklic' in nadaljujte z interaktivno namestitvijo."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Napaka pri prenosu datoteke kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Nimate dovolj pomnilnika za namestitev sistema %s v ta stroj."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Metoda rešitve"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Metoda namestitve"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Kakšne vrste nosilec vsebuje rešilno sliko?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Katero vrsto nosilca vsebuje paket, ki bi ga radi namestili?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Gonilnika ni moč najti"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Izberite gonilnik"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Uporabi disketo z gonilnikom"
 
-#: ../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?"
@@ -6167,60 +6167,60 @@ msgstr ""
 "Ni moč najti nobenih naprav vrste, zahtevane za to vrsto namestitve. Ali bi "
 "radi ročno izbrali svoj gonilnik ali uporabili disk z gonilnikom?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "V vašem sistemu so bile najdene sledeče naprave."
 
-#: ../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 ""
 "Za vaš sistem še ni naloženih gonilnikov. Bi sedaj radi naložili katerega?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Naprave"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Opravljeno"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Dodaj napravo"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "nalagalnik je bil že zagnan.  Lupina se zaganja.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Zaganjam anaconda, rešilni način sistema %s - prosimo, počakajte ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Teče anaconda, namestitev sistema %s - prosimo, počakajte ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Ni moč najti namestitvene slike %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Preverja se \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Zdaj se preverja nosilec..."
 
-#: ../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."
@@ -6229,7 +6229,7 @@ msgstr ""
 "To verjetno pomeni, da je bil disk ustvarjen, ne da bi se dodala kontrolna "
 "vsota."
 
-#: ../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 "
@@ -6239,18 +6239,18 @@ msgstr ""
 "prenosu ali slabega medija. Če je mogoče, očistite medij in poskusite znova. "
 "Če preverjanje vedno znova spodleti, vam odsvetujemonamestitev."
 
-#: ../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"
@@ -6261,30 +6261,30 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Preskus s kontrolno vsoto"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Slab argument ukaza za hitri zagon naprave %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "V ukazu za napravo kickstart morata biti navedena tako ime modula kot njegov "
 "tip"
 
-#: ../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 ""
 "Dolžina naslova IPv4 mora biti med 1 in 32 ali med 1 in 128 za naslov IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6295,27 +6295,27 @@ msgstr ""
 "ključ, ki je potreben za dostop do vašega brezžičnega omrežja. Če ključ ni "
 "potreben, pustite to polje prazno in namestitev se bo nadaljevala."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Šifrirni ključ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Nastavitve brezžičnega omrežja"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP imenskega strežnika"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Manjka imenski strežnik"
 
-#: ../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 "
@@ -6325,56 +6325,56 @@ msgstr ""
 "podatka o imenskem strežniku. Če tega podatke ne poznate lahko pustite polje "
 "prazno, namestitev pa se bo vseeno nadaljevala."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Neveljavni podatki o IP"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Vnesti morate veljaven naslov IP."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Omrežna napaka"
 
-#: ../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 "Pri nastavljanju omrežnega vmesnika je prišlo do napake."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Nastavitev TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Izbrati morate vsaj en protokol (IPv4 ali IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS potrebuje IPv4"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Namestitev z NFS potrebuje podporo za IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Naslov IPv4:"
 
-#: ../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 "Naslov IPv6:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Imenski strežnik:"
 
-#: ../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 "
@@ -6384,156 +6384,156 @@ msgstr ""
 "sprejemljiva omrežna maska ali predpona CIDR. Prehod in imenski strežnik "
 "morata biti veljavna naslova IPv4 ali IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ročna nastavitev TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Manjkajoči podatki"
 
-#: ../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 "Vnesti morate veljaven naslov IP in mrežno masko ali masko CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Vnesti morate veljaven naslov IPv6 in predpono CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Določamo ime računalnika in domeno..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Slab argument za hitri zagon omrežnega ukaza %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Slaba številka bootproto %s v omrežnem ukazu"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Omrežna naprava"
 
-#: ../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 "Katero vrsto sistema bi radi namestili?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Ime strežnika NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Imenik z %s:"
 
-#: ../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 "Nastavitev NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Ime gostitelja brez da bi nastavili DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Nalaganje"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Tega imenika ni moč priklopiti s strežnika."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Ni videti, da bi ta imenik vseboval namestitveno drevo za %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Slab parameter za ukaz NFS za hitro namestitev %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 "Čaka se povezava prek telneta..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Anaconda se poganja prek telneta..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Ni moč naložiti %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Namestitvene slike ni moč dobiti."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Slab parameter za ukaz URL za hitro namestitev %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Metodi URL za hitro namestitev je treba podati argument --url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Neznana metoda 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 "Nastavitev TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Nastavitev NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Vnesti morate imenik."
 
-#: ../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 "Neznan gostitelj"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ni veljavno ime gostitelja"
 
-#: ../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."
@@ -6541,24 +6541,24 @@ msgstr ""
 "Če uporabljate nadomestni strežnik za HTTP (proxy), vnesite ime nadomestnega "
 "strežnika HTTP, ki ga uporabljate."
 
-#: ../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 "Nadaljna nastavitev FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Nalagamo gonilnik za SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Nalaga se gonilnik %s..."
diff --git a/po/sq.po b/po/sq.po
index 63d0390a4..46125273d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -44,41 +44,41 @@ msgstr "Shtype <enter> për bërthamën"
 #: ../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"
 
@@ -499,22 +499,22 @@ msgstr ""
 #: ../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 ""
 
@@ -561,8 +561,8 @@ msgid ""
 msgstr ""
 
 #: ../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 ""
 
@@ -804,21 +804,21 @@ msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
-#: ../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 ""
 
@@ -829,8 +829,8 @@ msgstr ""
 #: ../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 ""
 
@@ -1558,21 +1558,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 ""
 
 #: ../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 ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "Skip entering %(instkey)s"
 msgstr ""
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr ""
@@ -2720,7 +2720,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr ""
 
-#: ../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 ""
 
@@ -3058,7 +3058,7 @@ msgstr ""
 msgid "Dynamic IP"
 msgstr ""
 
-#: ../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 ""
@@ -3221,7 +3221,7 @@ msgstr "Gabim i panjohur"
 msgid "Hardware address: "
 msgstr ""
 
-#: ../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 ""
 
@@ -3230,7 +3230,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 ""
 
@@ -3454,7 +3454,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr ""
 
@@ -4222,12 +4222,12 @@ msgstr ""
 msgid "Activate on boot"
 msgstr ""
 
-#: ../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 ""
@@ -4343,7 +4343,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 ""
 
@@ -4915,29 +4915,29 @@ 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 ""
 
-#: ../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 ""
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr ""
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
 "the disc and insert another for testing."
 msgstr ""
 
-#: ../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 "
@@ -4947,18 +4947,18 @@ msgid ""
 "to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -4966,145 +4966,145 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr ""
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr ""
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr ""
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr ""
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -5112,69 +5112,69 @@ msgid ""
 "screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr ""
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5182,269 +5182,269 @@ msgid ""
 "to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr ""
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr ""
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr ""
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr ""
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr ""
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr ""
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr ""
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr ""
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr ""
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr ""
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr ""
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr ""
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr ""
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr ""
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5452,26 +5452,26 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr ""
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -5479,258 +5479,258 @@ 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
 msgid "Wireless Settings"
 msgstr ""
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr ""
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 "
 "leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr ""
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr ""
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr ""
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr ""
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr ""
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr ""
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr ""
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr ""
 
-#: ../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
 msgid "Configure proxy"
 msgstr ""
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr ""
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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
 msgid "Further Setup"
 msgstr ""
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr ""
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 0bf2d876a..8a84ca3f1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -64,86 +64,86 @@ msgstr "Притисните <enter> за љуску"
 #: ../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
+#: ../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 "У реду"
 
@@ -630,41 +630,41 @@ msgstr "Мењам величину система датотека на %s..."
 #: ../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 "Грешка"
 
@@ -721,9 +721,9 @@ msgstr ""
 #: ../rescue.py:305
 #: ../rescue.py:307
 #: ../textw/upgrade_text.py:132
-#: ../loader2/cdinstall.c:200
-#: ../loader2/cdinstall.c:203
-#: ../loader2/method.c:393
+#: ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:203
+#: ../loader/method.c:393
 msgid "Skip"
 msgstr "Прескочи"
 
@@ -1020,9 +1020,9 @@ msgstr "Поправи"
 #: ../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 "Да"
 
@@ -1032,22 +1032,22 @@ msgstr "Да"
 #: ../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 "Не"
 
 #: ../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
+#: ../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 "Покушај поново"
 
@@ -1066,11 +1066,11 @@ msgstr "Занемари"
 #: ../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 "Откажи"
 
@@ -1838,28 +1838,28 @@ 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 "Назад"
 
@@ -1867,9 +1867,9 @@ msgstr "Назад"
 #: ../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
+#: ../loader/cdinstall.c:117
+#: ../loader/cdinstall.c:125
+#: ../loader/driverdisk.c:440
 msgid "Continue"
 msgstr "Настави"
 
@@ -2223,7 +2223,7 @@ msgid "Skip entering %(instkey)s"
 msgstr "Прескочи унос %(instkey)s"
 
 #: ../text.py:564
-#: ../loader2/lang.c:63
+#: ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Добро дошли у %s за %s"
@@ -3042,7 +3042,7 @@ msgstr "Избор језика"
 
 #: ../iw/language_gui.py:76
 #: ../textw/language_text.py:45
-#: ../loader2/lang.c:374
+#: ../loader/lang.c:374
 msgid "What language would you like to use during the installation process?"
 msgstr "Који језик бисте желели да користите током процеса инсталације?"
 
@@ -3405,8 +3405,8 @@ msgid "Dynamic IP"
 msgstr "Динамички IP"
 
 #: ../iw/netconfig_dialog.py:177
-#: ../loader2/net.c:416
-#: ../loader2/net.c:860
+#: ../loader/net.c:416
+#: ../loader/net.c:860
 #, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr "Шаљем захтев за IP податке за %s..."
@@ -3583,7 +3583,7 @@ msgstr "Хардверска адреса : "
 
 #: ../iw/network_gui.py:778
 #: ../textw/network_text.py:228
-#: ../loader2/net.c:820
+#: ../loader/net.c:820
 msgid "Missing Protocol"
 msgstr "Недостаје протокол"
 
@@ -3596,7 +3596,7 @@ msgstr "Морате изабрати подршку за барем IPv4 или
 #: ../iw/network_gui.py:843
 #: ../iw/network_gui.py:849
 #: ../textw/network_text.py:74
-#: ../loader2/net.c:92
+#: ../loader/net.c:92
 msgid "Invalid Prefix"
 msgstr "Неисправан предметак"
 
@@ -3831,7 +3831,7 @@ msgid "None"
 msgstr "Нема"
 
 #: ../iw/partition_gui.py:816
-#: ../loader2/hdinstall.c:334
+#: ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Чврсти дискови"
 
@@ -4627,13 +4627,13 @@ msgid "Activate on boot"
 msgstr "Активирај при покретању система"
 
 #: ../textw/network_text.py:149
-#: ../loader2/net.c:730
+#: ../loader/net.c:730
 #: tmp/netpostconfig.glade.h:9
 msgid "Enable IPv4 support"
 msgstr "Укључи IPv4 подршку"
 
 #: ../textw/network_text.py:156
-#: ../loader2/net.c:743
+#: ../loader/net.c:743
 #: tmp/netpostconfig.glade.h:10
 msgid "Enable IPv6 support"
 msgstr "Укључи IPv6 подршку"
@@ -4757,7 +4757,7 @@ msgid "DHCPv6"
 msgstr "DHCPv6"
 
 #: ../textw/network_text.py:678
-#: ../loader2/net.c:1055
+#: ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Мрежни пролаз:"
 
@@ -5326,45 +5326,45 @@ msgstr ""
 "* Исход може бити неподржана/неоверена инсталација Red Hat Enterprise Linux-а.\n"
 "* Нећете добити софтверска и безбедносна ажурирања пакета за које нисте претплаћени."
 
-#: ../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 "Провера медијума"
 
-#: ../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 "Испробај"
 
-#: ../loader2/cdinstall.c:96
-#: ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96
+#: ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Избаци диск"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject the disc and insert another for testing."
 msgstr "Одаберите „%s“ да испробате диск који је тренутно у уређају, или „%s“ да избаците диск и уметнете неки други за пробу."
 
-#: ../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 \"%s\". Testing each disc is not strictly required, however it is highly recommended.  Minimally, the discs should be tested prior to using them for the first time. After they have been successfully tested, it is not required to retest each disc prior to using it again."
 msgstr "Ако желите да испитате додатне медијуме, уметните следећи диск и притисните „%s“. Испитивање сваког диска није строго неопходно, али је веома препоручљиво.  У најмању руку, дискове треба испитати пре прве употребе. Након њиховог успешног испитивања, није потребно поново испитати сваки диск пре накнадне употребе."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid "The %s disc was not found in any of your drives. Please insert the %s disc and press %s to retry."
 msgstr "%s диск није пронађен ни у једном од диск уређаја. Молим уметните %s диск и притисните %s да покушате поново."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Диск је пронађен"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5375,452 +5375,452 @@ msgstr ""
 "\n"
 "Одаберите %s да би прескочили пробу медијума и започели инсталацију."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid "No %s disc was found which matches your boot media.  Please insert the %s disc and press %s to retry."
 msgstr "Ниједан %s диск који одговара покретачком медијуму није пронађен.  Молим уметните %s диск и притисните %s да покушате поново."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid "The %s disc was not found in any of your CDROM drives. Please insert the %s disc and press %s to retry."
 msgstr "%s диск није пронађен ни у једном од CDROM уређаја. Молим уметните %s диск и притисните %s да покушате поново."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Диск није пронађен"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Не могу да пронађем kickstart датотеку на CD-ROM-у."
 
-#: ../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 "Нисам успео да прочитам директоријум %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Учитавам"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Читам управљачку дискету..."
 
-#: ../loader2/driverdisk.c:230
-#: ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230
+#: ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Извор за управљачку дискету"
 
-#: ../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?"
 msgstr "Имате више уређаја који могу да послуже као извор за управљачку дискету.  Који бисте желели да користите?"
 
-#: ../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?"
 msgstr "Постоји више партиција на овом уређају које могу да садрже одраз управљачке дискете.  Коју бисте желели да користите?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Неуспело монтирање партиције."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Изаберите одраз управљачке дискете"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "Неуспело читање управљачке дискете из датотеке."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Уметните управљачку дискету у /dev/%s и притисните „У реду“ за наставак."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Уметните управљачку дискету"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Неуспешно монтирање управљачке дискете."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Управљачки диск је неважећи за ово %s издање."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Ручни избор"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Учитај још једну дискету"
 
-#: ../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 driver disk?"
 msgstr "Није пронађен ниједан уређај одговарајуће врсте на овој управљачкој дискети.  Желите ли да ручно изаберете управљачки програм, свеједно наставите, или учитате још неку управљачку дискету?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Управљачка дискета"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Да ли имате управљачку дискету?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Још управљачких дискета?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Желите ли да учитате још неке управљачке дискете?"
 
-#: ../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 грешка"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Непозната управљачка дискета kickstart извора: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid "The following invalid argument was specified for the kickstart driver disk command: %s:%s"
 msgstr "Следећи неисправан аргумент је наведен за команду kickstart управљачке дискете: %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 separated by spaces.  If you don't know what parameters to supply, skip this screen by pressing the \"OK\" button."
 msgstr "Молим унесите ма које параметре које желите да проследите %s модулу, раздвојене размаком.  Ако не знате које параметре да наведете, једноставно прескочите овај екран притиском на дугме „У реду“."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Унесите параметре модула"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ниједан управљачки програм није пронађен"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Учитај управљачку дискету"
 
-#: ../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 "Није пронађен ниједан управљачки програм за ручно убацивање.  Желите ли да користите управљачку дискету?"
 
-#: ../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."
 msgstr "Молим изаберите испод управљачки програм који желите да учитате.  Ако се не појављује на списку, а имате управљачку дискету, притисните F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Наведите необавезне аргументе модула"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Изаберите управљач уређаја за учитавање"
 
-#: ../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 "Пронађен медијум"
 
-#: ../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 "Пронађен локални медијум за инсталацију..."
 
-#: ../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 media."
 msgstr "Изгледа да стабло инсталације %s у том директоријуму не одговара Вашем покретачком медијуму."
 
-#: ../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."
 msgstr "Дошло је до грешке при читању инсталације са ISO одраза. Молим проверите Ваше ISO одразе и покушајте поново."
 
-#: ../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?"
 msgstr "Изгледа да немате ниједан чврсти диск у Вашем систему! Желите ли да подесите додатне уређаје?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid "What partition and directory on that partition hold the CD (iso9660) images for %s? If you don't see the disk drive you're using listed here, press F2 to configure additional devices."
 msgstr "Која партиција и који директоријум на њој садрже CD (iso9660) одразе %s-а? Ако диск који користите није наведен овде, притисните F2 да бисте подесили додатне уређаје."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Директоријум са одразима:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Изаберите партицију"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Изгледа да уређај %s не садржи CD-ROM одразе %s-а."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Лош аргумент команде HD kickstart методе %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 "Не могу да пронађем kickstart датотеку на чврстом диску."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Не могу да пронађем чврсти диск за BIOS диск %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Врста тастатуре"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Коју врсту тастатуре имате?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Грешка при отварању kickstart датотеке %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Грешка при читању садржаја kickstart датотеке %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Грешка код %s у %d. реду kickstart датотеке %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Не могу да нађем ks.cfg на измењивом медију."
 
-#: ../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 "Не могу да преузмем kickstart датотеку.  Молим измените kickstart параметар испод или притисните Откажи за наставак као интерактивна инсталација."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Грешка при преузимању kickstart датотеке"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Лош аргумент команде за гашење kickstart методе %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Добро дошли у %s за %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> између елемената |  <Space> избор  |  <F12> следећи екран"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Изаберите језик"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Локални CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Чврсти диск"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS директоријум"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Добро дошли у %s%n за %s"
 
-#: ../loader2/loader.c:374
-#: ../loader2/loader.c:410
+#: ../loader/loader.c:374
+#: ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Извор за дискету са ажурирањима"
 
-#: ../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?"
 msgstr "Имате више уређаја који могу да послуже као извор за дискету са ажурирањима.  Који бисте желели да користите?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid "There are multiple partitions on this device which could contain the update disk image.  Which would you like to use?"
 msgstr "Постоји више партиција на овом уређају које могу да садрже одраз диска са ажурирањима.  Коју бисте желели да употребите?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Уметните Вашу дискету са ажурирањима у /dev/%s и притисните „У реду“ за наставак."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Дискета са ажурирањима"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Неуспело монтирање дискете са ажурирањима."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Ажурирања"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Читам 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
 msgid "Error downloading updates image"
 msgstr "Грешка при преузимању отиска ажурирања"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Немате довољно RAM-а за инсталацију %s-а на овој машини"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Начин спашавања"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Начин инсталације"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Каква врста медијума садржи одраз за спашавање?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Каква врста медијума садржи пакете које треба инсталирати?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ниједан управљачки програм није пронађен"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Изаберите управљачки програм"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Користи управљачку дискету"
 
-#: ../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?"
 msgstr "Не могу да нађем ниједан уређај оног облика који је потребан за инсталацију ове врсте.  Желите ли да ручно изаберете Ваш управљачки програм или употребите управљачку дискету?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "У Вашем систему су пронађени следећи уређаји:"
 
-#: ../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 "Ниједан управљач уређаја није учитан за Ваш систем.  Желите ли да сада учитате неки?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Уређаји"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Урађено"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Додај уређај"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "покретач је већ извршен.  Покрећем љуску.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Покрећем anaconda-у %s, режим спашавања за %s - молим сачекајте...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Покрећем anaconda-у %s, инсталатер %s система - молим сачекајте...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Не могу да преузмем отисак инсталације %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Проверавам „%s“..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Проверавам медијуме..."
 
-#: ../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."
 msgstr "Неуспело читање контролне суме диска из описника основног диска.  Ово вероватно значи да је диск направљен без додавања контролне суме."
 
-#: ../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 again.  If this test continues to fail you should not continue the install."
 msgstr "Одраз који је управо испитан има грешке. Ово може бити до исквареног преузимања или рђавог диска.  Ако је то применљиво, молим очистите диск и покушајте поново.  Ако ова проба и даље не успева, не треба да наставите са инсталацијом."
 
-#: ../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"
@@ -5831,276 +5831,276 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Провера контролне суме"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Лош аргумент за команду уређајске kickstart методе %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Име модула мора бити наведено за kickstart наредбу уређаја."
 
-#: ../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 "Предметак мора бити између 1 и 32 за IPv4 мреже или између 1 и 128 за IPv6 мреже"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid "%s is a wireless network adapter.  Please provide the ESSID and encryption key needed to access your wireless network.  If no key is needed, leave this field blank and the install will continue."
 msgstr "%s је бежични мрежни уређај.  Молим пружите ESSID и шифрарски кључ који су потребни за приступ Вашој бежичној мрежи.  Ако кључ није потребан, оставите ово поље празно и инсталација ће се наставити."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Шифрарски кључ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Бежичне поставке"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP сервера имена"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Недостаје сервер имена"
 
-#: ../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 leave the field blank and the install will continue."
 msgstr "Вашем захтеву за IP адресу су враћени подаци за подешавање, али не укључују и адресу сервера имена. Ако немате овај податак, можете да оставите ово поље празно и инсталација ће се наставити."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Неисправни IP подаци"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Унели сте неисправну IP адресу."
 
-#: ../loader2/net.c:589
-#: ../loader2/net.c:695
+#: ../loader/net.c:589
+#: ../loader/net.c:695
 msgid "Network Error"
 msgstr "Мрежна грешка"
 
-#: ../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 "Дошло је до грешке при подешавању мрежне спреге."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Подеси TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Морате изабрати барем један протокол (IPv4 или IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 је потребан за NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS метод инсталације захтева IPv4 подршку."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 адреса:"
 
-#: ../loader2/net.c:962
-#: ../loader2/net.c:1014
+#: ../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 адреса:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Сервер имена:"
 
-#: ../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 "Унесите IPv4 и/или IPv6 адресу и предметак (адреса / предметак).  За IPv4, прихватљива је мрежна маска као четворочлана група са тачкама или предметак у CIDR стилу.  Поља за мрежни пролаз и сервер имена морају бити исправне IPv4 или IPv6 адресе."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ручно TCP/IP подешавање"
 
-#: ../loader2/net.c:1224
-#: ../loader2/net.c:1230
+#: ../loader/net.c:1224
+#: ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Изостављен податак"
 
-#: ../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 "Морате унети и исправну IPv4 адресу и мрежну маску или CIDR предметак."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Морате унети и исправну IPv6 адресу и CIDR предметак."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Одређујем име домаћина и домен..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Лош аргумент за мрежну kickstart команду %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Лош bootproto %s наведен у мрежној команди"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Мрежни уређај"
 
-#: ../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 "Имате неколико мрежних уређаја у овом систему. Који желите да користите за инсталацију?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Име NFS сервера:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s директоријум:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Унесите име сервера и путању до %s отисака."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS поставка"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Наведено је име домаћина без подешеног DNS-а"
 
-#: ../loader2/nfsinstall.c:215
-#: ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215
+#: ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Добављам"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Нисам могао да монтирам тај директоријум са сервера."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Изгледа да тај директоријум не садржи стабло инсталације %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Лош аргумент за команду NFS kickstart методе %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 "Чекам telnet везу..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Покрећем anaconda-у кроз telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Не могу да преузмем %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Не могу да преузмем отисак инсталације."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Лош аргумент за команду Урл kickstart методе %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Морате навести --url аргумент за Урл kickstart методу."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Непознат Урл метод %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Унесите УРЛ који садржи %s отиске на серверу."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Подеси прокси"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "УРЛ поставка"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Морате унети УРЛ."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "УРЛ мора бити ftp или http УРЛ"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Непознат домаћин"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s није исправно име домаћина."
 
-#: ../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."
 msgstr "Ако користите HTTP посредника, унесите име HTTP посредничког сервера."
 
-#: ../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
 msgid "Further Setup"
 msgstr "Накнадна поставка"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Учитавам управљачки програм за SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Читам %s управљачки програм..."
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 6cc3c79ba..b1eea6717 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -50,41 +50,41 @@ msgstr "Pritisnite <enter> za ljusku"
 #: ../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 "U redu"
 
@@ -567,22 +567,22 @@ msgstr "Menjam veličinu sistema datoteka na %s..."
 #: ../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 "Greška"
 
@@ -637,8 +637,8 @@ msgstr ""
 "Pritisnite <Enter> za izlazak iz instalatera."
 
 #: ../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 "Preskoči"
 
@@ -970,21 +970,21 @@ msgstr "Popravi"
 
 #: ../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 "Da"
 
 #: ../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 "Ne"
 
-#: ../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 "Pokušaj ponovo"
 
@@ -995,8 +995,8 @@ msgstr "Zanemari"
 #: ../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 "Otkaži"
 
@@ -1857,21 +1857,21 @@ msgid "_Write changes to disk"
 msgstr "U_piši izmene na disk"
 
 #: ../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 "Nazad"
 
 #: ../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 "Nastavi"
 
@@ -2305,7 +2305,7 @@ msgstr "Molim unesite %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Preskoči unos %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Dobro došli u %s za %s"
@@ -3204,7 +3204,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Izbor jezika"
 
-#: ../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 "Koji jezik biste želeli da koristite tokom procesa instalacije?"
 
@@ -3578,7 +3578,7 @@ msgstr "Neophodna je vrednost za polje %s."
 msgid "Dynamic IP"
 msgstr "Dinamički 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 "Šaljem zahtev za IP podatke za %s..."
@@ -3749,7 +3749,7 @@ msgstr "nepoznato"
 msgid "Hardware address: "
 msgstr "Hardverska adresa : "
 
-#: ../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 "Nedostaje protokol"
 
@@ -3758,7 +3758,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Morate izabrati podršku za barem IPv4 ili IPv6."
 
 #: ../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 "Neispravan predmetak"
 
@@ -3991,7 +3991,7 @@ msgstr "RAID uređaji"
 msgid "None"
 msgstr "Nema"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Čvrsti diskovi"
 
@@ -4900,12 +4900,12 @@ msgstr "Predmetak"
 msgid "Activate on boot"
 msgstr "Aktiviraj pri pokretanju sistema"
 
-#: ../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 "Uključi IPv4 podršku"
 
-#: ../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 "Uključi IPv6 podršku"
@@ -5025,7 +5025,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 "Mrežni prolaz:"
 
@@ -5644,22 +5644,22 @@ msgstr ""
 "* Nećete dobiti softverska i bezbednosna ažuriranja paketa za koje niste "
 "pretplaćeni."
 
-#: ../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 "Provera medijuma"
 
-#: ../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 "Isprobaj"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Izbaci disk"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5668,7 +5668,7 @@ msgstr ""
 "Odaberite „%s“ da isprobate disk koji je trenutno u uređaju, ili „%s“ da "
 "izbacite disk i umetnete neki drugi za probu."
 
-#: ../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 "
@@ -5683,7 +5683,7 @@ msgstr ""
 "Nakon njihovog uspešnog ispitivanja, nije potrebno ponovo ispitati svaki "
 "disk pre naknadne upotrebe."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5692,11 +5692,11 @@ msgstr ""
 "%s disk nije pronađen ni u jednom od disk uređaja. Molim umetnite %s disk i "
 "pritisnite %s da pokušate ponovo."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Disk je pronađen"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5707,7 +5707,7 @@ msgstr ""
 "\n"
 "Odaberite %s da bi preskočili probu medijuma i započeli instalaciju."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5716,7 +5716,7 @@ msgstr ""
 "Nijedan %s disk koji odgovara pokretačkom medijumu nije pronađen.  Molim "
 "umetnite %s disk i pritisnite %s da pokušate ponovo."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5725,32 +5725,32 @@ msgstr ""
 "%s disk nije pronađen ni u jednom od CDROM uređaja. Molim umetnite %s disk i "
 "pritisnite %s da pokušate ponovo."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Disk nije pronađen"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Ne mogu da pronađem kickstart datoteku na CD-ROM-u."
 
-#: ../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 "Nisam uspeo da pročitam direktorijum %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Učitavam"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Čitam upravljačku disketu..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Izvor za upravljačku disketu"
 
-#: ../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?"
@@ -5758,7 +5758,7 @@ msgstr ""
 "Imate više uređaja koji mogu da posluže kao izvor za upravljačku disketu.  "
 "Koji biste želeli da koristite?"
 
-#: ../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?"
@@ -5766,50 +5766,50 @@ msgstr ""
 "Postoji više particija na ovom uređaju koje mogu da sadrže odraz upravljačke "
 "diskete.  Koju biste želeli da koristite?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Neuspelo montiranje particije."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Izaberite odraz upravljačke diskete"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Izaberite datoteku koja je odraz upravljačke diskete."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Neuspelo čitanje upravljačke diskete iz datoteke."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Umetnite upravljačku disketu u /dev/%s i pritisnite „U redu“ za nastavak."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Umetnite upravljačku disketu"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Neuspešno montiranje upravljačke diskete."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Upravljački disk je nevažeći za ovo %s izdanje."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Ručni izbor"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Učitaj još jednu disketu"
 
-#: ../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 "
@@ -5819,38 +5819,38 @@ msgstr ""
 "disketi.  Želite li da ručno izaberete upravljački program, svejedno "
 "nastavite, ili učitate još neku upravljačku disketu?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Upravljačka disketa"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Da li imate upravljačku disketu?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Još upravljačkih disketa?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Želite li da učitate još neke upravljačke diskete?"
 
-#: ../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 greška"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Nepoznata upravljačka disketa kickstart izvora: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5859,7 +5859,7 @@ msgstr ""
 "Sledeći neispravan argument je naveden za komandu kickstart upravljačke "
 "diskete: %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 "
@@ -5870,19 +5870,19 @@ msgstr ""
 "razdvojene razmakom.  Ako ne znate koje parametre da navedete, jednostavno "
 "preskočite ovaj ekran pritiskom na dugme „U redu“."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Unesite parametre modula"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Nijedan upravljački program nije pronađen"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Učitaj upravljačku disketu"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5890,7 +5890,7 @@ msgstr ""
 "Nije pronađen nijedan upravljački program za ručno ubacivanje.  Želite li da "
 "koristite upravljačku disketu?"
 
-#: ../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."
@@ -5898,26 +5898,26 @@ msgstr ""
 "Molim izaberite ispod upravljački program koji želite da učitate.  Ako se ne "
 "pojavljuje na spisku, a imate upravljačku disketu, pritisnite F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Navedite neobavezne argumente modula"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Izaberite upravljač uređaja za učitavanje"
 
-#: ../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 "Pronađen medijum"
 
-#: ../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 "Pronađen lokalni medijum za instalaciju..."
 
-#: ../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 "
@@ -5926,7 +5926,7 @@ msgstr ""
 "Izgleda da stablo instalacije %s u tom direktorijumu ne odgovara Vašem "
 "pokretačkom medijumu."
 
-#: ../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."
@@ -5934,7 +5934,7 @@ msgstr ""
 "Došlo je do greške pri čitanju instalacije sa ISO odraza. Molim proverite "
 "Vaše ISO odraze i pokušajte ponovo."
 
-#: ../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?"
@@ -5942,7 +5942,7 @@ msgstr ""
 "Izgleda da nemate nijedan čvrsti disk u Vašem sistemu! Želite li da podesite "
 "dodatne uređaje?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5953,61 +5953,61 @@ msgstr ""
 "Ako disk koji koristite nije naveden ovde, pritisnite F2 da biste podesili "
 "dodatne uređaje."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Direktorijum sa odrazima:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Izaberite particiju"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Izgleda da uređaj %s ne sadrži CD-ROM odraze %s-a."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Loš argument komande HD kickstart metode %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 "Ne mogu da pronađem kickstart datoteku na čvrstom disku."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Ne mogu da pronađem čvrsti disk za BIOS disk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Vrsta tastature"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Koju vrstu tastature imate?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Greška pri otvaranju kickstart datoteke %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Greška pri čitanju sadržaja kickstart datoteke %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Greška kod %s u %d. redu kickstart datoteke %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Ne mogu da nađem ks.cfg na izmenjivom mediju."
 
-#: ../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."
@@ -6015,52 +6015,52 @@ msgstr ""
 "Ne mogu da preuzmem kickstart datoteku.  Molim izmenite kickstart parametar "
 "ispod ili pritisnite Otkaži za nastavak kao interaktivna instalacija."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Greška pri preuzimanju kickstart datoteke"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Loš argument komande za gašenje kickstart metode %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Dobro došli u %s za %s - režim spašavanja"
 
-#: ../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> između elemenata |  <Space> izbor  |  <F12> sledeći ekran"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Izaberite jezik"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokalni CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Čvrsti disk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS direktorijum"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Dobro došli u %s%n za %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Izvor za disketu sa ažuriranjima"
 
-#: ../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?"
@@ -6068,7 +6068,7 @@ msgstr ""
 "Imate više uređaja koji mogu da posluže kao izvor za disketu sa "
 "ažuriranjima.  Koji biste želeli da koristite?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -6076,30 +6076,30 @@ msgstr ""
 "Postoji više particija na ovom uređaju koje mogu da sadrže odraz diska sa "
 "ažuriranjima.  Koju biste želeli da upotrebite?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Umetnite Vašu disketu sa ažuriranjima u /dev/%s i pritisnite „U redu“ za "
 "nastavak."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Disketa sa ažuriranjima"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Neuspelo montiranje diskete sa ažuriranjima."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Ažuriranja"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Čitam anacondina ažuriranja"
 
-#: ../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.."
@@ -6107,44 +6107,44 @@ msgstr ""
 "Ne mogu da preuzmem otisak ažuriranja.  Molim izmenite lokaciju ažuriranja "
 "ispod ili pritisnite Otkaži za nastavak bez ažuriranja."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Greška pri preuzimanju otiska ažuriranja"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Nemate dovoljno RAM-a za instalaciju %sa na ovoj mašini"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Način spašavanja"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Način instalacije"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Kakva vrsta medijuma sadrži odraz za spašavanje?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Kakva vrsta medijuma sadrži pakete koje treba instalirati?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Nijedan upravljački program nije pronađen"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Izaberite upravljački program"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Koristi upravljačku disketu"
 
-#: ../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?"
@@ -6153,11 +6153,11 @@ msgstr ""
 "ove vrste.  Želite li da ručno izaberete Vaš upravljački program ili "
 "upotrebite upravljačku disketu?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "U Vašem sistemu su pronađeni sledeći uređaji:"
 
-#: ../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?"
@@ -6165,49 +6165,49 @@ msgstr ""
 "Nijedan upravljač uređaja nije učitan za Vaš sistem.  Želite li da sada "
 "učitate neki?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Uređaji"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Urađeno"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Dodaj uređaj"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "pokretač je već izvršen.  Pokrećem ljusku.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Pokrećem anacondu %s, režim spašavanja za %s - molim sačekajte...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Pokrećem anacondu %s, instalater %s sistema - molim sačekajte...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Ne mogu da preuzmem otisak instalacije %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Proveravam „%s“..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Proveravam medijume..."
 
-#: ../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."
@@ -6215,7 +6215,7 @@ msgstr ""
 "Neuspelo čitanje kontrolne sume diska iz opisnika osnovnog diska.  Ovo "
 "verovatno znači da je disk napravljen bez dodavanja kontrolne sume."
 
-#: ../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 "
@@ -6226,11 +6226,11 @@ msgstr ""
 "pokušajte ponovo.  Ako ova proba i dalje ne uspeva, ne treba da nastavite sa "
 "instalacijom."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Uspešno"
 
-#: ../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 "
@@ -6240,7 +6240,7 @@ msgstr ""
 "medijuma trebalo bi da bude u redu.  Primite k znanju da se sve greške "
 "medijuma/diska ne mogu da se otkriju tokom provere medijuma."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6251,20 +6251,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Provera kontrolne sume"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Loš argument za komandu uređajske kickstart metode %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Ime modula mora biti navedeno za kickstart naredbu uređaja."
 
-#: ../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"
@@ -6272,7 +6272,7 @@ msgstr ""
 "Predmetak mora biti između 1 i 32 za IPv4 mreže ili između 1 i 128 za IPv6 "
 "mreže"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6283,27 +6283,27 @@ msgstr ""
 "potrebni za pristup Vašoj bežičnoj mreži.  Ako ključ nije potreban, ostavite "
 "ovo polje prazno i instalacija će se nastaviti."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Šifrarski ključ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Bežične postavke"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP servera imena"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Nedostaje server imena"
 
-#: ../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 "
@@ -6313,56 +6313,56 @@ msgstr ""
 "uključuju i adresu servera imena. Ako nemate ovaj podatak, možete da "
 "ostavite ovo polje prazno i instalacija će se nastaviti."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Neispravni IP podaci"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Uneli ste neispravnu IP adresu."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Mrežna greška"
 
-#: ../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 "Došlo je do greške pri podešavanju mrežne sprege."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Podesi TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Morate izabrati barem jedan protokol (IPv4 ili IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 je potreban za NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS metod instalacije zahteva IPv4 podršku."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 adresa:"
 
-#: ../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 adresa:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Server imena:"
 
-#: ../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 "
@@ -6373,42 +6373,42 @@ msgstr ""
 "u CIDR stilu.  Polja za mrežni prolaz i server imena moraju biti ispravne "
 "IPv4 ili IPv6 adrese."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ručno TCP/IP podešavanje"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Izostavljen podatak"
 
-#: ../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 "Morate uneti i ispravnu IPv4 adresu i mrežnu masku ili CIDR predmetak."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Morate uneti i ispravnu IPv6 adresu i CIDR predmetak."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Određujem ime domaćina i domen..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Loš argument za mrežnu kickstart komandu %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Loš bootproto %s naveden u mrežnoj komandi"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Mrežni uređaj"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6416,134 +6416,134 @@ msgstr ""
 "Imate nekoliko mrežnih uređaja u ovom sistemu. Koji želite da koristite za "
 "instalaciju?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Ime NFS servera:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s direktorijum:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Unesite ime servera i putanju do %s otisaka."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS postavka"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Navedeno je ime domaćina bez podešenog DNS-a"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Dobavljam"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Nisam mogao da montiram taj direktorijum sa servera."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Izgleda da taj direktorijum ne sadrži stablo instalacije %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Loš argument za komandu NFS kickstart metode %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 "Čekam telnet vezu..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Pokrećem anacondu kroz telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Ne mogu da preuzmem %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Ne mogu da preuzmem otisak instalacije."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Loš argument za komandu Url kickstart metode %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Morate navesti --url argument za Url kickstart metodu."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Nepoznat Url metod %s"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Unesite URL koji sadrži %s otiske na serveru."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Podesi proksi"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL postavka"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Morate uneti URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL mora biti ftp ili http URL"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Nepoznat domaćin"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s nije ispravno ime domaćina."
 
-#: ../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."
 msgstr "Ako koristite HTTP posrednika, unesite ime HTTP posredničkog servera."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Ime proksija:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Port proksija:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Naknadna postavka"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Učitavam upravljački program za SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Čitam %s upravljački program..."
diff --git a/po/sv.po b/po/sv.po
index 28f131c83..5ac75871b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -47,41 +47,41 @@ msgstr "Tryck <retur> för ett skal"
 #: ../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"
 
@@ -557,22 +557,22 @@ msgstr "Ändrar storlek på filsystemet på %s ..."
 #: ../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 "Fel"
 
@@ -628,8 +628,8 @@ msgstr ""
 "Tryck <Retur> för att avsluta installationsprogrammet."
 
 #: ../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 "Hoppa över"
 
@@ -963,21 +963,21 @@ msgstr "Fixa"
 
 #: ../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 "Ja"
 
 #: ../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 "Nej"
 
-#: ../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 "Försök igen"
 
@@ -988,8 +988,8 @@ msgstr "Ignorera"
 #: ../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 "Avbryt"
 
@@ -1848,21 +1848,21 @@ msgid "_Write changes to disk"
 msgstr "_Skriv ändringar till disk"
 
 #: ../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 "Tillbaka"
 
 #: ../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 "Fortsätt"
 
@@ -2292,7 +2292,7 @@ msgstr "Ange din %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Hoppa över inmatning %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Välkommen till %s för %s"
@@ -3169,7 +3169,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "Språkval"
 
-#: ../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 "Vilket språk vill du använda under installationen?"
 
@@ -3544,7 +3544,7 @@ msgstr "Ett värde krävs i fältet \"%s\"."
 msgid "Dynamic IP"
 msgstr "Dynamisk 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 "Skickar förfrågan om IP-information för %s..."
@@ -3715,7 +3715,7 @@ msgstr "okänd"
 msgid "Hardware address: "
 msgstr "Hårdvaruadress:"
 
-#: ../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 "Protokoll saknas"
 
@@ -3724,7 +3724,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Du måste välja minst stöd för IPv4 eller IPv6."
 
 #: ../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 "Ogiltigt prefix"
 
@@ -3957,7 +3957,7 @@ msgstr "RAID-enheter"
 msgid "None"
 msgstr "Ingen"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Hårddiskar"
 
@@ -4866,12 +4866,12 @@ msgstr "Prefix"
 msgid "Activate on boot"
 msgstr "Aktivera vid uppstart"
 
-#: ../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 "Slå på IPv4 stöd"
 
-#: ../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 "Slå på IPv6 stöd"
@@ -4991,7 +4991,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:"
 
@@ -5611,22 +5611,22 @@ msgstr ""
 "* Du får inte program- och säkerhetsuppdateringar för paket som inte ingår i "
 "din prenumeration."
 
-#: ../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 "Mediakontroll"
 
-#: ../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 "Testa"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Mata ut skiva"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5635,7 +5635,7 @@ msgstr ""
 "Välj \"%s\" för att testa den skiva som för tillfället är i enheten, eller "
 "\"%s\" för att mata ut skivan och stoppa i en annan för testning."
 
-#: ../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 "
@@ -5650,7 +5650,7 @@ msgstr ""
 "har testats utan problem är det inte nödvändigt att testa varje skiva igen "
 "innan den används."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5659,11 +5659,11 @@ msgstr ""
 "Skivan med %s kunde inte hittas i någon av dina enheter. Sätt i skivan med %"
 "s och tryck %s för att försöka igen."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Skiva hittades"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5674,7 +5674,7 @@ msgstr ""
 "\n"
 "Välj %s för att hoppa över mediatestet och starta installationen."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5683,7 +5683,7 @@ msgstr ""
 "Ingen skiva med %s kunde hittas som stämmer överens med ditt startmedia. "
 "Sätt i skivan med %s och tryck %s för att försöka igen."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5692,32 +5692,32 @@ msgstr ""
 "Skivan med %s kunde inte hittas i någon av dina CDROM-enheter. Sätt i skivan "
 "med %s och tryck %s för att försöka igen."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Skiva hittades inte"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Kan inte hitta kickstartfil på cdrom-skiva."
 
-#: ../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 "Kunde inte läsa katalogen %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Läser in"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Läser drivrutinsdisketten..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Källa för drivrutinsdiskett"
 
-#: ../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?"
@@ -5725,7 +5725,7 @@ msgstr ""
 "Du har flera enheter som kan tjäna som källor för en drivrutinsdiskett. "
 "Vilken vill du använda?"
 
-#: ../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?"
@@ -5733,51 +5733,51 @@ msgstr ""
 "Det finns flera partitioner på denna enhet som kan innehålla avbilden för "
 "drivrutinsdisketten. Vilken vill du använda?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Misslyckades med att montera partitionen."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Välj avbild för drivrutinsdiskett"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Välj den fil som är avbilden för drivrutinsdisketten."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Misslyckades med att läsa in drivrutinsdisketten från fil."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sätt in din drivrutinsdiskett i /dev/%s och tryck på \"OK\" för att "
 "fortsätta."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Sätt in drivrutinsdiskett"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Montering av drivrutinsdisketten misslyckades."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Drivrutinsdisketten är ogiltig för denna utgåva av %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Välj manuellt"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Läs in en annan diskett"
 
-#: ../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 "
@@ -5787,38 +5787,38 @@ msgstr ""
 "drivrutinen manuellt, fortsätta ändå, eller läsa in en annan "
 "drivrutinsdiskett?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Drivrutinsdiskett"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Har du en drivrutinsdiskett?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Fler drivrutinsdisketter?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Vill du läsa in fler drivrutinsdisketter?"
 
-#: ../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 "Kickstartfel"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Okänd kickstartkälla för drivrutinsdiskett: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5827,7 +5827,7 @@ msgstr ""
 "Följande ogiltiga argument angavs till kickstartkommandot för "
 "drivrutinsdiskett: %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 "
@@ -5838,19 +5838,19 @@ msgstr ""
 "blanksteg. Om du inte vet vilka parametrar du bör ange hoppar du bara över "
 "denna skärm genom att trycka på knappen \"OK\"."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Ange modulparametrar"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Inga drivrutiner hittades"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Läs in drivrutinsdiskett"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5858,7 +5858,7 @@ msgstr ""
 "Inga drivrutiner som kan infogas manuellt kunde hittas. Vill du använda en "
 "drivrutinsdiskett?"
 
-#: ../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."
@@ -5866,26 +5866,26 @@ msgstr ""
 "Välj den drivrutin nedan som du vill läsa in. Om den inte finns i denna "
 "lista och du har en drivrutinsdiskett, tryck F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Ange valfria modulparametrar"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Välj enhetsdrivrutin att läsa in"
 
-#: ../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 "Medium detekterades"
 
-#: ../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 "Lokalt installationsmedium detekterades..."
 
-#: ../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 "
@@ -5894,7 +5894,7 @@ msgstr ""
 "%s-installationsträdet i den katalogen verkar inte stämma överens med ditt "
 "startmedium."
 
-#: ../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."
@@ -5902,7 +5902,7 @@ msgstr ""
 "Det inträffade ett fel vid läsning av installationen från ISO-avbilderna. "
 "Kontrollera dina ISO-avbilder och försök igen."
 
-#: ../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?"
@@ -5910,7 +5910,7 @@ msgstr ""
 "Du verkar inte ha några hårddiskar på ditt system! Vill du konfigurera "
 "ytterligare enheter?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5921,61 +5921,61 @@ msgstr ""
 "(iso9660) av %s? Tryck F2 för att konfigurera ytterligare enheter om du inte "
 "ser den disk du använder i denna lista."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Katalog som innehåller avbilder:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Välj partition"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Enheten %s ser inte ut att innehålla cd-romavbilder med %s."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Felaktigt argument till HD-kickstartmetodkommandot %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 "Kan inte hitta kickstartfil på hårddisken."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Kan inte hitta hårddisk för BIOS-disk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Tangentbordstyp"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Vilken typ av tangentbord har du?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Fel vid öppnande av kickstartfilen %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Fel vid läsning av innehållet i kickstartfil %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Fel i %s på rad %d i kickstartfilen %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Hittar inte ks.cfg på löstagbart medium."
 
-#: ../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."
@@ -5984,53 +5984,53 @@ msgstr ""
 "parametern nedan eller tryck Avbryt för att fortsätta en interaktiv "
 "installation."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Fel vid nedladdning av uppstartsfil"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 "Felaktigt argument till kickstartmetodkommandot för nedstängning %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Välkommen till %s för %s - räddningsläge"
 
-#: ../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> mellan element | <Blanksteg> väljer | <F12> nästa skärm "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Välj ett språk"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Lokal CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Hårddisk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS-katalog"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Välkommen till %s%n för %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Källa för uppdateringsdiskett"
 
-#: ../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?"
@@ -6038,79 +6038,79 @@ msgstr ""
 "Du har flera enheter som kan tjäna som källor för en uppdateringsdiskett. "
 "Vilken vill du använda?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr "Det finns flera partitioner på denna enhet som kan innehålla diskavbilden uppdatering.  Vilken vill du använda?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Sätt in din uppdateringsdiskett i /dev/%s och tryck \"OK\" för att fortsätta."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Uppdateringsdiskett"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Montering av uppdateringsdisketten misslyckades."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Uppdateringar"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Läser anaconda-uppdateringar..."
 
-#: ../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 "Kunde inte ladda ner uppdateringsavbilden.  Modifiera uppdateringsplatsen nedan eller tryck Avbryt för att fortsätta utan uppdateringar."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "Fel vid nedladdning av uppdateringsavbild"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 "Du har inte tillräckligt med minne för att installera %s på denna maskin."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Räddningsmetod"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Installationsmetod"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Vilket medium innehåller räddningsavbilden?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Vilket medium innehåller paketen som ska installeras?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ingen drivrutin hittades"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Välj drivrutin"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Använd en drivrutinsdiskett"
 
-#: ../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?"
@@ -6119,11 +6119,11 @@ msgstr ""
 "installationstyp. Vill du välja din drivrutin manuellt eller använda en "
 "drivrutinsdiskett?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Följande enheter har hittats i ditt 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?"
@@ -6131,49 +6131,49 @@ msgstr ""
 "Inga enhetsdrivrutiner för ditt system har lästs in. Vill du läsa in några "
 "nu?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Enheter"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Färdig"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Lägg till enhet"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "inläsaren har redan körts. Startar skal.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Kör anaconda %s, räddningsläget för %s - var vänlig vänta ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Kör anaconda %s, systeminstallationsprogrammet för %s - var vänlig vänta ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Kunde inte hitta installationsavbilden %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Kontrollerar \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Kontrollerar medium nu..."
 
-#: ../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."
@@ -6181,7 +6181,7 @@ msgstr ""
 "Kan inte läsa diskkontrollsumman från den primära identifieraren. Detta "
 "betyder troligtvis att disken skapades utan att kontrollsumman lades till."
 
-#: ../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 "
@@ -6192,18 +6192,18 @@ msgstr ""
 "och försök igen. Om detta test fortsätter att misslyckas bör du inte "
 "fortsätta installationen."
 
-#: ../loader2/mediacheck.c:117
+#: ../loader/mediacheck.c:117
 msgid "Success"
 msgstr "Gick bra"
 
-#: ../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 "Bilden som just testades verifierades riktigt.  Det skall vara OK att installera från detta media.  Observera att inte alla media-/enhetsfel kan upptäckas av mediakontrollen."
 
-#: ../loader2/method.c:390
+#: ../loader/method.c:390
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -6214,20 +6214,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Test av kontrollsumma"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Felaktigt argument till enhetskickstartmetodkommandot %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Ett modulnamn måste anges för kickstartenhetskommandot."
 
-#: ../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"
@@ -6235,7 +6235,7 @@ msgstr ""
 "Prefix måste vara mellan 1 och 32 för IPv4-nätverk eller mellan 1 och 128 "
 "för IPv6-nätverk"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6246,27 +6246,27 @@ msgstr ""
 "behövs för åtkomst at ditt trådlösa nätverk. Om ingen nyckel behövs bör du "
 "lämna fältet tomt, och installationen kommer att fortsätta."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Krypteringsnyckel"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Inställningar för trådlöst nätverk"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Namnserver-IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Saknar namnserver"
 
-#: ../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 "
@@ -6276,58 +6276,58 @@ msgstr ""
 "innehöll inte en DNS-namnserver. Om du inte har denna information kan du "
 "lämna fältet blankt och installationen kommer att fortsätta."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Ogiltig IP-information"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Du skrev in en ogiltig IP-adress."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: ../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 ""
 "Ett fel inträffade vid konfigurertömning av målhårddiskarna. Kloning "
 "misslyckades."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Konfigurera TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Du måste välja minst ett protokoll (IPv4 eller IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "IPv4 behövs för NFS"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS-installationsmetod kräver IPv4-stöd."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4-adress:"
 
-#: ../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-adress:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Namnserver:"
 
-#: ../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 "
@@ -6337,156 +6337,156 @@ msgstr ""
 "punkt-kvadruppel nätmask eller prefix i CIDR-stil tillåtet. Fälten gateway "
 "och namnserver måste vara giltiga IPv4- eller IPv6-adresser."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Manuell TCP/IP-konfiguration"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Information saknas"
 
-#: ../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 ""
 "Du måste skriva in både en giltig IPv4-adress och en nätmask eller CIDR "
 "prefix."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Du måste skriva in både en giltig IPv6-adress och ett CIDR prefix."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Undersöker värdnamn och domän..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Felaktigt argument till kickstartnätverkskommandot %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "Felaktigt startprotokoll %s angivet i nätverkskommando"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Nätverksenhet"
 
-#: ../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 ""
 "Du har flera nätverksenheter i detta system. Vilken vill du installera via?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Namn på NFS-server:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s-katalog:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "Ange servernamn och sökväg till dina %s-bilder."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS-konfiguration"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Värdnamn angivet utan att DNS är konfigurerat"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Den katalogen kunde inte monteras från servern."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Den katalogen verkar inte innehålla ett %s-installationsträd."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Felaktigt argument till NFS-kickstartmetodkommandot %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 "Väntar på telnet-anslutning..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Kör anaconda via telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Kan inte hämta %s://%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Kan inte hämta installationsavbilden."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Felaktigt argument till Url-kickstartmetodkommandot %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Måste ange ett --url-argument till Url-kickstartmetoden."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Url-metoden %s är okänd"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "Ange URL:en som innehåller %s-bilderna på din server."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "Konfigurera proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL-konfiguration"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "Du måste ange en URL."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL:en måste antingen vara en ftp- eller en http-URL"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "Okänd värd"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s är inget giltigt värdnamn."
 
-#: ../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."
@@ -6494,23 +6494,23 @@ msgstr ""
 "Om du använder en HTTP-proxy anger du namnet på den HTTP-proxyserver som ska "
 "användas."
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Proxynamn:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Proxyport:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Ytterligare konfiguration"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Läser in SCSI-drivrutin"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Läser in %s-drivrutinen..."
diff --git a/po/ta.po b/po/ta.po
index 64e06860e..947357336 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -72,41 +72,41 @@ msgstr "ஒரு ஷெல்லுக்கு <enter> ஐ அழுத்த�
 #: ../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 "சரி"
 
@@ -580,22 +580,22 @@ msgstr "%s இல் கோப்பு முறையை மறுஅளவி
 #: ../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 "பிழை"
 
@@ -649,8 +649,8 @@ msgstr ""
 "<Enter> விசையை அழுத்தி கணினியை மீண்டும் துவக்கவும்."
 
 #: ../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 "தவிர்க்கவும்"
 
@@ -979,21 +979,21 @@ msgstr "சரிசெய்யவும்"
 
 #: ../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 "ஆம்"
 
 #: ../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 "இல்லை"
 
-#: ../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 "மறுமுயற்சி"
 
@@ -1004,8 +1004,8 @@ msgstr "தவிர்க்கவும்"
 #: ../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 "ரத்து"
 
@@ -1846,21 +1846,21 @@ msgid "_Write changes to disk"
 msgstr "மாற்றங்களை வட்டில் எழுதுதல் (_W)"
 
 #: ../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 "பின்னோக்கு"
 
 #: ../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 "தொடரவும்"
 
@@ -2275,7 +2275,7 @@ msgstr "உங்கள் %(instkey)sஐ உள்ளிடவும்"
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s ஐ உள்ளிடுதலை தவிர்"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s க்கு %sக்கு வரவேற்கப்படுகிறீர்கள்"
@@ -3155,7 +3155,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "மொழி தேர்ந்தெடுத்தல்"
 
-#: ../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 "நிறுவலின் போது நீங்கள் பயன்படுத்த விரும்பும் மொழி என்ன?"
 
@@ -3527,7 +3527,7 @@ msgstr "புலம் \"%s\" க்கு ஒரு மதிப்பு த�
 msgid "Dynamic IP"
 msgstr "மாறும் 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 "%sக்கான IP தகவலுக்காக கோரிக்கை அனுப்பப்படுகிறது..."
@@ -3698,7 +3698,7 @@ msgstr "தெரியாதது"
 msgid "Hardware address: "
 msgstr "வன்பொருள் முகவரி:"
 
-#: ../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 "விடுபட்ட நெறிமுறை"
 
@@ -3707,7 +3707,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "நீங்கள் குறைந்தது ஒரு நெறிமுறையையாவது (IPv4 அல்லது IPv6) தேர்ந்தெடுக்க வேண்டும்."
 
 #: ../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 "தவறான முன்னொட்டு"
 
@@ -3935,7 +3935,7 @@ msgstr "RAID சாதனங்கள்"
 msgid "None"
 msgstr "ஒன்றுமில்லை"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "நிலைவட்டு இயக்கிகள்"
 
@@ -4826,12 +4826,12 @@ msgstr "முன்னொட்டு"
 msgid "Activate on boot"
 msgstr "துவக்கும் போது செயல்படுத்து"
 
-#: ../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 "IPv4 துணையை செயல்படுத்தவும்"
 
-#: ../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 "IPv6 துணையை செயல்படுத்தவும்"
@@ -4951,7 +4951,7 @@ msgstr "தானியக்க 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 "நுழைவாயில்:"
 
@@ -5561,22 +5561,22 @@ msgstr ""
 "போகலாம். \n"
 "* சந்தாவில் இல்லாத பொதிகளுக்கு மென்பொருள் பாதுகாப்பு மேம்பாடு இல்லாது போகலாம்."
 
-#: ../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 "ஊடக சோதனை"
 
-#: ../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 "சோதனை"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "குறுவட்டினை வெளியேற்று"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5585,7 +5585,7 @@ msgstr ""
 "\"%s\" தற்போது இயக்கியில் உள்ள குறுவட்டினை தேர்வு செய்யவும், அல்லது \"%s\" குறுவட்டினை "
 "வெளியேற்றிய பின் அடுத்த குறுவட்டினை உள்ளிட்டு சோதிக்கவும்."
 
-#: ../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 "
@@ -5599,7 +5599,7 @@ msgstr ""
 "பயன்படுத்துவதற்கு முன் சோதிக்க வேண்டும். அவை வெற்றிகரமாக சோதிக்கப்பட்ட பின் மீண்டும் அவற்றை "
 "சோதிக்க வேண்டிய அவசியம் இல்லை."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5608,11 +5608,11 @@ msgstr ""
 "%s குறுவட்டு எந்த ஒரு குறுவட்டும் இயக்கியிலும் இல்லை.%s குறுவட்டினை நுழைத்து %s ஐ "
 "அழுத்தி மீண்டும் முயற்சி செய்யவும்."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "குறுவட்டு கண்டுபிடிக்கப்பட்டது"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5623,7 +5623,7 @@ msgstr ""
 "\n"
 "%s ஐ தேர்வு செய்து ஊடக பரிசோதனையை நிறுத்திவிட்டு நிறுவலை துவக்கவும்."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5632,7 +5632,7 @@ msgstr ""
 "உங்கள் துவக்க ஊடகத்தோடு பொருந்தும் %s குறுவட்டு எதுவும் இல்லை.  %s குறுவட்டினை நுழைத்து "
 "%s ஐ அழுத்தி மீண்டும் முயற்சி செய்யவும்."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5641,38 +5641,38 @@ msgstr ""
 "%s குறுவட்டு எந்த ஒரு குறுவட்டும் இயக்கியிலும் இல்லை.%s குறுவட்டினை நுழைத்து %s ஐ "
 "அழுத்தி மீண்டும் முயற்சி செய்யவும்."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "குறுவட்டு காணப்படவில்லை"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "குறுவட்டில் கிக்ஸ்டார்ட் கோப்பினை காணவில்லை."
 
-#: ../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 "அடைவை படிக்க முடியவில்லை %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "ஏற்றப்படுகிறது"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "இயக்கி வட்டு படிக்கப்படுகிறது..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "இயக்கி வட்டு மூலம்"
 
-#: ../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?"
 msgstr "இயக்கி வட்டிற்கு மூலமான பல சாதனங்கள் உங்களிடம் உள்ளன. எதனை பயன்படுத்த வேண்டும்?"
 
-#: ../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?"
@@ -5680,49 +5680,49 @@ msgstr ""
 "இந்த சாதனத்தில் இயக்கிக்கான மென்பொருள் இருக்கும் பல பகிர்வுகள் உள்ளது. எந்த மென்பொருளை "
 "பயன்படுத்த வேண்டும்?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "பகிர்வை ஏற்ற முடியவில்லை."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "இயக்கி வட்டு உருவை தேர்வு செய்யவும்"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "இயக்கி கோப்பினை ஏற்ற முடியவில்லை."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "/dev/%s இல் உங்கள் இயக்க வட்டை நுழைத்து தொடர \"சரி\" ஐ அழுத்தவும். "
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "இயக்கி வட்டை நுழைக்கவும்"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "இயக்கி வட்டினை ஏற்ற முடியவில்லை."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%sஇன் இந்த வெளியீட்டுக்கு இயக்கி வட்டு தவறானது."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "கைமுறை தேர்வு"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "வேறு வட்டினை ஏற்றுக"
 
-#: ../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 "
@@ -5731,45 +5731,45 @@ msgstr ""
 "இந்த இயக்கியில் சரியான கருவி வகைகள் கண்டறியப்படவில்லை.இயக்கியை நீங்களாகவே தேர்வு செய்ய "
 "வேண்டுமா, எப்படி இருப்பினும் தொடர வேண்டுமா,அல்லது வேறு இயக்கிவட்டினை ஏற்ற வேண்டுமா?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "இயக்கி வட்டு"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "உங்களிடம் இயக்க வட்டு உள்ளதா?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "இயக்க வட்டுகள் மேலும் உள்ளதா?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "வேறு இயக்கு வட்டுகளை ஏற்ற வேண்டுமா?"
 
-#: ../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 "கிக்ஸ்டார்ட் பிழை"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "தெரியாத இயக்க வட்டு கிக்ஸ்டார்ட் மூலம்: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "கிக்ஸ்டார்ட் இயக்க வட்டு கட்டளையில் பின்வரும் தவறான அளவுரு குறிப்பிடப்பட்டுள்ளது: %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 "
@@ -5779,25 +5779,25 @@ msgstr ""
 "நீங்கள் அனுப்ப விரும்பும் அளபுருவை %s பகுதியில் இடைவெளிகளோடு உள்ளிடவும். அளபுருக்கள் "
 "தெரியவில்லை எனில் இந்த திரையை தவிர்த்து \"சரி\" பொத்தானை சொடுக்கவும்."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "தொகுதி அளபுருக்களை உள்ளிடவும்"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "இயக்கிகள் ஏதும் இல்லை"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "இயக்கி வட்டினை ஏற்றவும்"
 
-#: ../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 "கைமுறையாக உள்ளிட எந்த இயக்கிகளும் இல்லை. நீங்கள் இயக்கி வட்டினை பயன்படுத்த வேண்டுமா?"
 
-#: ../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."
@@ -5805,26 +5805,26 @@ msgstr ""
 "நீங்கள் ஏற்ற வேண்டிய இயக்கியை கீழே இருந்து தேர்வு செய்யவும். தேர்வில் எதுவும் இல்லை என்றால் "
 "F2 விசையை அழுத்தவும்"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "விருப்பமான தொகுதி மதிப்புருக்களை குறிப்பிடவும்."
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "ஏற்ற வேண்டிய சாதன இயக்கி தேர்ந்தெடுக்கவும்"
 
-#: ../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 "ஊடகம் கண்டுபிடிக்கப்பட்டது"
 
-#: ../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 "உள்ளமை நிறுவல் ஊடகம் கண்டுபிடிக்கப்பட்டது..."
 
-#: ../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 "
@@ -5833,7 +5833,7 @@ msgstr ""
 "அடைவில் உள்ள %s நிறுவல் கிளையில் உள்ள கோப்புகள் உங்கள் ஊடகத்தில் உள்ள கோப்புகளோடு "
 "பொருந்தவில்லை."
 
-#: ../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."
@@ -5841,13 +5841,13 @@ msgstr ""
 "ISO உருவிலிருந்து நிறுவலை வாசிக்கும் போது பிழை ஏற்பட்டுள்ளது. ISO உருவை சோதித்து "
 "மீண்டும் முயற்சிக்கவும்."
 
-#: ../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?"
 msgstr "உங்கள் கணினியில் நிலைவட்டு எதுவும் இல்லை. கூடுதல் சாதனங்களை கட்டமைக்க வேண்டுமா?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5858,61 +5858,61 @@ msgstr ""
 "ஒருவேளை வட்டு இயக்கி உங்கள் பட்டியலில் இல்லையெனில், F2 விசையை அழுத்தி கூடுதல் சாதனங்களை "
 "கட்டமைக்கவும்."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "உருக்களை கொண்டிருக்கும் அடைவு:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "பகிர்வை தேர்ந்தெடுக்கவும்"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "தெரியாத சாதனம் %s மானது %s குறுவட்டு உருக்களை கொண்டுள்ளது."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "%s HD கிக்ஸ்டார்ட் முறை கட்டளைக்கான அளவுரு தவறாக உள்ளது: %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 "நிலைவட்டு இயக்கியில் கிக்ஸ்டார்ட் கோப்பினை காணவில்லை."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS வட்டுக்கான நிலைவட்டினை காணவில்லை %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "விசைப்பலகை வகை"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "உங்களிடம் எந்த வகை விசைப்பலகை உள்ளது?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s கிக்ஸ்டார்ட் கோப்பினை திறப்பதில் தவறு ஏற்பட்டது: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s கிக்ஸ்டார்ட் கோப்பினை வாசிக்கும் போது பிழை ஏற்பட்டது: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "கிக்ஸ்டார்ட் கோப்பு %sஇல் வரிசை எண் %d இல் பிழை %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ks.cfgஐ நீக்கக்கூடிய ஊடகத்தில் காண முடியவில்லை."
 
-#: ../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."
@@ -5920,56 +5920,56 @@ msgstr ""
 "கிக்ஸ்டார்ட் கோப்பு தரவிறக்க இயலவில்லை. தயவு செய்து கீழ் கண்ட கிக்ஸ்டார்ட் அளபுருவை மாற்றவும் "
 "அல்லது ரத்து செய் ஐ அழுத்தி ஊடாடு நிறுவலாக தொடரவும்."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "கிக்ஸ்டார்ட் கோப்பினை தரவிறக்குவதில் தவறு ஏற்பட்டது"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "தவறான பணிநிறுத்தம் கிக்ஸ்டார்ட் முறை கட்டளை மதிப்புரு %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%sக்கு %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> between elements  | <Space> selects | <F12> next screen "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ஒரு மொழியை தேர்வு செய்யவும்"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "உள்ளமை குறுவட்டு"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "நிலைவட்டு இயக்கி"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "என்எஃப்எஸ் அடைவு"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n க்கு %sக்கு நல்வரவு"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "வட்டு மூலத்தை மேம்படுத்து"
 
-#: ../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?"
 msgstr "வட்டை மேம்படுத்த உங்களிடம் பல சாதனங்கள் உள்ளன. எதனை பயன்படுத்த வேண்டும்?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -5977,28 +5977,28 @@ msgstr ""
 "மேம்படுத்தல் வட்டு உருவை கொண்ட இந்த சாதனத்தில் பல பகிர்வுகள் உள்ளது. எதனை பயன்படுத்த "
 "வேண்டும்?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "உங்கள் வட்டை /dev/%s இல் செலுத்தி, பின்பு தொடர  \"சரி\" என்பதை அழுத்தவும்."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "வட்டு மேம்படுத்தப்படுகிறது"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "மேம்படுத்தல் வட்டினை ஏற்ற முடியவில்லை"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "மேம்படுத்தல்"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "அனகோன்டா மேம்படுத்தலை படிக்கிறது..."
 
-#: ../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.."
@@ -6006,44 +6006,44 @@ msgstr ""
 "உரு மேம்படுத்தலை பதிவிறக்க இயலவில்லை. கீழேயுள்ள மேம்படுத்தல் இடத்தை மாற்றவும் அல்லது ரத்து "
 "என அழுத்தி மேம்படுத்தல் இல்லாமல் தொடரவும்."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "உருவை பதிவிறக்குவதில் தவறு ஏற்பட்டது"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "%sஐ உங்கள் கணினியில் நிறுவ போதுமான RAM இடமில்லை."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "மீட்பு முறை"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "நிறுவல் முறை"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "எவ்வகை ஊடகம் மீட்பு நிரல் உருவை கொண்டுள்ளது?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "எவ்வகை ஊடகத்தில் நிறுவ வேண்டிய தொகுப்புகளை உள்ளது?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "இயக்கி ஏதுவும் இல்லை"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "இயக்கியை தேர்ந்தெடுக்கவும்"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "இயக்கி வட்டினை பயன்படுத்தவும்"
 
-#: ../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?"
@@ -6051,59 +6051,59 @@ msgstr ""
 "நிறுவல் வகைக்கு தேவையான சாதன வகையை கண்டுபிடிக்க முடியவில்லை.  நீங்கள் கைம்முறையாக "
 "இயக்கியை தேர்வு செய்ய வேண்டுமா அல்லது இயக்கி வட்டை பயன்படுத்த வேண்டுமா?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "பின்வரும் சாதனங்கள் உங்கள் கணினியில் கண்டுபிடிக்கப்பட்டுள்ளன."
 
-#: ../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 "உங்கள் கணினியிலிருந்து சாதன இயக்கிகள் எதுவும் ஏற்றப்படவில்லை. எப்படியாவது ஏற்ற வேண்டுமா?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "சாதனங்கள்"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "முடிந்தது"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "சாதனத்தை சேர்"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "ஏற்றி ஏற்கெனவே இயக்கத்தில் உள்ளது.  ஷெல் துவங்குகிறது.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "அனகோண்டா %s இயங்கிக்கொண்டிருக்கிறது, %s மீட்பு முறை- காத்திருக்கவும்...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "அனகோண்டா %s இயங்கிக்கொண்டிருக்கிறது, %s கணினி நிறுவலுக்காக - காத்திருக்கவும்...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "%s நிறுவல் உரு கண்டுபிடிக்க முடியவில்லை"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" ஐ சோதிக்கிறது..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "இப்போது ஊடகத்தை சோதித்துக்கொண்டிருக்கிறது.."
 
-#: ../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."
@@ -6111,7 +6111,7 @@ msgstr ""
 "முதன்மை தொகுதி விளக்கியிலிருந்து வட்டு checksum ஐ வாசிக்க முடியவில்லை.  ஏனெனில் "
 "வட்டு 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 "
@@ -6121,11 +6121,11 @@ msgstr ""
 "இருக்கலாம். முடியுமானால், வட்டை சுத்தப்படுத்தி மீண்டும் முயற்சிக்கவும். இந்த முயற்சியும் "
 "தோல்வியடைந்தால் நிறுவலை தொடர முடியாது."
 
-#: ../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 "
@@ -6134,7 +6134,7 @@ 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"
@@ -6145,20 +6145,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "checksum சோதனை"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "சாதன கிக்ஸ்டார்ட் முறை கட்டளைக்கு தவறான மதிப்புருக்கள் %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "கிக்ஸ்டார்ட் சாதன கட்டளையில் தொகுதி பெயர் குறிப்பிடப்பட வேண்டும்."
 
-#: ../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"
@@ -6166,7 +6166,7 @@ msgstr ""
 "IPv4 பிணையங்களுக்கு முன்னொட்டு 1க்கும் 32க்கும் இடைப்பட்டதாக இருக்க வேண்டும் அல்லது IPv6 "
 "பிணையங்களுக்கு 1க்கும் 128க்கும் இடைபட்டதாக இருக்க வேண்டும்"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6177,27 +6177,27 @@ msgstr ""
 "குறியாக்க விசையை கொடுக்கவும். விசை தேவை இல்லை எனில் இந்த புலத்தை வெற்றாக விடவும் "
 "மற்றும் நிறுவல் தொடரும்."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "குறியாக்க விசை"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "வடமில்லா அமைவுகள்"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "பெயர்சேவையகம் IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "பெயர்சேவையகம் காணவில்லை"
 
-#: ../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 "
@@ -6207,56 +6207,56 @@ msgstr ""
 "சேர்க்கவில்லை, உங்களுக்கு பெயர் சேவையகம் பெயர் தெரிந்தால், அதை உள்ளிடவும். உங்களிடம் இந்த "
 "தகவல் இல்லை என்றால், இந்தப் புலத்தை வெற்றாக விட்டு நிறுவலை தொடரவும்."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "தவறான IP தகவல்"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "தவறான IP முகவரி உள்ளிடப்பட்டுள்ளது."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "பிணைய பிழை"
 
-#: ../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 "உங்கள் பிணைய இடைமுகத்தை கட்டமைக்கும் போது பிழை."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IPஐ கட்டமைக்கவும்"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "DHCPக்கு நீங்கள் குறைந்தது ஒரு நெறிமுறையானவது (IPv4 அல்லது IPv6) தேர்ந்தெடுக்க வேண்டும்."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFSக்கு IPv4 தேவைப்படுகிறது"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS நிறுவல் முறைக்கு IPv4 துணை தேவைப்படுகிறது."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 முகவரி:"
 
-#: ../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 முகவரி:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "பெயர் சேவையகம்:"
 
-#: ../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 "
@@ -6267,154 +6267,154 @@ msgstr ""
 "ஒப்புக்கொள்ளப்படும். நுழைவாயில் மற்றும் பெயர் வழங்கன் புலங்கள் செல்லுபடியாகும் IPv4 அல்லது  "
 "IPv6 முகவரிகள் ஆக இருக்க வேண்டும்."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "கைமுறை TCP/IP கட்டமைப்பு"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "விடுபட்ட தகவல்கள்"
 
-#: ../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 ""
 "ஒரு சரியான IPv4 முகவரி மற்றும் ஒரு பிணைய மூடி இரண்டையும் அல்லது CIDR முன்னொட்டையும் "
 "உள்ளிட வேண்டும்."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "நீங்கள் ஒரு செல்லுபடியாகும் IPv6 முகவரி மற்றும் CIDR முன்னொட்டினை உள்ளிட வேண்டும்."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "புரவலன் பெயர் மற்றும் களத்தை வரையறுக்கிறது ..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "கிக்ஸ்டார்ட் கட்டளை %sக்கு தவறான மதிப்புரு: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "தவறான bootproto %s பிணைய கட்டளையில் குறிப்பிடப்பட்டுள்ளது"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "பிணைய சாதனங்கள்"
 
-#: ../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 "இந்த கணினியில் பல் பிணைய சாதனங்கள் உள்ளன. இதில் நிறுவ வேண்டும்?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS சேவையகப் பெயர்"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s அடைவு:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "சேவையகம் பெயர் மற்றும் பாதையை உங்கள் %s உருக்களில் உள்ளிடவும்."
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS அமைவு"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "புரவலன் பெயர் DNS கட்டமைக்கப்படாமல் குறிப்பிடப்பட்டுள்ளது"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "மீட்கப்படுகிறது"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "சேவையகத்திலிருந்து அடைவை ஏற்ற முடியவில்லை."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "%s நிறுவல் கிளை அடைவில் இருப்பதாக தெரியவில்லை"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "தவறான NFS கிக்ஸ்டார்ட் முறை கட்டளை %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 "telnet இணைப்பிற்காக காத்திருக்கிறது..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "அனகோண்டா telnet வழியாக இயக்கப்படுகிறது..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s://%s/%s யினை மீட்க முடியவில்லை."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "நிறுவப்பட்ட உருக்களை மீட்க முடியவில்லை."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "தவறான Url கிக்ஸ்டார்ட் முறை கட்டளை மதிப்புரு %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "ஒரு --url மதிப்புருவை Url கிக்ஸ்டார்ட் முறைக்கு கொடுக்க வேண்டும்."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "தெரியாத 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 "உங்கள் சேவையகத்தில் %s உருக்களை கொண்டிருக்கும் இணைய முகவரியை உள்ளிடவும்."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "பதிலாளை கட்டமைத்தல்"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL அமைவு"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "ஒரு URLஐ உள்ளிட வேண்டும்."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL ftp அல்லது http URLஆக இருக்க வேண்டும்"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "தெரியாத புரவலன்"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ஒரு சரியான புரவலன் பெயர் கிடையாது."
 
-#: ../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."
@@ -6422,23 +6422,23 @@ msgstr ""
 "நீங்கள் HTTP பதிலாள் சேவையகத்தைப் பயன்படுத்தினால் HTTP பதிலாள் சேவையகத்தின் பெயரை "
 "பயன்படுத்த உள்ளிடவும்."
 
-#: ../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
 msgid "Further Setup"
 msgstr "மேலும் அமைவு"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI இயக்கியை ஏற்றுகிறது"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr " %s இயக்கி ஏற்றுகிறது..."
diff --git a/po/te.po b/po/te.po
index f0ca14bb2..29b91ace7 100644
--- a/po/te.po
+++ b/po/te.po
@@ -69,41 +69,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 "సరే"
 
@@ -563,22 +563,22 @@ msgstr "%s పై దస్త్రవ్యవస్థను పునఃప�
 #: ../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 "దోషం"
 
@@ -633,8 +633,8 @@ msgstr ""
 "మీ కంప్యూటరు పునఃప్రారంభించటానికి <ప్రవేశం> నొక్కండి."
 
 #: ../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 "వదినివేయి"
 
@@ -959,21 +959,21 @@ msgstr "స్థాపించు"
 
 #: ../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 "అవును"
 
 #: ../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 "కాదు"
 
-#: ../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 "పునఃప్రయత్నించు"
 
@@ -984,8 +984,8 @@ msgstr "వదిలివేయి"
 #: ../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 "రద్దు"
 
@@ -1818,21 +1818,21 @@ msgid "_Write changes to disk"
 msgstr "మార్పులను డిస్క్‍‌కు వ్రాయుము(_W)"
 
 #: ../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 "వెనుకకు"
 
 #: ../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 "కొనసాగించు"
 
@@ -2234,7 +2234,7 @@ msgstr "దయచేసి మీ %(instkey)s ఇవ్వండి."
 msgid "Skip entering %(instkey)s"
 msgstr "%(instkey)s ప్రవేశాన్ని విడిచిపెట్టం"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "%s కు %s కొరకు స్వాగతము"
@@ -3096,7 +3096,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "భాష ఎన్నిక"
 
-#: ../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 "సంస్థాపనా విధానంలో మీరు ఏ భాషని ఉపయోగించాలనుకుంటున్నారు?"
 
@@ -3462,7 +3462,7 @@ msgstr "%s క్షేత్రం కోసం విలువ అవసరం
 msgid "Dynamic IP"
 msgstr "గతిశీల 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 "%s సమాచారంకోసం IPకోసం నివేదన పంపబడుతున్నది..."
@@ -3631,7 +3631,7 @@ msgstr "తెలియని"
 msgid "Hardware address: "
 msgstr "Hardware చిరునామాలు: "
 
-#: ../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 "తప్పిన ఒడంబడిక"
 
@@ -3640,7 +3640,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "మీరు తప్పక కనీసం ఒక ఒడంబడిక(IPv4 or IPv6)ను ఎన్నుకోవాలి."
 
 #: ../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 "చెల్లని పురస్సర్గ"
 
@@ -3868,7 +3868,7 @@ msgstr "RAID సాధనాలు"
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Hard Driveలు"
 
@@ -4739,12 +4739,12 @@ msgstr "Prefix"
 msgid "Activate on boot"
 msgstr "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 "IPv4 మద్దతు అసాధ్యం"
 
-#: ../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 "IPv6 మద్దతు అసాధ్యం"
@@ -4863,7 +4863,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:"
 
@@ -5472,22 +5472,22 @@ msgstr ""
 "* మీరు మీ ధృవీకరణలో ఉన్నటువంటి అన్ని ప్యాకేజీలను పొందలేరు.\n"
 "* ఇది మద్దతుఇవ్వని/ధృవీకరించనిన Red Hat సంస్థాపనకు కారణమవుతుంది."
 
-#: ../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 "మాధ్యమ శోధన"
 
-#: ../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 "పరీక్ష"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "డిస్కు ని బయటకు పంపు"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5496,7 +5496,7 @@ msgstr ""
 "ప్రస్తుతం driveలో ఉన్న CDని పరిశీలించటానికి \"%s\"ని ఎన్నుకోండి, లేదా \"%s\"  CDని తీసి పరిశీలనకు "
 "వేరొకదానిని పెట్టండి."
 
-#: ../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 "
@@ -5509,7 +5509,7 @@ msgstr ""
 "పరిక్షించటం అవసరంలేదు.  తక్కువగా, మొదటసారి ఉపయోగించేటప్పుడు పరీక్షించవలసి ఉంటుంది. అవి "
 "పరీక్షించబడిన తరువాత, ఉపయోగించటానికి ప్రతి CDని తిరిగి అమర్చనవసరంలేదు."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5518,11 +5518,11 @@ msgstr ""
 "%s CD మీ ఏ CDROM driveలోనూ కనుగొనబడలేదు.దయచేసి %s CDని ఉంచిపునఃప్రారంభించటానికి %s ను "
 "నొక్కండి."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "డిస్కు కనుగొనబడింది"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5533,7 +5533,7 @@ msgstr ""
 "\n"
 "%sను మాధ్యమ పరిశీలన దాటివేతకు మరియూ సంస్థాపన ప్రారంభానికి ఎన్నుకోండి."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5542,7 +5542,7 @@ msgstr ""
 "మీ boot మాధ్యమంతో జతపడే ఏ %s CD కనుగొనబడలేదు.  దయచేసి %s CDని ఉంచి పునఃప్రయత్నానికి %sని "
 "నొక్కండి."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5551,32 +5551,32 @@ msgstr ""
 "%s CD మీ ఏ CDROM driveలోనూ కనుగొనబడలేదు.దయచేసి %s CDని ఉంచిపునఃప్రారంభించటానికి %s ను "
 "నొక్కండి."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "డిస్కు కనుగొనబడలేదు"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "kickstart ఫైలు 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 "%s: %s directoryని చదవటంలో వైఫల్యం "
 
-#: ../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 "పఠన 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 ఆకరం"
 
-#: ../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?"
@@ -5584,7 +5584,7 @@ msgstr ""
 "driver disk ఆకరంగా పనిచేసే.సాధనా బాహుళ్యాన్ని మీరు కలిగి ఉన్నారు.  మీరు దేన్ని "
 "ఉపయోగించాలనుకుంటున్నారు?"
 
-#: ../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?"
@@ -5592,49 +5592,49 @@ msgstr ""
 "driver disk చిత్రాలను కలిగిఉన్న విభజనా బాహుళ్యాలు ఈ సాధనంలో ఉన్నాయి.  మీరు దేన్ని "
 "ఉపయోగించాలనుకుంటున్నారు?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "విభజనను మరల్చటంలో వైఫల్యం."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "driver disk చిత్రాన్ని ఎన్నుకో"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "మీ driver disk చిత్రంగా ఉన్న ఫైలుని ఎన్నుకోండి."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "driver disk నుండీ fileను load చేయటంలో వైఫల్యం."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "మీ driver disk /dev/%sలోకి చొప్పించి కొనసాగించటానికి \"సరే\"ను నొక్కండి."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Driver Diskను చొప్పించండి"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "driver diskను మరల్చటంలో వైఫల్యం."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "%s విడుదలకు Driver disk సరైనది కాదు."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "మానవీయంగా ఎన్నుకోబడింది"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "వేరొక diskని load చేయి"
 
-#: ../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 "
@@ -5643,45 +5643,45 @@ msgstr ""
 "ఈ driver diskకు తగిన వర్గానికి చెందిన సాధనాలు లేవు.  మీరు మానవీయంగా driverను "
 "ఎన్నుకోవాలనుకుంటున్నారా, కొనసాగించాలనుకుంటున్నారా, లేదా వేరే driver diskని loadచేయాలనుకుంటున్నారా?"
 
-#: ../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 "మీరు driver diskను కలిగి ఉన్నారా?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "ఎక్కువ Driver Diskలు?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "మీరు ఏమైనా driver diskలను load చేయాలనుకుంటున్నారా?"
 
-#: ../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 దోషం"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "తెలియని driver disk kickstart ఆకరం: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "ఈ కింది చెల్లని వాదన kickstart driver disk ఆదేశం కోసం నిర్దేశించబడింది: %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 "
@@ -5691,25 +5691,25 @@ msgstr ""
 "దయచేసి మీరు %s గుణకంకి ఇవ్వదలచుకున్న ఖాళీలచే వేరు చేయబడుతున్న పారామితులను ప్రవేశపెట్టండి.  "
 "పారామితులు ఏం సరఫరా చేస్తాయో తెలియకపోతే, ఈ screenను \"సరే\"మీట నొక్కటంద్వారా దాటవేయండి."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Module Parametersను ప్రవేశపెట్టండి"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ఏ driverలూ కనుగొనబడలేదు"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "driver diskను Load చేయి"
 
-#: ../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 "మానవీయంగా చొప్పించటానికి ఏ driverలూ కనుగొనబడలేదు.  మీరు 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."
@@ -5717,39 +5717,39 @@ msgstr ""
 "దయచేసి మీరు load చేయాలనుకుంటున్న కింది driverను ఎన్నుకోండి.  అది కనిపించకపోతే మీరుdriver "
 "diskను కలిగి ఉంటే, F2 నొక్కండి."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "ఐచ్ఛిక module అమర్పులను తెల్పండి"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr " Device Driverను 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 "మాధ్యమం కనిపెట్టబడింది"
 
-#: ../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 "స్వస్థాన సంస్థాపక మాధ్యమం కనిపెట్టబడింది..."
 
-#: ../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 "
 "media."
 msgstr "ఆ directoryలోని %s సంస్థాపనా చిత్రం మీ boot మాధ్యమంతో సరిపోల్చబడేటట్లు లేదు."
 
-#: ../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."
 msgstr "ISO చిత్రాలనుండీ . 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?"
@@ -5757,7 +5757,7 @@ msgstr ""
 "మీ కంప్యూటరులో మీరు ఏ hard driveలనూ కలిగి ఉన్నట్లు లేరు! మీరు అదనపు driveలను "
 "అకృతీకరించాలనుకుంటున్నారా?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5767,61 +5767,61 @@ msgstr ""
 "%s కొరకు CD (iso9660) చిత్రాలను ఏ విభజన మరియు డైరెక్టరి కలిగిఉంది.మీరు డిస్కు డ్రైవ్ ను చూసి "
 "ఉండకపోతే మీరు ఇక్కడ జాబితా చేసిన వాటివి వాడిఉండాలి,అదనపు సాధనాలు ఆకృతీకరించుటకు F2 వత్తండి."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Directory కలిగిఉన్న చిత్రాలు:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "విభ్జనను ఎన్నుకో"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s CDROM చిత్రాలను కలిగి ఉండటానికి %s సాధనం కనపడటంలేదు."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "HD kickstart విధాన ఆదేశం %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 "kickstart ఫైలు hard driveలో కనుగొనబడలేదు."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS disk %s కొరకు hard drive కనుగొనబడలేదు"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Keyboard రకం"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "మీరు ఏరకం కీబోర్డును కలిగి ఉన్నారు?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "kickstart ఫైలు %s: %sను తెరవటంలో దోషం"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "kickstart ఫైలు %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
 msgid "Cannot find ks.cfg on removable media."
 msgstr "తీసివేయదగిన మాద్యమంపై ks.cfg ను కనుగొనలేము."
 
-#: ../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."
@@ -5829,50 +5829,50 @@ msgstr ""
 "కిక్ స్టార్టు దస్త్రంను దిగుమతి చేయలేక పోయింది.దయచేసి కిక్ స్టార్టు పారామితిని క్రింద మార్చండి లేదా అన్యోన్య "
 "సంస్థాపనా విధానంలో వెళ్ళుటకు రద్దు ను నొక్కండి."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "kickstart ఫైలు దిగుమతి లో దోషం"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "kickstart విధాన ఆదేశం %s: %sని మూయటానికి చెడ్డ వాదం"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s కు %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> మూలకాలమద్య  | <Space> ఎన్నికలు | <F12> తదుపరి screen "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "ఒక భాషని ఎన్నుకో"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "స్యస్థాన CD/DVD"
 
-#: ../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 సంచిక"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s%n కు %s కొరకు స్వాగతం"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Disk ఆకరాలను నవీకరించు"
 
-#: ../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?"
@@ -5880,7 +5880,7 @@ msgstr ""
 "మీరు diskను నవీకరించటానికి ఆధారభూతమైన పెక్కు సాధనాలను కలిగి ఉన్నారు.  మీరు దేన్ని "
 "ఉపయోగించాలనుకుంటున్నారు?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
@@ -5888,28 +5888,28 @@ msgstr ""
 "నవీకరణ డిస్కు చిత్రమును కలగివుండగల బహుళ విభజనలు ఈ పరికరమునందు ఉన్నాయి.  మీరు ఏది "
 "ఉపయోగించుటకు ఇష్టపడతారు?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "మీ నవీకరణల diskను /dev/%sలో ఉంచండి మరియూ కొనసాగించటానికి  \"సరే\"ను నొక్కండి."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "నవీకరణల Disk"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "నవీకరణల Diskను మరల్చటంలో వైఫల్యం"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "నవీకరణలు"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "అనకొండ నవీకరణలు...ను చదువు"
 
-#: ../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.."
@@ -5917,44 +5917,44 @@ msgstr ""
 "నవీకరణ చిత్రమును దిగుమతి చేయలేకపోయింది.  దయచేసి క్రిందన నవీకరణాల స్థానాన్ని సవరించుము లేదా నవీకరణలు "
 "లేకుండా కొనసాగించుటకు రద్దుచేయు వత్తండి..."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 msgid "Error downloading updates image"
 msgstr "నవీకరణాల చిత్రాన్ని దిగుమతి చేయుటలో దోషము"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "కంప్యూటరులో %sను సంస్థాపించటానికి మీరు తగినంత RAMని కలిగిలేరు."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "ఇబ్బంది విధానాన"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "సంస్థాపనా విధానం"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "ఏ మాధ్యమ వర్గం rescue చిత్రాన్ని కలిగిఉంది?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "ఈ packages సంస్థాపన చేయటానికి ఏరక మాధ్యమం కలిగి ఉంది?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "driver కనుగొనబడలేదు"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "driverను ఎన్నుకో"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ఒక 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?"
@@ -5962,59 +5962,59 @@ msgstr ""
 "ఈ సంస్థాపనా రకానికి కావలసిన సాధనా వర్గాన్ని కనుగొన లేము.  మీరు మీ driverను మానవీయంగానే "
 "ఎన్నుకోవాలనుకుంటున్నారా లేక ఒక driver diskను ఉపయోగించాలనుకుంటున్నారా?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "మీ కంప్యూటరులో కింది driveలు కనుగొనబడుతున్నాయి."
 
-#: ../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 "మీ కంప్యూటరులో ఏ ఉపకరణ driveలూ loadచేయబడలేదు.  వేటినైనా మీరు ఇప్పుడు load చేయాలనుకుంటున్నారా?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "పరికరములు"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "అయినది"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "పరికరాన్ని కలుపుము"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "loader ఇప్పటికే నడుస్తోంది.  shellని ప్రారంభిస్తోంది.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "anaconda %s నడుస్తున్నది, %s ఇబ్బంది రీతిన - దయచేసి వేచివుండండి...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "anaconda %s నడుస్తున్నది, %s సిస్టమ్ సంస్థాపకి - దయచేసి వేచివుండండి...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "%s సంస్థాపక చిత్రాన్ని కనుగొనలేము"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\"... వెతుకుతోంది"
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "...మాధ్యమాన్ని ఇప్పుడు వెతుకుతోంది"
 
-#: ../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."
@@ -6022,7 +6022,7 @@ msgstr ""
 "ప్రధమ విభాగ డిస్క్రిప్టర్ నుండి డిస్కు చెక్సమ్ ను చదవలేదు. బహుశా దీనర్దం డిస్కు చెక్సమ్ కలుపకుండా "
 "సృష్టించబడి ఉండాలి."
 
-#: ../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 "
@@ -6032,11 +6032,11 @@ msgstr ""
 "అయ్యుండగలదు.  వీలైతే, దయచేసి డిస్కును శుభ్రపరచి మరలా తిరిగి ప్రయత్నించండి.  ఈ పరీక్ష నిరంతరంగా "
 "విఫలమైతే మీరు సంస్థాపన కొనసాగించ కూడదు."
 
-#: ../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 "
@@ -6045,7 +6045,7 @@ 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"
@@ -6056,20 +6056,20 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Checksum పరీక్ష"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "kickstart సాధన ఆదేశం %s: %sకి చెడ్డ వాదన"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "కిక్ స్టార్టు సాధన ఆదేశానికి మాడ్యూల్ నామము తప్పక తెలపాలి."
 
-#: ../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"
@@ -6077,7 +6077,7 @@ msgstr ""
 "IPv4 networkల కోసం Prefix  తప్పక 1 మరియూ 32ల మధ్య ఉండాలి లేదా IPv6 networkల కోసం 1 "
 "మరియూ 128ల మధ్య ఉండాలి"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6088,27 +6088,27 @@ msgstr ""
 "ఎన్క్రిప్షన్ కీ ను దయచేసి ప్రవేశపెట్టండి.  ఏ కీ అవసరం లేకపోయినట్లైతే, ఈ ఫీల్టు ను ఖాళీగా వదలి మరియు "
 "సంస్థాపనను కొనసాగించవచ్చు."
 
-#: ../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 మీట"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Wireless అమర్పులు"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "నామసర్వరు IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "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 "
@@ -6117,56 +6117,56 @@ msgstr ""
 "మీ IP చిరునామా అభ్యర్దన ఆకృతీకరణ సమాచారాన్ని ఇస్తుంది,అయితే నేమ్ సర్వర్ చిరునామాను మాత్రం చేర్చదు. మీరు "
 "ఈ సమాచారం కలిగిఉండకపోతే,మీరు ఈ క్షేత్రాన్ని ఖాళీగా వదిలి సంస్థాపన కొనసాగించవచ్చు."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "చెల్లని IP సమాచారం"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "మీరు చెల్లని IP చిరునామాన్ని ఇచ్చారు."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Network దోషం"
 
-#: ../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 "మీ network అంతర్ముఖాన్ని ఆకృతీకరించటంలో ఒక దోషం."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "నిర్ధారణ TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "మీరు తప్పక కనీసం ఒక ఒడంబడిక(IPv4 or IPv6)ను ఎన్నుకోవాలి."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS కోసం IPv4 అవసరం"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS సంస్థాపనా విధానానికి IPv4 మద్దతు అవసరం."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 చిరునామాలు:"
 
-#: ../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 చిరునామాలు:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "నామ 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 "
@@ -6176,43 +6176,43 @@ msgstr ""
 "డాటెడ్-క్వాడ్ నెట్మాస్కు లేదా CIDR-స్టైల్ పురస్సర్గ సరైనవి.గేట్వే మరియు నేమ్ సర్వర్ క్షేత్రాలు IPv4 లేక IPv6 "
 "చిరునామాలను తప్పక సరిచూడాలి."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "మానవీయ TCP/IP ఆకృతీకరణ"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "తప్పిపోయిన సమాచారం"
 
-#: ../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 ""
 "ఒక విలువైన IPv4 చిరునామాలూ మరియూ ఒక network mask లేదా CIDR prefix మీరు తప్పక రెంతినీ "
 "ప్రవేశపెట్టాలి."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "మీరు తప్పక సరైన IPv6 మరియూ CIDR పురస్సర్గలను ప్రవేశపెట్టాలి."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ఆతిధేయనామం మరియూ క్షేతాన్ని  నిర్ణయించు..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart network ఆదేశం %s: %sకి చెడ్డవాదన"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "చెడ్డ bootproto %s network ఆదేశంలో తెలుపబడింది"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Networking సాధనం"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6220,134 +6220,134 @@ msgstr ""
 "మీరు ఈ కంప్యూటరులో పెక్కు network సాధనాలను కలిగి ఉన్నారు. మీరు దెనిగుండా సంస్థాపన "
 "చేయాలనుకుంటున్నారు?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS server పేరు:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s సంచిక:"
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "దయచేసి మీ %s చిత్రములకు సేవికనామమును మరియు పాత్‌ను ప్రవేశపెట్టండి"
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS అమర్పు"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS ఆకృతీకరణ లేకుండా ఆతిధేయ నామం తెల్పబడింది"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "పునఃసమ్పాదన"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ఈ సంచిక server నుండీ మరల్చబడదు."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ఈ సంచిక %s సంస్థాపనా చిత్రాన్ని కలిగి ఉన్నట్లు లేదు."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart విధాన ఆదేశం %s: %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 "telnet అనుసంధానానికి ఎదురుచూస్తోంది ..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "anacondaను telnetద్వారా నడుస్తోంది..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s://%s/%s ను తిరిగిపొందలేక పోయింది."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "సంస్థాపనా చిత్రాన్ని తిరిగి తెచ్చుకోవటం కుదరదు."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url kickstart విధాన ఆదేశంక %s: %sకి చెడ్డ వాదన"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Url kickstart విధానానికి ఒక --url వాదన తప్పక సరఫరా చేయాలి."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "తెలియని 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 "మీ సేవికనందు %s చిత్రాలను కలిగివున్న URL ను దయచేసి ప్రవేశపెట్టండి."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "ప్రోక్సీని ఆకృతీకరించు"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL అమర్పు"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "మీరు తప్పక ఒక URL ను ప్రవేశపెట్టాలి."
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL తప్పక ftp లేదా http URL అయివుండాలి"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "తెలియని ఆతిధేయి"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s సరైన ఆతిధేయి పేరు కాదు."
 
-#: ../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."
 msgstr "మీరు HTTP proxy serverను ఉపయోగిస్తున్నట్లయితే ఉపయోగానికి HTTP proxy server పేరును ఇవ్వండి."
 
-#: ../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
 msgid "Further Setup"
 msgstr "ఇకపై అమర్పు"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI drivernu ఇతర loadచేస్తోంది"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Loading %s driver..."
diff --git a/po/tg.po b/po/tg.po
index 4c02fbf05..bc58aa442 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -57,86 +57,86 @@ msgstr ""
 #: ../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
+#: ../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"
 
@@ -580,41 +580,41 @@ msgstr ""
 #: ../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 "Хато"
 
@@ -665,9 +665,9 @@ msgstr ""
 #: ../rescue.py:305
 #: ../rescue.py:307
 #: ../textw/upgrade_text.py:132
-#: ../loader2/cdinstall.c:200
-#: ../loader2/cdinstall.c:203
-#: ../loader2/method.c:393
+#: ../loader/cdinstall.c:200
+#: ../loader/cdinstall.c:203
+#: ../loader/method.c:393
 msgid "Skip"
 msgstr ""
 
@@ -896,9 +896,9 @@ msgstr "Ислоҳ"
 #: ../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 "Ҳа"
 
@@ -908,22 +908,22 @@ msgstr "Ҳа"
 #: ../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 "Не"
 
 #: ../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
+#: ../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 "Кӯшиши нав"
 
@@ -942,11 +942,11 @@ msgstr "Рад кардан"
 #: ../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 "Бекор кардан"
 
@@ -1655,28 +1655,28 @@ 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 "Ақиб"
 
@@ -1684,9 +1684,9 @@ msgstr "Ақиб"
 #: ../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
+#: ../loader/cdinstall.c:117
+#: ../loader/cdinstall.c:125
+#: ../loader/driverdisk.c:440
 msgid "Continue"
 msgstr "Навбатӣ"
 
@@ -2023,7 +2023,7 @@ msgid "Skip entering %(instkey)s"
 msgstr ""
 
 #: ../text.py:564
-#: ../loader2/lang.c:63
+#: ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "Марҳамат намоед ба %s барои %s"
@@ -2788,7 +2788,7 @@ msgstr "Интихоби забонҳо"
 
 #: ../iw/language_gui.py:76
 #: ../textw/language_text.py:45
-#: ../loader2/lang.c:374
+#: ../loader/lang.c:374
 msgid "What language would you like to use during the installation process?"
 msgstr "Кадом забонро Шумо мехоҳед барои сабткунии система истифода мебаред?"
 
@@ -3143,8 +3143,8 @@ msgid "Dynamic IP"
 msgstr ""
 
 #: ../iw/netconfig_dialog.py:177
-#: ../loader2/net.c:416
-#: ../loader2/net.c:860
+#: ../loader/net.c:416
+#: ../loader/net.c:860
 #, c-format, python-format
 msgid "Sending request for IP information for %s..."
 msgstr ""
@@ -3318,7 +3318,7 @@ msgstr "Суроғаи сахтафзор: "
 
 #: ../iw/network_gui.py:778
 #: ../textw/network_text.py:228
-#: ../loader2/net.c:820
+#: ../loader/net.c:820
 msgid "Missing Protocol"
 msgstr ""
 
@@ -3331,7 +3331,7 @@ msgstr ""
 #: ../iw/network_gui.py:843
 #: ../iw/network_gui.py:849
 #: ../textw/network_text.py:74
-#: ../loader2/net.c:92
+#: ../loader/net.c:92
 msgid "Invalid Prefix"
 msgstr "Префикси нодуруст"
 
@@ -3564,7 +3564,7 @@ msgid "None"
 msgstr "Ҳеҷ чиз"
 
 #: ../iw/partition_gui.py:816
-#: ../loader2/hdinstall.c:334
+#: ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Дискҳои компютерӣ"
 
@@ -4293,13 +4293,13 @@ msgid "Activate on boot"
 msgstr ""
 
 #: ../textw/network_text.py:149
-#: ../loader2/net.c:730
+#: ../loader/net.c:730
 #: tmp/netpostconfig.glade.h:9
 msgid "Enable IPv4 support"
 msgstr "Пуштибонии IPv4 фаъол созед"
 
 #: ../textw/network_text.py:156
-#: ../loader2/net.c:743
+#: ../loader/net.c:743
 #: tmp/netpostconfig.glade.h:10
 msgid "Enable IPv6 support"
 msgstr "Пуштибонии IPv6 фаъол созед"
@@ -4423,7 +4423,7 @@ msgid "DHCPv6"
 msgstr "DHCPv6"
 
 #: ../textw/network_text.py:678
-#: ../loader2/net.c:1055
+#: ../loader/net.c:1055
 msgid "Gateway:"
 msgstr "Суроғаи хидматгоҳ:"
 
@@ -4983,45 +4983,45 @@ msgid ""
 "* You will not get software and security updates for packages not included 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 "Санҷиши медиа"
 
-#: ../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 "Санҷиш"
 
-#: ../loader2/cdinstall.c:96
-#: ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96
+#: ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Баровардани диск"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject the disc and insert another for testing."
 msgstr ""
 
-#: ../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 \"%s\". Testing each disc is not strictly required, however it is highly recommended.  Minimally, the discs should be tested prior to using them for the first time. After they have been successfully tested, it is not required to retest each disc prior to using it again."
 msgstr ""
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid "The %s disc was not found in any of your drives. Please insert the %s disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Диск ёфт шуд"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5029,452 +5029,452 @@ msgid ""
 "Choose %s to skip the media test and start the installation."
 msgstr ""
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid "No %s disc was found which matches your boot media.  Please insert the %s disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid "The %s disc was not found in any of your CDROM drives. Please insert the %s disc and press %s to retry."
 msgstr ""
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Диск ёфт нашуд"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Поркунӣ"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Озмоиши диски драйвер..."
 
-#: ../loader2/driverdisk.c:230
-#: ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230
+#: ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Манбаъи диски драйвер"
 
-#: ../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?"
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr ""
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr ""
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr ""
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Вориди диски драйвер"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Диски дигарро истифода баред"
 
-#: ../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 driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Диски драйвер"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr ""
 
-#: ../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"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid "The following invalid argument was specified for the kickstart driver disk command: %s:%s"
 msgstr ""
 
-#: ../loader2/driverselect.c:65
+#: ../loader/driverselect.c:65
 #, c-format
 msgid "Please enter any parameters which you wish to pass to the %s module separated by spaces.  If you don't know what parameters to supply, skip this screen by pressing the \"OK\" button."
 msgstr ""
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Вориди параметрҳои модул"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Ягон драйвер ёфт нашуд"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Интихоби диски драйвер"
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr ""
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr ""
 
-#: ../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 "Дастгоҳ муайян карда шуд"
 
-#: ../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 ""
 
-#: ../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 media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid "What partition and directory on that partition hold the CD (iso9660) images for %s? If you don't see the disk drive you're using listed here, press F2 to configure additional devices."
 msgstr ""
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr ""
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Интихоби қисми диск"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr ""
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Намуди клавиатура"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr ""
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr ""
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr ""
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr ""
 
-#: ../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
 msgid "Error downloading kickstart file"
 msgstr ""
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Забонро интихоб кунед"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Дискҳои маҳаллии CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Диски компютерӣ"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Феҳрасти NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Марҳамат намоед ба %s%n барои %s"
 
-#: ../loader2/loader.c:374
-#: ../loader2/loader.c:410
+#: ../loader/loader.c:374
+#: ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Навсозии манбаъи диск"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid "There are multiple partitions on this device which could contain the update disk image.  Which would you like to use?"
 msgstr ""
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Дискро аз нав месозад"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr ""
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Навсозиҳо"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr ""
 
-#: ../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
 msgid "Error downloading updates image"
 msgstr ""
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr ""
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Тарзи барқарорсозӣ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Тарзи сабткунӣ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr ""
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr ""
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Ягон драйвер ёфт нашуд"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Интихоби драйвер"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Интихоби диски драйвер"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Дастгоҳҳо"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Шуд"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Иловаи дастгоҳ"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr ""
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr ""
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Озмоиши \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Озмоиши медиа..."
 
-#: ../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."
 msgstr ""
 
-#: ../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 again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -5482,276 +5482,276 @@ msgid ""
 "   %s?"
 msgstr ""
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Санҷиши Checksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 key needed to access your wireless network.  If no key is needed, leave this field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Калиди рамзгузорӣ"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Танзимотҳои Интернетии бесимӣ"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Номи суроғаи хидматгоҳи IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr ""
 
-#: ../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 leave the field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Иттилооти IP нодуруст"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr ""
 
-#: ../loader2/net.c:589
-#: ../loader2/net.c:695
+#: ../loader/net.c:589
+#: ../loader/net.c:695
 msgid "Network Error"
 msgstr "Хатои пайвастшавии Интернет"
 
-#: ../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 ""
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Танзимоти TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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
 msgid "IPv4 address:"
 msgstr "Суроғаи IPv4:"
 
-#: ../loader2/net.c:962
-#: ../loader2/net.c:1014
+#: ../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:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Номи хидматгоҳ:"
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "Танзимоти дастӣ барои TCP/IP"
 
-#: ../loader2/net.c:1224
-#: ../loader2/net.c:1230
+#: ../loader/net.c:1224
+#: ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Иттилоот мавҷуд нест"
 
-#: ../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 ""
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr ""
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Дастгоҳи Интернетӣ"
 
-#: ../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 ""
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Номи хидматгоҳи NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Феҳрасти %s:"
 
-#: ../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"
 
-#: ../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 "Қабул мекунад"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr ""
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr ""
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Қабул кардани %s://%s/%s имконпазир нест."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr ""
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Услуби 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
 msgid "Configure proxy"
 msgstr "Танзимоти proxy"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "Танзимоти URL"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr ""
 
-#: ../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 "Алоқаи номуайян"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../loader2/urls.c:395
+#: ../loader/urls.c:395
 msgid "Proxy Name:"
 msgstr "Номи Proxy:"
 
-#: ../loader2/urls.c:400
+#: ../loader/urls.c:400
 msgid "Proxy Port:"
 msgstr "Бандари Proxy:"
 
-#: ../loader2/urls.c:416
+#: ../loader/urls.c:416
 msgid "Further Setup"
 msgstr "Танзимоти навбатӣ"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Боркунии драйвери SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Боркунии драйвери %s..."
diff --git a/po/th.po b/po/th.po
index 74ceafd66..9df757ffa 100644
--- a/po/th.po
+++ b/po/th.po
@@ -53,41 +53,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 "ตกลง"
 
@@ -562,22 +562,22 @@ msgstr "กำลังฟอร์แมตระบบไฟล์ %s ..."
 #: ../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 "เกิดข้อผิดพลาด"
 
@@ -633,8 +633,8 @@ msgstr ""
 "กด <Enter> เพื่อรีบูตระบบของคุณใหม่"
 
 #: ../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 "ข้ามไป"
 
@@ -940,21 +940,21 @@ msgstr "ซ่อม"
 
 #: ../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 "ใช่"
 
 #: ../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 "ไม่"
 
-#: ../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 "ลองใหม่"
 
@@ -965,8 +965,8 @@ msgstr "ไม่ต้องสนใจ"
 #: ../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 "ยกเลิก"
 
@@ -1807,21 +1807,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 "ย้อนกลับ"
 
 #: ../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 "ดำเนินการต่อไป"
 
@@ -2230,7 +2230,7 @@ msgstr "กรุณาป้อนชื่อของ volume group"
 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 "ยินดีต้อนรับสู่ %s"
@@ -3116,7 +3116,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "การเลือกภาษา"
 
-#: ../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 "ภาษาอะไรที่คุณต้องการใช้ในระหว่างกระบวนการการติดตั้ง?"
 
@@ -3487,7 +3487,7 @@ msgstr "จำเป็นต้องป้อนค่าในช่อง \"
 msgid "Dynamic IP"
 msgstr "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 "กำลังส่งคำร้องขอข้อมูล IP สำหรับ %s.."
@@ -3670,7 +3670,7 @@ msgstr "ไม่ทราบ"
 msgid "Hardware address: "
 msgstr "ตำแหน่งฮาร์ดแวร์:"
 
-#: ../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 "ไม่พบกลุ่ม"
@@ -3681,7 +3681,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "คุณต้องเลือกติดตั้งอย่างน้อยหนึ่งภาษา"
 
 #: ../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 "สตริงของไอพีไม่ถูกต้อง"
@@ -3916,7 +3916,7 @@ msgstr "อุปกรณ์ RAID"
 msgid "None"
 msgstr "ไม่มี"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ฮาร์ดไดรฟ์"
 
@@ -4816,12 +4816,12 @@ msgstr "สตริงของไอพีไม่ถูกต้อง"
 msgid "Activate on boot"
 msgstr "เปิดใช้เมื่อบูต"
 
-#: ../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 ""
@@ -4949,7 +4949,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 "เกตเวย์:"
 
@@ -5568,23 +5568,23 @@ 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 "ตรวจสอบแผ่นข้อมูล"
 
-#: ../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 "ทดสอบ"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "เอาแผ่นซีดีออก"
 
-#: ../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 "
@@ -5593,7 +5593,7 @@ msgstr ""
 "เลือก \"%s\" เพื่อทดสอบซีดีที่อยู่ในไดรฟ์ หรือ \"%s\" เพื่อเอาแผ่นซีดีออก "
 "และเปลี่ยนแผ่นอื่นสำหรับการทดสอบ"
 
-#: ../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 "
@@ -5603,19 +5603,19 @@ 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 "
 "and press %s to retry."
 msgstr "ไม่พบแผ่นซีดี %s ในไดรฟ์ซีดีรอมของคุณ กรุณาใส่แผ่นซีดี %s แล้วกด %s เพื่อลองใหม่อีกครั้ง"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "ตรวจพบแผ่นซีดี"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5626,148 +5626,148 @@ msgstr ""
 "\n"
 "เลือก %s ถ้าจะข้ามการตรวจสอบแผ่นข้อมูล และเริ่มเข้าสู่การติดตั้ง"
 
-#: ../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 "
 "disc and press %s to retry."
 msgstr "ไม่พบแผ่นซีดี %s ในไดรฟ์ซีดีรอมของคุณ กรุณาใส่แผ่นซีดี %s แล้วกด %s เพื่อลองใหม่อีกครั้ง"
 
-#: ../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 "
 "disc and press %s to retry."
 msgstr "ไม่พบแผ่นซีดี %s ในไดรฟ์ซีดีรอมของคุณ กรุณาใส่แผ่นซีดี %s แล้วกด %s เพื่อลองใหม่อีกครั้ง"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "ไม่พบแผ่นซีดี"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "ไม่สามารถหาไฟล์คิกสตาร์ทในซีดีรอม"
 
-#: ../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 "อ่านไดเรกทอรี %s ล้มเหลว: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "กำลังโหลด"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "กำลังอ่านแผ่นไดรเวอร์..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr ""
 
-#: ../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?"
 msgstr "คุณมีอุปกรณ์หลายตัวบนระบบนี้ คุณต้องการติดตั้งทั้งหมดหรือไม่?"
 
-#: ../loader2/driverdisk.c:263
+#: ../loader/driverdisk.c:263
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the driver "
 "disk image.  Which would you like to use?"
 msgstr "คุณมีอุปกรณ์หลายตัวบนระบบนี้ คุณต้องการติดตั้งทั้งหมดหรือไม่?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "เกิดความล้มเหลวในการเมานท์พาร์ทิชัน"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "เลือกอิมเมจของแผ่น driver"
 
-#: ../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 "การเมานท์แผ่นดิสก์ไดรเวอร์ล้มเหลว"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "ใส่แผ่นดิสก์ไดรเวอร์ใน /dev/%s แล้วกดปุ่ม \"ตกลง\" เพื่อดำเนินการต่อ"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "ใส่แผ่นไดรเวอร์"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "การเมานท์แผ่นดิสก์ไดรเวอร์ล้มเหลว"
 
-#: ../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 "เลือกด้วยตัวเอง"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "โหลดแผ่นดิสก์อื่น"
 
-#: ../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 "
 "driver disk?"
 msgstr ""
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "แผ่นไดรเวอร์"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "คุณมีแผ่นดิสก์ไดรเวอร์หรือไม่?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "มีแผ่นไดรเวอร์ อีกไหม?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "คุณต้องการที่จะโหลดแผ่นไดรเวอร์เพิ่มอีกหรือไม่?"
 
-#: ../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 ผิดพลาด"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr ""
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr ""
 
-#: ../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 "
@@ -5778,25 +5778,25 @@ msgstr ""
 "ถ้าคุณไม่ทราบว่ามีพารามีเตอร์ใดบ้างให้ใช้ ก็เพียงแต่กดปุ่ม \"ตกลง\" หรือ \"F1\" "
 "สำหรับดูรายการที่มี"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "ใส่พารามีเตอร์สำหรับโมดูล"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "ไม่พบไดรฟ์เวอร์"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "โหลดแผ่นไดรเวอร์"
 
-#: ../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 ""
 
-#: ../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."
@@ -5804,46 +5804,46 @@ msgstr ""
 "กรุณาเลือกไดรเวอร์ด้านล่าง ถ้าไดรเวอร์ที่คุณต้องการไม่ปรากฏในรายการนี้ "
 "และคุณมีแผ่นดิสก์ไดรเวอร์แผ่นอื่น ให้กดปุ่ม F2"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "กำหนดพารามีเตอร์สำหรับโมดูล "
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "เลือกไดรฟ์เวอร์อุปกรณ์ที่จะใช้ในการโหลด"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
 "media."
 msgstr ""
 
-#: ../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."
 msgstr ""
 "เกิดข้อผิดพลาดขณะอ่านตัวติดตั้งจากไฟล์ ISO กรุณาตรวจสอบไฟล์ ISO ของคุณ แล้วลองใหม่อีกครั้ง"
 
-#: ../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?"
 msgstr "ดูเหมือนจะไม่มีฮาร์ดไดรฟ์บนระบบของคุณ! คุณต้องการจะกำหนดค่าอุปกรณ์เพิ่มเติมอีกหรือไม่?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5853,251 +5853,251 @@ msgstr ""
 "อิมเมจซีดี (iso9660) สำหรับ %s ถูกเก็บที่พาร์ทิชัน และไดเรกทอรีใด? "
 "ถ้าคุณไม่เห็นดิสก์ไดรฟ์ที่คุณใช้อยู่ในรายการนี้ ให้กด F2 เพื่อปรับแต่งอุปกรณ์เพิ่มเติม"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ไดเรกทอรีที่เก็บอิมเมจ:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "เลือกพาร์ทิชัน"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "อุปกรณ์ %s ไม่มีอิมเมจของซีดี %s อยู่"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr ""
 
-#: ../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 "ไม่สามารถหาไฟล์คิกสตาร์ทบนฮาร์ดไดรฟ์"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "ไม่พบฮาร์ดไดรฟ์สำหรับ BISO disk %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "ประเภทของแป้นพิมพ์"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "คุณมีแป้นพิมพ์ประเภทใด?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "เกิดข้อผิดพลาดในการเปิดไฟล์คิกสตาร์ท %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "เกิดข้อพิดพลาดในการอ่านเนื้อหาของไฟล์คิกสตาร์ท %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "เกิดข้อผิดพลาดใน %s ในบรรทัดที่ %d ของไฟล์คิกสตาร์ท %s "
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "บนแผ่นบูตไม่มีไฟล์ ks.cfg"
 
-#: ../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 "เกิดข้อผิดพลาดในการเปิดไฟล์คิกสตาร์ท %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "ยินดีต้อนรับสู่ %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> ระหว่าง elements  | <Space> เลือก | <F12> หน้าถัดไป "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "เลือกภาษา"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "ซีดีรอมในเครื่อง"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ฮาร์ดไดรฟ์"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s ไดเรกทอรี:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "ยินดีต้อนรับสู่ %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "อัพเดทแผ่นดิสก์ต้นฉบับ"
 
-#: ../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?"
 msgstr "คุณมีอุปกรณ์หลายตัวบนระบบนี้ คุณต้องการติดตั้งทั้งหมดหรือไม่?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr "คุณมีอุปกรณ์หลายตัวบนระบบนี้ คุณต้องการติดตั้งทั้งหมดหรือไม่?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "ใส่แผ่นดิสก์อัพเดทใน /dev/%s และกด \"ตกลง\" เพื่อดำเนินการต่อไป"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "อัพเดทแผ่นดิสก์"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "การเมานท์แผ่นดิสก์อัพเดทล้มเหลว"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "อัพเดท"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "กำลังอ่านอนาคอนดาอัพเดต"
 
-#: ../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 "เกิดข้อผิดพลาดในการเปิดไฟล์คิกสตาร์ท %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 "คุณไม่มีแรมมากพอที่จะติดตั้ง %s บนเครื่องนี้"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "วิธีการกู้ระบบ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "วิธีการติดตั้ง"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "อิมเมจสำหรับกู้ระบบถูกเก็บในสื่อประเภทใด?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "แพ็กเกจที่จะติดตั้งถูกเก็บในสื่อประเภทใด?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "ไม่พบไดรฟ์เวอร์"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "เลือกไดรฟ์เวอร์"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ใช้แผ่นไดรเวอร์"
 
-#: ../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?"
 msgstr ""
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "พบอุปกรณ์ต่อไปนี้ในระบบของคุณ"
 
-#: ../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 "ไม่มีไดรเวอร์อุปกรณ์สำหรับโหลดใช้กับระบบของคุณ คุณต้องการจะโหลดตอนนี้หรือไม่?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "อุปกรณ์"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "เสร็จ"
 
-#: ../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 "กำลังรันโปรแกรมอนาคอนดา ตัวติดตั้งระบบ %s - กรุณารอสักครู่...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "ไม่สามารถเรียกอิมเมจ %s สำหรับติดตั้งมาได้"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "กำลังตรวจสอบ \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "กำลังตรวจสอบแผ่นข้อมูล ..."
 
-#: ../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."
@@ -6105,25 +6105,25 @@ msgstr ""
 "ไม่สามารถอ่านค่า checksum ของซีดีจากตัวบ่งชี้ในแผ่นข้อมูลหลัก "
 "อาจจะเกิดจากแผ่นติดตั้งสร้างขึ้นโดยไม่ได้ทำการใส่ 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 "
 "again.  If this test continues to fail you should not continue the install."
 msgstr ""
 
-#: ../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"
@@ -6134,26 +6134,26 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "การตรวจสอบ Checksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 
-#: ../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 "
@@ -6161,28 +6161,28 @@ msgid ""
 "field blank and the install will continue."
 msgstr ""
 
-#: ../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 "IP ของ nameserver"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Nameserver"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6193,244 +6193,244 @@ msgstr ""
 "ถ้าคุณทราบว่า nameserver ของคุณคืออะไร กรุณาป้อนค่า ถ้าคุณไม่ทราบข้อมูลนี้จริงๆ "
 "คุณสามารถละฟิลด์นี้ให้ว่างไว้ โดยที่การติดตั้งยังคงดำเนินต่อไปได้"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "ข้อมูลเกี่ยวกับ IP ไม่ถูกต้อง"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "คุณป้อนหมายเลข IP ไม่ถูกต้อง"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: ../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 "มีข้อผิดพลาดเกิดขึ้นตอนกำลังเตรียมไดรฟ์เป้าหมาย  การสำเนาล้มเหลว"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "กำหนดค่า TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "คุณต้องเลือกติดตั้งอย่างน้อยหนึ่งภาษา"
 
-#: ../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 "หมายเลข 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 "หมายเลข IP:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Nameserver"
 
-#: ../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 "การกำหนดค่า z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "ข้อมูลไม่ถูกต้อง"
 
-#: ../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 "คุณต้องป้อนค่าที่เป็นไปได้ทั้งหมายเลข IP และเน็ตมาสก์"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "คุณต้องป้อนค่าที่เป็นไปได้ทั้งหมายเลข IP และเน็ตมาสก์"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "กำลังค้นหาชื่อโฮสต์และชื่อโดเมน..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr ""
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr ""
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "อุปกรณ์เครือข่าย"
 
-#: ../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 "คุณมีอุปกรณ์เครือข่ายหลายตัวบนระบบนี้ คุณต้องการติดตั้งทั้งหมดหรือไม่?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "ชื่อเซิร์ฟเวอร์ NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s ไดเรกทอรี:"
 
-#: ../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"
 
-#: ../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 "กำลังเรียกคืน"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ไม่สามารถเมานท์ไดเรกทอรีจากเซิร์ฟเวอร์ได้"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "ไดเรกทอรีนั้นดูเหมือนจะไม่มีชุดติดตั้ง %s"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr ""
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "เทลเน็ต"
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "กำลังรอการเชื่อมต่อเทลเน็ต..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "กำลังรันโปรแกรมอนาคอนดาผ่านเทลเน็ต..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "ไม่สามารถเรียกคืน  %s://%s/%s/%s"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "ไม่สามารถเรียกอิมเมจสำหรับติดตั้งคืนมาได้"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "วิธี kickstart แบบ url มีอาร์กิวเมนต์ที่ไม่ถูกต้องสำหรับคำสั่ง %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "ต้องใส่อาร์กิวเมนต์ --url เพื่อใช้วิธี kickstart แบบ url"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "ไม่รู้จัก 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 "กำหนดค่า TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "การตั้งค่า NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "คุณต้องป้อนไดเรกทอรี"
 
-#: ../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 "ไม่รู้จักโฮสต์นี้"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "ชื่อ %s ใช้เป็นชื่อโฮสต์ไม่ได้"
 
-#: ../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."
 msgstr "ถ้าคุณใช้พรอกซีเซิร์ฟเวอร์สำหรับ HTTP ให้ป้อนชื่อเซิร์ฟเวอร์"
 
-#: ../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 "ติดตั้งผ่าน FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "กำลังโหลดไดรเวอร์ SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "กำลังโหลดไดรเวอร์ %s..."
diff --git a/po/tr.po b/po/tr.po
index ac06dac6b..6204abd29 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -57,41 +57,41 @@ msgstr "Kabuk için <enter>'a basınız."
 #: ../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 "Tamam"
 
@@ -587,22 +587,22 @@ msgstr "%s üzerine dosya sistemi bağlanırken hata: %s"
 #: ../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 "Hata"
 
@@ -659,8 +659,8 @@ msgstr ""
 "Sistem <Enter> tuşuna bastığınızda yeniden başlatılacaktır."
 
 #: ../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 "Atla"
 
@@ -998,21 +998,21 @@ msgstr "Düzelt"
 
 #: ../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 "Evet"
 
 #: ../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 "Hayır"
 
-#: ../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 "Tekrar dene"
 
@@ -1023,8 +1023,8 @@ msgstr "Yoksay"
 #: ../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 "İptal"
 
@@ -1889,21 +1889,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 "Geri"
 
 #: ../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 "Devam Et"
 
@@ -2328,7 +2328,7 @@ msgstr "Lütfen bir oylum grubu ismi girin."
 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 "%s'a Hoş Geldiniz"
@@ -3217,7 +3217,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Dil Seçimi"
 
-#: ../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 "Kurulum sırasında hangi dili kullanmak istiyorsunuz?"
 
@@ -3597,7 +3597,7 @@ msgstr "\"%s\" alanı için bir değer gereklidir."
 msgid "Dynamic IP"
 msgstr "Dinamik 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 "%s IP bilgisi için istek gönderiliyor..."
@@ -3776,7 +3776,7 @@ msgstr "Bilinmiyor"
 msgid "Hardware address: "
 msgstr "Donanım adresi: %s"
 
-#: ../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 "Eksik Protokol"
 
@@ -3786,7 +3786,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "DHCP için en azından bir protokol (IPv4 veya IPv6) seçmelisiniz."
 
 #: ../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 "Geçersiz Öntakı"
 
@@ -4022,7 +4022,7 @@ msgstr "RAID Aygıtları"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Sabit Diskler"
 
@@ -4943,12 +4943,12 @@ msgstr "IPv6/Öntakı"
 msgid "Activate on boot"
 msgstr "Açılışta etkinleştir"
 
-#: ../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 "IPv4 desteğini etkinleştir"
 
-#: ../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 "IPv6 desteğini etkinleştir"
@@ -5077,7 +5077,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 "Ağ geçidi:"
 
@@ -5707,23 +5707,23 @@ 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 "Ortam Sınaması"
 
-#: ../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 "CD'yi çıkart"
 
-#: ../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 "
@@ -5732,7 +5732,7 @@ msgstr ""
 "Sürücüdeki CD'nin test edilmesi için \"%s\", çıkartıp başka birini "
 "yerleştirmek için ise \"%s\" seçiniz. "
 
-#: ../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 "
@@ -5746,7 +5746,7 @@ msgstr ""
 "azından ilk kullanımda CD'lerin test edilmesi tavsiye edilir. Bir defa test "
 "edilmesinden sonra tekrar test edilmesine gerek yoktur."
 
-#: ../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 "
@@ -5755,12 +5755,12 @@ msgstr ""
 "CD sürücülerinizde %s CD'si bulunamadı. Lütfen %s CD'sini sürücüye "
 "yerleştirin ve tekrar %s tuşuna basın."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "CD Bulundu"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5771,7 +5771,7 @@ msgstr ""
 "\n"
 "CD kontrolünü atlayıp doğrudan kuruluma başlamak için %s tuşlayınız."
 
-#: ../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 "
@@ -5780,7 +5780,7 @@ msgstr ""
 "Önyükleme için %s CD'si bulunamadı. Lütfen %s CD'sini sürücüye yerleştirin "
 "ve tekrar %s tuşuna basın."
 
-#: ../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 "
@@ -5789,33 +5789,33 @@ msgstr ""
 "CD sürücülerinizde %s CD'si bulunamadı. Lütfen %s CD'sini sürücüye "
 "yerleştirin ve tekrar %s tuşuna basın."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "CD Bulunamadı"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "CD üzerinde kickstart dosyası bulunamadı."
 
-#: ../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 "%s dizini okunamadı: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Yükleniyor"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Sürücü diski okunuyor..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Sürücü Diski"
 
-#: ../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?"
@@ -5823,7 +5823,7 @@ msgstr ""
 "Bir sürücü diski için kaynak olabilecek çok sayıda aygıtınız var. Hangisini "
 "kullanmak istiyorsunuz?"
 
-#: ../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?"
@@ -5831,49 +5831,49 @@ msgstr ""
 "Bu aygıt üzerinde sürücü diski imgesini içerebilecek çok sayıda bölüm var. "
 "Hangisini kullanmak istersiniz?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Bölüm bağlanamadı."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Sürücü disk imgesini seçin"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Disk sürücüsü imgesi olan dosyayı seçin."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 msgid "Failed to load driver disk from file."
 msgstr "Sürücü disk dosyadan yüklenemedi."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Sürücü diskini /dev/%s aygıtına takıp \"Tamam\" düğmesine tıklayın."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Sürücü Diskini Yerleştirin"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Sürücü disketi bağlanamadı."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Sürücü diski %s sürümü için geçersizdir."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Elle seç"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Diğer diski yükle"
 
-#: ../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 "
@@ -5883,45 +5883,45 @@ msgstr ""
 "başka bir sürücü diski yüklemek isteyebilir ya da bir sürücü yüklemeden "
 "devam edebilirsiniz."
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Sürücü diski"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Bir sürücü disketiniz var mı?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Başka Sürücü Diski?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Yüklemek istediğiniz başka sürücü diskiniz var mı?"
 
-#: ../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 Hatası"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Bilinmeyen sürücü diskli kickstart kaynağı: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "Kickstart sürücü disk komutu için hatalı argüman: %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 "
@@ -5932,19 +5932,19 @@ msgstr ""
 "Hangi parametreleri vereceğinizi bilmiyorsanız \"Tamam\" düğmesine basarak "
 "bu adımı geçebilirsiniz. "
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Modül Parametrelerini Girin"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Hiç sürücü bulunamadı"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Sürücü diskini yükle"
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5952,7 +5952,7 @@ msgstr ""
 "Yerleştireceğiniz bir sürücü bulunamadı. Bir sürücü diski kullanmak "
 "istermisiniz?"
 
-#: ../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."
@@ -5961,26 +5961,26 @@ msgstr ""
 "bulunmayan bir sürücüye ihtiyacınız varsa, ve elinizde ayrı bir sürücü "
 "disketi bulunuyorsa, lütfen F2 tuşuna basın."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "İstemlik modül parametrelerini belirtin"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Yüklenecek Aygıt Sürücüsünü Seçin"
 
-#: ../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 "Ortam saptandı"
 
-#: ../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 "Yerel kurulum ortamı saptandı..."
 
-#: ../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 "
@@ -5988,7 +5988,7 @@ msgid ""
 msgstr ""
 "Bu dizindeki %s kurulum ağacı sizin önyükleme ortamınıza uygun görünmüyor."
 
-#: ../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."
@@ -5996,7 +5996,7 @@ msgstr ""
 "ISO kayıtlarından kurulum okunurken bir hata oluştu. ISO kayıtlarını kontrol "
 "ettikten sonra tekrar deneyiniz."
 
-#: ../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?"
@@ -6004,7 +6004,7 @@ msgstr ""
 "Tanımlı hiç sabit diskiniz bulunmuyor. Ek aygıt ayarları yapmak ister "
 "misiniz?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -6015,116 +6015,116 @@ msgstr ""
 "Eğer kullandığınız diski bu listede göremiyorsanız, F2 tuşuna basıp ek aygıt "
 "yapılandırabilirsiniz."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "İmgelerin bulunduğu dizin:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Bölümü seçin"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "%s aygıtı %s CDROM imgelerini içeriyor gibi görünmüyor."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Sabit diskli kickstart yönteminin komutu %s için hatalı argüman: %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 "Sabit disk üzerinde kickstart dosyası bulunamıyor."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "BIOS disk için sabit disk bulunamadı: %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Klavye Türü"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Klavyenizin türü nedir?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "%s kickstart dosyası açılırken hata: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "%s kickstart dosyasının içeriği okunurken hata: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%3$s dosyasının %2$d. satırındaki %1$s hatalı"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Açılış disketinde ks.cfg dosyası bulunamadı."
 
-#: ../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 "%s kickstart dosyası açılırken hata: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "kickstart yönteminin kapatılması için hatalı argüman %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "%s Kurtarma Moduna Hoş Geldiniz"
 
-#: ../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 ""
 "  Gezinmek için <Tab>/<Alt-Tab>  |  <Boşluk> seçer  |  <F12> sonraki ekran"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Bir Dil Seçin"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "Yerel CD sürücü"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Sabit Disk"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "NFS dizini:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "%s'a Hoş Geldiniz"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Güncelleme Diski"
 
-#: ../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?"
@@ -6132,7 +6132,7 @@ msgstr ""
 "Bir güncelleme diski olabilecek çok sayıda aygıt bulunuyor. Hangisini "
 "kullanmak istiyorsunuz?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6141,73 +6141,73 @@ msgstr ""
 "Bu aygıt üzerinde sürücü diski imgesini içerebilecek çok sayıda bölüm var. "
 "Hangisini kullanmak istersiniz?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Güncelleme diskini /dev/%s aygıtına takıp \"Tamam\" düğmesine tıklayın."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Güncelleme Diski"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Güncelleme diski bağlanamadı."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Güncellemeler"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Anaconda güncellemeleri okunuyor..."
 
-#: ../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 "%s kickstart dosyası açılırken hata: %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 "Bu makinada %s kurulumu için yeterli bellek yok."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Kurtarma Yöntemi"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Kurulum Yöntemi"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Kurtarma imgesini içeren ortamın türü nedir?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Kurulacak paketleri içeren ortamın türü nedir?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Hiç sürücü bulunamadı"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Sürücüyü seçin"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Bir sürücü diski kullanılsın"
 
-#: ../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?"
@@ -6215,61 +6215,61 @@ msgstr ""
 "Bu kurulum türünün gerektirdiği bir aygıt bulunamıyor. Sürücüyü kendiniz "
 "seçmek ya da bir sürücü diski kullanmak ister misiniz?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Sisteminizde aşağıdaki aygıtlar bulundu."
 
-#: ../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 ""
 "Sistemde yüklü bir aygıt sürücüsü yok. Bunları şimdi yüklemek ister misiniz?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Aygıtlar"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Yapıldı"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Aygıt Ekle"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "yükleyici zaten çalıştırıldı. Kabuk başlatılıyor.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Anaconda çalıştırılıyor, %s kurtarma kipi - lütfen bekleyiniz...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "%s sistem kurulum programı, anaconda çalıştırılıyor - lütfen bekleyiniz...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Kurulum kaydı %s bulunamıyor"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "\"%s\" sınanıyor..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Ortam şimdi sınanıyor..."
 
-#: ../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."
@@ -6278,7 +6278,7 @@ msgstr ""
 "oluşturulurken sağlama toplamının diske kaydedilmemiş olmasından "
 "kaynaklanabilir."
 
-#: ../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 "
@@ -6288,18 +6288,18 @@ msgstr ""
 "kaynaklanıyorolabilir. Eğer uygunsa diski temizleyip tekrar deneyiniz. Eğer "
 "test tekrar başarısız olursakuruluma devam etmemelisiniz."
 
-#: ../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"
@@ -6310,21 +6310,21 @@ msgstr ""
 "\n"
 "   %s"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Sağlama Testi"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Aygıtlı kickstart yönteminin komutu %s için hatalı argüman: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Kickstart sürücü disk komutu için hatalı argüman: %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"
@@ -6332,7 +6332,7 @@ msgstr ""
 "Öntakı değerleri IPv4 ağlar için 1 ile 32 arasında veya IPv6 ağlar için 1 "
 "ile 128 arasında olmalıdır"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6343,28 +6343,28 @@ msgstr ""
 "ESSID ve şifreleme anahtarını girin. Eğer şifre gerekmiyorsa, bu alanı boş "
 "bırakın, kurulum devam edecektir."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Şifreleme Anahtarı"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Kablosuz Ayarlar"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Alan adı sunucu IP'si"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Alan adı sunucu"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6375,103 +6375,103 @@ msgstr ""
 "bilgi içinde DNS sunucusu yok. Eğer DNS sunucusunu biliyorsanız, lütfen "
 "girin. Eğer bilmiyorsanız boş bırakabilir ve kuruluma devam edebilirsiniz."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Geçersiz IP Bilgisi"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Geçersiz bir IP adresi girdiniz."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
-#: ../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 "Ağ bağdaştıcınız yapılandırılırken bir hata oluştu."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "TCP/IP Yapılandırması"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "DHCP için en azından bir protokol (IPv4 veya IPv6) seçmelisiniz."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS için IPv4 Gerekmektedir"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS kurulum yöntemi IPv4 desteği gerektirmektedir."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 adresi:"
 
-#: ../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 adresi:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Alan Adı Sunucusu:"
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "Ele TCP/IP Yapılandırması"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Eksik Bilgi"
 
-#: ../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 ""
 "Devam etmek için geçerli bir IPv4 adresi ve ağ maskesi veya CIDR öntakısı "
 "girmelisiniz."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr ""
 "Devam etmek için geçerli bir IPv6 adresi ve bir CIDR öntakısı girmelisiniz."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Konak ismi ve alan adı belirleniyor..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart ağ komutu %s için hatalı argüman: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "ağ komutunda hatalı bootproto %s belirtilmiş"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Ağ Aygıtı"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6479,139 +6479,139 @@ msgstr ""
 "Sistemde birden fazla ağ aygıtı bulunuyor. Hangisi üzerinden kurulum yapmak "
 "istiyorsunuz?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS sunucu adı:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s dizini:"
 
-#: ../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 Ayarları"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "DNS yapılandırması yapılnadan makina adı belirtildi"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Bu dizin sunucudan bağlanamadı."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Bu dizin %s kurulum ağacını içeriyor gibi görünmüyor."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS'li kickstart yönteminin komutu %s için hatalı argüman: %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 "Telnet bağlantısı için bekleniyor..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Anaconda telnet üzerinden çalıştırılıyor..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "%s alınamadı: //%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Kurulum imgesi alınamıyor"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "URL'li kickstart yönteminin komutu %s için hatalı argüman : %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr ""
 "URL'li kickstart yöntemi için bir --url seçeneğine bir argüman vermelisiniz."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "URL yöntemi %s bilinmiyor"
 
-#: ../loader2/urls.c:282
+#: ../loader/urls.c:282
 #, fuzzy, c-format
 msgid "Please enter the URL containing the %s images on your server."
 msgstr "%s sürümünüz için kayıt anahtarını giriniz."
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 #, fuzzy
 msgid "Configure proxy"
 msgstr "%s Yapılandırması"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS Ayarları"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Bir dizin adı girmelisiniz"
 
-#: ../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 "Bilinmeyen Konak"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s tanımlı bir konak ismi değil."
 
-#: ../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."
 msgstr "Eğer bir HTTP vekil sunucu kullanılacaksa bu sunucunun adını belirtin."
 
-#: ../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 "Gelişmiş FTP Ayarları"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSI sürücüsü yükleniyor"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "%s sürücüsü yükleniyor..."
diff --git a/po/uk.po b/po/uk.po
index 2adb9cf73..dded079cb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -45,41 +45,41 @@ msgstr "Натисніть <enter> для переходу у командну �
 #: ../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 "Гаразд"
 
@@ -576,22 +576,22 @@ msgstr "Форматування файлової системи %s..."
 #: ../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 "Помилка"
 
@@ -647,8 +647,8 @@ msgstr ""
 "Натисніть <Enter> для перезавантаження системи."
 
 #: ../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 "Пропустити"
 
@@ -981,21 +981,21 @@ msgstr "Виправити"
 
 #: ../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 "Так"
 
 #: ../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 "Ні"
 
-#: ../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 "Повторити"
 
@@ -1006,8 +1006,8 @@ msgstr "Ігнорувати"
 #: ../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 "Скасувати"
 
@@ -1868,21 +1868,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 "Назад"
 
 #: ../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 "Продовжити"
 
@@ -2316,7 +2316,7 @@ msgstr "Введіть свій %(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "Пропустити введення %(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 "Ласкаво просимо до %s"
@@ -3196,7 +3196,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Вибір мови"
 
-#: ../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 "Яку мову ви хотіли б використовувати під час встановлення?"
 
@@ -3570,7 +3570,7 @@ msgstr "Необхідно вказати значення поля %s."
 msgid "Dynamic IP"
 msgstr "Динамічний 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 "Надсилається запит конфігурації IP для %s..."
@@ -3741,7 +3741,7 @@ msgstr "Невідомий"
 msgid "Hardware address: "
 msgstr "Апаратна адреса: "
 
-#: ../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 "Відсутній протокол"
 
@@ -3750,7 +3750,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Необхідно вибрати принаймні один протокол (IPv4 чи IPv6)."
 
 #: ../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 "Некоректний префікс"
 
@@ -3984,7 +3984,7 @@ msgstr "Пристрої RAID"
 msgid "None"
 msgstr "Немає"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Жорсткі диски"
 
@@ -4889,12 +4889,12 @@ msgstr "Префікс"
 msgid "Activate on boot"
 msgstr "Активізувати при завантаженні"
 
-#: ../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 "Включити підтримку IPv4"
 
-#: ../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 "Включити підтримку IPv6"
@@ -5014,7 +5014,7 @@ msgstr "Авто 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 "Шлюз:"
 
@@ -5634,22 +5634,22 @@ msgstr ""
 "сертифікованим.\n"
 "* Ви не отримаєте оновлень пакетів, не включених у вашу передплату."
 
-#: ../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 "Перевірка носія"
 
-#: ../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 "Перевірити"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "Витягти диск"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5658,7 +5658,7 @@ msgstr ""
 "Натисніть  \"%s\" для перевірки диску в пристрої, або \"%s\", щоб витягти "
 "диск та вставити інший диск для перевірки."
 
-#: ../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 "
@@ -5673,7 +5673,7 @@ msgstr ""
 "використанням. Після успішного тестування, не треба тестувати диск перед "
 "кожним використанням."
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
@@ -5682,11 +5682,11 @@ msgstr ""
 "Диск %s не знайдено у пристроях. Вставте диск %s та натисніть %s для "
 "продовження."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "Знайдено диск"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5697,7 +5697,7 @@ msgstr ""
 "\n"
 "Натисніть %s, щоб пропустити перевірку носія та запустити встановлення."
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
@@ -5706,7 +5706,7 @@ msgstr ""
 "Диск %s не знайдено у пристроях. Вставте диск %s та натисніть %s, щоб "
 "спробувати ще раз."
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5715,32 +5715,32 @@ msgstr ""
 "Диск %s не знайдено у пристроях. Вставте диск %s та натисніть %s для "
 "продовження."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "Диск не знайдено"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Не вдається знайти kickstart файл на 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 "Не вдається прочитати каталог %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Завантаження"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Зчитується диск драйверів..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Джерело диску драйверів"
 
-#: ../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?"
@@ -5748,7 +5748,7 @@ msgstr ""
 "В вашій системі є декілька пристроїв, в які може бути вставлений диск "
 "драйверів. Який пристрій використовувати?"
 
-#: ../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?"
@@ -5756,50 +5756,50 @@ msgstr ""
 "На цьому пристрої є декілька розділів, які можуть містити диск драйверів. "
 "Який розділ використовувати?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "Помилка підключення розділу."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "Виберіть образ диску драйверів"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "Помилка завантаження диску драйверів з файлу."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Вставте диск драйверів у /dev/%s та натисніть \"Гаразд\" для продовження."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Вставте диск драйверів"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Помилка підключення диску драйверів."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Диск з драйверам є некоректним для цього випуску %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Вибрати вручну"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Завантажити інший диск"
 
-#: ../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 "
@@ -5809,38 +5809,38 @@ msgstr ""
 "драйвер вручну, продовжити у будь-якому разі чи завантажити інший диск "
 "драйверів?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Диск драйверів"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "У вас є диск з драйвером?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Додаткові диски"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Завантажити додаткові диски драйверів?"
 
-#: ../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"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Невідоме джерело драйвера диска kickstart: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5848,7 +5848,7 @@ msgid ""
 msgstr ""
 "Вказано неправильний аргумент для команди драйвера диску kickstart: %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 "
@@ -5860,26 +5860,26 @@ msgstr ""
 "екран, натиснувши клавішу \"Гаразд\". Перелік доступних параметрів можна "
 "отримати натиснувши на клавішу F1."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Введіть параметри модуля"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Драйвери не знайдено"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Завантаження диску драйверів"
 
-#: ../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 ""
 "Драйвери для завантаження вручну не знайдено. Використовувати диск драйверів?"
 
-#: ../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."
@@ -5887,26 +5887,26 @@ msgstr ""
 "Виберіть з переліку драйвер, який потрібно завантажити. Якщо драйвер "
 "відсутній у переліку та у вас є диск драйверів, натисніть F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Вказати додаткові параметри модулів"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Виберіть драйвер пристрою"
 
-#: ../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 "Знайдено носій"
 
-#: ../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 "Знайдено локальний носій встановлення..."
 
-#: ../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 "
@@ -5915,7 +5915,7 @@ msgstr ""
 "Дерево встановлення %s у цьому каталозі не відповідає вашому "
 "завантажувальному диску."
 
-#: ../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."
@@ -5923,7 +5923,7 @@ msgstr ""
 "Помилка читання програми встановлення з образів ISO. Перевірте ваші образи "
 "ISO та спробуйте ще раз."
 
-#: ../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?"
@@ -5931,7 +5931,7 @@ msgstr ""
 "У вашій системі не виявлено жодного жорсткого диску! Бажаєте  настроїти "
 "додаткові пристрої?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5942,62 +5942,62 @@ msgstr ""
 "для %s. Якщо необхідний диск відсутній у списку, натисніть F2 для "
 "налаштовування додаткових пристроїв."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Каталог, що містить образи:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Вибір розділу"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Пристрій %s не містить образи %s CDROM."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Неприпустимий аргумент команди kickstart HD-методу %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 "Не вдається знайти файл на жорсткому диску."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Не вдається знайти жорсткий диск відповідний BIOS диску %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Тип клавіатури"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Вкажіть тип клавіатури"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Помилка відкривання файлу: %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Помилка читання вмісту kickstart файлу %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Помилка в %s в рядку %d файлу kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Не вдається знайти ks.cfg на завантажувальній дискеті."
 
-#: ../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."
@@ -6005,52 +6005,52 @@ msgstr ""
 "Неможливо завантажити файл kickstart. Змініть параметр kickstart чи "
 "натисніть Скасувати для продовження в інтерактивному режимі."
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "Помилка відкривання файлу kickstart"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Неприпустимий аргумент команди kickstart для вимкнення %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Ласкаво просимо до %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> між елементами | <Пробіл> вибір | <F12> наступний екран "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Виберіть мову"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "Локальний CD/DVD"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Жорсткий диск"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "Каталог NFS"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Ласкаво просимо до %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Диск з оновленням"
 
-#: ../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?"
@@ -6058,7 +6058,7 @@ msgstr ""
 "В вашій системі є декілька пристроїв, кожен з яких може служити джерелом "
 "диску оновлень. Який пристрій використовувати?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6067,29 +6067,29 @@ msgstr ""
 "На цьому пристрої є декілька розділів, які можуть містити диск драйверів. "
 "Який розділ використовувати?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 "Вставте диск оновлень у /dev/%s та натисніть \"Гаразд\" для продовження."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Диск з оновленнями"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Помилка підключення диску оновлень"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Оновлення"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Зчитування оновлень anaconda..."
 
-#: ../loader2/loader.c:485
+#: ../loader/loader.c:485
 #, fuzzy
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
@@ -6098,45 +6098,45 @@ msgstr ""
 "Неможливо завантажити файл kickstart. Змініть параметр kickstart чи "
 "натисніть Скасувати для продовження в інтерактивному режимі."
 
-#: ../loader2/loader.c:494
+#: ../loader/loader.c:494
 #, fuzzy
 msgid "Error downloading updates image"
 msgstr "Помилка відкривання файлу kickstart"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "Недостатньо оперативної пам'яті для встановлення %s на цій машині."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Метод відновлення"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Метод встановлення"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Який носій містить образ відновлення?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Носій якого типу містить пакети для встановлення?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Драйвер не знайдено"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Виберіть драйвер"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Використовувати диск драйверів"
 
-#: ../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?"
@@ -6144,11 +6144,11 @@ msgstr ""
 "Не вдається знайти жоден пристрій, необхідний для цього типу встановлення.  "
 "Бажаєте вибрати драйвер вручну чи використати диск драйверів?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "У вашій системі виявлено наступні пристрої."
 
-#: ../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?"
@@ -6156,51 +6156,51 @@ msgstr ""
 "Не було завантажено жодного драйвера пристроїв. Бажаєте зараз завантажити "
 "якийсь драйвер?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Пристрої"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Готово"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Додати пристрій"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "Завантажувач вже виконується. Запускається оболонка.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 "Запускається anaconda, режим відновлення %s - зачекайте, будь ласка...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr ""
 "Запускається anaconda, програма встановлення %s - зачекайте, будь ласка...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Не вдається знайти образ встановлення %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Перевіряється \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Перевіряється носій..."
 
-#: ../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."
@@ -6208,7 +6208,7 @@ msgstr ""
 "Не вдається прочитати контрольну суму диска з первинного дескриптора тому.  "
 "Швидше за все це означає, що диск створений без додавання контрольної суми."
 
-#: ../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 "
@@ -6219,18 +6219,18 @@ msgstr ""
 "спробуйте ще раз. Якщо помилка повторюється, встановлення не слід "
 "продовжувати."
 
-#: ../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"
@@ -6241,21 +6241,21 @@ msgstr ""
 "\n"
 "   %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Перевірка контрольної суми"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Неправильний аргумент для команди kickstart-методу встановлення %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Команді kickstart потрібно передати тип модуля та його назву."
 
-#: ../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"
@@ -6263,7 +6263,7 @@ msgstr ""
 "Значення префіксу має бути у межах від 1 до 32 для мереж IPv4 чи від 1 до "
 "128 для мереж IPv6"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6274,27 +6274,27 @@ msgstr ""
 "потрібні для доступу до бездротової мережі. Якщо ключ не використовується, "
 "залиште це поле порожнім та продовжуйте встановлення."
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "Ключ шифрування"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "Параметри бездротового зв'язку"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "IP DNS сервера"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "Не вказано сервер DNS"
 
-#: ../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 "
@@ -6305,56 +6305,56 @@ msgstr ""
 "її зараз. Якщо такої інформації немає, можете залишити це поле порожнім, і "
 "встановлення продовжиться."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Неприпустима інформація про IP"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Ви ввели неприпустиму IP-адресу."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "Помилка мережі"
 
-#: ../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 "Помилка при налаштовуванні мережного інтерфейсу."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Налаштовування TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Необхідно вибрати принаймні один протокол (IPv4 чи IPv6)."
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "Для NFS вимагається IPv4 "
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "Метод встановлення NFS вимагає увімкнення підтримки IPv4."
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "Адреса IPv4:"
 
-#: ../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:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "Сервер назв:"
 
-#: ../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 "
@@ -6365,42 +6365,42 @@ msgstr ""
 "стилі CIDR. Поля для шлюзу та сервера імен повинні містити коректні адреси "
 "IPv4 та IPv6."
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "Ручне налаштовування TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Недостатньо інформації"
 
-#: ../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 "Необхідно ввести правильну IP-адресу та маску мережі або префікс CIDR."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Необхідно ввести правильну адресу IPv6 та префікс CIDR."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Визначення назви комп'ютера та домену..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Неприпустимий аргумент мережної команди kickstart %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "В мережній команді неправильно вказано bootproto %s"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Пристрій мережі"
 
-#: ../loader2/net.c:1860
+#: ../loader/net.c:1860
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
@@ -6408,115 +6408,115 @@ msgstr ""
 "В цій системі є декілька мережних адаптерів. Який з них повинен "
 "використовуватись для встановлення?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Назва сервера NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "Каталог %s:"
 
-#: ../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"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Вказано назву вузла без налаштовування DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Цей каталог не може бути підключений з сервера."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Цей каталог не містить дерево встановлення %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Неправильний аргумент команди kickstart методу NFS %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 "Очікується з'єднання telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "anaconda запускається по telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Не вдається отримати %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Не вдається отримати образ встановлення."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Неправильний аргумент команди kickstart методу URL %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Для методу URL команди kickstart необхідно передати параметр --url."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Невідомий метод 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 "Налаштовування TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Налаштовування NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Ви маєте ввести каталог."
 
-#: ../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 "Невідомий сервер"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s не є припустимою назвою сервера."
 
-#: ../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."
@@ -6524,24 +6524,24 @@ msgstr ""
 "Якщо ви використовуєте HTTP проксі-сервер, вкажіть його назву або адресу IP."
 "назву сервера."
 
-#: ../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 "Подальше налаштовування FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Завантаження SCSI драйвера"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Завантажується драйвер %s..."
diff --git a/po/ur.po b/po/ur.po
index a85dbd66c..556911c3b 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -51,41 +51,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 "درست"
 
@@ -571,22 +571,22 @@ msgstr "فائل سسٹم %s فارمیٹنگ"
 #: ../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 "نقص"
 
@@ -642,8 +642,8 @@ msgstr ""
 "پر سویپ کرنے کی کوشش میں واقع ھو گی ھے \""
 
 #: ../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 "سکپ"
 
@@ -950,21 +950,21 @@ msgstr "ٹھیک کرنا۔"
 
 #: ../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 "جی ہاں۔"
 
 #: ../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 "نہیں۔"
 
-#: ../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 "دوبارہ کوشش کریں۔"
 
@@ -975,8 +975,8 @@ msgstr "پرواہ  نہ کرنا۔"
 #: ../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 "رد کرنا۔"
 
@@ -1841,21 +1841,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 "واپس"
 
 #: ../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 "جاری رھے"
 
@@ -2282,7 +2282,7 @@ msgstr "مہربانی فرما کر والیم گروپ نام کا اندرا�
 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 " میں  %sخوش آمدید"
@@ -3171,7 +3171,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "زبان کا انتخاب کریں"
 
-#: ../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 "کون سی زبان کا اپ استعمال کر نا چاہتے ہیں؟"
 
@@ -3546,7 +3546,7 @@ msgstr "\"%s\"ویلیو کی ضرورت ہے فیلد کے لیے."
 msgid "Dynamic IP"
 msgstr "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 " کیلۓ بھجی جارہی ہیں%s... آئ-پی معلومات"
@@ -3731,7 +3731,7 @@ msgstr "نہ معلوم"
 msgid "Hardware address: "
 msgstr "ہارڈویئر"
 
-#: ../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 "امکمل معلومات  "
@@ -3741,7 +3741,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr ""
 
 #: ../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 " سٹر نگ IP غلط"
@@ -3979,7 +3979,7 @@ msgstr "ڈیوائیسز RAID"
 msgid "None"
 msgstr "کچھ بھی نہیں"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "ہارڈ ڈرائیوز"
 
@@ -4887,12 +4887,12 @@ msgstr " سٹر نگ IP غلط"
 msgid "Activate on boot"
 msgstr "بو ٹ پر کا م شرو ع ھو نا"
 
-#: ../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 ""
@@ -5020,7 +5020,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 "گیٹ و ے"
 
@@ -5645,23 +5645,23 @@ 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 " میڈا چیک کریں "
 
-#: ../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 "آزمایش"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr " سی‌ڈی ناھر نکالے"
 
-#: ../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 "
@@ -5670,7 +5670,7 @@ msgstr ""
 "سی ڈی باھر نکالے اور آزمائش کے لیے دوسری ڈال د یں۔ \"%s\" آزمائش کا کہ سی ڈی "
 "ڈائیو میں موجود ھے ،یا \"%s\"  انتحاب کریں."
 
-#: ../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 "
@@ -5685,7 +5685,7 @@ msgstr ""
 "سی ڈی کو استعمال کرنے سے پہلے ٹیسٹ کریں۔ \"%s\"  اگر آپ اضافی میڈیا کو ٹیسٹ "
 "کرنا چاہتے ہیں، اگلی سی ڈی ڈالیں اور "
 
-#: ../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 "
@@ -5694,12 +5694,12 @@ msgstr ""
 " سی ڈی  %s کسی سی ڈی درائیو میں ملئ نھیں۔ مھربانی کر کے ڈالیں  %s سی ڈی اور "
 "ڈ بائیں %s دو بارا تلاش کرنے کے لیے۔."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "سی‌ڈی تلاش ھو گی "
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5710,7 +5710,7 @@ msgstr ""
 "\n"
 "انتحاب کریں %s میڈ یا چیک کو چھوڑ نے اور انسٹالیشن شروع کر نے کے لیے."
 
-#: ../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 "
@@ -5719,7 +5719,7 @@ msgstr ""
 "سی ڈی نھیں ملی %s جو بوٹ میڈ یا سے ملتی ھو۔ مھربانی کر کے ڈالیں %s سی ڈی اور "
 "د بائیں %s دو بارہ کوشش کے لیے۔ "
 
-#: ../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 "
@@ -5728,33 +5728,33 @@ msgstr ""
 " سی ڈی  %s کسی سی ڈی درائیو میں ملئ نھیں۔ مھربانی کر کے ڈالیں  %s سی ڈی اور "
 "ڈ بائیں %s دو بارا تلاش کرنے کے لیے۔."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "سی‌ڈی تلاش نہیں ھو ئی"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "فائل نہیں ملی  kickstart سی ڈی روم پر        "
 
-#: ../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 "ڑائریکٹری کو پڑھنے میں ناکام%s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "چلا نے کلیے کام جاری ھیں"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "ڈسک درائیو کو پڑ ھا جا رھا ھے۔۔۔۔"
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "ڈسک درائیو کی بنیاد "
 
-#: ../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?"
@@ -5762,7 +5762,7 @@ msgstr ""
 "آپ کے پاس بہت سی ڈوأسز ھیں جو کہ ڈرائیور ڈ یسک کی خد مت کا ز ر یعہ بن سکتی "
 "ھیں۔ آپ استمال کے لیے کس کا انتحاب کر یں گے  "
 
-#: ../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?"
@@ -5770,50 +5770,50 @@ msgstr ""
 "اس ڈیوایسُ میں بیشمار پارٹیشنز ایسی ہیں جو ڈرایور ڈسک خاکے پر مبنی ہیں۔ کیا "
 "آپ استعمال کرنا چاہتے ہیں؟"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "پارٹیشن کو ماُونٹ کرنے میں ناکام"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "ڈرایور ڈیکس امیج کا انتخاب کریں"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "فایُل سے ڈیسک ڈرایور اٹھانے میں ناکام"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr ""
 " ڈرئیور ڈیسک اس میں ڈالیں /dev/%s اور د بائیں« ھو گیا » جاری لکھنے کے لیے  ."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "درائیورڈسک ڈالیں"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr " خود انتخاب کریں "
 
-#: ../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 " خود انتخاب کریں "
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "دوسری ڈسک کو  لوڈ کر یں "
 
-#: ../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 "
@@ -5823,38 +5823,38 @@ msgstr ""
 "منتحب کرنا پسند کر ے گے، جاری رھنے د یں یا کسی اور ڈرائیور ڈ یسک کو لوڈ کر "
 "ہں؟  "
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "ڈرائیور ڈ یسک"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "کیا آپ کے پاس ڈ یسک ڈرائیور ھے؟"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "مز ید ڈ یسک ڈرائیور"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr " کیا آپ مزید ڈرائیور ڈ یسکس لوڈ کرنا چاھتے ھیں؟"
 
-#: ../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\" "
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "زر یعہ kickstartنا معلوم ڈرائیور ڈ یسک: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
@@ -5863,7 +5863,7 @@ msgstr ""
 "    ڈرائیور ڈ یسک کمانڈ کو بتانے کے لیے ھیں  kickstart نیچےبتا یا گیی نا اھل "
 "دلیل    : %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 "
@@ -5875,19 +5875,19 @@ msgstr ""
 "ھیں، اس کو \"OK\" د با کر چھوڑ سکتے۔a نٹن کو د با کر حا صل کی جا سکتی ھیں F1 "
 "ایک لسٹ تمام موجود انتحابات کی ."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "نمو نہ کے پرامیٹرز کو درج کر یں"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "کو ئی ڈرئیور نھیں ملا"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "  ڈ یسک ڈرائیور کو لوڈ کریں "
 
-#: ../loader2/driverselect.c:173
+#: ../loader/driverselect.c:173
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
@@ -5895,7 +5895,7 @@ msgstr ""
 "کو ئی ڈرائیورز تلاش نہیں ھو ے خود داخل کرنے کے لیے . کیا آپ ڈ یسک ڈرائیور "
 "یوز کرنا چاھئں گے؟"
 
-#: ../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."
@@ -5903,26 +5903,26 @@ msgstr ""
 " مھرباجی کر کے نیچے سے اپنی پسند کا ڈرائیور لوڈ کرنے کے لیے منتحب کر یں. اگر "
 "یہ ظاھر نھیں ھو تا اور آپ کے پاس ڈ یسک ڈرائیور ھے تو F2 کا بٹن د بائیں۔."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "زائد نقشوں کے دلا ئل کو بیا ن کر یں    "
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "لوڈ کرنے کے لیے ڈ یوائس ڈرائیور کو منتحب کر یں"
 
-#: ../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 "میڈیا مل گیا ہے"
 
-#: ../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 "لوکل انسٹالیشن کیلے میڈیا مل گیا ہے..."
 
-#: ../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 "
@@ -5931,7 +5931,7 @@ msgstr ""
 "یہ %s انسٹالیشن درخت اّس ڈاریکٹری میں آپ کے بو ٹ میڈ یا سے ملتا ھوا نظر نھیں "
 "آتا."
 
-#: ../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."
@@ -5939,7 +5939,7 @@ msgstr ""
 "سے پڑ تے ھو ے غلظی ھو گئ ھے ، مھر با نی کر کے اس  کو چیک کرئیں اور دوبارہ "
 "کوشش کرے  ISO "
 
-#: ../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?"
@@ -5947,7 +5947,7 @@ msgstr ""
 " آپ کے سسٹم میں کو ئی ھارڈ ڈرئیو نھیں ھے! کیا آپ مز ید ڈ یو ئسز کا تر تیب د "
 "ینا پسند کر ے گے ؟"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5958,117 +5958,117 @@ msgstr ""
 "کی معلومات کلیے   %s   اگر ڈ یسک ڈرائیور ظاھر نھیں   ھیں تو لسٹ استمال ھو "
 "رھی ھے ، F2  کو دبائیں مزئید ڈ یوائسز کی ترتیب کلیے ."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "ڈاریکٹری میں تصو یر یں ھیں:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "کا انتہاب کریں (patition) تقسیمی حصے    "
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr " ڈ یوائس %s میں نھیں ھے %s سی ڈی روم کی معلومات."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "  کمانڈ کے طر یقے کے لیے دلیل غلظ ھے HD kickstart  %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 "فا ئل تلاش نھیں ھو سکی ھارڈ ڈرائیو پر  Kickstart\" 150"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "کے لیُے ہارڈ ڈرایوُ  تلاش نھیں کر سکا %s بایوس ڈیسک "
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "کی بورڈ کہ قسم"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "آپ کے پاس کس طرح کا کی بورڈ ہے؟"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "ککسٹارٹ فائل کو کھولنے میں غلطی%s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "ککسٹارٹ فائل کے کانٹنٹس کو پڑھنے میں غلطی%s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "غلطی%sلائن پر%d ککسٹارٹ فائل%s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "ks.cfg  پر نہیں مل سکتابوٹ فلاپی"
 
-#: ../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 "ککسٹارٹ فائل کو کھولنے میں غلطی%s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "ککسٹارٹ طریقہ کمانڈ کو بند کرنےکیلئے غلط آرگومنٹ%s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "ریسکیو موڈ %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>ایلیمنٹس کے درمیان| <Space>انتخاپ | <F12>اگلی سکرین پر جانے "
 "کیلئے"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "زبان کا انتخاب کریں"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "لوکل سی ڈی روم"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "ہارڈ ڈرائیو"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "ڈائریکٹری %s:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr " میں  %sخوش آمدید"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "ڈسک سورس ايپڈيٹيس "
 
-#: ../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?"
@@ -6076,7 +6076,7 @@ msgstr ""
 "آپ کے پاس مختلف ڈیواسز ہیں جن کو ايپڈيٹيس ڈسک کیلئیے استعمال کیا جاسکتا ہے "
 "۔آپ کس کو استعمال کرنا چاہیں گے"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6085,72 +6085,72 @@ msgstr ""
 "اس ڈیوایسُ میں بیشمار پارٹیشنز ایسی ہیں جو ڈرایور ڈسک خاکے پر مبنی ہیں۔ کیا "
 "آپ استعمال کرنا چاہتے ہیں؟"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "اپنی ايپڈيٹيس ڈسک داخل کریں/dev/%s \"OK\" پرس کریں اور"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "ايپڈيٹيس ڈسک"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "ماؤنٹ ايپڈيٹيس ڈسک ناکام"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "ايپڈيٹيس"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "ایناکونڈا کی ايپڈيٹيس کو پڑھ رہا ہے"
 
-#: ../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 "ککسٹارٹ فائل کو کھولنے میں غلطی%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 "آپ کے پاس %sناکافی ہے RAMانسٹالیشن کیلئیے "
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "بچانے کا طریقہ"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "انسٹالیشن کا طریقہ"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "ایمیج ریسکیو کرنے کیلئے کس قسم کا میڈیا چائیے?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "پیکج کو انسٹال کرنے کیلئے کس قسم کا میڈیا چائیے?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "کوئ ڈرائیو نہیںملی"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "ڈرائیو کا انختاب کریں"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "ڈرائیو ڈسک استعمال کریں"
 
-#: ../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?"
@@ -6158,11 +6158,11 @@ msgstr ""
 "انسٹالیشن کیلئے جو ڈیوائسز چاہئے تھں نہیں ملیںکیا آپ خود سےکوئ ڈیوائسز چچنا "
 "چاہہں گے یا ڈرائیو ڈسک استعمال کرنا چاہیں گے"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "آپکے سسٹم پر درج ذیل ڈیوائسز ملی ہیں"
 
-#: ../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?"
@@ -6170,50 +6170,50 @@ msgstr ""
 "آپ کے سسٹم کیلئے کوئ ڈیوائس ڈرائور لوڈ نہیں کیا گیا کیا آپ کوئلوڈ کرنا چاہیں "
 "گے"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "ڈیوائسز"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "مکمل"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "ڈیوائس داخل کریں"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "لوڈر پہلے ہی جاری ہے۔ شیل شروع ہورہا ہے.\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr ""
 " ایناکونڈا جاری ہے  %s ۔برائے مہربانی انتظار کریں... ریسکیو موڈ میں۔ \n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr " ایناکونڈا جاری ہے %s.. .سسٹم نسٹالر۔برائےمہربانی انتظار کریں\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "%sایمیج کو انسٹال کرنے میں ناکام"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr " \"%s\"...چیکنگ"
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "اب میڈیا چیک ہو رہا ہے۔۔۔۔"
 
-#: ../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."
@@ -6221,7 +6221,7 @@ msgstr ""
 "پرائمری والیم ڈسکرپٹر سے ڈسک چیک کرنے میں ناکام جس کا مطلب ہے کہ ڈسک چیکازم "
 "کے بغیر تیار کی گئ ہے"
 
-#: ../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 "
@@ -6231,18 +6231,18 @@ msgstr ""
 "ڈسک کی وجہ سے ہو سکتی ہے اگر ممکن ہو تو ڈسک کو صاف کریں اور دوپارہ کوشش کریں "
 "اگر ہ ٹیسٹ پارپار ناکام ہو تو آب کو انسٹالیشن جاری نہیں رکھنی چاہئے"
 
-#: ../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"
@@ -6253,29 +6253,29 @@ msgstr ""
 "\n"
 "   %s?کیئے چیکاازم ٹیسٹ کرنا چاہتے ہیں"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "چیک ازم ٹیسٹ"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "دلیل ککسٹارٹ نیٹ ورک کمانڈ کیلے غلط%s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr ""
 "    ڈرائیور ڈ یسک کمانڈ کو بتانے کے لیے ھیں  kickstart نیچےبتا یا گیی نا اھل "
 "دلیل    : %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 "
@@ -6286,28 +6286,28 @@ msgstr ""
 "نہیں تو اس کو خالی چھوڑ دیں اور انسٹالیشن خود جاری ہو جاائے گی مہیا کریں ایک "
 "نیٹ ورک اڈاپٹر ہے ESSID"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "اینکر پشن کی"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "وائرلس سیٹنگز"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "نیم سرور آئ-پی"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "نیم سرور"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6320,221 +6320,221 @@ msgstr ""
 "ملومات نہیں ہے تو اس کک جگہ کو خالی چھوژ دیں اور انسٹالیشن خود ہی شروع ہو "
 "جاۓگی"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "آئ-پی سے متعلق غلط معلومات"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "اڈریس کا اندراج کیا ہے IP آپ نے غلط"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "کوئ پاسورڈ نھیں ھے"
 
-#: ../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 "یھان پر غلطی ٹارگٹ ڈریو کو چیک کریںأیکسانیت صیھع نھیںأ  "
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "ٹی-سی-پی/آئ-پی  وضع"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr ""
 
-#: ../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 "عنوان 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 "عنوان IP :"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "نیم سرور"
 
-#: ../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 " کی تر تیب z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "امکمل معلومات  "
 
-#: ../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 "آپ کو درست آئ-پی عنوان اور نیٹ ماسک دونوں داخل کرنے چاہۓ"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "آپ کو درست آئ-پی عنوان اور نیٹ ماسک دونوں داخل کرنے چاہۓ"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "ڈومین اور ہوسٹنیم کا تعین جاری ہے..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "دلیل ککسٹارٹ نیٹ ورک کمانڈ کیلے غلط%s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr " جو نیٹ ورک کمانڈ میں دی گئ ہے%s غلط بوٹپروٹو"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "نیٹ ورک ڈئواس"
 
-#: ../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 ""
 "آپ کے کمپیوٹر پر مختلف نیٹ ورک ڈئواسز ہیں آپ کونسی انسٹال کرنا چاہیں گے"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "ااین-ایف-ایس سرور کا نام:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "ڈائریکٹری %s:"
 
-#: ../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 "این-ایف-ایس  سیٹ اپ"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr " ترتیب کے بغیر میزبان کا نام واضع کیا گیا ہےDNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "دوبارہ حاصل کررہا"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "ڈائریکٹری سرور سے استوار نہیں ہوسکی."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "انسٹالیشن ٹری نظر نہیں آرہا%s.ڈائریکٹریمیں"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "این ایف ایس ککسٹارٹ کمانڈ کیلے غلط طریقہ%s: %s"
 
-#: ../loader2/telnetd.c:89 ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:131
 msgid "Telnet"
 msgstr "ٹيل نيٹ  "
 
-#: ../loader2/telnetd.c:89
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection..."
 msgstr "ٹیل نیٹ کے وصل کے لۓ انتظار..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "یل نیٹ کے ذریعے ایناکوڈا  جاری ہے..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "دوبارہ حاصل کرنے میں ناکام %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "تقرری تصویر کو دوبارہ حاصل کرنے میں ناکام ."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "یو-آر-ایل ککسٹارٹ طریقہ %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr " یو-آر-ایل ککسٹارٹ طریقہ کو ایک یو-آر-ایل آرگومنٹ  -- مہیا کرنا چاہۓ"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "نامعلوم  یو-آر-ایل طریقہ  %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 "ٹی-سی-پی/آئ-پی  وضع"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "این-ایف-ایس  سیٹ اپ"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "آپ کو ایک ڈائریکٹری درج کرنی چاہۓ۔ "
 
-#: ../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 "نامعلوم ہوسٹ"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s ایک صحیح ہوسٹ کا نام نہیں ہے"
 
-#: ../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."
@@ -6542,24 +6542,24 @@ msgstr ""
 "اگر آپ ایک ایچ-ٹی-ٹی-پی پروکسي سرور استمعال کر رہے ہیں تو ایچ-ٹی-ٹی-پی "
 "پروکسي سرور استعمال کرنے کے لۓ اس کا نام راخل کریں۔"
 
-#: ../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 "مزید ایف-ٹی-پی سیٹ اپ"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "SCSIڈرائیور لوڈنگ"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "چلا نے کلیے کام جاری ھیں %s...ڈرائیور"
diff --git a/po/vi.po b/po/vi.po
index bb7fa6e5e..005059563 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -46,41 +46,41 @@ msgstr "Hãy nhấn <enter> để mở một 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 "Đồng ý"
 
@@ -567,22 +567,22 @@ msgstr "Đang định dạng hệ thống tập tin %s..."
 #: ../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 "Lỗi"
 
@@ -638,8 +638,8 @@ msgstr ""
 "Nhấn <Enter> để khởi động lại hệ thống."
 
 #: ../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 "Bỏ qua"
 
@@ -946,21 +946,21 @@ msgstr "Sửa"
 
 #: ../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 "Có"
 
 #: ../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 "Không"
 
-#: ../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 "Thử lại"
 
@@ -971,8 +971,8 @@ msgstr "Bỏ qua"
 #: ../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 "Hủy bỏ"
 
@@ -1823,21 +1823,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 "Lùi"
 
 #: ../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 "Tiếp tục"
 
@@ -2259,7 +2259,7 @@ msgstr "Vui lòng nhập tên người dùng"
 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 "Chào mừng sử dụng %s"
@@ -3145,7 +3145,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "Chọn ngôn ngữ"
 
-#: ../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 "Bạn muốn dùng ngôn ngữ nào khi cài đặt?"
 
@@ -3499,7 +3499,7 @@ msgstr "Cần giá trị trong mục \"%s\"."
 msgid "Dynamic IP"
 msgstr "IP động"
 
-#: ../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 "Đang gửi yêu cầu thông tin IP cho %s..."
@@ -3684,7 +3684,7 @@ msgstr "Không biết"
 msgid "Hardware address: "
 msgstr "Địa chỉ 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 "Nhóm thiếu"
@@ -3695,7 +3695,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "Bạn phải chọn ít nhất một ngôn ngữ."
 
 #: ../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 "Chuỗi IP không hợp lệ"
@@ -3930,7 +3930,7 @@ msgstr "Thiết bị RAID"
 msgid "None"
 msgstr "Không"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "Đĩa cứng"
 
@@ -4821,12 +4821,12 @@ msgstr "Chuỗi IP không hợp lệ"
 msgid "Activate on boot"
 msgstr "Kích hoạt khi 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 ""
 
-#: ../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 ""
@@ -4954,7 +4954,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 "Gateway:"
 
@@ -5578,23 +5578,23 @@ 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 "Kiểm tra thiết bị"
 
-#: ../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 "Kiểm tra"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "Đẩy 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 "
@@ -5603,7 +5603,7 @@ msgstr ""
 "Chọn \"%s\" để kiểm tra CD hiện có trong ổ đĩa, hoặc chọn \"%s\" để lấy CD "
 "và chèn CD khác vào kiểm tra."
 
-#: ../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 "
@@ -5613,7 +5613,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 "
@@ -5621,12 +5621,12 @@ msgid ""
 msgstr ""
 "Không có CD %s trong ổ CDROM. Vui lòng chèn CD %s vào và nhấn %s để thử lại."
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "Tìm thấy CD"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5637,7 +5637,7 @@ msgstr ""
 "\n"
 "Chọn %ss để bỏ kiểm tra thiết bị và bắt đầu cài đặt."
 
-#: ../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 "
@@ -5646,7 +5646,7 @@ msgstr ""
 "Không có CD %s khớp với thiết bị khởi động của bạn. Vui lòng chèn CD %s vào "
 "và nhấn %s để thử lại."
 
-#: ../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 "
@@ -5654,33 +5654,33 @@ msgid ""
 msgstr ""
 "Không có CD %s trong ổ CDROM. Vui lòng chèn CD %s vào và nhấn %s để thử lại."
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "Không tìm thấy CD"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "Không thể tìm thấy tập tin kickstart trên 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 "Lỗi đọc thư mục %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "Đang nạp"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "Đang đọc đĩa driver..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "Nguồn đĩa driver"
 
-#: ../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?"
@@ -5688,7 +5688,7 @@ msgstr ""
 "Bạn có nhiều thiết bị mạng trên hệ thống, có thể dùng cho đĩa driver. Bạn "
 "muốn cài đặt bằng cái nào?"
 
-#: ../loader2/driverdisk.c:263
+#: ../loader/driverdisk.c:263
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the driver "
@@ -5697,52 +5697,52 @@ msgstr ""
 "Bạn có nhiều thiết bị mạng trên hệ thống, có thể dùng cho đĩa driver. Bạn "
 "muốn cài đặt bằng cái nào?"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 #, fuzzy
 msgid "Failed to mount partition."
 msgstr "Lỗi gắn kết đĩa."
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 #, fuzzy
 msgid "Select driver disk image"
 msgstr "Chọn driver"
 
-#: ../loader2/driverdisk.c:309
+#: ../loader/driverdisk.c:309
 msgid "Select the file which is your driver disk image."
 msgstr "Chọn tập tin ảnh của ổ đĩa."
 
-#: ../loader2/driverdisk.c:338
+#: ../loader/driverdisk.c:338
 #, fuzzy
 msgid "Failed to load driver disk from file."
 msgstr "Lỗi gắn kết đĩa driver."
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "Hãy chèn đĩa driver vào /dev/%s và nhấn \"Đồng ý\" để tiếp tục."
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "Chèn đĩa driver"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "Lỗi gắn kết đĩa driver."
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, fuzzy, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "Đĩa mềm này không phải là đĩa driver hợp lệ cho phiên bản %s."
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "Chọn bằng tay"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "Nạp đĩa khác"
 
-#: ../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 "
@@ -5751,45 +5751,45 @@ msgstr ""
 "Không tìm thấy thiết bị thích hợp nào trên đĩa driver này. Bạn muốn chọn đĩa "
 "driver bằng tay, vẫn tiếp tục, hoặc nạp một đĩa driver khác?"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "Đĩa driver"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "Bạn có đĩa driver không?"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "Nhiều đĩa driver?"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "Bạn có muốn nạp đĩa driver khác không?"
 
-#: ../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 "Lỗi Kickstart"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "Ổ đĩa nguồn kickstart lạ: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "Tham số sau cho lệnh liên quan đến ổ đĩa kickstart không hợp lệ: %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 "
@@ -5801,26 +5801,26 @@ msgstr ""
 "qua màn hình này và nhấn nút \"Đồng ý\". Có thể xem danh sách các tùy chọn "
 "hiện có bằng cách nhấn phím F1."
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "Nhập tham số môđun"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "Không tìm thấy driver"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "Nạp đĩa driver"
 
-#: ../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 ""
 "Không tìm thấy driver để chọn bằng tay. Bạn có muốn dùng đĩa driver không?"
 
-#: ../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."
@@ -5828,26 +5828,26 @@ msgstr ""
 "Vui lòng chọn driver cần nạp bên dưới. Nếu không có, và bạn có đĩa driver, "
 "hãy nhấn F2."
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "Xác định tham số môđun tùy chọn"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "Chọn đĩa driver cần nạp"
 
-#: ../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 "Tìm thấy Media"
 
-#: ../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 "Tìm thấy trình cài đặt trên máy..."
 
-#: ../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 "
@@ -5855,13 +5855,13 @@ msgid ""
 msgstr ""
 "Bộ cài đặt %s trong thư mục này dường như không khớp với thiết bị khởi động."
 
-#: ../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."
 msgstr "Lỗi đọc từ ISO image. Vui lòng kiểm tra ISO image và thử lại."
 
-#: ../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?"
@@ -5869,7 +5869,7 @@ msgstr ""
 "Hình như bạn không có ổ đĩa cứng! Bạn có muốn cấu hình thiết bị bổ sung "
 "không?"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5879,115 +5879,115 @@ msgstr ""
 "Partition và thư mục nào trên partition chứa CD (iso9660) image cho %s? Nếu "
 "bạn không thấy có đĩa này thì nhấn F2 để cấu hình thiết bị bổ sung."
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "Image thư mục:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "Chọn partition"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, fuzzy, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "Thiết bị %s có lẽ không chứa bộ cài đặt CDROM Red Hat."
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "Đối số cho lệnh HD kickstart sai %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 "Không thể tìm tập tin kickstart trên đĩa cứng."
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "Không tìm thấy ổ đĩa cứng %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "Loại bàn phím"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "Bạn dùng loại bàn phím nào?"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "Lỗi mở tập tin kickstart %s: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "Lỗi đọc nội dung tập tin kickstart %s: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "Lỗi trong %s tại dòng %d của tập tin kickstart %s."
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "Không tìm thấy ks.cfg trên đĩa boot."
 
-#: ../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 "Lỗi mở tập tin kickstart %s: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, fuzzy, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "Đối số cho lệnh HD kickstart sai %s: %s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "Chào mừng sử dụng %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> chuyển đổi  | <Space> chọn | <F12> bước kế "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "Chọn ngôn ngữ"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "CDROM cục bộ"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "Đĩa cứng"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "Thư mục Red Hat:"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "Chào mừng sử dụng %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "Nguồn đĩa cập nhật"
 
-#: ../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?"
@@ -5995,7 +5995,7 @@ msgstr ""
 "Bạn có nhiều thiết bị, có thể làm nguồn đĩa cập nhật. Bạn muốn cài đặt bằng "
 "cái nào?"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
@@ -6004,72 +6004,72 @@ msgstr ""
 "Bạn có nhiều thiết bị mạng trên hệ thống, có thể dùng cho đĩa driver. Bạn "
 "muốn cài đặt bằng cái nào?"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "Hãy chèn đĩa cập nhật vào /dev/%s và nhấn \"Đồng ý\" để tiếp tục."
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "Đĩa cập nhật"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "Lỗi gắn kết đĩa cập nhật."
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "Cập nhật"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "Đang đọc cập nhật 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 "Lỗi mở tập tin kickstart %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 "Bạn không có đủ RAM để cài đặt %s trên máy này."
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "Cách phục hồi"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "Cách cài đặt"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "Loại thiết bị nào chứa image phục hồi?"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "Cài đặt lên loại thiết bị nào?"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "Không tìm thấy driver"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "Chọn driver"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "Dùng đĩa driver"
 
-#: ../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?"
@@ -6077,59 +6077,59 @@ msgstr ""
 "Không thể tìm thấy thiết bị cần thiết cho loại cài đặt này. Bạn có muốn chọn "
 "driver bằng tay hoặc dùng đĩa driver không?"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "Tìm thấy những thiết bị sau trên hệ thống."
 
-#: ../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 "Chưa nạp driver thiết bị trên hệ thống. Bạn có muốn nạp bây giờ không?"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "Thiết bị"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "Xong"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "Thêm thiết bị"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, fuzzy, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "loader đã chạy rồi. Khởi động shell."
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "Đang chạy anaconda, bộ cài đặt hệ thống %s - vui lòng chờ...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "Đang chạy anaconda, bộ cài đặt hệ thống %s - vui lòng chờ...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "Không thể tìm image cài đặt %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "Đang kiểm tra \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "Đang kiểm tra thiết lưu trữ bị..."
 
-#: ../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."
@@ -6137,7 +6137,7 @@ msgstr ""
 "Không thể đọc checksum đĩa từ bộ mô tả volume chính. Có thể là do đĩa được "
 "tạo không có checksum."
 
-#: ../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 "
@@ -6150,18 +6150,18 @@ msgstr ""
 "Nếu có thể, vui lòng làm sạch đĩa và thử lại. Nếu lần kiểm tra kế tiếp lại "
 "thất bại, bạn không nên tiếp tục cài đặt."
 
-#: ../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"
@@ -6172,27 +6172,27 @@ msgstr ""
 "\n"
 "    %s?"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Kiểm tra checksum"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "Lệnh kickstart có tham số sai %s: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "Tham số sau cho lệnh liên quan đến ổ đĩa kickstart không hợp lệ: %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 "
@@ -6200,29 +6200,29 @@ msgid ""
 "field blank and the install will continue."
 msgstr ""
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../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 "Thiết lập linh tinh"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "Nameserver IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "Nameserver"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6234,246 +6234,246 @@ msgstr ""
 "không\n"
 "thì có thể bỏ trống và tiếp tục cài đặt."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "Thông tin IP không hợp lệ"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "Bạn đã nhập địa chỉ IP không hợp lệ."
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 #, fuzzy
 msgid "Network Error"
 msgstr "Không mật khẩu"
 
-#: ../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 "Lỗi xóa đĩa đích. Sao chép thất bại."
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "Cấu hình TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "Bạn phải chọn ít nhất một ngôn ngữ."
 
-#: ../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 "Địa chỉ 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 "Địa chỉ IP:"
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 #, fuzzy
 msgid "Name Server:"
 msgstr "Nameserver"
 
-#: ../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 "Cấu hình z/IPL"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "Thiếu thông tin"
 
-#: ../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 "Bạn phải nhập cả địa chỉ IP hợp lệ và netmask hợp lệ."
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "Bạn phải nhập cả địa chỉ IP hợp lệ và netmask hợp lệ."
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "Đang xác định tên máy và tên miền..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "Đối số cho lệnh mạng kickstart sai %s: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "BootProto %s sai trong lệnh mạng"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "Thiết bị mạng"
 
-#: ../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 ""
 "Bạn có nhiều thiết bị mạng trên hệ thống. Bạn muốn cài đặt bằng cái nào?"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "Tên server NFS:"
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, fuzzy, c-format
 msgid "%s directory:"
 msgstr "Thư mục Red Hat:"
 
-#: ../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 "Thiết lập NFS"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "Chỉ định Hostname nhưng chưa cấu hình DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "Đang nhận"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "Không thể gắn thư mục này từ server."
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "Thư mục này không chứa bộ cài đặt Red Hat %s."
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "Đối số cho lệnh mạng NFS kickstart sai %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 "Đang đợi kết nối telnet..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "Đang chạy anaconda qua telnet..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "Không thể nhận %s://%s/%s/%s."
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "Không thể nhận image cài đặt."
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Đối số cho lệnh mạng URL kickstart sai %s: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "Phải cung cấp đối số --url cho URL kichstart."
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "Loại URL lạ %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 "Cấu hình TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "Thiết lập NFS"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "Bạn phải nhập thư mục."
 
-#: ../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 "Máy lạ"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s không phải là tên máy hợp lệ."
 
-#: ../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."
 msgstr ""
 "Nếu bạn dùng HTTP proxy server, hãy nhập tên HTTP proxy server cần dùng."
 
-#: ../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 "Thiết lập FTP"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "Đang nạp driver SCSI"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "Đang nạp driver %s..."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d2b32c655..96deae2a6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -59,41 +59,41 @@ msgstr "按<回车>键执行一个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 "确定"
 
@@ -549,22 +549,22 @@ msgstr "正在 %s 中重新定义文件系统大小..."
 #: ../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 "错误"
 
@@ -618,8 +618,8 @@ msgstr ""
 "请按 <Enter> 键退出安装."
 
 #: ../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 "跳过"
 
@@ -934,21 +934,21 @@ msgstr "修复"
 
 #: ../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 "是"
 
 #: ../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 "否"
 
-#: ../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 "重试"
 
@@ -959,8 +959,8 @@ msgstr "忽略"
 #: ../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 "取消"
 
@@ -1775,21 +1775,21 @@ msgid "_Write changes to disk"
 msgstr "将修改写入磁盘（_W）"
 
 #: ../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 "上一步"
 
 #: ../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 "继续"
 
@@ -2183,7 +2183,7 @@ msgstr "请输入您的%(instkey)s"
 msgid "Skip entering %(instkey)s"
 msgstr "跳过输入 %(instkey)s"
 
-#: ../text.py:564 ../loader2/lang.c:63
+#: ../text.py:564 ../loader/lang.c:63
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "欢迎为 %s 进入 %s"
@@ -3033,7 +3033,7 @@ msgstr "<i>%s</i>"
 msgid "Language Selection"
 msgstr "语言选择"
 
-#: ../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 "您在安装过程中想使用何种语言？"
 
@@ -3393,7 +3393,7 @@ msgstr "%s字段需要输入值。"
 msgid "Dynamic IP"
 msgstr "动态 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 "正在为 %s 发送 IP 信息请求..."
@@ -3560,7 +3560,7 @@ msgstr "未知"
 msgid "Hardware address: "
 msgstr "硬件地址:"
 
-#: ../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 "缺少网络协议"
 
@@ -3569,7 +3569,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "您必须至少选择IPv4或IPv6支持."
 
 #: ../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 "无效的前缀"
 
@@ -3799,7 +3799,7 @@ msgstr "RAID 设备"
 msgid "None"
 msgstr "无"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "硬盘驱动器"
 
@@ -4663,12 +4663,12 @@ msgstr "前缀"
 msgid "Activate on boot"
 msgstr "引导时激活"
 
-#: ../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 "启动IPv4支持"
 
-#: ../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 "启动IPV6支持"
@@ -4786,7 +4786,7 @@ msgstr "自动 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 "网关："
 
@@ -5386,22 +5386,22 @@ msgstr ""
 "＊您的Red Hat Enterprise Linux 将得不到支持和保护。\n"
 "＊您将不能获得更多的关于软件和安全升级"
 
-#: ../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 "检查介质"
 
-#: ../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 "测试"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 msgid "Eject Disc"
 msgstr "弹出光盘"
 
-#: ../loader2/cdinstall.c:97
+#: ../loader/cdinstall.c:97
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -5410,7 +5410,7 @@ msgstr ""
 "选择\"%s\" 来测试当前驱动器内的光盘，或\"%s\" 来弹出光盘，然后另插入一张来测"
 "试。"
 
-#: ../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 "
@@ -5422,18 +5422,18 @@ msgstr ""
 "如果您想测试附带的媒体，请放入下一张CD，并按\"%s\"。建议测试每一张CD，但并非"
 "严格要求这么做。至少在CD在第一次使用前要进行测试，之后就不必再测试了。"
 
-#: ../loader2/cdinstall.c:142
+#: ../loader/cdinstall.c:142
 #, c-format
 msgid ""
 "The %s disc was not found in any of your drives. Please insert the %s disc "
 "and press %s to retry."
 msgstr "在您所有驱动器中均无法找到 %s 光盘。请插入 %s 光盘，然后按 %s 来重试。"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 msgid "Disc Found"
 msgstr "找到光盘"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5444,100 +5444,100 @@ msgstr ""
 "\n"
 "选择 %s 跳过介质测试并开始安装。"
 
-#: ../loader2/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 #, c-format
 msgid ""
 "No %s disc was found which matches your boot media.  Please insert the %s "
 "disc and press %s to retry."
 msgstr "没有找到%s 光盘匹配您的引导介质 。请插入 %s 光盘，然后按 %s 来重试。"
 
-#: ../loader2/cdinstall.c:344
+#: ../loader/cdinstall.c:344
 #, c-format
 msgid ""
 "The %s disc was not found in any of your CDROM drives. Please insert the %s "
 "disc and press %s to retry."
 msgstr "您所有光驱中均无法找到 %s 光盘。请插入 %s 光盘，然后按 %s 来重试。"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 msgid "Disc Not Found"
 msgstr "没找到光盘"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "在光盘上找不到 kickstart 文件。"
 
-#: ../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 "读取目录 %s 失败：%s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "载入"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "正在读取驱动程序盘..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "驱动程序盘源"
 
-#: ../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?"
 msgstr "您的系统上具有多种可作为驱动程序盘源的设备。您想使用哪一个？"
 
-#: ../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?"
 msgstr "您的系统上具有多种可作为驱动程序盘映像来源的分区。您想使用哪一个？"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "挂载分区失败。"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "选择驱动盘映像"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "从文件挂载驱动程序盘失败。"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "在 /dev/%s 中插入驱动程序盘，然后按“确定”来继续。"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "插入驱动程序盘"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "挂载驱动程序盘失败。"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "驱动程序盘无效%s 的这个发行版本。"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "手工选择"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "载入另一张磁盘"
 
-#: ../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 "
@@ -5546,45 +5546,45 @@ msgstr ""
 "在驱动程序盘上没有找到恰当类型的设备。您想手工选择驱动程序、继续、还是载入另"
 "一张磁盘？"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "驱动程序盘"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "您有驱动程序盘吗？"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "更多驱动程序盘？"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "您想载入更多驱动程序盘吗？"
 
-#: ../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 错误"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "未知驱动程序盘的 kickstart 源：%s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "以下为 kickstart 驱动程序盘命令 %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 "
@@ -5594,25 +5594,25 @@ msgstr ""
 "请输入您想传递给 %s 模块的任何参数，用空格间隔。如果不知道要提供哪些参数，按"
 "\"确定\"按钮即可跳过。"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "输入模块参数"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "未找到任何驱动程序"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "载入驱动程序盘"
 
-#: ../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 "没有找到任何驱动程序来手工插入。您想要使用驱动程序盘吗？"
 
-#: ../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."
@@ -5620,45 +5620,45 @@ msgstr ""
 "请在下面选择您想载入的驱动程序。如果它没有被包括，并且您另外备有驱动程序盘，"
 "请按 F2 键。"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "指定可选模块参数"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "选择要载入的设备驱动程序"
 
-#: ../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 "检测到介质"
 
-#: ../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 "检测到本地安装介质..."
 
-#: ../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 "
 "media."
 msgstr "该目录中的 %s 安装树似乎和您的引导介质不符。"
 
-#: ../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."
 msgstr "从 ISO 映像中读取安装时出错。请检查您的 ISO 映像后重试。"
 
-#: ../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?"
 msgstr "您的系统似乎未配备任何硬盘驱动器！是否要配置附加设备？"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5668,61 +5668,61 @@ msgstr ""
 "哪一个分区以及分区上的哪一个目录下存有 %s 的光盘（iso9660）映像？如果您所用的"
 "磁盘驱动器在这里没有被列出，按 F2 键来配置附加的设备。"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "包含映像的目录："
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "选择分区"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "设备 %s 似乎不包含 %s 光盘映像。"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "硬盘 kickstart 方法命令 %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 "在硬盘驱动器上找不到 kickstart 文件。"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "无法找到与 BIOS 对应的硬盘 %s"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "键盘类型"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "您使用哪一种类型的键盘？"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "打开 kickstart 文件 %s 时出错：%s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "读取 kickstart 文件 %s 的内容时出现错误：%s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "%s 处出错，第 %d 行的 kickstart 文件 %s。"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "无法在可移动介质中找到 ks.cfg。"
 
-#: ../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."
@@ -5730,128 +5730,128 @@ msgstr ""
 "无法下载kickstart文件。请使用交互式安装方法：修改下边的kickstart参数或者 点击"
 "Cancel。"
 
-#: ../loader2/kickstart.c:386
+#: ../loader/kickstart.c:386
 msgid "Error downloading kickstart file"
 msgstr "下载点击开始文件时出错"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "关闭 kickstart 方法命令 %s 的参数不对：%s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "欢迎为 %s 使用 %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> 元素间切换   |  <Space> 选择   |  <F12> 下一屏幕 "
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "选择一种语言"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 msgid "Local CD/DVD"
 msgstr "本地光盘"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "硬盘驱动器"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 msgid "NFS directory"
 msgstr "NFS目录"
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "欢迎到%s%n 做 %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "更新盘源"
 
-#: ../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?"
 msgstr "您的系统上具有多种可作为更新盘源的设备。您想使用哪一个？"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr "这个设备中有多个可能包含更新磁盘映像的分区。您想使用哪一个？"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "在 /dev/%s 中插入更新盘，然后按“确定”来继续。"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "更新盘"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "挂载更新盘失败。"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "更新"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "正在读取 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
 msgid "Error downloading updates image"
 msgstr "下载更新映像时出错"
 
-#: ../loader2/loader.c:994
+#: ../loader/loader.c:994
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "在本机上安装 %s 所需内存不够。"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "救援方法"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "安装方法"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "哪一类介质包含救援映像？"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "哪一类介质包含要安装的软件包？"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "未找到任何驱动程序"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "选择驱动程序"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "使用驱动程序盘"
 
-#: ../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?"
@@ -5859,65 +5859,65 @@ msgstr ""
 "找不到这种安装类型所需的任何设备。您想手工选择驱动程序或使用一张驱动程序盘"
 "吗？"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "在系统中发现以下设备。"
 
-#: ../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 "没有为您的系统载入任何设备驱动程序。现在是否需要载入？"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "设备"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "完成"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "添加设备"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "装载程序已经被运行。正在启动 shell。\n"
 
-#: ../loader2/loader.c:1946
+#: ../loader/loader.c:1946
 #, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
 msgstr "正在运行 anaconda %s、%s 救援模式 - 请稍候...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "正在运行 anaconda %s、%s 系统安装程序 - 请稍候...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "无法找到安装映像 %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "正在检查\"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "正在检查介质..."
 
-#: ../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."
 msgstr "无法从主标签中读出磁盘校验和。这可能是因为创建磁盘时没有添加校验和。"
 
-#: ../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 "
@@ -5926,11 +5926,11 @@ msgstr ""
 "刚测试过的映像上有错误。这可能是由于下载文件或光盘介质被损坏。如果情况如此，"
 "请清洁光盘后再试一次。如果测试仍旧失败，您就不应该继续安装。"
 
-#: ../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 "
@@ -5939,7 +5939,7 @@ 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"
@@ -5950,26 +5950,26 @@ msgstr ""
 "\n"
 "   %s？"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "校验和测试"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "设备 kickstart 方法命令 %s 的参数不对：%s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 msgid "A module name must be specified for the kickstart device command."
 msgstr "必须为 kickstart 设备命令指定模块名称。"
 
-#: ../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 "对于 IPv4网络，前缀值在1到32之间，而对于 IPv6网络则在1到128之间。"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -5979,27 +5979,27 @@ msgstr ""
 "%s 是无线网络适配器。请提供进入您的无线网络所需的 ESSID 和加密钥匙。如果不需"
 "要钥匙，请把该字段留为空白，安装将会继续。"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "加密密钥"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "无线设置"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "名称服务器(DNS) IP"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 msgid "Missing Nameserver"
 msgstr "缺失名称服务器"
 
-#: ../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 "
@@ -6008,56 +6008,56 @@ msgstr ""
 "您的IP请求返回了IP配置信息,但该信息没有包括 DNS 名称服务器地址.您若不知道此信"
 "息,可将该字段留空,安装将继续."
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "IP 信息无效"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "您输入的 IP 地址无效。"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "网络错误"
 
-#: ../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 "配置网络界面时出错。"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "配置 TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "您必须至少选择一项网络协议（IPv4或IPv6)。"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS 需要 IPv4"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "NFS 安装需要 IPv4 的支持。"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 地址："
 
-#: ../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地址："
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "域名服务器(DNS)："
 
-#: ../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 "
@@ -6067,175 +6067,175 @@ msgstr ""
 "掩码或CIDR形式的前缀是可接受的。网关和域名服务器域必须是有效的IPv4或IPv6的地"
 "址。"
 
-#: ../loader2/net.c:1115
+#: ../loader/net.c:1115
 msgid "Manual TCP/IP Configuration"
 msgstr "手动配置TCP/IP"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "缺少信息"
 
-#: ../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 "必须输入有效的 IPv4 地址和子网掩码或CIDR代码。"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "您必须输入有效的 IPv6 地址和一个 CIDR 前缀。"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "正在确定主机的名称和域..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart 网络命令 %s 的参数不对：%s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "网络命令中指定的 bootproto %s 不对"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "网络设备"
 
-#: ../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 "您的系统上具有多种网络设备。您想通过哪一种设备来安装？"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS 服务器名称："
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s 目录："
 
-#: ../loader2/nfsinstall.c:65
+#: ../loader/nfsinstall.c:65
 #, c-format
 msgid "Please enter the server name and path to your %s images."
 msgstr "请输入服务器名称以及到您的 %s 映像的路径。"
 
-#: ../loader2/nfsinstall.c:67
+#: ../loader/nfsinstall.c:67
 msgid "NFS Setup"
 msgstr "NFS 设置"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "无需设置DNS指定主机名"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "检索"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "无法从服务器中挂载该目录。"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "该目录似乎不包含 %s 安装树。"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart 命令 %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 "正在等待 telnet 连接..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "通过 telnet 运行 anaconda ..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "无法获取 %s://%s/%s。"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "无法获取安装映像。"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "URL kickstart 方法命令 %s 的参数不对：%s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "必须给 URL kickstart 方法提供一个 --url 参数。"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "未知 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 "请在您的服务器中输入包含 %s 映像的 URL。"
 
-#: ../loader2/urls.c:293
+#: ../loader/urls.c:293
 msgid "Configure proxy"
 msgstr "配置代理服务器"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 msgid "URL Setup"
 msgstr "URL 设置"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 msgid "You must enter a URL."
 msgstr "您必须输入一个 URL。"
 
-#: ../loader2/urls.c:322
+#: ../loader/urls.c:322
 msgid "URL must be either an ftp or http URL"
 msgstr "URL 必须是 ftp 或者 http URL"
 
-#: ../loader2/urls.c:333
+#: ../loader/urls.c:333
 msgid "Unknown Host"
 msgstr "未知主机"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s 不是有效的主机名。"
 
-#: ../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."
 msgstr "如果要使用的是 HTTP 代理服务器，请输入要使用的 HTTP 代理服务器名称。"
 
-#: ../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
 msgid "Further Setup"
 msgstr "更多设置"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "载入 SCSI 驱动程序"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "正在载入 %s 驱动程序..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 14304ff3e..68f5eb7b9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -54,41 +54,41 @@ msgstr "按下 <enter> 以啟動命令列"
 #: ../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 "確定"
 
@@ -565,22 +565,22 @@ msgstr "正在格式化 %s 檔案系統..."
 #: ../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 "錯誤"
 
@@ -634,8 +634,8 @@ msgstr ""
 "請按 <Enter> 重新啟動您的系統。"
 
 #: ../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 "跳過"
 
@@ -962,21 +962,21 @@ msgstr "修護"
 
 #: ../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 "是"
 
 #: ../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 "否"
 
-#: ../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 "重試"
 
@@ -987,8 +987,8 @@ msgstr "忽略"
 #: ../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 "取消"
 
@@ -1816,21 +1816,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 "上一步"
 
 #: ../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 "繼續"
 
@@ -2226,7 +2226,7 @@ msgstr "請輸入磁區群組名稱。"
 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 "歡迎使用 %s"
@@ -3079,7 +3079,7 @@ msgstr ""
 msgid "Language Selection"
 msgstr "選擇語言"
 
-#: ../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 "在安裝的過程中你想使用哪種語言？"
 
@@ -3448,7 +3448,7 @@ msgstr "欄位 \"%s\" 需要一個數值。"
 msgid "Dynamic IP"
 msgstr "動態 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 "正在傳送 %s 之 IP 資訊的要求..."
@@ -3623,7 +3623,7 @@ msgstr "不知名類型"
 msgid "Hardware address: "
 msgstr "硬體位址：%s"
 
-#: ../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 "缺少通訊協定"
 
@@ -3633,7 +3633,7 @@ msgid "You must select at least IPv4 or IPv6 support."
 msgstr "使用 DHCP 時，您必須選擇至少一項通訊協定（IPv4 或 IPv6）。"
 
 #: ../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 "無效的前置"
 
@@ -3863,7 +3863,7 @@ msgstr "RAID 裝置"
 msgid "None"
 msgstr "沒有"
 
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:334
+#: ../iw/partition_gui.py:816 ../loader/hdinstall.c:334
 msgid "Hard Drives"
 msgstr "硬碟"
 
@@ -4744,12 +4744,12 @@ msgstr "IPv6/前置"
 msgid "Activate on boot"
 msgstr "開機時立即啟動"
 
-#: ../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 "啟用 IPv4 支援"
 
-#: ../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 "啟用 IPv6 支援"
@@ -4878,7 +4878,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 "閘道器："
 
@@ -5488,23 +5488,23 @@ 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 "媒體測試"
 
-#: ../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 "測試"
 
-#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:100
+#: ../loader/cdinstall.c:96 ../loader/cdinstall.c:100
 #, fuzzy
 msgid "Eject Disc"
 msgstr "退出光碟片"
 
-#: ../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 "
@@ -5513,7 +5513,7 @@ msgstr ""
 "選取 \"%s\" 來測試光碟機裡的光碟片，或選取 \"%s\" 退出光碟片並放入另一片以作"
 "測試。"
 
-#: ../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 "
@@ -5526,19 +5526,19 @@ 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 "
 "and press %s to retry."
 msgstr "在您的光碟機中找不到 %s 光碟片。 請置入 %s 光碟片，並按下 %s 重試。"
 
-#: ../loader2/cdinstall.c:200
+#: ../loader/cdinstall.c:200
 #, fuzzy
 msgid "Disc Found"
 msgstr "找到光碟片"
 
-#: ../loader2/cdinstall.c:201
+#: ../loader/cdinstall.c:201
 #, fuzzy, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -5549,101 +5549,101 @@ msgstr ""
 "\n"
 "選取 %s 略過媒體測試並開始安裝程式。"
 
-#: ../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 "
 "disc and press %s to retry."
 msgstr "在您的光碟機中找不到開機媒體光碟片 %s，請置入 %s 光碟片，並按下 %s 重試。"
 
-#: ../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 "
 "disc and press %s to retry."
 msgstr "在您的光碟機中找不到 %s 光碟片。 請置入 %s 光碟片，並按下 %s 重試。"
 
-#: ../loader2/cdinstall.c:350
+#: ../loader/cdinstall.c:350
 #, fuzzy
 msgid "Disc Not Found"
 msgstr "找不到光碟片"
 
-#: ../loader2/cdinstall.c:422
+#: ../loader/cdinstall.c:422
 msgid "Cannot find kickstart file on CDROM."
 msgstr "在光碟片上找不到 kickstart 檔案。"
 
-#: ../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 "無法讀取目錄 %s: %s"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Loading"
 msgstr "載入中"
 
-#: ../loader2/driverdisk.c:138
+#: ../loader/driverdisk.c:138
 msgid "Reading driver disk..."
 msgstr "讀取驅動程式磁片中..."
 
-#: ../loader2/driverdisk.c:230 ../loader2/driverdisk.c:262
+#: ../loader/driverdisk.c:230 ../loader/driverdisk.c:262
 msgid "Driver Disk Source"
 msgstr "驅動程式磁片來源"
 
-#: ../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?"
 msgstr "你的系統有多個裝置可當作驅動程式磁片的來源。 您想要使用那一個？"
 
-#: ../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?"
 msgstr "這裝置中，有多個分割區包含驅動程式磁片的映像檔。您想要使用哪一個？"
 
-#: ../loader2/driverdisk.c:300
+#: ../loader/driverdisk.c:300
 msgid "Failed to mount partition."
 msgstr "無法掛載分割區。"
 
-#: ../loader2/driverdisk.c:308
+#: ../loader/driverdisk.c:308
 msgid "Select driver disk image"
 msgstr "選擇驅動程式磁片映像檔"
 
-#: ../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
 msgid "Failed to load driver disk from file."
 msgstr "無法從檔案載入驅動程式磁片。"
 
-#: ../loader2/driverdisk.c:349
+#: ../loader/driverdisk.c:349
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "請放入驅動程式磁片到 /dev/%s，並按「確定」繼續。"
 
-#: ../loader2/driverdisk.c:351
+#: ../loader/driverdisk.c:351
 msgid "Insert Driver Disk"
 msgstr "放入驅動程式磁片"
 
-#: ../loader2/driverdisk.c:366
+#: ../loader/driverdisk.c:366
 msgid "Failed to mount driver disk."
 msgstr "無法掛載驅動程式磁片。"
 
-#: ../loader2/driverdisk.c:376
+#: ../loader/driverdisk.c:376
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "驅動程式磁片不適用於 %s 的此版本。"
 
-#: ../loader2/driverdisk.c:439
+#: ../loader/driverdisk.c:439
 msgid "Manually choose"
 msgstr "手動選取"
 
-#: ../loader2/driverdisk.c:440
+#: ../loader/driverdisk.c:440
 msgid "Load another disk"
 msgstr "載入另一片磁片"
 
-#: ../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 "
@@ -5652,45 +5652,45 @@ msgstr ""
 "在這片驅動程式磁片上找不到適當的裝置類型。 您想要手動選取驅動程式或繼續進行，"
 "或者要放入另一片驅動程式磁片？"
 
-#: ../loader2/driverdisk.c:479
+#: ../loader/driverdisk.c:479
 msgid "Driver disk"
 msgstr "驅動程式磁片"
 
-#: ../loader2/driverdisk.c:480
+#: ../loader/driverdisk.c:480
 msgid "Do you have a driver disk?"
 msgstr "你有驅動程式的磁片嗎？"
 
-#: ../loader2/driverdisk.c:489
+#: ../loader/driverdisk.c:489
 msgid "More Driver Disks?"
 msgstr "還有其他的驅動程式磁片嗎？"
 
-#: ../loader2/driverdisk.c:490
+#: ../loader/driverdisk.c:490
 msgid "Do you wish to load any more driver disks?"
 msgstr "您想要載入其他驅動程式磁片嗎？"
 
-#: ../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 錯誤"
 
-#: ../loader2/driverdisk.c:536
+#: ../loader/driverdisk.c:536
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "未知的 kickstart 驅動程式磁片來源: %s"
 
-#: ../loader2/driverdisk.c:573
+#: ../loader/driverdisk.c:573
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "下列 kickstart 驅動程式磁片之指令的引數無效: %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 "
@@ -5700,25 +5700,25 @@ msgstr ""
 "請輸入您想要傳送到 %s 模組的任何參數（請以空白分隔）。 如果您不知道該加什麼參"
 "數， 請按 \"OK\" 鈕跳過這個畫面。"
 
-#: ../loader2/driverselect.c:85
+#: ../loader/driverselect.c:85
 msgid "Enter Module Parameters"
 msgstr "請輸入模組參數"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "No drivers found"
 msgstr "找不到驅動程式"
 
-#: ../loader2/driverselect.c:172
+#: ../loader/driverselect.c:172
 msgid "Load driver disk"
 msgstr "載入驅動程式磁片"
 
-#: ../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 "找不到驅動程式，您想要使用一片驅動程式磁片嗎？"
 
-#: ../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."
@@ -5726,45 +5726,45 @@ msgstr ""
 "請在以下選取您想要載入的驅動程式？ 如果在清單中找不到您要的，而且您有一片驅動"
 "程式磁片，請按 <F2>。"
 
-#: ../loader2/driverselect.c:200
+#: ../loader/driverselect.c:200
 msgid "Specify optional module arguments"
 msgstr "指定額外的模組引數"
 
-#: ../loader2/driverselect.c:225
+#: ../loader/driverselect.c:225
 msgid "Select Device Driver to Load"
 msgstr "選擇要載入的裝置驅動程式"
 
-#: ../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 "偵測到媒體"
 
-#: ../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 "偵測到本機的安裝媒體..."
 
-#: ../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 "
 "media."
 msgstr "這個目錄中的 %s 安裝樹似乎與您的開機媒體不相符。"
 
-#: ../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."
 msgstr "讀取 ISO 映像檔時發生錯誤。 請檢查您的 ISO 映像檔然後再試一次。"
 
-#: ../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?"
 msgstr "您的系統似乎沒有硬碟！ 您想要設定其他裝置嗎？"
 
-#: ../loader2/hdinstall.c:349
+#: ../loader/hdinstall.c:349
 #, c-format
 msgid ""
 "What partition and directory on that partition hold the CD (iso9660) images "
@@ -5774,192 +5774,192 @@ msgstr ""
 "在該分割區上那一個分割區與目錄含有 %s 的 CD (iso9660) 映像檔？ 如果您在這裡沒"
 "有看到您使用中的硬碟，按下 F2 來設定其他裝置。"
 
-#: ../loader2/hdinstall.c:372
+#: ../loader/hdinstall.c:372
 msgid "Directory holding images:"
 msgstr "存放映像檔的目錄:"
 
-#: ../loader2/hdinstall.c:400
+#: ../loader/hdinstall.c:400
 msgid "Select Partition"
 msgstr "選擇分割區"
 
-#: ../loader2/hdinstall.c:439
+#: ../loader/hdinstall.c:439
 #, c-format
 msgid "Device %s does not appear to contain %s CDROM images."
 msgstr "裝置 %s 並不含有 %s CDROM 的映像檔。"
 
-#: ../loader2/hdinstall.c:471
+#: ../loader/hdinstall.c:471
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "硬碟 kickstart 方式之指令 %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 "在硬碟上找不到 kickstart 檔案。"
 
-#: ../loader2/hdinstall.c:584
+#: ../loader/hdinstall.c:584
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "無法為 BIOS 磁碟 %s 找到硬碟"
 
-#: ../loader2/kbd.c:136
+#: ../loader/kbd.c:136
 msgid "Keyboard Type"
 msgstr "鍵盤類型"
 
-#: ../loader2/kbd.c:137
+#: ../loader/kbd.c:137
 msgid "What type of keyboard do you have?"
 msgstr "您使用的是那一種鍵盤呢？"
 
-#: ../loader2/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %s"
 msgstr "開啟 kickstart 檔案 %s 發生錯誤: %s"
 
-#: ../loader2/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %s"
 msgstr "讀取 kickstart 檔案 %s 內容時發生錯誤: %s"
 
-#: ../loader2/kickstart.c:186
+#: ../loader/kickstart.c:186
 #, c-format
 msgid "Error in %s on line %d of kickstart file %s."
 msgstr "在 %s 位於第 %d 行在 kickstart 檔案 %s 有錯誤發生。"
 
-#: ../loader2/kickstart.c:285
+#: ../loader/kickstart.c:285
 #, fuzzy
 msgid "Cannot find ks.cfg on removable media."
 msgstr "安裝磁片上找不到 ks.cfg 這個檔案。"
 
-#: ../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 "開啟 kickstart 檔案 %s 發生錯誤: %s"
 
-#: ../loader2/kickstart.c:530
+#: ../loader/kickstart.c:530
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "關閉 kickstart 所用的參數 %s不正確：%s"
 
-#: ../loader2/lang.c:64
+#: ../loader/lang.c:64
 #, fuzzy, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "歡迎使用 %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> 移動游標 | <Space> 選取 | <F12> 下一個畫面"
 
-#: ../loader2/lang.c:373
+#: ../loader/lang.c:373
 msgid "Choose a Language"
 msgstr "選擇語言"
 
-#: ../loader2/loader.c:123
+#: ../loader/loader.c:123
 #, fuzzy
 msgid "Local CD/DVD"
 msgstr "本機光碟機"
 
-#: ../loader2/loader.c:125
+#: ../loader/loader.c:125
 msgid "Hard drive"
 msgstr "硬碟"
 
-#: ../loader2/loader.c:126
+#: ../loader/loader.c:126
 #, fuzzy
 msgid "NFS directory"
 msgstr "%s 安裝目錄："
 
-#: ../loader2/loader.c:156
+#: ../loader/loader.c:156
 #, fuzzy, c-format
 msgid "Welcome to %s%n for %s"
 msgstr "歡迎使用 %s"
 
-#: ../loader2/loader.c:374 ../loader2/loader.c:410
+#: ../loader/loader.c:374 ../loader/loader.c:410
 msgid "Update Disk Source"
 msgstr "更新磁片來源"
 
-#: ../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?"
 msgstr "您的系統有多個裝置可以當作更新磁片的來源。 您想要使用那一個？"
 
-#: ../loader2/loader.c:411
+#: ../loader/loader.c:411
 #, fuzzy
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr "這裝置中，有多個分割區包含驅動程式磁片的映像檔。您想要使用哪一個？"
 
-#: ../loader2/loader.c:429
+#: ../loader/loader.c:429
 #, c-format
 msgid "Insert your updates disk into /dev/%s and press \"OK\" to continue."
 msgstr "請放入您的更新磁片到 /dev/%s 並按 \"OK\" 繼續。"
 
-#: ../loader2/loader.c:431
+#: ../loader/loader.c:431
 msgid "Updates Disk"
 msgstr "更新磁片"
 
-#: ../loader2/loader.c:446
+#: ../loader/loader.c:446
 msgid "Failed to mount updates disk"
 msgstr "掛載更新磁片失敗"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Updates"
 msgstr "更新"
 
-#: ../loader2/loader.c:449
+#: ../loader/loader.c:449
 msgid "Reading anaconda updates..."
 msgstr "正在讀取 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 "開啟 kickstart 檔案 %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 "本機器沒有足夠的記憶體可供安裝 %s。"
 
-#: ../loader2/loader.c:1151
+#: ../loader/loader.c:1151
 msgid "Rescue Method"
 msgstr "救援方式"
 
-#: ../loader2/loader.c:1152
+#: ../loader/loader.c:1152
 msgid "Installation Method"
 msgstr "安裝方式"
 
-#: ../loader2/loader.c:1154
+#: ../loader/loader.c:1154
 msgid "What type of media contains the rescue image?"
 msgstr "您的救援映像檔存放在那一種媒體上呢？"
 
-#: ../loader2/loader.c:1156
+#: ../loader/loader.c:1156
 msgid "What type of media contains the packages to be installed?"
 msgstr "您想安裝的套件是放在那一種儲存媒體上呢？"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "No driver found"
 msgstr "找不到驅動程式"
 
-#: ../loader2/loader.c:1180
+#: ../loader/loader.c:1180
 msgid "Select driver"
 msgstr "選擇驅動程式"
 
-#: ../loader2/loader.c:1181
+#: ../loader/loader.c:1181
 msgid "Use a driver disk"
 msgstr "使用驅動程式的磁片"
 
-#: ../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?"
@@ -5967,65 +5967,65 @@ msgstr ""
 "找不到這種安裝類型所需的任何裝置類型。您想要手動選取您的驅動程式或使用驅動程"
 "式磁片？"
 
-#: ../loader2/loader.c:1415
+#: ../loader/loader.c:1415
 msgid "The following devices have been found on your system."
 msgstr "已經在您的系統上找到下列裝置。"
 
-#: ../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 "並沒有為您的系統載入任何的裝置驅動程式，您想要現在載入嗎？"
 
-#: ../loader2/loader.c:1421
+#: ../loader/loader.c:1421
 msgid "Devices"
 msgstr "裝置"
 
-#: ../loader2/loader.c:1422
+#: ../loader/loader.c:1422
 msgid "Done"
 msgstr "完成"
 
-#: ../loader2/loader.c:1423
+#: ../loader/loader.c:1423
 msgid "Add Device"
 msgstr "新增裝置"
 
-#: ../loader2/loader.c:1600
+#: ../loader/loader.c:1600
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "已經執行載入程式。 正在啟動 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 "正在執行 anaconda，%s 系統的緊急救援模式 - 請稍候...\n"
 
-#: ../loader2/loader.c:1948
+#: ../loader/loader.c:1948
 #, fuzzy, c-format
 msgid "Running anaconda %s, the %s system installer - please wait...\n"
 msgstr "正在執行 anaconda，%s 系統安裝程式 - 請稍候...\n"
 
-#: ../loader2/mediacheck.c:62
+#: ../loader/mediacheck.c:62
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "找不到安裝映像檔 %s"
 
-#: ../loader2/mediacheck.c:68
+#: ../loader/mediacheck.c:68
 #, c-format
 msgid "Checking \"%s\"..."
 msgstr "正在檢查 \"%s\"..."
 
-#: ../loader2/mediacheck.c:70
+#: ../loader/mediacheck.c:70
 #, c-format
 msgid "Checking media now..."
 msgstr "正在檢查媒體..."
 
-#: ../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."
 msgstr "無法從主卷冊描述中讀取磁碟數值。 這也許表示在建立此磁碟時沒有加上檢測值資訊。"
 
-#: ../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 "
@@ -6034,18 +6034,18 @@ msgstr ""
 "剛剛測試的影像檔的有錯誤，可能是下載檔或碟片已損壞。 如果可能的話，請清潔您的"
 "碟片，然後再試一次。 假如這個測試再次失敗，您不應該繼續安裝。"
 
-#: ../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"
@@ -6056,27 +6056,27 @@ msgstr ""
 "\n"
 "   %s？"
 
-#: ../loader2/method.c:393
+#: ../loader/method.c:393
 msgid "Checksum Test"
 msgstr "Checksum 測試"
 
-#: ../loader2/modules.c:337
+#: ../loader/modules.c:337
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "kickstart 方式之指令 %s 的裝置引數不正確: %s"
 
-#: ../loader2/modules.c:349
+#: ../loader/modules.c:349
 #, fuzzy
 msgid "A module name must be specified for the kickstart device command."
 msgstr "下列 kickstart 驅動程式磁片之指令的引數無效: %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 "前置數字必須介於 1 到 32 之間（IPv4）或介於 1 到 128 之間（IPv6）。"
 
-#: ../loader2/net.c:266
+#: ../loader/net.c:266
 #, c-format
 msgid ""
 "%s is a wireless network adapter.  Please provide the ESSID and encryption "
@@ -6086,28 +6086,28 @@ msgstr ""
 "%s 是無線網路卡。請輸入連接您無線網路所需的 ESSID 與加密金鑰。如果不需要金鑰"
 "即可連接您的網路，請將欄位留空，繼續安裝。"
 
-#: ../loader2/net.c:272
+#: ../loader/net.c:272
 msgid "ESSID"
 msgstr "ESSID"
 
-#: ../loader2/net.c:273
+#: ../loader/net.c:273
 msgid "Encryption Key"
 msgstr "加密金鑰"
 
-#: ../loader2/net.c:276
+#: ../loader/net.c:276
 msgid "Wireless Settings"
 msgstr "無線設定"
 
-#: ../loader2/net.c:311
+#: ../loader/net.c:311
 msgid "Nameserver IP"
 msgstr "名稱伺服器的 IP 位址"
 
-#: ../loader2/net.c:315
+#: ../loader/net.c:315
 #, fuzzy
 msgid "Missing Nameserver"
 msgstr "名稱伺服器"
 
-#: ../loader2/net.c:316
+#: ../loader/net.c:316
 #, fuzzy
 msgid ""
 "Your IP address request returned configuration information, but it did not "
@@ -6117,236 +6117,236 @@ msgstr ""
 "您的動態 IP 設定回應不包括 DNS 名稱伺服器。 如果您知道您的名稱伺服器，請現在"
 "輸入。否則就留下空白，而安裝過程仍將繼續。"
 
-#: ../loader2/net.c:338
+#: ../loader/net.c:338
 msgid "Invalid IP Information"
 msgstr "輸入的 IP 資料無效"
 
-#: ../loader2/net.c:339
+#: ../loader/net.c:339
 msgid "You entered an invalid IP address."
 msgstr "您輸入無效的 IP 位址。"
 
-#: ../loader2/net.c:589 ../loader2/net.c:695
+#: ../loader/net.c:589 ../loader/net.c:695
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: ../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 "設定網路界面時發生錯誤。"
 
-#: ../loader2/net.c:776
+#: ../loader/net.c:776
 msgid "Configure TCP/IP"
 msgstr "設定 TCP/IP"
 
-#: ../loader2/net.c:821
+#: ../loader/net.c:821
 #, fuzzy
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "使用 DHCP 時，您必須選擇至少一項通訊協定（IPv4 或 IPv6）。"
 
-#: ../loader2/net.c:828
+#: ../loader/net.c:828
 msgid "IPv4 Needed for NFS"
 msgstr "NFS 需要 IPv4"
 
-#: ../loader2/net.c:829
+#: ../loader/net.c:829
 msgid "NFS installation method requires IPv4 support."
 msgstr "要使用 NFS 安裝，需要 IPv4 的支援。"
 
-#: ../loader2/net.c:950
+#: ../loader/net.c:950
 msgid "IPv4 address:"
 msgstr "IPv4 位址："
 
-#: ../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 位址："
 
-#: ../loader2/net.c:1063
+#: ../loader/net.c:1063
 msgid "Name Server:"
 msgstr "名稱伺服器："
 
-#: ../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
 msgid "Manual TCP/IP Configuration"
 msgstr "手動 TCP/IP 設定"
 
-#: ../loader2/net.c:1224 ../loader2/net.c:1230
+#: ../loader/net.c:1224 ../loader/net.c:1230
 msgid "Missing Information"
 msgstr "資訊不足"
 
-#: ../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 "您必須輸入有效的 IPv4 位址及網路遮罩或 CIDR 前置字元。"
 
-#: ../loader2/net.c:1231
+#: ../loader/net.c:1231
 #, fuzzy
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "您必須輸入有效的 IPv6 位址及 aCIDR 前置字元。"
 
-#: ../loader2/net.c:1552
+#: ../loader/net.c:1552
 msgid "Determining host name and domain..."
 msgstr "正在決定主機及網域名稱..."
 
-#: ../loader2/net.c:1648
+#: ../loader/net.c:1648
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart 網路指令 %s 的引數不正確: %s"
 
-#: ../loader2/net.c:1671
+#: ../loader/net.c:1671
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "錯誤的開機網路命令 %s 設定"
 
-#: ../loader2/net.c:1859
+#: ../loader/net.c:1859
 msgid "Networking Device"
 msgstr "網路裝置"
 
-#: ../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 "你的系統有多個網路裝置。 您想要透過那一個安裝？"
 
-#: ../loader2/nfsinstall.c:57
+#: ../loader/nfsinstall.c:57
 msgid "NFS server name:"
 msgstr "NFS 伺服器名稱："
 
-#: ../loader2/nfsinstall.c:60
+#: ../loader/nfsinstall.c:60
 #, c-format
 msgid "%s directory:"
 msgstr "%s 安裝目錄："
 
-#: ../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 設定"
 
-#: ../loader2/nfsinstall.c:154
+#: ../loader/nfsinstall.c:154
 msgid "Hostname specified with no DNS configured"
 msgstr "指定了主機名稱，但未設定 DNS"
 
-#: ../loader2/nfsinstall.c:215 ../loader2/urls.c:223
+#: ../loader/nfsinstall.c:215 ../loader/urls.c:223
 msgid "Retrieving"
 msgstr "正在擷取資訊"
 
-#: ../loader2/nfsinstall.c:284
+#: ../loader/nfsinstall.c:284
 msgid "That directory could not be mounted from the server."
 msgstr "無法從該伺服器掛載這個目錄。"
 
-#: ../loader2/nfsinstall.c:297
+#: ../loader/nfsinstall.c:297
 #, c-format
 msgid "That directory does not seem to contain a %s installation tree."
 msgstr "該目錄並沒有 %s 的安裝樹。"
 
-#: ../loader2/nfsinstall.c:343
+#: ../loader/nfsinstall.c:343
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart 方式之指令 %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 "正在等候 telnet 連線..."
 
-#: ../loader2/telnetd.c:131
+#: ../loader/telnetd.c:131
 msgid "Running anaconda via telnet..."
 msgstr "正在使用 telnet 執行 anaconda..."
 
-#: ../loader2/urlinstall.c:79
+#: ../loader/urlinstall.c:79
 #, fuzzy, c-format
 msgid "Unable to retrieve %s://%s/%s."
 msgstr "無法擷取 %s://%s/%s/%s。"
 
-#: ../loader2/urlinstall.c:186
+#: ../loader/urlinstall.c:186
 msgid "Unable to retrieve the install image."
 msgstr "無法擷取安裝映像檔。"
 
-#: ../loader2/urlinstall.c:438
+#: ../loader/urlinstall.c:438
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url kickstart 方式之指令 %s 的引數不正確: %s"
 
-#: ../loader2/urlinstall.c:447
+#: ../loader/urlinstall.c:447
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "必須提供一個 --url 引數給 Url 的 kickstart 方式。"
 
-#: ../loader2/urlinstall.c:456
+#: ../loader/urlinstall.c:456
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "未知的 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 "設定 TCP/IP"
 
-#: ../loader2/urls.c:308
+#: ../loader/urls.c:308
 #, fuzzy
 msgid "URL Setup"
 msgstr "NFS 設定"
 
-#: ../loader2/urls.c:316
+#: ../loader/urls.c:316
 #, fuzzy
 msgid "You must enter a URL."
 msgstr "您必須輸入目錄名稱。"
 
-#: ../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 "未知的主機"
 
-#: ../loader2/urls.c:334
+#: ../loader/urls.c:334
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s 不是有效的主機名稱。"
 
-#: ../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."
 msgstr "如果您正使用 HTTP 代理伺服器，請輸入 HTTP 代理伺服器的名稱。"
 
-#: ../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 "進階 FTP 設定"
 
-#: ../loader2/windows.c:63
+#: ../loader/windows.c:63
 msgid "Loading SCSI driver"
 msgstr "正在載入 SCSI 驅動程式"
 
-#: ../loader2/windows.c:64
+#: ../loader/windows.c:64
 #, c-format
 msgid "Loading %s driver..."
 msgstr "正在載入 %s 的驅動程式..."
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..."
author	David Cantrell <dcantrell@redhat.com>	2008-08-25 17:13:37 -1000
committer	David Cantrell <dcantrell@redhat.com>	2008-08-25 17:13:37 -1000
commit	80713e3f73e48856221c667f32b94b0a023ebecc (patch)
tree	aff4d9170fc24d2f1acc238a2d8908159a71d3dd /po
parent	ef5fbf7bc72572f3a6326b12f9187a5438e58e4c (diff)
download	anaconda-80713e3f73e48856221c667f32b94b0a023ebecc.tar.gz anaconda-80713e3f73e48856221c667f32b94b0a023ebecc.tar.xz anaconda-80713e3f73e48856221c667f32b94b0a023ebecc.zip