Renamed loader2 subdirectory to loader (hooray for git)

1 files changed, 264 insertions, 264 deletions

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 的驅動程式..."