Sending translation for Chinese (Traditional)

1 files changed, 1738 insertions, 2155 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index a95cd32c8..2b5116c5b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,3 +1,4 @@
+# translation of anaconda.master.po to Traditional Chinese
 # translation of anaconda.master.po to
 # Translation of anaconda to Traditional Chinese
 # Copyright (C) 2002 Red Hat, Inc.
@@ -15,65 +16,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: anaconda.master\n"
 "Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2009-08-05 10:18-0400\n"
-"PO-Revision-Date: 2009-04-02 11:51+1000\n"
+"POT-Creation-Date: 2009-08-26 02:51+0000\n"
+"PO-Revision-Date: 2009-08-27 10:31+1000\n"
 "Last-Translator: Terry Chuang <tchuang@redhat.com>\n"
-"Language-Team:  <zh@li.org>\n"
+"Language-Team: Traditional Chinese <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: anaconda:374
+#: ../anaconda:374
 msgid "Press <enter> for a shell"
-msgstr "按下 <enter> 以啟動命令列"
-
-#: anaconda:389 rescue.py:324 rescue.py:350 rescue.py:363 rescue.py:439
-#: rescue.py:451 text.py:545 loader/cdinstall.c:228 loader/cdinstall.c:232
-#: loader/cdinstall.c:248 loader/cdinstall.c:251 loader/cdinstall.c:445
-#: loader/cdinstall.c:452 loader/cdinstall.c:517 loader/dirbrowser.c:145
-#: loader/driverdisk.c:98 loader/driverdisk.c:243 loader/driverdisk.c:274
-#: loader/driverdisk.c:305 loader/driverdisk.c:340 loader/driverdisk.c:359
-#: loader/driverdisk.c:371 loader/driverdisk.c:379 loader/driverdisk.c:539
-#: loader/driverdisk.c:576 loader/driverselect.c:81 loader/driverselect.c:205
-#: loader/hdinstall.c:134 loader/hdinstall.c:280 loader/hdinstall.c:343
-#: loader/hdinstall.c:375 loader/hdinstall.c:445 loader/hdinstall.c:488
-#: loader/hdinstall.c:501 loader/kbd.c:138 loader/kickstart.c:132
-#: loader/kickstart.c:142 loader/kickstart.c:185 loader/kickstart.c:284
-#: loader/kickstart.c:375 loader/kickstart.c:554 loader/lang.c:115
-#: loader/lang.c:379 loader/loader.c:403 loader/loader.c:439
-#: loader/loader.c:482 loader/loader.c:503 loader/loader.c:520
-#: loader/loader.c:557 loader/loader.c:1207 loader/loader.c:1382
-#: loader/mediacheck.c:46 loader/mediacheck.c:85 loader/mediacheck.c:92
-#: loader/mediacheck.c:101 loader/method.c:279 loader/method.c:353
-#: loader/modules.c:335 loader/modules.c:347 loader/net.c:572 loader/net.c:943
-#: loader/net.c:1577 loader/net.c:1598 loader/net.c:1856 loader/net.c:1878
-#: loader/net.c:1890 loader/nfsinstall.c:91 loader/nfsinstall.c:248
-#: loader/nfsinstall.c:267 loader/nfsinstall.c:335 loader/telnetd.c:92
-#: loader/urlinstall.c:83 loader/urlinstall.c:107 loader/urlinstall.c:175
-#: loader/urlinstall.c:418 loader/urlinstall.c:427 loader/urlinstall.c:436
-#: loader/urls.c:292 loader/urls.c:328 loader/urls.c:334 loader/urls.c:346
-#: textw/constants_text.py:44
+msgstr "按下 <enter> 以啟動 shell"
+
+#. button bar at the bottom of the window
+#: ../anaconda:389 ../rescue.py:324 ../rescue.py:350 ../rescue.py:363
+#: ../rescue.py:439 ../rescue.py:451 ../text.py:545 ../loader/cdinstall.c:228
+#: ../loader/cdinstall.c:232 ../loader/cdinstall.c:248
+#: ../loader/cdinstall.c:251 ../loader/cdinstall.c:445
+#: ../loader/cdinstall.c:452 ../loader/cdinstall.c:517
+#: ../loader/dirbrowser.c:145 ../loader/driverdisk.c:98
+#: ../loader/driverdisk.c:243 ../loader/driverdisk.c:274
+#: ../loader/driverdisk.c:305 ../loader/driverdisk.c:340
+#: ../loader/driverdisk.c:359 ../loader/driverdisk.c:371
+#: ../loader/driverdisk.c:379 ../loader/driverdisk.c:539
+#: ../loader/driverdisk.c:576 ../loader/driverselect.c:81
+#: ../loader/driverselect.c:205 ../loader/hdinstall.c:134
+#: ../loader/hdinstall.c:280 ../loader/hdinstall.c:343
+#: ../loader/hdinstall.c:375 ../loader/hdinstall.c:445
+#: ../loader/hdinstall.c:488 ../loader/hdinstall.c:501 ../loader/kbd.c:119
+#: ../loader/kickstart.c:132 ../loader/kickstart.c:142
+#: ../loader/kickstart.c:185 ../loader/kickstart.c:284
+#: ../loader/kickstart.c:381 ../loader/kickstart.c:562 ../loader/lang.c:115
+#: ../loader/lang.c:379 ../loader/loader.c:403 ../loader/loader.c:439
+#: ../loader/loader.c:482 ../loader/loader.c:503 ../loader/loader.c:520
+#: ../loader/loader.c:557 ../loader/loader.c:1211 ../loader/loader.c:1389
+#: ../loader/mediacheck.c:46 ../loader/mediacheck.c:85
+#: ../loader/mediacheck.c:92 ../loader/mediacheck.c:101 ../loader/method.c:279
+#: ../loader/method.c:353 ../loader/modules.c:335 ../loader/modules.c:347
+#: ../loader/net.c:574 ../loader/net.c:945 ../loader/net.c:1579
+#: ../loader/net.c:1600 ../loader/net.c:1858 ../loader/net.c:1880
+#: ../loader/net.c:1892 ../loader/nfsinstall.c:91 ../loader/nfsinstall.c:248
+#: ../loader/nfsinstall.c:267 ../loader/nfsinstall.c:335
+#: ../loader/telnetd.c:92 ../loader/urlinstall.c:83 ../loader/urlinstall.c:107
+#: ../loader/urlinstall.c:175 ../loader/urlinstall.c:449
+#: ../loader/urlinstall.c:458 ../loader/urlinstall.c:467 ../loader/urls.c:292
+#: ../loader/urls.c:328 ../loader/urls.c:334 ../loader/urls.c:346
+#: ../textw/constants_text.py:44
 msgid "OK"
 msgstr "確定"
 
-#: anaconda:396
+#: ../anaconda:396
 msgid ""
 "You do not have enough RAM to use the graphical installer.  Starting text "
 "mode."
-msgstr "您沒有足夠的記憶體可使用圖形安裝模式，進入文字安裝模式。"
+msgstr "您沒有足夠的記憶體可使用圖形安裝模式，即將進入文字安裝模式。"
 
-#: anaconda:459
-#, fuzzy
+#: ../anaconda:459
 msgid "Starting graphical installation."
-msgstr "正在啟動圖形安裝介面..."
+msgstr "正在啟動圖形安裝介面。"
 
-#: anaconda:775
+#: ../anaconda:775
 msgid "Would you like to use VNC?"
 msgstr "您希望使用 VNC 嗎？"
 
-#: anaconda:776
+#: ../anaconda:776
 msgid ""
 "Text mode provides a limited set of installation options.  It does not allow "
 "you to specify your own partitioning layout or package selections.  Would "
@@ -82,98 +90,102 @@ msgstr ""
 "文字模式提供了一組安裝選項。它不允許您指定您自己的分割區格式或套件選擇。您是"
 "否希望使用 VNC 模式來代替？"
 
-#: anaconda:802
+#: ../anaconda:802
 msgid "Install class forcing text mode installation"
 msgstr "強制進入文字安裝模式"
 
-#: anaconda:821
-#, fuzzy
+#: ../anaconda:821
 msgid "Graphical installation is not available. Starting text mode."
-msgstr "無法使用圖形模式安裝...  開始文字模式安裝。"
+msgstr "無法使用圖形模式安裝。即將進入文字模式。"
 
-#: anaconda:829
-#, fuzzy
+#: ../anaconda:829
 msgid "DISPLAY variable not set. Starting text mode."
-msgstr "DISPLAY 變數並未設定。啟動文字模式！"
+msgstr "DISPLAY 變數尚未設定。即將啟動文字模式。"
 
-#: anaconda:997
+#: ../anaconda:997
 msgid "reipl configuration successful => reboot"
-msgstr "reipl 配置成功 => 重新啟動"
+msgstr "reipl 設定成功 => 重新啟動"
 
-#: anaconda:1000
+#: ../anaconda:1000
 msgid "reipl configuration failed => halt"
-msgstr "reipl 配置失敗 => 停滯"
+msgstr "reipl 設定失敗 => 停滯"
 
-#: backend.py:145
+#: ../backend.py:145
 #, python-format
 msgid "Upgrading %s\n"
 msgstr "正在升級 %s\n"
 
-#: backend.py:147
+#: ../backend.py:147
 #, python-format
 msgid "Installing %s\n"
 msgstr "正在安裝 %s\n"
 
-#: backend.py:167
+#: ../backend.py:167
 msgid "Copying File"
 msgstr "正在複製檔案"
 
-#: backend.py:168
-#, fuzzy
+#: ../backend.py:168
 msgid "Transferring install image to hard drive"
-msgstr "正在傳送安裝映像檔到硬碟..."
+msgstr "正在傳送安裝映像檔至硬碟。"
 
-#: backend.py:178
-#, fuzzy
+#: ../backend.py:178
 msgid ""
 "An error occurred transferring the install image to your hard drive.  This "
 "is often cause by damaged or low quality media."
-msgstr "傳送安裝映像檔到硬碟時發生錯誤。這可能是因為媒介出了問題。"
+msgstr "傳送安裝映像檔到您的硬碟時發生了錯誤。這一般是因為低品質的媒介或是媒介損毀所造成的。"
 
-#: backend.py:182
+#: ../backend.py:182
 msgid ""
 "An error occurred transferring the install image to your hard drive. You are "
 "probably out of disk space."
 msgstr "傳送安裝映像檔到硬碟時發生錯誤。你的硬碟空間可能不夠。"
 
-#: backend.py:186 image.py:285 livecd.py:192 livecd.py:396
-#: partIntfHelpers.py:208 text.py:308 text.py:312 yuminstall.py:364
-#: yuminstall.py:686 yuminstall.py:800 yuminstall.py:1081 yuminstall.py:1147
-#: yuminstall.py:1304 yuminstall.py:1322 iw/autopart_type.py:99
-#: iw/autopart_type.py:198 iw/autopart_type.py:318 iw/autopart_type.py:321
-#: iw/autopart_type.py:388 iw/autopart_type.py:396 iw/autopart_type.py:425
-#: iw/osbootwidget.py:210 iw/osbootwidget.py:219 iw/raid_dialog_gui.py:705
-#: iw/raid_dialog_gui.py:744 iw/task_gui.py:63 iw/task_gui.py:161
-#: iw/task_gui.py:292 iw/task_gui.py:414 loader/cdinstall.c:228
-#: loader/cdinstall.c:517 loader/driverdisk.c:98 loader/driverdisk.c:305
-#: loader/driverdisk.c:340 loader/driverdisk.c:371 loader/driverdisk.c:379
-#: loader/driverdisk.c:443 loader/hdinstall.c:134 loader/hdinstall.c:343
-#: loader/hdinstall.c:445 loader/hdinstall.c:488 loader/hdinstall.c:501
-#: loader/kickstart.c:284 loader/lang.c:115 loader/loader.c:403
-#: loader/loader.c:520 loader/loader.c:1207 loader/mediacheck.c:46
-#: loader/mediacheck.c:85 loader/mediacheck.c:92 loader/method.c:279
-#: loader/method.c:353 loader/nfsinstall.c:248 loader/nfsinstall.c:267
-#: loader/telnetd.c:92 loader/urlinstall.c:83 loader/urlinstall.c:107
-#: loader/urlinstall.c:175 loader/urls.c:328 loader/urls.c:334
-#: storage/__init__.py:1577 storage/__init__.py:1593
-#: textw/netconfig_text.py:272 textw/partition_text.py:186
-#: textw/partition_text.py:192 textw/partition_text.py:198
-#: textw/partition_text.py:231 textw/partition_text.py:241
-#: textw/upgrade_text.py:175 textw/upgrade_text.py:182
+#. success
+#. FIXME: would be nice to be able to recover here
+#. we don't have any more modules of the proper class.  ask
+#. * them to manually load
+#: ../backend.py:186 ../image.py:285 ../livecd.py:192 ../livecd.py:397
+#: ../partIntfHelpers.py:208 ../text.py:308 ../text.py:312
+#: ../yuminstall.py:378 ../yuminstall.py:722 ../yuminstall.py:836
+#: ../yuminstall.py:1114 ../yuminstall.py:1180 ../yuminstall.py:1338
+#: ../yuminstall.py:1356 ../iw/autopart_type.py:99 ../iw/autopart_type.py:198
+#: ../iw/autopart_type.py:318 ../iw/autopart_type.py:321
+#: ../iw/autopart_type.py:388 ../iw/autopart_type.py:396
+#: ../iw/autopart_type.py:425 ../iw/osbootwidget.py:210
+#: ../iw/osbootwidget.py:219 ../iw/raid_dialog_gui.py:705
+#: ../iw/raid_dialog_gui.py:744 ../iw/task_gui.py:63 ../iw/task_gui.py:176
+#: ../iw/task_gui.py:305 ../iw/task_gui.py:429 ../loader/cdinstall.c:228
+#: ../loader/cdinstall.c:517 ../loader/driverdisk.c:98
+#: ../loader/driverdisk.c:305 ../loader/driverdisk.c:340
+#: ../loader/driverdisk.c:371 ../loader/driverdisk.c:379
+#: ../loader/driverdisk.c:443 ../loader/hdinstall.c:134
+#: ../loader/hdinstall.c:343 ../loader/hdinstall.c:445
+#: ../loader/hdinstall.c:488 ../loader/hdinstall.c:501
+#: ../loader/kickstart.c:284 ../loader/lang.c:115 ../loader/loader.c:403
+#: ../loader/loader.c:520 ../loader/loader.c:1211 ../loader/mediacheck.c:46
+#: ../loader/mediacheck.c:85 ../loader/mediacheck.c:92 ../loader/method.c:279
+#: ../loader/method.c:353 ../loader/nfsinstall.c:248
+#: ../loader/nfsinstall.c:267 ../loader/telnetd.c:92 ../loader/urlinstall.c:83
+#: ../loader/urlinstall.c:107 ../loader/urlinstall.c:175 ../loader/urls.c:328
+#: ../loader/urls.c:334 ../storage/__init__.py:1577
+#: ../storage/__init__.py:1593 ../textw/netconfig_text.py:272
+#: ../textw/partition_text.py:186 ../textw/partition_text.py:192
+#: ../textw/partition_text.py:198 ../textw/partition_text.py:231
+#: ../textw/partition_text.py:241 ../textw/upgrade_text.py:175
+#: ../textw/upgrade_text.py:182
 msgid "Error"
 msgstr "錯誤"
 
-#: bootloader.py:53 bootloader.py:209 bootloader.py:216 image.py:82
-#: upgrade.py:242 yuminstall.py:1485 yuminstall.py:1521
-#: iw/autopart_type.py:208 iw/blpasswidget.py:151 iw/upgrade_swap_gui.py:192
-#: iw/upgrade_swap_gui.py:200 iw/upgrade_swap_gui.py:207
-#: storage/devicetree.py:141 storage/devicetree.py:168
-#: textw/upgrade_text.py:187
+#: ../bootloader.py:53 ../bootloader.py:209 ../bootloader.py:216
+#: ../image.py:82 ../upgrade.py:251 ../yuminstall.py:1519
+#: ../yuminstall.py:1555 ../iw/autopart_type.py:208 ../iw/blpasswidget.py:148
+#: ../iw/upgrade_swap_gui.py:192 ../iw/upgrade_swap_gui.py:200
+#: ../iw/upgrade_swap_gui.py:207 ../storage/devicetree.py:145
+#: ../storage/devicetree.py:172 ../textw/upgrade_text.py:187
 msgid "Warning"
 msgstr "警告"
 
-#: bootloader.py:54
-#, fuzzy
+#: ../bootloader.py:54
 msgid ""
 "Filesystems have already been activated.  You cannot go back past this "
 "point.\n"
@@ -184,81 +196,80 @@ msgstr ""
 "\n"
 "您想要繼續進行安裝嗎？"
 
-#: bootloader.py:58 gui.py:1093 gui.py:1140 gui.py:1268 gui.py:1345
-#: image.py:91 livecd.py:199 livecd.py:403 packages.py:126 packages.py:134
-#: packages.py:142 packages.py:150 packages.py:162 packages.py:171
-#: packages.py:179 packages.py:188 upgrade.py:57 upgrade.py:197
-#: yuminstall.py:804 yuminstall.py:884 yuminstall.py:890 yuminstall.py:1052
-#: yuminstall.py:1077 yuminstall.py:1135 yuminstall.py:1299 yuminstall.py:1329
-#: storage/__init__.py:89 storage/__init__.py:1679
+#: ../bootloader.py:58 ../gui.py:1093 ../gui.py:1140 ../gui.py:1268
+#: ../gui.py:1347 ../image.py:91 ../livecd.py:199 ../livecd.py:404
+#: ../packages.py:126 ../packages.py:134 ../packages.py:142 ../packages.py:150
+#: ../packages.py:162 ../packages.py:171 ../packages.py:179 ../packages.py:188
+#: ../upgrade.py:58 ../upgrade.py:206 ../yuminstall.py:235
+#: ../yuminstall.py:655 ../yuminstall.py:840 ../yuminstall.py:920
+#: ../yuminstall.py:926 ../yuminstall.py:1085 ../yuminstall.py:1110
+#: ../yuminstall.py:1168 ../yuminstall.py:1333 ../yuminstall.py:1363
+#: ../storage/__init__.py:89 ../storage/__init__.py:1679
 msgid "_Exit installer"
-msgstr "退出安裝程式（_E）"
+msgstr "退出安裝程式(_E)"
 
-#: bootloader.py:58 image.py:92 image.py:248 kickstart.py:1301
-#: kickstart.py:1340 upgrade.py:57 yuminstall.py:1140 iw/partition_gui.py:1036
-#: storage/__init__.py:1680
+#: ../bootloader.py:58 ../image.py:92 ../image.py:248 ../kickstart.py:1300
+#: ../kickstart.py:1339 ../upgrade.py:58 ../yuminstall.py:1173
+#: ../iw/partition_gui.py:1036 ../storage/__init__.py:1680
 msgid "_Continue"
-msgstr "繼續（_C）"
+msgstr "繼續(_C)"
 
-#: bootloader.py:114 platform.py:93 platform.py:319 platform.py:376
-#: platform.py:466
+#: ../bootloader.py:114 ../platform.py:93 ../platform.py:320
+#: ../platform.py:377 ../platform.py:468
 msgid "RAID Device"
 msgstr "RAID 裝置"
 
-#: bootloader.py:143
+#: ../bootloader.py:143
 msgid "Bootloader"
 msgstr "開機管理程式"
 
-#: bootloader.py:143
-#, fuzzy
+#: ../bootloader.py:143
 msgid "Installing bootloader."
-msgstr "正在安裝開機管理程式..."
+msgstr "正在安裝開機管理程式。"
 
-#: bootloader.py:210
+#: ../bootloader.py:210
 msgid ""
 "There was an error installing the bootloader.  The system may not be "
 "bootable."
-msgstr ""
+msgstr "安裝開機管理程式時發生了錯誤。系統可能將無法啟動。"
 
-#: bootloader.py:217
-#, fuzzy
+#: ../bootloader.py:217
 msgid ""
 "No kernel packages were installed on the system.  Bootloader configuration "
 "will not be changed."
-msgstr "您的系統沒有安裝核心套件。您的開機管理程式設定將不會變動。"
+msgstr "您的系統上未安裝核心套件。您的開機管理程式設定將不會變動。"
 
-#: cmdline.py:55
+#: ../cmdline.py:55
 msgid "Completed"
 msgstr "已完成"
 
-#: cmdline.py:63
-#, fuzzy
+#: ../cmdline.py:63
 msgid "In progress"
-msgstr "正在進行...   "
+msgstr "正在進行中"
 
-#: cmdline.py:86 gui.py:1135 text.py:391
-#, fuzzy, python-format
+#: ../cmdline.py:86 ../gui.py:1135 ../kickstart.py:1180 ../text.py:391
+#, python-format
 msgid ""
 "The following error was found while parsing the kickstart configuration "
 "file:\n"
 "\n"
 "%s"
 msgstr ""
-"解析 kickstart 設定時發生錯誤：\n"
+"以下為剖析 kickstart 設定檔時所發現的錯誤：\n"
 "\n"
 "%s"
 
-#: cmdline.py:98
+#: ../cmdline.py:98
 msgid ""
 "Command line mode requires all choices to be specified in a kickstart "
 "configuration file."
-msgstr ""
+msgstr "指令列模式將需要所有選項都指定於 kickstart 設定檔中。"
 
-#: cmdline.py:114 cmdline.py:121
+#: ../cmdline.py:114 ../cmdline.py:121
 msgid "Can't have a question in command line mode!"
 msgstr "在指令列模式中不能輸入問題！"
 
-#: constants.py:74
+#: ../constants.py:74
 msgid ""
 "An unhandled exception has occurred.  This is most likely a bug.  Please "
 "save a copy of the detailed exception and file a bug report"
@@ -266,26 +277,28 @@ msgstr ""
 "發生無法處理的例外狀況。這極可能是一個程式錯誤。請複製一份完整的文字敘述，並"
 "回報程式錯誤"
 
-#: constants.py:80
+#. this string will be combined with "An unhandled exception"...
+#. the leading space is not a typo.
+#: ../constants.py:80
 msgid " with the provider of this software."
 msgstr " 給此軟體的供應商。"
 
-#: constants.py:84
+#. this string will be combined with "An unhandled exception"...
+#. the leading space is not a typo.
+#: ../constants.py:84
 #, python-format
 msgid " against anaconda at %s"
 msgstr " 針對於位於 %s 的 anaconda"
 
-#: gui.py:106
-#, fuzzy
+#: ../gui.py:106
 msgid "An error occurred saving screenshots to disk."
-msgstr "複製螢幕截圖時發生錯誤。"
+msgstr "將螢幕截圖儲存至磁碟時發生了錯誤。"
 
-#: gui.py:117
+#: ../gui.py:117
 msgid "Screenshots Copied"
-msgstr "螢幕截圖已經複製完畢"
+msgstr "螢幕截圖已複製完畢"
 
-#: gui.py:118
-#, fuzzy
+#: ../gui.py:118
 msgid ""
 "The screenshots have been saved in the directory:\n"
 "\n"
@@ -293,26 +306,26 @@ msgid ""
 "\n"
 "You can access these when you reboot and login as root."
 msgstr ""
-"螢幕截圖已經儲存到以下目錄：\n"
+"螢幕截圖已儲存到以下目錄：\n"
 "\n"
 "\t/root/anaconda-screenshots/\n"
 "\n"
 "在您重新開機並登入為 root 後，您即可存取這些檔案。"
 
-#: gui.py:161
+#: ../gui.py:161
 msgid "Saving Screenshot"
 msgstr "正在儲存螢幕截圖"
 
-#: gui.py:162
+#: ../gui.py:162
 #, python-format
 msgid "A screenshot named '%s' has been saved."
 msgstr "名為 '%s' 的螢幕截圖已經儲存了。"
 
-#: gui.py:165
+#: ../gui.py:165
 msgid "Error Saving Screenshot"
 msgstr "儲存螢幕截圖時發生錯誤"
 
-#: gui.py:166
+#: ../gui.py:166
 msgid ""
 "An error occurred while saving the screenshot.  If this occurred during "
 "package installation, you may need to try several times for it to succeed."
@@ -320,60 +333,61 @@ msgstr ""
 "儲存螢幕截圖時發生錯誤。假如這發生在套件安裝階段，您也許需要多試幾次才能成"
 "功。"
 
-#: gui.py:560 text.py:348
+#: ../gui.py:560 ../text.py:348
 msgid "Installation Key"
 msgstr "安裝金鑰"
 
-#: gui.py:631 text.py:148
-#, fuzzy
+#: ../gui.py:631 ../text.py:148
 msgid ""
 "Choose a passphrase for the encrypted devices. You will be prompted for this "
 "passphrase during system boot."
-msgstr "請為您加密的裝置選擇一組密碼。您將會在系統啟動時被要求輸入這組密碼。"
+msgstr "請為您的加密裝置選擇一組密碼。您將會在系統啟動時被要求輸入這組密碼。"
 
-#: gui.py:650 gui.py:658 text.py:186 text.py:196
+#: ../gui.py:650 ../gui.py:658 ../text.py:186 ../text.py:196
 msgid "Error with passphrase"
 msgstr "密碼發生錯誤"
 
-#: gui.py:651 text.py:187
+#: ../gui.py:651 ../text.py:187
 msgid "The passphrases you entered were different.  Please try again."
 msgstr "您所輸入的密碼不相符，請重新輸入。"
 
-#: gui.py:659
+#: ../gui.py:659
 msgid "The passphrase must be at least eight characters long."
 msgstr "密碼長度不得少於八個字元。"
 
-#: gui.py:693 text.py:224
+#: ../gui.py:693 ../text.py:224
 #, python-format
 msgid ""
 "Device %s is encrypted. In order to access the device's contents during "
 "installation you must enter the device's passphrase below."
 msgstr "%s 裝置已加密。若要在安裝時存取該裝置的內容，您必須輸入裝置的密碼。"
 
-#: gui.py:784 gui.py:1345 partIntfHelpers.py:153 partIntfHelpers.py:310
-#: text.py:99 text.py:100 iw/account_gui.py:135 loader/dirbrowser.c:145
-#: loader/driverdisk.c:244 loader/kickstart.c:375 loader/loader.c:439
-#: loader/loader.c:557 textw/constants_text.py:48
+#: ../gui.py:784 ../gui.py:1347 ../partIntfHelpers.py:153
+#: ../partIntfHelpers.py:310 ../text.py:99 ../text.py:100
+#: ../iw/account_gui.py:130 ../loader/dirbrowser.c:145
+#: ../loader/driverdisk.c:244 ../loader/kickstart.c:381 ../loader/loader.c:439
+#: ../loader/loader.c:557 ../textw/constants_text.py:48
 msgid "Cancel"
 msgstr "取消"
 
-#: gui.py:796 gui.py:797 gui.py:909 gui.py:910 ui/anaconda.glade:154
+#: ../gui.py:796 ../gui.py:797 ../gui.py:909 ../gui.py:910
+#: ../ui/anaconda.glade.h:2
 msgid "_Debug"
-msgstr "除錯程式（_D）"
+msgstr "除錯程式(_D)"
 
-#: gui.py:1137 text.py:393
+#: ../gui.py:1137 ../text.py:393
 msgid "Error Parsing Kickstart Config"
-msgstr "解析 kickstart 設定發生錯誤"
+msgstr "剖析 kickstart 設定時發生了錯誤"
 
-#: gui.py:1177
+#: ../gui.py:1177
 msgid "default:LTR"
-msgstr "預設：LTR"
+msgstr "預設值：LTR"
 
-#: gui.py:1257 text.py:510
+#: ../gui.py:1257 ../text.py:510
 msgid "Error!"
 msgstr "錯誤！"
 
-#: gui.py:1258 text.py:511
+#: ../gui.py:1258 ../text.py:511
 #, python-format
 msgid ""
 "An error occurred when attempting to load an installer interface component.\n"
@@ -384,56 +398,56 @@ msgstr ""
 "\n"
 "className = %s"
 
-#: gui.py:1263 image.py:164 image.py:194 packages.py:425 packages.py:430
+#: ../gui.py:1263 ../image.py:164 ../image.py:194 ../packages.py:425
+#: ../packages.py:430
 msgid "_Exit"
-msgstr "離開（_E）"
+msgstr "離開(_E)"
 
-#: gui.py:1264 image.py:164 image.py:194 livecd.py:199 yuminstall.py:678
-#: yuminstall.py:1077 yuminstall.py:1135 yuminstall.py:1299
+#: ../gui.py:1264 ../image.py:164 ../image.py:194 ../livecd.py:199
+#: ../yuminstall.py:714 ../yuminstall.py:1110 ../yuminstall.py:1168
+#: ../yuminstall.py:1333
 msgid "_Retry"
-msgstr "重試（_R）"
+msgstr "重試(_R)"
 
-#: gui.py:1267
-#, fuzzy
+#: ../gui.py:1267
 msgid "The installer will now exit."
-msgstr "安裝程式即將關閉..."
+msgstr "安裝程式即將關閉。"
 
-#: gui.py:1270 storage/partitioning.py:256
-#, fuzzy
+#: ../gui.py:1270 ../storage/partitioning.py:255
 msgid "The system will now reboot."
-msgstr "系統現在將重新開機。"
+msgstr "系統現在將重新啟動。"
 
-#: gui.py:1271 image.py:248 packages.py:433 yuminstall.py:1345
+#: ../gui.py:1271 ../image.py:248 ../packages.py:433 ../yuminstall.py:1379
 msgid "_Reboot"
-msgstr "重新開機（_R）"
+msgstr "重新開機(_R)"
 
-#: gui.py:1273
+#: ../gui.py:1273
 msgid "Exiting"
 msgstr "退出"
 
-#: gui.py:1342 livecd.py:115 text.py:266
+#. FIXME: translate the string
+#: ../gui.py:1344 ../livecd.py:115 ../text.py:266 ../upgrade.py:197
 msgid "Exit installer"
 msgstr "退出安裝程式"
 
-#: gui.py:1343
-#, fuzzy
+#: ../gui.py:1345
 msgid "Are you sure you wish to exit the installer?"
-msgstr "您確定要退出安裝程序嗎？"
+msgstr "您確定要退出安裝程式嗎？"
 
-#: gui.py:1352
+#: ../gui.py:1354
 #, python-format
 msgid "%s Installer"
 msgstr "%s 系統安裝程式"
 
-#: gui.py:1358
+#: ../gui.py:1360
 msgid "Unable to load title bar"
 msgstr "無法載入標題列"
 
-#: gui.py:1420
+#: ../gui.py:1422
 msgid "Install Window"
 msgstr "安裝視窗"
 
-#: image.py:83
+#: ../image.py:83
 #, python-format
 msgid ""
 "The ISO image %s has a size which is not a multiple of 2048 bytes.  This may "
@@ -447,11 +461,11 @@ msgstr ""
 "\n"
 "我們建議您退出並結束您的安裝程序，但若您希望的話，您也可選擇繼續進行。"
 
-#: image.py:156
+#: ../image.py:156
 msgid "Couldn't Mount ISO Source"
 msgstr "無法掛載 ISO 來源"
 
-#: image.py:157
+#: ../image.py:157
 #, python-format
 msgid ""
 "An error occurred mounting the source device %s.  This may happen if your "
@@ -463,11 +477,11 @@ msgstr ""
 "進階儲存裝置上，或是掛載分割區時發生問題的話，這就有可能會發生。請按下「退"
 "出」來終止安裝程序。"
 
-#: image.py:185
+#: ../image.py:185
 msgid "Missing ISO 9660 Image"
 msgstr "找不到 ISO 9660 映像檔"
 
-#: image.py:186
+#: ../image.py:186
 #, python-format
 msgid ""
 "The installer has tried to mount image #%s, but cannot find it on the hard "
@@ -480,11 +494,11 @@ msgstr ""
 "\n"
 "請將此映像檔複製至硬碟中，然後按下「重試」。請按下「退出」來中止安裝程序。"
 
-#: image.py:241
+#: ../image.py:241
 msgid "Required Install Media"
 msgstr "需要的安裝媒體"
 
-#: image.py:242
+#: ../image.py:242
 #, python-format
 msgid ""
 "The software you have selected to install will require the following %s %s "
@@ -500,13 +514,13 @@ msgstr ""
 "請在開始安裝之前準備好這些光碟片。假如您需要放棄安裝並且重新開機，請選擇「重"
 "新開機」。"
 
-#: image.py:248 livecd.py:402 packages.py:379 packages.py:430 packages.py:433
-#: upgrade.py:196 yuminstall.py:804 yuminstall.py:890 yuminstall.py:1329
-#: yuminstall.py:1345
+#: ../image.py:248 ../livecd.py:403 ../packages.py:379 ../packages.py:430
+#: ../packages.py:433 ../upgrade.py:205 ../yuminstall.py:840
+#: ../yuminstall.py:926 ../yuminstall.py:1363 ../yuminstall.py:1379
 msgid "_Back"
-msgstr "上一步（_B）"
+msgstr "上一步(_B)"
 
-#: image.py:286
+#: ../image.py:286
 #, python-format
 msgid ""
 "An error occurred unmounting the disc.  Please make sure you're not "
@@ -515,63 +529,65 @@ msgstr ""
 "卸載光碟時發生錯誤。請確定您沒有從 shell 存取 tty2 上的 %s，然後點選「確定」"
 "來再試一次。"
 
-#: installclass.py:74
+#. by default, place this under the "install" category; it gets it's
+#. own toplevel category otherwise
+#: ../installclass.py:74
 msgid "Install on System"
 msgstr "安裝到系統"
 
-#: iutil.py:755
+#: ../iutil.py:824
 #, python-format
 msgid "Error: On open, cannot set reIPL method to %s (%s: %s)"
 msgstr "錯誤：開啟時無法將 reIPL 模式設為 %s (%s: %s)"
 
-#: iutil.py:763
+#: ../iutil.py:832
 #, python-format
 msgid "Error: On write, cannot set reIPL method to %s (%s: %s)"
 msgstr "錯誤：寫入時無法將 reIPL 模式設為 %s (%s: %s)"
 
-#: iutil.py:770
+#: ../iutil.py:839
 #, python-format
 msgid "Error: On close, cannot set reIPL method to %s (%s: %s)"
 msgstr "錯誤：關閉時無法將 reIPL 模式設為 %s (%s: %s)"
 
-#: iutil.py:787
+#: ../iutil.py:856
 #, python-format
 msgid "Error: Could not set %s as reIPL device (%s)"
 msgstr "錯誤：無法將 %s 設為 relPL 裝置（%s）"
 
-#: iutil.py:796
+#: ../iutil.py:865
 #, python-format
 msgid "Error: Could not reset loadparm (%s)"
 msgstr "錯誤：無法重新啟動 loadparm（%s）"
 
-#: iutil.py:805
+#: ../iutil.py:874
 #, python-format
 msgid "Warning: Could not reset parm (%s)"
 msgstr "警告：無法重新啟用 parm（%s）"
 
-#: iutil.py:815
+#: ../iutil.py:884
 #, python-format
 msgid ""
 "After shutdown, please perform a manual IPL from DASD device %s to continue "
 "installation"
 msgstr "關閉之後，請由 DASD 裝置 %s 進行手動式的 IPL 以繼續進行安裝程序"
 
-#: iutil.py:837
+#: ../iutil.py:906
 #, python-format
 msgid "Error: reading FCP property %s for reIPL (%s)"
 msgstr "錯誤：讀取 relPL 的 FCP 內容 %s（%s）"
 
-#: iutil.py:850
+#: ../iutil.py:919
 #, python-format
 msgid "Error: writing FCP property %s for reIPL (%s)"
 msgstr "錯誤：寫入 relPL 的 FCP 內容 %s（%s）"
 
-#: iutil.py:863
+#: ../iutil.py:932
 #, python-format
 msgid "Error: writing default FCP property %s for reIPL (%s)"
 msgstr "錯誤：寫入 relPL（%s）的預設 FCP 內容 %s"
 
-#: iutil.py:873
+#: ../iutil.py:942
 #, python-format
 msgid ""
 "After shutdown, please perform a manual IPL from FCP %(device)s with WWPN %"
@@ -580,133 +596,113 @@ msgstr ""
 "關閉後，請由 FCP %(device)s 搭配 WWPN %(wwpn)s 和 LUN %(lun)s 來進行手動式的 "
 "IPL 以繼續進行安裝程序"
 
-#: iutil.py:880
+#: ../iutil.py:949
 msgid ""
 "After shutdown, please perform a manual IPL from the device now containing /"
 "boot to continue installation"
 msgstr "關閉後，請由包含著 /boot 的裝置來進行手動式的 IPL 以繼續進行安裝程序"
 
-#: iutil.py:888
+#: ../iutil.py:957
 msgid "Error determining mount point type"
 msgstr "錯誤判斷了掛載點類型"
 
-#: iutil.py:892
+#: ../iutil.py:961
 msgid "The mount point /boot or / is on a disk that we are not familiar with"
 msgstr "掛載點 /boot 或 / 位於一個我們不熟悉的磁碟上"
 
-#: kickstart.py:96
-#, fuzzy, python-format
+#: ../kickstart.py:96
+#, python-format
 msgid ""
 "There was an error running the kickstart script at line %s.  You may examine "
 "the output in %s.  This is a fatal error and installation will be aborted.  "
 "Press the OK button to exit the installer."
-msgstr ""
-"執行 kickstart script 時 %s 行列上發生錯誤。請檢查 %s 中的輸出。這是嚴重的錯"
-"誤，您的安裝過程將會中止。請按下「確定」來退出安裝程序。"
+msgstr "在行列 %s 上執行 kickstart script 時發生了錯誤。請檢查 %s 中的輸出。這是嚴重的錯誤，您的安裝程序即將中止。請按下「確定」來退出安裝程序。"
 
-#: kickstart.py:111 kickstart.py:113
+#: ../kickstart.py:111 ../kickstart.py:113
 msgid "Scriptlet Failure"
 msgstr "小型程序檔失敗"
 
-#: kickstart.py:1167
+#: ../kickstart.py:1166
 #, python-format
 msgid "Error processing %%ksappend lines: %s"
 msgstr "處理 %%ksappend 行時發生錯誤：%s"
 
-#: kickstart.py:1170
+#: ../kickstart.py:1169
 #, python-format
 msgid "Unknown error processing %%ksappend lines: %s"
 msgstr "處理 %%ksappend 行時發生不明錯誤：%s"
 
-#: kickstart.py:1181
-#, fuzzy, python-format
-msgid ""
-"The following error was found while parsing thekickstart configuration "
-"file:\n"
-"\n"
-"%s"
-msgstr ""
-"解析 kickstart 設定時發生錯誤：\n"
-"\n"
-"%s"
-
-#: kickstart.py:1242 livecd.py:223
-#, fuzzy
+#: ../kickstart.py:1241 ../livecd.py:223
 msgid "Post-Installation"
-msgstr "最後階段安裝"
+msgstr "安裝後的階段"
 
-#: kickstart.py:1243
-#, fuzzy
+#: ../kickstart.py:1242
 msgid "Running post-installation scripts"
 msgstr "執行安裝後的程序檔"
 
-#: kickstart.py:1259
-#, fuzzy
+#: ../kickstart.py:1258
 msgid "Pre-Installation"
-msgstr "安裝套件"
+msgstr "安裝前的階段"
 
-#: kickstart.py:1260
-#, fuzzy
+#: ../kickstart.py:1259
 msgid "Running pre-installation scripts"
 msgstr "執行安裝前的程序檔"
 
-#: kickstart.py:1292
+#: ../kickstart.py:1291
 msgid "Missing Package"
 msgstr "找不到套件"
 
-#: kickstart.py:1293
-#, fuzzy, python-format
+#: ../kickstart.py:1292
+#, python-format
 msgid ""
 "You have specified that the package '%s' should be installed.  This package "
 "does not exist. Would you like to continue or abort this installation?"
-msgstr "您已經指定安裝「%s」套件。這套件並不存在。您要繼續，還是要放棄安裝？"
+msgstr "您已經指定安裝「%s」套件。這套件並不存在。請問您要繼續，還是要放棄安裝？"
 
-#: kickstart.py:1299 kickstart.py:1338
+#: ../kickstart.py:1298 ../kickstart.py:1337
 msgid "_Abort"
-msgstr "放棄（_A）"
+msgstr "放棄(_A)"
 
-#: kickstart.py:1300 kickstart.py:1339
+#: ../kickstart.py:1299 ../kickstart.py:1338
 msgid "_Ignore All"
-msgstr "忽略全部（_I）"
+msgstr "忽略全部(_I)"
 
-#: kickstart.py:1330
+#: ../kickstart.py:1329
 msgid "Missing Group"
 msgstr "找不到群組"
 
-#: kickstart.py:1331
-#, fuzzy, python-format
+#: ../kickstart.py:1330
+#, python-format
 msgid ""
 "You have specified that the group '%s' should be installed. This group does "
 "not exist. Would you like to continue or abort this installation?"
-msgstr "您已經指定安裝「%s」群組。這群組並不存在。您要繼續，還是要放棄安裝？"
+msgstr "您已經指定安裝「%s」群組。該群組並不存在。請問您要繼續，還是要放棄安裝？"
 
-#: kickstart.py:1437
-#, fuzzy, python-format
+#: ../kickstart.py:1436
+#, python-format
 msgid ""
 "The kickstart configuration file is missing required information that "
 "anaconda cannot prompt for.  Please add the following sections and try "
 "again:\n"
 "%s"
 msgstr ""
-"您的 kickstart 檔案缺少了必要的資訊，anaconda 無法提示這項資訊。請附加下列部"
-"份並重新嘗試：\n"
+"您的 kickstart 檔案缺少了必要的資訊，anaconda 無法提示這項資訊。請附加下列部份並重新嘗試：:\n"
 "%s"
 
-#: livecd.py:110
+#: ../livecd.py:110
 msgid "Unable to find image"
 msgstr "找不到安裝映像檔"
 
-#: livecd.py:111
+#: ../livecd.py:111
 #, python-format
-msgid ""
-"The given location isn't a valid %s live CD to use as an installation source."
+msgid "The given location isn't a valid %s live CD to use as an installation source."
 msgstr "提供的位置並非可使用來作為安裝來源的有效 %s live CD。"
 
-#: livecd.py:174
+#: ../livecd.py:174
 msgid "Copying live image to hard drive."
 msgstr "正在傳送即時映像檔到硬碟。"
 
-#: livecd.py:193
+#: ../livecd.py:193
 msgid ""
 "There was an error installing the live image to your hard drive.  This could "
 "be due to bad media.  Please verify your installation media.\n"
@@ -719,152 +715,154 @@ msgstr ""
 "\n"
 "若您退出的話，電腦將會處於不一致的狀態，並且可能需要重新安裝。"
 
-#: livecd.py:224
-#, fuzzy
+#: ../livecd.py:224
 msgid ""
 "Performing post-installation filesystem changes.  This may take several "
 "minutes."
-msgstr "進行安裝後的檔案系統變更。這也許會花上幾分鐘..."
+msgstr "正在進行安裝後的檔案系統變更。這也許會花上數分鐘。"
 
-#: livecd.py:397
+#: ../livecd.py:398
 #, python-format
 msgid ""
 "The root filesystem you created is not large enough for this live image "
 "(%.2f MB required)."
 msgstr "您所建立的 root 檔案系統的大小不足以容納此即時映像檔（需要 %.2f MB）。"
 
-#: network.py:56
+#: ../network.py:56
 msgid "Hostname must be 255 or fewer characters in length."
 msgstr "主機名稱長度必須為 255 個或更少個字元。"
 
-#: network.py:62
+#: ../network.py:62
 msgid ""
 "Hostname must start with a valid character in the ranges 'a-z', 'A-Z', or '0-"
 "9'"
 msgstr "主機名稱必須以「a-z」、「A-Z」或「0-9」等有效字元作為起始"
 
-#: network.py:67
-msgid ""
-"Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.'"
+#: ../network.py:67
+msgid "Hostnames can only contain the characters 'a-z', 'A-Z', '0-9', '-', or '.'"
 msgstr "主機名稱只能包含「a-z」、「A-Z」、「0-9」、「-」或「.」等字元"
 
-#: network.py:176
+#: ../network.py:176
 msgid "IP address is missing."
 msgstr "缺少 IP 位址。"
 
-#: network.py:180
+#: ../network.py:180
 msgid ""
 "IPv4 addresses must contain four numbers between 0 and 255, separated by "
 "periods."
 msgstr "IPv4 位址必須包含四組以小數點分隔，介乎 0 到 255 之間的號碼。"
 
-#: network.py:183
+#: ../network.py:183
 #, python-format
 msgid "'%s' is not a valid IPv6 address."
 msgstr "「%s」不是有效的 IPv6 位址。"
 
-#: network.py:185
+#: ../network.py:185
 #, python-format
 msgid "'%s' is an invalid IP address."
 msgstr "「%s」是個無效的 IP 位址。"
 
-#: packages.py:121
+#. XXX does this make any sense? do we support resize of
+#. devices other than partitions?
+#: ../packages.py:121
 msgid "Device Resize Failed"
 msgstr "裝置重設大小失敗"
 
-#: packages.py:122
+#: ../packages.py:122
 #, python-format
 msgid "An error was encountered while resizing device %s."
 msgstr "重設裝置 %s 的大小時發生了錯誤。"
 
-#: packages.py:129
+#: ../packages.py:129
 msgid "Device Creation Failed"
 msgstr "裝置建立失敗"
 
-#: packages.py:130
+#: ../packages.py:130
 #, python-format
 msgid "An error was encountered while creating device %s."
 msgstr "建立裝置 %s 時發生了錯誤。"
 
-#: packages.py:137
+#: ../packages.py:137
 msgid "Device Removal Failed"
 msgstr "裝置移除失敗"
 
-#: packages.py:138
+#: ../packages.py:138
 #, python-format
 msgid "An error was encountered while removing device %s."
 msgstr "移除裝置 %s 時發生了錯誤。"
 
-#: packages.py:145
+#: ../packages.py:145
 msgid "Device Setup Failed"
 msgstr "裝置設定失敗"
 
-#: packages.py:146
+#: ../packages.py:146
 #, python-format
 msgid "An error was encountered while setting up device %s."
 msgstr "設定裝置 %s 時發生了錯誤。"
 
-#: packages.py:157
+#: ../packages.py:157
 msgid "Resizing Failed"
 msgstr "重設大小失敗"
 
-#: packages.py:158
+#: ../packages.py:158
 #, python-format
 msgid "There was an error encountered while resizing the device %s."
 msgstr "重設裝置 %s 的大小時發生了錯誤。"
 
-#: packages.py:165
+#: ../packages.py:165
 msgid "Migration Failed"
 msgstr "遷移失敗"
 
-#: packages.py:166
+#: ../packages.py:166
 #, python-format
 msgid "An error was encountered while migrating filesystem on device %s."
 msgstr "遷移裝置 %s 上的檔案系統時發生了錯誤。"
 
-#: packages.py:174
+#: ../packages.py:174
 msgid "Formatting Failed"
 msgstr "格式化失敗"
 
-#: packages.py:175
+#: ../packages.py:175
 #, python-format
 msgid "An error was encountered while formatting device %s."
 msgstr "格式化裝置 %s 時發生了錯誤。"
 
-#: packages.py:183
+#. catch-all
+#: ../packages.py:183
 msgid "Storage Activation Failed"
 msgstr "儲存裝置啟用失敗"
 
-#: packages.py:184
+#: ../packages.py:184
 msgid "An error was encountered while activating your storage configuration."
-msgstr "啟用您的儲存裝置配置時發生了錯誤。"
+msgstr "啟用您的儲存裝置設定時發生了錯誤。"
 
-#: packages.py:188
+#: ../packages.py:188
 msgid "_File Bug"
-msgstr ""
+msgstr "提交錯誤(_F)"
 
-#: packages.py:350
+#: ../packages.py:350
 msgid "Invalid Key"
 msgstr "無效的金鑰"
 
-#: packages.py:351
+#: ../packages.py:351
 msgid "The key you entered is invalid."
 msgstr "您所輸入的金鑰無效。"
 
-#: packages.py:376 rescue.py:287 rescue.py:289 loader/cdinstall.c:248
-#: loader/cdinstall.c:251 loader/method.c:326 textw/upgrade_text.py:133
+#: ../packages.py:376 ../rescue.py:287 ../rescue.py:289
+#: ../loader/cdinstall.c:248 ../loader/cdinstall.c:251 ../loader/method.c:326
+#: ../textw/upgrade_text.py:133
 msgid "Skip"
 msgstr "跳過"
 
-#: packages.py:379
+#: ../packages.py:379
 msgid "_Skip"
-msgstr "跳過（_S）"
+msgstr "跳過(_S)"
 
-#: packages.py:411 packages.py:434
+#: ../packages.py:411 ../packages.py:434
 msgid "Warning! This is pre-release software!"
-msgstr "警告！ 這是測試版的軟體！"
+msgstr "警告！這是測試版的軟體！"
 
-#: packages.py:412
+#: ../packages.py:412
 #, python-format
 msgid ""
 "Thank you for downloading this pre-release of %s.\n"
@@ -890,32 +888,32 @@ msgstr ""
 "\n"
 "並針對 '%s' 呈送一份報告。\n"
 
-#: packages.py:425
+#: ../packages.py:425
 msgid "_Install anyway"
-msgstr "繼續安裝（_I）"
+msgstr "繼續安裝(_I)"
 
-#: packages.py:429
+#: ../packages.py:429
 msgid "The installer will now exit..."
 msgstr "安裝程式即將關閉..."
 
-#: packages.py:432
+#: ../packages.py:432
 msgid "Your system will now be rebooted..."
 msgstr "您的系統現在將重新開機..."
 
-#: partIntfHelpers.py:41
+#: ../partIntfHelpers.py:41
 msgid "Please enter a volume group name."
 msgstr "請輸入卷冊群組名稱。"
 
-#: partIntfHelpers.py:45
+#: ../partIntfHelpers.py:45
 msgid "Volume Group Names must be less than 128 characters"
 msgstr "卷冊群組名稱必須少於 128 個字元"
 
-#: partIntfHelpers.py:48
+#: ../partIntfHelpers.py:48
 #, python-format
 msgid "Error - the volume group name %s is not valid."
 msgstr "錯誤 - 卷冊群組名稱 %s 無效。"
 
-#: partIntfHelpers.py:53
+#: ../partIntfHelpers.py:53
 msgid ""
 "Error - the volume group name contains illegal characters or spaces.  "
 "Acceptable characters are letters, digits, '.' or '_'."
@@ -923,20 +921,20 @@ msgstr ""
 "錯誤 - 卷冊群組名稱包含不合規格的字元或空白。可使用的字元是字母、數字、'.' "
 "或 '_'。"
 
-#: partIntfHelpers.py:63
+#: ../partIntfHelpers.py:63
 msgid "Please enter a logical volume name."
 msgstr "請輸入一個邏輯卷冊名稱。"
 
-#: partIntfHelpers.py:67
+#: ../partIntfHelpers.py:67
 msgid "Logical Volume Names must be less than 128 characters"
 msgstr "邏輯卷冊名稱必須少於 128 個字元"
 
-#: partIntfHelpers.py:71
+#: ../partIntfHelpers.py:71
 #, python-format
 msgid "Error - the logical volume name %s is not valid."
 msgstr "錯誤 - 邏輯卷冊名稱 %s 無效。"
 
-#: partIntfHelpers.py:77
+#: ../partIntfHelpers.py:77
 msgid ""
 "Error - the logical volume name contains illegal characters or spaces.  "
 "Acceptable characters are letters, digits, '.' or '_'."
@@ -944,7 +942,7 @@ msgstr ""
 "錯誤 - 邏輯卷冊名稱包含不合規格的字元或空白。可使用的字元是字母、數字、'.' "
 "或 '_'。"
 
-#: partIntfHelpers.py:101
+#: ../partIntfHelpers.py:101
 #, python-format
 msgid ""
 "The mount point %s is invalid.  Mount points must start with '/' and cannot "
@@ -953,37 +951,39 @@ msgstr ""
 "掛載點 %s 無效。掛載點必須以 '/' 開始而且不能以 '/' 結尾，並只能包含可列印字"
 "元，不包括空白。"
 
-#: partIntfHelpers.py:108
+#: ../partIntfHelpers.py:108
 msgid "Please specify a mount point for this partition."
 msgstr "請為這個分割區指定掛載點。"
 
-#: partIntfHelpers.py:121 partIntfHelpers.py:128
+#: ../partIntfHelpers.py:121 ../partIntfHelpers.py:128
 msgid "Unable To Delete"
 msgstr "無法刪除"
 
-#: partIntfHelpers.py:122
+#: ../partIntfHelpers.py:122
 msgid "You must first select a partition to delete."
 msgstr "您必須先選擇要刪除的分割區。"
 
-#: partIntfHelpers.py:149 partIntfHelpers.py:309 iw/lvm_dialog_gui.py:812
+#: ../partIntfHelpers.py:149 ../partIntfHelpers.py:309
+#: ../iw/lvm_dialog_gui.py:812
 msgid "Confirm Delete"
 msgstr "確認刪除"
 
-#: partIntfHelpers.py:150
+#: ../partIntfHelpers.py:150
 #, python-format
 msgid "You are about to delete all partitions on the device '%s'."
 msgstr "您即將刪除裝置 '%s' 上的所有分割區。"
 
-#: partIntfHelpers.py:153 partIntfHelpers.py:310 iw/lvm_dialog_gui.py:815
-#: iw/lvm_dialog_gui.py:1348 iw/osbootwidget.py:103 iw/partition_gui.py:1336
+#: ../partIntfHelpers.py:153 ../partIntfHelpers.py:310
+#: ../iw/lvm_dialog_gui.py:815 ../iw/lvm_dialog_gui.py:1348
+#: ../iw/osbootwidget.py:103 ../iw/partition_gui.py:1336
 msgid "_Delete"
-msgstr "刪除（_D）"
+msgstr "刪除(_D)"
 
-#: partIntfHelpers.py:175
+#: ../partIntfHelpers.py:175
 msgid "Notice"
 msgstr "提示"
 
-#: partIntfHelpers.py:176
+#: ../partIntfHelpers.py:176
 #, python-format
 msgid ""
 "The following partitions were not deleted because they are in use:\n"
@@ -994,11 +994,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: partIntfHelpers.py:191
+#: ../partIntfHelpers.py:191
 msgid "Format as Swap?"
 msgstr "要格式化成 Swap 分割區嗎？"
 
-#: partIntfHelpers.py:192
+#: ../partIntfHelpers.py:192
 #, python-format
 msgid ""
 "%s has a partition type of 0x82 (Linux swap) but does not appear to be "
@@ -1010,12 +1010,12 @@ msgstr ""
 "\n"
 "您希望將此分割區格式化為 swap 分割區嗎？"
 
-#: partIntfHelpers.py:207
+#: ../partIntfHelpers.py:207
 #, python-format
 msgid "You need to select at least one hard drive to install %s."
 msgstr "您至少需選擇一部硬碟以便安裝 %s。"
 
-#: partIntfHelpers.py:212
+#: ../partIntfHelpers.py:212
 msgid ""
 "You have chosen to use a pre-existing partition for this installation "
 "without formatting it. We recommend that you format this partition to make "
@@ -1029,23 +1029,23 @@ msgstr ""
 "分割區含有您想要保留的檔案（例如家目錄），您可以選擇繼續而不對此分割區進行格"
 "式化。"
 
-#: partIntfHelpers.py:220
+#: ../partIntfHelpers.py:220
 msgid "Format?"
 msgstr "要格式化嗎？"
 
-#: partIntfHelpers.py:220 iw/partition_gui.py:1034
+#: ../partIntfHelpers.py:220 ../iw/partition_gui.py:1034
 msgid "_Modify Partition"
-msgstr "調整分割區（_M）"
+msgstr "調整分割區(_M)"
 
-#: partIntfHelpers.py:220
+#: ../partIntfHelpers.py:220
 msgid "Do _Not Format"
-msgstr "不格式化（_N）"
+msgstr "不格式化(_N)"
 
-#: partIntfHelpers.py:228
+#: ../partIntfHelpers.py:228
 msgid "Error with Partitioning"
 msgstr "磁碟分割錯誤"
 
-#: partIntfHelpers.py:229
+#: ../partIntfHelpers.py:229
 #, python-format
 msgid ""
 "The following critical errors exist with your requested partitioning scheme. "
@@ -1057,11 +1057,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: partIntfHelpers.py:243
+#: ../partIntfHelpers.py:243
 msgid "Partitioning Warning"
 msgstr "磁碟分割警告"
 
-#: partIntfHelpers.py:244
+#: ../partIntfHelpers.py:244
 #, python-format
 msgid ""
 "The following warnings exist with your requested partition scheme.\n"
@@ -1076,23 +1076,23 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: partIntfHelpers.py:258 iw/partition_gui.py:639
+#: ../partIntfHelpers.py:258 ../iw/partition_gui.py:639
 msgid ""
 "The following pre-existing partitions have been selected to be formatted, "
 "destroying all data."
 msgstr "下列已存在的分割區要被格式化，將會刪除所有資料。"
 
-#: partIntfHelpers.py:261
+#: ../partIntfHelpers.py:261
 msgid ""
 "Select 'Yes' to continue and format these partitions, or 'No' to go back and "
 "change these settings."
 msgstr "選擇「是」以繼續格式化這些分割區，或「否」回到上一步並更改設定。"
 
-#: partIntfHelpers.py:267
+#: ../partIntfHelpers.py:267
 msgid "Format Warning"
 msgstr "格式化警告"
 
-#: partIntfHelpers.py:293
+#: ../partIntfHelpers.py:293
 #, python-format
 msgid ""
 "You are about to delete the volume group \"%s\".\n"
@@ -1103,156 +1103,155 @@ msgstr ""
 "\n"
 "在這個卷冊群組中的所有邏輯卷冊將會消失！"
 
-#: partIntfHelpers.py:297
+#: ../partIntfHelpers.py:297
 #, python-format
 msgid "You are about to delete the logical volume \"%s\"."
 msgstr "您即將要刪除邏輯卷冊「%s」。"
 
-#: partIntfHelpers.py:300
+#: ../partIntfHelpers.py:300
 msgid "You are about to delete a RAID device."
 msgstr "您即將要刪除一個 RAID 裝置。"
 
-#: partIntfHelpers.py:302
+#: ../partIntfHelpers.py:302
 #, python-format
 msgid "You are about to delete the %s partition."
 msgstr "您即將要刪除 %s 分割區。"
 
-#: partIntfHelpers.py:306
+#. we may want something a little bit prettier than device.type
+#: ../partIntfHelpers.py:306
 #, python-format
 msgid "You are about to delete the %s %s"
 msgstr "您即將要刪除 %s /%s"
 
-#: partIntfHelpers.py:317
+#: ../partIntfHelpers.py:317
 msgid "Confirm Reset"
 msgstr "確認還原"
 
-#: partIntfHelpers.py:318
-msgid ""
-"Are you sure you want to reset the partition table to its original state?"
+#: ../partIntfHelpers.py:318
+msgid "Are you sure you want to reset the partition table to its original state?"
 msgstr "您確定要將磁碟分割表重設至原來的狀態？"
 
-#: platform.py:94 platform.py:97 platform.py:320 platform.py:377
-#: platform.py:467 platform.py:470
+#: ../platform.py:94 ../platform.py:97 ../platform.py:321 ../platform.py:378
+#: ../platform.py:469 ../platform.py:472
 msgid "Master Boot Record (MBR)"
 msgstr "主要開機紀錄（MBR）"
 
-#: platform.py:96 platform.py:469
+#: ../platform.py:96 ../platform.py:471
 msgid "First sector of boot partition"
 msgstr "開機分割區的第一個磁區"
 
-#: platform.py:112
-#, fuzzy
+#: ../platform.py:112
 msgid "You have not created a bootable partition."
-msgstr "您還未建立一個 boot 分割區。"
+msgstr "您還未建立一個可用來開機的分割區。"
 
-#: platform.py:115
+#: ../platform.py:115
 msgid "Bootable partitions can only be on RAID1 devices."
 msgstr "可開機分割區只能建立在 RAID 1 裝置上。"
 
-#: platform.py:119
+#: ../platform.py:119
 msgid "Bootable partitions cannot be on a logical volume."
 msgstr "可開機分割區不能建立在邏輯卷冊上。"
 
-#: platform.py:123
+#: ../platform.py:123
 msgid "Bootable partitions cannot be on a RAID device."
 msgstr "可開機分割區不能建立在 RAID 裝置上。"
 
-#: platform.py:127 platform.py:131
+#: ../platform.py:127 ../platform.py:131
 #, python-format
 msgid "Bootable partitions cannot be on an %s filesystem."
 msgstr "可開機分割區不能建立在一個 %s 檔案系統上。"
 
-#: platform.py:135 platform.py:140
+#. Handle encrypted boot on a partition.
+#: ../platform.py:135 ../platform.py:140
 msgid "Bootable partitions cannot be on an encrypted block device"
 msgstr "可開機分割區不能建立在一個加密的區塊裝置上。"
 
-#: platform.py:213
+#: ../platform.py:214
 msgid "EFI System Partition"
 msgstr "EFI 系統分割區"
 
-#: platform.py:218
-#, fuzzy
+#: ../platform.py:219
 msgid "You have not created a /boot/efi partition."
-msgstr "您還未建立一個 boot 分割區。"
+msgstr "您還未建立一個 /boot/efi 分割區。"
 
-#: platform.py:224
-#, fuzzy
+#: ../platform.py:225
 msgid "/boot is not on an ext2 filesystem."
-msgstr "可開機分割區不能建立在一個 %s 檔案系統上。"
+msgstr "ext2 檔案系統上沒有 /boot 分割區。"
 
-#: platform.py:227
+#: ../platform.py:228
 msgid "/boot/efi is not EFI."
-msgstr ""
+msgstr "/boot/efi 不是 EFI。"
 
-#: platform.py:265
+#: ../platform.py:266
 #, python-format
 msgid "%s must have a bsd disk label."
-msgstr ""
+msgstr "%s 必須有個 bsd 磁碟標籤。"
 
-#: platform.py:277
+#: ../platform.py:278
 #, python-format
 msgid "The disk %s requires at least 1MB of free space at the beginning."
-msgstr ""
+msgstr "磁碟 %s 在一開始時需要至少 1MB 的可用空間。"
 
-#: platform.py:322
+#: ../platform.py:323
 msgid "PPC PReP Boot"
 msgstr "PPC PReP 開機"
 
-#: platform.py:334
-#, fuzzy
+#: ../platform.py:335
 msgid "The boot partition must be within the first 4MB of the disk."
-msgstr "將系統狀態寫入磁碟時出現問題。"
+msgstr "boot 分割區必須在磁碟的前 4MB 中。"
 
-#: platform.py:379 platform.py:382
+#: ../platform.py:380 ../platform.py:383
 msgid "Apple Bootstrap"
 msgstr "Apple 啟動載入程式"
 
-#: platform.py:397
+#: ../platform.py:398
 #, python-format
 msgid "%s must have a mac disk label."
-msgstr ""
+msgstr "%s 必須有個 mac 磁碟標籤。"
 
-#: rescue.py:199
+#: ../rescue.py:199
 msgid "When finished please exit from the shell and your system will reboot."
 msgstr "完成後請退出 shell，您的系統將會重新啟動。"
 
-#: rescue.py:213
+#: ../rescue.py:213
 msgid "Unable to find /bin/sh to execute!  Not starting shell"
 msgstr "找不到可執行的 /bin/sh！Shell 沒有啟動"
 
-#: rescue.py:232
+#: ../rescue.py:232
 msgid "Setup Networking"
 msgstr "設定網路連線"
 
-#: rescue.py:233
+#: ../rescue.py:233
 msgid "Do you want to start the network interfaces on this system?"
 msgstr "您是否想要啟動這部系統上的網路介面卡？"
 
-#: rescue.py:234 loader/driverdisk.c:483 loader/driverdisk.c:493
-#: loader/hdinstall.c:222 textw/constants_text.py:56
+#: ../rescue.py:234 ../loader/driverdisk.c:483 ../loader/driverdisk.c:493
+#: ../loader/hdinstall.c:222 ../textw/constants_text.py:56
 msgid "Yes"
 msgstr "是"
 
-#: rescue.py:234 rescue.py:236 loader/driverdisk.c:483 loader/driverdisk.c:493
-#: textw/constants_text.py:60
+#: ../rescue.py:234 ../rescue.py:236 ../loader/driverdisk.c:483
+#: ../loader/driverdisk.c:493 ../textw/constants_text.py:60
 msgid "No"
 msgstr "否"
 
-#: rescue.py:240 yuminstall.py:1047
+#: ../rescue.py:240 ../yuminstall.py:650 ../yuminstall.py:1080
 msgid "No Network Available"
 msgstr "沒有可用的網路"
 
-#: rescue.py:241
+#: ../rescue.py:241
 msgid ""
 "Unable to activate a networking device.  Networking will not be available in "
 "rescue mode."
 msgstr "無法啟用網路裝置。救援模式中將無法使用網路。"
 
-#: rescue.py:276 rescue.py:345 rescue.py:356 rescue.py:434
+#. prompt to see if we should try and find root filesystem and mount
+#. everything in /etc/fstab on that root
+#: ../rescue.py:276 ../rescue.py:345 ../rescue.py:356 ../rescue.py:434
 msgid "Rescue"
 msgstr "救援模式"
 
-#: rescue.py:277
+#: ../rescue.py:277
 #, python-format
 msgid ""
 "The rescue environment will now attempt to find your Linux installation and "
@@ -1272,29 +1271,29 @@ msgstr ""
 "若有其他原因造成執行失敗，您可以選擇「跳過」，系統將會帶您進入命令列狀態。\n"
 "\n"
 
-#: rescue.py:287 iw/partition_gui.py:543 loader/cdinstall.c:206
-#: loader/cdinstall.c:214 loader/driverdisk.c:444 storage/__init__.py:134
-#: storage/devicetree.py:82
+#: ../rescue.py:287 ../iw/partition_gui.py:543 ../loader/cdinstall.c:206
+#: ../loader/cdinstall.c:214 ../loader/driverdisk.c:444
+#: ../storage/__init__.py:134 ../storage/devicetree.py:83
 msgid "Continue"
 msgstr "繼續"
 
-#: rescue.py:287 rescue.py:292
+#: ../rescue.py:287 ../rescue.py:292
 msgid "Read-Only"
 msgstr "只能讀取"
 
-#: rescue.py:321
+#: ../rescue.py:321
 msgid "System to Rescue"
 msgstr "要救援的系統"
 
-#: rescue.py:322
+#: ../rescue.py:322
 msgid "Which device holds the root partition of your installation?"
 msgstr "哪個裝置持有您的 root 分割區呢？"
 
-#: rescue.py:324 rescue.py:328 text.py:515 text.py:517
+#: ../rescue.py:324 ../rescue.py:328 ../text.py:515 ../text.py:517
 msgid "Exit"
 msgstr "離開"
 
-#: rescue.py:346
+#: ../rescue.py:346
 msgid ""
 "Your system had dirty file systems which you chose not to mount.  Press "
 "return to get a shell from which you can fsck and mount your partitions.  "
@@ -1303,7 +1302,7 @@ msgstr ""
 "您選擇不要掛載在系統的分割區有問題。按 return 鍵以取得 shell，您可以執行 "
 "fsck 然後掛載分割區。當您退出 shell 後，系統將自動重新啟動。"
 
-#: rescue.py:357
+#: ../rescue.py:357
 #, python-format
 msgid ""
 "Your system has been mounted under %s.\n"
@@ -1323,7 +1322,7 @@ msgstr ""
 "\n"
 "當您離開 shell 時，系統將會自動重新啟動。"
 
-#: rescue.py:435
+#: ../rescue.py:435
 #, python-format
 msgid ""
 "An error occurred trying to mount some or all of your system. Some of it may "
@@ -1336,15 +1335,15 @@ msgstr ""
 "\n"
 "請按 <return> 取得 shell。當您離開 shell 時，系統將會自動重新啟動。"
 
-#: rescue.py:444
+#: ../rescue.py:444
 msgid "You don't have any Linux partitions.  Rebooting.\n"
-msgstr ""
+msgstr "您沒有任何 Linux 分割區。系統即將重新啟動。\n"
 
-#: rescue.py:447
+#: ../rescue.py:447
 msgid "Rescue Mode"
 msgstr "救援模式"
 
-#: rescue.py:448
+#: ../rescue.py:448
 msgid ""
 "You don't have any Linux partitions. Press return to get a shell. The system "
 "will reboot automatically when you exit from the shell."
@@ -1352,52 +1351,52 @@ msgstr ""
 "您沒有任何的 Linux 分割區。按 return 鍵以取得 shell。當您退出 shell 後，系統"
 "將自動重新啟動。"
 
-#: rescue.py:461
+#: ../rescue.py:461
 #, python-format
 msgid "Your system is mounted under the %s directory."
 msgstr "您的系統被掛載在 %s 目錄下。"
 
-#: text.py:153
+#: ../text.py:153
 msgid "Passphrase for encrypted device"
 msgstr "已加密裝置的密碼"
 
-#: text.py:166
+#: ../text.py:166
 msgid "Also add this passphrase to all existing encrypted devices"
 msgstr "將這組密碼附加至所有現有的加密裝置"
 
-#: text.py:231 ui/lukspassphrase.glade:275
+#: ../text.py:231 ../ui/lukspassphrase.glade.h:6
 msgid "Passphrase"
 msgstr "密碼"
 
-#: text.py:239 ui/lukspassphrase.glade:421
+#: ../text.py:239 ../ui/lukspassphrase.glade.h:7
 msgid "This is a global passphrase"
 msgstr "這是組全域密碼"
 
-#: text.py:309 text.py:313
+#: ../text.py:309 ../text.py:313
 msgid "Repository editing is not available in text mode."
 msgstr "無法在文字模式下進行軟體庫的編輯。"
 
-#: text.py:353
+#: ../text.py:353
 #, python-format
 msgid "Please enter your %(instkey)s"
 msgstr "請輸入您的 %(instkey)s。"
 
-#: text.py:370 ui/instkey.glade:143
-#, python-format
+#: ../text.py:370 ../ui/instkey.glade.h:6
+#, no-c-format, python-format
 msgid "Skip entering %(instkey)s"
 msgstr "跳過輸入 %(instkey)s"
 
-#: text.py:420 loader/lang.c:63 loader/loader.c:215
+#: ../text.py:420 ../loader/lang.c:63 ../loader/loader.c:215
 #, c-format, python-format
 msgid "Welcome to %s for %s"
 msgstr "歡迎使用 %s 的 %s"
 
-#: text.py:422
+#: ../text.py:422
 #, python-format
 msgid "Welcome to %s"
 msgstr "歡迎使用 %s"
 
-#: text.py:424
+#: ../text.py:424
 msgid ""
 "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
 "screen"
@@ -1405,24 +1404,25 @@ msgstr ""
 "     <Tab>/<Alt-Tab>  移動游標          | <Space>  選取     | <F12>  下一個畫"
 "面"
 
-#: text.py:515 loader/net.c:111 loader/net.c:462 loader/net.c:518
-#: loader/net.c:661 loader/net.c:669 loader/net.c:1092 loader/net.c:1099
+#: ../text.py:515 ../loader/net.c:111 ../loader/net.c:464 ../loader/net.c:520
+#: ../loader/net.c:663 ../loader/net.c:671 ../loader/net.c:1094
+#: ../loader/net.c:1101
 msgid "Retry"
 msgstr "重試"
 
-#: text.py:541
+#: ../text.py:541
 msgid "Cancelled"
 msgstr "已取消"
 
-#: text.py:542
+#: ../text.py:542
 msgid "I can't go to the previous step from here. You will have to try again."
 msgstr "現在無法回到上一層安裝步驟。您必須再試一次。"
 
-#: upgrade.py:50
+#: ../upgrade.py:51
 msgid "Proceed with upgrade?"
 msgstr "確定要升級？"
 
-#: upgrade.py:51
+#: ../upgrade.py:52
 msgid ""
 "The file systems of the Linux installation you have chosen to upgrade have "
 "already been mounted. You cannot go back past this point. \n"
@@ -1431,15 +1431,15 @@ msgstr ""
 "您選擇要升級的檔案系統已經掛載了。過了這步安裝階段，將無法再來這裡。\n"
 "\n"
 
-#: upgrade.py:55
+#: ../upgrade.py:56
 msgid "Would you like to continue with the upgrade?"
 msgstr "您想要繼續升級系統嗎？"
 
-#: upgrade.py:183
+#: ../upgrade.py:184
 msgid "Mount failed"
 msgstr "掛載失敗"
 
-#: upgrade.py:184
+#: ../upgrade.py:185
 #, python-format
 msgid ""
 "The following error occurred when mounting the file systems listed in /etc/"
@@ -1450,18 +1450,21 @@ msgstr ""
 "級一次。\n"
 "%s"
 
-#: upgrade.py:191
+#: ../upgrade.py:193 ../upgrade.py:200
 msgid "Upgrade root not found"
 msgstr "找不到升級的 root"
 
-#: upgrade.py:192
+#: ../upgrade.py:194
+msgid "The root for the previously installed system was not found."
+msgstr "找不到先前安裝的系統的 root。"
+
+#: ../upgrade.py:201
 msgid ""
 "The root for the previously installed system was not found.  You can exit "
 "installer or backtrack to choose installation instead of upgrade."
-msgstr ""
-"找不到先前安裝的系統的 root。您可退出安裝程式或是退回並選擇安裝而不是升級。"
+msgstr "找不到先前安裝的系統的 root。您可退出安裝程式或是退回並選擇安裝而不是升級。"
 
-#: upgrade.py:215
+#: ../upgrade.py:224
 msgid ""
 "The following files are absolute symbolic links, which we do not support "
 "during an upgrade. Please change them to relative symbolic links and restart "
@@ -1472,11 +1475,11 @@ msgstr ""
 "對符號連結（relative symbolic links）後再重新執行升級。\n"
 "\n"
 
-#: upgrade.py:221
+#: ../upgrade.py:230
 msgid "Absolute Symlinks"
 msgstr "絕對符號連結"
 
-#: upgrade.py:232
+#: ../upgrade.py:241
 msgid ""
 "The following are directories which should instead be symbolic links, which "
 "will cause problems with the upgrade.  Please return them to their original "
@@ -1487,56 +1490,56 @@ msgstr ""
 "成原本的符號連結狀態後，再重新執行升級。\n"
 "\n"
 
-#: upgrade.py:238
+#: ../upgrade.py:247
 msgid "Invalid Directories"
 msgstr "目錄無效"
 
-#: upgrade.py:243
+#: ../upgrade.py:252
 #, python-format
 msgid "%s not found"
 msgstr "找不到 %s"
 
-#: vnc.py:137
+#: ../vnc.py:137
 #, python-format
 msgid "%s %s installation on host %s"
 msgstr "%s %s 安裝在主機 %s"
 
-#: vnc.py:139
+#: ../vnc.py:139
 #, python-format
 msgid "%s %s installation"
 msgstr "%s %s 安裝"
 
-#: vnc.py:166
+#: ../vnc.py:166
 #, python-format
 msgid "Attempting to connect to vnc client on host %s..."
 msgstr "試著要連線到主機 %s 的 vnc 用戶端..."
 
-#: vnc.py:180
+#: ../vnc.py:180
 msgid "Connected!"
 msgstr "已連線！"
 
-#: vnc.py:183
+#: ../vnc.py:183
 msgid "Will try to connect again in 15 seconds..."
 msgstr "將在 15 秒後試著再連線一次..."
 
-#: vnc.py:200
+#: ../vnc.py:200
 #, python-format
 msgid "Please manually connect your vnc client to %s to begin the install."
 msgstr "請手動連接您的 vnc 用戶端至 %s 以開始進行安裝。"
 
-#: vnc.py:202
+#: ../vnc.py:202
 msgid "Please manually connect your vnc client to begin the install."
 msgstr "請手動連接您的 vnc 用戶端以開始進行安裝。"
 
-#: vnc.py:205
+#: ../vnc.py:205
 msgid "Starting VNC..."
 msgstr "VNC 啟動中..."
 
-#: vnc.py:230
+#: ../vnc.py:230
 msgid "The VNC server is now running."
 msgstr "VNC 伺服器現在正在執行。"
 
-#: vnc.py:243
+#: ../vnc.py:243
 msgid ""
 "\n"
 "\n"
@@ -1554,7 +1557,7 @@ msgstr ""
 "情況下被使用\n"
 "\n"
 
-#: vnc.py:248
+#: ../vnc.py:248
 msgid ""
 "\n"
 "\n"
@@ -1570,7 +1573,7 @@ msgstr ""
 "使用 vncpassword=<password> 這個開機選項。\n"
 "\n"
 
-#: vnc.py:252
+#: ../vnc.py:252
 msgid ""
 "\n"
 "\n"
@@ -1582,7 +1585,7 @@ msgstr ""
 "您選擇了利用一組密碼來執行 vnc。\n"
 "\n"
 
-#: vnc.py:254
+#: ../vnc.py:254
 msgid ""
 "\n"
 "\n"
@@ -1594,51 +1597,50 @@ msgstr ""
 "不知名錯誤。進行終止。\n"
 "\n"
 
-#: vnc.py:276 vnc.py:369
+#: ../vnc.py:276 ../vnc.py:369
 msgid "VNC Configuration"
 msgstr "VNC 設定"
 
-#: vnc.py:279 vnc.py:373
+#: ../vnc.py:279 ../vnc.py:373
 msgid "No password"
 msgstr "不設定密碼"
 
-#: vnc.py:281 vnc.py:376
+#: ../vnc.py:281 ../vnc.py:376
 msgid ""
 "A password will prevent unauthorized listeners connecting and monitoring "
 "your installation progress.  Please enter a password to be used for the "
 "installation"
-msgstr ""
-"密碼可以避免其他人連接到您的電腦，監控您的安裝過程。請為安裝過程輸入密碼"
+msgstr "密碼可以避免其他人連接到您的電腦，監控您的安裝過程。請為安裝過程輸入密碼"
 
-#: vnc.py:289 vnc.py:384 textw/userauth_text.py:47
+#: ../vnc.py:289 ../vnc.py:384 ../textw/userauth_text.py:47
 msgid "Password:"
 msgstr "密碼："
 
-#: vnc.py:290 vnc.py:385 textw/userauth_text.py:49
+#: ../vnc.py:290 ../vnc.py:385 ../textw/userauth_text.py:49
 msgid "Password (confirm):"
 msgstr "確認密碼："
 
-#: vnc.py:308 vnc.py:407 textw/userauth_text.py:70
+#: ../vnc.py:308 ../vnc.py:407 ../textw/userauth_text.py:70
 msgid "Password Mismatch"
 msgstr "密碼不符"
 
-#: vnc.py:309 vnc.py:408 textw/userauth_text.py:71
+#: ../vnc.py:309 ../vnc.py:408 ../textw/userauth_text.py:71
 msgid "The passwords you entered were different. Please try again."
 msgstr "您輸入的密碼不相符，請重新輸入。"
 
-#: vnc.py:314 vnc.py:413 textw/userauth_text.py:66
+#: ../vnc.py:314 ../vnc.py:413 ../textw/userauth_text.py:66
 msgid "Password Length"
 msgstr "密碼長度"
 
-#: vnc.py:315 vnc.py:414
+#: ../vnc.py:315 ../vnc.py:414
 msgid "The password must be at least six characters long."
 msgstr "密碼長度不得少於六個字元。"
 
-#: vnc.py:337
+#: ../vnc.py:337
 msgid "Unable to Start X"
 msgstr "無法啟動 X"
 
-#: vnc.py:339
+#: ../vnc.py:339
 msgid ""
 "X was unable to start on your machine.  Would you like to start VNC to "
 "connect to this computer from another computer and perform a graphical "
@@ -1647,52 +1649,61 @@ msgstr ""
 "X 無法在您的機器上執行。您要啟動 VNC 使其他電腦可以連進來執行圖形模式安裝或是"
 "使用文字模式繼續安裝？"
 
-#: vnc.py:358
+#: ../vnc.py:358
 msgid "Start VNC"
 msgstr "啟動 VNC"
 
-#: vnc.py:359 vnc.py:361
+#: ../vnc.py:359 ../vnc.py:361
 msgid "Use text mode"
 msgstr "使用文字模式安裝"
 
-#: yuminstall.py:80
+#: ../yuminstall.py:81
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: yuminstall.py:83
+#: ../yuminstall.py:84
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: yuminstall.py:129
+#: ../yuminstall.py:130
 msgid "Preparing to install"
-msgstr ""
+msgstr "正在準備進行安裝"
 
-#: yuminstall.py:130
-#, fuzzy
+#: ../yuminstall.py:131
 msgid "Preparing transaction from installation source"
-msgstr "準備從安裝來源進行作業..."
+msgstr "正在準備由安裝來源進行作業"
 
-#: yuminstall.py:158
+#: ../yuminstall.py:159
 #, python-format
 msgid "<b>Installing %s</b> (%s)\n"
 msgstr "<b>正在安裝 %s</b>（%s）\n"
 
-#: yuminstall.py:218
+#: ../yuminstall.py:219
 msgid "Finishing upgrade"
 msgstr "正在完成升級"
 
-#: yuminstall.py:219
-#, fuzzy
+#: ../yuminstall.py:220
 msgid "Finishing upgrade process.  This may take a little while."
-msgstr "正在完成升級程序。這可能會花上一段時間..."
+msgstr "正在完成升級程序。這可能會花上一段時間。"
 
-#: yuminstall.py:286 iw/task_gui.py:301
+#: ../yuminstall.py:229
+msgid "Error Installing Package"
+msgstr "安裝套件時發生了錯誤"
+
+#: ../yuminstall.py:230
+#, python-format
+msgid ""
+"A fatal error occurred when installing the %s package.  This could indicate "
+"errors when reading the installation media.  Installation cannot continue."
+msgstr "當安裝 %s 套件時發生了嚴重錯誤。這可能表示讀取安裝媒介時發生了問題。安裝程序無法繼續進行。"
+
+#: ../yuminstall.py:300 ../iw/task_gui.py:80 ../iw/task_gui.py:318
 msgid "Error Setting Up Repository"
 msgstr "設定軟體庫時發生錯誤"
 
-#: yuminstall.py:287 iw/task_gui.py:302
+#: ../yuminstall.py:301
 #, python-format
 msgid ""
 "The following error occurred while setting up the installation repository:\n"
@@ -1707,42 +1718,48 @@ msgstr ""
 "\n"
 "請提供安裝 %s 的正確資訊。"
 
-#: yuminstall.py:346
+#: ../yuminstall.py:360
 msgid "Change Disc"
 msgstr "更換光碟"
 
-#: yuminstall.py:347
+#: ../yuminstall.py:361
 #, python-format
 msgid "Please insert %s disc %d to continue."
 msgstr "請插入 %s 光碟片 %d 以繼續。"
 
-#: yuminstall.py:357
+#: ../yuminstall.py:371
 msgid "Wrong Disc"
 msgstr "錯誤的光碟"
 
-#: yuminstall.py:358
+#: ../yuminstall.py:372
 #, python-format
 msgid "That's not the correct %s disc."
 msgstr "這不是正確的 %s 光碟。"
 
-#: yuminstall.py:365
+#: ../yuminstall.py:379
 msgid "Unable to access the disc."
 msgstr "無法存取光碟。"
 
-#: yuminstall.py:524
+#: ../yuminstall.py:538
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
-msgstr "軟體庫 %r 在配置中缺少名稱，使用 id"
+msgstr "軟體庫 %r 在設定中缺少名稱，使用 id"
+
+#: ../yuminstall.py:651 ../yuminstall.py:1081
+msgid ""
+"Some of your software repositories require networking, but there was an "
+"error enabling the network on your system."
+msgstr "您的一些軟體庫需要網路作業，不過在您的系統上啟用網路時發生了一項錯誤。"
 
-#: yuminstall.py:676 yuminstall.py:678
+#: ../yuminstall.py:712 ../yuminstall.py:714
 msgid "Re_boot"
-msgstr "重新開機（_b）"
+msgstr "重新開機(_b)"
 
-#: yuminstall.py:676
+#: ../yuminstall.py:712
 msgid "_Eject"
-msgstr "退出光碟片（_E）"
+msgstr "退出光碟片(_E)"
 
-#: yuminstall.py:687
+#: ../yuminstall.py:723
 #, python-format
 msgid ""
 "The file %s cannot be opened.  This is due to a missing file, a corrupt "
@@ -1758,62 +1775,61 @@ msgstr ""
 "如果您重新開機的話，您的系統將會處於不一致的狀態，並且可能會需要重新安裝。\n"
 "\n"
 
-#: yuminstall.py:735
+#: ../yuminstall.py:771
 msgid "Retrying"
 msgstr "正在重試"
 
-#: yuminstall.py:735
-#, fuzzy
+#: ../yuminstall.py:771
 msgid "Retrying download."
-msgstr "正在重新嘗試下載..."
+msgstr "正在重新嘗試下載。"
 
-#: yuminstall.py:801
+#: ../yuminstall.py:837
 #, python-format
-msgid ""
-"There was an error running your transaction for the following reason: %s\n"
+msgid "There was an error running your transaction for the following reason: %s\n"
 msgstr "由於下列原因，您的傳輸發生了錯誤：%s\n"
 
-#: yuminstall.py:836 yuminstall.py:837
+#. FIXME: we need to actually look at these problems...
+#: ../yuminstall.py:872 ../yuminstall.py:873
 msgid "file conflicts"
 msgstr "檔案衝突"
 
-#: yuminstall.py:838
+#: ../yuminstall.py:874
 msgid "older package(s)"
 msgstr "舊的套件"
 
-#: yuminstall.py:839
+#: ../yuminstall.py:875
 msgid "insufficient disk space"
 msgstr "磁碟空間不足"
 
-#: yuminstall.py:840
+#: ../yuminstall.py:876
 msgid "insufficient disk inodes"
 msgstr "磁碟 inode 不足"
 
-#: yuminstall.py:841
+#: ../yuminstall.py:877
 msgid "package conflicts"
 msgstr "套件衝突"
 
-#: yuminstall.py:842
+#: ../yuminstall.py:878
 msgid "package already installed"
 msgstr "已安裝套件"
 
-#: yuminstall.py:843
+#: ../yuminstall.py:879
 msgid "required package"
 msgstr "所需套件"
 
-#: yuminstall.py:844
+#: ../yuminstall.py:880
 msgid "package for incorrect arch"
 msgstr "套件的架構不正確"
 
-#: yuminstall.py:845
+#: ../yuminstall.py:881
 msgid "package for incorrect os"
 msgstr "套件的作業系統不正確"
 
-#: yuminstall.py:859
+#: ../yuminstall.py:895
 msgid "You need more space on the following file systems:\n"
 msgstr "以下檔案系統需要更多空間：\n"
 
-#: yuminstall.py:872
+#: ../yuminstall.py:908
 #, python-format
 msgid ""
 "There were file conflicts when checking the packages to be installed:\n"
@@ -1822,48 +1838,41 @@ msgstr ""
 "當檢查您想安裝的套件時發現了檔案衝突：\n"
 "%s\n"
 
-#: yuminstall.py:875
+#: ../yuminstall.py:911
 #, python-format
 msgid ""
 "There was an error running your transaction for the following reason(s): %"
 "s.\n"
 msgstr "由於下列原因，您的傳輸發生了錯誤：%s。\n"
 
-#: yuminstall.py:882 yuminstall.py:887
+#: ../yuminstall.py:918 ../yuminstall.py:923
 msgid "Error Running Transaction"
 msgstr "執行傳輸時發生錯誤"
 
-#: yuminstall.py:1048
-msgid ""
-"Some of your software repositories require networking, but there was an "
-"error enabling the network on your system."
-msgstr "您的一些軟體庫需要網路作業，不過在您的系統上啟用網路時發生了一項錯誤。"
-
-#: yuminstall.py:1082
+#: ../yuminstall.py:1115
 msgid ""
 "Unable to read group information from repositories.  This is a problem with "
 "the generation of your install tree."
 msgstr "無法由軟體庫讀取群組讀取群組資訊。這是個您安裝樹在產生上所發生的問題。"
 
-#: yuminstall.py:1118
-#, fuzzy
+#: ../yuminstall.py:1151
 msgid "Retrieving installation information."
-msgstr "正在取得安裝資訊..."
+msgstr "正在取得安裝資訊。"
 
-#: yuminstall.py:1120
-#, fuzzy, python-format
+#: ../yuminstall.py:1153
+#, python-format
 msgid "Retrieving installation information for %s."
-msgstr "正在為 %s 取得安裝資訊..."
+msgstr "正在為 %s 取得安裝資訊。"
 
-#: yuminstall.py:1122
+#: ../yuminstall.py:1155
 msgid "Installation Progress"
 msgstr "安裝進度"
 
-#: yuminstall.py:1135 textw/constants_text.py:64
+#: ../yuminstall.py:1168 ../textw/constants_text.py:64
 msgid "Edit"
 msgstr "修改"
 
-#: yuminstall.py:1148 yuminstall.py:1305
+#: ../yuminstall.py:1181 ../yuminstall.py:1339
 #, python-format
 msgid ""
 "Unable to read package metadata. This may be due to a missing repodata "
@@ -1877,7 +1886,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: yuminstall.py:1323
+#: ../yuminstall.py:1357
 #, python-format
 msgid ""
 "Your selected packages require %d MB of free space for installation, but you "
@@ -1887,22 +1896,22 @@ msgstr ""
 "您所選擇安裝的套件需要 %d MB 的磁碟空間；但電腦上沒有足夠的空間。您可以變更選"
 "擇，或退出安裝程式。"
 
-#: yuminstall.py:1342
+#: ../yuminstall.py:1376
 msgid "Reboot?"
 msgstr "重新開機？"
 
-#: yuminstall.py:1343
+#: ../yuminstall.py:1377
 msgid "The system will be rebooted now."
 msgstr "系統現在將重新開機。"
 
-#: yuminstall.py:1486
+#: ../yuminstall.py:1520
 #, python-format
 msgid ""
 "You appear to be upgrading from a system which is too old to upgrade to this "
 "version of %s.  Are you sure you wish to continue the upgrade process?"
 msgstr "您正打算從太舊而不適合升級的系統，升級到 %s。您確定要繼續升級程序嗎？"
 
-#: yuminstall.py:1522
+#: ../yuminstall.py:1556
 #, python-format
 msgid ""
 "The arch of the release of %s you are upgrading to appears to be %s which "
@@ -1912,103 +1921,96 @@ msgstr ""
 "您正打算從先前安裝的 %s 架構升級至 %s 版本的架構（%s），不過這和您先前所安裝"
 "的架構並不相符。這很可能無法成功。您確定要繼續進行升級程序嗎？"
 
-#: yuminstall.py:1573
+#: ../yuminstall.py:1607
 msgid "Post Upgrade"
 msgstr "升級後"
 
-#: yuminstall.py:1574
-#, fuzzy
+#: ../yuminstall.py:1608
 msgid "Performing post-upgrade configuration"
-msgstr "正在執行升級後的設定..."
+msgstr "正在執行升級後的設定"
 
-#: yuminstall.py:1576
-#, fuzzy
+#: ../yuminstall.py:1610
 msgid "Post Installation"
-msgstr "最後階段安裝"
+msgstr "安裝後的階段"
 
-#: yuminstall.py:1577
-#, fuzzy
+#: ../yuminstall.py:1611
 msgid "Performing post-installation configuration"
-msgstr "正在執行最後階段的安裝設定..."
+msgstr "正在執行安裝後的階段的設定"
 
-#: yuminstall.py:1803
-#, fuzzy
+#: ../yuminstall.py:1840
 msgid "Installation Starting"
-msgstr "安裝開始"
+msgstr "安裝即將開始"
 
-#: yuminstall.py:1804
-#, fuzzy
+#: ../yuminstall.py:1841
 msgid "Starting installation process"
-msgstr "安裝進度"
+msgstr "正在進行安裝程序"
 
-#: yuminstall.py:1842
+#: ../yuminstall.py:1879
 msgid "Dependency Check"
 msgstr "套件相依性檢查"
 
-#: yuminstall.py:1843
-#, fuzzy
+#: ../yuminstall.py:1880
 msgid "Checking dependencies in packages selected for installation"
-msgstr "正在檢查安裝套件的相依性..."
+msgstr "正在檢查欲安裝套件的相依性。"
 
-#: installclasses/fedora.py:39
+#: ../installclasses/fedora.py:39
 msgid "_Fedora"
-msgstr "_Fedora"
+msgstr "_Fedora(_F)"
 
-#: installclasses/fedora.py:40 installclasses/rhel.py:45
+#: ../installclasses/fedora.py:40 ../installclasses/rhel.py:45
 #, python-format
 msgid ""
 "The default installation of %s includes a set of software applicable for "
 "general internet usage. What additional tasks would you like your system to "
 "include support for?"
-msgstr ""
-"%s 的預設安裝包括使用網際網路的一般性軟體。您希望系統還支援哪些額外項目呢？"
+msgstr "%s 的預設安裝包括使用網際網路的一般性軟體。您希望系統還支援哪些額外項目呢？"
 
-#: installclasses/fedora.py:49
+#: ../installclasses/fedora.py:49
 msgid "Office and Productivity"
 msgstr "辦公軟體 / 生產力軟體"
 
-#: installclasses/fedora.py:50 installclasses/rhel.py:57
-#: installclasses/rhel.py:62
+#: ../installclasses/fedora.py:50 ../installclasses/rhel.py:57
+#: ../installclasses/rhel.py:62
 msgid "Software Development"
 msgstr "軟體開發"
 
-#: installclasses/fedora.py:51
+#: ../installclasses/fedora.py:51
 msgid "Web Server"
 msgstr "網頁伺服器"
 
-#: installclasses/rhel.py:44
+#: ../installclasses/rhel.py:44
 msgid "Red Hat Enterprise Linux"
 msgstr "Red Hat Enterprise Linux"
 
-#: installclasses/rhel.py:54
+#: ../installclasses/rhel.py:54
 msgid "Office"
 msgstr "辦公軟體"
 
-#: installclasses/rhel.py:55
+#: ../installclasses/rhel.py:55
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: installclasses/rhel.py:61
+#: ../installclasses/rhel.py:61
 msgid "Web server"
 msgstr "網頁伺服器"
 
-#: installclasses/rhel.py:66
+#: ../installclasses/rhel.py:66
 msgid "Virtualization"
 msgstr "虛擬化"
 
-#: installclasses/rhel.py:67
+#: ../installclasses/rhel.py:67
 msgid "Clustering"
 msgstr "叢集"
 
-#: installclasses/rhel.py:68
+#: ../installclasses/rhel.py:68
 msgid "Storage Clustering"
 msgstr "儲存裝置叢集"
 
-#: installclasses/rhel.py:72
+#: ../installclasses/rhel.py:72
 msgid "Installation Number"
 msgstr "安裝序號"
 
-#: installclasses/rhel.py:73
+#: ../installclasses/rhel.py:73
 msgid ""
 "Would you like to enter an Installation Number (sometimes called "
 "Subscription Number) now? This feature enables the installer to access any "
@@ -2017,161 +2019,165 @@ msgid ""
 "\n"
 "See http://www.redhat.com/InstNum/ for more information."
 msgstr ""
+"您是否希望現在輸入一組安裝序號（亦稱為訂閱號碼）？這項功能能讓安裝程式存取包含在您訂閱中的任何額外元件。若您跳過此步驟的話，額外的元件可在之後經由手動式安裝。\n"
+"\n"
+"欲取得更多資訊請參閱 http://www.redhat.com/InstNum/。"
 
-#: installclasses/rhel.py:79
+#: ../installclasses/rhel.py:79
 msgid ""
 "If you cannot locate the Installation Number, consult http://www.redhat.com/"
 "InstNum/"
 msgstr ""
+"若您找不到安裝序號，請參閱 http://www.redhat.com/"
+"InstNum/"
 
-#: iw/GroupSelector.py:147
+#: ../iw/GroupSelector.py:147
 #, python-format
 msgid "Packages in %s"
 msgstr "%s 中的套件"
 
-#: iw/GroupSelector.py:424
+#: ../iw/GroupSelector.py:424
 #, python-format
 msgid "Optional packages selected: %d of %d"
 msgstr "選擇了可選套件：%d 之 %d"
 
-#: iw/GroupSelector.py:425
+#: ../iw/GroupSelector.py:425
 #, python-format
 msgid "<i>%s</i>"
 msgstr "<i>%s</i>"
 
-#: iw/GroupSelector.py:485
+#: ../iw/GroupSelector.py:485
 msgid "Uncategorized"
 msgstr "未分類"
 
-#: iw/account_gui.py:52
+#. connect hotkeys
+#: ../iw/account_gui.py:52
 msgid "Root _Password:"
-msgstr "Root 密碼（_P）："
+msgstr "Root 密碼(_P)："
 
-#: iw/account_gui.py:54
+#: ../iw/account_gui.py:54
 msgid "_Confirm:"
-msgstr "密碼確認（_C）："
+msgstr "密碼確認(_C)："
 
-#: iw/account_gui.py:97
+#: ../iw/account_gui.py:92
 msgid "Caps Lock is on."
 msgstr "Caps Lock 啟用中。"
 
-#: iw/account_gui.py:107 iw/account_gui.py:115 iw/account_gui.py:122
-#: iw/account_gui.py:142 textw/userauth_text.py:74
+#: ../iw/account_gui.py:102 ../iw/account_gui.py:110 ../iw/account_gui.py:117
+#: ../iw/account_gui.py:137 ../textw/userauth_text.py:74
 msgid "Error with Password"
 msgstr "密碼發生錯誤"
 
-#: iw/account_gui.py:108
+#: ../iw/account_gui.py:103
 msgid ""
 "You must enter your root password and confirm it by typing it a second time "
 "to continue."
 msgstr "您必須輸入您的 root 密碼，並再輸入一次以作確認，才能繼續安裝過程。"
 
-#: iw/account_gui.py:116
+#: ../iw/account_gui.py:111
 msgid "The passwords you entered were different.  Please try again."
 msgstr "您輸入的密碼不相符，請重新輸入。"
 
-#: iw/account_gui.py:123
+#: ../iw/account_gui.py:118
 msgid "The root password must be at least six characters long."
 msgstr "root 密碼不得少於六個字元。"
 
-#: iw/account_gui.py:132 textw/userauth_text.py:83
+#: ../iw/account_gui.py:127 ../textw/userauth_text.py:83
 msgid "Weak Password"
 msgstr "安全性較弱的密碼"
 
-#: iw/account_gui.py:133
+#: ../iw/account_gui.py:128
 #, python-format
 msgid "You have provided a weak password: %s"
-msgstr ""
+msgstr "您所提供的密碼安全性過低：%s"
 
-#: iw/account_gui.py:135
-#, fuzzy
+#: ../iw/account_gui.py:130
 msgid "Use Anyway"
-msgstr "使用者名稱"
+msgstr "照樣使用"
 
-#: iw/account_gui.py:143 textw/userauth_text.py:75
-msgid ""
-"Requested password contains non-ASCII characters, which are not allowed."
+#: ../iw/account_gui.py:138 ../textw/userauth_text.py:75
+msgid "Requested password contains non-ASCII characters, which are not allowed."
 msgstr "所要求的密碼含有非 ASCII 的字元，這些字元不允許使用在密碼上。"
 
-#: iw/autopart_type.py:100
+#: ../iw/autopart_type.py:100
 msgid ""
 "No partitions are available to resize.  Only physical partitions with "
 "specific filesystems can be resized."
 msgstr "沒有可變更大小的分割區。只有含有特定檔案系統的實體分割區可改變大小。"
 
-#: iw/autopart_type.py:123
+#: ../iw/autopart_type.py:123
 msgid "Resize FileSystem Error"
 msgstr "重設檔案系統大小時發生了錯誤"
 
-#: iw/autopart_type.py:124 iw/autopart_type.py:133
+#: ../iw/autopart_type.py:124 ../iw/autopart_type.py:133
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: iw/autopart_type.py:132
+#: ../iw/autopart_type.py:132
 msgid "Resize Device Error"
 msgstr "重設裝置大小時發生了錯誤"
 
-#: iw/autopart_type.py:207
-msgid ""
-"Do you really want to boot from a disk which is not used for installation?"
+#: ../iw/autopart_type.py:207
+msgid "Do you really want to boot from a disk which is not used for installation?"
 msgstr "您是否希望由一個非安裝用的磁碟來進行開機？"
 
-#: iw/autopart_type.py:284
+#: ../iw/autopart_type.py:284
 msgid "Invalid Initiator Name"
 msgstr "Initiator 名稱無效"
 
-#: iw/autopart_type.py:285
+#: ../iw/autopart_type.py:285
 msgid "You must provide an initiator name."
 msgstr "您必須提供一個 Initiator 名稱。"
 
-#: iw/autopart_type.py:311
+#: ../iw/autopart_type.py:311
 msgid "Error with Data"
 msgstr "資料錯誤"
 
-#: iw/autopart_type.py:469 iw/autopart_type.py:470
+#: ../iw/autopart_type.py:469 ../iw/autopart_type.py:470
 msgid "Rescanning disks"
 msgstr "正在重新掃描磁碟"
 
-#: iw/autopart_type.py:524 textw/partition_text.py:63
+#: ../iw/autopart_type.py:524 ../textw/partition_text.py:63
 msgid "Use entire drive"
 msgstr "使用整個磁碟"
 
-#: iw/autopart_type.py:525 textw/partition_text.py:64
+#: ../iw/autopart_type.py:525 ../textw/partition_text.py:64
 msgid "Replace existing Linux system"
 msgstr "替換掉現有的 Linux 系統"
 
-#: iw/autopart_type.py:526
+#: ../iw/autopart_type.py:526
 msgid "Shrink current system"
 msgstr "縮小目前的系統"
 
-#: iw/autopart_type.py:527 textw/partition_text.py:65
+#: ../iw/autopart_type.py:527 ../textw/partition_text.py:65
 msgid "Use free space"
 msgstr "使用可用空間"
 
-#: iw/autopart_type.py:528
+#: ../iw/autopart_type.py:528
 msgid "Create custom layout"
 msgstr "建立自訂的分割模式"
 
-#: iw/blpasswidget.py:47
+#. password widgets + callback
+#: ../iw/blpasswidget.py:44
 msgid "_Use a boot loader password"
-msgstr "使用開機載入程式密碼（_U）"
+msgstr "使用開機載入程式密碼(_U)"
 
-#: iw/blpasswidget.py:48
+#: ../iw/blpasswidget.py:45
 msgid ""
 "A boot loader password prevents users from changing kernel options, "
 "increasing security."
 msgstr "開機載入程式密碼可以防止使用者更改核心選項，並增強安全性。"
 
-#: iw/blpasswidget.py:79
+#: ../iw/blpasswidget.py:76
 msgid "Change _password"
-msgstr "更改密碼（_p）"
+msgstr "更改密碼(_p)"
 
-#: iw/blpasswidget.py:102
+#: ../iw/blpasswidget.py:99
 msgid "Enter Boot Loader Password"
 msgstr "輸入開機管理程式密碼"
 
-#: iw/blpasswidget.py:108
+#: ../iw/blpasswidget.py:105
 msgid ""
 "Enter a boot loader password and then confirm it.  (Note that your BIOS "
 "keymap may be different than the actual keymap you are used to.)"
@@ -2179,23 +2185,23 @@ msgstr ""
 "請輸入開機管理程式的密碼，然後再輸入一次以作確認。（請注意您的 BIOS 鍵盤配置 "
 "也許與您平時使用的實際鍵盤配置不一樣。）"
 
-#: iw/blpasswidget.py:115
+#: ../iw/blpasswidget.py:112
 msgid "_Password:"
-msgstr "密碼（_P）："
+msgstr "密碼(_P)："
 
-#: iw/blpasswidget.py:121
+#: ../iw/blpasswidget.py:118
 msgid "Con_firm:"
-msgstr "密碼確認（_f）："
+msgstr "密碼確認(_f)："
 
-#: iw/blpasswidget.py:142
+#: ../iw/blpasswidget.py:139
 msgid "Passwords don't match"
 msgstr "密碼不符"
 
-#: iw/blpasswidget.py:143
+#: ../iw/blpasswidget.py:140
 msgid "Passwords do not match"
 msgstr "密碼不符"
 
-#: iw/blpasswidget.py:152
+#: ../iw/blpasswidget.py:149
 msgid ""
 "Your boot loader password is shorter than six characters.  We recommend a "
 "longer boot loader password.\n"
@@ -2206,25 +2212,25 @@ msgstr ""
 "\n"
 "您想要繼續使用這組密碼嗎？"
 
-#: iw/bootloader_main_gui.py:36
+#: ../iw/bootloader_main_gui.py:36
 msgid "Boot Loader Configuration"
 msgstr "開機管理程式設定"
 
-#: iw/bootloader_main_gui.py:179 iw/bootloader_main_gui.py:184
-#: iw/bootloader_main_gui.py:221
+#: ../iw/bootloader_main_gui.py:179 ../iw/bootloader_main_gui.py:184
+#: ../iw/bootloader_main_gui.py:221
 #, python-format
 msgid "_Install boot loader on /dev/%s."
-msgstr "在 /dev/%s 上安裝開機載入程式（I）。"
+msgstr "在 /dev/%s 上安裝開機載入程式(_I)。"
 
-#: iw/bootloader_main_gui.py:227
+#: ../iw/bootloader_main_gui.py:227
 msgid "_Change device"
-msgstr "改變裝置（_C）"
+msgstr "改變裝置(_C)"
 
-#: iw/congrats_gui.py:33
+#: ../iw/congrats_gui.py:33
 msgid "Congratulations"
 msgstr "恭喜您"
 
-#: iw/congrats_gui.py:74 textw/complete_text.py:39
+#: ../iw/congrats_gui.py:74 ../textw/complete_text.py:39
 #, python-format
 msgid ""
 "Congratulations, your %s installation is complete.\n"
@@ -2233,19 +2239,19 @@ msgstr ""
 "恭喜您，您的 %s 安裝已完成。\n"
 "\n"
 
-#: iw/congrats_gui.py:77 textw/complete_text.py:42
+#: ../iw/congrats_gui.py:77 ../textw/complete_text.py:42
 msgid "Shutdown"
 msgstr "關閉"
 
-#: iw/congrats_gui.py:79 textw/complete_text.py:44
+#: ../iw/congrats_gui.py:79 ../textw/complete_text.py:44
 msgid "Please shutdown to use the installed system.\n"
 msgstr "請進行關閉以使用已安裝的系統。\n"
 
-#: iw/congrats_gui.py:81 textw/complete_text.py:46
+#: ../iw/congrats_gui.py:81 ../textw/complete_text.py:46
 msgid "Please reboot to use the installed system.\n"
 msgstr "請重新啟動系統來使用已安裝的系統。\n"
 
-#: iw/congrats_gui.py:86 textw/complete_text.py:51
+#: ../iw/congrats_gui.py:86 ../textw/complete_text.py:51
 msgid ""
 "Note that updates may be available to ensure the proper functioning of your "
 "system and installation of these updates is recommended after the reboot."
@@ -2253,7 +2259,7 @@ msgstr ""
 "請注意，可能會有可用的更新以確保您的系統可正常運作，我們建議您在重新啟動系統"
 "後安裝這些更新。"
 
-#: iw/congrats_gui.py:90 textw/complete_text.py:55
+#: ../iw/congrats_gui.py:90 ../textw/complete_text.py:55
 #, python-format
 msgid ""
 "Congratulations, your %s installation is complete.\n"
@@ -2267,16 +2273,16 @@ msgstr ""
 "請重新啟動系統以使用安裝的系統。請注意，可能會有可用的更新以確保您的系統可正"
 "常運作，我們建議您在重新啟動系統後安裝這些更新。"
 
-#: iw/examine_gui.py:37
+#: ../iw/examine_gui.py:37
 msgid "Upgrade Examine"
 msgstr "升級檢視"
 
-#: iw/examine_gui.py:59
+#: ../iw/examine_gui.py:59
 #, python-format
 msgid "_Install %s"
-msgstr "安裝 %s（_I）"
+msgstr "安裝 %s(_I)"
 
-#: iw/examine_gui.py:61
+#: ../iw/examine_gui.py:61
 msgid ""
 "Choose this option to freshly install your system. Existing software and "
 "data may be overwritten depending on your configuration choices."
@@ -2284,11 +2290,11 @@ msgstr ""
 "選擇這個選項以完整安裝您的系統，取決於您的設定選項，目前的軟體與資料也許會被"
 "覆寫。"
 
-#: iw/examine_gui.py:65
+#: ../iw/examine_gui.py:65
 msgid "_Upgrade an existing installation"
-msgstr "升級現有系統（_U）"
+msgstr "升級現有系統(_U)"
 
-#: iw/examine_gui.py:67
+#: ../iw/examine_gui.py:67
 #, python-format
 msgid ""
 "Choose this option if you would like to upgrade your existing %s system.  "
@@ -2297,29 +2303,30 @@ msgstr ""
 "假如您想要升級您目前的 %s 系統，請選擇這個選項。此選項將會保留您硬碟上現有的"
 "資料。"
 
-#: iw/examine_gui.py:123
+#: ../iw/examine_gui.py:123
 msgid "The following installed system will be upgraded:"
 msgstr "將會升級下列已安裝的系統："
 
-#: iw/examine_gui.py:136
+#: ../iw/examine_gui.py:136
 msgid "Unknown Linux system"
 msgstr "不知名 Linux 系統"
 
-#: iw/language_gui.py:33
+#: ../iw/language_gui.py:33
 msgid "Language Selection"
 msgstr "選擇語言"
 
-#: iw/language_gui.py:81 loader/lang.c:377
+#: ../iw/language_gui.py:81 ../loader/lang.c:377
 msgid "What language would you like to use during the installation process?"
 msgstr "在安裝的過程中你想使用哪種語言？"
 
-#: iw/lvm_dialog_gui.py:121 iw/lvm_dialog_gui.py:167 iw/lvm_dialog_gui.py:179
-#: iw/lvm_dialog_gui.py:218 iw/lvm_dialog_gui.py:295 iw/lvm_dialog_gui.py:662
-#: iw/lvm_dialog_gui.py:682
+#: ../iw/lvm_dialog_gui.py:121 ../iw/lvm_dialog_gui.py:167
+#: ../iw/lvm_dialog_gui.py:179 ../iw/lvm_dialog_gui.py:218
+#: ../iw/lvm_dialog_gui.py:295 ../iw/lvm_dialog_gui.py:662
+#: ../iw/lvm_dialog_gui.py:682
 msgid "Not enough space"
 msgstr "空間不足"
 
-#: iw/lvm_dialog_gui.py:122
+#: ../iw/lvm_dialog_gui.py:122
 msgid ""
 "The physical extent size cannot be changed because otherwise the space "
 "required by the currently defined logical volumes will be increased to more "
@@ -2328,11 +2335,11 @@ msgstr ""
 "無法更改實體容量的大小，因為目前定義的邏輯卷冊所需的空間將會增大至超過可使用"
 "的空間。"
 
-#: iw/lvm_dialog_gui.py:131
+#: ../iw/lvm_dialog_gui.py:131
 msgid "Confirm Physical Extent Change"
 msgstr "確認變更實體容量"
 
-#: iw/lvm_dialog_gui.py:132
+#: ../iw/lvm_dialog_gui.py:132
 msgid ""
 "This change in the value of the physical extent will require the sizes of "
 "the current logical volume requests to be rounded up in size to an integer "
@@ -2345,11 +2352,11 @@ msgstr ""
 "\n"
 "這個變更會立即生效。"
 
-#: iw/lvm_dialog_gui.py:141 iw/lvm_dialog_gui.py:201
+#: ../iw/lvm_dialog_gui.py:141 ../iw/lvm_dialog_gui.py:201
 msgid "C_ontinue"
-msgstr "繼續（_o）"
+msgstr "繼續(_o)"
 
-#: iw/lvm_dialog_gui.py:168
+#: ../iw/lvm_dialog_gui.py:168
 #, python-format
 msgid ""
 "The physical extent size cannot be changed because the value selected (%"
@@ -2359,7 +2366,7 @@ msgstr ""
 "無法變更實體容量的大小，因為選取的數值（%10.2f MB）大於卷冊群組中最小的實體磁"
 "區（%10.2f MB）。"
 
-#: iw/lvm_dialog_gui.py:180
+#: ../iw/lvm_dialog_gui.py:180
 #, python-format
 msgid ""
 "The physical extent size cannot be changed because the value selected (%"
@@ -2369,18 +2376,17 @@ msgstr ""
 "無法變更實體容量的大小，因為選取的數值（%10.2f MB）大於卷冊群組中最小的實體磁"
 "區（%10.2f MB）。"
 
-#: iw/lvm_dialog_gui.py:194
+#: ../iw/lvm_dialog_gui.py:194
 msgid "Too small"
 msgstr "太小"
 
-#: iw/lvm_dialog_gui.py:195
+#: ../iw/lvm_dialog_gui.py:195
 msgid ""
 "This change in the value of the physical extent will waste substantial space "
 "on one or more of the physical volumes in the volume group."
-msgstr ""
-"這個實體容量數值的變更將會浪費在卷冊群組中一或更多的實體卷冊上相當大的空間。"
+msgstr "這個實體容量數值的變更將會浪費在卷冊群組中一或更多的實體卷冊上相當大的空間。"
 
-#: iw/lvm_dialog_gui.py:219
+#: ../iw/lvm_dialog_gui.py:219
 #, python-format
 msgid ""
 "The physical extent size cannot be changed because the resulting maximum "
@@ -2390,7 +2396,7 @@ msgstr ""
 "無法變更實體容量的大小，因為結果最大的邏輯卷冊大小（%10.2f MB）小於一或多個目"
 "前已定義的邏輯卷冊。"
 
-#: iw/lvm_dialog_gui.py:296
+#: ../iw/lvm_dialog_gui.py:296
 msgid ""
 "You cannot remove this physical volume because otherwise the volume group "
 "will be too small to hold the currently defined logical volumes."
@@ -2398,95 +2404,108 @@ msgstr ""
 "您不能移除這個實體卷冊，因為這樣會導致卷冊群組將會太小而無法容納目前已定義的"
 "邏輯卷冊。"
 
-#: iw/lvm_dialog_gui.py:395
+#: ../iw/lvm_dialog_gui.py:395
 msgid "Make Logical Volume"
 msgstr "建立邏輯卷冊"
 
-#: iw/lvm_dialog_gui.py:397
+#: ../iw/lvm_dialog_gui.py:397
 #, python-format
 msgid "Edit Logical Volume: %s"
 msgstr "編輯邏輯卷冊：%s"
 
-#: iw/lvm_dialog_gui.py:428 iw/raid_dialog_gui.py:378
+#. File system type lables & combo
+#: ../iw/lvm_dialog_gui.py:428 ../iw/raid_dialog_gui.py:378
 msgid "_File System Type:"
-msgstr "檔案系統類型（_F）："
+msgstr "檔案系統類型(_F)："
 
-#: iw/lvm_dialog_gui.py:434
+#. Logical Volume name label & entry
+#: ../iw/lvm_dialog_gui.py:434
 msgid "_Logical Volume Name:"
-msgstr "邏輯卷冊名稱（_L）："
+msgstr "邏輯卷冊名稱(_L)："
 
-#: iw/lvm_dialog_gui.py:443 iw/partition_dialog_gui.py:411
+#. Logical Volume size label & entry
+#. Size specification
+#: ../iw/lvm_dialog_gui.py:443 ../iw/partition_dialog_gui.py:411
 msgid "_Size (MB):"
-msgstr "大小（MB）（_S）："
+msgstr "大小（MB）(_S)："
 
-#: iw/lvm_dialog_gui.py:449
+#. Maximum size label
+#: ../iw/lvm_dialog_gui.py:449
 #, python-format
 msgid "(Max size is %s MB)"
 msgstr "（最大空間為 %s MB）"
 
-#: iw/lvm_dialog_gui.py:453 iw/partition_dialog_gui.py:463
-#: iw/partition_ui_helpers_gui.py:338 iw/raid_dialog_gui.py:350
+#. Encrypt Check Box button.
+#. this gets added to the table a bit later on
+#. we'll maybe add this further down
+#: ../iw/lvm_dialog_gui.py:453 ../iw/partition_dialog_gui.py:463
+#: ../iw/partition_ui_helpers_gui.py:338 ../iw/raid_dialog_gui.py:350
 msgid "_Encrypt"
-msgstr "加密（_E）"
+msgstr "加密(_E)"
 
-#: iw/lvm_dialog_gui.py:462 iw/raid_dialog_gui.py:388
+#. File system type lable & combo
+#: ../iw/lvm_dialog_gui.py:462 ../iw/raid_dialog_gui.py:388
 msgid "Original File System Type:"
 msgstr "原本的檔案系統類型："
 
-#: iw/lvm_dialog_gui.py:466 iw/partition_gui.py:776 iw/partition_gui.py:930
-#: iw/raid_dialog_gui.py:393
+#: ../iw/lvm_dialog_gui.py:466 ../iw/partition_gui.py:776
+#: ../iw/partition_gui.py:928 ../iw/raid_dialog_gui.py:393
 msgid "Unknown"
 msgstr "不知名類型"
 
-#: iw/lvm_dialog_gui.py:470 iw/partition_dialog_gui.py:401
-#: iw/raid_dialog_gui.py:399
+#: ../iw/lvm_dialog_gui.py:470 ../iw/partition_dialog_gui.py:401
+#: ../iw/raid_dialog_gui.py:399
 msgid "Original File System Label:"
 msgstr "原本的檔案系統標籤："
 
-#: iw/lvm_dialog_gui.py:475
+#. Logical Volume name label & entry
+#: ../iw/lvm_dialog_gui.py:475
 msgid "Logical Volume Name:"
 msgstr "邏輯卷冊名稱："
 
-#: iw/lvm_dialog_gui.py:479
+#. Logical Volume size label & entry
+#: ../iw/lvm_dialog_gui.py:479
 msgid "Size (MB):"
 msgstr "大小（MB）："
 
-#: iw/lvm_dialog_gui.py:506 iw/partition_dialog_gui.py:356
-#: iw/raid_dialog_gui.py:369
+#. Add the mountCombo that we previously created
+#. Mount Point entry
+#: ../iw/lvm_dialog_gui.py:506 ../iw/partition_dialog_gui.py:356
+#: ../iw/raid_dialog_gui.py:369
 msgid "_Mount Point:"
-msgstr "檔案系統掛載點（_M）："
+msgstr "檔案系統掛載點(_M)："
 
-#: iw/lvm_dialog_gui.py:589
+#: ../iw/lvm_dialog_gui.py:589
 msgid "Illegal Logical Volume Name"
 msgstr "無效的邏輯卷冊名稱"
 
-#: iw/lvm_dialog_gui.py:604
+#: ../iw/lvm_dialog_gui.py:604
 msgid "Illegal logical volume name"
 msgstr "無效的邏輯卷冊名稱"
 
-#: iw/lvm_dialog_gui.py:605
+#: ../iw/lvm_dialog_gui.py:605
 #, python-format
 msgid "The logical volume name \"%s\" is already in use. Please pick another."
 msgstr "邏輯卷冊名稱「%s」已被使用。請選擇另外一個。"
 
-#: iw/lvm_dialog_gui.py:633
+#: ../iw/lvm_dialog_gui.py:633
 msgid "Mount point in use"
 msgstr "掛載點已被使用"
 
-#: iw/lvm_dialog_gui.py:634
+#: ../iw/lvm_dialog_gui.py:634
 #, python-format
 msgid "The mount point \"%s\" is in use. Please pick another."
 msgstr "您所要求的掛載點「%s」已經被使用。請另外指定一個。"
 
-#: iw/lvm_dialog_gui.py:649
+#: ../iw/lvm_dialog_gui.py:649
 msgid "Illegal size"
 msgstr "無效的大小"
 
-#: iw/lvm_dialog_gui.py:650
+#: ../iw/lvm_dialog_gui.py:650
 msgid "The requested size as entered is not a valid number greater than 0."
 msgstr "您必須輸入一個有效的、大於零的數字。"
 
-#: iw/lvm_dialog_gui.py:663
+#: ../iw/lvm_dialog_gui.py:663
 #, python-format
 msgid ""
 "The current requested size (%10.2f MB) is larger than the maximum logical "
@@ -2497,23 +2516,23 @@ msgstr ""
 "個容量限制，您可以從未分割的分割區中，建立更多實體卷冊，然後將這些卷冊加入卷"
 "冊群組中。"
 
-#: iw/lvm_dialog_gui.py:683
+#: ../iw/lvm_dialog_gui.py:683
 #, python-format
 msgid ""
 "The logical volumes you have configured require %d MB, but the volume group "
 "only has %d MB.  Please either make the volume group larger or make the "
 "logical volume(s) smaller."
-msgstr ""
+msgstr "您所設定的邏輯卷測需要 %d MB，不過卷測群組只有 %d MB。請擴大卷測群組或是將邏輯卷測縮小。"
 
-#: iw/lvm_dialog_gui.py:769
+#: ../iw/lvm_dialog_gui.py:769
 msgid "No free slots"
 msgstr "沒有可用的位置"
 
-#: iw/lvm_dialog_gui.py:780
+#: ../iw/lvm_dialog_gui.py:780
 msgid "No free space"
 msgstr "沒有剩餘空間"
 
-#: iw/lvm_dialog_gui.py:781
+#: ../iw/lvm_dialog_gui.py:781
 msgid ""
 "There is no room left in the volume group to create new logical volumes. To "
 "add a logical volume you must reduce the size of one or more of the "
@@ -2522,29 +2541,29 @@ msgstr ""
 "這個卷冊群組已經沒有剩餘的空間來建立邏輯卷冊。如要新增一個邏輯卷冊，您必須要"
 "縮小一或多個目前現有的邏輯卷冊空間"
 
-#: iw/lvm_dialog_gui.py:813
+#: ../iw/lvm_dialog_gui.py:813
 #, python-format
 msgid "Are you sure you want to delete the logical volume \"%s\"?"
 msgstr "您確定要刪除邏輯卷冊「%s」嗎？"
 
-#: iw/lvm_dialog_gui.py:926
+#: ../iw/lvm_dialog_gui.py:926
 msgid "Invalid Volume Group Name"
 msgstr "無效的卷冊群組名稱"
 
-#: iw/lvm_dialog_gui.py:935
+#: ../iw/lvm_dialog_gui.py:935
 msgid "Name in use"
 msgstr "名稱已被使用"
 
-#: iw/lvm_dialog_gui.py:936
+#: ../iw/lvm_dialog_gui.py:936
 #, python-format
 msgid "The volume group name \"%s\" is already in use. Please pick another."
 msgstr "您所輸入的卷冊群組名稱「%s」已被使用。請另外指定一個。"
 
-#: iw/lvm_dialog_gui.py:1179
+#: ../iw/lvm_dialog_gui.py:1179
 msgid "Not enough physical volumes"
 msgstr "實體卷冊不足"
 
-#: iw/lvm_dialog_gui.py:1180
+#: ../iw/lvm_dialog_gui.py:1180
 msgid ""
 "At least one unused physical volume partition is needed to create an LVM "
 "Volume Group.\n"
@@ -2557,73 +2576,74 @@ msgstr ""
 "首先，建立一個分割區或「實體卷冊（LVM）」類型的 RAID 陣列，然後再選擇「LVM」"
 "選項。"
 
-#: iw/lvm_dialog_gui.py:1191
+#: ../iw/lvm_dialog_gui.py:1191
 msgid "Make LVM Volume Group"
 msgstr "建立 LVM 卷冊群組"
 
-#: iw/lvm_dialog_gui.py:1194
+#: ../iw/lvm_dialog_gui.py:1194
 #, python-format
 msgid "Edit LVM Volume Group: %s"
 msgstr "編輯 LVM 卷冊群組：%s"
 
-#: iw/lvm_dialog_gui.py:1196
+#: ../iw/lvm_dialog_gui.py:1196
 msgid "Edit LVM Volume Group"
 msgstr "編輯 LVM 卷冊群組"
 
-#: iw/lvm_dialog_gui.py:1212
+#: ../iw/lvm_dialog_gui.py:1212
 msgid "_Volume Group Name:"
-msgstr "卷冊群組名稱（_V）："
+msgstr "卷冊群組名稱(_V)："
 
-#: iw/lvm_dialog_gui.py:1220
+#: ../iw/lvm_dialog_gui.py:1220
 msgid "Volume Group Name:"
 msgstr "卷冊群組名稱："
 
-#: iw/lvm_dialog_gui.py:1228
+#: ../iw/lvm_dialog_gui.py:1228
 msgid "_Physical Extent:"
-msgstr "實體容量（_P）："
+msgstr "實體容量(_P)："
 
-#: iw/lvm_dialog_gui.py:1243
+#: ../iw/lvm_dialog_gui.py:1243
 msgid "Physical Volumes to _Use:"
-msgstr "要使用的實體卷冊（_U）："
+msgstr "要使用的實體卷冊(_U)："
 
-#: iw/lvm_dialog_gui.py:1249
+#: ../iw/lvm_dialog_gui.py:1249
 msgid "Used Space:"
 msgstr "已用空間："
 
-#: iw/lvm_dialog_gui.py:1266
+#: ../iw/lvm_dialog_gui.py:1266
 msgid "Free Space:"
 msgstr "剩餘空間："
 
-#: iw/lvm_dialog_gui.py:1284
+#: ../iw/lvm_dialog_gui.py:1284
 msgid "Total Space:"
 msgstr "全部磁碟空間："
 
-#: iw/lvm_dialog_gui.py:1322
+#: ../iw/lvm_dialog_gui.py:1322
 msgid "Logical Volume Name"
 msgstr "邏輯卷冊名稱"
 
-#: iw/lvm_dialog_gui.py:1325 iw/partition_gui.py:362
-#: iw/upgrade_swap_gui.py:140 textw/upgrade_text.py:118
+#: ../iw/lvm_dialog_gui.py:1325 ../iw/partition_gui.py:362
+#: ../iw/upgrade_swap_gui.py:140 ../textw/upgrade_text.py:118
 msgid "Mount Point"
 msgstr "掛載點"
 
-#: iw/lvm_dialog_gui.py:1328 iw/partition_gui.py:367
+#: ../iw/lvm_dialog_gui.py:1328 ../iw/partition_gui.py:367
 msgid "Size (MB)"
 msgstr "大小（MB）"
 
-#: iw/lvm_dialog_gui.py:1342 iw/osbootwidget.py:95
+#: ../iw/lvm_dialog_gui.py:1342 ../iw/osbootwidget.py:95
 msgid "_Add"
-msgstr "新增（_A）"
+msgstr "新增(_A)"
 
-#: iw/lvm_dialog_gui.py:1345 iw/osbootwidget.py:99 iw/partition_gui.py:1335
+#: ../iw/lvm_dialog_gui.py:1345 ../iw/osbootwidget.py:99
+#: ../iw/partition_gui.py:1335
 msgid "_Edit"
-msgstr "編輯（_E）"
+msgstr "編輯(_E)"
 
-#: iw/lvm_dialog_gui.py:1360
+#: ../iw/lvm_dialog_gui.py:1360
 msgid "_Logical Volumes"
-msgstr "邏輯卷冊（_L）"
+msgstr "邏輯卷冊(_L)"
 
-#: iw/netconfig_dialog.py:192 textw/netconfig_text.py:36
+#: ../iw/netconfig_dialog.py:192 ../textw/netconfig_text.py:36
 #, python-format
 msgid ""
 "An error occurred converting the value entered for \"%s\":\n"
@@ -2632,72 +2652,71 @@ msgstr ""
 "轉換為「%s」輸入的數值時發生錯誤：\n"
 "%s"
 
-#: iw/netconfig_dialog.py:194 iw/netconfig_dialog.py:203
-#: textw/netconfig_text.py:35 textw/netconfig_text.py:40
+#: ../iw/netconfig_dialog.py:194 ../iw/netconfig_dialog.py:203
+#: ../textw/netconfig_text.py:35 ../textw/netconfig_text.py:40
 msgid "Error With Data"
 msgstr "資料錯誤"
 
-#: iw/netconfig_dialog.py:202
+#: ../iw/netconfig_dialog.py:202
 #, python-format
 msgid "A value is required for the field %s."
 msgstr "欄位「%s」需要一個數值。"
 
-#: iw/netconfig_dialog.py:212
+#: ../iw/netconfig_dialog.py:212
 #, python-format
 msgid "An error occurred trying to bring up the %s network interface."
 msgstr "啟用 %s 網路介面時發生了一項錯誤。"
 
-#: iw/netconfig_dialog.py:214
+#: ../iw/netconfig_dialog.py:214
 msgid "Error Configuring Network"
 msgstr "設定網路時發生了錯誤"
 
-#: iw/netconfig_dialog.py:240
-#, fuzzy
+#: ../iw/netconfig_dialog.py:240
 msgid "Dynamic IP Address"
-msgstr "動態 IP"
+msgstr "動態 IP 位址"
 
-#: iw/netconfig_dialog.py:241
-#, fuzzy, python-format
+#: ../iw/netconfig_dialog.py:241
+#, python-format
 msgid "Sending request for IP address information for %s"
-msgstr "正在傳送 %s 之 IP 資訊的要求..."
+msgstr "正在傳送 %s 之 IP 位址資訊的請求"
 
-#: iw/netconfig_dialog.py:256 iw/netconfig_dialog.py:259
-#: textw/netconfig_text.py:215 textw/netconfig_text.py:218
+#: ../iw/netconfig_dialog.py:256 ../iw/netconfig_dialog.py:259
+#: ../textw/netconfig_text.py:215 ../textw/netconfig_text.py:218
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: iw/netconfig_dialog.py:266 textw/netconfig_text.py:225
+#: ../iw/netconfig_dialog.py:266 ../textw/netconfig_text.py:225
 msgid "IPv4 CIDR prefix must be between 0 and 32."
 msgstr "IPv4 CIDR 的前置數字必須介於 0 與 32 之間。"
 
-#: iw/netconfig_dialog.py:267 iw/netconfig_dialog.py:273
-#: iw/netconfig_dialog.py:281 iw/netconfig_dialog.py:284
-#: textw/netconfig_text.py:226 textw/netconfig_text.py:232
-#: textw/netconfig_text.py:240
+#: ../iw/netconfig_dialog.py:267 ../iw/netconfig_dialog.py:273
+#: ../iw/netconfig_dialog.py:281 ../iw/netconfig_dialog.py:284
+#: ../textw/netconfig_text.py:226 ../textw/netconfig_text.py:232
+#: ../textw/netconfig_text.py:240
 msgid "IPv4 Network Mask"
 msgstr "IPv4 網路遮罩"
 
-#: iw/netconfig_dialog.py:294 textw/netconfig_text.py:253
+#: ../iw/netconfig_dialog.py:294 ../textw/netconfig_text.py:253
 msgid "Gateway"
 msgstr "閘道器（Gateway）"
 
-#: iw/netconfig_dialog.py:304 textw/netconfig_text.py:263
+#: ../iw/netconfig_dialog.py:304 ../textw/netconfig_text.py:263
 msgid "Nameserver"
 msgstr "名稱伺服器"
 
-#: iw/netconfig_dialog.py:313
+#: ../iw/netconfig_dialog.py:313
 msgid "Error configuring network device:"
 msgstr "設定網路裝置時發生錯誤："
 
-#: iw/network_gui.py:66 iw/network_gui.py:72
+#: ../iw/network_gui.py:67 ../iw/network_gui.py:73
 msgid "Error with Hostname"
 msgstr "主機名稱錯誤"
 
-#: iw/network_gui.py:67
+#: ../iw/network_gui.py:68
 msgid "You must enter a valid hostname for this computer."
 msgstr "您必須為此電腦輸入一組有效的主機名稱。"
 
-#: iw/network_gui.py:73
+#: ../iw/network_gui.py:74
 #, python-format
 msgid ""
 "The hostname \"%s\" is not valid for the following reason:\n"
@@ -2708,27 +2727,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: iw/osbootwidget.py:50
+#: ../iw/osbootwidget.py:50
 msgid "Boot loader operating system list"
 msgstr "開機載入程式作業系統清單"
 
-#: iw/osbootwidget.py:66
+#: ../iw/osbootwidget.py:66
 msgid "Default"
 msgstr "預設"
 
-#: iw/osbootwidget.py:66 iw/partition_gui.py:361
+#: ../iw/osbootwidget.py:66 ../iw/partition_gui.py:361
 msgid "Label"
 msgstr "標籤"
 
-#: iw/osbootwidget.py:66 iw/partition_gui.py:360
+#. format: column header, type, x alignment, hide?, visibleKey
+#: ../iw/osbootwidget.py:66 ../iw/partition_gui.py:360
 msgid "Device"
 msgstr "裝置"
 
-#: iw/osbootwidget.py:129
+#: ../iw/osbootwidget.py:129
 msgid "Image"
 msgstr "映像"
 
-#: iw/osbootwidget.py:136
+#: ../iw/osbootwidget.py:136
 msgid ""
 "Enter a label for the boot loader menu to display. The device (or hard drive "
 "and partition number) is the device from which it boots."
@@ -2736,104 +2756,106 @@ msgstr ""
 "請輸入要顯示在開機載入程式中的標籤。這裡的裝置（或硬碟與分割區號碼）就是要用"
 "來開機的裝置。"
 
-#: iw/osbootwidget.py:144
+#: ../iw/osbootwidget.py:144
 msgid "_Label"
-msgstr "標籤（_L）"
+msgstr "標籤(_L)"
 
-#: iw/osbootwidget.py:152
+#: ../iw/osbootwidget.py:152
 msgid "_Device"
-msgstr "裝置（_D）"
+msgstr "裝置(_D)"
 
-#: iw/osbootwidget.py:182
+#: ../iw/osbootwidget.py:182
 msgid "Default Boot _Target"
-msgstr "設成預設開機（_T）"
+msgstr "設成預設開機(_T)"
 
-#: iw/osbootwidget.py:211
+#: ../iw/osbootwidget.py:211
 msgid "You must specify a label for the entry"
 msgstr "您必須指定一個標籤給這個紀錄項"
 
-#: iw/osbootwidget.py:220
+#: ../iw/osbootwidget.py:220
 msgid "Boot label contains illegal characters"
 msgstr "開機識別標籤包含不合規格的字元"
 
-#: iw/osbootwidget.py:244
+#: ../iw/osbootwidget.py:244
 msgid "Duplicate Label"
 msgstr "複製標籤"
 
-#: iw/osbootwidget.py:245
+#: ../iw/osbootwidget.py:245
 msgid "This label is already in use for another boot entry."
 msgstr "這個識別標籤已被另一個開機紀錄使用。"
 
-#: iw/osbootwidget.py:258
+#: ../iw/osbootwidget.py:258
 msgid "Duplicate Device"
 msgstr "複製裝置"
 
-#: iw/osbootwidget.py:259
+#: ../iw/osbootwidget.py:259
 msgid "This device is already being used for another boot entry."
 msgstr "這個裝置已經被另一個開機紀錄使用。"
 
-#: iw/osbootwidget.py:321
+#: ../iw/osbootwidget.py:321
 msgid "Cannot Delete"
 msgstr "無法刪除"
 
-#: iw/osbootwidget.py:322
+#: ../iw/osbootwidget.py:322
 #, python-format
 msgid ""
 "This boot target cannot be deleted because it is for the %s system you are "
 "about to install."
 msgstr "無法刪除這個開機目標，因為它是用於您將要安裝的 %s 系統。"
 
-#: iw/partition_dialog_gui.py:57
+#: ../iw/partition_dialog_gui.py:57
 msgid "Additional Size Options"
 msgstr "額外的大小選項"
 
-#: iw/partition_dialog_gui.py:62
+#: ../iw/partition_dialog_gui.py:62
 msgid "_Fixed size"
-msgstr "固定大小（_F）"
+msgstr "固定大小(_F)"
 
-#: iw/partition_dialog_gui.py:64
+#: ../iw/partition_dialog_gui.py:64
 msgid "Fill all space _up to (MB):"
-msgstr "填滿分割區直到（MB）（_u）："
+msgstr "填滿分割區直到（MB）(_u)："
 
-#: iw/partition_dialog_gui.py:74
+#: ../iw/partition_dialog_gui.py:74
 msgid "Fill to maximum _allowable size"
-msgstr "填滿分割區至可使用的最大值（_a）"
+msgstr "填滿分割區至可使用的最大值(_a)"
 
-#: iw/partition_dialog_gui.py:326
+#: ../iw/partition_dialog_gui.py:326
 msgid "Add Partition"
 msgstr "新增分割區"
 
-#: iw/partition_dialog_gui.py:328
+#: ../iw/partition_dialog_gui.py:328
 #, python-format
 msgid "Edit Partition: %s"
 msgstr "編輯分割區：%s"
 
-#: iw/partition_dialog_gui.py:365
+#: ../iw/partition_dialog_gui.py:365
 msgid "File System _Type:"
-msgstr "檔案系統類型（_T）："
+msgstr "檔案系統類型(_T)："
 
-#: iw/partition_dialog_gui.py:381
+#: ../iw/partition_dialog_gui.py:381
 msgid "Allowable _Drives:"
-msgstr "可使用的磁碟機（_D）："
+msgstr "可使用的磁碟機(_D)："
 
-#: iw/partition_dialog_gui.py:450
+#: ../iw/partition_dialog_gui.py:450
 msgid "Force to be a _primary partition"
-msgstr "強制成為主要分割區（_p）"
+msgstr "強制成為主要分割區(_p)"
 
-#: iw/partition_gui.py:319
+#: ../iw/partition_gui.py:319
 #, python-format
 msgid "Drive %s (%-0.f MB) (Model: %s)"
 msgstr "磁碟 %s（%-0.f MB）（型號：%s）"
 
-#: iw/partition_gui.py:363
+#: ../iw/partition_gui.py:363
 msgid "Type"
 msgstr "類型"
 
-#: iw/partition_gui.py:366
+#. (N_("Format"), gobject.TYPE_BOOLEAN, 0.5, 0, isFormattable),
+#. (N_("Size (MB)"), gobject.TYPE_STRING, 1.0, 0, isLeaf),
+#: ../iw/partition_gui.py:366
 msgid "Format"
 msgstr "格式化"
 
-#: iw/partition_gui.py:404
+#: ../iw/partition_gui.py:404
 msgid ""
 "Mount Point/\n"
 "RAID/Volume"
@@ -2841,7 +2863,7 @@ msgstr ""
 "掛載點/\n"
 "RAID/卷冊"
 
-#: iw/partition_gui.py:406
+#: ../iw/partition_gui.py:406
 msgid ""
 "Size\n"
 "(MB)"
@@ -2849,93 +2871,92 @@ msgstr ""
 "大小\n"
 "（MB）"
 
-#: iw/partition_gui.py:518
+#: ../iw/partition_gui.py:518
 msgid "Partitioning"
 msgstr "設定分割區"
 
-#: iw/partition_gui.py:608
-msgid ""
-"The partitioning scheme you requested caused the following critical errors."
+#: ../iw/partition_gui.py:608
+msgid "The partitioning scheme you requested caused the following critical errors."
 msgstr "您所進行的分割區設定造成了下列重大錯誤。"
 
-#: iw/partition_gui.py:610
+#: ../iw/partition_gui.py:610
 #, python-format
-msgid ""
-"You must correct these errors before you continue your installation of %s."
+msgid "You must correct these errors before you continue your installation of %s."
 msgstr "在您繼續安裝 %s 之前，您必須先更正這些錯誤。"
 
-#: iw/partition_gui.py:616
+#: ../iw/partition_gui.py:616
 msgid "Partitioning Errors"
 msgstr "磁碟分割錯誤"
 
-#: iw/partition_gui.py:623
+#. "storage configuration"
+#: ../iw/partition_gui.py:623
 msgid "The partitioning scheme you requested generated the following warnings."
 msgstr "您所進行的分割區設定產生了下列警告。"
 
-#: iw/partition_gui.py:625
+#: ../iw/partition_gui.py:625
 msgid "Would you like to continue with your requested partitioning scheme?"
 msgstr "您想要繼續使用您設定好的磁碟分割嗎？"
 
-#: iw/partition_gui.py:630
+#: ../iw/partition_gui.py:630
 msgid "Partitioning Warnings"
 msgstr "磁碟分割警告"
 
-#: iw/partition_gui.py:651
+#: ../iw/partition_gui.py:651
 msgid "Format Warnings"
 msgstr "格式化警告"
 
-#: iw/partition_gui.py:656
+#: ../iw/partition_gui.py:656
 msgid "_Format"
-msgstr "格式化（_F）"
+msgstr "格式化(_F)"
 
-#: iw/partition_gui.py:683
+#: ../iw/partition_gui.py:683
 msgid "LVM Volume Groups"
 msgstr "LVM 卷冊群組"
 
-#: iw/partition_gui.py:730
+#: ../iw/partition_gui.py:730
 msgid "RAID Devices"
 msgstr "RAID 裝置"
 
-#: iw/partition_gui.py:797 loader/hdinstall.c:222
+#: ../iw/partition_gui.py:797 ../loader/hdinstall.c:222
 msgid "Hard Drives"
 msgstr "硬碟"
 
-#: iw/partition_gui.py:898
+#: ../iw/partition_gui.py:896
 msgid "Extended"
 msgstr "延伸"
 
-#: iw/partition_gui.py:900
+#: ../iw/partition_gui.py:898
 msgid "software RAID"
 msgstr "軟體磁碟陣列（RAID）"
 
-#: iw/partition_gui.py:932
+#: ../iw/partition_gui.py:930
 msgid "Free"
 msgstr "剩餘空間"
 
-#: iw/partition_gui.py:1022 storage/partitioning.py:180
-#: storage/partitioning.py:220
+#: ../iw/partition_gui.py:1022 ../storage/partitioning.py:179
+#: ../storage/partitioning.py:219
 msgid "Error Partitioning"
 msgstr "設定分割區錯誤"
 
-#: iw/partition_gui.py:1023
+#: ../iw/partition_gui.py:1023
 #, python-format
 msgid "Could not allocate requested partitions: %s."
 msgstr "無法配置要求的分割區：%s。"
 
-#: iw/partition_gui.py:1032
+#: ../iw/partition_gui.py:1032
 #, python-format
 msgid "Warning: %s."
 msgstr "警告：%s。"
 
-#: iw/partition_gui.py:1062 iw/partition_gui.py:1069
+#: ../iw/partition_gui.py:1062 ../iw/partition_gui.py:1069
 msgid "Unable To Edit"
 msgstr "無法編輯"
 
-#: iw/partition_gui.py:1063
+#: ../iw/partition_gui.py:1063
 msgid "You must select a device to edit"
 msgstr "您必須選擇欲編輯的裝置"
 
-#: iw/partition_gui.py:1070
+#: ../iw/partition_gui.py:1070
 #, python-format
 msgid ""
 "You cannot edit this device:\n"
@@ -2946,49 +2967,42 @@ msgstr ""
 "\n"
 "%s"
 
-#: iw/partition_gui.py:1177 iw/partition_gui.py:1189
+#: ../iw/partition_gui.py:1177 ../iw/partition_gui.py:1189
 msgid "Not supported"
 msgstr "不支援"
 
-#: iw/partition_gui.py:1178
+#: ../iw/partition_gui.py:1178
 msgid "LVM is NOT supported on this platform."
 msgstr "這個平台不支援 LVM。"
 
-#: iw/partition_gui.py:1190
+#: ../iw/partition_gui.py:1190
 msgid "Software RAID is NOT supported on this platform."
 msgstr "這個平台不支援軟體 RAID。"
 
-#: iw/partition_gui.py:1197
+#: ../iw/partition_gui.py:1197
 msgid "No RAID minor device numbers available"
 msgstr "找不到 RAID 鏡像（minor）裝置的號碼"
 
-#: iw/partition_gui.py:1198
+#: ../iw/partition_gui.py:1198
 msgid ""
 "A software RAID device cannot be created because all of the available RAID "
 "minor device numbers have been used."
-msgstr ""
-"無法建立軟體 RAID 裝置，因為所有的 RAID 鏡像（minor）裝置號碼都已經被使用了。"
+msgstr "無法建立軟體 RAID 裝置，因為所有的 RAID 鏡像（minor）裝置號碼都已經被使用了。"
 
-#: iw/partition_gui.py:1210
+#: ../iw/partition_gui.py:1210
 msgid "RAID Options"
 msgstr "RAID 選項"
 
-#: iw/partition_gui.py:1225
-#, fuzzy, python-format
+#: ../iw/partition_gui.py:1225
+#, python-format
 msgid ""
 "Software RAID allows you to combine several disks into a larger RAID "
 "device.  A RAID device can be configured to provide additional speed and "
 "reliability compared to using an individual drive.  For more information on "
 "using RAID devices please consult the %s documentation."
-msgstr ""
-"軟體 RAID 讓您可以結合許多磁碟成為一個較大的 RAID 裝置。比起使用單獨的磁碟，"
-"RAID 裝置可以設定為提供額外的速度與可靠性。如需關於使用 RAID 裝置的更多資訊，"
-"請參閱 %s 說明文件。\n"
-"\n"
-"您目前可以使用 %s 軟體 RAID 分割區。\n"
-"\n"
+msgstr "軟體 RAID 讓您能夠結合許多磁碟來成為一個較大的 RAID 裝置。比起使用單獨的磁碟，RAID 裝置可被設定來提昇速度與可靠性。欲取得有關於使用 RAID 裝置上的更多資訊，請參閱 %s 說明文件。"
 
-#: iw/partition_gui.py:1235
+#: ../iw/partition_gui.py:1235
 msgid ""
 "To use RAID you must first create at least two partitions of type 'software "
 "RAID'.  Then you can create a RAID device that can be formatted and "
@@ -2999,70 +3013,70 @@ msgstr ""
 "建立可格式化與被掛載的 RAID 裝置。\n"
 "\n"
 
-#: iw/partition_gui.py:1241
+#: ../iw/partition_gui.py:1241
 msgid "What do you want to do now?"
 msgstr "現在您想要怎麼做？"
 
-#: iw/partition_gui.py:1250
+#: ../iw/partition_gui.py:1250
 msgid "Create a software RAID _partition."
-msgstr "建立軟體 RAID 分割區（_p）。"
+msgstr "建立軟體 RAID 分割區(_p)。"
 
-#: iw/partition_gui.py:1253
+#: ../iw/partition_gui.py:1253
 #, python-format
 msgid "Create a RAID _device [default=/dev/md%s]."
-msgstr "建立 RAID 裝置 [預設為 /dev/md%s]（_d）。"
+msgstr "建立 RAID 裝置 [預設為 /dev/md%s](_d)。"
 
-#: iw/partition_gui.py:1257
+#: ../iw/partition_gui.py:1257
 #, python-format
 msgid "Clone a _drive to create a RAID device [default=/dev/md%s]."
-msgstr "完整複製一個磁碟以建立 RAID 裝置 [預設為 /dev/md%s]（_d）。"
+msgstr "完整複製一個磁碟以建立 RAID 裝置 [預設為 /dev/md%s](_d)。"
 
-#: iw/partition_gui.py:1299
+#: ../iw/partition_gui.py:1299
 msgid "Couldn't Create Drive Clone Editor"
 msgstr "無法建立磁碟複製編輯器"
 
-#: iw/partition_gui.py:1300
+#: ../iw/partition_gui.py:1300
 msgid "The drive clone editor could not be created for some reason."
 msgstr "由於某種原因，無法建立磁碟複製編輯器。"
 
-#: iw/partition_gui.py:1334
+#: ../iw/partition_gui.py:1334
 msgid "Ne_w"
-msgstr "新增（_w）"
+msgstr "新增(_w)"
 
-#: iw/partition_gui.py:1337
+#: ../iw/partition_gui.py:1337
 msgid "Re_set"
-msgstr "重設（_s）"
+msgstr "重設(_s)"
 
-#: iw/partition_gui.py:1338
+#: ../iw/partition_gui.py:1338
 msgid "R_AID"
-msgstr "R_AID"
+msgstr "R_AID(_A)"
 
-#: iw/partition_gui.py:1339
+#: ../iw/partition_gui.py:1339
 msgid "_LVM"
-msgstr "_LVM"
+msgstr "_LVM(_L)"
 
-#: iw/partition_gui.py:1380
+#: ../iw/partition_gui.py:1380
 msgid "Hide RAID device/LVM Volume _Group members"
-msgstr "隱藏 RAID 裝置/LVM 卷冊群組成員（_G）"
+msgstr "隱藏 RAID 裝置/LVM 卷冊群組成員(_G)"
 
-#: iw/partition_ui_helpers_gui.py:108 iw/partition_ui_helpers_gui.py:130
-#: iw/partition_ui_helpers_gui.py:132
+#: ../iw/partition_ui_helpers_gui.py:108 ../iw/partition_ui_helpers_gui.py:130
+#: ../iw/partition_ui_helpers_gui.py:132
 msgid "<Not Applicable>"
 msgstr "「不適用」"
 
-#: iw/partition_ui_helpers_gui.py:319
+#: ../iw/partition_ui_helpers_gui.py:319
 msgid "_Format as:"
-msgstr "格式化為（_F）："
+msgstr "格式化為(_F)："
 
-#: iw/partition_ui_helpers_gui.py:341
+#: ../iw/partition_ui_helpers_gui.py:341
 msgid "Mi_grate filesystem to:"
-msgstr "轉換檔案系統（_g）："
+msgstr "轉換檔案系統(_g)："
 
-#: iw/partition_ui_helpers_gui.py:371
+#: ../iw/partition_ui_helpers_gui.py:371
 msgid "_Resize"
-msgstr "重設大小（_R）"
+msgstr "重設大小(_R)"
 
-#: iw/partition_ui_helpers_gui.py:435
+#: ../iw/partition_ui_helpers_gui.py:435
 #, python-format
 msgid ""
 "Partitions of type '%s' must be constrained to a single drive.  To do this, "
@@ -3071,11 +3085,11 @@ msgstr ""
 "「%s」類型的分割區必須限制在單一的磁碟中。這可藉由在「可使用的磁碟」清單中選"
 "擇磁碟來做到。"
 
-#: iw/progress_gui.py:37
+#: ../iw/progress_gui.py:37
 msgid "Installing Packages"
 msgstr "正在安裝套件"
 
-#: iw/raid_dialog_gui.py:317
+#: ../iw/raid_dialog_gui.py:317
 msgid ""
 "At least two unused software RAID partitions are needed to create a RAID "
 "device.\n"
@@ -3087,40 +3101,44 @@ msgstr ""
 "\n"
 "首先建立至少兩個「軟體 RAID」類型的分割區，然後再選擇「RAID」選項。"
 
-#: iw/raid_dialog_gui.py:331 iw/raid_dialog_gui.py:768
+#: ../iw/raid_dialog_gui.py:331 ../iw/raid_dialog_gui.py:768
 msgid "Make RAID Device"
 msgstr "建立 RAID 裝置"
 
-#: iw/raid_dialog_gui.py:334
+#: ../iw/raid_dialog_gui.py:334
 #, python-format
 msgid "Edit RAID Device: %s"
 msgstr "編輯 RAID 裝置：%s"
 
-#: iw/raid_dialog_gui.py:336
+#: ../iw/raid_dialog_gui.py:336
 msgid "Edit RAID Device"
 msgstr "編輯 RAID 裝置"
 
-#: iw/raid_dialog_gui.py:407
+#. raid minors
+#: ../iw/raid_dialog_gui.py:407
 msgid "RAID _Device:"
-msgstr "RAID 裝置（_D）："
+msgstr "RAID 裝置(_D)："
 
-#: iw/raid_dialog_gui.py:425
+#. raid level
+#: ../iw/raid_dialog_gui.py:425
 msgid "RAID _Level:"
-msgstr "RAID 類型（_L）："
+msgstr "RAID 類型(_L)："
 
-#: iw/raid_dialog_gui.py:467
+#. raid members
+#: ../iw/raid_dialog_gui.py:467
 msgid "_RAID Members:"
-msgstr "_RAID 成員："
+msgstr "RAID 成員(_R)："
 
-#: iw/raid_dialog_gui.py:484
+#. number of spares - created widget above
+#: ../iw/raid_dialog_gui.py:484
 msgid "Number of _spares:"
-msgstr "備援裝置的數量（_s）："
+msgstr "備援裝置的數量(_s)："
 
-#: iw/raid_dialog_gui.py:494
+#: ../iw/raid_dialog_gui.py:494
 msgid "_Format partition?"
-msgstr "格式化分割區（_F）？"
+msgstr "格式化分割區(_F)？"
 
-#: iw/raid_dialog_gui.py:568
+#: ../iw/raid_dialog_gui.py:568
 msgid ""
 "The source drive has no partitions to be cloned.  You must first define "
 "partitions of type 'software RAID' on this drive before it can be cloned."
@@ -3128,12 +3146,12 @@ msgstr ""
 "來源磁碟沒有要複製的分割區。在做磁碟複製之前，您必須在該磁碟上先定義「軟體 "
 "RAID」類型的分割區。"
 
-#: iw/raid_dialog_gui.py:572 iw/raid_dialog_gui.py:578
-#: iw/raid_dialog_gui.py:592 iw/raid_dialog_gui.py:605
+#: ../iw/raid_dialog_gui.py:572 ../iw/raid_dialog_gui.py:578
+#: ../iw/raid_dialog_gui.py:592 ../iw/raid_dialog_gui.py:605
 msgid "Source Drive Error"
 msgstr "來源磁碟錯誤"
 
-#: iw/raid_dialog_gui.py:579
+#: ../iw/raid_dialog_gui.py:579
 msgid ""
 "The source drive you selected has partitions which are not of type 'software "
 "RAID'.\n"
@@ -3144,7 +3162,7 @@ msgstr ""
 "\n"
 "在做磁碟複製之前，您必須先移除這些分割區。"
 
-#: iw/raid_dialog_gui.py:593
+#: ../iw/raid_dialog_gui.py:593
 #, python-format
 msgid ""
 "The source drive you selected has partitions which are not constrained to "
@@ -3157,7 +3175,7 @@ msgstr ""
 "\n"
 "在做磁碟複製之前，這些分割區必須先被移除或將之限於這個磁碟。"
 
-#: iw/raid_dialog_gui.py:606
+#: ../iw/raid_dialog_gui.py:606
 msgid ""
 "The source drive you selected has software RAID partition(s) which are "
 "members of an active software RAID device.\n"
@@ -3168,21 +3186,21 @@ msgstr ""
 "\n"
 "在做磁碟複製之前，您必須先移除這些分割區。"
 
-#: iw/raid_dialog_gui.py:620 iw/raid_dialog_gui.py:626
-#: iw/raid_dialog_gui.py:642
+#: ../iw/raid_dialog_gui.py:620 ../iw/raid_dialog_gui.py:626
+#: ../iw/raid_dialog_gui.py:642
 msgid "Target Drive Error"
 msgstr "目標磁碟錯誤"
 
-#: iw/raid_dialog_gui.py:621
+#: ../iw/raid_dialog_gui.py:621
 msgid "Please select the target drives for the clone operation."
 msgstr "請選擇複製操作的目標磁碟。"
 
-#: iw/raid_dialog_gui.py:627
+#: ../iw/raid_dialog_gui.py:627
 #, python-format
 msgid "The source drive %s cannot be selected as a target drive as well."
 msgstr "來源磁碟 %s 不能同時被選取為目標磁碟。"
 
-#: iw/raid_dialog_gui.py:643
+#: ../iw/raid_dialog_gui.py:643
 #, python-format
 msgid ""
 "The target drive %s has a partition which cannot be removed for the "
@@ -3198,11 +3216,12 @@ msgstr ""
 "\n"
 "若要這個磁碟作為目標磁碟，您必須移除此分割區。"
 
-#: iw/raid_dialog_gui.py:706
+#: ../iw/raid_dialog_gui.py:706
 msgid "Please select a source drive."
 msgstr "請選擇一個來源磁碟。"
 
-#: iw/raid_dialog_gui.py:726
+#. now give them last chance to bail
+#: ../iw/raid_dialog_gui.py:726
 #, python-format
 msgid ""
 "The drive %s will now be cloned to the following drives:\n"
@@ -3211,7 +3230,7 @@ msgstr ""
 "磁碟 %s 現在將會被複製到下列的磁碟：\n"
 "\n"
 
-#: iw/raid_dialog_gui.py:731
+#: ../iw/raid_dialog_gui.py:731
 msgid ""
 "\n"
 "\n"
@@ -3221,19 +3240,19 @@ msgstr ""
 "\n"
 "警告！ 目標磁碟上的所有資料將會被摧毀。"
 
-#: iw/raid_dialog_gui.py:734
+#: ../iw/raid_dialog_gui.py:734
 msgid "Final Warning"
 msgstr "最後警告"
 
-#: iw/raid_dialog_gui.py:736
+#: ../iw/raid_dialog_gui.py:736
 msgid "Clone Drives"
 msgstr "複製磁碟"
 
-#: iw/raid_dialog_gui.py:745
+#: ../iw/raid_dialog_gui.py:745
 msgid "There was an error clearing the target drives.  Cloning failed."
 msgstr "清除目標磁碟時發生錯誤。磁碟複製失敗。"
 
-#: iw/raid_dialog_gui.py:778
+#: ../iw/raid_dialog_gui.py:778
 msgid ""
 "Clone Drive Tool\n"
 "\n"
@@ -3259,19 +3278,19 @@ msgstr ""
 "\n"
 "在目標磁碟上的所有資料將會完全被摧毀。"
 
-#: iw/raid_dialog_gui.py:798
+#: ../iw/raid_dialog_gui.py:798
 msgid "Source Drive:"
 msgstr "來源磁碟："
 
-#: iw/raid_dialog_gui.py:806
+#: ../iw/raid_dialog_gui.py:806
 msgid "Target Drive(s):"
 msgstr "目標磁碟："
 
-#: iw/raid_dialog_gui.py:814
+#: ../iw/raid_dialog_gui.py:814
 msgid "Drives"
 msgstr "磁碟"
 
-#: iw/task_gui.py:64
+#: ../iw/task_gui.py:64
 #, python-format
 msgid ""
 "Unable to read package metadata from repository.  This may be due to a "
@@ -3285,112 +3304,138 @@ msgstr ""
 "\n"
 "%s"
 
-#: iw/task_gui.py:162
+#: ../iw/task_gui.py:81
+#, python-format
+msgid ""
+"The following error occurred while setting up the installation repository:\n"
+"\n"
+"%s\n"
+"\n"
+"Please provide the correct information for installing %s"
+msgstr ""
+"設定安裝程序的軟體庫時發生了下列錯誤：\n"
+"\n"
+"%s\n"
+"\n"
+"請提供安裝 %s 的正確資訊"
+
+#: ../iw/task_gui.py:177
 #, python-format
 msgid ""
 "The repository %s has already been added.  Please choose a different "
 "repository name and URL."
 msgstr "已加入軟體庫 %s，請選擇另一個軟體庫名稱與網址。"
 
-#: iw/task_gui.py:175
+#: ../iw/task_gui.py:190
 msgid "Edit Repository"
 msgstr "編輯軟體庫"
 
-#: iw/task_gui.py:238
+#: ../iw/task_gui.py:253
 msgid "Invalid Proxy URL"
 msgstr "Proxy URL 無效"
 
-#: iw/task_gui.py:239
+#: ../iw/task_gui.py:254
 msgid "You must provide an HTTP, HTTPS, or FTP URL to a proxy."
 msgstr "您必須為 proxy 提供 HTTP、HTTPS 或 FTP 網址。"
 
-#: iw/task_gui.py:250 iw/task_gui.py:388
+#: ../iw/task_gui.py:265 ../iw/task_gui.py:403
 msgid "Invalid Repository URL"
 msgstr "軟體庫 URL 無效"
 
-#: iw/task_gui.py:251 iw/task_gui.py:389
+#: ../iw/task_gui.py:266 ../iw/task_gui.py:404
 msgid "You must provide an HTTP, HTTPS, or FTP URL to a repository."
 msgstr "您必須為軟體庫提供 HTTP、HTTPS 或 FTP 網址。"
 
-#: iw/task_gui.py:273 iw/task_gui.py:398
+#: ../iw/task_gui.py:287 ../iw/task_gui.py:413
 msgid "No Media Found"
 msgstr "找不到媒介"
 
-#: iw/task_gui.py:274 iw/task_gui.py:399
+#: ../iw/task_gui.py:288 ../iw/task_gui.py:414
 msgid ""
 "No installation media was found. Please insert a disc into your drive and "
 "try again."
 msgstr "找不到安裝媒介。請將光碟插入您的光碟機並重新嘗試。"
 
-#: iw/task_gui.py:293 iw/task_gui.py:415
+#: ../iw/task_gui.py:306 ../iw/task_gui.py:430
 msgid "Please enter an NFS server and path."
 msgstr "請輸入一個 NFS 伺服器與路徑。"
 
-#: iw/task_gui.py:325
+#: ../iw/task_gui.py:319
+#, python-format
+msgid ""
+"The following error occurred while setting up the repository:\n"
+"\n"
+"%s"
+msgstr ""
+"設定軟體庫時發生了下列錯誤：\n"
+"\n"
+"%s"
+
+#: ../iw/task_gui.py:341
 msgid "Invalid Repository Name"
 msgstr "軟體庫名稱無效"
 
-#: iw/task_gui.py:326
+#: ../iw/task_gui.py:342
 msgid "You must provide a repository name."
 msgstr "您必須提供一組軟體庫名稱。"
 
-#: iw/task_gui.py:450 ui/addrepo.glade:10
+#: ../iw/task_gui.py:465 ../ui/addrepo.glade.h:3
 msgid "Add Repository"
 msgstr "新增軟體庫"
 
-#: iw/task_gui.py:455
+#: ../iw/task_gui.py:470
 msgid "No Software Repos Enabled"
 msgstr "未啟用任何軟體軟體庫"
 
-#: iw/task_gui.py:456
+#: ../iw/task_gui.py:471
 msgid ""
 "You must have at least one software repository enabled to continue "
 "installation."
 msgstr "在您繼續進行安裝之前，您必須擁有至少一個軟體儲存庫。"
 
-#: iw/timezone_gui.py:63 textw/timezone_text.py:96
+#. self.c.setCallback(self.updateSysClock)
+#: ../iw/timezone_gui.py:63 ../textw/timezone_text.py:96
 msgid "Time Zone Selection"
 msgstr "選擇時區"
 
-#: iw/upgrade_bootloader_gui.py:37 textw/upgrade_bootloader_text.py:136
+#: ../iw/upgrade_bootloader_gui.py:37 ../textw/upgrade_bootloader_text.py:136
 msgid "Upgrade Boot Loader Configuration"
 msgstr "升級開機管理程式設定"
 
-#: iw/upgrade_bootloader_gui.py:123
+#: ../iw/upgrade_bootloader_gui.py:123
 msgid "_Update boot loader configuration"
-msgstr "更新開機管理程式設定（_U）"
+msgstr "更新開機管理程式設定(_U)"
 
-#: iw/upgrade_bootloader_gui.py:124
+#: ../iw/upgrade_bootloader_gui.py:124
 msgid "This will update your current boot loader."
 msgstr "這將會更新您目前的開機管理程式。"
 
-#: iw/upgrade_bootloader_gui.py:128 textw/upgrade_bootloader_text.py:108
+#: ../iw/upgrade_bootloader_gui.py:128 ../textw/upgrade_bootloader_text.py:108
 msgid ""
 "Due to system changes, your boot loader configuration can not be "
 "automatically updated."
-msgstr "基於系統的變更，您的開機載入程式配置無法自動地更新。"
+msgstr "基於系統的變更，您的開機載入程式設定無法自動地更新。"
 
-#: iw/upgrade_bootloader_gui.py:131 textw/upgrade_bootloader_text.py:112
+#: ../iw/upgrade_bootloader_gui.py:131 ../textw/upgrade_bootloader_text.py:112
 msgid ""
 "The installer is unable to detect the boot loader currently in use on your "
 "system."
 msgstr "安裝程式偵測不到目前在您系統使用的開機管理程式。"
 
-#: iw/upgrade_bootloader_gui.py:138 textw/upgrade_bootloader_text.py:121
+#: ../iw/upgrade_bootloader_gui.py:138 ../textw/upgrade_bootloader_text.py:121
 #, python-format
-msgid ""
-"The installer has detected the %s boot loader currently installed on %s."
+msgid "The installer has detected the %s boot loader currently installed on %s."
 msgstr "安裝程式偵測到 %s 開機管理程式已安裝在 %s。"
 
-#: iw/upgrade_bootloader_gui.py:142
+#: ../iw/upgrade_bootloader_gui.py:142
 msgid "This is the recommended option."
 msgstr "這是建議選項。"
 
-#: iw/upgrade_bootloader_gui.py:147
+#: ../iw/upgrade_bootloader_gui.py:147
 msgid "_Create new boot loader configuration"
-msgstr "建立新的開機管理程式設定（_C）"
+msgstr "建立新的開機管理程式設定(_C)"
 
-#: iw/upgrade_bootloader_gui.py:149
+#: ../iw/upgrade_bootloader_gui.py:149
 msgid ""
 "This option creates a new boot loader configuration.  If you wish to switch "
 "boot loaders, you should choose this."
@@ -3398,11 +3443,11 @@ msgstr ""
 "這將會讓您建立一個新的開機載入程式設定。如果您希望轉換為不同的開機載入程式，"
 "您應該選取此選項。"
 
-#: iw/upgrade_bootloader_gui.py:156
+#: ../iw/upgrade_bootloader_gui.py:156
 msgid "_Skip boot loader updating"
-msgstr "略過更新開機管理程式（_S）"
+msgstr "略過更新開機管理程式(_S)"
 
-#: iw/upgrade_bootloader_gui.py:157
+#: ../iw/upgrade_bootloader_gui.py:157
 msgid ""
 "This option makes no changes to boot loader configuration.  If you are using "
 "a third party boot loader, you should choose this."
@@ -3410,15 +3455,15 @@ msgstr ""
 "這將不會改變開機載入程式設定。如果您使用第三方的開機載入程式，您應該選取此選"
 "項。"
 
-#: iw/upgrade_bootloader_gui.py:168
+#: ../iw/upgrade_bootloader_gui.py:168
 msgid "What would you like to do?"
 msgstr "您想要怎麼做？"
 
-#: iw/upgrade_migratefs_gui.py:38 textw/upgrade_text.py:36
+#: ../iw/upgrade_migratefs_gui.py:38 ../textw/upgrade_text.py:36
 msgid "Migrate File Systems"
 msgstr "轉換檔案系統"
 
-#: iw/upgrade_migratefs_gui.py:70
+#: ../iw/upgrade_migratefs_gui.py:70
 #, python-format
 msgid ""
 "This release of %s supports an updated file system, which has several "
@@ -3432,11 +3477,11 @@ msgstr ""
 "\n"
 "您想要遷移哪些分割區？"
 
-#: iw/upgrade_swap_gui.py:35
+#: ../iw/upgrade_swap_gui.py:35
 msgid "Upgrade Swap Partition"
 msgstr "升級 Swap 分割區"
 
-#: iw/upgrade_swap_gui.py:94 textw/upgrade_text.py:101
+#: ../iw/upgrade_swap_gui.py:94 ../textw/upgrade_text.py:101
 #, python-format
 msgid ""
 "Recent kernels (2.4 or newer) need significantly more swap than older "
@@ -3448,7 +3493,7 @@ msgstr ""
 "兩倍。您目前配置了 %dMB 的 swap 空間，您現在可以再新增額外的 swap 空間在您其"
 "中的一個檔案系統上。"
 
-#: iw/upgrade_swap_gui.py:101
+#: ../iw/upgrade_swap_gui.py:101
 #, python-format
 msgid ""
 "\n"
@@ -3459,38 +3504,38 @@ msgstr ""
 "\n"
 "安裝程式偵測到 %s MB 的記憶體。\n"
 
-#: iw/upgrade_swap_gui.py:113
+#: ../iw/upgrade_swap_gui.py:113
 msgid "I _want to create a swap file"
-msgstr "我想要建立一個 swap 檔案（_w）"
+msgstr "我想要建立一個 swap 檔案(_w)"
 
-#: iw/upgrade_swap_gui.py:122
+#: ../iw/upgrade_swap_gui.py:122
 msgid "Select the _partition to put the swap file on:"
-msgstr "選擇要放置 swap 檔案的分割區（_p）："
+msgstr "選擇要放置 swap 檔案的分割區(_p)："
 
-#: iw/upgrade_swap_gui.py:140 textw/upgrade_text.py:119
+#: ../iw/upgrade_swap_gui.py:140 ../textw/upgrade_text.py:119
 msgid "Partition"
 msgstr "設定分割區"
 
-#: iw/upgrade_swap_gui.py:140
+#: ../iw/upgrade_swap_gui.py:140
 msgid "Free Space (MB)"
 msgstr "剩餘空間（MB）"
 
-#: iw/upgrade_swap_gui.py:158
+#: ../iw/upgrade_swap_gui.py:158
 #, python-format
 msgid ""
 "A minimum swap file size of %d MB is recommended.  Please enter a size for "
 "the swap file:"
 msgstr "建議您的 swap 檔案大小至少要 %d MB。請輸入 swap 檔案的大小："
 
-#: iw/upgrade_swap_gui.py:173
+#: ../iw/upgrade_swap_gui.py:173
 msgid "Swap file _size (MB):"
-msgstr "swap 檔案大小（MB）（_s）："
+msgstr "swap 檔案大小（MB）(_s)："
 
-#: iw/upgrade_swap_gui.py:183
+#: ../iw/upgrade_swap_gui.py:183
 msgid "I _don't want to create a swap file"
-msgstr "我不想要建立 swap 檔案（_d）"
+msgstr "我不想要建立 swap 檔案(_d)"
 
-#: iw/upgrade_swap_gui.py:193
+#: ../iw/upgrade_swap_gui.py:193
 msgid ""
 "A swap file is strongly recommended. Failure to create one could cause the "
 "installer to abort abnormally.  Are you sure you wish to continue?"
@@ -3498,20 +3543,19 @@ msgstr ""
 "強烈建議您建立一個 swap 檔案。若不建立將可能會造成安裝程式不正常中止。您確定"
 "要繼續？"
 
-#: iw/upgrade_swap_gui.py:201 textw/upgrade_text.py:188
+#: ../iw/upgrade_swap_gui.py:201 ../textw/upgrade_text.py:188
 msgid "The swap file must be between 1 and 2000 MB in size."
 msgstr "swap 檔案的大小必須介於 1 至 2000 MB 之間。"
 
-#: iw/upgrade_swap_gui.py:208 textw/upgrade_text.py:183
-msgid ""
-"There is not enough space on the device you selected for the swap partition."
+#: ../iw/upgrade_swap_gui.py:208 ../textw/upgrade_text.py:183
+msgid "There is not enough space on the device you selected for the swap partition."
 msgstr "您所選擇的裝置空間不足以建立 swap 分割區。"
 
-#: iw/welcome_gui.py:56 textw/welcome_text.py:36
+#: ../iw/welcome_gui.py:56 ../textw/welcome_text.py:36
 msgid "Network Install Required"
 msgstr "需要網路安裝"
 
-#: iw/welcome_gui.py:57 textw/welcome_text.py:37
+#: ../iw/welcome_gui.py:57 ../textw/welcome_text.py:37
 msgid ""
 "Your installation source is set to a network location, but no netork devices "
 "were found on your system.  To avoid a network installation, boot with the "
@@ -3522,19 +3566,19 @@ msgstr ""
 "裝，請透過完整的 DVD、CD 組來開機，或是不要傳送一個指定網路來源的 repo= 參"
 "數。"
 
-#: iw/welcome_gui.py:67
+#: ../iw/welcome_gui.py:67
 msgid "E_xit Installer"
-msgstr "退出安裝程式（_x）"
+msgstr "退出安裝程式(_x)"
 
-#: iw/zipl_gui.py:37
+#: ../iw/zipl_gui.py:37
 msgid "z/IPL Boot Loader Configuration"
 msgstr "z/IPL 開機管理程式設定"
 
-#: iw/zipl_gui.py:61
+#: ../iw/zipl_gui.py:61
 msgid "The z/IPL boot loader will be installed on your system."
 msgstr "z/IPL 開機管理程式將會安裝在您的系統中。"
 
-#: iw/zipl_gui.py:63
+#: ../iw/zipl_gui.py:63
 msgid ""
 "The z/IPL Boot Loader will now be installed on your system.\n"
 "\n"
@@ -3560,28 +3604,29 @@ msgstr ""
 "\n"
 "現在您可以輸入任何您機器或設定所需的額外核心參數。"
 
-#: iw/zipl_gui.py:90 textw/zipl_text.py:71
+#: ../iw/zipl_gui.py:90 ../textw/zipl_text.py:71
 msgid "Kernel Parameters"
 msgstr "核心參數"
 
-#: iw/zipl_gui.py:93 iw/zipl_gui.py:96
+#: ../iw/zipl_gui.py:93 ../iw/zipl_gui.py:96
 msgid "Chandev Parameters"
 msgstr "Chandev 參數"
 
-#: loader/cdinstall.c:185 loader/cdinstall.c:206 loader/mediacheck.c:60
+#: ../loader/cdinstall.c:185 ../loader/cdinstall.c:206
+#: ../loader/mediacheck.c:60
 msgid "Media Check"
 msgstr "媒體測試"
 
-#: loader/cdinstall.c:185 loader/cdinstall.c:188 loader/cdinstall.c:206
-#: loader/cdinstall.c:214 loader/method.c:326
+#: ../loader/cdinstall.c:185 ../loader/cdinstall.c:188
+#: ../loader/cdinstall.c:206 ../loader/cdinstall.c:214 ../loader/method.c:326
 msgid "Test"
 msgstr "測試"
 
-#: loader/cdinstall.c:185 loader/cdinstall.c:189
+#: ../loader/cdinstall.c:185 ../loader/cdinstall.c:189
 msgid "Eject Disc"
 msgstr "退出光碟片"
 
-#: loader/cdinstall.c:186
+#: ../loader/cdinstall.c:186
 #, c-format
 msgid ""
 "Choose \"%s\" to test the disc currently in the drive, or \"%s\" to eject "
@@ -3590,7 +3635,7 @@ msgstr ""
 "選取「%s」來測試光碟機裡的光碟片，或選取「%s」來退出光碟片並放入另一片以進行"
 "測試。"
 
-#: loader/cdinstall.c:207
+#: ../loader/cdinstall.c:207
 #, c-format
 msgid ""
 "If you would like to test additional media, insert the next disc and press "
@@ -3603,18 +3648,18 @@ msgstr ""
 "張光碟；然而我們強烈建議您這麼做。最起碼，您在第一次使用光碟前，應該先進行測"
 "試。光碟測試成功後，您就不需要每次都進行測試。"
 
-#: loader/cdinstall.c:229
+#: ../loader/cdinstall.c:229
 #, 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 來重試。"
 
-#: loader/cdinstall.c:248
+#: ../loader/cdinstall.c:248
 msgid "Disc Found"
 msgstr "找到光碟片"
 
-#: loader/cdinstall.c:249
+#: ../loader/cdinstall.c:249
 #, c-format
 msgid ""
 "To begin testing the media before installation press %s.\n"
@@ -3625,119 +3670,120 @@ msgstr ""
 "\n"
 "選取 %s 來略過媒體測試並開始安裝程式。"
 
-#: loader/cdinstall.c:339
+#: ../loader/cdinstall.c:339
 msgid "Scanning"
 msgstr "掃描中"
 
-#: loader/cdinstall.c:339
-#, fuzzy, c-format
+#: ../loader/cdinstall.c:339
+#, c-format
 msgid "Looking for installation images on CD device %s\n"
-msgstr "正在尋找 CD 裝置 %s 上的安裝映像檔"
+msgstr "正在尋找 CD 裝置 %s 上的安裝映像檔\n"
 
-#: loader/cdinstall.c:341
+#: ../loader/cdinstall.c:341
 #, c-format
 msgid "Looking for installation images on CD device %s"
 msgstr "正在尋找 CD 裝置 %s 上的安裝映像檔"
 
-#: loader/cdinstall.c:442
+#: ../loader/cdinstall.c:442
 #, 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 來重試。"
 
-#: loader/cdinstall.c:451
+#: ../loader/cdinstall.c:451
 msgid "Disc Not Found"
 msgstr "找不到光碟片"
 
-#: loader/cdinstall.c:452 loader/driverdisk.c:244 loader/driverdisk.c:275
-#: loader/driverdisk.c:359 loader/driverselect.c:81 loader/driverselect.c:179
-#: loader/driverselect.c:205 loader/hdinstall.c:222 loader/hdinstall.c:280
-#: loader/kbd.c:138 loader/loader.c:483 loader/loader.c:503
-#: loader/loader.c:1382 loader/loader.c:1413 loader/net.c:572 loader/net.c:943
-#: loader/net.c:1856 loader/net.c:1878 loader/nfsinstall.c:91
-#: loader/urls.c:292 storage/__init__.py:134 storage/devicetree.py:82
-#: textw/constants_text.py:52
+#: ../loader/cdinstall.c:452 ../loader/driverdisk.c:244
+#: ../loader/driverdisk.c:275 ../loader/driverdisk.c:359
+#: ../loader/driverselect.c:81 ../loader/driverselect.c:179
+#: ../loader/driverselect.c:205 ../loader/hdinstall.c:222
+#: ../loader/hdinstall.c:280 ../loader/kbd.c:119 ../loader/loader.c:483
+#: ../loader/loader.c:503 ../loader/loader.c:1389 ../loader/loader.c:1420
+#: ../loader/net.c:574 ../loader/net.c:945 ../loader/net.c:1858
+#: ../loader/net.c:1880 ../loader/nfsinstall.c:91 ../loader/urls.c:292
+#: ../storage/__init__.py:134 ../storage/devicetree.py:83
+#: ../textw/constants_text.py:52
 msgid "Back"
 msgstr "上一步"
 
-#: loader/cdinstall.c:518
+#: ../loader/cdinstall.c:518
 msgid "Cannot find kickstart file on CDROM."
 msgstr "在光碟片上找不到 kickstart 檔案。"
 
-#: loader/copy.c:51 loader/method.c:280
+#: ../loader/copy.c:51 ../loader/method.c:280
 #, c-format
 msgid "Failed to read directory %s: %m"
 msgstr "無法讀取目錄 %s：%m"
 
-#: loader/driverdisk.c:139
+#: ../loader/driverdisk.c:139
 msgid "Loading"
 msgstr "載入中"
 
-#: loader/driverdisk.c:139
-#, fuzzy
+#: ../loader/driverdisk.c:139
 msgid "Reading driver disk"
-msgstr "讀取驅動程式磁片中..."
+msgstr "正在讀取驅動程式磁片中"
 
-#: loader/driverdisk.c:238 loader/driverdisk.c:270
+#: ../loader/driverdisk.c:238 ../loader/driverdisk.c:270
 msgid "Driver Disk Source"
 msgstr "驅動程式磁片來源"
 
-#: loader/driverdisk.c:239
+#: ../loader/driverdisk.c:239
 msgid ""
 "You have multiple devices which could serve as sources for a driver disk.  "
 "Which would you like to use?"
 msgstr "你的系統有多個裝置可當作驅動程式磁片的來源。您想要使用那一個？"
 
-#: loader/driverdisk.c:271
+#: ../loader/driverdisk.c:271
 msgid ""
 "There are multiple partitions on this device which could contain the driver "
 "disk image.  Which would you like to use?"
 msgstr "這裝置中，有多個分割區包含驅動程式磁片的映像檔。您想要使用哪一個？"
 
-#: loader/driverdisk.c:306
+#: ../loader/driverdisk.c:306
 msgid "Failed to mount partition."
 msgstr "無法掛載分割區。"
 
-#: loader/driverdisk.c:311
+#: ../loader/driverdisk.c:311
 msgid "Select driver disk image"
 msgstr "選擇驅動程式磁片映像檔"
 
-#: loader/driverdisk.c:312
+#: ../loader/driverdisk.c:312
 msgid "Select the file which is your driver disk image."
 msgstr "請選擇您的驅動程式磁片映像檔。"
 
-#: loader/driverdisk.c:341
+#: ../loader/driverdisk.c:341
 msgid "Failed to load driver disk from file."
 msgstr "無法從檔案載入驅動程式磁片。"
 
-#: loader/driverdisk.c:353
+#: ../loader/driverdisk.c:353
 #, c-format
 msgid "Insert your driver disk into /dev/%s and press \"OK\" to continue."
 msgstr "請放入驅動程式磁片到 /dev/%s，並按「確定」繼續。"
 
-#: loader/driverdisk.c:359
+#: ../loader/driverdisk.c:359
 msgid "Insert Driver Disk"
 msgstr "放入驅動程式磁片"
 
-#: loader/driverdisk.c:372
+#: ../loader/driverdisk.c:372
 msgid "Failed to mount driver disk."
 msgstr "無法掛載驅動程式磁片。"
 
-#: loader/driverdisk.c:380
+#: ../loader/driverdisk.c:380
 #, c-format
 msgid "Driver disk is invalid for this release of %s."
 msgstr "驅動程式磁片不適用於 %s 的此版本。"
 
-#: loader/driverdisk.c:443
+#: ../loader/driverdisk.c:443
 msgid "Manually choose"
 msgstr "手動選取"
 
-#: loader/driverdisk.c:444
+#: ../loader/driverdisk.c:444
 msgid "Load another disk"
 msgstr "載入另一片磁片"
 
-#: loader/driverdisk.c:445
+#: ../loader/driverdisk.c:445
 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 "
@@ -3746,43 +3792,45 @@ msgstr ""
 "在這片驅動程式磁片上找不到適當的裝置類型。您想要手動選取驅動程式或繼續進行，"
 "或者要放入另一片驅動程式磁片？"
 
-#: loader/driverdisk.c:483
+#: ../loader/driverdisk.c:483
 msgid "Driver disk"
 msgstr "驅動程式磁片"
 
-#: loader/driverdisk.c:484
+#: ../loader/driverdisk.c:484
 msgid "Do you have a driver disk?"
 msgstr "你有驅動程式的磁片嗎？"
 
-#: loader/driverdisk.c:493
+#: ../loader/driverdisk.c:493
 msgid "More Driver Disks?"
 msgstr "還有其他的驅動程式磁片嗎？"
 
-#: loader/driverdisk.c:494
+#: ../loader/driverdisk.c:494
 msgid "Do you wish to load any more driver disks?"
 msgstr "您想要載入其他驅動程式磁片嗎？"
 
-#: loader/driverdisk.c:539 loader/driverdisk.c:576 loader/hdinstall.c:375
-#: loader/kickstart.c:132 loader/kickstart.c:142 loader/kickstart.c:185
-#: loader/kickstart.c:554 loader/modules.c:335 loader/modules.c:347
-#: loader/net.c:1577 loader/net.c:1598 loader/nfsinstall.c:335
-#: loader/urlinstall.c:418 loader/urlinstall.c:427 loader/urlinstall.c:436
+#: ../loader/driverdisk.c:539 ../loader/driverdisk.c:576
+#: ../loader/hdinstall.c:375 ../loader/kickstart.c:132
+#: ../loader/kickstart.c:142 ../loader/kickstart.c:185
+#: ../loader/kickstart.c:562 ../loader/modules.c:335 ../loader/modules.c:347
+#: ../loader/net.c:1579 ../loader/net.c:1600 ../loader/nfsinstall.c:335
+#: ../loader/urlinstall.c:449 ../loader/urlinstall.c:458
+#: ../loader/urlinstall.c:467
 msgid "Kickstart Error"
 msgstr "Kickstart 錯誤"
 
-#: loader/driverdisk.c:540
+#: ../loader/driverdisk.c:540
 #, c-format
 msgid "Unknown driver disk kickstart source: %s"
 msgstr "不明的 kickstart 驅動程式磁片來源：%s"
 
-#: loader/driverdisk.c:577
+#: ../loader/driverdisk.c:577
 #, c-format
 msgid ""
 "The following invalid argument was specified for the kickstart driver disk "
 "command: %s:%s"
 msgstr "下列 kickstart 驅動程式磁片之指令的引數無效：%s:%s"
 
-#: loader/driverselect.c:67
+#: ../loader/driverselect.c:67
 #, c-format
 msgid ""
 "Please enter any parameters which you wish to pass to the %s module "
@@ -3792,25 +3840,25 @@ msgstr ""
 "請輸入您想要傳送到 %s 模組的任何參數（請以空白分隔）。如果您不知道該加什麼參"
 "數， 請按「確定」鈕來跳過這個畫面。"
 
-#: loader/driverselect.c:91
+#: ../loader/driverselect.c:91
 msgid "Enter Module Parameters"
 msgstr "請輸入模組參數"
 
-#: loader/driverselect.c:178
+#: ../loader/driverselect.c:178
 msgid "No drivers found"
 msgstr "找不到驅動程式"
 
-#: loader/driverselect.c:178
+#: ../loader/driverselect.c:178
 msgid "Load driver disk"
 msgstr "載入驅動程式磁片"
 
-#: loader/driverselect.c:179
+#: ../loader/driverselect.c:179
 msgid ""
 "No drivers were found to manually insert.  Would you like to use a driver "
 "disk?"
 msgstr "找不到驅動程式，您想要使用一片驅動程式磁片嗎？"
 
-#: loader/driverselect.c:197
+#: ../loader/driverselect.c:197
 msgid ""
 "Please select the driver below which you wish to load.  If it does not "
 "appear and you have a driver disk, press F2."
@@ -3818,27 +3866,28 @@ msgstr ""
 "請在以下選取您想要載入的驅動程式？ 如果在清單中找不到您要的，而且您有一片驅動"
 "程式磁片，請按 <F2>。"
 
-#: loader/driverselect.c:206
+#: ../loader/driverselect.c:206
 msgid "Specify optional module arguments"
 msgstr "指定額外的模組引數"
 
-#: loader/driverselect.c:234
+#: ../loader/driverselect.c:234
 msgid "Select Device Driver to Load"
 msgstr "選擇要載入的裝置驅動程式"
 
-#: loader/hdinstall.c:135
+#: ../loader/hdinstall.c:135
 msgid ""
 "An error occured finding the installation image on your hard drive.  Please "
 "check your images and try again."
 msgstr "搜尋您硬碟上的安裝映像檔時發生了錯誤。請檢查您的映像檔然後再試一次。"
 
-#: loader/hdinstall.c:223
+#: ../loader/hdinstall.c:223
 msgid ""
 "You don't seem to have any hard drives on your system! Would you like to "
 "configure additional devices?"
 msgstr "您的系統似乎沒有硬碟！ 您想要設定其他裝置嗎？"
 
-#: loader/hdinstall.c:237
+#. now find out which partition has the stage2 image
+#: ../loader/hdinstall.c:237
 #, c-format
 msgid ""
 "What partition and directory on that partition holds the installation image "
@@ -3848,61 +3897,61 @@ msgstr ""
 "在該分割區上那一個分割區與目錄含有 %s 的映像檔？如果您在這裡沒有看到您使用中"
 "的硬碟，請按下 F2 來設定其它裝置。"
 
-#: loader/hdinstall.c:264
+#: ../loader/hdinstall.c:264
 msgid "Directory holding image:"
 msgstr "存放映像檔的目錄："
 
-#: loader/hdinstall.c:292
+#: ../loader/hdinstall.c:292
 msgid "Select Partition"
 msgstr "選擇分割區"
 
-#: loader/hdinstall.c:344
+#: ../loader/hdinstall.c:344
 #, c-format
 msgid "Device %s does not appear to contain an installation image."
 msgstr "裝置 %s 並不含有安裝映像檔。"
 
-#: loader/hdinstall.c:376
+#: ../loader/hdinstall.c:376
 #, c-format
 msgid "Bad argument to HD kickstart method command %s: %s"
 msgstr "硬碟 kickstart 方式之指令 %s 的引數不正確：%s"
 
-#: loader/hdinstall.c:446 loader/hdinstall.c:502
+#: ../loader/hdinstall.c:446 ../loader/hdinstall.c:502
 msgid "Cannot find kickstart file on hard drive."
 msgstr "在硬碟上找不到 kickstart 檔案。"
 
-#: loader/hdinstall.c:489
+#: ../loader/hdinstall.c:489
 #, c-format
 msgid "Cannot find hard drive for BIOS disk %s"
 msgstr "無法為 BIOS 磁碟 %s 找到硬碟"
 
-#: loader/kbd.c:136
+#: ../loader/kbd.c:117
 msgid "Keyboard Type"
 msgstr "鍵盤類型"
 
-#: loader/kbd.c:137
+#: ../loader/kbd.c:118
 msgid "What type of keyboard do you have?"
 msgstr "您使用的是那一種鍵盤呢？"
 
-#: loader/kickstart.c:133
+#: ../loader/kickstart.c:133
 #, c-format
 msgid "Error opening kickstart file %s: %m"
 msgstr "開啟 kickstart 檔案 %s 時發生錯誤：%m"
 
-#: loader/kickstart.c:143
+#: ../loader/kickstart.c:143
 #, c-format
 msgid "Error reading contents of kickstart file %s: %m"
 msgstr "讀取 kickstart 檔案 %s 的內容時發生錯誤：%m"
 
-#: loader/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 有錯誤發生。"
 
-#: loader/kickstart.c:285
+#: ../loader/kickstart.c:285
 msgid "Cannot find ks.cfg on removable media."
 msgstr "卸除式媒介上找不到 ks.cfg 這個檔案。"
 
-#: loader/kickstart.c:380
+#: ../loader/kickstart.c:386
 msgid ""
 "Unable to download the kickstart file.  Please modify the kickstart "
 "parameter below or press Cancel to proceed as an interactive installation."
@@ -3910,80 +3959,79 @@ msgstr ""
 "無法下載 kickstart 檔案。請在下列修改 kickstart 參數或按下「取消」來進行互動"
 "式安裝程序。"
 
-#: loader/kickstart.c:389
+#: ../loader/kickstart.c:395
 msgid "Error downloading kickstart file"
 msgstr "下載 kickstart 檔案時發生錯誤"
 
-#: loader/kickstart.c:555
+#: ../loader/kickstart.c:563
 #, c-format
 msgid "Bad argument to shutdown kickstart method command %s: %s"
 msgstr "關閉 kickstart 所用的參數 %s不正確：%s"
 
-#: loader/lang.c:64
+#: ../loader/lang.c:64
 #, c-format
 msgid "Welcome to %s for %s - Rescue Mode"
 msgstr "歡迎使用 %s 的 %s - 救援模式"
 
-#: loader/lang.c:65 loader/loader.c:226
-msgid ""
-"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+#: ../loader/lang.c:65 ../loader/loader.c:226
+msgid "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr "      <Tab>/<Alt-Tab> 移動游標 | <Space> 選取 | <F12> 下一個畫面"
 
-#: loader/lang.c:376
+#: ../loader/lang.c:376
 msgid "Choose a Language"
 msgstr "選擇語言"
 
-#: loader/loader.c:127
+#: ../loader/loader.c:127
 msgid "Local CD/DVD"
 msgstr "本機 CD/DVD"
 
-#: loader/loader.c:128
+#: ../loader/loader.c:128
 msgid "Hard drive"
 msgstr "硬碟"
 
-#: loader/loader.c:129
+#: ../loader/loader.c:129
 msgid "NFS directory"
 msgstr "NFS 目錄"
 
-#: loader/loader.c:434 loader/loader.c:478
+#: ../loader/loader.c:434 ../loader/loader.c:478
 msgid "Update Disk Source"
 msgstr "更新磁片來源"
 
-#: loader/loader.c:435
+#: ../loader/loader.c:435
 msgid ""
 "You have multiple devices which could serve as sources for an update disk.  "
 "Which would you like to use?"
 msgstr "您的系統有多個裝置可以當作更新磁片的來源。您想要使用那一個？"
 
-#: loader/loader.c:479
+#: ../loader/loader.c:479
 msgid ""
 "There are multiple partitions on this device which could contain the update "
 "disk image.  Which would you like to use?"
 msgstr "這裝置中，有多個分割區包含更新磁片的映像檔。您想要使用哪一個？"
 
-#: loader/loader.c:497
+#: ../loader/loader.c:497
 #, c-format
 msgid "Insert your updates disk into %s and press \"OK\" to continue."
 msgstr "請放入您的更新磁片到 %s 中並按下「OK」繼續。"
 
-#: loader/loader.c:503
+#: ../loader/loader.c:503
 msgid "Updates Disk"
 msgstr "更新磁片"
 
-#: loader/loader.c:521
+#: ../loader/loader.c:521
 msgid "Failed to mount updates disk"
 msgstr "掛載更新磁片失敗"
 
-#: loader/loader.c:526
+#. Copy everything to /tmp/updates so we can unmount the disk
+#: ../loader/loader.c:526
 msgid "Updates"
 msgstr "更新"
 
-#: loader/loader.c:526
-#, fuzzy
+#: ../loader/loader.c:526
 msgid "Reading anaconda updates"
-msgstr "正在讀取 anaconda 更新程式..."
+msgstr "正在讀取 anaconda 更新程式"
 
-#: loader/loader.c:562
+#: ../loader/loader.c:562
 msgid ""
 "Unable to download the updates image.  Please modify the updates location "
 "below or press Cancel to proceed without updates.."
@@ -3991,53 +4039,52 @@ msgstr ""
 "無法下載更新映像檔。請在下列修改更新位址或按下「取消」來在不更新的情況下繼續"
 "進行.."
 
-#: loader/loader.c:571
+#: ../loader/loader.c:571
 msgid "Error downloading updates image"
 msgstr "下載更新映像檔時發生錯誤"
 
-#: loader/loader.c:1200
+#: ../loader/loader.c:1204
 #, c-format
 msgid "You do not have enough RAM to install %s on this machine."
 msgstr "本機器沒有足夠的記憶體可供安裝 %s。"
 
-#: loader/loader.c:1257
+#: ../loader/loader.c:1261
 msgid "Media Detected"
-msgstr "偵測到媒體"
+msgstr "偵測到媒介"
 
-#: loader/loader.c:1258
-#, fuzzy
+#: ../loader/loader.c:1262
 msgid "Found local installation media"
-msgstr "偵測到本機的安裝媒體..."
+msgstr "已偵測到本機的安裝媒介"
 
-#: loader/loader.c:1374
+#: ../loader/loader.c:1381
 msgid "Rescue Method"
 msgstr "救援方式"
 
-#: loader/loader.c:1375
+#: ../loader/loader.c:1382
 msgid "Installation Method"
 msgstr "安裝方式"
 
-#: loader/loader.c:1377
+#: ../loader/loader.c:1384
 msgid "What type of media contains the rescue image?"
 msgstr "您的救援映像檔存放在那一種媒體上呢？"
 
-#: loader/loader.c:1379
+#: ../loader/loader.c:1386
 msgid "What type of media contains the installation image?"
 msgstr "包含著安裝映像檔的是哪一類型的媒介？"
 
-#: loader/loader.c:1412
+#: ../loader/loader.c:1419
 msgid "No driver found"
 msgstr "找不到驅動程式"
 
-#: loader/loader.c:1412
+#: ../loader/loader.c:1419
 msgid "Select driver"
 msgstr "選擇驅動程式"
 
-#: loader/loader.c:1413
+#: ../loader/loader.c:1420
 msgid "Use a driver disk"
 msgstr "使用驅動程式的磁片"
 
-#: loader/loader.c:1414
+#: ../loader/loader.c:1421
 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?"
@@ -4045,66 +4092,65 @@ msgstr ""
 "找不到這種安裝類型所需的任何裝置類型。您想要手動選取您的驅動程式或使用驅動程"
 "式磁片？"
 
-#: loader/loader.c:1634
+#: ../loader/loader.c:1642
 msgid "The following devices have been found on your system."
 msgstr "已經在您的系統上找到下列裝置。"
 
-#: loader/loader.c:1636
+#: ../loader/loader.c:1644
 msgid ""
 "No device drivers have been loaded for your system.  Would you like to load "
 "any now?"
 msgstr "並沒有為您的系統載入任何的裝置驅動程式，您想要現在載入嗎？"
 
-#: loader/loader.c:1640
+#: ../loader/loader.c:1648
 msgid "Devices"
 msgstr "裝置"
 
-#: loader/loader.c:1641
+#: ../loader/loader.c:1649
 msgid "Done"
 msgstr "完成"
 
-#: loader/loader.c:1642
+#: ../loader/loader.c:1650
 msgid "Add Device"
 msgstr "新增裝置"
 
-#: loader/loader.c:1854
+#: ../loader/loader.c:1862
 #, c-format
 msgid "loader has already been run.  Starting shell.\n"
 msgstr "已經執行載入程式。正在啟動 shell 。\n"
 
-#: loader/loader.c:2230
-#, fuzzy, c-format
+#: ../loader/loader.c:2240
+#, c-format
 msgid "Running anaconda %s, the %s rescue mode - please wait.\n"
-msgstr "正在執行 anaconda %s，%s 系統的緊急救援模式 - 請稍候...\n"
+msgstr "正在執行 anaconda %s，%s 救援模式 - 請稍候。\n"
 
-#: loader/loader.c:2232
-#, fuzzy, c-format
+#: ../loader/loader.c:2242
+#, c-format
 msgid "Running anaconda %s, the %s system installer - please wait.\n"
-msgstr "正在執行 anaconda %s，%s 系統安裝程式 - 請稍候...\n"
+msgstr "正在執行 anaconda %s，%s 系統安裝程式 - 請稍候。\n"
 
-#: loader/mediacheck.c:46
+#: ../loader/mediacheck.c:46
 #, c-format
 msgid "Unable to find install image %s"
 msgstr "找不到安裝映像檔 %s"
 
-#: loader/mediacheck.c:52
-#, fuzzy, c-format
+#: ../loader/mediacheck.c:52
+#, c-format
 msgid "Checking \"%s\"."
-msgstr "正在檢查「%s」..."
+msgstr "正在檢查「%s」。"
 
-#: loader/mediacheck.c:54
-#, fuzzy, c-format
+#: ../loader/mediacheck.c:54
+#, c-format
 msgid "Checking media."
-msgstr "正在檢查媒體..."
+msgstr "正在檢查媒介。"
 
-#: loader/mediacheck.c:86
+#: ../loader/mediacheck.c:86
 msgid ""
 "Unable to read the disc checksum from the primary volume descriptor.  This "
 "probably means the disc was created without adding the checksum."
-msgstr ""
-"無法從主卷冊描述中讀取磁碟數值。這也許表示在建立此磁碟時沒有加上檢測值資訊。"
+msgstr "無法從主卷冊描述中讀取磁碟數值。這也許表示在建立此磁碟時沒有加上檢測值資訊。"
 
-#: loader/mediacheck.c:93
+#: ../loader/mediacheck.c:93
 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 "
@@ -4113,11 +4159,11 @@ msgstr ""
 "剛剛測試的影像檔的有錯誤，可能是下載檔或碟片已損壞。如果可能的話，請清潔您的"
 "碟片，然後再試一次。假如這個測試再次失敗，您不應該繼續安裝。"
 
-#: loader/mediacheck.c:101
+#: ../loader/mediacheck.c:101
 msgid "Success"
 msgstr "成功"
 
-#: loader/mediacheck.c:102
+#: ../loader/mediacheck.c:102
 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 "
@@ -4126,7 +4172,7 @@ msgstr ""
 "您方才測試的映像檔已成功驗證。您應可透過此媒介來進行安裝。請注意，並非所有媒"
 "介/驅動程式錯誤都可透過媒體測試來偵測到。"
 
-#: loader/method.c:323
+#: ../loader/method.c:323
 #, c-format
 msgid ""
 "Would you like to perform a checksum test of the ISO image:\n"
@@ -4137,87 +4183,86 @@ msgstr ""
 "\n"
 "   %s？"
 
-#: loader/method.c:326
+#: ../loader/method.c:326
 msgid "Checksum Test"
 msgstr "Checksum 測試"
 
-#: loader/modules.c:336
+#: ../loader/modules.c:336
 #, c-format
 msgid "Bad argument to device kickstart method command %s: %s"
 msgstr "kickstart 方式之指令 %s 的裝置引數不正確：%s"
 
-#: loader/modules.c:348
+#: ../loader/modules.c:348
 msgid "A module name must be specified for the kickstart device command."
 msgstr "您必須為 kickstart 裝置指令指定一組模組名稱。"
 
-#: loader/net.c:111
+#: ../loader/net.c:111
 msgid "Invalid Prefix"
 msgstr "無效的前置"
 
-#: loader/net.c:112
+#: ../loader/net.c:112
 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）。"
 
-#: loader/net.c:462 loader/net.c:518
+#: ../loader/net.c:464 ../loader/net.c:520
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: loader/net.c:463 loader/net.c:519
+#: ../loader/net.c:465 ../loader/net.c:521
 msgid "There was an error configuring your network interface."
 msgstr "設定網路界面時發生錯誤。"
 
-#: loader/net.c:550 textw/netconfig_text.py:131
+#: ../loader/net.c:552 ../textw/netconfig_text.py:131
 msgid "Enable IPv4 support"
 msgstr "啟用 IPv4 支援"
 
-#: loader/net.c:564
+#: ../loader/net.c:566
 msgid "Enable IPv6 support"
 msgstr "啟用 IPv6 支援"
 
-#: loader/net.c:604
+#: ../loader/net.c:606
 msgid "Configure TCP/IP"
 msgstr "設定 TCP/IP"
 
-#: loader/net.c:661
+#: ../loader/net.c:663
 msgid "Missing Protocol"
 msgstr "缺少通訊協定"
 
-#: loader/net.c:662
+#: ../loader/net.c:664
 msgid "You must select at least one protocol (IPv4 or IPv6)."
 msgstr "您必須選擇至少一項通訊協定（IPv4 或 IPv6）。"
 
-#: loader/net.c:669
+#: ../loader/net.c:671
 msgid "IPv4 Needed for NFS"
 msgstr "NFS 需要 IPv4"
 
-#: loader/net.c:670
+#: ../loader/net.c:672
 msgid "NFS installation method requires IPv4 support."
 msgstr "要使用 NFS 安裝，需要 IPv4 的支援。"
 
-#: loader/net.c:769
+#: ../loader/net.c:771
 msgid "IPv4 address:"
 msgstr "IPv4 位址："
 
-#: loader/net.c:781 loader/net.c:848 ui/netconfig.glade:261
-#: ui/netconfig.glade:362
+#: ../loader/net.c:783 ../loader/net.c:850 ../ui/netconfig.glade.h:1
 msgid "/"
 msgstr "/"
 
-#: loader/net.c:836
+#: ../loader/net.c:838
 msgid "IPv6 address:"
 msgstr "IPv6 位址："
 
-#: loader/net.c:902 textw/netconfig_text.py:158
+#: ../loader/net.c:904 ../textw/netconfig_text.py:158
 msgid "Gateway:"
 msgstr "閘道器："
 
-#: loader/net.c:910
+#: ../loader/net.c:912
 msgid "Name Server:"
 msgstr "名稱伺服器："
 
-#: loader/net.c:949
+#: ../loader/net.c:951
 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 "
@@ -4227,56 +4272,55 @@ msgstr ""
 "可使用網路遮罩或是 CIDR 形式的前置字元。閘道器和名稱伺服器欄位必須是有效的 "
 "IPv4 或 IPv6 位址。"
 
-#: loader/net.c:969
+#: ../loader/net.c:971
 msgid "Manual TCP/IP Configuration"
 msgstr "手動 TCP/IP 設定"
 
-#: loader/net.c:1092 loader/net.c:1099
+#: ../loader/net.c:1094 ../loader/net.c:1101
 msgid "Missing Information"
 msgstr "資訊不足"
 
-#: loader/net.c:1093
-msgid ""
-"You must enter both a valid IPv4 address and a network mask or CIDR prefix."
+#: ../loader/net.c:1095
+msgid "You must enter both a valid IPv4 address and a network mask or CIDR prefix."
 msgstr "您必須輸入有效的 IPv4 位址及網路遮罩或 CIDR 前置字元。"
 
-#: loader/net.c:1100
+#: ../loader/net.c:1102
 msgid "You must enter both a valid IPv6 address and a CIDR prefix."
 msgstr "您必須輸入有效的 IPv6 位址以及 CIDR 前置字元。"
 
-#: loader/net.c:1578
+#: ../loader/net.c:1580
 #, c-format
 msgid "Bad argument to kickstart network command %s: %s"
 msgstr "kickstart 網路指令 %s 的引數不正確：%s"
 
-#: loader/net.c:1599
+#: ../loader/net.c:1601
 #, c-format
 msgid "Bad bootproto %s specified in network command"
 msgstr "錯誤的開機網路命令 %s 設定"
 
-#: loader/net.c:1676
+#: ../loader/net.c:1678
 msgid "Seconds:"
 msgstr "秒："
 
-#: loader/net.c:1851
+#: ../loader/net.c:1853
 msgid "Networking Device"
 msgstr "網路裝置"
 
-#: loader/net.c:1852
+#: ../loader/net.c:1854
 msgid ""
 "You have multiple network devices on this system. Which would you like to "
 "install through?"
 msgstr "你的系統有多個網路裝置。您想要透過那一個安裝？"
 
-#: loader/net.c:1856
+#: ../loader/net.c:1858
 msgid "Identify"
 msgstr "辨識"
 
-#: loader/net.c:1865
+#: ../loader/net.c:1867
 msgid "You can identify the physical port for"
 msgstr "您可辨識實體通訊埠："
 
-#: loader/net.c:1867
+#: ../loader/net.c:1869
 msgid ""
 "by flashing the LED lights for a number of seconds.  Enter a number between "
 "1 and 30 to set the duration to flash the LED port lights."
@@ -4284,166 +4328,163 @@ msgstr ""
 "透過使 LED 燈閃爍幾秒鐘。輸入一個介於 1 與 30 之間的數字來設置 LED port "
 "light 的閃爍時間。"
 
-#: loader/net.c:1877
+#: ../loader/net.c:1879
 msgid "Identify NIC"
 msgstr "辨識 NIC"
 
-#: loader/net.c:1890
+#: ../loader/net.c:1892
 msgid "Invalid Duration"
 msgstr "無效的時間"
 
-#: loader/net.c:1891
+#: ../loader/net.c:1893
 msgid "You must enter the number of seconds as an integer between 1 and 30."
 msgstr "您必須以秒數為單位，並使用介於 1 與 30 之間的整數來將時間輸入。"
 
-#: loader/net.c:1903
-#, fuzzy, c-format
+#: ../loader/net.c:1905
+#, c-format
 msgid "Flashing %s port lights for %d seconds."
-msgstr "閃爍 %s port light %d 秒..."
+msgstr "閃爍 %s 連接埠燈 %d 秒。"
 
-#: loader/net.c:2071 loader/net.c:2075
-#, fuzzy, c-format
+#: ../loader/net.c:2074 ../loader/net.c:2078
+#, c-format
 msgid "Waiting for NetworkManager to configure %s.\n"
-msgstr "正在等候 NetworkManager 設定 %s...\n"
+msgstr "正在等候 NetworkManager 設定 %s。\n"
 
-#: loader/nfsinstall.c:68
+#: ../loader/nfsinstall.c:68
 msgid "NFS server name:"
 msgstr "NFS 伺服器名稱："
 
-#: loader/nfsinstall.c:72
+#: ../loader/nfsinstall.c:72
 #, c-format
 msgid "%s directory:"
 msgstr "%s 安裝目錄："
 
-#: loader/nfsinstall.c:83
+#: ../loader/nfsinstall.c:83
 #, c-format
 msgid "Please enter the server name and path to your %s installation image."
 msgstr "請輸入您 %s 安裝映像檔的伺服器名稱與路徑。"
 
-#: loader/nfsinstall.c:90
+#: ../loader/nfsinstall.c:90
 msgid "NFS Setup"
 msgstr "NFS 設定"
 
-#: loader/nfsinstall.c:249
+#: ../loader/nfsinstall.c:249
 msgid "That directory could not be mounted from the server."
 msgstr "無法從該伺服器掛載這個目錄。"
 
-#: loader/nfsinstall.c:260
+#: ../loader/nfsinstall.c:260
 #, c-format
 msgid "That directory does not seem to contain a %s installation image."
 msgstr "該目錄並不包含一個 %s 安裝映像檔。"
 
-#: loader/nfsinstall.c:336
+#: ../loader/nfsinstall.c:336
 #, c-format
 msgid "Bad argument to NFS kickstart method command %s: %s"
 msgstr "NFS kickstart 方式之指令 %s 的引數不正確：%s"
 
-#: loader/telnetd.c:89 loader/telnetd.c:128
+#: ../loader/telnetd.c:89 ../loader/telnetd.c:128
 msgid "Telnet"
 msgstr "Telnet"
 
-#: loader/telnetd.c:89
-#, fuzzy
+#: ../loader/telnetd.c:89
 msgid "Waiting for telnet connection."
-msgstr "正在等候 telnet 連線..."
+msgstr "正在等候 telnet 連線。"
 
-#: loader/telnetd.c:128
-#, fuzzy
+#: ../loader/telnetd.c:128
 msgid "Running anaconda via telnet."
-msgstr "正在使用 telnet 執行 anaconda..."
+msgstr "正在透過 telnet 執行 anaconda。"
 
-#: loader/urlinstall.c:84
+#: ../loader/urlinstall.c:84
 #, c-format
 msgid "Unable to retrieve %s://%s%s."
 msgstr "無法擷取 %s：//%s%s。"
 
-#: loader/urlinstall.c:176
+#: ../loader/urlinstall.c:176
 msgid "Unable to retrieve the install image."
 msgstr "無法擷取安裝映像檔。"
 
-#: loader/urlinstall.c:419
+#: ../loader/urlinstall.c:450
 #, c-format
 msgid "Bad argument to Url kickstart method command %s: %s"
 msgstr "Url kickstart 方式之指令 %s 的引數不正確：%s"
 
-#: loader/urlinstall.c:428
+#: ../loader/urlinstall.c:459
 msgid "Must supply a --url argument to Url kickstart method."
 msgstr "必須提供一個 --url 引數給 Url 的 kickstart 方式。"
 
-#: loader/urlinstall.c:437
+#: ../loader/urlinstall.c:468
 #, c-format
 msgid "Unknown Url method %s"
 msgstr "不明的 Url 方式 %s"
 
-#: loader/urls.c:235 loader/urls.c:237 loader/urls.c:240
+#: ../loader/urls.c:235 ../loader/urls.c:237 ../loader/urls.c:240
 msgid "Retrieving"
 msgstr "正在擷取資訊"
 
-#: loader/urls.c:295
+#: ../loader/urls.c:295
 #, c-format
-msgid ""
-"Please enter the URL containing the %s installation image on your server."
+msgid "Please enter the URL containing the %s installation image on your server."
 msgstr "請輸入包含著您伺服器上的 %s 安裝映像檔的 URL。"
 
-#: loader/urls.c:321
+#: ../loader/urls.c:321
 msgid "URL Setup"
 msgstr "URL 設定"
 
-#: loader/urls.c:329
+#: ../loader/urls.c:329
 msgid "You must enter a URL."
 msgstr "您必須輸入 URL。"
 
-#: loader/urls.c:335
+#: ../loader/urls.c:335
 msgid "URL must be either an ftp or http URL"
 msgstr "URL 必須是 ftp 或 http 網址"
 
-#: loader/urls.c:346
+#: ../loader/urls.c:346
 msgid "Unknown Host"
 msgstr "不明主機"
 
-#: loader/urls.c:347
+#: ../loader/urls.c:347
 #, c-format
 msgid "%s is not a valid hostname."
 msgstr "%s 不是有效的主機名稱。"
 
-#: loader/windows.c:65
+#: ../loader/windows.c:65
 msgid "Loading SCSI driver"
 msgstr "正在載入 SCSI 驅動程式"
 
-#: loader/windows.c:66
-#, fuzzy, c-format
+#: ../loader/windows.c:66
+#, c-format
 msgid "Loading %s driver"
-msgstr "正在載入 %s 的驅動程式..."
+msgstr "正在載入 %s 驅動程式。"
 
-#: storage/__init__.py:85
+#: ../storage/__init__.py:85
 msgid "Unknown Device"
 msgstr "不明的裝置"
 
-#: storage/__init__.py:86
+#: ../storage/__init__.py:86
 #, python-format
 msgid ""
 "The installation source given by device %s could not be found.  Please check "
 "your parameters and try again."
 msgstr "找不到裝置 %s 所提供的安裝媒介。請檢查您的參數並重新嘗試。"
 
-#: storage/__init__.py:97
+#: ../storage/__init__.py:97
 msgid "Installation cannot continue."
 msgstr "安裝無法繼續。"
 
-#: storage/__init__.py:98
+#: ../storage/__init__.py:98
 msgid ""
 "The storage configuration you have chosen has already been activated. You "
 "can no longer return to the disk editing screen. Would you like to continue "
 "with the installation process?"
 msgstr ""
-"您所選擇的儲存裝置配置已經啟用了。您無法再回到磁碟編輯畫面。您想要繼續進行安"
+"您所選擇的儲存裝置設定已經啟用了。您無法再回到磁碟編輯畫面。您想要繼續進行安"
 "裝程序嗎？"
 
-#: storage/__init__.py:126
+#: ../storage/__init__.py:126
 msgid "Encrypt device?"
 msgstr "為裝置加密？"
 
-#: storage/__init__.py:127
+#: ../storage/__init__.py:127
 msgid ""
 "You specified block device encryption should be enabled, but you have not "
 "supplied a passphrase. If you do not go back and provide a passphrase, block "
@@ -4452,11 +4493,11 @@ msgstr ""
 "您指定啟用了區塊裝置加密，不過您並未提供一組密碼。若您不退回上一步並提供密碼"
 "的話，區塊裝置加密將會被停用。"
 
-#: storage/__init__.py:150
+#: ../storage/__init__.py:150
 msgid "Writing storage configuration to disk"
-msgstr "將儲存裝置配置寫至磁碟"
+msgstr "將儲存裝置設定寫至磁碟"
 
-#: storage/__init__.py:151
+#: ../storage/__init__.py:151
 msgid ""
 "The partitioning options you have selected will now be written to disk.  Any "
 "data on deleted or reformatted partitions will be lost."
@@ -4464,50 +4505,51 @@ msgstr ""
 "您所選擇的磁碟分割選項現在將被寫入磁碟中。任何位於即將被刪除或是格式化分割區"
 "上的資料都將會流失。"
 
-#: storage/__init__.py:156
+#: ../storage/__init__.py:156
 msgid "Go _back"
-msgstr "上一步（_b）"
+msgstr "上一步(_b)"
 
-#: storage/__init__.py:157
+#: ../storage/__init__.py:157
 msgid "_Write changes to disk"
-msgstr "將變更寫至磁碟（_W）"
+msgstr "將變更寫至磁碟(_W)"
 
-#: storage/__init__.py:272
+#: ../storage/__init__.py:272
 msgid "Finding Devices"
 msgstr "尋找裝置"
 
-#: storage/__init__.py:273
-#, fuzzy
+#: ../storage/__init__.py:273
 msgid "Finding storage devices"
-msgstr "正在尋找儲存裝置..."
+msgstr "正在尋找儲存裝置"
 
-#: storage/__init__.py:511
+#: ../storage/__init__.py:511
 msgid "This partition is holding the data for the hard drive install."
 msgstr "此分割區包含了硬碟安裝時要用到的資料。"
 
-#: storage/__init__.py:516
+#. LDL formatted DASDs always have one partition, you'd have to
+#. reformat the DASD in CDL mode to get rid of it
+#: ../storage/__init__.py:516
 msgid "You cannot delete a partition of a LDL formatted DASD."
 msgstr "您無法刪除 LDL 格式化的 DASD 的分割區。"
 
-#: storage/__init__.py:522
+#: ../storage/__init__.py:522
 #, python-format
 msgid "This device is part of the RAID device %s."
 msgstr "此裝置為 RAID 裝置 %s 的一部份。"
 
-#: storage/__init__.py:525
+#: ../storage/__init__.py:525
 msgid "This device is part of a RAID device."
 msgstr "此裝置為 RAID 裝置的一部份。"
 
-#: storage/__init__.py:530
+#: ../storage/__init__.py:530
 #, python-format
 msgid "This device is part of the LVM volume group '%s'."
 msgstr "此裝置為 LVM 卷冊群組 '%s' 的一部份。"
 
-#: storage/__init__.py:533
+#: ../storage/__init__.py:533
 msgid "This device is part of a LVM volume group."
 msgstr "此裝置為 LVM 卷冊群組的一部份。"
 
-#: storage/__init__.py:549
+#: ../storage/__init__.py:549
 msgid ""
 "This device is an extended partition which contains logical partitions that "
 "cannot be deleted:\n"
@@ -4516,62 +4558,58 @@ msgstr ""
 "此裝置是個延伸的分割區，它包含了無法刪除的邏輯分割區：\n"
 "\n"
 
-#: storage/__init__.py:817
+#: ../storage/__init__.py:817
 #, python-format
 msgid ""
 "You have not defined a root partition (/), which is required for "
 "installation of %s to continue."
 msgstr "您還沒指定 root 分割區（/），為了讓 %s 安裝程式繼續，您必須先指定。"
 
-#: storage/__init__.py:822
+#: ../storage/__init__.py:822
 #, python-format
 msgid ""
 "Your root partition is less than 250 megabytes which is usually too small to "
 "install %s."
 msgstr "您的 root 分割區小於 250 MB，空間太小不足以安裝 %s。"
 
-#: storage/__init__.py:828
-#, fuzzy, python-format
+#: ../storage/__init__.py:828
+#, python-format
 msgid ""
 "Your / partition is less than %s MB which is lower than recommended for a "
 "normal %s install."
-msgstr "你的 / 分割區小於 %s MB，這比正常安裝 %s 的建議值還要小。"
+msgstr "你的 / 分割區小於 %s MB，這低於正常的 %s 安裝的建議值。"
 
-#: storage/__init__.py:838
+#: ../storage/__init__.py:838
 #, python-format
 msgid ""
 "Your / partition does not match the the live image you are installing from.  "
 "It must be formatted as %s."
-msgstr ""
+msgstr "您的 / 分割區和您正要從其進行安裝的即時映像不符。它必須被格式化為 %s。"
 
-#: storage/__init__.py:845
+#: ../storage/__init__.py:845
 #, python-format
 msgid ""
 "Your %s partition is less than %s megabytes which is lower than recommended "
 "for a normal %s install."
 msgstr "你的 %s 分割區小於 %s MB，這比正常安裝 %s 的建議值還要小。"
 
-#: storage/__init__.py:872
-msgid ""
-"Installing on a USB device.  This may or may not produce a working system."
+#: ../storage/__init__.py:872
+msgid "Installing on a USB device.  This may or may not produce a working system."
 msgstr "安裝至 USB 裝置上。安裝後的系統可能會、也可能不會正常運作。"
 
-#: storage/__init__.py:875
+#: ../storage/__init__.py:875
 msgid ""
 "Installing on a FireWire device.  This may or may not produce a working "
 "system."
 msgstr "安裝至火線（Firewire）裝置上。安裝後的系統可能會、也可能不會正常運作。"
 
-#: storage/__init__.py:882
-#, fuzzy
+#: ../storage/__init__.py:882
 msgid ""
 "You have not specified a swap partition.  Due to the amount of memory "
 "present, a swap partition is required to complete installation."
-msgstr ""
-"您尚未指定 swap 分割區。雖然並沒有強制規定一定要有，但有的話對安裝效率會有很"
-"大的改善。"
+msgstr "您尚未指定 swap 分割區。根據所擁有的記憶體，您必須建立一個 swap 分割區才可完成安裝程序。"
 
-#: storage/__init__.py:887
+#: ../storage/__init__.py:887
 msgid ""
 "You have not specified a swap partition.  Although not strictly required in "
 "all cases, it will significantly improve performance for most installations."
@@ -4579,22 +4617,21 @@ msgstr ""
 "您尚未指定 swap 分割區。雖然並沒有強制規定一定要有，但有的話對安裝效率會有很"
 "大的改善。"
 
-#: storage/__init__.py:894
+#: ../storage/__init__.py:894
 #, python-format
-msgid ""
-"This mount point is invalid.  The %s directory must be on the / file system."
-msgstr ""
+msgid "This mount point is invalid.  The %s directory must be on the / file system."
+msgstr "此掛載點無效。%s 目錄必須位於 / 檔案系統上。"
 
-#: storage/__init__.py:898
-#, fuzzy, python-format
+#: ../storage/__init__.py:898
+#, python-format
 msgid "The mount point %s must be on a linux file system."
-msgstr "您所要求的掛載點「%s」已經被使用。請另外指定一個。"
+msgstr "掛載點「%s」必須位於一個 Linux 檔案系統上。"
 
-#: storage/__init__.py:909
+#: ../storage/__init__.py:909
 msgid "No Drives Found"
 msgstr "找不到磁碟機"
 
-#: storage/__init__.py:910
+#: ../storage/__init__.py:910
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "file systems. Please check your hardware for the cause of this problem."
@@ -4602,11 +4639,11 @@ msgstr ""
 "發生錯誤 - 找不到可用來建立新檔案系統的磁碟機。請檢查您的硬體以找出問題發生的"
 "原因。"
 
-#: storage/__init__.py:1103 storage/__init__.py:1112
+#: ../storage/__init__.py:1103 ../storage/__init__.py:1112
 msgid "Dirty File Systems"
 msgstr "未經正常程序關機（Dirty）的檔案系統"
 
-#: storage/__init__.py:1104
+#: ../storage/__init__.py:1104
 #, python-format
 msgid ""
 "The following file systems for your Linux system were not unmounted "
@@ -4618,7 +4655,7 @@ msgstr ""
 "且讓安裝程式自動檢查檔案系統，再來正常關機以進行系統升級。\n"
 "%s"
 
-#: storage/__init__.py:1113
+#: ../storage/__init__.py:1113
 #, python-format
 msgid ""
 "The following file systems for your Linux system were not unmounted "
@@ -4628,7 +4665,7 @@ msgstr ""
 "在你的 Linux 系統上有下列的檔案系統沒有完整的卸載。您還是想要掛載它們嗎？\n"
 "%s"
 
-#: storage/__init__.py:1560
+#: ../storage/__init__.py:1560
 #, python-format
 msgid ""
 "The swap device:\n"
@@ -4646,7 +4683,7 @@ msgstr ""
 "這個在您 /etc/fstab 檔案中的裝置目前正被使用來作為軟體中止裝置，這表示您的系"
 "統正在休眠中。若要進行升級，請關閉您的系統，而不是使其處於休眠狀態中。"
 
-#: storage/__init__.py:1568
+#: ../storage/__init__.py:1568
 #, python-format
 msgid ""
 "The swap device:\n"
@@ -4665,7 +4702,7 @@ msgstr ""
 "統正在休眠中。若您正要進行全新的安裝，請確認安裝程式已被設為會將所有 swap 裝"
 "置格式化。"
 
-#: storage/__init__.py:1582
+#: ../storage/__init__.py:1582
 #, python-format
 msgid ""
 "Error enabling swap device %s: %s\n"
@@ -4681,7 +4718,7 @@ msgstr ""
 "\n"
 "請按下「確定」來退出安裝程式。"
 
-#: storage/__init__.py:1588
+#: ../storage/__init__.py:1588
 #, python-format
 msgid ""
 "Error enabling swap device %s: %s\n"
@@ -4696,11 +4733,11 @@ msgstr ""
 "\n"
 "請按下「確定」來退出安裝程式。"
 
-#: storage/__init__.py:1646 storage/__init__.py:1656
+#: ../storage/__init__.py:1646 ../storage/__init__.py:1656
 msgid "Invalid mount point"
 msgstr "錯誤的掛載點"
 
-#: storage/__init__.py:1647
+#: ../storage/__init__.py:1647
 #, python-format
 msgid ""
 "An error occurred when trying to create %s.  Some element of this path is "
@@ -4713,7 +4750,7 @@ msgstr ""
 "\n"
 "請按下 <Enter> 鍵來退出安裝程式。"
 
-#: storage/__init__.py:1657
+#: ../storage/__init__.py:1657
 #, python-format
 msgid ""
 "An error occurred when trying to create %s: %s.  This is a fatal error and "
@@ -4725,18 +4762,18 @@ msgstr ""
 "\n"
 "請按下 <Enter> 鍵來退出安裝程式。"
 
-#: storage/__init__.py:1670 storage/__init__.py:1691
+#: ../storage/__init__.py:1670 ../storage/__init__.py:1691
 msgid "Unable to mount filesystem"
 msgstr "無法掛載檔案系統"
 
-#: storage/__init__.py:1671
+#: ../storage/__init__.py:1671
 #, python-format
 msgid ""
 "An error occurred mounting device %s as %s.  You may continue installation, "
 "but there may be problems."
 msgstr "將裝置 %s 掛載為 %s 時發生錯誤。您可以繼續安裝，但可能會產生一些問題。"
 
-#: storage/__init__.py:1692
+#: ../storage/__init__.py:1692
 #, python-format
 msgid ""
 "An error occurred mounting device %s as %s: %s. This is a fatal error and "
@@ -4749,21 +4786,21 @@ msgstr ""
 "\n"
 "請按下 <Enter> 鍵來退出安裝程式。"
 
-#: storage/devicelibs/lvm.py:312
+#: ../storage/devicelibs/lvm.py:319
 #, python-format
 msgid "vginfo failed for %s"
 msgstr "%s 的 vginfo 已失敗"
 
-#: storage/devicelibs/lvm.py:341
+#: ../storage/devicelibs/lvm.py:348
 #, python-format
 msgid "lvs failed for %s"
 msgstr "%s 的 lvs 已失敗"
 
-#: storage/devicetree.py:91
+#: ../storage/devicetree.py:92
 msgid "Confirm"
 msgstr "確認"
 
-#: storage/devicetree.py:92
+#: ../storage/devicetree.py:93
 #, python-format
 msgid ""
 "Are you sure you want to skip entering a passphrase for device %s?\n"
@@ -4775,27 +4812,39 @@ msgstr ""
 "\n"
 "若您跳過此步驟，裝置的內容在安裝時將無法使用。"
 
-#: storage/devicetree.py:142
-#, fuzzy, python-format
+#: ../storage/devicetree.py:146
+#, python-format
 msgid ""
-"Error processing drive %s %-0.fMB (%s).\n"
+"Error processing drive:\n"
+"\n"
+"%s\n"
+"%-0.fMB\n"
+"%s\n"
 "\n"
-"Maybe it needs to be reinitialized.  YOU WILL LOSE ALL DATA ON THIS DRIVE IF "
-"YOU REINITIALIZE IT!%s"
+"This device may need to be reinitialized.\n"
+"\n"
+"REINITIALIZING WILL CAUSE ALL DATA TO BE LOST!%s"
 msgstr ""
-"處理磁碟 %s 時發生了錯誤。\n"
-"它可能需要被重新初始化。您將失去該磁碟上的所有資料！"
+"處理磁碟時發生了錯誤：\n"
+"\n"
+"%s\n"
+"%-0.fMB\n"
+"%s\n"
+"\n"
+"這個裝置可能需要被重新初始化。\n"
+"\n"
+"重新初始化將會失去該磁碟上的所有資料！%s"
 
-#: storage/devicetree.py:148
+#: ../storage/devicetree.py:152
 msgid "_Ignore drive"
-msgstr "忽略磁碟（_I）"
+msgstr "忽略磁碟(_I)"
 
-#: storage/devicetree.py:149
+#: ../storage/devicetree.py:153
 msgid "_Re-initialize drive"
-msgstr "格式化磁碟（_R）"
+msgstr "格式化磁碟(_R)"
 
-#: storage/devicetree.py:169
-#, fuzzy, python-format
+#: ../storage/devicetree.py:173
+#, python-format
 msgid ""
 "Error processing LVM.\n"
 "There is inconsistent LVM data on %s.  You can reinitialize all related PVs "
@@ -4803,102 +4852,98 @@ msgid ""
 "contents."
 msgstr ""
 "處理 LVM 時發生了錯誤。\n"
-"LVM 資料看似不一致。(%s) 會構成 %s。您可重新初始化所有相關的 PV，這將會清除掉"
-"所有的 LVM metadata。或是您可忽略，這會將內容保留住。"
+"%s 上的 LVM 資料不一致。您可重新初始化所有相關的 PV（%s），這將會清除掉所有的 LVM metadata。或是您可選擇忽略，這便會將內容保留住。"
 
-#: storage/devicetree.py:174
-#, fuzzy
+#: ../storage/devicetree.py:178
 msgid "_Ignore"
-msgstr "忽略全部（_I）"
+msgstr "忽略(_I)"
 
-#: storage/devicetree.py:175
-#, fuzzy
+#: ../storage/devicetree.py:179
 msgid "_Re-initialize"
-msgstr "格式化磁碟（_R）"
+msgstr "重新初始化(_R)"
 
-#: storage/devicetree.py:1634 storage/devicetree.py:1683
-#, fuzzy
+#: ../storage/devicetree.py:1703 ../storage/devicetree.py:1752
 msgid "This partition is part of an inconsistent LVM Volume Group."
-msgstr "此裝置為 LVM 卷冊群組的一部份。"
+msgstr "此分割區為不一致的 LVM 卷冊群組的一部份。"
 
-#: storage/formats/fs.py:66
+#: ../storage/formats/fs.py:66
 msgid "attr dict must include a type"
 msgstr "attr dict 必須包含一個類型"
 
-#: storage/formats/fs.py:113
+#: ../storage/formats/fs.py:113
 msgid "filesystem configuration missing a type"
-msgstr "檔案系統配置缺少了類型"
+msgstr "檔案系統設定缺少了類型"
 
-#: storage/formats/fs.py:343
+#: ../storage/formats/fs.py:343
 msgid "Formatting"
 msgstr "正在格式化"
 
-#: storage/formats/fs.py:344
-#, fuzzy, python-format
+#: ../storage/formats/fs.py:344
+#, python-format
 msgid "Creating filesystem on %s"
-msgstr "正在 %s 上建立檔案系統..."
+msgstr "正在 %s 上建立檔案系統"
 
-#: storage/formats/fs.py:440
+#: ../storage/formats/fs.py:440
 msgid "Resizing"
 msgstr "重設大小"
 
-#: storage/formats/fs.py:441
-#, fuzzy, python-format
+#: ../storage/formats/fs.py:441
+#, python-format
 msgid "Resizing filesystem on %s"
-msgstr "正在重設 %s 上的檔案系統大小..."
+msgstr "正在重設 %s 上的檔案系統大小"
 
-#: storage/formats/fs.py:484
+#: ../storage/formats/fs.py:484
 msgid "Checking"
 msgstr "正在檢查"
 
-#: storage/formats/fs.py:485
-#, fuzzy, python-format
+#: ../storage/formats/fs.py:485
+#, python-format
 msgid "Checking filesystem on %s"
-msgstr "正在檢查 %s 上的檔案系統..."
+msgstr "正在檢查 %s 上的檔案系統"
 
-#: storage/iscsi.py:82 storage/iscsi.py:83
+#: ../storage/iscsi.py:82 ../storage/iscsi.py:83
 msgid "Scanning iSCSI nodes"
 msgstr "正在掃描 iSCSI 節點"
 
-#: storage/iscsi.py:160 storage/iscsi.py:161
+#: ../storage/iscsi.py:160 ../storage/iscsi.py:161
 msgid "Initializing iSCSI initiator"
 msgstr "正在初始化 iSCSI initiator"
 
-#: storage/iscsi.py:197
+#: ../storage/iscsi.py:197
 msgid "iSCSI not available"
 msgstr "iSCSI 無法使用"
 
-#: storage/iscsi.py:199
+#: ../storage/iscsi.py:199
 msgid "No initiator name set"
 msgstr "未設置起始名稱"
 
-#: storage/iscsi.py:213
+#: ../storage/iscsi.py:213
 msgid "No iSCSI nodes discovered"
 msgstr "沒有發現 iSCSI 節點"
 
-#: storage/iscsi.py:216 storage/iscsi.py:217
+#: ../storage/iscsi.py:216 ../storage/iscsi.py:217
 msgid "Logging in to iSCSI nodes"
 msgstr "登入 iSCSI 節點"
 
-#: storage/iscsi.py:239
+#: ../storage/iscsi.py:239
 msgid "No new iSCSI nodes discovered"
 msgstr "沒有找到新的 iSCSI 節點"
 
-#: storage/iscsi.py:242
+#: ../storage/iscsi.py:242
 msgid "Could not log in to any of the discovered nodes"
 msgstr "無法登入至任何發現的節點中"
 
-#: storage/partitioning.py:181
+#: ../storage/partitioning.py:180
 msgid ""
 "Could not find enough free space for automatic partitioning, please use "
 "another partitioning method."
 msgstr "找不到可用於自動分割的足夠空間，請使用另一種分割方式。"
 
-#: storage/partitioning.py:205
+#: ../storage/partitioning.py:204
 msgid "Warnings During Automatic Partitioning"
 msgstr "自動分割磁碟時的警告"
 
-#: storage/partitioning.py:207
+#: ../storage/partitioning.py:206
 #, python-format
 msgid ""
 "Following warnings occurred during automatic partitioning:\n"
@@ -4909,7 +4954,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: storage/partitioning.py:219 storage/partitioning.py:239
+#: ../storage/partitioning.py:218 ../storage/partitioning.py:238
 msgid ""
 "\n"
 "\n"
@@ -4919,7 +4964,7 @@ msgstr ""
 "\n"
 "請按下「確定」來退出安裝程式。"
 
-#: storage/partitioning.py:221
+#: ../storage/partitioning.py:220
 #, python-format
 msgid ""
 "Could not allocate requested partitions: \n"
@@ -4930,7 +4975,7 @@ msgstr ""
 "\n"
 "%s.%s"
 
-#: storage/partitioning.py:241
+#: ../storage/partitioning.py:240
 msgid ""
 "\n"
 "\n"
@@ -4940,11 +4985,11 @@ msgstr ""
 "\n"
 "請按下「確定」，選擇不同的分割區選項。"
 
-#: storage/partitioning.py:243
+#: ../storage/partitioning.py:242
 msgid "Automatic Partitioning Errors"
 msgstr "自動分割磁碟發生錯誤"
 
-#: storage/partitioning.py:244
+#: ../storage/partitioning.py:243
 #, python-format
 msgid ""
 "The following errors occurred with your partitioning:\n"
@@ -4960,134 +5005,196 @@ msgstr ""
 "\n"
 "這有可能是因為您硬碟上的剩餘空間不足以讓安裝程式使用。%s"
 
-#: storage/partitioning.py:255
+#: ../storage/partitioning.py:254
 msgid "Unrecoverable Error"
 msgstr "無法復原的錯誤"
 
-#: storage/zfcp.py:49
+#: ../storage/zfcp.py:50
 msgid "You have not specified a device number or the number is invalid"
 msgstr "您尚未指定裝置號碼，或該號碼不正確。"
 
-#: storage/zfcp.py:51
+#: ../storage/zfcp.py:52
 msgid "You have not specified a worldwide port name or the name is invalid."
 msgstr "您尚未指定 worldwide 連接埠名稱，或該名稱無效。"
 
-#: storage/zfcp.py:53
+#: ../storage/zfcp.py:54
 msgid "You have not specified a FCP LUN or the number is invalid."
 msgstr "您尚未指定 FCP LUN，或該號碼無效"
 
-#: textw/complete_text.py:32
+#: ../storage/zfcp.py:132
+#, python-format
+msgid "Could not free zFCP device %s from device ignore list (%s)."
+msgstr "無法將 zFCP 裝置 %s 由裝置忽略清單（%s）中釋放。"
+
+#: ../storage/zfcp.py:137
+#, python-format
+msgid "zFCP device %s not found, not even in device ignore list."
+msgstr "找不到 zFCP 裝置 %s，甚至在裝置忽略清單中也找不到。"
+
+#: ../storage/zfcp.py:150
+#, python-format
+msgid "Could not set zFCP device %s online (%s)."
+msgstr "無法將 zFCP 裝置 %s 設為 online（%s）"
+
+#: ../storage/zfcp.py:161
+#, python-format
+msgid "Could not add WWPN %s to zFCP device %s (%s)."
+msgstr "無法新增 WWPN %s 至 zFCP 裝置 %s（%s）。"
+
+#. newer zfcp sysfs interface with auto port scan
+#: ../storage/zfcp.py:165
+#, python-format
+msgid "WWPN %s not found at zFCP device %s."
+msgstr "在 zFCP 裝置 %s 上找不到 WWPN %s。"
+
+#: ../storage/zfcp.py:179
+#, python-format
+msgid "Could not add LUN %s to WWPN %s on zFCP device %s (%s)."
+msgstr "無法新增 LUN %s 至 zFCP 裝置 %s（%s）上的 WWPN %s。"
+
+#: ../storage/zfcp.py:183
+#, python-format
+msgid "LUN %s at WWPN %s on zFCP device %s already configured."
+msgstr "已設定了位於 zFCP 裝置 %s 上的 WWPN %s 的 LUN %s。"
+
+#: ../storage/zfcp.py:193
+#, python-format
+msgid "Could not read failed attribute of LUN %s at WWPN %s on zFCP device %s (%s)."
+msgstr "無法讀取位於 zFCP 裝置 %s（%s）上的 WWPN %s 的錯誤 LUN %s 屬性。"
+
+#: ../storage/zfcp.py:198
+#, python-format
+msgid "Failed LUN %s at WWPN %s on zFCP device %s removed again."
+msgstr "再次移除了位於 zFCP 裝置 %s 上的 WWPN %s 的錯誤 LUN %s。"
+
+#: ../storage/zfcp.py:253
+#, python-format
+msgid "Could not correctly delete SCSI device of zFCP %s %s %s (%s)."
+msgstr "無法正確地刪除 zFCP %s %s %s（%s）的 SCSI 裝置。"
+
+#: ../storage/zfcp.py:260
+#, python-format
+msgid "Could not remove LUN %s at WWPN %s on zFCP device %s (%s)."
+msgstr "無法移除位於 zFCP 裝置 %s（%s）上的 WWPN %s 的 LUN %s。"
+
+#: ../storage/zfcp.py:275
+#, python-format
+msgid "Could not remove WWPN %s on zFCP device %s (%s)."
+msgstr "無法移除 zFCP 裝置 %s（%s）上的 WWPN %s。"
+
+#: ../storage/zfcp.py:299
+#, python-format
+msgid "Could not set zFCP device %s offline (%s)."
+msgstr "無法將 zFCP 裝置 %s 設為離線（%s）。"
+
+#: ../textw/complete_text.py:32
 msgid "Reboot"
 msgstr "重新開機"
 
-#: textw/complete_text.py:34
+#: ../textw/complete_text.py:34
 msgid "<Enter> to exit"
 msgstr "按 <Enter> 鍵離開"
 
-#: textw/complete_text.py:62
+#: ../textw/complete_text.py:62
 msgid "Complete"
 msgstr "安裝完成"
 
-#: textw/keyboard_text.py:48
+#: ../textw/keyboard_text.py:48
 msgid "Keyboard Selection"
 msgstr "選擇鍵盤"
 
-#: textw/keyboard_text.py:49
+#: ../textw/keyboard_text.py:49
 msgid "Which model keyboard is attached to this computer?"
 msgstr "您使用的是那一種鍵盤？"
 
-#: textw/netconfig_text.py:41
+#: ../textw/netconfig_text.py:41
 #, python-format
 msgid "A value is required for the field %s"
 msgstr "欄位「%s」需要一個數值。"
 
-#: textw/netconfig_text.py:86 ui/netconfig.glade:8
+#: ../textw/netconfig_text.py:86 ../ui/netconfig.glade.h:9
 msgid "Enable network interface"
 msgstr "啟用網路界面"
 
-#: textw/netconfig_text.py:89 ui/netconfig.glade:78
+#: ../textw/netconfig_text.py:89 ../ui/netconfig.glade.h:10
 msgid ""
 "This requires that you have an active network connection during the "
 "installation process.  Please configure a network interface."
 msgstr "在安裝過程中，您需要可用的網路連線。請設定網路介面。"
 
-#: textw/netconfig_text.py:128
+#: ../textw/netconfig_text.py:128
 msgid "Use dynamic IP configuration (DHCP)"
 msgstr "使用動態 IP 設定（DHCP）"
 
-#: textw/netconfig_text.py:138
+#: ../textw/netconfig_text.py:138
 msgid "IPv4 Address:"
 msgstr "IPv4 位址："
 
-#: textw/netconfig_text.py:161
+#: ../textw/netconfig_text.py:161
 msgid "Nameserver:"
 msgstr "名稱伺服器："
 
-#: textw/netconfig_text.py:191
+#: ../textw/netconfig_text.py:191
 msgid "Missing Device"
 msgstr "裝置遺失"
 
-#: textw/netconfig_text.py:192
+#: ../textw/netconfig_text.py:192
 msgid "You must select a network device"
 msgstr "您必須選擇網路裝置"
 
-#: textw/netconfig_text.py:243
+#: ../textw/netconfig_text.py:243
 msgid "IPv4 Network Mask "
 msgstr "IPv4 網路遮罩"
 
-#: textw/netconfig_text.py:266
+#: ../textw/netconfig_text.py:266
 msgid "Configuring Network Interfaces"
-msgstr "配置網路介面"
+msgstr "設定網路介面"
 
-#: textw/netconfig_text.py:266
-#, fuzzy
+#: ../textw/netconfig_text.py:266
 msgid "Waiting for NetworkManager"
-msgstr "正在等候 NetworkManager..."
+msgstr "正在等候 NetworkManager"
 
-#: textw/netconfig_text.py:272
+#: ../textw/netconfig_text.py:272
 msgid "Error configuring network device"
 msgstr "設定網路裝置時發生錯誤"
 
-#: textw/netconfig_text.py:272
+#: ../textw/netconfig_text.py:272
 #, python-format
 msgid "Error configuring network device %s"
 msgstr "設定網路裝置 %s 時發生錯誤"
 
-#: textw/partition_text.py:58
+#: ../textw/partition_text.py:58
 msgid "Partitioning Type"
 msgstr "分割類型"
 
-#: textw/partition_text.py:60
-#, fuzzy
+#: ../textw/partition_text.py:60
 msgid ""
 "Installation requires partitioning of your hard drive.  The default layout "
 "is suitable for most users.  Select what space to use and which drives to "
 "use as the install target."
-msgstr ""
-"安裝過程需要分割您的硬碟。預設分割格式適用於大部份的使用者。請選擇欲使用的空"
-"間和作為安裝目標的磁碟。您亦可選擇建立您自己的自訂格式。"
+msgstr "安裝過程需要分割您的硬碟。預設分割格式適用於大部份的使用者。請選擇欲使用的空間和作為安裝目標的磁碟。"
 
-#: textw/partition_text.py:80
+#: ../textw/partition_text.py:80
 msgid "Which drive(s) do you want to use for this installation?"
 msgstr "您想安裝程序使用哪些磁碟機？"
 
-#: textw/partition_text.py:95
+#: ../textw/partition_text.py:95
 msgid "<Space>,<+>,<-> selection   |   <F2> Add drive   |   <F12> next screen"
 msgstr "<Space>,<+>,<-> 選擇   |   <F2> 群組細節   |   <F12> 下一個畫面"
 
-#: textw/partition_text.py:173 ui/adddrive.glade:8
+#: ../textw/partition_text.py:173 ../ui/adddrive.glade.h:4
 msgid "Advanced Storage Options"
 msgstr "進階儲存選項"
 
-#: textw/partition_text.py:174 ui/adddrive.glade:138
+#: ../textw/partition_text.py:174 ../ui/adddrive.glade.h:6
 msgid "How would you like to modify your drive configuration?"
 msgstr "您要如何修改您的磁碟設定？"
 
-#: textw/partition_text.py:203
+#: ../textw/partition_text.py:203
 msgid "Add FCP Device"
 msgstr "新增 FCP 裝置"
 
-#: textw/partition_text.py:204 ui/zfcp-config.glade:77
+#: ../textw/partition_text.py:204 ../ui/zfcp-config.glade.h:5
 msgid ""
 "zSeries machines can access industry-standard SCSI devices via Fibre Channel "
 "(FCP). You need to provide a 16 bit device number, a 64 bit World Wide Port "
@@ -5097,32 +5204,30 @@ msgstr ""
 "SCSI 裝置。您需要為每個裝置設定五個參數：16 位元的裝置號碼、64 位元的 World "
 "Wide Port Number（WWPN），以及 16 位元的 FCP LUN。"
 
-#: textw/partition_text.py:223
-#, fuzzy
+#: ../textw/partition_text.py:223
 msgid "Add FCoE SAN"
-msgstr "新增 _ZFCP LUN"
+msgstr "新增 FCoE SAN"
 
-#: textw/partition_text.py:224
+#: ../textw/partition_text.py:224
 msgid ""
 "Enter the device name for the NIC which is connected to the FCoE SAN. For "
 "example \"eth0\"."
-msgstr ""
+msgstr "請輸入連至了 FCoE SAN 的 NIC 裝置名稱。例如「eth0」。"
 
-#: textw/partition_text.py:225
-#, fuzzy
+#: ../textw/partition_text.py:225
 msgid "NIC device name"
-msgstr "找不到裝置"
+msgstr "NIC 裝置名稱"
 
-#: textw/partition_text.py:232
-#, fuzzy, python-format
+#: ../textw/partition_text.py:232
+#, python-format
 msgid "%s is not a valid NIC device name."
-msgstr "%s 不是有效的主機名稱。"
+msgstr "%s 不是一組有效的 NIC 裝置名稱。"
 
-#: textw/partition_text.py:248 ui/iscsi-config.glade:7
+#: ../textw/partition_text.py:248 ../ui/iscsi-config.glade.h:7
 msgid "Configure iSCSI Parameters"
 msgstr "設定 iSCSI 參數"
 
-#: textw/partition_text.py:249 ui/iscsi-config.glade:139
+#: ../textw/partition_text.py:249 ../ui/iscsi-config.glade.h:8
 msgid ""
 "To use iSCSI disks, you must provide the address of your iSCSI target and "
 "the iSCSI initiator name you've configured for your host."
@@ -5130,55 +5235,57 @@ msgstr ""
 "要使用 iSCSI 磁碟機，您必須提供已經為您的主機設定好的 iSCSI 目標位址與 iSCSI "
 "起始名稱。"
 
-#: textw/partition_text.py:250
+#: ../textw/partition_text.py:250
 msgid "Target IP Address"
 msgstr "目的地 IP 位址"
 
-#: textw/partition_text.py:251
+#: ../textw/partition_text.py:251
 msgid "iSCSI Initiator Name"
 msgstr "iSCSI 起始名稱"
 
-#: textw/partition_text.py:252
+#: ../textw/partition_text.py:252
 msgid "CHAP username"
 msgstr "CHAP 用戶名稱"
 
-#: textw/partition_text.py:253
+#: ../textw/partition_text.py:253
 msgid "CHAP password"
 msgstr "CHAP 密碼"
 
-#: textw/partition_text.py:254
+#: ../textw/partition_text.py:254
 msgid "Reverse CHAP username"
 msgstr "反向的 CHAP 用戶名稱"
 
-#: textw/partition_text.py:255
+#: ../textw/partition_text.py:255
 msgid "Reverse CHAP password"
 msgstr "反向的 CHAP 密碼"
 
-#: textw/progress_text.py:46
+#: ../textw/progress_text.py:46
 msgid "Package Installation"
 msgstr "安裝套件"
 
-#: textw/timezone_text.py:75
+#: ../textw/timezone_text.py:75
 msgid "In which time zone are you located?"
 msgstr "您位於那一個時區？"
 
-#: textw/timezone_text.py:93
+#. self.l.setCallback(self.updateClock)
+#: ../textw/timezone_text.py:93
 msgid "System clock uses UTC"
 msgstr "系統時鐘使用 UTC"
 
-#: textw/upgrade_bootloader_text.py:116 textw/upgrade_bootloader_text.py:125
+#: ../textw/upgrade_bootloader_text.py:116
+#: ../textw/upgrade_bootloader_text.py:125
 msgid "Update boot loader configuration"
 msgstr "更新開機管理程式設定"
 
-#: textw/upgrade_bootloader_text.py:128
+#: ../textw/upgrade_bootloader_text.py:128
 msgid "Skip boot loader updating"
 msgstr "略過更新開機管理程式"
 
-#: textw/upgrade_bootloader_text.py:130
+#: ../textw/upgrade_bootloader_text.py:130
 msgid "Create new boot loader configuration"
 msgstr "建立新的開機管理程式設定"
 
-#: textw/upgrade_text.py:38
+#: ../textw/upgrade_text.py:38
 #, python-format
 msgid ""
 "This release of %s supports the an updated file system, which has several "
@@ -5192,39 +5299,39 @@ msgstr ""
 "\n"
 "您想要遷移哪些分割區？"
 
-#: textw/upgrade_text.py:119
+#: ../textw/upgrade_text.py:119
 msgid "Free Space"
 msgstr "剩餘空間"
 
-#: textw/upgrade_text.py:137
+#: ../textw/upgrade_text.py:137
 msgid "RAM detected (MB):"
 msgstr "偵測到的記憶體（MB）："
 
-#: textw/upgrade_text.py:140
+#: ../textw/upgrade_text.py:140
 msgid "Suggested size (MB):"
 msgstr "建議大小（MB）："
 
-#: textw/upgrade_text.py:143
+#: ../textw/upgrade_text.py:143
 msgid "Swap file size (MB):"
 msgstr "Swap 檔案大小（MB）："
 
-#: textw/upgrade_text.py:151
+#: ../textw/upgrade_text.py:151
 msgid "Add Swap"
 msgstr "新增 swap 分割區"
 
-#: textw/upgrade_text.py:176
+#: ../textw/upgrade_text.py:176
 msgid "The value you entered is not a valid number."
 msgstr "您必須輸入一個有效數字。"
 
-#: textw/upgrade_text.py:209
+#: ../textw/upgrade_text.py:209
 msgid "Reinstall System"
 msgstr "重新安裝系統"
 
-#: textw/upgrade_text.py:219
+#: ../textw/upgrade_text.py:219
 msgid "System to Upgrade"
 msgstr "要升級的系統"
 
-#: textw/upgrade_text.py:220
+#: ../textw/upgrade_text.py:220
 msgid ""
 "There seem to be one or more existing Linux installations on your system.\n"
 "\n"
@@ -5235,22 +5342,22 @@ msgstr ""
 "\n"
 "請選擇一個來做升級，或選擇「重新安裝系統」來完整安裝您的系統。"
 
-#: textw/userauth_text.py:30
+#: ../textw/userauth_text.py:30
 msgid "Root Password"
 msgstr "Root 密碼"
 
-#: textw/userauth_text.py:33
+#: ../textw/userauth_text.py:33
 msgid ""
 "Pick a root password. You must type it twice to ensure you know it and do "
 "not make a typing mistake. "
 msgstr "輸入 root 密碼。您必須輸入兩次以做確認。"
 
-#: textw/userauth_text.py:67
+#: ../textw/userauth_text.py:67
 msgid "The root password must be at least 6 characters long."
 msgstr "root 密碼不得少於六個字元。"
 
-#: textw/userauth_text.py:84
-#, fuzzy, python-format
+#: ../textw/userauth_text.py:84
+#, python-format
 msgid ""
 "You have provided a weak password: %s\n"
 "\n"
@@ -5260,12 +5367,12 @@ msgstr ""
 "\n"
 "您是否希望繼續使用這組密碼？"
 
-#: textw/welcome_text.py:29
+#: ../textw/welcome_text.py:29
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: textw/welcome_text.py:30
+#: ../textw/welcome_text.py:30
 #, python-format
 msgid ""
 "Welcome to %s!\n"
@@ -5274,7 +5381,7 @@ msgstr ""
 "歡迎使用 %s!\n"
 "\n"
 
-#: textw/zipl_text.py:35
+#: ../textw/zipl_text.py:35
 msgid ""
 "The z/IPL Boot Loader will be installed on your system after installation is "
 "complete. You can now enter any additional kernel and chandev parameters "
@@ -5283,27 +5390,27 @@ msgstr ""
 "在完成安裝後，z/IPL 開機載入程式將會被安裝在您的系統上。現在您可以輸入您的機"
 "器或設定所需的任何其他核心或 chandev 參數。"
 
-#: textw/zipl_text.py:67
+#: ../textw/zipl_text.py:67
 msgid "z/IPL Configuration"
 msgstr "z/IPL 設定"
 
-#: textw/zipl_text.py:75 textw/zipl_text.py:79
+#: ../textw/zipl_text.py:75 ../textw/zipl_text.py:79
 msgid "Chandev line "
 msgstr "Chandev line"
 
-#: ui/GroupSelector.glade:8
-msgid "window1"
-msgstr ""
+#: ../liveinst/liveinst.desktop.in.h:1
+msgid "Install"
+msgstr "安裝"
 
-#: ui/GroupSelector.glade:203
-msgid "_Optional packages"
-msgstr "可選套件（_O）"
+#: ../liveinst/liveinst.desktop.in.h:2
+msgid "Install the live CD to your hard disk"
+msgstr "將即時 CD 安裝至您的硬碟上"
 
-#: ui/GroupSelector.glade:233
-msgid "dialog1"
-msgstr "dialog1"
+#: ../liveinst/liveinst.desktop.in.h:3
+msgid "Install to Hard Drive"
+msgstr "安裝至硬碟"
 
-#: ui/GroupSelector.glade:293
+#: ../ui/GroupSelector.glade.h:1
 msgid ""
 "Some packages associated with this group are not required to be installed "
 "but may provide additional functionality.  Please choose the packages which "
@@ -5312,71 +5419,77 @@ msgstr ""
 "有些和此群組相聯的套件無須被安裝不過可能能夠提供額外的功能。請選擇您希望安裝"
 "的套件。"
 
-#: ui/GroupSelector.glade:360
+#: ../ui/GroupSelector.glade.h:2
+msgid "_Deselect"
+msgstr "反選(_D)"
+
+#: ../ui/GroupSelector.glade.h:3
+msgid "_Deselect all optional packages"
+msgstr "反選所有可選的套件(_D)"
+
+#: ../ui/GroupSelector.glade.h:4
+msgid "_Optional packages"
+msgstr "可選套件(_O)"
+
+#: ../ui/GroupSelector.glade.h:5
 msgid "_Select"
-msgstr "選擇（_S）"
+msgstr "選擇(_S)"
 
-#: ui/GroupSelector.glade:369
+#: ../ui/GroupSelector.glade.h:6
 msgid "_Select all optional packages"
-msgstr "選擇所有可選套件（_S）"
+msgstr "選擇所有可選套件(_S)"
 
-#: ui/GroupSelector.glade:378
-msgid "_Deselect"
-msgstr "反選（_D）"
+#: ../ui/GroupSelector.glade.h:7
+msgid "dialog1"
+msgstr "dialog1"
 
-#: ui/GroupSelector.glade:387
-msgid "_Deselect all optional packages"
-msgstr "反選所有可選的套件"
+#: ../ui/account.glade.h:1
+msgid "Confirm:"
+msgstr "密碼確認："
 
-#: ui/account.glade:78
+#: ../ui/account.glade.h:2
+msgid "Root Password:"
+msgstr "Root 密碼："
+
+#: ../ui/account.glade.h:3
 msgid ""
 "The root account is used for administering the system.  Enter a password for "
 "the root user."
 msgstr "root 是系統管理專用的帳號。請為 root 使用者輸入密碼。"
 
-#: ui/account.glade:134
-msgid "Root Password:"
-msgstr "Root 密碼："
-
-#: ui/account.glade:162
-msgid "Confirm:"
-msgstr "密碼確認："
-
-#: ui/adddrive.glade:92
-msgid "_Add drive"
-msgstr "新增硬碟（_A）"
-
-#: ui/adddrive.glade:169
-msgid "Add _iSCSI target"
-msgstr "新增 _iSCSI 目標"
+#: ../ui/adddrive.glade.h:1
+msgid "Add _FCoE SAN"
+msgstr "新增 FCoE SAN(_F)"
 
-#: ui/adddrive.glade:188
+#: ../ui/adddrive.glade.h:2
 msgid "Add _ZFCP LUN"
-msgstr "新增 _ZFCP LUN"
+msgstr "新增 ZFCP LUN(_Z)"
 
-#: ui/adddrive.glade:207
-#, fuzzy
-msgid "Add _FCoE SAN"
-msgstr "新增 _ZFCP LUN"
+#: ../ui/adddrive.glade.h:3
+msgid "Add _iSCSI target"
+msgstr "新增 iSCSI 目標(_i)"
 
-#: ui/adddrive.glade:228
+#: ../ui/adddrive.glade.h:5
 msgid "Disable _dmraid device"
-msgstr "停用 _dmraid 裝置"
+msgstr "停用 dmraid 裝置(_d)"
 
-#: ui/addrepo.glade:82
-msgid ""
-"Please provide the configuration information for this software repository."
-msgstr "請提供此軟體庫的配置資訊。"
+#: ../ui/adddrive.glade.h:7
+msgid "_Add drive"
+msgstr "新增硬碟(_A)"
 
-#: ui/addrepo.glade:116
+#: ../ui/addrepo.glade.h:1
 msgid "<b>Repository _name:</b>"
-msgstr "<b>軟體庫名稱（_n）：</b>"
+msgstr "<b>軟體庫名稱(_n)：</b>"
 
-#: ui/addrepo.glade:166
+#: ../ui/addrepo.glade.h:2
 msgid "<b>Repository _type:</b>"
-msgstr "<b>軟體庫類型（_t）：</b>"
+msgstr "<b>軟體庫類型(_t)：</b>"
 
-#: ui/addrepo.glade:194
+#: ../ui/addrepo.glade.h:4
+msgid "Configure _proxy"
+msgstr "設定 proxy(_p)"
+
+#: ../ui/addrepo.glade.h:5
 msgid ""
 "HTTP/FTP\n"
 "CD/DVD\n"
@@ -5388,63 +5501,67 @@ msgstr ""
 "NFS\n"
 "Hard Drive"
 
-#: ui/addrepo.glade:243
-msgid "Repository _URL"
-msgstr "軟體庫 URL（_U）"
-
-#: ui/addrepo.glade:296
-msgid "URL is a _mirror list"
-msgstr "URL 是個鏡像清單（_m）"
-
-#: ui/addrepo.glade:316
-msgid "Configure _proxy"
-msgstr "設定 proxy（_p）"
+#: ../ui/addrepo.glade.h:9
+msgid "Please provide the configuration information for this software repository."
+msgstr "請提供此軟體庫的設定資訊。"
 
-#: ui/addrepo.glade:344
+#: ../ui/addrepo.glade.h:10
 msgid "Proxy U_RL (host:port)"
-msgstr "主機 URL（host:port）（_R）"
+msgstr "主機 URL（host:port）(_R)"
 
-#: ui/addrepo.glade:373
+#: ../ui/addrepo.glade.h:11
+msgid "Proxy pass_word"
+msgstr "Proxy 密碼(_w)"
+
+#: ../ui/addrepo.glade.h:12
 msgid "Proxy u_sername"
-msgstr "Proxy 用戶名稱（_s）"
+msgstr "Proxy 用戶名稱(_s)"
 
-#: ui/addrepo.glade:402
-msgid "Proxy pass_word"
-msgstr "Proxy 密碼（_w）"
+#: ../ui/addrepo.glade.h:13
+msgid "Repository _URL"
+msgstr "軟體庫 URL(_U)"
 
-#: ui/addrepo.glade:640
-msgid "_Server"
-msgstr "伺服器（_S）"
+#: ../ui/addrepo.glade.h:14
+msgid "Select A Directory"
+msgstr "選擇目錄"
 
-#: ui/addrepo.glade:669
-msgid "_Path"
-msgstr "路徑（_P）"
+#: ../ui/addrepo.glade.h:15
+msgid "URL is a _mirror list"
+msgstr "URL 是個鏡像清單(_m)"
+
+#: ../ui/addrepo.glade.h:16
+msgid "_Directory"
+msgstr "目錄(_D)"
 
-#: ui/addrepo.glade:698
+#: ../ui/addrepo.glade.h:17
 msgid "_Options"
-msgstr "選項（_O）"
+msgstr "選項(_O)"
 
-#: ui/addrepo.glade:855
+#: ../ui/addrepo.glade.h:18
 msgid "_Partition"
-msgstr "分割區（_P）"
+msgstr "分割區(_P)"
 
-#: ui/addrepo.glade:883
-msgid "_Directory"
-msgstr "目錄（_D）"
+#: ../ui/addrepo.glade.h:19
+msgid "_Path"
+msgstr "路徑(_P)"
 
-#: ui/addrepo.glade:926
-msgid "Select A Directory"
-msgstr "選擇目錄"
+#: ../ui/addrepo.glade.h:20
+msgid "_Server"
+msgstr "伺服器(_S)"
 
-#: ui/anaconda.glade:253
+#: ../ui/anaconda.glade.h:1
+msgid "Reboo_t"
+msgstr "重新開機(_t)"
+
+#: ../ui/anaconda.glade.h:3
 msgid "_Next"
-msgstr "下一步（_N）"
+msgstr "下一步(_N)"
 
-#: ui/anaconda.glade:327
-msgid "Reboo_t"
-msgstr "重新開機（_t）"
+#: ../ui/autopart.glade.h:1
+msgid "<b>Shrink _target (in MB):</b>"
+msgstr "<b>重設目的地大小，單位為 MB(_t)：</b>"
 
-#: ui/autopart.glade:33
+#: ../ui/autopart.glade.h:2
 msgid ""
 "Installation requires partitioning of your hard drive.  The default layout "
 "is suitable for most users.  Select what space to use and which drives to "
@@ -5454,769 +5571,235 @@ msgstr ""
 "安裝過程需要分割您的硬碟。預設分割格式適用於大部份的使用者。請選擇欲使用的空"
 "間和作為安裝目標的磁碟。您亦可選擇建立您自己的自訂格式。"
 
-#: ui/autopart.glade:86
-msgid "_Encrypt system"
-msgstr "加密系統（_E）"
-
-#: ui/autopart.glade:103
-msgid "_Select the drive(s) to use for this installation."
-msgstr "選擇您想要用於安裝的磁碟機（_S）。"
+#: ../ui/autopart.glade.h:3
+msgid "Re_view and modify partitioning layout"
+msgstr "檢視並修改分割區(_v)"
 
-#: ui/autopart.glade:216
-msgid "_Advanced storage configuration"
-msgstr "進階儲存設定（_A）"
+#: ../ui/autopart.glade.h:4
+msgid "Volume to Shrink"
+msgstr "欲縮小的卷測"
 
-#: ui/autopart.glade:271
+#: ../ui/autopart.glade.h:5
 msgid "What drive would you like to _boot this installation from?"
-msgstr "你希望由哪個磁碟來啟動此安裝？（_b）"
+msgstr "你希望由哪個磁碟來啟動此安裝？(_b)"
 
-#: ui/autopart.glade:323
-msgid "Re_view and modify partitioning layout"
-msgstr "檢視並修改分割區（_v）"
+#: ../ui/autopart.glade.h:6
+msgid "Which partition would you like to shrink to make room for your installation?"
+msgstr "您希望縮小哪個分割區以便空出空間來進行安裝？"
 
-#: ui/autopart.glade:344
-#, fuzzy
-msgid "Volume to Shrink"
-msgstr "需重設大小的卷冊"
+#: ../ui/autopart.glade.h:7
+msgid "_Advanced storage configuration"
+msgstr "進階儲存設定(_A)"
+
+#: ../ui/autopart.glade.h:8
+msgid "_Encrypt system"
+msgstr "加密系統(_E)"
 
-#: ui/autopart.glade:430
+#: ../ui/autopart.glade.h:9
+msgid "_Select the drive(s) to use for this installation."
+msgstr "選擇您想要用於安裝的磁碟機(_S)。"
+
+#: ../ui/autopart.glade.h:10
 msgid "_Shrink"
-msgstr ""
+msgstr "縮小(_S)"
 
-#: ui/autopart.glade:475
-#, fuzzy
-msgid ""
-"Which partition would you like to shrink to make room for your installation?"
-msgstr "您希望重設哪個分割區的大小以便空出空間來進行安裝？"
+#: ../ui/blwhere.glade.h:1
+msgid "/boot"
+msgstr "/boot"
 
-#: ui/autopart.glade:520
-#, fuzzy
-msgid "<b>Shrink _target (in MB):</b>"
-msgstr "<b>重設目的地大小，單位為 MB（_t）：</b>"
+#: ../ui/blwhere.glade.h:2
+msgid "BIOS Drive Order"
+msgstr "BIOS 磁碟順序"
 
-#: ui/blwhere.glade:8
+#: ../ui/blwhere.glade.h:3
 msgid "Boot loader device"
 msgstr "開機載入程式裝置"
 
-#: ui/blwhere.glade:77
-msgid "Where would you like to install the boot loader for your system?"
-msgstr "您希望將您系統的開機載入程式安裝在那裡？"
+#: ../ui/blwhere.glade.h:4
+msgid "First BIOS drive:"
+msgstr "第一個 BIOS 磁碟："
+
+#: ../ui/blwhere.glade.h:5
+msgid "Fourth BIOS drive:"
+msgstr "第四個 BIOS 磁碟："
 
-#: ui/blwhere.glade:102
+#: ../ui/blwhere.glade.h:6
 msgid "MBR"
 msgstr "MBR"
 
-#: ui/blwhere.glade:120
-msgid "/boot"
-msgstr "/boot"
-
-#: ui/blwhere.glade:167
-msgid "First BIOS drive:"
-msgstr "第一個 BIOS 磁碟："
-
-#: ui/blwhere.glade:194
+#: ../ui/blwhere.glade.h:7
 msgid "Second BIOS drive:"
 msgstr "第二個 BIOS 磁碟："
 
-#: ui/blwhere.glade:221
+#: ../ui/blwhere.glade.h:8
 msgid "Third BIOS drive:"
 msgstr "第三個 BIOS 磁碟："
 
-#: ui/blwhere.glade:248
-msgid "Fourth BIOS drive:"
-msgstr "第四個 BIOS 磁碟："
-
-#: ui/blwhere.glade:341
-msgid "BIOS Drive Order"
-msgstr "BIOS 磁碟順序"
+#: ../ui/blwhere.glade.h:9
+msgid "Where would you like to install the boot loader for your system?"
+msgstr "您希望將您系統的開機載入程式安裝在那裡？"
 
-#: ui/detailed-dialog.glade:63
+#: ../ui/detailed-dialog.glade.h:1
 msgid "Info"
 msgstr "資訊"
 
-#: ui/detailed-dialog.glade:133
+#: ../ui/detailed-dialog.glade.h:2
 msgid "_Details"
 msgstr "詳細資訊（_D）"
 
-#: ui/instkey.glade:58
-msgid "Please enter your %(instkey)s."
-msgstr "請輸入您的 %(instkey)s。"
-
-#: ui/instkey.glade:102
+#: ../ui/instkey.glade.h:2
+#, no-c-format
 msgid "%(instkey)s:"
 msgstr "%(instkey)s："
 
-#: ui/iscsi-config.glade:93
-msgid "_Add target"
-msgstr "新增目標（_A）"
-
-#: ui/iscsi-config.glade:174
-msgid "<b>_Target IP Address:</b>"
-msgstr "<b>目的地 IP 位址（_T）：</b>"
+#: ../ui/instkey.glade.h:4
+#, no-c-format
+msgid "Please enter your %(instkey)s."
+msgstr "請輸入您的 %(instkey)s。"
 
-#: ui/iscsi-config.glade:226
-msgid "<b>iSCSI Initiator _Name:</b>"
-msgstr "<b>iSCSI 起始名稱（_N）：</b>"
+#: ../ui/iscsi-config.glade.h:1
+msgid "<b>CHAP _Password:</b>"
+msgstr "<b>CHAP 密碼(_P)：</b>"
 
-#: ui/iscsi-config.glade:278
+#: ../ui/iscsi-config.glade.h:2
 msgid "<b>CHAP _Username:</b>"
-msgstr "<b>CHAP 使用者名稱（_U）：</b>"
+msgstr "<b>CHAP 使用者名稱(_U)：</b>"
 
-#: ui/iscsi-config.glade:330
-msgid "<b>CHAP _Password:</b>"
-msgstr "<b>CHAP 密碼（_P）：</b>"
+#: ../ui/iscsi-config.glade.h:3
+msgid "<b>Reverse CHAP P_assword:</b>"
+msgstr "<b>反向 CHAP 密碼(_a)：</b>"
 
-#: ui/iscsi-config.glade:382
+#: ../ui/iscsi-config.glade.h:4
 msgid "<b>Reverse CHAP U_sername:</b>"
-msgstr "<b>反向CHAP 使用者名稱（_s）：</b>"
+msgstr "<b>反向CHAP 使用者名稱(_s)：</b>"
 
-#: ui/iscsi-config.glade:434
-msgid "<b>Reverse CHAP P_assword:</b>"
-msgstr "<b>反向 CHAP 密碼（_a）：</b>"
+#: ../ui/iscsi-config.glade.h:5
+msgid "<b>_Target IP Address:</b>"
+msgstr "<b>目的地 IP 位址(_T)：</b>"
 
-#: ui/lukspassphrase.glade:8
-msgid "Enter passphrase for encrypted partition"
-msgstr "請為加密分割區輸入密碼"
+#: ../ui/iscsi-config.glade.h:6
+msgid "<b>iSCSI Initiator _Name:</b>"
+msgstr "<b>iSCSI 起始名稱(_N)：</b>"
 
-#: ui/lukspassphrase.glade:100
+#: ../ui/iscsi-config.glade.h:9
+msgid "_Add target"
+msgstr "新增目標(_A)"
+
+#: ../ui/lukspassphrase.glade.h:1
+msgid ""
+"Also add this passphrase to all existing encrypted devices to streamline the "
+"boot process"
+msgstr "將此密碼套用在所有現有的加密裝置上以增加開機程序進行上的效率"
+
+#: ../ui/lukspassphrase.glade.h:2
 msgid ""
 "Choose a passphrase for this encrypted partition. You will be prompted for "
 "the passphrase during system boot."
 msgstr "請為此加密分割區選擇一組密碼。您將會在系統啟動時被要求輸入這組密碼。"
 
-#: ui/lukspassphrase.glade:141
+#: ../ui/lukspassphrase.glade.h:3
+msgid "Confirm passphrase:"
+msgstr "確認密碼："
+
+#: ../ui/lukspassphrase.glade.h:4
+msgid "Enter passphrase for encrypted partition"
+msgstr "請為加密分割區輸入密碼"
+
+#: ../ui/lukspassphrase.glade.h:5
 msgid "Enter passphrase:"
 msgstr "請輸入密碼："
 
-#: ui/lukspassphrase.glade:169
-msgid "Confirm passphrase:"
-msgstr "確認密碼："
+#: ../ui/netconfig.glade.h:2
+msgid "<b>Gateway:</b>"
+msgstr "<b>閘道器：</b>"
 
-#: ui/lukspassphrase.glade:248
-msgid ""
-"Also add this passphrase to all existing encrypted devices to streamline the "
-"boot process"
-msgstr "將此密碼套用在所有現有的加密裝置上以增加開機程序進行上的效率"
+#: ../ui/netconfig.glade.h:3
+msgid "<b>IPv4 Address:</b>"
+msgstr "<b>IPv4 位址：</b>"
 
-#: ui/lukspassphrase.glade:368
-#, fuzzy
-msgid "label1"
-msgstr "標籤"
+#: ../ui/netconfig.glade.h:4
+msgid "<b>IPv6 Address:</b>"
+msgstr "<b>IPv6 位址：</b>"
 
-#: ui/netconfig.glade:109
-msgid "<b>_Interface:</b>"
-msgstr "<b>界面（_I）：</b>"
+#: ../ui/netconfig.glade.h:5
+msgid "<b>Nameserver:</b>"
+msgstr "<b>名稱伺服器：</b>"
 
-#: ui/netconfig.glade:155
-msgid "Use _dynamic IP configuration (DHCP)"
-msgstr "使用動態 IP 設定 - DHCP（_d）"
+#: ../ui/netconfig.glade.h:6
+msgid "<b>_Interface:</b>"
+msgstr "<b>介面卡(_I)：</b>"
 
-#: ui/netconfig.glade:174
+#: ../ui/netconfig.glade.h:7
 msgid "Enable IPv_4 support"
 msgstr "啟用 IPv_4 支援"
 
-#: ui/netconfig.glade:192
+#: ../ui/netconfig.glade.h:8
 msgid "Enable IPv_6 support"
 msgstr "啟用 IPv_6 支援"
 
-#: ui/netconfig.glade:217
-msgid "<b>IPv4 Address:</b>"
-msgstr "<b>IPv4 位址：</b>"
-
-#: ui/netconfig.glade:318
-msgid "<b>IPv6 Address:</b>"
-msgstr "<b>IPv6 位址：</b>"
-
-#: ui/netconfig.glade:419
-msgid "<b>Gateway:</b>"
-msgstr "<b>閘道器：</b>"
+#: ../ui/netconfig.glade.h:11
+msgid "Use _dynamic IP configuration (DHCP)"
+msgstr "使用動態 IP 設定 - DHCP(_d)"
 
-#: ui/netconfig.glade:476
-msgid "<b>Nameserver:</b>"
-msgstr "<b>名稱伺服器：</b>"
+#: ../ui/network.glade.h:1
+msgid "Hostname:"
+msgstr "主機名稱："
 
-#: ui/network.glade:78
+#: ../ui/network.glade.h:2
 msgid ""
 "Please name this computer.  The hostname identifies the computer on a "
 "network."
 msgstr "請為此電腦命名。主機名稱可用來辨識網路上的某部電腦。"
 
-#: ui/network.glade:134
-msgid "Hostname:"
-msgstr "主機名稱："
+#: ../ui/tasksel.glade.h:1
+msgid "Customize _later"
+msgstr "稍後自訂(_l)"
+
+#: ../ui/tasksel.glade.h:2
+msgid ""
+"Please select any additional repositories that you want to use for software "
+"installation."
+msgstr "請選擇任何您想要使用軟體安裝的額外軟體庫。"
 
-#: ui/tasksel.glade:35
+#: ../ui/tasksel.glade.h:4
+#, no-c-format
 msgid ""
 "The default installation of %s includes a set of software applicable for "
 "general internet usage.  What additional tasks would you like your system to "
 "support?"
-msgstr ""
-"%s 的預設安裝包括使用網際網路的一般性軟體。您希望系統還支援哪些東西呢？"
+msgstr "%s 的預設安裝包括使用網際網路的一般性軟體。您希望系統還支援哪些東西呢？"
 
-#: ui/tasksel.glade:110
+#: ../ui/tasksel.glade.h:5
 msgid ""
 "You can further customize the software selection now, or after install via "
 "the software management application."
 msgstr "您可以現在進一步自訂要安裝的軟體，或在安裝後透過軟體管理程式進行。"
 
-#: ui/tasksel.glade:141
-msgid "Customize _later"
-msgstr "稍後自訂（_l）"
+#: ../ui/tasksel.glade.h:6
+msgid "_Add additional software repositories"
+msgstr "新增額外軟體庫(_A)"
 
-#: ui/tasksel.glade:159
+#: ../ui/tasksel.glade.h:7
 msgid "_Customize now"
-msgstr "立即自訂（_C）"
+msgstr "立即自訂(_C)"
 
-#: ui/tasksel.glade:200
-msgid ""
-"Please select any additional repositories that you want to use for software "
-"installation."
-msgstr "請選擇任何您想要使用軟體安裝的額外軟體庫。"
-
-#: ui/tasksel.glade:304
-msgid "_Add additional software repositories"
-msgstr "新增額外軟體庫（_A）"
-
-#: ui/tasksel.glade:378
+#: ../ui/tasksel.glade.h:8
 msgid "_Modify repository"
-msgstr "修改軟體庫（_M）"
+msgstr "修改軟體庫(_M)"
 
-#: ui/zfcp-config.glade:7
-msgid "Add FCP device"
-msgstr "新增 FCP 裝置"
-
-#: ui/zfcp-config.glade:112
+#: ../ui/zfcp-config.glade.h:1
 msgid "<b>Device number:</b>"
 msgstr "<b>裝置號碼：</b>"
 
-#: ui/zfcp-config.glade:162
-msgid "<b>WWPN:</b>"
-msgstr "<b>WWPN：</b>"
-
-#: ui/zfcp-config.glade:212
+#: ../ui/zfcp-config.glade.h:2
 msgid "<b>FCP LUN:</b>"
 msgstr "<b>FCP LUN：</b>"
 
-#~ msgid "Fatal Error"
-#~ msgstr "嚴重錯誤"
-
-#~ msgid ""
-#~ "You do not have enough RAM to install %s on this machine.\n"
-#~ "\n"
-#~ "Press <return> to reboot your system.\n"
-#~ msgstr ""
-#~ "您沒有足夠的記憶體在此機器上安裝 %s。\n"
-#~ "\n"
-#~ "請按下 <return> 來重新啟動您的系統。\n"
-
-#~ msgid ""
-#~ "Your bug could not be filed due to the following error when communicating "
-#~ "with bugzilla:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "您的錯誤無法登記因為和 bugzilla 進行通訊時發生了下列錯誤：\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Your bug could not be filed due to bad information in the bug fields.  "
-#~ "This is most likely an error in anaconda:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "您的錯誤無法登記因為在 bug 欄位中輸入了錯誤的資訊。這很有可能是 anaconda "
-#~ "中的錯誤：\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Unable To File Bug"
-#~ msgstr "無法登記錯誤"
-
-#~ msgid "Bug Filing Not Supported"
-#~ msgstr "不支援錯誤登記"
-
-#~ msgid ""
-#~ "Your distribution does not provide a supported bug filing system, so you "
-#~ "cannot save your exception this way."
-#~ msgstr "您的供應商不支援錯誤登記系統，因此您無法用此方式來儲存您的錯誤。"
-
-#~ msgid "Invalid Bug Information"
-#~ msgstr "無效的錯誤資訊"
-
-#~ msgid ""
-#~ "Please provide a valid username, password, and short bug description."
-#~ msgstr "請提供一組有效的用戶名稱、密碼和簡短的錯誤描述。"
-
-#~ msgid "Unable To Login"
-#~ msgstr "無法登入"
-
-#~ msgid ""
-#~ "There was an error logging into %s using the provided username and "
-#~ "password."
-#~ msgstr "使用提供的用戶名稱和密碼來登錄 %s 時發生了錯誤。"
-
-#~ msgid "Bug Created"
-#~ msgstr "錯誤已建立"
-
-#~ msgid ""
-#~ "A new bug has been created with your traceback attached. Please add "
-#~ "additional information such as what you were doing when you encountered "
-#~ "the bug, screenshots, and whatever else is appropriate to the following "
-#~ "bug:\n"
-#~ "\n"
-#~ "%s/%s"
-#~ msgstr ""
-#~ "有個新的錯誤已被建立，並且您的回溯已和該錯誤鏈結。請附加額外資訊，例如當您"
-#~ "發生該錯誤時您正在做什麼、出現的畫面，以及任何與下列錯誤有關的資訊：\n"
-#~ "\n"
-#~ "%s/%s"
-
-#~ msgid "Bug Updated"
-#~ msgstr "錯誤更新"
-
-#~ msgid ""
-#~ "A bug with your information already exists.  Your account has been added "
-#~ "to the CC list and your traceback added as a comment.  Please add "
-#~ "additional descriptive information to the following bug:\n"
-#~ "\n"
-#~ "%s/%s"
-#~ msgstr ""
-#~ "已經有個含有您資訊的錯誤存在了。您的帳號已被附加至 CC 清單並且您的回溯已被"
-#~ "附加為備注。請附加額外的描述資訊至下列錯誤：\n"
-#~ "\n"
-#~ "%s/%s"
-
-#~ msgid "Dump Written"
-#~ msgstr "Dump 寫入"
-
-#~ msgid ""
-#~ "Your system's state has been successfully written to the disk. The "
-#~ "installer will now exit."
-#~ msgstr "你系統的狀態已經成功地寫入磁碟中。現在安裝程式將會退出。"
-
-#~ msgid "Dump Not Written"
-#~ msgstr "Dump 並未寫入"
-
-#~ msgid ""
-#~ "Cannot save a bug report since there is no active networking device "
-#~ "available."
-#~ msgstr "無法儲存錯誤回報因為沒有可用的網路作業裝置。"
-
-#~ msgid ""
-#~ "Your system's state has been successfully written to the remote host.  "
-#~ "The installer will now exit."
-#~ msgstr "你的系統狀態已經成功寫入遠端主機中。現在安裝程式將會退出。"
-
-#~ msgid "There was a problem writing the system state to the remote host."
-#~ msgstr "將系統狀態寫入遠端機器時出現問題。"
-
-#~ msgid "Bugzilla (%s)"
-#~ msgstr "Bugzilla（%s）"
-
-#~ msgid "Debug"
-#~ msgstr "除錯程式"
-
-#~ msgid "Exception Occurred"
-#~ msgstr "發生例外狀況"
-
-#~ msgid "Error: %s splits into %s but not like we expect"
-#~ msgstr "錯誤：%s 劃分為 %s 不過和我們所預期的不同"
-
-#~ msgid "Could not get information for mount point /boot or /"
-#~ msgstr "無法取得有關於掛載點 /boot 或 / 的相關資訊"
-
-#~ msgid "Running..."
-#~ msgstr "執行中..."
-
-#~ msgid "Doing post-installation"
-#~ msgstr "正進行安裝後的程序檔"
-
-#~ msgid "None"
-#~ msgstr "沒有"
-
-#~ msgid ""
-#~ "The device %s is LDL formatted instead of CDL formatted.  LDL formatted "
-#~ "DASDs are not supported for usage during an install of %s.  If you wish "
-#~ "to use this disk for installation, it must be re-initialized causing the "
-#~ "loss of ALL DATA on this drive.\n"
-#~ "\n"
-#~ "Would you like to reformat this DASD using CDL format?"
-#~ msgstr ""
-#~ "裝置 %s 為 LDL 格式化的，非為 CDL 格式化的。在 %s 的安裝過程中，並不支援 "
-#~ "使用 LDL 格式化的 DASDs，如要使用這個磁碟來進行安裝，必須先初始化磁碟，這"
-#~ "將 會造成磁碟上「所有資料」的流失。\n"
-#~ "\n"
-#~ "您想要使用 CDL 格式重新格式化這個 DASD 嗎？"
-
-#~ msgid ""
-#~ "/dev/%s currently has a %s partition layout.  To use this drive for the "
-#~ "installation of %s, it must be re-initialized, causing the loss of ALL "
-#~ "DATA on this drive.\n"
-#~ "\n"
-#~ "Would you like to re-initialize this drive?"
-#~ msgstr ""
-#~ "/dev/%s 目前已經有 %s 個分割區。要在這硬碟上安裝 %s，您必須重新格式化硬"
-#~ "碟，這會刪除該硬碟上「所有資料」。\n"
-#~ "\n"
-#~ "您希望格式化硬碟嗎？"
-
-#~ msgid "Initializing"
-#~ msgstr "正在初始化磁碟"
-
-#~ msgid "Please wait while formatting drive %s...\n"
-#~ msgstr "正在格式化磁碟 %s ，請稍候...\n"
-
-#~ msgid ""
-#~ "The partition table on device %s (%s %-0.f MB) was unreadable.\n"
-#~ "\n"
-#~ "To create new partitions it must be initialized, causing the loss of ALL "
-#~ "DATA on this drive.\n"
-#~ "\n"
-#~ "This operation will override any previous installation choices about "
-#~ "which drives to ignore.\n"
-#~ "\n"
-#~ "Would you like to initialize this drive, erasing ALL DATA?"
-#~ msgstr ""
-#~ "無法讀取 %s (%s %-0.f MB) 裝置上的磁碟分割表。\n"
-#~ "\n"
-#~ "要建立新分割區必須先初始化分割表，這將會造成磁碟上所有的資料流失。\n"
-#~ "\n"
-#~ "這個動作將會強制將之前任何關於要忽略那一個磁碟的安裝選擇進行覆寫。\n"
-#~ "\n"
-#~ "您希望初始化磁碟並刪除所有的資料嗎？"
-
-#~ msgid ""
-#~ "The drive /dev/%s has more than 15 partitions on it.  The SCSI subsystem "
-#~ "in the Linux kernel does not allow for more than 15 partitons at this "
-#~ "time.  You will not be able to make changes to the partitioning of this "
-#~ "disk or use any partitions beyond /dev/%s15 in %s"
-#~ msgstr ""
-#~ "/dev/%s 磁碟上含有超過 15 個分割區。Linux kernel 中的 SCSI 子系統目前並不"
-#~ "允許超過 15 個分割區。在 %s 中超過 /dev/%s15 之後您便無法對於磁碟進行任何"
-#~ "分割區上的變更或使用任何分割區。"
-
-#~ msgid "Save"
-#~ msgstr "儲存"
-
-#~ msgid "Save to local disk"
-#~ msgstr "儲存至本地磁碟"
-
-#~ msgid "Send to bugzilla (%s)"
-#~ msgstr "傳送至 bugzilla（%s）"
-
-#~ msgid "Send to remote server (scp)"
-#~ msgstr "傳送至遠端伺服器（scp）"
-
-#~ msgid "Password"
-#~ msgstr "密碼"
-
-#~ msgid "Bug Description"
-#~ msgstr "錯誤描述"
-
-#~ msgid "Host (host:port)"
-#~ msgstr "主機（host:port）"
-
-#~ msgid "Destination file"
-#~ msgstr "目的地檔案"
-
-#~ msgid "The passphrase must be at least %d characters long."
-#~ msgstr "密碼長度不得少於 %d 個字元。"
-
-#~ msgid ""
-#~ "You have choosen the upgrade for %s architecture, but the installed "
-#~ "system is for %s architecture. \n"
-#~ "\n"
-#~ msgstr ""
-#~ "您選擇了升級 %s 架構，不過安裝的系統屬於 %s 架構。\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Would you like to upgrade  the installed system to the %s architecture?"
-#~ msgstr "您希望將安裝的系統升級為 %s 架構嗎？"
-
-#~ msgid "Giving up attempting to connect after %d tries!\n"
-#~ msgstr "在嘗試 %d 次後，放棄嘗試連線！\n"
-
-#~ msgid "%s Byte"
-#~ msgstr "%s 位元組"
-
-#~ msgid "%s Bytes"
-#~ msgstr "%s 位元組"
-
-#~ msgid "Processing"
-#~ msgstr "處理中"
-
-#~ msgid "%s of %s packages completed"
-#~ msgstr "%s 之 %s 的套件已完成"
-
-#~ msgid "Starting install process.  This may take several minutes..."
-#~ msgstr "開始安裝程序，這要花上幾分鐘..."
-
-#~ msgid "You cannot create more than %s logical volumes per volume group."
-#~ msgstr "您不能在每一個卷冊群組建立超過 %s 邏輯卷冊。"
-
-#~ msgid "Drive %s (Geom: %s/%s/%s) (Model: %s)"
-#~ msgstr "磁碟 %s（Geom：%s/%s/%s）（型號：%s）"
-
-#~ msgid ""
-#~ "To install the full set of supported packages included in your "
-#~ "subscription, please enter your Installation Number"
-#~ msgstr "若要完整安裝包含於您訂閱中的已支援套件，請輸入您的安裝序號"
-
-#~ msgid ""
-#~ "If you're unable to locate the Installation Number, consult http://www."
-#~ "redhat.com/apps/support/in.html.\n"
-#~ "\n"
-#~ "If you skip:\n"
-#~ "* You may not get access to the full set of packages included in your "
-#~ "subscription.\n"
-#~ "* It may result in an unsupported/uncertified installation of Red Hat "
-#~ "Enterprise Linux.\n"
-#~ "* You will not get software and security updates for packages not "
-#~ "included in your subscription."
-#~ msgstr ""
-#~ "若您無法找到安裝序號，請參閱 consult http://www.redhat.com/apps/support/"
-#~ "in.html.\n"
-#~ "\n"
-#~ "若您略過的話：\n"
-#~ "* 您將無法存取包含于您訂閱中的所有套件。\n"
-#~ "* 這可能會造成您的 Red Hat Enterprise Linux 不被支援/認證。\n"
-#~ "* 您將無法取得不包含在您訂閱中的套件的軟體與安全性上的更新。"
-
-#~ msgid "Filesystem error detected, cannot continue."
-#~ msgstr "已偵測到檔案系統錯誤，無法繼續進行。"
-
-#~ msgid "boot flag not available for this partition"
-#~ msgstr "此分割區無法使用 boot flag"
-
-#~ msgid "_Ignore drive(s)"
-#~ msgstr "忽略磁碟（_I）"
-
-#~ msgid "_Re-initialize drive(s)"
-#~ msgstr "重新初始化磁碟（_R）"
-
-#~ msgid "Your system will now be rebooted."
-#~ msgstr "您的系統現在將重新開機。"
-
-#~ msgid "Bug _description"
-#~ msgstr "錯誤描述（_d）"
-
-#~ msgid "Destination _file"
-#~ msgstr "目的地檔案（_f）"
-
-#~ msgid ""
-#~ "Local storage device\n"
-#~ "Local disk\n"
-#~ "Remote server (scp)"
-#~ msgstr ""
-#~ "本地儲存裝置\n"
-#~ "本地磁碟\n"
-#~ "遠端伺服器（scp）"
-
-#~ msgid "Please choose a destination for saving your traceback."
-#~ msgstr "請選擇一個儲存您回溯的目的地。"
-
-#~ msgid "Select A File"
-#~ msgstr "選擇檔案"
-
-#~ msgid "_Host (host:port)"
-#~ msgstr "主機（host:port）（_H）"
-
-#~ msgid "_Password"
-#~ msgstr "密碼（_P）"
-
-#~ msgid "_User name"
-#~ msgstr "使用者名稱（_U）"
-
-#~ msgid "Install"
-#~ msgstr "安裝"
-
-#~ msgid "Install the live CD to your hard disk"
-#~ msgstr "將即時 CD 安裝至您的硬碟上"
-
-#~ msgid "Install to Hard Drive"
-#~ msgstr "安裝至硬碟"
-
-#~ msgid "Afrikaans"
-#~ msgstr "南非荷蘭語"
-
-#~ msgid "Arabic"
-#~ msgstr "阿拉伯文"
-
-#~ msgid "Assamese"
-#~ msgstr "阿撒姆語"
-
-#~ msgid "Bengali"
-#~ msgstr "孟加拉語"
-
-#~ msgid "Bengali(India)"
-#~ msgstr "孟加拉語（印度）"
-
-#~ msgid "Bulgarian"
-#~ msgstr "保加利亞文"
-
-#~ msgid "Catalan"
-#~ msgstr "加泰羅尼亞語"
-
-#~ msgid "Chinese(Simplified)"
-#~ msgstr "簡體中文"
-
-#~ msgid "Chinese(Traditional)"
-#~ msgstr "繁體中文"
-
-#~ msgid "Croatian"
-#~ msgstr "克羅埃西亞語"
-
-#~ msgid "Czech"
-#~ msgstr "捷克語"
-
-#~ msgid "Danish"
-#~ msgstr "丹麥語"
-
-#~ msgid "Dutch"
-#~ msgstr "荷蘭文"
-
-#~ msgid "English"
-#~ msgstr "英語"
-
-#~ msgid "Estonian"
-#~ msgstr "愛沙尼亞文"
-
-#~ msgid "Finnish"
-#~ msgstr "芬蘭文"
-
-#~ msgid "French"
-#~ msgstr "法語"
-
-#~ msgid "German"
-#~ msgstr "德語"
-
-#~ msgid "Greek"
-#~ msgstr "希臘文"
-
-#~ msgid "Gujarati"
-#~ msgstr "古吉拉特語"
-
-#~ msgid "Hebrew"
-#~ msgstr "希伯來語"
-
-#~ msgid "Hindi"
-#~ msgstr "印地語"
-
-#~ msgid "Hungarian"
-#~ msgstr "匈牙利文"
-
-#~ msgid "Icelandic"
-#~ msgstr "冰島語"
-
-#~ msgid "Iloko"
-#~ msgstr "伊洛卡諾語"
-
-#~ msgid "Indonesian"
-#~ msgstr "印尼文"
-
-#~ msgid "Italian"
-#~ msgstr "義大利語"
-
-#~ msgid "Japanese"
-#~ msgstr "日語"
-
-#~ msgid "Kannada"
-#~ msgstr "坎納達語"
-
-#~ msgid "Korean"
-#~ msgstr "韓語"
-
-#~ msgid "Macedonian"
-#~ msgstr "馬其頓語"
-
-#~ msgid "Maithili"
-#~ msgstr "彌濕羅語"
-
-#~ msgid "Malay"
-#~ msgstr "馬來文"
-
-#~ msgid "Malayalam"
-#~ msgstr "馬拉雅拉姆語"
-
-#~ msgid "Marathi"
-#~ msgstr "馬拉地語"
-
-#~ msgid "Nepali"
-#~ msgstr "尼泊爾語"
-
-#~ msgid "Norwegian(Bokmål)"
-#~ msgstr "挪威語（Bokmål）"
-
-#~ msgid "Northern Sotho"
-#~ msgstr "北索托語"
-
-#~ msgid "Oriya"
-#~ msgstr "奧里雅語"
-
-#~ msgid "Persian"
-#~ msgstr "波斯語"
-
-#~ msgid "Polish"
-#~ msgstr "波蘭文"
-
-#~ msgid "Portuguese"
-#~ msgstr "葡萄牙語"
-
-#~ msgid "Portuguese(Brazilian)"
-#~ msgstr "葡萄牙語（巴西）"
-
-#~ msgid "Punjabi"
-#~ msgstr "旁遮普語"
-
-#~ msgid "Romanian"
-#~ msgstr "羅馬尼亞語"
-
-#~ msgid "Russian"
-#~ msgstr "俄語"
-
-#~ msgid "Serbian"
-#~ msgstr "塞爾維亞語"
-
-#~ msgid "Serbian(Latin)"
-#~ msgstr "塞爾維亞語（拉丁）"
-
-#~ msgid "Sinhala"
-#~ msgstr "錫蘭語"
-
-#~ msgid "Slovak"
-#~ msgstr "斯洛伐克語"
-
-#~ msgid "Slovenian"
-#~ msgstr "斯洛維尼亞語"
-
-#~ msgid "Spanish"
-#~ msgstr "西班牙語"
-
-#~ msgid "Swedish"
-#~ msgstr "瑞典語"
-
-#~ msgid "Tajik"
-#~ msgstr "塔吉克語"
-
-#~ msgid "Tamil"
-#~ msgstr "泰米爾語"
-
-#~ msgid "Telugu"
-#~ msgstr "泰盧固語"
-
-#~ msgid "Turkish"
-#~ msgstr "土耳其文"
-
-#~ msgid "Ukrainian"
-#~ msgstr "烏克蘭語"
-
-#~ msgid "Vietnamese"
-#~ msgstr "越南文"
+#: ../ui/zfcp-config.glade.h:3
+msgid "<b>WWPN:</b>"
+msgstr "<b>WWPN：</b>"
 
-#~ msgid "Welsh"
-#~ msgstr "威爾斯語"
+#: ../ui/zfcp-config.glade.h:4
+msgid "Add FCP device"
+msgstr "新增 FCP 裝置"
 
-#~ msgid "Zulu"
-#~ msgstr "祖魯語"