fixed menu

1 files changed, 4705 insertions, 3999 deletions

diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po
index 5ea6f1f35..b43718bc7 100644
--- a/perl-install/share/po/zh_TW.po
+++ b/perl-install/share/po/zh_TW.po
@@ -1,8 +1,3 @@
-# translation of zh_TW.po to 
-# translation of zh_TW.po to
-# translation of zh_TW.po to
-# translation of zh_TW.po to
-# translation of zh_TW.po to
 # translation of zh_TW.po to 繁體中文
 # translation of zh_TW.po to Chinese Traditional
 # translation of DrakX-zh_TW.po to Chinese Traditional
@@ -16,23 +11,27 @@
 # Hilbert <freehil@yahoo.com>, 2003, 2004.
 # Hilbert <h@mandrake.org>, 2004.
 # hilbert <h@mandrake.org>, 2004.
+# Shiva Huang <blueshiva@giga.net.tw>, 2005.
+# Shiva Huang <shivahuang@gmail.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: zh_TW\n"
-"POT-Creation-Date: 2004-10-07 21:57+0200\n"
-"PO-Revision-Date: 2004-10-08 21:55+0800\n"
-"Last-Translator: Hilbert <h@mandrake.org>\n"
-"Language-Team:  <zh@li.org>\n"
+"Project-Id-Version: DrakX\n"
+"POT-Creation-Date: 2005-02-24 14:10+0100\n"
+"PO-Revision-Date: 2005-02-23 13:04+0800\n"
+"Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
+"Language-Team: Traditional Chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: TAIWAN\n"
 
 #: ../move/move.pm:292
 #, c-format
 msgid "Which USB key do you want to format?"
-msgstr "您想要格式化那一個 USB key?"
+msgstr "您想要格式化那一個 USB 隨身碟？"
 
 #: ../move/move.pm:296
 #, c-format
@@ -46,8 +45,8 @@ msgstr ""
 
 #: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Key isn't writable"
-msgstr "Key 無法寫入"
+msgid "Key is not writable"
+msgstr "無法寫入隨身碟"
 
 #: ../move/move.pm:450
 #, c-format
@@ -55,6 +54,8 @@ msgid ""
 "The USB key seems to have write protection enabled. Please\n"
 "unplug it, remove write protection, and then plug it again."
 msgstr ""
+"您的 USB 隨身碟似乎有防寫保護。請先移除它，解除防寫保護之\n"
+"後重新接到電腦上。"
 
 #: ../move/move.pm:452
 #, c-format
@@ -69,7 +70,7 @@ msgstr "不用 USB key 而繼續"
 #: ../move/move.pm:462
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
+"The USB key seems to have write protection enabled, but we can not safely\n"
 "unplug it now.\n"
 "\n"
 "\n"
@@ -77,7 +78,7 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1317
 #, c-format
 msgid "Reboot"
 msgstr "重新開機"
@@ -85,7 +86,7 @@ msgstr "重新開機"
 #: ../move/move.pm:473
 #, c-format
 msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"Your USB key does not have any valid Windows (FAT) partitions.\n"
 "We need one to continue (beside, it's more standard so that you\n"
 "will be able to move and access your files from machines\n"
 "running Windows). Please plug in an USB key containing a\n"
@@ -100,7 +101,7 @@ msgstr ""
 #: ../move/move.pm:483
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
+"We did not detect any USB key on your system. If you\n"
 "plug in an USB key now, Mandrake Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
@@ -116,27 +117,27 @@ msgstr ""
 #: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
-msgstr "需要一 key 以儲存您的資料"
+msgstr "需要一個隨身碟來儲存您的資料"
 
 #: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
-msgstr ""
+msgstr "再次偵測到 USB 隨身碟"
 
 #: ../move/move.pm:517
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up USB key"
-msgstr "不用 USB key 而繼續"
+msgstr "設定 USB 隨身碟"
 
 #: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "請稍後, 設定系統設定檔於 USB key 上"
+msgstr "請稍候，正在將系統設定檔設定於 USB 隨身碟上..."
 
 #: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
-msgstr ""
+msgstr "請輸入您的使用者資訊，密碼將會用於螢幕保護程式的解除密碼"
 
 #: ../move/move.pm:556
 #, c-format
@@ -146,61 +147,64 @@ msgstr "自動設定"
 #: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
-msgstr "請稍後, 正在偵測與設定裝置中..."
+msgstr "請稍候，正在偵測與設定裝置中..."
 
 #: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
-#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
-#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
-#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
-#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
-#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
-#: network/netconnect.pm:1004 network/netconnect.pm:1045
-#: network/netconnect.pm:1049 network/netconnect.pm:1187
-#: network/netconnect.pm:1192 network/netconnect.pm:1210
-#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227
+#: diskdrake/interactive.pm:240 diskdrake/interactive.pm:393
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:541
+#: diskdrake/interactive.pm:546 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:183
+#: install_any.pm:1564 install_any.pm:1587 install_steps.pm:82
+#: install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:1037
+#: network/netconnect.pm:1041 network/netconnect.pm:1046
+#: network/netconnect.pm:1072 network/netconnect.pm:1141
+#: network/netconnect.pm:1145 network/netconnect.pm:1283
+#: network/netconnect.pm:1288 network/netconnect.pm:1306
+#: network/netconnect.pm:1491 printer/printerdrake.pm:238
 #: printer/printerdrake.pm:245 printer/printerdrake.pm:270
 #: printer/printerdrake.pm:416 printer/printerdrake.pm:421
 #: printer/printerdrake.pm:434 printer/printerdrake.pm:444
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
-#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
-#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
-#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
-#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
-#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
-#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
-#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
-#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
-#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
-#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
-#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
-#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
-#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
-#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
-#: standalone/drakTermServ:379 standalone/drakTermServ:731
-#: standalone/drakTermServ:738 standalone/drakTermServ:933
-#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
-#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
-#: standalone/drakTermServ:1447 standalone/drakauth:37
-#: standalone/drakbackup:512 standalone/drakbackup:626
-#: standalone/drakbackup:1128 standalone/drakbackup:1161
-#: standalone/drakbackup:1665 standalone/drakbackup:1821
-#: standalone/drakbackup:2416 standalone/drakbackup:4105
-#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
-#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
-#: standalone/drakconnect:651 standalone/drakconnect:670
-#: standalone/drakfloppy:297 standalone/drakfloppy:301
-#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
-#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:635
+#: printer/printerdrake.pm:1288 printer/printerdrake.pm:1335
+#: printer/printerdrake.pm:1372 printer/printerdrake.pm:1416
+#: printer/printerdrake.pm:1420 printer/printerdrake.pm:1434
+#: printer/printerdrake.pm:1524 printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1609 printer/printerdrake.pm:1613
+#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1719
+#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1737
+#: printer/printerdrake.pm:1848 printer/printerdrake.pm:1852
+#: printer/printerdrake.pm:1889 printer/printerdrake.pm:1957
+#: printer/printerdrake.pm:1975 printer/printerdrake.pm:1984
+#: printer/printerdrake.pm:1993 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2066 printer/printerdrake.pm:2159
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2955 printer/printerdrake.pm:3501
+#: printer/printerdrake.pm:3505 printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3965 printer/printerdrake.pm:4205
+#: printer/printerdrake.pm:4225 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366 printer/printerdrake.pm:4483
+#: standalone/drakTermServ:392 standalone/drakTermServ:753
+#: standalone/drakTermServ:760 standalone/drakTermServ:779
+#: standalone/drakTermServ:998 standalone/drakTermServ:1478
+#: standalone/drakTermServ:1483 standalone/drakTermServ:1490
+#: standalone/drakTermServ:1502 standalone/drakTermServ:1523
+#: standalone/drakauth:35 standalone/drakbackup:511 standalone/drakbackup:625
+#: standalone/drakbackup:1127 standalone/drakbackup:1160
+#: standalone/drakbackup:1671 standalone/drakbackup:1827
+#: standalone/drakbackup:2421 standalone/drakbackup:4110
+#: standalone/drakbackup:4330 standalone/drakbug:191 standalone/drakclock:124
+#: standalone/drakconnect:649 standalone/drakconnect:652
+#: standalone/drakconnect:671 standalone/drakfloppy:297
+#: standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209
+#: standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:604
+#: standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107
+#: standalone/finish-install:39 standalone/logdrake:169
 #: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
-#: standalone/scannerdrake:196 standalone/scannerdrake:255
-#: standalone/scannerdrake:684 standalone/scannerdrake:695
-#: standalone/scannerdrake:834 standalone/scannerdrake:845
-#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: standalone/scannerdrake:202 standalone/scannerdrake:261
+#: standalone/scannerdrake:715 standalone/scannerdrake:726
+#: standalone/scannerdrake:865 standalone/scannerdrake:876
+#: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "錯誤"
@@ -208,7 +212,7 @@ msgstr "錯誤"
 #: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
+"An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 "發生了一個錯誤, 但我不知道該如何妥善處置它.\n"
@@ -265,16 +269,16 @@ msgid "No CDROM support"
 msgstr "沒有 CDROM 支援"
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
-#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1030
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Read carefully!"
-msgstr "詳細閱讀!"
+msgstr "詳細閱讀！"
 
 #: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
-"You can't use another CDROM when the following programs are running: \n"
+"You can not use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
 
@@ -286,64 +290,64 @@ msgstr ""
 #: Xconfig/card.pm:13
 #, c-format
 msgid "256 kB"
-msgstr ""
+msgstr "256 kB"
 
 #: Xconfig/card.pm:14
 #, c-format
 msgid "512 kB"
-msgstr ""
+msgstr "512 kB"
 
 #: Xconfig/card.pm:15
 #, c-format
 msgid "1 MB"
-msgstr ""
+msgstr "1 MB"
 
 #: Xconfig/card.pm:16
 #, c-format
 msgid "2 MB"
-msgstr ""
+msgstr "2 MB"
 
 #: Xconfig/card.pm:17
 #, c-format
 msgid "4 MB"
-msgstr ""
+msgstr "4 MB"
 
 #: Xconfig/card.pm:18
 #, c-format
 msgid "8 MB"
-msgstr ""
+msgstr "8 MB"
 
 #: Xconfig/card.pm:19
 #, c-format
 msgid "16 MB"
-msgstr ""
+msgstr "16 MB"
 
 #: Xconfig/card.pm:20
 #, c-format
 msgid "32 MB"
-msgstr ""
+msgstr "32 MB"
 
 #: Xconfig/card.pm:21
 #, c-format
 msgid "64 MB or more"
 msgstr "64 MB 或者更多"
 
-#: Xconfig/card.pm:155
+#: Xconfig/card.pm:159
 #, c-format
 msgid "X server"
 msgstr "X 伺服器"
 
-#: Xconfig/card.pm:156
+#: Xconfig/card.pm:160
 #, c-format
 msgid "Choose an X server"
 msgstr "選取一個 X 伺服器"
 
-#: Xconfig/card.pm:188
+#: Xconfig/card.pm:192
 #, c-format
 msgid "Multi-head configuration"
 msgstr "多頭端(Multi-head)設定"
 
-#: Xconfig/card.pm:189
+#: Xconfig/card.pm:193
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -352,80 +356,80 @@ msgstr ""
 "您的系統支援多頭端(multiple head)設定組態.\n"
 "您打算怎麼做呢?"
 
-#: Xconfig/card.pm:255
+#: Xconfig/card.pm:262
 #, c-format
-msgid "Can't install Xorg package: %s"
+msgid "Can not install Xorg package: %s"
 msgstr "無法安裝 Xorg 套件: %s"
 
-#: Xconfig/card.pm:265
+#: Xconfig/card.pm:272
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "選擇顯示卡上的記憶體大小"
 
-#: Xconfig/card.pm:352
+#: Xconfig/card.pm:349
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg 設定"
 
-#: Xconfig/card.pm:354
+#: Xconfig/card.pm:351
 #, c-format
 msgid "Which configuration of Xorg do you want to have?"
 msgstr "您想要有哪一個 Xorg 設定?"
 
-#: Xconfig/card.pm:387
+#: Xconfig/card.pm:384
 #, c-format
 msgid "Configure all heads independently"
 msgstr "獨立設定所有頭端(head)"
 
-#: Xconfig/card.pm:388
+#: Xconfig/card.pm:385
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "使用 Xinerama 延伸"
 
-#: Xconfig/card.pm:393
+#: Xconfig/card.pm:390
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "僅設定 \"%s\"%s 卡"
 
-#: Xconfig/card.pm:405 Xconfig/various.pm:23
+#: Xconfig/card.pm:402 Xconfig/various.pm:23
 #, c-format
 msgid "Xorg %s"
 msgstr "Xorg %s"
 
-#: Xconfig/card.pm:412 Xconfig/various.pm:22
+#: Xconfig/card.pm:409 Xconfig/various.pm:22
 #, c-format
 msgid "Xorg %s with 3D hardware acceleration"
 msgstr "Xorg %s 含 3D 硬體加速功能"
 
-#: Xconfig/card.pm:414
+#: Xconfig/card.pm:411
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with Xorg %s."
 msgstr "您的顯示卡搭配 Xorg %s 有 3D 硬體加速功能."
 
-#: Xconfig/card.pm:420
+#: Xconfig/card.pm:417
 #, c-format
 msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "Xorg %s 搭配實驗性質 3D 硬體加速"
 
-#: Xconfig/card.pm:422
+#: Xconfig/card.pm:419
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with Xorg %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
-"您的顯示卡搭配 Xorg %s 能夠啟用 3D 硬體加速功能,\n"
-"但是請注意, 這是實驗性質的支援項目, 而且可會凍結您的電腦."
+"您的顯示卡搭配 Xorg %s 能夠啟用 3D 硬體加速功能，\n"
+"但是請注意，這是實驗性質的支援項目，而且可能會凍結您的電腦。"
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:117 any.pm:914
 #, c-format
 msgid "Custom"
 msgstr "自訂"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
-#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
-#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
-#: standalone/net_applet:160 standalone/scannerdrake:446
+#: install_steps_interactive.pm:86 printer/printerdrake.pm:737
+#: printer/printerdrake.pm:4296 printer/printerdrake.pm:4742
+#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:183
+#: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
 msgstr "離開"
@@ -435,12 +439,12 @@ msgstr "離開"
 msgid "Graphic Card"
 msgstr "顯示卡"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:111
 #, c-format
 msgid "Monitor"
 msgstr "螢幕"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:221
 #, c-format
 msgid "Resolution"
 msgstr "解析度"
@@ -450,19 +454,19 @@ msgstr "解析度"
 msgid "Test"
 msgstr "測試"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:437
 #: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
+#: standalone/drakfont:493 standalone/drakfont:555
 #, c-format
 msgid "Options"
 msgstr "選項"
 
-#: Xconfig/main.pm:167
+#: Xconfig/main.pm:168
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
-msgstr ""
+msgstr "您的 Xorg 設定檔已損毀，我們將忽略它。"
 
-#: Xconfig/main.pm:184
+#: Xconfig/main.pm:186
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -470,43 +474,43 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"保留目前的變更?\n"
-"目前的組態是:\n"
+"保留目前的變更？\n"
+"目前的組態是：\n"
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, c-format
 msgid "Choose a monitor for head #%d"
-msgstr "選取一個監視器給頭端(head) #%d"
+msgstr "選取一個螢幕給頭端(head) #%d"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, c-format
 msgid "Choose a monitor"
-msgstr "選取一個監視器"
+msgstr "選取一個螢幕"
 
-#: Xconfig/monitor.pm:117
+#: Xconfig/monitor.pm:118
 #, c-format
 msgid "Plug'n Play"
-msgstr "隨插即用 Plug'n Play"
+msgstr "隨插即用"
 
-#: Xconfig/monitor.pm:118 mouse.pm:49
+#: Xconfig/monitor.pm:119 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "一般"
 
-#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
-#: standalone/harddrake2:83
+#: Xconfig/monitor.pm:120 standalone/drakconnect:569 standalone/harddrake2:52
+#: standalone/harddrake2:86
 #, c-format
 msgid "Vendor"
 msgstr "廠商"
 
-#: Xconfig/monitor.pm:129
+#: Xconfig/monitor.pm:130
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
-msgstr "隨插即用 Plug'n Play 偵測失敗, 請選擇正確的監視器"
+msgstr "隨插即用 Plug'n Play 偵測失敗, 請選擇正確的螢幕"
 
-#: Xconfig/monitor.pm:134
+#: Xconfig/monitor.pm:135
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -520,20 +524,20 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"這兩個重要的參數是您監視器的垂直更新頻率, 以及最重要\n"
-"的水平更新頻率, 前者是您整個螢幕影像更新的頻率,\n"
-"後者是電子槍掃描的速率.\n"
+"這兩個重要的參數是您螢幕的垂直更新頻率，以及最重要\n"
+"的水平更新頻率，前者是您整個螢幕影像更新的頻率，\n"
+"後者是電子槍掃描的速率。\n"
 "\n"
-"特別重要的是, 不要設定一個超過您正在用的監視器\n"
-"同步範圍的監視器: 您可能傷害您的監視器.\n"
-"若您不確定的話, 請選擇保守一點的設定值."
+"特別重要的是，不要設定一個超過您正在用的螢幕\n"
+"同步範圍的螢幕：您可能傷害您的螢幕。\n"
+"若您不確定的話，請選擇保守一點的設定值。"
 
-#: Xconfig/monitor.pm:141
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "水平更新頻率"
 
-#: Xconfig/monitor.pm:142
+#: Xconfig/monitor.pm:143
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "垂直更新頻率"
@@ -558,7 +562,7 @@ msgstr "6 萬 5 千色 (16 位元)"
 msgid "16 million colors (24 bits)"
 msgstr "1 千 6 百萬色 (24 位元)"
 
-#: Xconfig/resolution_and_depth.pm:135
+#: Xconfig/resolution_and_depth.pm:133
 #, c-format
 msgid "Resolutions"
 msgstr "解析度"
@@ -571,47 +575,47 @@ msgstr "選取解析度以及顏色深度"
 #: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
-msgstr "顯示卡: %s"
+msgstr "顯示卡：%s"
 
-#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
-#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: Xconfig/resolution_and_depth.pm:285 interactive.pm:424
+#: interactive/gtk.pm:768 interactive/http.pm:103 interactive/http.pm:156
 #: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakTermServ:201 standalone/drakTermServ:474
-#: standalone/drakbackup:3962 standalone/drakbackup:4022
-#: standalone/drakbackup:4066 standalone/drakconnect:165
-#: standalone/drakconnect:850 standalone/drakconnect:937
-#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
-#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
-#: ugtk2.pm:1122 ugtk2.pm:1145
+#: standalone/drakTermServ:199 standalone/drakTermServ:490
+#: standalone/drakbackup:3967 standalone/drakbackup:4027
+#: standalone/drakbackup:4071 standalone/drakconnect:165
+#: standalone/drakconnect:849 standalone/drakconnect:936
+#: standalone/drakconnect:1035 standalone/drakfont:576 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:409 ugtk2.pm:506
+#: ugtk2.pm:900 ugtk2.pm:923
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
-#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:826 interactive.pm:425 interactive/gtk.pm:772
 #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
 #: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
-#: standalone/drakautoinst:217 standalone/drakbackup:3888
-#: standalone/drakbackup:3892 standalone/drakbackup:3950
-#: standalone/drakconnect:164 standalone/drakconnect:935
-#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
-#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
-#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3579
+#: standalone/drakautoinst:217 standalone/drakbackup:3893
+#: standalone/drakbackup:3897 standalone/drakbackup:3955
+#: standalone/drakconnect:164 standalone/drakconnect:934
+#: standalone/drakconnect:1034 standalone/drakfont:668 standalone/drakfont:745
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343
+#: ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:900
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
-#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
-#: standalone/drakbackup:3884 standalone/drakbug:128
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:519
+#: interactive/gtk.pm:638 interactive/gtk.pm:640 standalone/drakTermServ:284
+#: standalone/drakbackup:3889 standalone/drakbug:104
 #: standalone/drakconnect:160 standalone/drakconnect:245
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
-#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
-#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
+#: standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:336
+#: standalone/draksec:338 standalone/draksec:356 standalone/draksec:358
+#: ugtk2.pm:1031 ugtk2.pm:1032
 #, c-format
 msgid "Help"
 msgstr "求助"
@@ -642,12 +646,12 @@ msgstr ""
 "%s\n"
 "試著改變某些參數"
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d 秒後離開"
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "這是正確設定值嗎?"
@@ -747,20 +751,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "您的電視用什麼標準?"
 
-#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
-#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
-#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
-#: standalone/service_harddrake:199
+#: any.pm:140 harddrake/sound.pm:191 install_any.pm:652 interactive.pm:462
+#: standalone/drakconnect:167 standalone/drakconnect:613 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:231
+#: standalone/service_harddrake:204
 #, c-format
 msgid "Please wait"
 msgstr "請稍候"
 
-#: any.pm:116
+#: any.pm:140
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "開機載入器安裝中"
 
-#: any.pm:127
+#: any.pm:151
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -771,16 +775,16 @@ msgid ""
 "Assign a new Volume ID?"
 msgstr ""
 
-#: any.pm:138
+#: any.pm:162
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "開機程式安裝失敗, 發生如下之錯誤："
 
-#: any.pm:144
+#: any.pm:168
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" enable the bootloader.  If you do not see the bootloader prompt at\n"
 " reboot, hold down Command-Option-O-F at reboot and enter:\n"
 " setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
@@ -793,7 +797,7 @@ msgstr ""
 "然後再輸入: shut-down\n"
 "然後你下一次開機時應該就可以看到開機啟動程式的訊息了。"
 
-#: any.pm:181
+#: any.pm:206
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -808,259 +812,257 @@ msgstr ""
 "\n"
 "您正用那顆硬碟開機呢?"
 
-#: any.pm:204 help.pm:739
+#: any.pm:229 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "硬碟的第一個扇區 (MBR)"
 
-#: any.pm:205
+#: any.pm:230
 #, c-format
 msgid "First sector of the root partition"
 msgstr "根分隔區的第一扇區"
 
-#: any.pm:207
+#: any.pm:232
 #, c-format
 msgid "On Floppy"
 msgstr "在軟碟機"
 
-#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
+#: any.pm:234 help.pm:739 printer/printerdrake.pm:3962
 #, c-format
 msgid "Skip"
 msgstr "略過"
 
-#: any.pm:213
+#: any.pm:238
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/GRUB 安裝"
 
-#: any.pm:214
+#: any.pm:239
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "您要將開機載入器安裝在那裡?"
 
-#: any.pm:239 standalone/drakboot:307
+#: any.pm:264 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "開機樣式組態設定"
 
-#: any.pm:241 any.pm:275
+#: any.pm:266 any.pm:298
 #, c-format
 msgid "Bootloader main options"
 msgstr "開機載入器主要選項"
 
-#: any.pm:245
+#: any.pm:270
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "輸入記憶體大小 (以 MB 為單位)"
 
-#: any.pm:247
+#: any.pm:272
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "選項 ``限制命令列選項'' 在沒有設定密碼的情況下會無用"
 
-#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176
 #, c-format
 msgid "The passwords do not match"
 msgstr "密碼不符合"
 
-#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
-#: install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176 diskdrake/interactive.pm:1270
 #, c-format
 msgid "Please try again"
 msgstr "請再試一次"
 
-#: any.pm:253 any.pm:278
+#: any.pm:278 any.pm:301
 #, c-format
 msgid "Bootloader to use"
 msgstr "要用的開機載入器"
 
-#: any.pm:255 any.pm:280
+#: any.pm:280 any.pm:303
 #, c-format
 msgid "Boot device"
 msgstr "開機裝置"
 
-#: any.pm:257
+#: any.pm:282
 #, c-format
 msgid "Delay before booting default image"
 msgstr "在開機到預設的影像前的延遲"
 
-#: any.pm:258
+#: any.pm:283
 #, c-format
 msgid "Enable ACPI"
 msgstr "啟用 ACPI"
 
-#: any.pm:260
+#: any.pm:285
 #, c-format
 msgid "Force no APIC"
 msgstr "強制無 APIC"
 
-#: any.pm:262
+#: any.pm:287
 #, c-format
 msgid "Force No Local APIC"
 msgstr "強制無本地端 APIC"
 
-#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1220 network/netconnect.pm:595
-#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
-#: standalone/drakbackup:1647 standalone/drakbackup:3490
-#: standalone/drakups:295
+#: any.pm:289 any.pm:633 authentication.pm:181 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:633 printer/printerdrake.pm:1596
+#: printer/printerdrake.pm:1716 standalone/drakbackup:1653
+#: standalone/drakbackup:3495 standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "密碼"
 
-#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
+#: any.pm:290 any.pm:634 authentication.pm:182
 #, c-format
 msgid "Password (again)"
 msgstr "密碼 (再一次)"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "Restrict command line options"
 msgstr "限制命令列選項"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "restrict"
 msgstr "限制"
 
-#: any.pm:268
+#: any.pm:293
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次開機時清理 /tmp"
 
-#: any.pm:269
+#: any.pm:294
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "需要的話, 輸入精確的記憶體大小 (找到 %d MB)"
 
-#: any.pm:279
+#: any.pm:302
 #, c-format
 msgid "Init Message"
 msgstr "啟動訊息"
 
-#: any.pm:281
+#: any.pm:304
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "開啟 Firmware 延遲"
 
-#: any.pm:282
+#: any.pm:305
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心啟動時間逾時"
 
-#: any.pm:283
+#: any.pm:306
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允許 CD 開機?"
 
-#: any.pm:284
+#: any.pm:307
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "允許 OF 開機?"
 
-#: any.pm:285
+#: any.pm:308
 #, c-format
 msgid "Default OS?"
 msgstr "預設 OS?"
 
-#: any.pm:338
+#: any.pm:361
 #, c-format
 msgid "Image"
 msgstr "影像"
 
-#: any.pm:339 any.pm:349
+#: any.pm:362 any.pm:372
 #, c-format
 msgid "Root"
-msgstr ""
+msgstr "根目錄"
 
-#: any.pm:340 any.pm:362
+#: any.pm:363 any.pm:385
 #, c-format
 msgid "Append"
 msgstr "附加"
 
-#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:365 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "視訊模式"
 
-#: any.pm:344
+#: any.pm:367
 #, c-format
 msgid "Initrd"
 msgstr ""
 
-#: any.pm:345
+#: any.pm:368
 #, c-format
 msgid "Network profile"
 msgstr "網路 profile"
 
-#: any.pm:354 any.pm:359 any.pm:361
+#: any.pm:377 any.pm:382 any.pm:384
 #, c-format
 msgid "Label"
 msgstr "標籤"
 
-#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: any.pm:379 any.pm:389 harddrake/v4l.pm:275 standalone/drakfloppy:84
 #: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "預設"
 
-#: any.pm:363
+#: any.pm:386
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd-大小"
 
-#: any.pm:365
+#: any.pm:388
 #, c-format
 msgid "NoVideo"
 msgstr ""
 
-#: any.pm:376
+#: any.pm:399
 #, c-format
 msgid "Empty label not allowed"
 msgstr "標籤空白不被允許"
 
-#: any.pm:377
+#: any.pm:400
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您需要指定一個核心影像"
 
-#: any.pm:377
+#: any.pm:400
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您需要指定一個 root 分割區"
 
-#: any.pm:378
+#: any.pm:401
 #, c-format
 msgid "This label is already used"
 msgstr "這個標籤已經被用過了"
 
-#: any.pm:392
+#: any.pm:415
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "您要新增哪一類的項目?"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Linux"
-msgstr ""
+msgstr "Linux"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其他作業系統 (SunOS...)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其他作業系統 (MacOS...)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其他作業系統 (Windows...)"
 
-#: any.pm:422
+#: any.pm:445
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1069,73 +1071,73 @@ msgstr ""
 "到此為止有這些選項於您的開機選單.\n"
 "您可以建立多的選項或修改既有的選項."
 
-#: any.pm:572
+#: any.pm:592
 #, c-format
 msgid "access to X programs"
 msgstr "存取 X 程式"
 
-#: any.pm:573
+#: any.pm:593
 #, c-format
 msgid "access to rpm tools"
 msgstr "存取 rpm 工具程式"
 
-#: any.pm:574
+#: any.pm:594
 #, c-format
 msgid "allow \"su\""
 msgstr "允許 \"su\""
 
-#: any.pm:575
+#: any.pm:595
 #, c-format
 msgid "access to administrative files"
 msgstr "存取管理權限的的檔案"
 
-#: any.pm:576
+#: any.pm:596
 #, c-format
 msgid "access to network tools"
 msgstr "存取網路工具"
 
-#: any.pm:577
+#: any.pm:597
 #, c-format
 msgid "access to compilation tools"
 msgstr "存取編譯工具"
 
-#: any.pm:582
+#: any.pm:602
 #, c-format
 msgid "(already added %s)"
 msgstr "( %s 已經加入)"
 
-#: any.pm:587
+#: any.pm:607
 #, c-format
 msgid "This password is too simple"
 msgstr "這密碼太簡單了"
 
-#: any.pm:588
+#: any.pm:608
 #, c-format
 msgid "Please give a user name"
 msgstr "請輸入使用者名稱"
 
-#: any.pm:589
+#: any.pm:609
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "使用者名稱只能含有小寫英文字母, 數字, `-' 與 `_'"
 
-#: any.pm:590
+#: any.pm:610
 #, c-format
 msgid "The user name is too long"
 msgstr "這個使用者名稱太長了"
 
-#: any.pm:591
+#: any.pm:611
 #, c-format
 msgid "This user name has already been added"
 msgstr "這個使用者早就已經被加入過了"
 
-#: any.pm:595
+#: any.pm:615
 #, c-format
 msgid "Add user"
 msgstr "新增使用者"
 
-#: any.pm:596
+#: any.pm:616
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1144,77 +1146,77 @@ msgstr ""
 "輸入一位使用者\n"
 "%s"
 
-#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: any.pm:619 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
 #: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
 #: interactive/http.pm:151 printer/printerdrake.pm:191
-#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
-#: standalone/drakbackup:2703 standalone/scannerdrake:637
-#: standalone/scannerdrake:787
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4742
+#: standalone/drakbackup:2708 standalone/scannerdrake:668
+#: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
 msgstr "完成"
 
-#: any.pm:600 help.pm:51
+#: any.pm:620 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "接受使用者"
 
-#: any.pm:611
+#: any.pm:631
 #, c-format
 msgid "Real name"
 msgstr "真實名稱"
 
-#: any.pm:612 standalone/drakbackup:1642
+#: any.pm:632 standalone/drakbackup:1648
 #, c-format
 msgid "Login name"
 msgstr "登入名稱"
 
-#: any.pm:615
+#: any.pm:635
 #, c-format
 msgid "Shell"
 msgstr "命令殼"
 
-#: any.pm:617
+#: any.pm:637
 #, c-format
 msgid "Icon"
 msgstr "圖示"
 
-#: any.pm:664 security/l10n.pm:14
+#: any.pm:684 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自動登入"
 
-#: any.pm:665
+#: any.pm:685
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "我能夠設定您的電腦自動以某個使用者身份登入系統."
 
-#: any.pm:666 help.pm:51
+#: any.pm:686 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "您想要使用這個功能嗎?"
 
-#: any.pm:667
+#: any.pm:687
 #, c-format
 msgid "Choose the default user:"
 msgstr "選取預設的使用者:"
 
-#: any.pm:668
+#: any.pm:688
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "選取您想使用的視窗管理員:"
 
-#: any.pm:680
+#: any.pm:700
 #, c-format
 msgid "Please choose a language to use."
 msgstr "請選擇要使用那個語系."
 
-#: any.pm:681
+#: any.pm:701
 #, c-format
 msgid "Language choice"
 msgstr "語言選擇"
 
-#: any.pm:707
+#: any.pm:727
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1224,57 +1226,59 @@ msgstr ""
 "Mandrakelinux 能支援多種語言. 選擇您想安裝的語言.\n"
 "他們將可使用於您的安裝完成與您重新開始您的系統之後."
 
-#: any.pm:725 help.pm:647
+#: any.pm:746 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "預設使用 Unicode"
 
-#: any.pm:726 help.pm:647
+#: any.pm:747 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "所有語言"
 
-#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
+#: any.pm:786 help.pm:566 help.pm:855 install_steps_interactive.pm:946
 #, c-format
 msgid "Country / Region"
 msgstr "國家/地區"
 
-#: any.pm:766
+#: any.pm:787
 #, c-format
 msgid "Please choose your country."
 msgstr "請選擇您的國家."
 
-#: any.pm:768
+#: any.pm:789
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "以下是全部可用的所有的國家清單"
 
-#: any.pm:769
+#: any.pm:790
 #, c-format
 msgid "Other Countries"
 msgstr "其他國家"
 
-#: any.pm:777
+#: any.pm:798
 #, c-format
 msgid "Input method:"
 msgstr "輸入方式:"
 
-#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#: any.pm:799 install_any.pm:388 network/netconnect.pm:323
+#: network/netconnect.pm:328 printer/printerdrake.pm:99
+#: printer/printerdrake.pm:2111
 #, c-format
 msgid "None"
 msgstr "無"
 
-#: any.pm:912
+#: any.pm:914
 #, c-format
 msgid "No sharing"
 msgstr "不分享"
 
-#: any.pm:912
+#: any.pm:914
 #, c-format
 msgid "Allow all users"
 msgstr "允許所有使用者"
 
-#: any.pm:916
+#: any.pm:918
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1289,42 +1293,42 @@ msgstr ""
 "\n"
 "\"Custom\" 允許每一個使用者粒度.\n"
 
-#: any.pm:928
+#: any.pm:930
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 傳統 Unix 檔案分享系統, 跟著少的 Mac 與 Windows 支援."
 
-#: any.pm:931
+#: any.pm:933
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr "SMB: 一個 Windows, Mac OS X 與許多先進的 Linux 系統用的檔案分享系統."
 
-#: any.pm:939
+#: any.pm:941
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您能夠用 NFS 或者是 SMB 匯出. 請選擇您想要用那一個."
 
-#: any.pm:964
+#: any.pm:966
 #, c-format
 msgid "Launch userdrake"
 msgstr "啟動 userdrake"
 
-#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
-#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
-#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
-#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
-#: standalone/drakfont:594 standalone/net_monitor:123
-#: standalone/printerdrake:559
+#: any.pm:966 printer/printerdrake.pm:3802 printer/printerdrake.pm:3805
+#: printer/printerdrake.pm:3806 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:5036 standalone/drakTermServ:294
+#: standalone/drakbackup:4089 standalone/drakbug:126 standalone/drakfont:499
+#: standalone/drakfont:595 standalone/net_monitor:123
+#: standalone/printerdrake:547
 #, c-format
 msgid "Close"
 msgstr "關閉"
 
-#: any.pm:966
+#: any.pm:968
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1341,183 +1345,189 @@ msgstr "本地端檔案"
 #: authentication.pm:17
 #, c-format
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #: authentication.pm:18
 #, c-format
 msgid "NIS"
+msgstr "NIS"
+
+#: authentication.pm:19
+#, c-format
+msgid "Smart Card"
 msgstr ""
 
-#: authentication.pm:19 authentication.pm:127
+#: authentication.pm:20 authentication.pm:148
 #, c-format
 msgid "Windows Domain"
 msgstr "Windows 網域"
 
-#: authentication.pm:20
+#: authentication.pm:21
 #, c-format
 msgid "Active Directory with SFU"
 msgstr ""
 
-#: authentication.pm:21
+#: authentication.pm:22
 #, c-format
 msgid "Active Directory with Winbind"
 msgstr ""
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, c-format
 msgid "Local file:"
 msgstr "本地端檔案:"
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, c-format
 msgid ""
 "Use local for all authentication and information user tell in local file"
 msgstr ""
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, c-format
 msgid "LDAP:"
 msgstr "LDAP:"
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, c-format
 msgid ""
 "Tells your computer to use LDAP for some or all authentication. LDAP "
 "consolidates certain types of information within your organization."
 msgstr ""
 
-#: authentication.pm:32
+#: authentication.pm:53
 #, c-format
 msgid "NIS:"
 msgstr "NIS:"
 
-#: authentication.pm:32
+#: authentication.pm:53
 #, c-format
 msgid ""
 "Allows you to run a group of computers in the same Network Information "
 "Service domain with a common password and group file."
 msgstr ""
 
-#: authentication.pm:33
+#: authentication.pm:54
 #, c-format
 msgid "Windows Domain:"
-msgstr "Windows 網域:"
+msgstr "Windows 網域："
 
-#: authentication.pm:33
+#: authentication.pm:54
 #, c-format
 msgid ""
 "Winbind allows the system to retrieve information and authenticate users in "
 "a Windows domain."
 msgstr ""
 
-#: authentication.pm:34
+#: authentication.pm:55
 #, c-format
 msgid "Active Directory with SFU:"
 msgstr ""
 
-#: authentication.pm:34 authentication.pm:35
+#: authentication.pm:55 authentication.pm:56
 #, c-format
 msgid ""
 "Kerberos is a secure system for providing network authentication services."
 msgstr ""
 
-#: authentication.pm:35
+#: authentication.pm:56
 #, c-format
 msgid "Active Directory with Winbind:"
 msgstr ""
 
-#: authentication.pm:60
+#: authentication.pm:81
 #, c-format
 msgid "Authentication LDAP"
 msgstr "LDAP 認證"
 
-#: authentication.pm:61
+#: authentication.pm:82
 #, c-format
 msgid "LDAP Base dn"
 msgstr ""
 
-#: authentication.pm:62 share/compssUsers.pl:101
+#: authentication.pm:83 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
-#: authentication.pm:75 fsedit.pm:21
+#: authentication.pm:96 fsedit.pm:21
 #, c-format
 msgid "simple"
 msgstr "簡單"
 
-#: authentication.pm:76
+#: authentication.pm:97
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: authentication.pm:77
+#: authentication.pm:98
 #, c-format
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
-#: authentication.pm:78
+#: authentication.pm:99
 #, c-format
 msgid "security layout (SASL/Kerberos)"
 msgstr "安全性佈置 (SASL/Kerberos)"
 
-#: authentication.pm:85 authentication.pm:123
+#: authentication.pm:106 authentication.pm:144
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Active Directory 認證"
 
-#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:107 authentication.pm:146 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "網域"
 
-#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: authentication.pm:109 diskdrake/dav.pm:63 help.pm:146
 #: printer/printerdrake.pm:135 share/compssUsers.pl:81
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Server"
 msgstr "伺服器"
 
-#: authentication.pm:89
+#: authentication.pm:110
 #, c-format
 msgid "LDAP users database"
 msgstr "LDAP 使用者資料庫"
 
-#: authentication.pm:90
+#: authentication.pm:111
 #, c-format
 msgid "Use Anonymous BIND "
 msgstr ""
 
-#: authentication.pm:91
+#: authentication.pm:112
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr ""
 
-#: authentication.pm:92
+#: authentication.pm:113
 #, c-format
 msgid "Password for user"
 msgstr "使用者密碼"
 
-#: authentication.pm:93
+#: authentication.pm:114
 #, c-format
 msgid "Encryption"
 msgstr "加密"
 
-#: authentication.pm:104
+#: authentication.pm:125
 #, c-format
 msgid "Authentication NIS"
 msgstr "NIS 認證"
 
-#: authentication.pm:105
+#: authentication.pm:126
 #, c-format
 msgid "NIS Domain"
 msgstr "NIS 網域"
 
-#: authentication.pm:106
+#: authentication.pm:127
 #, c-format
 msgid "NIS Server"
 msgstr "NIS 伺服器"
 
-#: authentication.pm:111
+#: authentication.pm:132
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1543,38 +1553,70 @@ msgstr ""
 "號與密碼.\n"
 "最後使用 'wbinfo -t' 測試確認認證功能是否可以正常工作."
 
-#: authentication.pm:123
+#: authentication.pm:144
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Windows 網域認證"
 
-#: authentication.pm:128
+#: authentication.pm:149
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "網域管理使用者名稱"
 
-#: authentication.pm:129
+#: authentication.pm:150
 #, c-format
 msgid "Domain Admin Password"
 msgstr "網域管理密碼"
 
-#: authentication.pm:130
+#: authentication.pm:151
 #, c-format
 msgid "Use Idmap for store UID/SID "
 msgstr ""
 
-#: authentication.pm:131
+#: authentication.pm:152
 #, c-format
 msgid "Default Idmap "
 msgstr "預設 Idmap"
 
-#: authentication.pm:231
+#: authentication.pm:165
+#, c-format
+msgid "Set administrator (root) password and network authentication methods"
+msgstr ""
+
+#: authentication.pm:166
+#, fuzzy, c-format
+msgid "Set administrator (root) password"
+msgstr "設定 root 密碼"
+
+#: authentication.pm:167 standalone/drakvpn:1125
+#, fuzzy, c-format
+msgid "Authentication method"
+msgstr "認證方式"
+
+#. -PO: keep this short or else the buttons will not fit in the window
+#: authentication.pm:172 help.pm:722
+#, c-format
+msgid "No password"
+msgstr "沒有密碼"
+
+#: authentication.pm:178
+#, c-format
+msgid "This password is too short (it must be at least %d characters long)"
+msgstr "這個密碼太短了 (一定至少要有 %d 個字元才行)"
+
+#: authentication.pm:183 network/netconnect.pm:328 network/netconnect.pm:634
+#: standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:459
+#, c-format
+msgid "Authentication"
+msgstr "認證方式"
+
+#: authentication.pm:296
 #, c-format
-msgid "Can't use broadcast with no NIS domain"
+msgid "Can not use broadcast with no NIS domain"
 msgstr "沒有 NIS 網域無法使用廣播 (broadcast)"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:673
+#: bootloader.pm:728
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1589,51 +1631,51 @@ msgstr ""
 "等待預設開機.\n"
 "\n"
 
-#: bootloader.pm:787
+#: bootloader.pm:815
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO 圖形介面菜單"
 
-#: bootloader.pm:788
+#: bootloader.pm:816
 #, c-format
 msgid "LILO with text menu"
-msgstr "LILO 文字菜單"
+msgstr "LILO 文字選單"
 
-#: bootloader.pm:789
+#: bootloader.pm:817
 #, c-format
 msgid "Grub"
-msgstr ""
+msgstr "Grub"
 
-#: bootloader.pm:790
+#: bootloader.pm:818
 #, c-format
 msgid "Yaboot"
 msgstr ""
 
-#: bootloader.pm:852
+#: bootloader.pm:881
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 沒有足夠的空間"
 
-#: bootloader.pm:1266
+#: bootloader.pm:1295
 #, c-format
-msgid "You can't install the bootloader on a %s partition\n"
+msgid "You can not install the bootloader on a %s partition\n"
 msgstr "您不能把開機載入器安裝在 %s 分割區上\n"
 
-#: bootloader.pm:1311
+#: bootloader.pm:1340
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "您的開機載入器設定必須要更新因為分割區已經被重新編號"
 
-#: bootloader.pm:1326
+#: bootloader.pm:1355
 #, c-format
 msgid ""
-"The bootloader can't be installed correctly. You have to boot rescue and "
+"The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "開機載入器不能被正確的安裝. 你必須以 rescue 開機且選擇 \"%s\""
 
-#: bootloader.pm:1327
+#: bootloader.pm:1356
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安裝開機載入器"
@@ -1641,22 +1683,22 @@ msgstr "重新安裝開機載入器"
 #: common.pm:125
 #, c-format
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
 #: common.pm:125
 #, c-format
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: common.pm:125
 #, c-format
 msgid "GB"
-msgstr ""
+msgstr "GB"
 
 #: common.pm:133
 #, c-format
 msgid "TB"
-msgstr ""
+msgstr "TB"
 
 #: common.pm:141
 #, c-format
@@ -1673,94 +1715,115 @@ msgstr "1 分鐘"
 msgid "%d seconds"
 msgstr "%d 秒"
 
-#: common.pm:197
-#, c-format
-msgid "Can't make screenshots before partitioning"
-msgstr "在尚未進行分割前無法提供畫面捕捉功能"
-
-#: common.pm:204
-#, c-format
-msgid "Screenshots will be available after install in %s"
-msgstr "在安裝於 %s 後就能夠提供畫面捕捉功能"
-
-#: common.pm:269
+#: common.pm:240
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu 遺失"
 
-#: common.pm:272
+#: common.pm:243
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelper 遺失"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
-#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
-#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
-#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
-#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
-#: network/netconnect.pm:47
-#, c-format
-msgid "France"
-msgstr "法國"
-
-#: crypto.pm:15 lang.pm:229
+#: crypto.pm:14 crypto.pm:43 lang.pm:202 network/adsl_consts.pm:50
+#: network/adsl_consts.pm:58 network/adsl_consts.pm:66
 #, c-format
-msgid "Costa Rica"
-msgstr "哥斯大黎加"
+msgid "Austria"
+msgstr "澳洲"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
-#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
-#: network/adsl_consts.pm:85 network/netconnect.pm:50
+#: crypto.pm:15 crypto.pm:34 lang.pm:209 network/adsl_consts.pm:74
+#: network/adsl_consts.pm:82 network/adsl_consts.pm:93
+#: network/adsl_consts.pm:101 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr "比利時"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:235
+#: crypto.pm:16 lang.pm:230 network/adsl_consts.pm:780
+#: network/adsl_consts.pm:788 network/adsl_consts.pm:798
+#, c-format
+msgid "Switzerland"
+msgstr "Switzerland"
+
+#: crypto.pm:17 lang.pm:237
+#, c-format
+msgid "Costa Rica"
+msgstr "哥斯大黎加"
+
+#: crypto.pm:18 crypto.pm:35 lang.pm:243 network/adsl_consts.pm:319
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
-#: network/adsl_consts.pm:418
+#: crypto.pm:19 crypto.pm:36 lang.pm:244 network/adsl_consts.pm:437
+#: network/adsl_consts.pm:445
 #, c-format
 msgid "Germany"
 msgstr "德國"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
+#: crypto.pm:20 crypto.pm:33 lang.pm:262 network/adsl_consts.pm:343
+#: network/adsl_consts.pm:354 network/adsl_consts.pm:365
+#: network/adsl_consts.pm:375 network/adsl_consts.pm:385
+#: network/adsl_consts.pm:396 network/adsl_consts.pm:407
+#: network/adsl_consts.pm:417 network/adsl_consts.pm:427
+#: network/netconnect.pm:47
+#, c-format
+msgid "France"
+msgstr "法國"
+
+#: crypto.pm:21 crypto.pm:37 lang.pm:275 network/adsl_consts.pm:455
 #, c-format
 msgid "Greece"
 msgstr "希臘"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:340
+#: crypto.pm:22 lang.pm:286 network/adsl_consts.pm:463
 #, c-format
-msgid "Norway"
-msgstr "挪威"
+msgid "Hungary"
+msgstr "匈牙利"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
+#: crypto.pm:23 crypto.pm:42 lang.pm:295 network/adsl_consts.pm:489
+#: network/adsl_consts.pm:499 network/adsl_consts.pm:509
+#: network/adsl_consts.pm:517 network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
-msgid "Sweden"
-msgstr "瑞典"
+msgid "Italy"
+msgstr "義大利"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
-#: network/netconnect.pm:48
+#: crypto.pm:24 crypto.pm:41 lang.pm:347 network/adsl_consts.pm:545
+#: network/adsl_consts.pm:553 network/adsl_consts.pm:561
+#: network/adsl_consts.pm:569 network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
-#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
-#: network/netconnect.pm:49 standalone/drakxtv:47
+#: crypto.pm:25 crypto.pm:38 lang.pm:348 network/adsl_consts.pm:577
+#: network/adsl_consts.pm:582 network/adsl_consts.pm:587
+#: network/adsl_consts.pm:592 network/adsl_consts.pm:597
+#: network/adsl_consts.pm:602 network/adsl_consts.pm:607
 #, c-format
-msgid "Italy"
-msgstr "義大利"
+msgid "Norway"
+msgstr "挪威"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
-#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
+#: crypto.pm:26 lang.pm:360 network/adsl_consts.pm:614
+#: network/adsl_consts.pm:624
 #, c-format
-msgid "Austria"
-msgstr "澳洲"
+msgid "Poland"
+msgstr "波蘭"
+
+#: crypto.pm:27 crypto.pm:39 lang.pm:377 network/adsl_consts.pm:772
+#, c-format
+msgid "Sweden"
+msgstr "瑞典"
+
+#: crypto.pm:28 lang.pm:382
+#, c-format
+msgid "Slovakia"
+msgstr "Slovakia"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
+#: crypto.pm:29 lang.pm:406
+#, c-format
+msgid "Taiwan"
+msgstr "台灣"
+
+#: crypto.pm:40 crypto.pm:75 lang.pm:411 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "美國"
@@ -1779,18 +1842,18 @@ msgstr ""
 msgid "New"
 msgstr "新增"
 
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:443 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "卸載"
 
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:440 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "掛載"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
-#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:435
+#: diskdrake/interactive.pm:653 diskdrake/interactive.pm:672
 #: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
@@ -1811,13 +1874,13 @@ msgstr "URL 格式必須為 http:// 或是 https://"
 msgid "Server: "
 msgstr "伺服器:"
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:504
+#: diskdrake/interactive.pm:1166 diskdrake/interactive.pm:1241
 #, c-format
 msgid "Mount point: "
 msgstr "掛載點:"
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1248
 #, c-format
 msgid "Options: %s"
 msgstr "選項: %s"
@@ -1863,8 +1926,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "請點選一個分割區"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
-#: standalone/drakbackup:2938 standalone/drakbackup:2998
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
+#: standalone/drakbackup:2943 standalone/drakbackup:3003
 #, c-format
 msgid "Details"
 msgstr "詳細資訊"
@@ -1874,206 +1937,214 @@ msgstr "詳細資訊"
 msgid "No hard drives found"
 msgstr "找不到硬碟裝置"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Ext2"
-msgstr ""
+msgstr "Ext2"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Journalised FS"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Swap"
-msgstr ""
+msgstr "Swap"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "SunOS"
-msgstr ""
+msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "HFS"
-msgstr ""
+msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Windows"
 msgstr "視窗"
 
-#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
-#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:284 mouse.pm:168
+#: services.pm:162 standalone/drakbackup:1609 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "其他"
 
-#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1181
 #, c-format
 msgid "Empty"
 msgstr "空白"
 
-#: diskdrake/hd_gtk.pm:330
+#: diskdrake/hd_gtk.pm:343
 #, c-format
 msgid "Filesystem types:"
 msgstr "檔案系統格式:"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:362 diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "用 ``%s'' 代替"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:459
+#, c-format
+msgid "Create"
+msgstr "建立"
+
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368
+#: diskdrake/interactive.pm:436 diskdrake/interactive.pm:606
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
-#: standalone/harddrake2:101
+#: standalone/harddrake2:106 standalone/harddrake2:115
 #, c-format
 msgid "Type"
 msgstr "格式"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
-#, c-format
-msgid "Create"
-msgstr "建立"
-
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
-#: standalone/drakperm:124 standalone/printerdrake:242
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:444
+#: standalone/drakperm:124 standalone/printerdrake:235
 #, c-format
 msgid "Delete"
 msgstr "刪除"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "要先 ``Unmount''"
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, c-format
 msgid "Choose another partition"
 msgstr "選擇另一個分割區"
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, c-format
 msgid "Choose a partition"
 msgstr "選擇一個分割區"
 
-#: diskdrake/interactive.pm:216
+#: diskdrake/interactive.pm:220
 #, c-format
 msgid "Exit"
 msgstr "離開"
 
-#: diskdrake/interactive.pm:249 help.pm:530
+#: diskdrake/interactive.pm:253 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "復原"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "切換到一般模式"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "切換到專家模式"
 
-#: diskdrake/interactive.pm:268
+#: diskdrake/interactive.pm:272
 #, c-format
 msgid "Continue anyway?"
 msgstr "不管如何都要繼續嗎?"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:275
+#, c-format
+msgid ""
+"You should format partition %s.\n"
+"Otherwise no entry for mount point %s will be written in fstab.\n"
+"Quit anyway?"
+msgstr ""
+
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without saving"
 msgstr "不儲存就離開"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "放棄寫入硬碟分割表就離開?"
 
-#: diskdrake/interactive.pm:278
+#: diskdrake/interactive.pm:287
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "您想要儲存 /etc/fstab 檔案的修改嗎?"
 
-#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
+#: diskdrake/interactive.pm:294 install_steps_interactive.pm:329
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "您須要重新開機以使更動過的硬碟分割表生效"
 
-#: diskdrake/interactive.pm:298 help.pm:530
+#: diskdrake/interactive.pm:307 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "全部清除"
 
-#: diskdrake/interactive.pm:299 help.pm:530
+#: diskdrake/interactive.pm:308 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "自動分配"
 
-#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
-#: help.pm:855 install_steps_interactive.pm:124
+#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:122
 #, c-format
 msgid "More"
 msgstr "更多"
 
-#: diskdrake/interactive.pm:305
+#: diskdrake/interactive.pm:314
 #, c-format
 msgid "Hard drive information"
 msgstr "硬碟資訊"
 
-#: diskdrake/interactive.pm:337
+#: diskdrake/interactive.pm:346
 #, c-format
 msgid "All primary partitions are used"
 msgstr "主分割區數目已經全被用了"
 
-#: diskdrake/interactive.pm:338
+#: diskdrake/interactive.pm:347
 #, c-format
-msgid "I can't add any more partitions"
+msgid "I can not add any more partitions"
 msgstr "我無法再新增任何分割區了"
 
-#: diskdrake/interactive.pm:339
+#: diskdrake/interactive.pm:348
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr "需要有更多的分割區的話, 請刪除一個主分割區以建立延伸分割區"
 
-#: diskdrake/interactive.pm:350 help.pm:530
+#: diskdrake/interactive.pm:359 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "寫入硬碟分割表"
 
-#: diskdrake/interactive.pm:351 help.pm:530
+#: diskdrake/interactive.pm:360 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "回存硬碟分割表"
 
-#: diskdrake/interactive.pm:352 help.pm:530
+#: diskdrake/interactive.pm:361 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "搶救硬碟分割表"
 
-#: diskdrake/interactive.pm:354 help.pm:530
+#: diskdrake/interactive.pm:363 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "重新載入硬碟分割表"
 
-#: diskdrake/interactive.pm:356
+#: diskdrake/interactive.pm:365
 #, c-format
 msgid "Removable media automounting"
 msgstr "可移除式裝置自動掛載"
 
-#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
+#: diskdrake/interactive.pm:376 diskdrake/interactive.pm:402
 #, c-format
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: diskdrake/interactive.pm:372
+#: diskdrake/interactive.pm:388
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -2082,120 +2153,90 @@ msgstr ""
 "備份的硬碟分割表有不一樣的大小\n"
 "還要繼續?"
 
-#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
-#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
-#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
-#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
-#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
-#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
-#: standalone/drakTermServ:315 standalone/drakTermServ:1045
-#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
-#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
-#: standalone/drakclock:225 standalone/drakconnect:972
-#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
-#: standalone/scannerdrake:909
-#, c-format
-msgid "Warning"
-msgstr "警告"
-
-#: diskdrake/interactive.pm:387
-#, c-format
-msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
-msgstr ""
-"插入一個軟碟片\n"
-"所有在這片軟碟中的資料都將遺失"
-
-#: diskdrake/interactive.pm:398
+#: diskdrake/interactive.pm:417
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "正在試圖救回硬碟分割表"
 
-#: diskdrake/interactive.pm:404
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Detailed information"
 msgstr "詳細資訊"
 
-#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:438 diskdrake/interactive.pm:743
 #, c-format
 msgid "Resize"
 msgstr "重新變更大小"
 
-#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
-#, c-format
-msgid "Move"
-msgstr "移動"
-
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:439
 #, c-format
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:441
 #, c-format
 msgid "Add to RAID"
 msgstr "加入到磁碟陣列"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:442
 #, c-format
 msgid "Add to LVM"
 msgstr "加入到 LVM"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:445
 #, c-format
 msgid "Remove from RAID"
 msgstr "由磁碟陣列中移除"
 
-#: diskdrake/interactive.pm:428
+#: diskdrake/interactive.pm:446
 #, c-format
 msgid "Remove from LVM"
 msgstr "由 LVM 中移除"
 
-#: diskdrake/interactive.pm:429
+#: diskdrake/interactive.pm:447
 #, c-format
 msgid "Modify RAID"
 msgstr "變更磁碟陣列"
 
-#: diskdrake/interactive.pm:430
+#: diskdrake/interactive.pm:448
 #, c-format
 msgid "Use for loopback"
 msgstr "作為 loopback"
 
-#: diskdrake/interactive.pm:472
+#: diskdrake/interactive.pm:497
 #, c-format
 msgid "Create a new partition"
 msgstr "建立新的分割區"
 
-#: diskdrake/interactive.pm:475
+#: diskdrake/interactive.pm:500
 #, c-format
 msgid "Start sector: "
 msgstr "開始的磁區:"
 
-#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:502 diskdrake/interactive.pm:899
 #, c-format
 msgid "Size in MB: "
 msgstr "大小 (MB):"
 
-#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:503 diskdrake/interactive.pm:900
 #, c-format
 msgid "Filesystem type: "
 msgstr "檔案系統格式:"
 
-#: diskdrake/interactive.pm:483
+#: diskdrake/interactive.pm:508
 #, c-format
 msgid "Preference: "
 msgstr "偏好設定:"
 
-#: diskdrake/interactive.pm:486
+#: diskdrake/interactive.pm:511
 #, c-format
 msgid "Logical volume name "
 msgstr "邏輯容量名稱"
 
-#: diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:541
 #, c-format
 msgid ""
-"You can't create a new partition\n"
+"You can not create a new partition\n"
 "(since you reached the maximal number of primary partitions).\n"
 "First remove a primary partition and create an extended partition."
 msgstr ""
@@ -2203,235 +2244,210 @@ msgstr ""
 "(因為你達到主分割區的最大值).\n"
 "您需要先移除一個主分割區然後建立一個延伸分割區."
 
-#: diskdrake/interactive.pm:545
+#: diskdrake/interactive.pm:571
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "移除 loopback 檔案?"
 
-#: diskdrake/interactive.pm:564
+#: diskdrake/interactive.pm:590
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "改變分割區 %s 的格式以後, 所有在這個分割區上的資料都會遺失"
 
-#: diskdrake/interactive.pm:576
+#: diskdrake/interactive.pm:602
 #, c-format
 msgid "Change partition type"
 msgstr "改變分割區格式"
 
-#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:603 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "您要用那一種檔案系統?"
 
-#: diskdrake/interactive.pm:585
+#: diskdrake/interactive.pm:611
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "由 ext2 正在切換到 ext3"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:640
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "您要把 loopback 檔案 %s 掛載在那裡?"
 
-#: diskdrake/interactive.pm:615
+#: diskdrake/interactive.pm:641
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您要把這個裝置 %s 掛載在那裡 ?"
 
-#: diskdrake/interactive.pm:620
+#: diskdrake/interactive.pm:646
 #, c-format
 msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
+"Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 "因為這個分割區被用作 loop back 使用, 所以無法解除\n"
 "這個掛載點. 請先取消 loopback 的設定"
 
-#: diskdrake/interactive.pm:645
+#: diskdrake/interactive.pm:671
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "您要將 %s 掛載在那裡?"
 
-#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: diskdrake/interactive.pm:695 diskdrake/interactive.pm:774
 #: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "正在重設大小"
 
-#: diskdrake/interactive.pm:669
+#: diskdrake/interactive.pm:695
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "正在計算 fat 分割區的邊界"
 
-#: diskdrake/interactive.pm:705
+#: diskdrake/interactive.pm:731
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "這個分割區無法重新調整大小"
 
-#: diskdrake/interactive.pm:710
+#: diskdrake/interactive.pm:736
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "所有在這個分割區上的資料都應該先經過備份"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:738
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "在改變分割區 %s 的大小以後, 所有在這個分割區上的資料都會遺失"
 
-#: diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:743
 #, c-format
 msgid "Choose the new size"
 msgstr "選取新的大小"
 
-#: diskdrake/interactive.pm:718
+#: diskdrake/interactive.pm:744
 #, c-format
 msgid "New size in MB: "
 msgstr "新大小 (MB):"
 
-#: diskdrake/interactive.pm:761 install_interactive.pm:196
+#: diskdrake/interactive.pm:787 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
 
-#: diskdrake/interactive.pm:784
-#, c-format
-msgid "Which disk do you want to move it to?"
-msgstr "您要將它移動到那個磁碟機?"
-
-#: diskdrake/interactive.pm:785
-#, c-format
-msgid "Sector"
-msgstr "扇區"
-
-#: diskdrake/interactive.pm:786
-#, c-format
-msgid "Which sector do you want to move it to?"
-msgstr "您要將它移動到那個扇區?"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving"
-msgstr "正在移動"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving partition..."
-msgstr "正在移動分割區..."
-
-#: diskdrake/interactive.pm:810
+#: diskdrake/interactive.pm:825
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "選取一存在的磁碟陣列加入到"
 
-#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
+#: diskdrake/interactive.pm:827 diskdrake/interactive.pm:844
 #, c-format
 msgid "new"
 msgstr "新的"
 
-#: diskdrake/interactive.pm:826
+#: diskdrake/interactive.pm:842
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "選取一個已經存在的 LVM 以加入"
 
-#: diskdrake/interactive.pm:832
+#: diskdrake/interactive.pm:848
 #, c-format
 msgid "LVM name?"
 msgstr "LVM 名稱?"
 
-#: diskdrake/interactive.pm:869
+#: diskdrake/interactive.pm:884
 #, c-format
-msgid "This partition can't be used for loopback"
+msgid "This partition can not be used for loopback"
 msgstr "這個分割區不能用來作為 loopback"
 
-#: diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:897
 #, c-format
 msgid "Loopback"
-msgstr ""
+msgstr "Loopback"
 
-#: diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:898
 #, c-format
 msgid "Loopback file name: "
 msgstr "Loopback 檔案名稱:"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:903
 #, c-format
 msgid "Give a file name"
 msgstr "輸入一個檔案名稱"
 
-#: diskdrake/interactive.pm:891
+#: diskdrake/interactive.pm:906
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "檔案已被用來作為其他的 loopback, 請選擇其他檔案"
 
-#: diskdrake/interactive.pm:892
+#: diskdrake/interactive.pm:907
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "檔案已經存在了. 要使用它嗎?"
 
-#: diskdrake/interactive.pm:915
+#: diskdrake/interactive.pm:930
 #, c-format
 msgid "Mount options"
 msgstr "掛載參數"
 
-#: diskdrake/interactive.pm:922
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "Various"
 msgstr "各種的"
 
-#: diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:1002
 #, c-format
 msgid "device"
 msgstr "裝置"
 
-#: diskdrake/interactive.pm:988
+#: diskdrake/interactive.pm:1003
 #, c-format
 msgid "level"
 msgstr "階層"
 
-#: diskdrake/interactive.pm:989
+#: diskdrake/interactive.pm:1004
 #, c-format
 msgid "chunk size in KiB"
 msgstr "組塊大小以 Kib 計量"
 
-#: diskdrake/interactive.pm:1006
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "請小心: 這個工作很危險."
 
-#: diskdrake/interactive.pm:1021
+#: diskdrake/interactive.pm:1036
 #, c-format
 msgid "What type of partitioning?"
 msgstr "以那種形式分割?"
 
-#: diskdrake/interactive.pm:1059
+#: diskdrake/interactive.pm:1074
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "您需要重新開機以便於讓異動的設定生效"
 
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "正在準備將要寫入磁碟 %s 的硬碟分割表!"
 
-#: diskdrake/interactive.pm:1081
+#: diskdrake/interactive.pm:1096
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "在對分割區 %s 進行格式化的動作以後, 所有在這個分割區上的資料都會遺失"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, c-format
 msgid "Move files to the new partition"
 msgstr "將檔案搬移到新的分割區"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, c-format
 msgid "Hide files"
 msgstr "隱藏檔案"
 
-#: diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2440,103 +2456,108 @@ msgstr ""
 "%s 目錄已經包含了資料了\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1113
+#: diskdrake/interactive.pm:1124
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "正在將檔案搬移到新的分割區"
 
-#: diskdrake/interactive.pm:1117
+#: diskdrake/interactive.pm:1128
 #, c-format
 msgid "Copying %s"
 msgstr "正在複製 %s"
 
-#: diskdrake/interactive.pm:1121
+#: diskdrake/interactive.pm:1132
 #, c-format
 msgid "Removing %s"
 msgstr "正在移除 %s"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1146
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "該分割區 %s 目前被認知為 %s"
 
-#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1147
+#, c-format
+msgid "Partitions have been renumbered: "
+msgstr "分割區已經重新編號："
+
+#: diskdrake/interactive.pm:1167 diskdrake/interactive.pm:1226
 #, c-format
 msgid "Device: "
 msgstr "裝置:"
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1168
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs 名稱:"
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1169
 #, c-format
 msgid "Volume label: "
-msgstr ""
+msgstr "磁區標籤：\""
 
-#: diskdrake/interactive.pm:1159
+#: diskdrake/interactive.pm:1170
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS 磁碟代號: %s (只是一個猜測)\n"
 
-#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1235
+#: diskdrake/interactive.pm:1174 diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1244
 #, c-format
 msgid "Type: "
 msgstr "格式:"
 
-#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
+#: diskdrake/interactive.pm:1178 install_steps_gtk.pm:296
 #, c-format
 msgid "Name: "
 msgstr "名稱: "
 
-#: diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1185
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "開始: %s 扇區\n"
 
-#: diskdrake/interactive.pm:1175
+#: diskdrake/interactive.pm:1186
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: diskdrake/interactive.pm:1177
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s 扇區"
 
-#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1190
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "%d 磁柱到第 %d 磁柱\n"
 
-#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1191
 #, c-format
 msgid "Number of logical extents: %d"
 msgstr ""
 
-#: diskdrake/interactive.pm:1181
+#: diskdrake/interactive.pm:1192
 #, c-format
 msgid "Formatted\n"
 msgstr "已格式化\n"
 
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1193
 #, c-format
 msgid "Not formatted\n"
 msgstr "未格式化\n"
 
-#: diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1194
 #, c-format
 msgid "Mounted\n"
 msgstr "已掛載\n"
 
-#: diskdrake/interactive.pm:1184
+#: diskdrake/interactive.pm:1195
 #, c-format
 msgid "RAID %s\n"
 msgstr "磁碟陣列 %s\n"
 
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1197
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2545,7 +2566,7 @@ msgstr ""
 "loopback 檔案:\n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1198
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2554,27 +2575,27 @@ msgstr ""
 "預設開機的分割區\n"
 "    (給 MS-DOS 開機程式用的, 跟 lilo 無關)\n"
 
-#: diskdrake/interactive.pm:1189
+#: diskdrake/interactive.pm:1200
 #, c-format
 msgid "Level %s\n"
 msgstr "階層 %s\n"
 
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1201
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "組塊大小 %d KiB\n"
 
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1202
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "磁碟陣列-磁碟 %s\n"
 
-#: diskdrake/interactive.pm:1193
+#: diskdrake/interactive.pm:1204
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback 檔案名稱:  %s"
 
-#: diskdrake/interactive.pm:1196
+#: diskdrake/interactive.pm:1207
 #, c-format
 msgid ""
 "\n"
@@ -2587,7 +2608,7 @@ msgstr ""
 "是透過驅動程式產生出來的\n"
 "您應該不要去異動這個分割區資料.\n"
 
-#: diskdrake/interactive.pm:1199
+#: diskdrake/interactive.pm:1210
 #, c-format
 msgid ""
 "\n"
@@ -2599,68 +2620,68 @@ msgstr ""
 "這個特殊分割區用來作為 \n"
 "雙重開機使用的.\n"
 
-#: diskdrake/interactive.pm:1218
+#: diskdrake/interactive.pm:1227
 #, c-format
 msgid "Read-only"
-msgstr ""
+msgstr "唯讀"
 
-#: diskdrake/interactive.pm:1219
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "Size: %s\n"
 msgstr "大小: %s\n"
 
-#: diskdrake/interactive.pm:1220
+#: diskdrake/interactive.pm:1229
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "幾何: %s 磁柱, %s 讀寫頭, %s 扇區\n"
 
-#: diskdrake/interactive.pm:1221
+#: diskdrake/interactive.pm:1230
 #, c-format
 msgid "Info: "
 msgstr "資訊:"
 
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1231
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM-磁碟 %s\n"
 
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1232
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "硬碟分割表形式: %s\n"
 
-#: diskdrake/interactive.pm:1224
+#: diskdrake/interactive.pm:1233
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "位在通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "檔案系統加密金鑰"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1266
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "選擇您檔案系統所使用的加密金鑰"
 
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1269
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "這個加密金鑰太簡單了 (一定至少要有 %d 個字元才行)"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1270
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "輸入的加密金鑰不符合"
 
-#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
-#: standalone/drakconnect:395
+#: diskdrake/interactive.pm:1273 network/netconnect.pm:1136
+#: standalone/drakconnect:397
 #, c-format
 msgid "Encryption key"
 msgstr "加密金鑰"
 
-#: diskdrake/interactive.pm:1265
+#: diskdrake/interactive.pm:1274
 #, c-format
 msgid "Encryption key (again)"
 msgstr "再次輸入加密金鑰"
@@ -2672,7 +2693,7 @@ msgstr "改變分割區格式"
 
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
-msgid "Can't login using username %s (bad password?)"
+msgid "Can not login using username %s (bad password?)"
 msgstr "無法使用 %s 使用者名稱登入系統 (密碼錯誤?)"
 
 #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
@@ -2696,7 +2717,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr "請輸入你的使用者名稱, 密碼以及網域名稱, 以便於能夠連線存取這個主機"
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3494
 #, c-format
 msgid "Username"
 msgstr "使用者名稱"
@@ -2726,52 +2747,52 @@ msgstr "必要的 %s 套件遺失"
 msgid "Installing packages..."
 msgstr "正在安裝套件..."
 
-#: do_pkgs.pm:216
+#: do_pkgs.pm:217
 #, c-format
 msgid "Removing packages..."
 msgstr "正在移除套件..."
 
-#: fs.pm:445 fs.pm:494
+#: fs.pm:487 fs.pm:536
 #, c-format
 msgid "Mounting partition %s"
 msgstr "正在掛載分割區 %s"
 
-#: fs.pm:446 fs.pm:495
+#: fs.pm:488 fs.pm:537
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "正在將 %s 分割區掛載於 %s 目錄時失敗"
 
-#: fs.pm:466 fs.pm:473
+#: fs.pm:508 fs.pm:515
 #, c-format
 msgid "Checking %s"
 msgstr "檢查 %s"
 
-#: fs.pm:511 partition_table.pm:387
+#: fs.pm:553 partition_table.pm:391
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "卸下 %s 的掛載時發生錯誤: %s"
 
-#: fs.pm:543
+#: fs.pm:585
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "正在啟用 swap 分割區 %s"
 
-#: fs/format.pm:39 fs/format.pm:46
+#: fs/format.pm:44 fs/format.pm:51
 #, c-format
 msgid "Formatting partition %s"
 msgstr "正在格式化分割區 %s"
 
-#: fs/format.pm:43
+#: fs/format.pm:48
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "建立並格式化檔案 %s"
 
-#: fs/format.pm:78
+#: fs/format.pm:83
 #, c-format
-msgid "I don't know how to format %s in type %s"
+msgid "I do not know how to format %s in type %s"
 msgstr "不知道要如何將 %s 格式化為 %s 格式"
 
-#: fs/format.pm:80
+#: fs/format.pm:88 fs/format.pm:90
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "以 %s 格式化 %s 失敗"
@@ -2846,14 +2867,14 @@ msgstr "給寫入權限給一般使用者"
 msgid "Give read-only access to ordinary users"
 msgstr "給唯讀權限給一般使用者"
 
-#: fs/type.pm:364
+#: fs/type.pm:370
 #, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
+msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "小於 16MB 的分割區不能使用 JFS 格式"
 
-#: fs/type.pm:365
+#: fs/type.pm:371
 #, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "小於 32MB 的分割區不能使用 ReiserFS 格式"
 
 #: fsedit.pm:25
@@ -2866,10 +2887,11 @@ msgstr ""
 msgid "server"
 msgstr "伺服器"
 
-#: fsedit.pm:168
+#: fsedit.pm:184
 #, c-format
 msgid ""
-"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not read the partition table of device %s, it's too corrupted for me :"
+"(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
 "The other solution is to not allow DrakX to modify the partition table.\n"
 "(the error is %s)\n"
@@ -2877,22 +2899,22 @@ msgid ""
 "Do you agree to lose all the partitions?\n"
 msgstr ""
 
-#: fsedit.pm:385
+#: fsedit.pm:401
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "掛載點必需以 / 開頭"
 
-#: fsedit.pm:386
+#: fsedit.pm:402
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "掛載點應該只有包含英文字母與數字與底線這類字元"
 
-#: fsedit.pm:387
+#: fsedit.pm:403
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "已經有分割區分配到掛載點 %s 了\n"
 
-#: fsedit.pm:389
+#: fsedit.pm:405
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2903,12 +2925,12 @@ msgstr ""
 "沒有 /boot 分割區, 開機載入器不可能處理這種情況.\n"
 "請確定會增加一個 /boot 分割區"
 
-#: fsedit.pm:392
+#: fsedit.pm:408
 #, c-format
-msgid "You can't use a LVM Logical Volume for mount point %s"
+msgid "You can not use a LVM Logical Volume for mount point %s"
 msgstr "您不能使用 LVM Logical Volume 來最為 %s 的掛載點"
 
-#: fsedit.pm:394
+#: fsedit.pm:410
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2919,19 +2941,19 @@ msgstr ""
 "沒有 /boot 分割區, 開機載入器不可能處理這種情況.\n"
 "請確定會增加一個 /boot 分割區"
 
-#: fsedit.pm:397
+#: fsedit.pm:413
 #, c-format
 msgid ""
-"You may not be able to install lilo (since lilo doesn't handle a LV on "
+"You may not be able to install lilo (since lilo does not handle a LV on "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:400 fsedit.pm:402
+#: fsedit.pm:416 fsedit.pm:418
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "這個目錄應該放在根檔案系統 (/) 才對"
 
-#: fsedit.pm:404 fsedit.pm:406
+#: fsedit.pm:420 fsedit.pm:422
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2939,45 +2961,40 @@ msgid ""
 msgstr ""
 "您需要一個真正的檔案系統 (ext2/ext3, reiserfs, xfs 或是 jfs) 來放這個掛載點\n"
 
-#: fsedit.pm:408
+#: fsedit.pm:424
 #, c-format
-msgid "You can't use an encrypted file system for mount point %s"
+msgid "You can not use an encrypted file system for mount point %s"
 msgstr "您不能使用加密過的檔案系統來最為 %s 的掛載點"
 
-#: fsedit.pm:469
+#: fsedit.pm:485
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "沒有足夠的空間能夠自動配置"
 
-#: fsedit.pm:471
+#: fsedit.pm:487
 #, c-format
 msgid "Nothing to do"
 msgstr "沒有做任何動作"
 
-#: fsedit.pm:569
-#, c-format
-msgid "Error opening %s for writing: %s"
-msgstr "正在開啟 %s 以寫入 %s 時發生錯誤"
-
-#: harddrake/data.pm:61
+#: harddrake/data.pm:61 install_any.pm:1505
 #, c-format
 msgid "Floppy"
-msgstr "軟片"
+msgstr "軟碟片"
 
 #: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:81
+#: harddrake/data.pm:81 install_any.pm:1506
 #, c-format
-msgid "Disk"
-msgstr "軟片"
+msgid "Hard Disk"
+msgstr "硬碟"
 
-#: harddrake/data.pm:90
+#: harddrake/data.pm:90 install_any.pm:1507
 #, c-format
 msgid "CDROM"
-msgstr ""
+msgstr "光碟機"
 
 #: harddrake/data.pm:100
 #, c-format
@@ -2989,7 +3006,7 @@ msgstr "CD/DVD 燒錄器"
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:120 standalone/drakbackup:2045
+#: harddrake/data.pm:120 standalone/drakbackup:2051
 #, c-format
 msgid "Tape"
 msgstr "磁帶"
@@ -3017,137 +3034,142 @@ msgstr "音效卡"
 #: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
-msgstr "Webcam"
+msgstr "網路攝影機"
 
-#: harddrake/data.pm:181
+#: harddrake/data.pm:180
 #, c-format
 msgid "Processors"
 msgstr "處理器"
 
-#: harddrake/data.pm:191
+#: harddrake/data.pm:190
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN 介面卡"
 
-#: harddrake/data.pm:201
+#: harddrake/data.pm:200
 #, c-format
 msgid "Ethernetcard"
 msgstr "乙太網路介面卡"
 
-#: harddrake/data.pm:219 network/netconnect.pm:484
+#: harddrake/data.pm:218 network/netconnect.pm:518
 #, c-format
 msgid "Modem"
 msgstr "數據機"
 
-#: harddrake/data.pm:229
+#: harddrake/data.pm:228
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL 介面卡"
 
-#: harddrake/data.pm:243
+#: harddrake/data.pm:242
 #, c-format
-msgid "AGP controllers"
-msgstr "AGP 控制器"
+msgid "Memory"
+msgstr "記憶體"
 
-#: harddrake/data.pm:252
+#: harddrake/data.pm:251
 #, c-format
-msgid "Bridges and system controllers"
-msgstr "橋樑與系統控制器"
+msgid "AGP controllers"
+msgstr "AGP 控制器"
 
-#: harddrake/data.pm:261 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
+#: harddrake/data.pm:260 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:978
 #, c-format
 msgid "Printer"
-msgstr "列印機"
+msgstr "印表機"
 
-#: harddrake/data.pm:271
+#: harddrake/data.pm:270
 #, c-format
 msgid "Joystick"
-msgstr ""
+msgstr "搖桿"
 
-#: harddrake/data.pm:281
+#: harddrake/data.pm:280
 #, c-format
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATA 控制器"
 
-#: harddrake/data.pm:290
+#: harddrake/data.pm:289
 #, c-format
 msgid "SATA controllers"
 msgstr "SATA 控制器"
 
-#: harddrake/data.pm:299
+#: harddrake/data.pm:298
 #, c-format
 msgid "Firewire controllers"
 msgstr "Firewire 控制器"
 
-#: harddrake/data.pm:308
+#: harddrake/data.pm:307
 #, c-format
 msgid "PCMCIA controllers"
 msgstr "PCMCIA 控制器"
 
-#: harddrake/data.pm:321
+#: harddrake/data.pm:316
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI 控制器"
 
-#: harddrake/data.pm:330
+#: harddrake/data.pm:325
 #, c-format
 msgid "USB controllers"
 msgstr "USB 控制器"
 
-#: harddrake/data.pm:339
+#: harddrake/data.pm:334
 #, c-format
 msgid "USB ports"
 msgstr "USB 埠"
 
-#: harddrake/data.pm:348
+#: harddrake/data.pm:343
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus 控制器"
 
-#: harddrake/data.pm:357
+#: harddrake/data.pm:352
+#, c-format
+msgid "Bridges and system controllers"
+msgstr "橋樑與系統控制器"
+
+#: harddrake/data.pm:361
 #, c-format
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
 
-#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
-#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#: harddrake/data.pm:370 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:938 standalone/keyboarddrake:28
 #, c-format
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#: harddrake/data.pm:383 help.pm:855 install_steps_interactive.pm:971
 #, c-format
 msgid "Mouse"
 msgstr "滑鼠"
 
-#: harddrake/data.pm:393
+#: harddrake/data.pm:397
 #, c-format
 msgid "Scanner"
 msgstr "掃描器"
 
-#: harddrake/data.pm:403 standalone/harddrake2:431
+#: harddrake/data.pm:407 standalone/harddrake2:439
 #, c-format
 msgid "Unknown/Others"
 msgstr "未知/其他"
 
-#: harddrake/data.pm:431
+#: harddrake/data.pm:435
 #, c-format
 msgid "cpu # "
-msgstr ""
+msgstr "CPU 編號"
 
-#: harddrake/sound.pm:170 standalone/drakconnect:169
-#: standalone/drakconnect:613
+#: harddrake/sound.pm:191 standalone/drakconnect:169
+#: standalone/drakconnect:615
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "請稍待... 正在套用該設定"
 
-#: harddrake/sound.pm:206
+#: harddrake/sound.pm:227
 #, c-format
 msgid "No alternative driver"
 msgstr "無另外可供選擇的驅動程式"
 
-#: harddrake/sound.pm:207
+#: harddrake/sound.pm:228
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3156,19 +3178,22 @@ msgstr ""
 "目前沒有另外可供選擇的 OSS/ALSA 驅動程式支援你的音效卡 (%s)\n"
 "正在使用 \"%s\""
 
-#: harddrake/sound.pm:213
+#: harddrake/sound.pm:234
 #, c-format
 msgid "Sound configuration"
 msgstr "音效設定"
 
-#: harddrake/sound.pm:215
+#: harddrake/sound.pm:236
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr "您可以選擇使用另外的 (OSS 或者 ALSA) 的驅動程式給您的音效卡 (%s)"
 
-#: harddrake/sound.pm:217
+#. -PO: here the first %s is either "OSS" or "ALSA", 
+#. -PO: the second %s is the name of the current driver
+#. -PO: and the third %s is the name of the default driver
+#: harddrake/sound.pm:241
 #, c-format
 msgid ""
 "\n"
@@ -3180,7 +3205,7 @@ msgstr ""
 "\n"
 "您的卡現在正在使用 %s\"%s\" 驅動程式 (您的卡預設驅動程式為 \"%s\")"
 
-#: harddrake/sound.pm:219
+#: harddrake/sound.pm:243
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3200,17 +3225,34 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
+#: harddrake/sound.pm:257 harddrake/sound.pm:342 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "驅動程式:"
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:262
 #, c-format
 msgid "Trouble shooting"
 msgstr "疑難排解"
 
-#: harddrake/sound.pm:246
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1039
+#: network/netconnect.pm:504 printer/printerdrake.pm:1142
+#: printer/printerdrake.pm:2142 printer/printerdrake.pm:2228
+#: printer/printerdrake.pm:2274 printer/printerdrake.pm:2341
+#: printer/printerdrake.pm:2376 printer/printerdrake.pm:2684
+#: printer/printerdrake.pm:2691 printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:3970 printer/printerdrake.pm:4092
+#: printer/printerdrake.pm:5183 standalone/drakTermServ:325
+#: standalone/drakTermServ:1111 standalone/drakTermServ:1172
+#: standalone/drakTermServ:1821 standalone/drakbackup:510
+#: standalone/drakbackup:609 standalone/drakboot:165 standalone/drakclock:224
+#: standalone/drakconnect:971 standalone/drakfloppy:291 standalone/drakups:27
+#: standalone/scannerdrake:51 standalone/scannerdrake:940
+#, c-format
+msgid "Warning"
+msgstr "警告"
+
+#: harddrake/sound.pm:270
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3220,45 +3262,45 @@ msgid ""
 "The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:278
 #, c-format
 msgid "No open source driver"
 msgstr "無開放原始碼的驅動程式"
 
-#: harddrake/sound.pm:255
+#: harddrake/sound.pm:279
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
 "driver at \"%s\"."
 msgstr "您的音效卡 (%s) 沒有自由的驅動程式, 但是有專利的驅動程式於 \"%s\"."
 
-#: harddrake/sound.pm:258
+#: harddrake/sound.pm:282
 #, c-format
 msgid "No known driver"
 msgstr "無已知的驅動程式"
 
-#: harddrake/sound.pm:259
+#: harddrake/sound.pm:283
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "您使用的音效卡尚未有已知的驅動程式 (%s)"
 
-#: harddrake/sound.pm:263
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Unknown driver"
 msgstr "未知的驅動程式"
 
-#: harddrake/sound.pm:264
+#: harddrake/sound.pm:288
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
-msgstr "錯誤: 你的音效卡驅動程式 \"%s\" 沒有列出"
+msgstr "錯誤：您的音效卡驅動程式 \"%s\" 沒有列出"
 
-#: harddrake/sound.pm:278
+#: harddrake/sound.pm:302
 #, c-format
 msgid "Sound trouble shooting"
-msgstr ""
+msgstr "音效問題排除"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:281
+#: harddrake/sound.pm:305
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3282,18 +3324,18 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:307
+#: harddrake/sound.pm:331
 #, c-format
 msgid "Let me pick any driver"
 msgstr "讓我選擇任何驅動程式"
 
-#: harddrake/sound.pm:310
+#: harddrake/sound.pm:334
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "正在選擇任意的驅動程式"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:313
+#: harddrake/sound.pm:337
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3302,6 +3344,10 @@ msgid ""
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
+"如果您真的認為您知道您音效卡應該使用那個驅動程式\n"
+"您可以在上面的列表中自己選取。\n"
+"\n"
+"目前您的音效卡 \"%s\" 使用的驅動程式是 \"%s\"。"
 
 #: harddrake/v4l.pm:14
 #, c-format
@@ -3316,12 +3362,12 @@ msgstr "未知|一般"
 #: harddrake/v4l.pm:105
 #, c-format
 msgid "Unknown|CPH05X (bt878) [many vendors]"
-msgstr "未知|CPH05X (bt878) [許多賣主]"
+msgstr "未知|CPH05X (bt878) [許多廠商]"
 
 #: harddrake/v4l.pm:106
 #, c-format
 msgid "Unknown|CPH06X (bt878) [many vendors]"
-msgstr "未知|CPH06X (bt878) [許多賣主]"
+msgstr "未知|CPH06X (bt878) [許多廠商]"
 
 #: harddrake/v4l.pm:309
 #, c-format
@@ -3331,25 +3377,25 @@ msgid ""
 "If your card is misdetected, you can force the right tuner and card types "
 "here. Just select your tv card parameters if needed."
 msgstr ""
-"對於目前大部分的 TV 卡, GNU/Linux 核心的 bttv 模組能夠正確的偵測\n"
-"處理參數.\n"
-"若是無法正確偵測出來您的 TV 卡的話, 您可以在這邊強制正確的調頻與卡型. 若需要"
-"的話請選擇 TV 卡參數."
+"對於目前大部分的電視卡，GNU/Linux 核心的 bttv 模組都能夠正確的偵測正確的參"
+"數。\n"
+"若是無法正確偵測您的電視卡的話，您可以在這邊直接指定正確的電視頻道與電視卡型"
+"號。若需要的話請直接選擇您的電視卡卡參數。"
 
 #: harddrake/v4l.pm:312
 #, c-format
 msgid "Card model:"
-msgstr "卡模型:"
+msgstr "卡模組："
 
 #: harddrake/v4l.pm:313
 #, c-format
 msgid "Tuner type:"
-msgstr "調頻類型:"
+msgstr "調頻類型："
 
 #: harddrake/v4l.pm:314
 #, c-format
 msgid "Number of capture buffers:"
-msgstr "擷取緩衝的數量:"
+msgstr "擷取緩衝的數量："
 
 #: harddrake/v4l.pm:314
 #, c-format
@@ -3359,17 +3405,17 @@ msgstr ""
 #: harddrake/v4l.pm:316
 #, c-format
 msgid "PLL setting:"
-msgstr "PLL 設定:"
+msgstr "PLL 設定："
 
 #: harddrake/v4l.pm:317
 #, c-format
 msgid "Radio support:"
-msgstr "Radio 支援:"
+msgstr "音效支援："
 
 #: harddrake/v4l.pm:317
 #, c-format
 msgid "enable radio support"
-msgstr "啟用 radio 支援"
+msgstr "啟用音效支援"
 
 #: help.pm:11
 #, c-format
@@ -3379,12 +3425,12 @@ msgid ""
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
-"在繼續之前, 您應該仔細的閱讀下面相關版權條款.\n"
-"這包含整個 Mandrakelinux distriubtion 版權內容. 若是您同意裡面的\n"
-"全部條款, 點選\"%s\" 按鈕. 否則點選 \"%s\" 按鈕將會重新開機."
+"在繼續之前，您應該仔細的閱讀下面相關版權條款。\n"
+"這包含整個 Mandrakelinux 發行版的版權內容。若是您同意裡面的所有條款，\n"
+"請點選 \"%s\" 按鈕，否則請點選 \"%s\" 按鈕並自動重新開機。"
 
-#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "接受"
@@ -3394,16 +3440,17 @@ msgstr "接受"
 msgid ""
 "GNU/Linux is a multi-user system which means each user can have his or her\n"
 "own preferences, own files and so on. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point won't be authorized\n"
+"system administrator, the users you add at this point will not be "
+"authorized\n"
 "to change anything except their own files and their own configurations,\n"
 "protecting the system from unintentional or malicious changes which could\n"
 "impact on the system as a whole. You'll have to create at least one regular\n"
 "user for yourself -- this is the account which you should use for routine,\n"
 "day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
 "anything and everything, it may also be very dangerous! A very simple\n"
-"mistake could mean that your system won't work any more. If you make a\n"
+"mistake could mean that your system will not work any more. If you make a\n"
 "serious mistake as a regular user, the worst that can happen is that you'll\n"
-"lose some information, but you won't affect the entire system.\n"
+"lose some information, but you will not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
@@ -3424,7 +3471,7 @@ msgid ""
 "\n"
 "When you're finished adding users, you'll be asked to choose a user who\n"
 "will be automatically logged into the system when the computer boots up. If\n"
-"you're interested in that feature (and don't care much about local\n"
+"you're interested in that feature (and do not care much about local\n"
 "security), choose the desired user and window manager, then click on\n"
 "\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
@@ -3464,23 +3511,23 @@ msgstr ""
 "安全性), 選擇希望的使用者與視窗管理員, 然後點選 \"%s\".\n"
 "若你對這個特色有沒有興趣, 不選取 \"%s\" 盒子."
 
-#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#: help.pm:51 printer/printerdrake.pm:1595 printer/printerdrake.pm:1715
 #, c-format
 msgid "User name"
 msgstr "使用者名稱"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
-#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
-#: network/tools.pm:198 printer/printerdrake.pm:3268
-#: standalone/drakTermServ:372 standalone/drakbackup:3941
-#: standalone/drakbackup:4035 standalone/drakbackup:4052
-#: standalone/drakbackup:4070 ugtk2.pm:515
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
+#: install_steps_gtk.pm:689 interactive.pm:424 interactive/newt.pm:317
+#: network/netconnect.pm:278 network/tools.pm:182 printer/printerdrake.pm:3581
+#: standalone/drakTermServ:382 standalone/drakbackup:3946
+#: standalone/drakbackup:4040 standalone/drakbackup:4057
+#: standalone/drakbackup:4075 ugtk2.pm:506
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
 #: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
-#: interactive.pm:371
+#: interactive.pm:385
 #, c-format
 msgid "Advanced"
 msgstr "進階"
@@ -3518,7 +3565,7 @@ msgid ""
 "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
-"目前所列出來的是硬碟機上偵測到已經存在的的 Linux 分割區.\n"
+"目前所列出來的是硬碟機上偵測到已經存在的 Linux 分割區.\n"
 "您可以保留巫師模式做的選擇, 因為他們對一般安裝是不錯的.\n"
 "如果您做任何改變的話, 您至少要定義出一塊當作根分割區 (\"/\").\n"
 "別選擇一個太小的分割區, 否則您將無法安裝足夠的軟體.\n"
@@ -3616,7 +3663,7 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"現在是指定那個程式您想要裝在您的系統上. Mandrake Linux 有上千個套件,\n"
+"現在是指定那個程式您想要裝在您的系統上. Mandrakelinux 有上千個套件,\n"
 "為了簡單管理, 相似性質的應用程式已經被分類到群組裡.\n"
 "\n"
 "Mandrakelinux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"
@@ -3648,16 +3695,16 @@ msgstr ""
 "若您用 \"%s\" 模式開始安裝, 你可以取消選擇全部群組且防止安裝任何新套件.\n"
 "這對修復或更新一個已經存在的系統很有用.\n"
 "\n"
-"如果當您執行一個一般正常安裝, 您取消選擇全部群組 (相反於一個升級),\n"
-"一個對話方塊將會跳出建議不同的選項給最小安裝:\n"
+"如果當您執行一個一般正常安裝, 您取消選擇全部群組 (相反於一個升級)，\n"
+"一個對話方塊將會跳出建議不同的選項給最小安裝：\n"
 "\n"
-" * \"%s\": 安裝最少的套件來擁有可工作的圖形桌面.\n"
+" * \"%s\"：安裝最少的套件來擁有可工作的圖形桌面。\n"
 "\n"
-" * \"%s\": 安裝系統基礎加上基本的工具與其文件\n"
-"這種安裝適合於設定起來一個伺服器.\n"
+" * \"%s\"：安裝系統基礎加上基本的工具與其文件\n"
+"這種安裝適合於設定起來一個伺服器。\n"
 "\n"
-" * \"%s\": 將安裝絕對最少套件必要於使一個 Linux 系統工作.\n"
-"用這個安裝您將只擁有一個命令列介面. 全部安裝大小大約 65 megabytes."
+" * \"%s\"：將安裝絕對最少套件必要於使一個 Linux 系統工作。\n"
+"用這個安裝您將只擁有一個命令列介面. 全部安裝大小大約 65 MB。"
 
 #: help.pm:146 share/compssUsers.pl:23
 #, c-format
@@ -3675,7 +3722,7 @@ msgstr "程式開發"
 msgid "Graphical Environment"
 msgstr "圖形環境"
 
-#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "選取單一套件"
@@ -3718,7 +3765,8 @@ msgid ""
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you don't know what a particular service is supposed to do or\n"
+"finalized. If you do not know what a particular service is supposed to do "
+"or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
 "\n"
@@ -3737,19 +3785,20 @@ msgid ""
 "such a floppy."
 msgstr ""
 
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
-#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
-#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
-#: wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:792
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2508
+#: standalone/draksec:54 standalone/harddrake2:306 standalone/net_applet:255
+#: ugtk2.pm:899 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:711
-#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
-#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
-#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:792 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:736
+#: standalone/drakbackup:2508 standalone/drakgw:287 standalone/drakgw:288
+#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
+#: standalone/harddrake2:305 standalone/net_applet:259 ugtk2.pm:899
+#: wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "是的"
@@ -3768,9 +3817,9 @@ msgid ""
 "manual is similar to the one used during installation."
 msgstr ""
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
-#: standalone/drakbackup:2329 standalone/drakbackup:2333
-#: standalone/drakbackup:2337 standalone/drakbackup:2341
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
+#: standalone/drakbackup:2333 standalone/drakbackup:2337
+#: standalone/drakbackup:2341 standalone/drakbackup:2345
 #, c-format
 msgid "Configure"
 msgstr "設定"
@@ -3782,7 +3831,7 @@ msgid ""
 "time.\n"
 "\n"
 "DrakX will list all services available on the current installation. Review\n"
-"each one of them carefully and uncheck those which aren't needed at boot\n"
+"each one of them carefully and uncheck those which are not needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
@@ -3790,7 +3839,8 @@ msgid ""
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you probably don't want to start any services which you don't need.\n"
+"server: you probably do not want to start any services which you do not "
+"need.\n"
 "Please remember that some services can be dangerous if they're enabled on a\n"
 "server. In general, select only those services you really need. !!"
 msgstr ""
@@ -3823,7 +3873,7 @@ msgid ""
 "server which can be used by other machines on your local network as well."
 msgstr ""
 
-#: help.pm:217 install_steps_interactive.pm:887
+#: help.pm:217 install_steps_interactive.pm:873
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "硬體時鐘設定為 GMT 時間"
@@ -3997,7 +4047,8 @@ msgid ""
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
 "your hard drive and replace them with your new Mandrakelinux system, choose\n"
-"this option. Be careful, because you won't be able to undo this operation\n"
+"this option. Be careful, because you will not be able to undo this "
+"operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
@@ -4108,7 +4159,7 @@ msgstr "自訂磁碟分割"
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Do not forget\n"
 "to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
 "boot-loader menu, giving you the choice of which operating system to start.\n"
@@ -4171,17 +4222,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "產生自動安裝軟片"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Replay"
 msgstr "重播"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Automated"
 msgstr "自動化"
 
-#: help.pm:409 install_steps_interactive.pm:1366
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Save packages selection"
 msgstr "儲存套件選擇"
@@ -4195,12 +4246,13 @@ msgid ""
 "\n"
 "Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
+"reformat\n"
 "partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
 "Please be careful when selecting partitions. After the formatting is\n"
 "completed, all data on the selected partitions will be deleted and you\n"
-"won't be able to recover it.\n"
+"will not be able to recover it.\n"
 "\n"
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
@@ -4223,11 +4275,11 @@ msgstr ""
 "若您想選擇另一個分割給您的新的 Mandrakelinux 作業系統安裝, 點選了\"%s\".\n"
 "若您想選擇要被檢查磁碟上壞的區塊的分割, 點選.\"%s\"."
 
-#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
-#: interactive/newt.pm:316 printer/printerdrake.pm:3266
-#: standalone/drakTermServ:351 standalone/drakbackup:3901
-#: standalone/drakbackup:3940 standalone/drakbackup:4051
-#: standalone/drakbackup:4066 ugtk2.pm:513
+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:425
+#: interactive/newt.pm:316 printer/printerdrake.pm:3579
+#: standalone/drakTermServ:361 standalone/drakbackup:3906
+#: standalone/drakbackup:3945 standalone/drakbackup:4056
+#: standalone/drakbackup:4071 ugtk2.pm:504
 #, c-format
 msgid "Previous"
 msgstr "上一步"
@@ -4256,8 +4308,8 @@ msgstr ""
 "跟您近的. 一個套件選擇樹將出現: 審查選擇, 按下 \"%s\" 來擷取且安裝\n"
 "被選擇的套件, 或 \"%s\" 以中斷放棄."
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
-#: install_steps_interactive.pm:158 standalone/drakbackup:4098
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
+#: install_steps_interactive.pm:156 standalone/drakbackup:4103
 #, c-format
 msgid "Install"
 msgstr "安裝"
@@ -4271,7 +4323,7 @@ msgid ""
 "exposed to the Internet. The trade-off that a higher security level is\n"
 "generally obtained at the expense of ease of use.\n"
 "\n"
-"If you don't know what to choose, keep the default option. You'll be able\n"
+"If you do not know what to choose, keep the default option. You'll be able\n"
 "to change it later with the draksec tool, which is part of Mandrakelinux\n"
 "Control Center.\n"
 "\n"
@@ -4322,7 +4374,7 @@ msgid ""
 "floppy disk.\n"
 "\n"
 " * \"%s\": if your partition table is damaged, you can try to recover it\n"
-"using this option. Please be careful and remember that it doesn't always\n"
+"using this option. Please be careful and remember that it does not always\n"
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
@@ -4500,7 +4552,8 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": check the current country selection. If you're not in this country,\n"
-"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"click on the \"%s\" button and choose another. If your country is not in "
+"the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
@@ -4521,7 +4574,7 @@ msgid ""
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mandrakelinux system. Your current partitioning\n"
-"scheme and user data won't be altered. Most of the other configuration\n"
+"scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
@@ -4540,7 +4593,7 @@ msgid ""
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard don't match. In either case, this installation step\n"
+"country-set keyboard do not match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
 "Click on the \"%s\" button to be shown a list of supported keyboards.\n"
@@ -4745,10 +4798,11 @@ msgid ""
 "characters long. Never write down the \"root\" password -- it makes it far\n"
 "too easy to compromise your system.\n"
 "\n"
-"One caveat: don't make the password too long or too complicated because you\n"
+"One caveat: do not make the password too long or too complicated because "
+"you\n"
 "must be able to remember it!\n"
 "\n"
-"The password won't be displayed on screen as you type it. To reduce the\n"
+"The password will not be displayed on screen as you type it. To reduce the\n"
 "chance of a blind typing error you'll need to enter the password twice. If\n"
 "you do happen to make the same typing error twice, you'll have to use this\n"
 "``incorrect'' password the first time you'll try to connect as \"root\".\n"
@@ -4757,7 +4811,7 @@ msgid ""
 "click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you don't know which\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
 "If you happen to have problems with remembering passwords, or if your\n"
@@ -4795,12 +4849,6 @@ msgstr ""
 msgid "authentication"
 msgstr "認證"
 
-#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:722 install_steps_interactive.pm:1211
-#, c-format
-msgid "No password"
-msgstr "沒有密碼"
-
 #: help.pm:725
 #, c-format
 msgid ""
@@ -4815,9 +4863,10 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"If DrakX can not determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
-"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"Choosing \"%s\" will not install any boot loader. Use this option only if "
+"you\n"
 "know what you're doing."
 msgstr ""
 
@@ -4828,9 +4877,9 @@ msgid ""
 "operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
-" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
 "within networks.) It's recommended that you use \"pdq\" if this is your\n"
 "first experience with GNU/Linux.\n"
@@ -4845,7 +4894,7 @@ msgid ""
 "\"%s\" includes graphical front-ends for printing or choosing printer\n"
 "options and for managing the printer.\n"
 "\n"
-"If you make a choice now, and later find that you don't like your printing\n"
+"If you make a choice now, and later find that you do not like your printing\n"
 "system you may change it by running PrinterDrake from the Mandrakelinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
@@ -4853,18 +4902,19 @@ msgstr ""
 "但是 Mandrakelinux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"
 "態.\n"
 "\n"
-" * \"%s\" - 是 ``print, don't queue (列印, 不排隊)'' 之縮寫字, 是當您有一個\n"
-"直接連線的列印機, 您不想因為卡紙而驚慌, 且您沒有網路列印機. (\"%s\"\n"
+" * \"%s\" - 是 ``print, do not queue (列印, 不排隊)'' 之縮寫字, 是當您有一"
+"個\n"
+"直接連線的印表機, 您不想因為卡紙而驚慌, 且您沒有網路印表機. (\"%s\"\n"
 "只將會處理非常簡單的網路條件且當用於網路時有些慢) 如果這是您第一次 GNU/"
 "Linux\n"
 "經驗, 建議您使用\"pdq\".\n"
 "\n"
 " * \"%s\" 是 ``Common Unix Printing System (通用 Unix 列印系統)'', 這是一套\n"
-"對於直接列印到本地端列印機上, 或者是到地球另一端都相當出色的選擇. 它的設定\n"
+"對於直接列印到本地端印表機上, 或者是到地球另一端都相當出色的選擇. 它的設定\n"
 "是相當簡單且可以當成古老的 lpd 列印系統的伺服器端或者是用戶端使用, 所以它是\n"
 "相容於需要列印服務比較舊的作業系統. 相當強力, 基本設定幾乎跟 \"pdq\" 一樣\n"
 "簡單. 如果您希望能夠模擬 \"lpd\" 伺服器, 確定您開啟 \"cups-lpd\" daemon.\n"
-"\"%s\" 提供了圖形的介面前端給列印, 選擇列印的選項, 管理列印機.\n"
+"\"%s\" 提供了圖形的介面前端給列印, 選擇列印的選項, 管理印表機.\n"
 "\n"
 "如果您現在做出決定, 且您之後發現不喜歡您的列印系統, 您可以藉由從\n"
 "Mandrakelinux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."
@@ -4874,7 +4924,7 @@ msgstr ""
 msgid "pdq"
 msgstr ""
 
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:118
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
@@ -4921,12 +4971,12 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver."
 msgstr ""
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
-#: install_steps_interactive.pm:1036
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:1022
 #, c-format
 msgid "Sound card"
 msgstr "音效卡"
@@ -4945,7 +4995,7 @@ msgid ""
 "\n"
 " * \"%s\": check the current country selection. If you're not in this\n"
 "country, click on the \"%s\" button and choose another. If your country\n"
-"isn't in the list shown, click on the \"%s\" button to get the complete\n"
+"is not in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
 " * \"%s\": by default, DrakX deduces your time zone based on the country\n"
@@ -4961,18 +5011,18 @@ msgid ""
 "presented in our manual is similar to the one used during installation.\n"
 "\n"
 " * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver.\n"
 "\n"
 " * \"%s\": if you have a TV card, this is where information about its\n"
-"configuration will be displayed. If you have a TV card and it isn't\n"
+"configuration will be displayed. If you have a TV card and it is not\n"
 "detected, click on \"%s\" to try to configure it manually.\n"
 "\n"
 " * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
 "the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
@@ -5001,12 +5051,12 @@ msgid ""
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
+#: help.pm:855 install_steps_interactive.pm:964 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "時區"
 
-#: help.pm:855 install_steps_interactive.pm:1052
+#: help.pm:855 install_steps_interactive.pm:1038
 #, c-format
 msgid "TV card"
 msgstr "電視卡"
@@ -5021,32 +5071,33 @@ msgstr "ISDN 卡"
 msgid "Graphical Interface"
 msgstr "圖形介面"
 
-#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
+#: help.pm:855 install_any.pm:1528 install_steps_interactive.pm:1056
+#: standalone/drakbackup:2036
 #, c-format
 msgid "Network"
 msgstr "網路"
 
-#: help.pm:855 install_steps_interactive.pm:1085
+#: help.pm:855 install_steps_interactive.pm:1071
 #, c-format
 msgid "Proxies"
 msgstr "代理伺服器"
 
-#: help.pm:855 install_steps_interactive.pm:1096
+#: help.pm:855 install_steps_interactive.pm:1082
 #, c-format
 msgid "Security Level"
 msgstr "安全層級"
 
-#: help.pm:855 install_steps_interactive.pm:1110
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Firewall"
 msgstr "防火牆"
 
-#: help.pm:855 install_steps_interactive.pm:1124
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Bootloader"
 msgstr "開機載入器"
 
-#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1123 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "服務"
@@ -5091,7 +5142,7 @@ msgstr "<- 上一步"
 #: install2.pm:117
 #, c-format
 msgid ""
-"Can't access kernel modules corresponding to your kernel (file %s is "
+"Can not access kernel modules corresponding to your kernel (file %s is "
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
@@ -5104,22 +5155,13 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "您也必須要格式化 %s"
 
-#: install_any.pm:390
-#, c-format
-msgid ""
-"The following installation media have been found.\n"
-"If you want to skip some of them, you can unselect them now."
-msgstr ""
-"下列安裝媒體已經被找到.\n"
-"如果您想略過他們, 您現在可以不選擇他們."
-
-#: install_any.pm:411
+#: install_any.pm:376
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "您還有其他的補充媒體嗎?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:414
+#: install_any.pm:379
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -5132,74 +5174,96 @@ msgstr ""
 "\n"
 "您有補充安裝媒體要設定嗎?"
 
-#: install_any.pm:420 printer/printerdrake.pm:2652
-#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
-#: standalone/scannerdrake:184 standalone/scannerdrake:235
-#: standalone/scannerdrake:242
+#: install_any.pm:388 printer/printerdrake.pm:2929
+#: printer/printerdrake.pm:2936 standalone/scannerdrake:182
+#: standalone/scannerdrake:190 standalone/scannerdrake:241
+#: standalone/scannerdrake:248
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, c-format
 msgid "Network (http)"
 msgstr "網路 (http)"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, c-format
 msgid "Network (ftp)"
 msgstr "網路 (ftp)"
 
-#: install_any.pm:464 standalone/drakbackup:112
+#: install_any.pm:436 standalone/drakbackup:112
 #, c-format
 msgid "No device found"
-msgstr "沒有裝置被找到"
+msgstr "沒有找到任何裝置"
 
-#: install_any.pm:468
+#: install_any.pm:440
 #, c-format
 msgid "Insert the CD"
-msgstr ""
+msgstr "請插入光碟"
 
-#: install_any.pm:492
+#: install_any.pm:445
+#, c-format
+msgid "Unable to mount CD-ROM"
+msgstr "無法掛載光碟機"
+
+#: install_any.pm:468
 #, c-format
 msgid "Insert the CD 1 again"
-msgstr ""
+msgstr "請再次插入光碟 1"
 
-#: install_any.pm:502 install_any.pm:506
+#: install_any.pm:478 install_any.pm:482
 #, c-format
 msgid "URL of the mirror?"
-msgstr ""
+msgstr "映像站的 URL？"
 
-#: install_any.pm:532
+#: install_any.pm:515
 #, c-format
-msgid "Can't find hdlist file on this mirror"
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
+msgstr "無法在這個映像站上找到套件列表檔。請確定位址是正確的。"
+
+#: install_any.pm:633
+#, c-format
+msgid ""
+"Change your Cd-Rom!\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done."
 msgstr ""
+"更換光碟片！\n"
+"請插入標籤為 \"%s\" 的光碟於您的光碟機中，完成後請按下確定。"
+
+#: install_any.pm:652
+#, c-format
+msgid "Copying in progress"
+msgstr "複製進行中"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:713
+#: install_any.pm:783
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
 "\n"
 "\n"
-"These servers are activated by default. They don't have any known security\n"
+"These servers are activated by default. They do not have any known security\n"
 "issues, but some new ones could be found. In that case, you must make sure\n"
 "to upgrade as soon as possible.\n"
 "\n"
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
-"您已經選擇了下面的伺服器: %s\n"
+"您已經選擇了下面的伺服器：%s\n"
 "\n"
 "\n"
-"這些伺服器安裝好後預設是活躍的. 他們沒有任何已知的安全性問題,\n"
-"但是某些新的安全性問題或許會被找到. 在那情況下, 確定您一定要儘快更新.\n"
+"這些伺服器安裝好後預設是啟用的。他們沒有任何已知的安全性問題，\n"
+"但是某些新的安全性問題或許會被發現。在這種情況下，請您一定要儘快更新。\n"
 "\n"
 "\n"
-"您確定真的要安裝這些伺服器嗎?\n"
+"您確定真的要安裝這些伺服器嗎？\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:736
+#: install_any.pm:806
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5208,34 +5272,22 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: install_any.pm:1116
+#: install_any.pm:1214 partition_table.pm:603
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "請在 %s 磁碟中插入 FAT 已經格式化軟片"
-
-#: install_any.pm:1120
-#, c-format
-msgid "This floppy is not FAT formatted"
-msgstr "這張軟片並不是 FAT 格式化的"
+msgid "Error reading file %s"
+msgstr "讀取檔案 %s 時發生錯誤"
 
-#: install_any.pm:1132
+#: install_any.pm:1425
 #, c-format
-msgid ""
-"To use this saved packages selection, boot installation with ``linux "
-"defcfg=floppy''"
-msgstr "要使用所儲存的套件選擇, 在開機安裝的時候輸入 ``linux defcfg=floppy''"
+msgid "The following disk(s) were renamed:"
+msgstr "下列磁碟已經改名："
 
-#: install_any.pm:1160 partition_table.pm:595
+#: install_any.pm:1427
 #, c-format
-msgid "Error reading file %s"
-msgstr "讀取檔案 %s 時發生錯誤"
-
-#: install_any.pm:1361
-#, fuzzy, c-format
-msgid "%s (was %s)"
-msgstr "%s (連接埠 %s)"
+msgid "%s (previously named as %s)"
+msgstr "%s (原本為 %s)"
 
-#: install_any.pm:1396
+#: install_any.pm:1465
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5244,12 +5296,52 @@ msgstr ""
 "發生了一個錯誤 - 找不到任何有效的裝置可以用來建立新的檔案系統, 請檢查您的硬體"
 "以找出問題的原因"
 
-#: install_gtk.pm:160
+#: install_any.pm:1509
+#, c-format
+msgid "HTTP"
+msgstr "HTTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "FTP"
+msgstr "FTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "NFS"
+msgstr "NFS"
+
+#: install_any.pm:1532
+#, fuzzy, c-format
+msgid "Please choose a media"
+msgstr "請選擇要用來備份的裝置"
+
+#: install_any.pm:1564
+#, c-format
+msgid "Bad media %s"
+msgstr ""
+
+#: install_any.pm:1576
+#, fuzzy, c-format
+msgid "File already exists. Overwrite it?"
+msgstr "檔案已經存在了. 要使用它嗎?"
+
+#: install_any.pm:1627
+#, c-format
+msgid "Can not make screenshots before partitioning"
+msgstr "在尚未進行分割前無法提供畫面捕捉功能"
+
+#: install_any.pm:1634
+#, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "在安裝於 %s 後就能夠提供畫面捕捉功能"
+
+#: install_gtk.pm:136
 #, c-format
 msgid "System installation"
 msgstr "系統安裝"
 
-#: install_gtk.pm:163
+#: install_gtk.pm:139
 #, c-format
 msgid "System configuration"
 msgstr "系統設定"
@@ -5277,7 +5369,7 @@ msgstr ""
 #: install_interactive.pm:67
 #, c-format
 msgid ""
-"You don't have a swap partition.\n"
+"You do not have a swap partition.\n"
 "\n"
 "Continue anyway?"
 msgstr ""
@@ -5436,14 +5528,14 @@ msgstr "使用 fdisk"
 #, c-format
 msgid ""
 "You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+"When you are done, do not forget to save using `w'"
 msgstr ""
 "您現在可以對 %s 分割區進行劃分動作.\n"
 "當您完成時, 別忘了使用 'w' 儲存"
 
 #: install_interactive.pm:271
 #, c-format
-msgid "I can't find any room for installing"
+msgid "I can not find any room for installing"
 msgstr "找不到任何可用的安裝空間"
 
 #: install_interactive.pm:275
@@ -5707,10 +5799,10 @@ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "重複的掛載點 %s"
 
-#: install_steps.pm:477
+#: install_steps.pm:479
 #, c-format
 msgid ""
-"Some important packages didn't get installed properly.\n"
+"Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
@@ -5719,7 +5811,7 @@ msgstr ""
 "可能是您的 cdrom 磁碟或者是 cdrom 光碟有缺陷.\n"
 "確認 cdrom 在一個已經安裝的電腦上使用 \"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:603
+#: install_steps.pm:599
 #, c-format
 msgid "No floppy drive available"
 msgstr "沒有可用的軟碟機"
@@ -5729,7 +5821,7 @@ msgstr "沒有可用的軟碟機"
 msgid "Entering step `%s'\n"
 msgstr "進入步驟 `%s'\n"
 
-#: install_steps_gtk.pm:184
+#: install_steps_gtk.pm:177
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -5741,93 +5833,94 @@ msgstr ""
 "若是那發生的話, 您或許可以改用文字模式的方式安裝替代.\n"
 "要如此的話, CDROM 開機時按下 `F1', 然後輸入 `text'."
 
-#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
 msgstr "套件群組選擇"
 
-#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "總共大小: %d / %d MB"
 
-#: install_steps_gtk.pm:309
+#: install_steps_gtk.pm:295
 #, c-format
 msgid "Bad package"
 msgstr "壞掉的套件"
 
-#: install_steps_gtk.pm:311
+#: install_steps_gtk.pm:297
 #, c-format
 msgid "Version: "
 msgstr "版本:"
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "Size: "
 msgstr "大小:"
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "%d KB\n"
-msgstr ""
+msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:313
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:332
 #, c-format
-msgid "You can't select/unselect this package"
+msgid "You can not select/unselect this package"
 msgstr "您不可以選擇/取消選擇這個套件"
 
-#: install_steps_gtk.pm:350
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "due to missing %s"
 msgstr "因為遺失 %s"
 
-#: install_steps_gtk.pm:351
+#: install_steps_gtk.pm:337
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於 %s 未被滿足"
 
-#: install_steps_gtk.pm:352
+#: install_steps_gtk.pm:338
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在嘗試促進 %s"
 
-#: install_steps_gtk.pm:353
+#: install_steps_gtk.pm:339
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
-#: install_steps_gtk.pm:358
+#: install_steps_gtk.pm:344
 #, c-format
 msgid ""
-"You can't select this package as there is not enough space left to install it"
+"You can not select this package as there is not enough space left to install "
+"it"
 msgstr "您不可以選取這個套件因為剩餘空間不足以安裝它."
 
-#: install_steps_gtk.pm:361
+#: install_steps_gtk.pm:347
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "下列的套件將會被安裝上"
 
-#: install_steps_gtk.pm:362
+#: install_steps_gtk.pm:348
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "下列的套件將會被移除"
 
-#: install_steps_gtk.pm:386
+#: install_steps_gtk.pm:372
 #, c-format
-msgid "This is a mandatory package, it can't be unselected"
+msgid "This is a mandatory package, it can not be unselected"
 msgstr "這是一個必要的套件, 您不可以選擇不要安裝這個套件"
 
-#: install_steps_gtk.pm:388
+#: install_steps_gtk.pm:374
 #, c-format
-msgid "You can't unselect this package. It is already installed"
+msgid "You can not unselect this package. It is already installed"
 msgstr "您不可以不選這個套件. 它已經被安裝上了."
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:377
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -5836,222 +5929,240 @@ msgstr ""
 "這個套件一定要更新才行.\n"
 "您確定您不要選它嗎?"
 
-#: install_steps_gtk.pm:394
+#: install_steps_gtk.pm:380
 #, c-format
-msgid "You can't unselect this package. It must be upgraded"
+msgid "You can not unselect this package. It must be upgraded"
 msgstr "您不可以不選這個套件. 它一定要更新才行."
 
-#: install_steps_gtk.pm:399
+#: install_steps_gtk.pm:385
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自動顯示被選取的套件"
 
-#: install_steps_gtk.pm:404
-#, c-format
-msgid "Load/Save on floppy"
-msgstr "由軟碟載入/儲存"
+#: install_steps_gtk.pm:390
+#, fuzzy, c-format
+msgid "Load/Save selection"
+msgstr "套件選取"
 
-#: install_steps_gtk.pm:405
+#: install_steps_gtk.pm:391
 #, c-format
 msgid "Updating package selection"
 msgstr "正在更新套件的選擇"
 
-#: install_steps_gtk.pm:410
+#: install_steps_gtk.pm:396
 #, c-format
 msgid "Minimal install"
 msgstr "最小安裝"
 
-#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
+#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "選擇您想要安裝的套件"
 
-#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
+#: install_steps_gtk.pm:426 install_steps_interactive.pm:706
 #, c-format
 msgid "Installing"
 msgstr "正在安裝"
 
-#: install_steps_gtk.pm:447
+#: install_steps_gtk.pm:433
 #, c-format
 msgid "Estimating"
 msgstr "正在估計"
 
-#: install_steps_gtk.pm:453
+#: install_steps_gtk.pm:482
+#, c-format
+msgid "No details"
+msgstr "沒有詳細資訊"
+
+#: install_steps_gtk.pm:490
 #, c-format
 msgid "Time remaining "
 msgstr "剩餘時間"
 
-#: install_steps_gtk.pm:464
+#: install_steps_gtk.pm:497
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "請稍後, 正在準備安裝..."
 
-#: install_steps_gtk.pm:474
-#, c-format
-msgid "No details"
-msgstr "沒有詳細資訊"
-
-#: install_steps_gtk.pm:527
+#: install_steps_gtk.pm:512
 #, c-format
 msgid "%d packages"
 msgstr "%d 套件"
 
-#: install_steps_gtk.pm:532
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安裝 %s 套件"
 
-#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745
+#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731
 #, c-format
 msgid "Refuse"
 msgstr "拒絕"
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:735
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
-"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "更換 Cd-Rom!\n"
 "請插入 Cd-Rom 標籤為 \"%s\" 於您的磁碟, 完成時按下 Ok 確定.\n"
 "若是您並沒有它, 請點選 Cancel 取消以略過這一片 Cd-Rom 的安裝."
 
-#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:746
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列套件時發生錯誤:"
 
-#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
-#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_interactive.pm:746 install_steps_interactive.pm:750
 #, c-format
 msgid "Go on anyway?"
 msgstr "無論如何都要繼續嗎?"
 
-#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "安裝套件時發生錯誤:"
 
-#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
-#: install_steps_interactive.pm:1086
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:920
+#: install_steps_interactive.pm:1072
 #, c-format
 msgid "not configured"
 msgstr "未被設定"
 
-#: install_steps_interactive.pm:86
+#: install_steps_gtk.pm:680
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+"下列安裝媒體已經被找到.\n"
+"如果您想略過他們, 您現在可以不選擇他們."
+
+#: install_steps_gtk.pm:684
+#, c-format
+msgid ""
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
+msgstr ""
+
+#: install_steps_gtk.pm:686
 #, c-format
-msgid "Do you want to recover your system?"
-msgstr "您想要恢復您的系統嗎?"
+msgid "Copy whole CDs"
+msgstr "複製整張光碟"
 
-#: install_steps_interactive.pm:87
+#: install_steps_interactive.pm:85
 #, c-format
 msgid "License agreement"
 msgstr "版權協議"
 
-#: install_steps_interactive.pm:91
+#: install_steps_interactive.pm:89
 #, c-format
 msgid "Release Notes"
 msgstr "發行紀錄"
 
-#: install_steps_interactive.pm:121
+#: install_steps_interactive.pm:119
 #, c-format
 msgid "Please choose your keyboard layout."
-msgstr "請選取鍵盤排列的格式."
+msgstr "請選取鍵盤排列的樣式。"
 
-#: install_steps_interactive.pm:123
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "以下是所有可用的的鍵盤"
 
-#: install_steps_interactive.pm:153
+#: install_steps_interactive.pm:151
 #, c-format
 msgid "Install/Upgrade"
 msgstr "安裝/升級"
 
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:152
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "這是安裝或是升級?"
+msgstr "這是安裝或是升級？"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:158
 #, c-format
 msgid "Upgrade %s"
 msgstr "升級 %s"
 
-#: install_steps_interactive.pm:170
+#: install_steps_interactive.pm:168
 #, c-format
 msgid "Encryption key for %s"
 msgstr "加密金鑰於 %s"
 
-#: install_steps_interactive.pm:187
+#: install_steps_interactive.pm:185
 #, c-format
 msgid "Please choose your type of mouse."
-msgstr "請選取您的滑鼠的形式."
+msgstr "請選取您滑鼠的形式。"
 
-#: install_steps_interactive.pm:196 standalone/mousedrake:46
+#: install_steps_interactive.pm:194 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "滑鼠連接埠"
 
-#: install_steps_interactive.pm:197 standalone/mousedrake:47
+#: install_steps_interactive.pm:195 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
-msgstr "請選取您滑鼠連接的序列埠."
+msgstr "請選取您滑鼠連接的序列埠。"
 
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:205
 #, c-format
 msgid "Buttons emulation"
 msgstr "按鍵模擬"
 
-#: install_steps_interactive.pm:209
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "第二鍵模擬"
 
-#: install_steps_interactive.pm:210
+#: install_steps_interactive.pm:208
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "第三鍵模擬"
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "正在設定 PCMCIA 卡..."
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "Configuring IDE"
 msgstr "正在設定 IDE"
 
-#: install_steps_interactive.pm:258 network/tools.pm:187
+#: install_steps_interactive.pm:256 network/tools.pm:172
 #, c-format
 msgid "No partition available"
 msgstr "沒有可用的分割區"
 
-#: install_steps_interactive.pm:261
+#: install_steps_interactive.pm:259
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "正在掃描分割區以尋找掛載點"
 
-#: install_steps_interactive.pm:268
+#: install_steps_interactive.pm:266
 #, c-format
 msgid "Choose the mount points"
 msgstr "選取掛載點"
 
-#: install_steps_interactive.pm:300
+#: install_steps_interactive.pm:312
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -6060,99 +6171,94 @@ msgstr ""
 "沒有足夠的可用空間安裝 bootstrap! 安裝還是會繼續, 但是您需要在 DiskDrake\n"
 "建立 bootstrap 分割以開機您的系統"
 
-#: install_steps_interactive.pm:337
+#: install_steps_interactive.pm:317
+#, fuzzy, c-format
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"沒有足夠的可用空間安裝 bootstrap! 安裝還是會繼續, 但是您需要在 DiskDrake\n"
+"建立 bootstrap 分割以開機您的系統"
+
+#: install_steps_interactive.pm:353
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "選擇要格式化的分割區"
 
-#: install_steps_interactive.pm:339
+#: install_steps_interactive.pm:355
 #, c-format
 msgid "Check bad blocks?"
 msgstr "檢查壞掉的區塊?"
 
-#: install_steps_interactive.pm:371
+#: install_steps_interactive.pm:383
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
 "you can lose data)"
 msgstr "無法檢查檔案系統 %s. 您要修復該錯誤嗎? (請注意, 您可能遺失資料)"
 
-#: install_steps_interactive.pm:374
+#: install_steps_interactive.pm:386
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "沒有足夠的置換空間 (swap) 可以用來完成安裝, 請增加一些"
 
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:393
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "正在搜尋可以用的套件並且建立 rpm 資料庫..."
 
-#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
+#: install_steps_interactive.pm:394 install_steps_interactive.pm:452
 #, c-format
 msgid "Looking for available packages..."
 msgstr "正在搜尋可以用的套件..."
 
-#: install_steps_interactive.pm:385
+#: install_steps_interactive.pm:397
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查看已經安裝過的套件..."
 
-#: install_steps_interactive.pm:389
+#: install_steps_interactive.pm:401
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在搜尋要升級的套件..."
 
-#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "連結到 Mirror Linux Web Site 查詢可用的映射站台"
-
-#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:825
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "選取要用來抓取程式套件檔的 FTP 映射站台"
 
-#: install_steps_interactive.pm:451
+#: install_steps_interactive.pm:461
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "您的系統沒有足夠的空間可以用來安裝或升級了 (%d > %d)"
 
-#: install_steps_interactive.pm:493
-#, c-format
+#: install_steps_interactive.pm:495
+#, fuzzy, c-format
 msgid ""
-"Please choose load or save package selection on floppy.\n"
-"The format is the same as auto_install generated floppies."
+"Please choose load or save package selection.\n"
+"The format is the same as auto_install generated files."
 msgstr ""
 "請選擇載入或者是儲存套件選擇到軟片.\n"
 "該格式等同於 auto_install 產生的軟片."
 
-#: install_steps_interactive.pm:495
-#, c-format
-msgid "Load from floppy"
-msgstr "由軟片載入"
-
-#: install_steps_interactive.pm:495
+#: install_steps_interactive.pm:497
 #, c-format
-msgid "Save on floppy"
-msgstr "儲存到軟片"
+msgid "Load"
+msgstr "負載"
 
-#: install_steps_interactive.pm:499
+#: install_steps_interactive.pm:497 standalone/drakbackup:3924
+#: standalone/drakbackup:3997 standalone/logdrake:173
 #, c-format
-msgid "Package selection"
-msgstr "套件選取"
-
-#: install_steps_interactive.pm:499
-#, c-format
-msgid "Loading from floppy"
-msgstr "正在由軟片載入"
+msgid "Save"
+msgstr "儲存"
 
-#: install_steps_interactive.pm:504
-#, c-format
-msgid "Insert a floppy containing package selection"
-msgstr "插入一張包含套件選擇的軟片"
+#: install_steps_interactive.pm:505
+#, fuzzy, c-format
+msgid "Bad file"
+msgstr "選擇檔案"
 
 #: install_steps_interactive.pm:581
 #, c-format
@@ -6167,7 +6273,7 @@ msgstr "安裝類型"
 #: install_steps_interactive.pm:597
 #, c-format
 msgid ""
-"You haven't selected any group of packages.\n"
+"You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "您並未選取任何套件群組.\n"
@@ -6183,12 +6289,12 @@ msgstr "包含基本的說明文件 (被建議的!)"
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最小安裝 (尤其無 urpmi)"
 
-#: install_steps_interactive.pm:645 standalone/drakxtv:52
+#: install_steps_interactive.pm:641 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: install_steps_interactive.pm:694
+#: install_steps_interactive.pm:680
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -6199,17 +6305,17 @@ msgstr ""
 "如果都沒有的話, 請點選 Cancel 取消.\n"
 "如果有一些項目您並沒有的話, 把該項目取消選取, 然後按下 Ok 確定."
 
-#: install_steps_interactive.pm:699
+#: install_steps_interactive.pm:685
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "標籤為 \"%s\" 的 Cd-Rom"
 
-#: install_steps_interactive.pm:720
+#: install_steps_interactive.pm:706
 #, c-format
 msgid "Preparing installation"
 msgstr "正在準備安裝"
 
-#: install_steps_interactive.pm:729
+#: install_steps_interactive.pm:715
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6218,17 +6324,17 @@ msgstr ""
 "正在安裝 %s 套件\n"
 "%d%%"
 
-#: install_steps_interactive.pm:778
+#: install_steps_interactive.pm:764
 #, c-format
 msgid "Post-install configuration"
 msgstr "安裝後的設定"
 
-#: install_steps_interactive.pm:784
+#: install_steps_interactive.pm:770
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "請在 %s 磁碟機內插入更新模組軟片"
 
-#: install_steps_interactive.pm:813
+#: install_steps_interactive.pm:799
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -6247,179 +6353,164 @@ msgstr ""
 "\n"
 "您想要安裝更新嗎?"
 
-#: install_steps_interactive.pm:853
+#: install_steps_interactive.pm:820
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "連結到 Mirror Linux Web Site 查詢可用的映射站台"
+
+#: install_steps_interactive.pm:839
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "聯繫映射站台取得可用的程式套件列表..."
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "無法聯繫映射站台 %s"
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, c-format
 msgid "Would you like to try again?"
 msgstr "您要再試一次嗎?"
 
-#: install_steps_interactive.pm:883 standalone/drakclock:46
+#: install_steps_interactive.pm:869 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您的時區為何?"
 
-#: install_steps_interactive.pm:888
+#: install_steps_interactive.pm:874
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動時間同步(使用 NTP 服務)"
 
-#: install_steps_interactive.pm:896
+#: install_steps_interactive.pm:882
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 伺服器"
 
-#: install_steps_interactive.pm:938 steps.pm:30
+#: install_steps_interactive.pm:924 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "總結"
 
-#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
-#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
-#: install_steps_interactive.pm:1136 services.pm:135
-#: standalone/drakbackup:1593
+#: install_steps_interactive.pm:937 install_steps_interactive.pm:945
+#: install_steps_interactive.pm:963 install_steps_interactive.pm:970
+#: install_steps_interactive.pm:1122 services.pm:133
+#: standalone/drakbackup:1599
 #, c-format
 msgid "System"
 msgstr "系統"
 
-#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
-#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:1004
+#: install_steps_interactive.pm:1021 install_steps_interactive.pm:1037
+#: install_steps_interactive.pm:1048
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:992
 #, c-format
 msgid "Remote CUPS server"
 msgstr "遠端 CUPS 伺服器"
 
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:983
 #, c-format
 msgid "No printer"
-msgstr "無列印機"
+msgstr "無印表機"
 
-#: install_steps_interactive.pm:1039
+#: install_steps_interactive.pm:1025
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 音效卡嗎?"
 
-#: install_steps_interactive.pm:1041
+#: install_steps_interactive.pm:1027
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "請在安裝完畢後, 執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡"
 
-#: install_steps_interactive.pm:1043
+#: install_steps_interactive.pm:1029
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "沒偵測到任何音效卡. 請在安裝後嘗試 \"harddrake\" 進行設定"
 
-#: install_steps_interactive.pm:1063
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "Graphical interface"
 msgstr "圖形介面"
 
-#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
+#: install_steps_interactive.pm:1055 install_steps_interactive.pm:1070
 #, c-format
 msgid "Network & Internet"
 msgstr "網路 & 網際網路"
 
-#: install_steps_interactive.pm:1086
+#: install_steps_interactive.pm:1072
 #, c-format
 msgid "configured"
 msgstr "已設定"
 
-#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
+#: install_steps_interactive.pm:1081 install_steps_interactive.pm:1095
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "安全性"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
 #, c-format
 msgid "activated"
 msgstr "被激活"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
 #, c-format
 msgid "disabled"
 msgstr "被禁用"
 
-#: install_steps_interactive.pm:1123
+#: install_steps_interactive.pm:1109
 #, c-format
 msgid "Boot"
 msgstr "重新開機"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1127
+#: install_steps_interactive.pm:1113
 #, c-format
 msgid "%s on %s"
-msgstr ""
+msgstr "%2$s 上的 %1$s"
 
-#: install_steps_interactive.pm:1141 services.pm:177
+#: install_steps_interactive.pm:1127 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "服務: %d 已經啟動 給 %d 註冊的項目"
 
-#: install_steps_interactive.pm:1151
+#: install_steps_interactive.pm:1137
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: install_steps_interactive.pm:1205
-#, c-format
-msgid "Set root password and network authentication methods"
-msgstr ""
-
-#: install_steps_interactive.pm:1206
-#, c-format
-msgid "Set root password"
-msgstr "設定 root 密碼"
-
 #: install_steps_interactive.pm:1217
 #, c-format
-msgid "This password is too short (it must be at least %d characters long)"
-msgstr "這個密碼太短了 (一定至少要有 %d 個字元才行)"
-
-#: install_steps_interactive.pm:1222 network/netconnect.pm:596
-#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
-#, c-format
-msgid "Authentication"
-msgstr "認證方式"
-
-#: install_steps_interactive.pm:1254
-#, c-format
 msgid "Preparing bootloader..."
 msgstr "正在準備開機載入器..."
 
-#: install_steps_interactive.pm:1264
-#, c-format
+#: install_steps_interactive.pm:1227
+#, fuzzy, c-format
 msgid ""
-"You appear to have an OldWorld or Unknown\n"
-" machine, the yaboot bootloader will not work for you.\n"
-"The install will continue, but you'll\n"
-" need to use BootX or some other means to boot your machine"
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
 msgstr ""
 "您的系統似乎有 OldWorld 或者是其他不認識的機器,\n"
 "這將會導致 yaboot 開機載入器無法正常運作.\n"
 "安裝還是會繼續下去, 不過您將需要使用 bootX 或某些其他方法來開機你的機器."
 
-#: install_steps_interactive.pm:1270
+#: install_steps_interactive.pm:1233
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "您要使用 aboot 嗎?"
 
-#: install_steps_interactive.pm:1273
+#: install_steps_interactive.pm:1236
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -6428,29 +6519,29 @@ msgstr ""
 "安裝 aboot 時發生錯誤,\n"
 "你要冒著可能毀損第一個分割區的危險強迫安裝嗎?"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1257
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1286 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "請在 %s 中插入一片空白軟片"
 
-#: install_steps_interactive.pm:1327
+#: install_steps_interactive.pm:1291
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "請插入另一張軟片給驅動磁碟"
 
-#: install_steps_interactive.pm:1329
+#: install_steps_interactive.pm:1293
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在製作自動安裝軟片..."
 
-#: install_steps_interactive.pm:1341
+#: install_steps_interactive.pm:1305
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -6461,12 +6552,12 @@ msgstr ""
 "\n"
 "您確定要結束安裝程式?"
 
-#: install_steps_interactive.pm:1356
+#: install_steps_interactive.pm:1321
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "製作自動安裝軟片"
 
-#: install_steps_interactive.pm:1358
+#: install_steps_interactive.pm:1323
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6492,37 +6583,37 @@ msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr "  <Tab>/<Alt-Tab> 在元件間移動  | <Space> 選取 | <F12> 下個螢幕 "
 
-#: interactive.pm:170
+#: interactive.pm:184
 #, c-format
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
-#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakbackup:1540
+#: standalone/drakfont:593 standalone/drakfont:660 standalone/drakups:297
 #: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
 msgid "Add"
 msgstr "增加"
 
-#: interactive.pm:295 interactive/gtk.pm:482
+#: interactive.pm:309 interactive/gtk.pm:489
 #, c-format
 msgid "Modify"
 msgstr "修改"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakups:299
 #: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
 msgid "Remove"
 msgstr "移除"
 
-#: interactive.pm:372
+#: interactive.pm:386
 #, c-format
 msgid "Basic"
 msgstr "基本"
 
-#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
+#: interactive.pm:424 interactive/newt.pm:317 ugtk2.pm:506
 #, c-format
 msgid "Finish"
 msgstr "完成"
@@ -6605,765 +6696,870 @@ msgstr ""
 msgid "Re-submit"
 msgstr "重新送出"
 
-#: keyboard.pm:163 keyboard.pm:194
+#: keyboard.pm:170 keyboard.pm:204
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTZ)"
 msgstr "捷克 (QWERTZ)"
 
-#: keyboard.pm:164 keyboard.pm:196
+#: keyboard.pm:171 keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German"
 msgstr "德國"
 
-#: keyboard.pm:165
+#: keyboard.pm:172
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:173 keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Spanish"
 msgstr "西班牙"
 
-#: keyboard.pm:167 keyboard.pm:207
+#: keyboard.pm:174 keyboard.pm:224
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Finnish"
 msgstr "芬蘭"
 
-#: keyboard.pm:168 keyboard.pm:208
+#: keyboard.pm:175 keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French"
 msgstr "法國"
 
-#: keyboard.pm:169 keyboard.pm:254
+#: keyboard.pm:176 keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Norwegian"
 msgstr "挪威"
 
-#: keyboard.pm:170
+#: keyboard.pm:177
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish"
 msgstr "波蘭"
 
-#: keyboard.pm:171 keyboard.pm:264
+#: keyboard.pm:178 keyboard.pm:287
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian"
 msgstr "俄羅斯"
 
-#: keyboard.pm:173 keyboard.pm:268
+#: keyboard.pm:180 keyboard.pm:293
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swedish"
 msgstr "瑞典"
 
-#: keyboard.pm:174 keyboard.pm:287
+#: keyboard.pm:181 keyboard.pm:320
 #, c-format
 msgid "UK keyboard"
 msgstr "英式鍵盤"
 
-#: keyboard.pm:175 keyboard.pm:288
+#: keyboard.pm:182 keyboard.pm:323
 #, c-format
 msgid "US keyboard"
 msgstr "美式鍵盤"
 
-#: keyboard.pm:177
+#: keyboard.pm:184
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "阿爾巴尼亞"
 
-#: keyboard.pm:178
+#: keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (old)"
 msgstr "亞美尼亞 (old)"
 
-#: keyboard.pm:179
+#: keyboard.pm:186
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "亞美尼亞 (typewriter)"
 
-#: keyboard.pm:180
+#: keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "亞美尼亞 (phonetic)"
 
-#: keyboard.pm:181
+#: keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabic"
 
-#: keyboard.pm:182
+#: keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "蘇聯共和國 (latin)"
 
-#: keyboard.pm:183
+#: keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "比利時"
 
-#: keyboard.pm:184
+#: keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali"
-msgstr "孟加拉"
+"Bengali (Inscript-layout)"
+msgstr "孟加拉(Inscript)"
 
-#: keyboard.pm:185
+#: keyboard.pm:192
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Bengali (Probhat)"
+msgstr "孟加拉(Probhat)"
+
+#: keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "保加利亞 (phonetic)"
 
-#: keyboard.pm:186
+#: keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "保加利亞"
 
-#: keyboard.pm:187
+#: keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "巴西 (ABNT-2)"
 
-#: keyboard.pm:188
+#: keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "愛沙尼亞"
 
-#: keyboard.pm:189
+#: keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr ""
 
-#: keyboard.pm:191
+#: keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "瑞士 (德國式配置)"
 
-#: keyboard.pm:193
+#: keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "瑞士 (法國式配置)"
 
-#: keyboard.pm:195
+#: keyboard.pm:203
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Cherokee syllabics"
+msgstr "Arabic"
+
+#: keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "捷克 (QWERTY)"
 
-#: keyboard.pm:197
+#: keyboard.pm:207
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "德國 (no dead keys)"
 
-#: keyboard.pm:198
+#: keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr ""
 
-#: keyboard.pm:199
+#: keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "丹麥"
 
-#: keyboard.pm:200
+#: keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:201
+#: keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr ""
 
-#: keyboard.pm:202
+#: keyboard.pm:214
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (French)"
+msgstr "Dvorak (Norwegian)"
+
+#: keyboard.pm:216
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (UK)"
+msgstr "Dvorak (US)"
+
+#: keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: keyboard.pm:203
+#: keyboard.pm:219
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (Polish)"
+msgstr "Dvorak (Swedish)"
+
+#: keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Swedish)"
 
-#: keyboard.pm:205
+#: keyboard.pm:221
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Dzongkha/Tibetan"
+msgstr "愛沙尼亞"
+
+#: keyboard.pm:222
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "愛沙尼亞"
 
-#: keyboard.pm:209
+#: keyboard.pm:226
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Faroese"
+msgstr "希臘"
+
+#: keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "喬治亞 (\"俄國式\" 配置)"
 
-#: keyboard.pm:210
+#: keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "喬治亞 (\"拉丁式\" 配置)"
 
-#: keyboard.pm:211
+#: keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "希臘"
 
-#: keyboard.pm:212
+#: keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: keyboard.pm:213
+#: keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: keyboard.pm:214
+#: keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: keyboard.pm:216
+#: keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "匈牙利"
 
-#: keyboard.pm:217
+#: keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "克羅埃西亞"
 
-#: keyboard.pm:218
+#: keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: keyboard.pm:219
+#: keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "以色列"
 
-#: keyboard.pm:220
+#: keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "以色列 (音標)"
 
-#: keyboard.pm:221
+#: keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "伊朗"
 
-#: keyboard.pm:222
+#: keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "冰島"
 
-#: keyboard.pm:223
+#: keyboard.pm:242
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "義大利"
 
-#: keyboard.pm:224
+#: keyboard.pm:243
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: keyboard.pm:229
+#: keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "日本 106 鍵"
 
-#: keyboard.pm:230
+#: keyboard.pm:249
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr ""
 
-#: keyboard.pm:233
+#: keyboard.pm:252
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "韓式鍵盤"
 
-#: keyboard.pm:234
+#: keyboard.pm:254
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Kurdish (arabic script)"
+msgstr "Arabic"
+
+#: keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr ""
 
-#: keyboard.pm:235
+#: keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "拉丁美洲"
 
-#: keyboard.pm:236
+#: keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "老撾國"
 
-#: keyboard.pm:238
+#: keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (old)"
 msgstr "立陶宛 (舊 AZERTY 式)"
 
-#: keyboard.pm:241
+#: keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (new)"
 msgstr "立陶宛 (新 AZERTY 式)"
 
-#: keyboard.pm:243
+#: keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"number row\" QWERTY"
 msgstr "立陶宛 \"number row, QWERTY 式\""
 
-#: keyboard.pm:245
+#: keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"phonetic\" QWERTY"
 msgstr "立陶宛 \"phonetic, QWERTY 式\""
 
-#: keyboard.pm:246
+#: keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "拉托維亞"
 
-#: keyboard.pm:247
+#: keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: keyboard.pm:248
+#: keyboard.pm:269
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "馬其頓"
 
-#: keyboard.pm:249
+#: keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "緬甸語 (Burmese)"
 
-#: keyboard.pm:250
+#: keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "蒙古語 (cyrillic)"
 
-#: keyboard.pm:251
+#: keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "馬爾他語 (UK)"
 
-#: keyboard.pm:252
+#: keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "馬爾他語 (US)"
 
-#: keyboard.pm:253
+#: keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "荷蘭"
 
-#: keyboard.pm:255
+#: keyboard.pm:276
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: keyboard.pm:256
+#: keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "波蘭 (qwerty 式配置)"
 
-#: keyboard.pm:257
+#: keyboard.pm:278
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "波蘭 (qwertz 式配置)"
 
-#: keyboard.pm:258
+#: keyboard.pm:280
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Pashto"
+msgstr "波蘭"
+
+#: keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "葡萄牙"
 
-#: keyboard.pm:260
+#: keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "加拿大 (魁北克)"
 
-#: keyboard.pm:262
+#: keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "羅馬尼亞 (qwertz)"
 
-#: keyboard.pm:263
+#: keyboard.pm:286
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "羅馬尼亞 (qwerty)"
 
-#: keyboard.pm:265
+#: keyboard.pm:288
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "俄羅斯 (音標)"
 
-#: keyboard.pm:266
+#: keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr ""
 
-#: keyboard.pm:267
+#: keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: keyboard.pm:269
+#: keyboard.pm:292
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Sindhi"
+msgstr "泰式鍵盤"
+
+#: keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "斯洛法尼亞"
 
-#: keyboard.pm:270
+#: keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "斯洛法克 (QWERTZ)"
 
-#: keyboard.pm:271
+#: keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "斯洛法克 (QWERTY)"
 
-#: keyboard.pm:273
+#: keyboard.pm:298
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "塞爾維亞 (cyrillic)"
 
-#: keyboard.pm:274
+#: keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriac"
 
-#: keyboard.pm:275
+#: keyboard.pm:300
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "利亞語 (phonetic)"
 
-#: keyboard.pm:276
+#: keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr ""
 
-#: keyboard.pm:278
+#: keyboard.pm:303
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "坦米爾 (ISCII-佈置)"
 
-#: keyboard.pm:279
+#: keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "亞美尼亞 (Typewriter-佈置)"
 
-#: keyboard.pm:280
-#, c-format
+#: keyboard.pm:305
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (Kedmanee)"
+msgstr "泰式鍵盤"
+
+#: keyboard.pm:306
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (TIS-820)"
+msgstr "泰式鍵盤"
+
+#: keyboard.pm:308
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"Thai"
+"Thai (Pattachote)"
 msgstr "泰式鍵盤"
 
-#: keyboard.pm:282
+#: keyboard.pm:311
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Tifinagh (+latin/arabic)"
+msgstr "南斯拉夫 (拉丁)"
+
+#: keyboard.pm:313
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik 鍵盤"
 
-#: keyboard.pm:283
+#: keyboard.pm:315
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Turkmen"
+msgstr "德國"
+
+#: keyboard.pm:316
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (traditional \"F\" model)"
 msgstr "土耳其 (傳統式 \"F\" 型)"
 
-#: keyboard.pm:284
+#: keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (modern \"Q\" model)"
 msgstr "土耳其 (現代式 \"Q\" 型)"
 
-#: keyboard.pm:286
+#: keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "烏克蘭"
 
-#: keyboard.pm:289
+#: keyboard.pm:322
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Urdu keyboard"
+msgstr "韓式鍵盤"
+
+#: keyboard.pm:324
 #, c-format
 msgid "US keyboard (international)"
 msgstr "美式鍵盤 (國際型)"
 
-#: keyboard.pm:290
+#: keyboard.pm:325
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "塞爾維亞 (cyrillic)"
 
-#: keyboard.pm:292
+#: keyboard.pm:327
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "越南 \"numeric row\" QWERTY 式"
 
-#: keyboard.pm:293
+#: keyboard.pm:328
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "南斯拉夫 (拉丁)"
 
-#: keyboard.pm:300
+#: keyboard.pm:335
 #, c-format
 msgid "Right Alt key"
 msgstr "右方 Alt 按鍵"
 
-#: keyboard.pm:301
+#: keyboard.pm:336
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "同時兩邊 Shift 按鍵"
 
-#: keyboard.pm:302
+#: keyboard.pm:337
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control 與 Shift 鍵同時"
 
-#: keyboard.pm:303
+#: keyboard.pm:338
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock 按鍵"
 
-#: keyboard.pm:304
+#: keyboard.pm:339
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift 與 CapsLock 鍵同時"
 
-#: keyboard.pm:305
+#: keyboard.pm:340
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl 與 Alt 鍵同時"
 
-#: keyboard.pm:306
+#: keyboard.pm:341
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt 與 Shift 鍵同時"
 
-#: keyboard.pm:307
+#: keyboard.pm:342
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"選單\" 按鍵"
 
-#: keyboard.pm:308
+#: keyboard.pm:343
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "左邊 \"Windows\" 按鍵"
 
-#: keyboard.pm:309
+#: keyboard.pm:344
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "右邊 \"Windows\" 按鍵"
 
-#: keyboard.pm:310
+#: keyboard.pm:345
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "同時兩邊 Control 按鍵"
 
-#: keyboard.pm:311
+#: keyboard.pm:346
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "同時兩邊 Alt 按鍵"
 
-#: keyboard.pm:312
+#: keyboard.pm:347
 #, c-format
 msgid "Left Shift key"
 msgstr "左邊 Shift 按鍵"
 
-#: keyboard.pm:313
+#: keyboard.pm:348
 #, c-format
 msgid "Right Shift key"
 msgstr "右邊 Shift 按鍵"
 
-#: keyboard.pm:314
+#: keyboard.pm:349
 #, c-format
 msgid "Left Alt key"
 msgstr "左邊 Alt 按鍵"
 
-#: keyboard.pm:315
+#: keyboard.pm:350
 #, c-format
 msgid "Left Control key"
 msgstr "左邊 Control 按鍵"
 
-#: keyboard.pm:316
+#: keyboard.pm:351
 #, c-format
 msgid "Right Control key"
 msgstr "右邊 Control 按鍵"
 
-#: keyboard.pm:347
+#: keyboard.pm:387
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7373,7 +7569,7 @@ msgstr ""
 "請選擇按鍵或組合鍵, 以便於快速的切換不同的鍵盤配置\n"
 "(eg: 拉丁與非拉丁)"
 
-#: keyboard.pm:352
+#: keyboard.pm:392
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7384,1165 +7580,1145 @@ msgstr ""
 #. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
 #. -PO: or as "default:RTL", depending if your language is written from
 #. -PO: left to right, or from right to left; any other string is wrong.
-#: lang.pm:165
+#: lang.pm:173
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:182
+#: lang.pm:190
 #, c-format
 msgid "Andorra"
-msgstr "Andorra"
+msgstr "安道爾"
 
-#: lang.pm:183
+#: lang.pm:191 network/adsl_consts.pm:826
 #, c-format
 msgid "United Arab Emirates"
 msgstr "阿拉伯聯合大公國"
 
-#: lang.pm:184
+#: lang.pm:192
 #, c-format
 msgid "Afghanistan"
-msgstr "Afghanistan"
+msgstr "阿富汗"
 
-#: lang.pm:185
+#: lang.pm:193
 #, c-format
 msgid "Antigua and Barbuda"
-msgstr "Antigua and Barbuda"
+msgstr "安地卡及巴布達"
 
-#: lang.pm:186
+#: lang.pm:194
 #, c-format
 msgid "Anguilla"
-msgstr "Anguilla"
+msgstr "安圭拉島"
 
-#: lang.pm:187
+#: lang.pm:195
 #, c-format
 msgid "Albania"
-msgstr "Albania"
+msgstr "阿爾巴尼亞"
 
-#: lang.pm:188
+#: lang.pm:196
 #, c-format
 msgid "Armenia"
-msgstr "Armenia"
+msgstr "亞美尼亞"
 
-#: lang.pm:189
+#: lang.pm:197
 #, c-format
 msgid "Netherlands Antilles"
-msgstr "Netherlands Antilles"
+msgstr "荷屬安地列斯群島"
 
-#: lang.pm:190
+#: lang.pm:198
 #, c-format
 msgid "Angola"
-msgstr "Angola"
+msgstr "安哥拉"
 
-#: lang.pm:191
+#: lang.pm:199
 #, c-format
 msgid "Antarctica"
-msgstr "Antarctica"
+msgstr "南極洲"
 
-#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
+#: lang.pm:200 network/adsl_consts.pm:40 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: lang.pm:193
+#: lang.pm:201
 #, c-format
 msgid "American Samoa"
-msgstr "American Samoa"
+msgstr "美屬薩摩亞"
 
-#: lang.pm:195 standalone/drakxtv:48
+#: lang.pm:203 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "澳洲"
 
-#: lang.pm:196
+#: lang.pm:204
 #, c-format
 msgid "Aruba"
-msgstr "Aruba"
+msgstr "阿魯巴島"
 
-#: lang.pm:197
+#: lang.pm:205
 #, c-format
 msgid "Azerbaijan"
-msgstr "Azerbaijan"
+msgstr "阿塞拜然"
 
-#: lang.pm:198
+#: lang.pm:206
 #, c-format
 msgid "Bosnia and Herzegovina"
-msgstr "Bosnia and Herzegovina"
+msgstr "波斯尼亞及黑塞哥維那"
 
-#: lang.pm:199
+#: lang.pm:207
 #, c-format
 msgid "Barbados"
-msgstr "Barbados"
+msgstr "巴巴多斯島"
 
-#: lang.pm:200
+#: lang.pm:208
 #, c-format
 msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr "孟加拉"
 
-#: lang.pm:202
+#: lang.pm:210
 #, c-format
 msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr "布吉納法索"
 
-#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
+#: lang.pm:211 network/adsl_consts.pm:143 network/adsl_consts.pm:151
 #, c-format
 msgid "Bulgaria"
-msgstr "Bulgaria"
+msgstr "保加利亞"
 
-#: lang.pm:204
+#: lang.pm:212
 #, c-format
 msgid "Bahrain"
-msgstr "Bahrain"
+msgstr "巴林"
 
-#: lang.pm:205
+#: lang.pm:213
 #, c-format
 msgid "Burundi"
-msgstr "Burundi"
+msgstr "蒲隆地"
 
-#: lang.pm:206
+#: lang.pm:214
 #, c-format
 msgid "Benin"
-msgstr "Benin"
+msgstr "貝南"
 
-#: lang.pm:207
+#: lang.pm:215
 #, c-format
 msgid "Bermuda"
-msgstr "Bermuda"
+msgstr "百慕達"
 
-#: lang.pm:208
+#: lang.pm:216
 #, c-format
 msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
+msgstr "汶萊"
 
-#: lang.pm:209
+#: lang.pm:217
 #, c-format
 msgid "Bolivia"
-msgstr "Bolivia"
+msgstr "玻利維亞"
 
-#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
-#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
+#: lang.pm:218 network/adsl_consts.pm:109 network/adsl_consts.pm:119
+#: network/adsl_consts.pm:127 network/adsl_consts.pm:135
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: lang.pm:211
+#: lang.pm:219
 #, c-format
 msgid "Bahamas"
-msgstr "Bahamas"
+msgstr "巴哈馬"
 
-#: lang.pm:212
+#: lang.pm:220
 #, c-format
 msgid "Bhutan"
-msgstr "Bhutan"
+msgstr "不丹"
 
-#: lang.pm:213
+#: lang.pm:221
 #, c-format
 msgid "Bouvet Island"
-msgstr "Bouvet Island"
+msgstr "波維特島"
 
-#: lang.pm:214
+#: lang.pm:222
 #, c-format
 msgid "Botswana"
-msgstr "Botswana"
+msgstr "波札那"
 
-#: lang.pm:215
+#: lang.pm:223
 #, c-format
 msgid "Belarus"
-msgstr "Belarus"
+msgstr "白俄羅斯"
 
-#: lang.pm:216
+#: lang.pm:224
 #, c-format
 msgid "Belize"
-msgstr "Belize"
+msgstr "貝里斯"
 
-#: lang.pm:217
+#: lang.pm:225
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: lang.pm:218
+#: lang.pm:226
 #, c-format
 msgid "Cocos (Keeling) Islands"
-msgstr "Cocos (Keeling) Islands"
+msgstr "可可斯群島"
 
-#: lang.pm:219
+#: lang.pm:227
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr ""
 
-#: lang.pm:220
+#: lang.pm:228
 #, c-format
 msgid "Central African Republic"
-msgstr "Central African Republic"
+msgstr "中非共和國"
 
-#: lang.pm:221
+#: lang.pm:229
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr ""
 
-#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
-#, c-format
-msgid "Switzerland"
-msgstr "Switzerland"
-
-#: lang.pm:223
+#: lang.pm:231
 #, c-format
 msgid "Cote d'Ivoire"
-msgstr "Cote d'Ivoire"
+msgstr "象牙海岸"
 
-#: lang.pm:224
+#: lang.pm:232
 #, c-format
 msgid "Cook Islands"
-msgstr "Cook Islands"
+msgstr "庫克群島"
 
-#: lang.pm:225
+#: lang.pm:233
 #, c-format
 msgid "Chile"
-msgstr "Chile"
+msgstr "智利"
 
-#: lang.pm:226
+#: lang.pm:234
 #, c-format
 msgid "Cameroon"
-msgstr "Cameroon"
-
-#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
-#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
-#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
-#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
-#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
-#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
-#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
-#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
-#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
-#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
+msgstr "喀麥隆"
+
+#: lang.pm:235 network/adsl_consts.pm:159 network/adsl_consts.pm:167
+#: network/adsl_consts.pm:175 network/adsl_consts.pm:183
+#: network/adsl_consts.pm:191 network/adsl_consts.pm:199
+#: network/adsl_consts.pm:207 network/adsl_consts.pm:215
+#: network/adsl_consts.pm:223 network/adsl_consts.pm:231
+#: network/adsl_consts.pm:239 network/adsl_consts.pm:247
+#: network/adsl_consts.pm:255 network/adsl_consts.pm:263
+#: network/adsl_consts.pm:271 network/adsl_consts.pm:279
+#: network/adsl_consts.pm:287 network/adsl_consts.pm:295
+#: network/adsl_consts.pm:303 network/adsl_consts.pm:311
 #, c-format
 msgid "China"
 msgstr "中國"
 
-#: lang.pm:228
+#: lang.pm:236
 #, c-format
 msgid "Colombia"
-msgstr "Colombia"
+msgstr "哥倫比亞"
 
-#: lang.pm:230
+#: lang.pm:238
 #, c-format
 msgid "Serbia & Montenegro"
-msgstr ""
+msgstr "塞爾維亞及芒特尼格羅共和國"
 
-#: lang.pm:231
+#: lang.pm:239
 #, c-format
 msgid "Cuba"
-msgstr "Cuba"
+msgstr "古巴"
 
-#: lang.pm:232
+#: lang.pm:240
 #, c-format
 msgid "Cape Verde"
-msgstr "Cape Verde"
+msgstr "維德角島"
 
-#: lang.pm:233
+#: lang.pm:241
 #, c-format
 msgid "Christmas Island"
 msgstr "聖誕島"
 
-#: lang.pm:234
+#: lang.pm:242
 #, c-format
 msgid "Cyprus"
-msgstr "Cyprus"
+msgstr "賽普勒斯"
 
-#: lang.pm:237
+#: lang.pm:245
 #, c-format
 msgid "Djibouti"
-msgstr "Djibouti"
+msgstr "吉布地"
 
-#: lang.pm:238 network/adsl_consts.pm:302
+#: lang.pm:246 network/adsl_consts.pm:327
 #, c-format
 msgid "Denmark"
-msgstr "Denmark"
+msgstr "丹麥"
 
-#: lang.pm:239
+#: lang.pm:247
 #, c-format
 msgid "Dominica"
-msgstr "Dominica"
+msgstr "多米尼克聯邦"
 
-#: lang.pm:240
+#: lang.pm:248
 #, c-format
 msgid "Dominican Republic"
-msgstr "Dominican Republic"
+msgstr "多明尼加共和國"
 
-#: lang.pm:241
+#: lang.pm:249 network/adsl_consts.pm:30
 #, c-format
 msgid "Algeria"
-msgstr "Algeria"
+msgstr "阿爾及利亞"
 
-#: lang.pm:242
+#: lang.pm:250
 #, c-format
 msgid "Ecuador"
-msgstr "Ecuador"
+msgstr "厄瓜多"
 
-#: lang.pm:243
+#: lang.pm:251
 #, c-format
 msgid "Estonia"
-msgstr "Estonia"
+msgstr "愛沙尼亞"
 
-#: lang.pm:244
+#: lang.pm:252
 #, c-format
 msgid "Egypt"
-msgstr "Egypt"
+msgstr "埃及"
 
-#: lang.pm:245
+#: lang.pm:253
 #, c-format
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: lang.pm:246
+#: lang.pm:254
 #, c-format
 msgid "Eritrea"
-msgstr "Eritrea"
+msgstr "厄利垂亞"
 
-#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
-#: network/adsl_consts.pm:551
+#: lang.pm:255 network/adsl_consts.pm:663 network/adsl_consts.pm:672
+#: network/adsl_consts.pm:682 network/adsl_consts.pm:692
+#: network/adsl_consts.pm:700 network/adsl_consts.pm:708
+#: network/adsl_consts.pm:716 network/adsl_consts.pm:724
+#: network/adsl_consts.pm:732 network/adsl_consts.pm:740
+#: network/adsl_consts.pm:748 network/adsl_consts.pm:756
+#: network/adsl_consts.pm:764
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: lang.pm:248
+#: lang.pm:256
 #, c-format
 msgid "Ethiopia"
-msgstr "Ethiopia"
+msgstr "依索比亞"
 
-#: lang.pm:249 network/adsl_consts.pm:402
+#: lang.pm:257 network/adsl_consts.pm:335
 #, c-format
 msgid "Finland"
 msgstr "芬蘭"
 
-#: lang.pm:250
+#: lang.pm:258
 #, c-format
 msgid "Fiji"
-msgstr "Fiji"
+msgstr "斐濟群島"
 
-#: lang.pm:251
+#: lang.pm:259
 #, c-format
 msgid "Falkland Islands (Malvinas)"
-msgstr "Falkland Islands (Malvinas)"
+msgstr "福克蘭群島"
 
-#: lang.pm:252
+#: lang.pm:260
 #, c-format
 msgid "Micronesia"
-msgstr "Micronesia"
+msgstr "密克羅尼西亞"
 
-#: lang.pm:253
+#: lang.pm:261
 #, c-format
 msgid "Faroe Islands"
-msgstr "Faroe Islands"
+msgstr "法羅群島"
 
-#: lang.pm:255
+#: lang.pm:263
 #, c-format
 msgid "Gabon"
-msgstr "Gabon"
+msgstr "加彭"
 
-#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: lang.pm:264 network/adsl_consts.pm:836 network/adsl_consts.pm:846
 #: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "英國"
 
-#: lang.pm:257
+#: lang.pm:265
 #, c-format
 msgid "Grenada"
-msgstr "Grenada"
+msgstr "格瑞那達"
 
-#: lang.pm:258
+#: lang.pm:266
 #, c-format
 msgid "Georgia"
-msgstr "Georgia"
+msgstr "喬治亞"
 
-#: lang.pm:259
+#: lang.pm:267
 #, c-format
 msgid "French Guiana"
-msgstr "French Guiana"
+msgstr "法屬幾內亞"
 
-#: lang.pm:260
+#: lang.pm:268
 #, c-format
 msgid "Ghana"
-msgstr "Ghana"
+msgstr "迦納"
 
-#: lang.pm:261
+#: lang.pm:269
 #, c-format
 msgid "Gibraltar"
-msgstr "Gibraltar"
+msgstr "直布羅陀"
 
-#: lang.pm:262
+#: lang.pm:270
 #, c-format
 msgid "Greenland"
-msgstr "Greenland"
+msgstr "格陵蘭島"
 
-#: lang.pm:263
+#: lang.pm:271
 #, c-format
 msgid "Gambia"
-msgstr "Gambia"
+msgstr "甘比亞"
 
-#: lang.pm:264
+#: lang.pm:272
 #, c-format
 msgid "Guinea"
-msgstr "Guinea"
+msgstr "幾內亞"
 
-#: lang.pm:265
+#: lang.pm:273
 #, c-format
 msgid "Guadeloupe"
-msgstr "Guadeloupe"
+msgstr "瓜德魯普島"
 
-#: lang.pm:266
+#: lang.pm:274
 #, c-format
 msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
+msgstr "赤道幾內亞"
 
-#: lang.pm:268
+#: lang.pm:276
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr ""
 
-#: lang.pm:269
+#: lang.pm:277
 #, c-format
 msgid "Guatemala"
-msgstr "Guatemala"
+msgstr "瓜地馬拉"
 
-#: lang.pm:270
+#: lang.pm:278
 #, c-format
 msgid "Guam"
 msgstr "關島"
 
-#: lang.pm:271
+#: lang.pm:279
 #, c-format
 msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr "幾內亞比索"
 
-#: lang.pm:272
+#: lang.pm:280
 #, c-format
 msgid "Guyana"
-msgstr "Guyana"
+msgstr "蓋亞那"
 
-#: lang.pm:273
+#: lang.pm:281
 #, c-format
 msgid "Hong Kong SAR (China)"
 msgstr "香港 SAR (中國)"
 
-#: lang.pm:274
+#: lang.pm:282
 #, c-format
 msgid "Heard and McDonald Islands"
-msgstr ""
+msgstr "赫德及麥當勞群島"
 
-#: lang.pm:275
+#: lang.pm:283
 #, c-format
 msgid "Honduras"
-msgstr "Honduras"
+msgstr "宏都拉斯"
 
-#: lang.pm:276
+#: lang.pm:284
 #, c-format
 msgid "Croatia"
-msgstr "Croatia"
+msgstr "克羅地亞"
 
-#: lang.pm:277
+#: lang.pm:285
 #, c-format
 msgid "Haiti"
-msgstr "Haiti"
+msgstr "海地"
 
-#: lang.pm:278 network/adsl_consts.pm:436
-#, c-format
-msgid "Hungary"
-msgstr "匈牙利"
-
-#: lang.pm:279
+#: lang.pm:287
 #, c-format
 msgid "Indonesia"
 msgstr "印度尼西亞"
 
-#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
+#: lang.pm:288 network/adsl_consts.pm:471 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: lang.pm:281
+#: lang.pm:289 network/adsl_consts.pm:479
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: lang.pm:282
+#: lang.pm:290
 #, c-format
 msgid "India"
 msgstr "印度"
 
-#: lang.pm:283
+#: lang.pm:291
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "大不列顛印度海洋領土"
 
-#: lang.pm:284
+#: lang.pm:292
 #, c-format
 msgid "Iraq"
-msgstr "Iraq"
+msgstr "伊拉克"
 
-#: lang.pm:285
+#: lang.pm:293
 #, c-format
 msgid "Iran"
-msgstr ""
+msgstr "伊朗"
 
-#: lang.pm:286
+#: lang.pm:294
 #, c-format
 msgid "Iceland"
-msgstr "Iceland"
+msgstr "冰島"
 
-#: lang.pm:288
+#: lang.pm:296
 #, c-format
 msgid "Jamaica"
 msgstr "牙買加"
 
-#: lang.pm:289
+#: lang.pm:297
 #, c-format
 msgid "Jordan"
 msgstr "約旦"
 
-#: lang.pm:290
+#: lang.pm:298
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: lang.pm:291
+#: lang.pm:299
 #, c-format
 msgid "Kenya"
 msgstr "肯亞"
 
-#: lang.pm:292
+#: lang.pm:300
 #, c-format
 msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
+msgstr "吉爾吉斯"
 
-#: lang.pm:293
+#: lang.pm:301
 #, c-format
 msgid "Cambodia"
-msgstr "Cambodia"
+msgstr "柬埔寨"
 
-#: lang.pm:294
+#: lang.pm:302
 #, c-format
 msgid "Kiribati"
-msgstr "Kiribati"
+msgstr "吉里巴斯"
 
-#: lang.pm:295
+#: lang.pm:303
 #, c-format
 msgid "Comoros"
-msgstr "Comoros"
+msgstr "葛摩"
 
-#: lang.pm:296
+#: lang.pm:304
 #, c-format
 msgid "Saint Kitts and Nevis"
-msgstr "Saint Kitts and Nevis"
+msgstr "聖克里斯多福"
 
-#: lang.pm:297
+#: lang.pm:305
 #, c-format
 msgid "Korea (North)"
-msgstr ""
+msgstr "北韓"
 
-#: lang.pm:298
+#: lang.pm:306
 #, c-format
 msgid "Korea"
 msgstr "韓國"
 
-#: lang.pm:299
+#: lang.pm:307
 #, c-format
 msgid "Kuwait"
 msgstr "科威特"
 
-#: lang.pm:300
+#: lang.pm:308
 #, c-format
 msgid "Cayman Islands"
-msgstr "Cayman Islands"
+msgstr "開曼群島"
 
-#: lang.pm:301
+#: lang.pm:309
 #, c-format
 msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgstr "哈薩克"
 
-#: lang.pm:302
+#: lang.pm:310
 #, c-format
 msgid "Laos"
 msgstr "寮國"
 
-#: lang.pm:303
+#: lang.pm:311
 #, c-format
 msgid "Lebanon"
-msgstr "Lebanon"
+msgstr "黎巴嫩"
 
-#: lang.pm:304
+#: lang.pm:312
 #, c-format
 msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr "聖露西亞"
 
-#: lang.pm:305
+#: lang.pm:313
 #, c-format
 msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr "列支敦斯登"
 
-#: lang.pm:306
+#: lang.pm:314
 #, c-format
 msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr "斯里蘭卡"
 
-#: lang.pm:307
+#: lang.pm:315
 #, c-format
 msgid "Liberia"
 msgstr "利比利亞"
 
-#: lang.pm:308
+#: lang.pm:316
 #, c-format
 msgid "Lesotho"
 msgstr "賴索托"
 
-#: lang.pm:309 network/adsl_consts.pm:479
+#: lang.pm:317 network/adsl_consts.pm:527
 #, c-format
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: lang.pm:310
+#: lang.pm:318
 #, c-format
 msgid "Luxembourg"
 msgstr "森堡"
 
-#: lang.pm:311
+#: lang.pm:319
 #, c-format
 msgid "Latvia"
-msgstr "Latvia"
+msgstr "拉脫維亞"
 
-#: lang.pm:312
+#: lang.pm:320
 #, c-format
 msgid "Libya"
 msgstr "利比亞"
 
-#: lang.pm:313 network/adsl_consts.pm:487
+#: lang.pm:321 network/adsl_consts.pm:535
 #, c-format
 msgid "Morocco"
-msgstr "Morocco"
+msgstr "摩洛哥"
 
-#: lang.pm:314
+#: lang.pm:322
 #, c-format
 msgid "Monaco"
-msgstr "Monaco"
+msgstr "摩納哥"
 
-#: lang.pm:315
+#: lang.pm:323
 #, c-format
 msgid "Moldova"
-msgstr "Moldova"
+msgstr "摩爾多瓦"
 
-#: lang.pm:316
+#: lang.pm:324
 #, c-format
 msgid "Madagascar"
-msgstr "Madagascar"
+msgstr "馬達加斯加"
 
-#: lang.pm:317
+#: lang.pm:325
 #, c-format
 msgid "Marshall Islands"
-msgstr "Marshall Islands"
+msgstr "馬紹爾群島"
 
-#: lang.pm:318
+#: lang.pm:326
 #, c-format
 msgid "Macedonia"
 msgstr "馬其頓"
 
-#: lang.pm:319
+#: lang.pm:327
 #, c-format
 msgid "Mali"
 msgstr "馬里"
 
-#: lang.pm:320
+#: lang.pm:328
 #, c-format
 msgid "Myanmar"
-msgstr "Myanmar"
+msgstr "緬甸文字"
 
-#: lang.pm:321
+#: lang.pm:329
 #, c-format
 msgid "Mongolia"
-msgstr "Mongolia"
+msgstr "蒙古"
 
-#: lang.pm:322
+#: lang.pm:330
 #, c-format
 msgid "Northern Mariana Islands"
-msgstr "Northern Mariana Islands"
+msgstr "北馬里亞納群島"
 
-#: lang.pm:323
+#: lang.pm:331
 #, c-format
 msgid "Martinique"
-msgstr "Martinique"
+msgstr "聖馬丁節"
 
-#: lang.pm:324
+#: lang.pm:332
 #, c-format
 msgid "Mauritania"
-msgstr "Mauritania"
+msgstr "茅利塔尼亞"
 
-#: lang.pm:325
+#: lang.pm:333
 #, c-format
 msgid "Montserrat"
-msgstr "Montserrat"
+msgstr "蒙瑟拉特島"
 
-#: lang.pm:326
+#: lang.pm:334
 #, c-format
 msgid "Malta"
-msgstr "Malta"
+msgstr "馬爾他"
 
-#: lang.pm:327
+#: lang.pm:335
 #, c-format
 msgid "Mauritius"
-msgstr "Mauritius"
+msgstr "模里西斯"
 
-#: lang.pm:328
+#: lang.pm:336
 #, c-format
 msgid "Maldives"
-msgstr "Maldives"
+msgstr "馬爾地夫"
 
-#: lang.pm:329
+#: lang.pm:337
 #, c-format
 msgid "Malawi"
-msgstr "Malawi"
+msgstr "馬拉威"
 
-#: lang.pm:330
+#: lang.pm:338
 #, c-format
 msgid "Mexico"
-msgstr "Mexico"
+msgstr "墨西哥"
 
-#: lang.pm:331
+#: lang.pm:339
 #, c-format
 msgid "Malaysia"
-msgstr "Malaysia"
+msgstr "馬來西亞"
 
-#: lang.pm:332
+#: lang.pm:340
 #, c-format
 msgid "Mozambique"
-msgstr "Mozambique"
+msgstr "莫三比克"
 
-#: lang.pm:333
+#: lang.pm:341
 #, c-format
 msgid "Namibia"
-msgstr "Namibia"
+msgstr "納米比亞"
 
-#: lang.pm:334
+#: lang.pm:342
 #, c-format
 msgid "New Caledonia"
-msgstr "New Caledonia"
+msgstr "新喀里多尼亞群島"
 
-#: lang.pm:335
+#: lang.pm:343
 #, c-format
 msgid "Niger"
-msgstr "Niger"
+msgstr "尼日"
 
-#: lang.pm:336
+#: lang.pm:344
 #, c-format
 msgid "Norfolk Island"
-msgstr "Norfolk Island"
+msgstr "諾福克群島"
 
-#: lang.pm:337
+#: lang.pm:345
 #, c-format
 msgid "Nigeria"
-msgstr "Nigeria"
+msgstr "奈及利亞"
 
-#: lang.pm:338
+#: lang.pm:346
 #, c-format
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: lang.pm:341
+#: lang.pm:349
 #, c-format
 msgid "Nepal"
 msgstr "尼泊爾"
 
-#: lang.pm:342
+#: lang.pm:350
 #, c-format
 msgid "Nauru"
-msgstr "Nauru"
+msgstr "諾魯"
 
-#: lang.pm:343
+#: lang.pm:351
 #, c-format
 msgid "Niue"
-msgstr "Niue"
+msgstr "紐威島"
 
-#: lang.pm:344
+#: lang.pm:352
 #, c-format
 msgid "New Zealand"
-msgstr "New Zealand"
+msgstr "紐西蘭"
 
-#: lang.pm:345
+#: lang.pm:353
 #, c-format
 msgid "Oman"
-msgstr "Oman"
+msgstr "阿曼"
 
-#: lang.pm:346
+#: lang.pm:354
 #, c-format
 msgid "Panama"
-msgstr "Panama"
+msgstr "巴拿馬"
 
-#: lang.pm:347
+#: lang.pm:355
 #, c-format
 msgid "Peru"
-msgstr "Peru"
+msgstr "秘魯"
 
-#: lang.pm:348
+#: lang.pm:356
 #, c-format
 msgid "French Polynesia"
-msgstr "French Polynesia"
+msgstr "法屬玻里尼西亞"
 
-#: lang.pm:349
+#: lang.pm:357
 #, c-format
 msgid "Papua New Guinea"
-msgstr "Papua New Guinea"
+msgstr "巴布亞紐幾內亞"
 
-#: lang.pm:350
+#: lang.pm:358
 #, c-format
 msgid "Philippines"
-msgstr "Philippines"
+msgstr "菲律賓"
 
-#: lang.pm:351
+#: lang.pm:359
 #, c-format
 msgid "Pakistan"
-msgstr "Pakistan"
-
-#: lang.pm:352 network/adsl_consts.pm:503
-#, c-format
-msgid "Poland"
-msgstr "波蘭"
+msgstr "巴基斯坦"
 
-#: lang.pm:353
+#: lang.pm:361
 #, c-format
 msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
+msgstr "聖匹及密啟倫群島"
 
-#: lang.pm:354
+#: lang.pm:362
 #, c-format
 msgid "Pitcairn"
-msgstr "Pitcairn"
+msgstr "皮特康"
 
-#: lang.pm:355
+#: lang.pm:363
 #, c-format
 msgid "Puerto Rico"
-msgstr "Puerto Rico"
+msgstr "波多黎各"
 
-#: lang.pm:356
+#: lang.pm:364
 #, c-format
 msgid "Palestine"
 msgstr ""
 
-#: lang.pm:357 network/adsl_consts.pm:513
+#: lang.pm:365 network/adsl_consts.pm:634
 #, c-format
 msgid "Portugal"
-msgstr "Portugal"
+msgstr "葡萄牙"
 
-#: lang.pm:358
+#: lang.pm:366
 #, c-format
 msgid "Paraguay"
-msgstr "Paraguay"
+msgstr "巴拉圭"
 
-#: lang.pm:359
+#: lang.pm:367
 #, c-format
 msgid "Palau"
-msgstr "Palau"
+msgstr "帛琉群島"
 
-#: lang.pm:360
+#: lang.pm:368
 #, c-format
 msgid "Qatar"
-msgstr "Qatar"
+msgstr "卡達"
 
-#: lang.pm:361
+#: lang.pm:369
 #, c-format
 msgid "Reunion"
-msgstr "Reunion"
+msgstr "留尼旺"
 
-#: lang.pm:362
+#: lang.pm:370
 #, c-format
 msgid "Romania"
-msgstr "Romania"
+msgstr "羅馬尼亞"
 
-#: lang.pm:363
+#: lang.pm:371 network/adsl_consts.pm:642
 #, c-format
 msgid "Russia"
 msgstr "蘇俄"
 
-#: lang.pm:364
+#: lang.pm:372
 #, c-format
 msgid "Rwanda"
-msgstr "Rwanda"
+msgstr "盧旺達"
 
-#: lang.pm:365
+#: lang.pm:373
 #, c-format
 msgid "Saudi Arabia"
 msgstr "沙烏地阿拉伯"
 
-#: lang.pm:366
+#: lang.pm:374
 #, c-format
 msgid "Solomon Islands"
-msgstr "Solomon Islands"
+msgstr "所羅門群島"
 
-#: lang.pm:367
+#: lang.pm:375
 #, c-format
 msgid "Seychelles"
-msgstr "Seychelles"
+msgstr "塞席爾"
 
-#: lang.pm:368
+#: lang.pm:376
 #, c-format
 msgid "Sudan"
-msgstr "Sudan"
+msgstr "蘇丹"
 
-#: lang.pm:370
+#: lang.pm:378
 #, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: lang.pm:371
+#: lang.pm:379
 #, c-format
 msgid "Saint Helena"
-msgstr "Saint Helena"
+msgstr "聖赫勒拿島"
 
-#: lang.pm:372 network/adsl_consts.pm:520
+#: lang.pm:380 network/adsl_consts.pm:652
 #, c-format
 msgid "Slovenia"
-msgstr "Slovenia"
+msgstr "斯洛維尼亞"
 
-#: lang.pm:373
+#: lang.pm:381
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
-msgstr "Svalbard and Jan Mayen Islands"
-
-#: lang.pm:374
-#, c-format
-msgid "Slovakia"
-msgstr "Slovakia"
+msgstr "斯瓦巴及尖棉島"
 
-#: lang.pm:375
+#: lang.pm:383
 #, c-format
 msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr "獅子山"
 
-#: lang.pm:376
+#: lang.pm:384
 #, c-format
 msgid "San Marino"
-msgstr "San Marino"
+msgstr "聖馬利諾"
 
-#: lang.pm:377
+#: lang.pm:385
 #, c-format
 msgid "Senegal"
-msgstr "Senegal"
+msgstr "塞內加爾"
 
-#: lang.pm:378
+#: lang.pm:386
 #, c-format
 msgid "Somalia"
-msgstr "Somalia"
+msgstr "索馬利亞"
 
-#: lang.pm:379
+#: lang.pm:387
 #, c-format
 msgid "Suriname"
-msgstr "Suriname"
+msgstr "蘇里南"
 
-#: lang.pm:380
+#: lang.pm:388
 #, c-format
 msgid "Sao Tome and Principe"
-msgstr "Sao Tome and Principe"
+msgstr "聖多美普林西比"
 
-#: lang.pm:381
+#: lang.pm:389
 #, c-format
 msgid "El Salvador"
-msgstr "El Salvador"
+msgstr "薩爾瓦多"
 
-#: lang.pm:382
+#: lang.pm:390
 #, c-format
 msgid "Syria"
-msgstr ""
+msgstr "敘利亞"
 
-#: lang.pm:383
+#: lang.pm:391
 #, c-format
 msgid "Swaziland"
-msgstr "Swaziland"
+msgstr "史瓦濟蘭"
 
-#: lang.pm:384
+#: lang.pm:392
 #, c-format
 msgid "Turks and Caicos Islands"
-msgstr "Turks and Caicos Islands"
+msgstr "土克斯及開科斯群島"
 
-#: lang.pm:385
+#: lang.pm:393
 #, c-format
 msgid "Chad"
-msgstr "Chad"
+msgstr "查德"
 
-#: lang.pm:386
+#: lang.pm:394
 #, c-format
 msgid "French Southern Territories"
-msgstr "French Southern Territories"
+msgstr "法屬南部屬地"
 
-#: lang.pm:387
+#: lang.pm:395
 #, c-format
 msgid "Togo"
-msgstr "Togo"
+msgstr "多哥"
 
-#: lang.pm:388 network/adsl_consts.pm:585
+#: lang.pm:396 network/adsl_consts.pm:806
 #, c-format
 msgid "Thailand"
 msgstr "泰國"
 
-#: lang.pm:389
+#: lang.pm:397
 #, c-format
 msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr "塔吉克"
 
-#: lang.pm:390
+#: lang.pm:398
 #, c-format
 msgid "Tokelau"
-msgstr "Tokelau"
+msgstr "托克勞群島"
 
-#: lang.pm:391
+#: lang.pm:399
 #, c-format
 msgid "East Timor"
-msgstr "East Timor"
+msgstr "東帝汶"
 
-#: lang.pm:392
+#: lang.pm:400
 #, c-format
 msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr "土庫曼"
 
-#: lang.pm:393
+#: lang.pm:401 network/adsl_consts.pm:816
 #, c-format
 msgid "Tunisia"
-msgstr "Tunisia"
+msgstr "突尼西亞"
 
-#: lang.pm:394
+#: lang.pm:402
 #, c-format
 msgid "Tonga"
-msgstr "Tonga"
+msgstr "東加"
 
-#: lang.pm:395
+#: lang.pm:403
 #, c-format
 msgid "Turkey"
-msgstr "Turkey"
+msgstr "土耳其"
 
-#: lang.pm:396
+#: lang.pm:404
 #, c-format
 msgid "Trinidad and Tobago"
-msgstr "Trinidad and Tobago"
+msgstr "千里達及托巴哥"
 
-#: lang.pm:397
+#: lang.pm:405
 #, c-format
 msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: lang.pm:398
-#, c-format
-msgid "Taiwan"
-msgstr "台灣"
+msgstr "吐瓦魯"
 
-#: lang.pm:399
+#: lang.pm:407
 #, c-format
 msgid "Tanzania"
-msgstr ""
+msgstr "坦尚尼亞"
 
-#: lang.pm:400
+#: lang.pm:408
 #, c-format
 msgid "Ukraine"
-msgstr "Ukraine"
+msgstr "烏克蘭"
 
-#: lang.pm:401
+#: lang.pm:409
 #, c-format
 msgid "Uganda"
-msgstr "Uganda"
+msgstr "烏干達"
 
-#: lang.pm:402
+#: lang.pm:410
 #, c-format
 msgid "United States Minor Outlying Islands"
-msgstr "United States Minor Outlying Islands"
+msgstr "美屬邊疆群島"
 
-#: lang.pm:404
+#: lang.pm:412
 #, c-format
 msgid "Uruguay"
-msgstr "Uruguay"
+msgstr "烏拉圭"
 
-#: lang.pm:405
+#: lang.pm:413
 #, c-format
 msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr "烏茲別克"
 
-#: lang.pm:406
+#: lang.pm:414
 #, c-format
 msgid "Vatican"
 msgstr "梵諦岡"
 
-#: lang.pm:407
+#: lang.pm:415
 #, c-format
 msgid "Saint Vincent and the Grenadines"
-msgstr "Saint Vincent and the Grenadines"
+msgstr "聖文森及格瑞那丁"
 
-#: lang.pm:408
+#: lang.pm:416
 #, c-format
 msgid "Venezuela"
-msgstr "Venezuela"
+msgstr "委內瑞拉"
 
-#: lang.pm:409
+#: lang.pm:417
 #, c-format
 msgid "Virgin Islands (British)"
-msgstr "Virgin Islands (British)"
+msgstr "英屬維爾京群島"
 
-#: lang.pm:410
+#: lang.pm:418
 #, c-format
 msgid "Virgin Islands (U.S.)"
-msgstr "Virgin Islands (U.S.)"
+msgstr "美屬維爾京群島"
 
-#: lang.pm:411
+#: lang.pm:419
 #, c-format
 msgid "Vietnam"
-msgstr ""
+msgstr "越南"
 
-#: lang.pm:412
+#: lang.pm:420
 #, c-format
 msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr "萬那杜"
 
-#: lang.pm:413
+#: lang.pm:421
 #, c-format
 msgid "Wallis and Futuna"
 msgstr ""
 
-#: lang.pm:414
+#: lang.pm:422
 #, c-format
 msgid "Samoa"
-msgstr "Samoa"
+msgstr "薩摩亞群島"
 
-#: lang.pm:415
+#: lang.pm:423
 #, c-format
 msgid "Yemen"
-msgstr "Yemen"
+msgstr "葉門"
 
-#: lang.pm:416
+#: lang.pm:424
 #, c-format
 msgid "Mayotte"
-msgstr "Mayotte"
+msgstr "美亞特"
 
-#: lang.pm:417 standalone/drakxtv:49
+#: lang.pm:425 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "南非"
 
-#: lang.pm:418
+#: lang.pm:426
 #, c-format
 msgid "Zambia"
 msgstr "尚比亞"
 
-#: lang.pm:419
+#: lang.pm:427
 #, c-format
 msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr "辛巴威"
 
-#: lang.pm:1047
+#: lang.pm:1040
 #, c-format
 msgid "You should install the following packages: %s"
 msgstr "您應該安裝下列套件: %s"
 
 #. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: lang.pm:1050 standalone/scannerdrake:135
+#: lang.pm:1043 standalone/scannerdrake:135
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: lang.pm:1101
+#: lang.pm:1094
 #, c-format
 msgid "Welcome to %s"
 msgstr "歡迎來到 %s"
@@ -8552,12 +8728,12 @@ msgstr "歡迎來到 %s"
 msgid "Circular mounts %s\n"
 msgstr "循環掛載 %s\n"
 
-#: lvm.pm:116
+#: lvm.pm:111
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "先移除邏輯 volume\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:1033
+#: modules/interactive.pm:21 standalone/drakconnect:1032
 #, c-format
 msgid "Parameters"
 msgstr "參數"
@@ -8597,19 +8773,39 @@ msgstr "你是否有任何 %s 介面?"
 msgid "See hardware info"
 msgstr "看硬體資訊"
 
+#: modules/interactive.pm:82
+#, fuzzy, c-format
+msgid "Installing driver for USB controller"
+msgstr "正在安裝 %s 卡 %s 的驅動程式"
+
+#: modules/interactive.pm:83
+#, fuzzy, c-format
+msgid "Installing driver for firewire controller %s"
+msgstr "正在安裝 %s 卡 %s 的驅動程式"
+
+#: modules/interactive.pm:84
+#, fuzzy, c-format
+msgid "Installing driver for hard drive controller %s"
+msgstr "正在安裝 %s 卡 %s 的驅動程式"
+
+#: modules/interactive.pm:85
+#, fuzzy, c-format
+msgid "Installing driver for ethernet controller %s"
+msgstr "正在安裝 %s 卡 %s 的驅動程式"
+
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: modules/interactive.pm:87
+#: modules/interactive.pm:96
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "正在安裝 %s 卡 %s 的驅動程式"
 
-#: modules/interactive.pm:87
+#: modules/interactive.pm:99
 #, c-format
 msgid "(module %s)"
 msgstr "(模組 %s)"
 
-#: modules/interactive.pm:98
+#: modules/interactive.pm:109
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
@@ -8618,7 +8814,7 @@ msgstr ""
 "您現在可以為模組 %s 提供選項.\n"
 "請注意一下, 輸入的記憶體位置應該使用 0x 開頭, 比方像是 '0x123'"
 
-#: modules/interactive.pm:104
+#: modules/interactive.pm:115
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
@@ -8629,18 +8825,18 @@ msgstr ""
 "選項的格式為 ``name=value name2=value2 ...''\n"
 "例如, ``io=0x300 irq=7''"
 
-#: modules/interactive.pm:106
+#: modules/interactive.pm:117
 #, c-format
 msgid "Module options:"
 msgstr "模組選項:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:119
+#: modules/interactive.pm:130
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "我應該試那個 %s 驅動程式呢?"
 
-#: modules/interactive.pm:128
+#: modules/interactive.pm:139
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -8656,17 +8852,17 @@ msgstr ""
 "或是允許驅動程式偵測您的機器需要取得驅動程式需要的資訊?有時候偵測會讓電腦當"
 "機, 不過應該不至於造成任何傷害才對."
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Autoprobe"
 msgstr "自動偵測"
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Specify options"
 msgstr "指定選項"
 
-#: modules/interactive.pm:144
+#: modules/interactive.pm:155
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -8725,11 +8921,11 @@ msgstr "一般 PS/2 滾輪滑鼠"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
-#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
-#: network/netconnect.pm:624 network/netconnect.pm:629
-#: network/netconnect.pm:645 network/netconnect.pm:647
+#: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
+#: network/modem.pm:137 network/netconnect.pm:645 network/netconnect.pm:650
+#: network/netconnect.pm:662 network/netconnect.pm:667
+#: network/netconnect.pm:683 network/netconnect.pm:685
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -8879,7 +9075,7 @@ msgstr ""
 msgid "Synaptics Touchpad"
 msgstr ""
 
-#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
+#: mouse.pm:93 standalone/drakconnect:360 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "無"
@@ -8939,23 +9135,23 @@ msgstr ""
 msgid "Sagem (using DHCP) USB"
 msgstr ""
 
-#: network/adsl.pm:35 network/netconnect.pm:799
+#: network/adsl.pm:35 network/netconnect.pm:839
 #, c-format
 msgid "Connect to the Internet"
 msgstr "連線到 Internet"
 
-#: network/adsl.pm:36 network/netconnect.pm:800
+#: network/adsl.pm:36 network/netconnect.pm:840
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
 "Some connections use PPTP, a few use DHCP.\n"
-"If you don't know, choose 'use PPPoE'"
+"If you do not know, choose 'use PPPoE'"
 msgstr ""
 "最常連線到 ADSL 的方法就是使用 pppoe.\n"
 "有些連線是使用 PPTP, 有些事使用 DHCP.\n"
 "若是您不清楚的話, 選擇 '使用 PPPoE'"
 
-#: network/adsl.pm:41 network/netconnect.pm:804
+#: network/adsl.pm:41 network/netconnect.pm:844
 #, c-format
 msgid "ADSL connection type:"
 msgstr "ADSL 連線型態:"
@@ -8996,9 +9192,9 @@ msgid "Telnet server"
 msgstr "Telnet 伺服器"
 
 #: network/drakfirewall.pm:48
-#, fuzzy, c-format
-msgid "Samba server"
-msgstr "Samba 伺服器"
+#, c-format
+msgid "Windows Files Sharing (SMB)"
+msgstr "Wndows 檔案分享 (SMB)"
 
 #: network/drakfirewall.pm:54
 #, c-format
@@ -9013,7 +9209,7 @@ msgstr ""
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -9080,107 +9276,107 @@ msgstr "全部 (沒有 firewall)"
 msgid "Other ports"
 msgstr "其它埠"
 
-#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
-#: network/netconnect.pm:567
+#: network/isdn.pm:125 network/netconnect.pm:490 network/netconnect.pm:602
+#: network/netconnect.pm:605
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr ""
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
-msgid "I don't know"
+msgid "I do not know"
 msgstr "我不清楚"
 
-#: network/isdn.pm:169 network/netconnect.pm:388
+#: network/isdn.pm:169 network/netconnect.pm:422
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:170 network/netconnect.pm:388
+#: network/isdn.pm:170 network/netconnect.pm:422
 #, c-format
 msgid "USB"
-msgstr ""
+msgstr "USB"
 
-#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/netconnect.pm:612 network/netconnect.pm:629
-#: network/netconnect.pm:645
+#: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/netconnect.pm:650 network/netconnect.pm:667
+#: network/netconnect.pm:683
 #, c-format
 msgid "Manual"
 msgstr "手動"
 
-#: network/netconnect.pm:89 network/netconnect.pm:485
-#: network/netconnect.pm:489
+#: network/netconnect.pm:90 network/netconnect.pm:519
+#: network/netconnect.pm:523
 #, c-format
 msgid "Manual choice"
 msgstr "手動選擇"
 
-#: network/netconnect.pm:89
+#: network/netconnect.pm:90
 #, c-format
 msgid "Internal ISDN card"
 msgstr "內部 ISDN 卡"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, c-format
 msgid "Master"
 msgstr ""
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:103
 #, c-format
 msgid "Repeater"
 msgstr "重複器"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:104
 #, c-format
 msgid "Secondary"
 msgstr "第二的"
 
-#: network/netconnect.pm:103
+#: network/netconnect.pm:105
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: network/netconnect.pm:108 printer/printerdrake.pm:1354
 #: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "手動組態設定"
 
-#: network/netconnect.pm:107
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "自動 IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:109
+#: network/netconnect.pm:111
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "自動 IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:112
+#: network/netconnect.pm:114
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "其他世界的的通訊協定"
 
-#: network/netconnect.pm:114 standalone/drakconnect:539
+#: network/netconnect.pm:116 standalone/drakconnect:541
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "歐洲人的通訊協定 (EDSS1)"
 
-#: network/netconnect.pm:115 standalone/drakconnect:540
+#: network/netconnect.pm:117 standalone/drakconnect:542
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9189,168 +9385,168 @@ msgstr ""
 "其他世界的通訊協定\n"
 "無 D-Channel (leased lines)"
 
-#: network/netconnect.pm:151
+#: network/netconnect.pm:153
 #, c-format
 msgid "Alcatel speedtouch USB modem"
-msgstr ""
+msgstr "Alcatel speedtouch USB 數據機"
 
-#: network/netconnect.pm:152
+#: network/netconnect.pm:154
 #, c-format
 msgid "Sagem USB modem"
-msgstr ""
+msgstr "Sagem USB 數據機"
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:155
 #, c-format
 msgid "Bewan modem"
-msgstr ""
+msgstr "Bewan 數據機"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:156
 #, c-format
 msgid "ECI Hi-Focus modem"
-msgstr ""
+msgstr "ECI Hi-Focus 數據機"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:160
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:159
+#: network/netconnect.pm:161
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "手動組態設定 TCP/IP"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:162
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:163
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:164
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:165
 #, c-format
 msgid "DSL over CAPI"
 msgstr ""
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:169
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr ""
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:170
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr ""
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:171
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:170
+#: network/netconnect.pm:172
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:171
+#: network/netconnect.pm:173
 #, c-format
 msgid "PPPoA LLC"
 msgstr ""
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:174
 #, c-format
 msgid "PPPoA VC"
 msgstr ""
 
-#: network/netconnect.pm:176 standalone/drakconnect:474
+#: network/netconnect.pm:178 standalone/drakconnect:476
 #, c-format
 msgid "Script-based"
 msgstr "Script-based"
 
-#: network/netconnect.pm:177 standalone/drakconnect:474
+#: network/netconnect.pm:179 standalone/drakconnect:476
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:178 standalone/drakconnect:474
+#: network/netconnect.pm:180 standalone/drakconnect:476
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-based"
 
-#: network/netconnect.pm:179 standalone/drakconnect:474
+#: network/netconnect.pm:181 standalone/drakconnect:476
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:180 standalone/drakconnect:474
+#: network/netconnect.pm:182 standalone/drakconnect:476
 #, c-format
 msgid "PAP/CHAP"
-msgstr ""
+msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:236 standalone/drakconnect:59
+#: network/netconnect.pm:238 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "網路 & 網際網路設定"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(於 port %s 被偵測到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
 #, c-format
 msgid "(detected %s)"
 msgstr "(偵測到 %s)"
 
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
 #, c-format
 msgid "(detected)"
 msgstr "(被偵測到)"
 
-#: network/netconnect.pm:246
+#: network/netconnect.pm:248
 #, c-format
 msgid "Modem connection"
 msgstr "Modem 連線"
 
-#: network/netconnect.pm:247
+#: network/netconnect.pm:249
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 連線"
 
-#: network/netconnect.pm:248
+#: network/netconnect.pm:250
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 連線"
 
-#: network/netconnect.pm:249
+#: network/netconnect.pm:251
 #, c-format
 msgid "Cable connection"
 msgstr "Cable 連線"
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:252
 #, c-format
 msgid "LAN connection"
 msgstr "區域網路連線"
 
-#: network/netconnect.pm:251 network/netconnect.pm:265
+#: network/netconnect.pm:253 network/netconnect.pm:267
 #, c-format
 msgid "Wireless connection"
 msgstr "無線網路連線"
 
-#: network/netconnect.pm:261
+#: network/netconnect.pm:263
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "選擇您要設定的連線項目"
 
-#: network/netconnect.pm:279
+#: network/netconnect.pm:277
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9363,130 +9559,141 @@ msgstr ""
 "\n"
 "按 \"%s\" 繼續."
 
-#: network/netconnect.pm:287 network/netconnect.pm:839
+#: network/netconnect.pm:285 network/netconnect.pm:879
 #, c-format
 msgid "Connection Configuration"
 msgstr "連線組態設定"
 
-#: network/netconnect.pm:288 network/netconnect.pm:840
+#: network/netconnect.pm:286 network/netconnect.pm:880
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "請您填入或檢查下面欄位"
 
-#: network/netconnect.pm:295 standalone/drakconnect:530
+#: network/netconnect.pm:293 standalone/drakconnect:532
 #, c-format
 msgid "Card IRQ"
 msgstr "卡的 IRQ"
 
-#: network/netconnect.pm:296 standalone/drakconnect:531
+#: network/netconnect.pm:294 standalone/drakconnect:533
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "卡的 mem (DMA)"
 
-#: network/netconnect.pm:297 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:534
 #, c-format
 msgid "Card IO"
 msgstr "卡的 IO"
 
-#: network/netconnect.pm:298 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:535
 #, c-format
 msgid "Card IO_0"
 msgstr "卡的 IO_0"
 
-#: network/netconnect.pm:299
+#: network/netconnect.pm:297
 #, c-format
 msgid "Card IO_1"
 msgstr "卡的 IO_1"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:298
 #, c-format
 msgid "Your personal phone number"
 msgstr "您的個人電話號碼"
 
-#: network/netconnect.pm:301 network/netconnect.pm:843
+#: network/netconnect.pm:299 network/netconnect.pm:883
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "提供者的名稱 (ex provider.net)"
 
-#: network/netconnect.pm:302 standalone/drakconnect:469
+#: network/netconnect.pm:300 standalone/drakconnect:471
 #, c-format
 msgid "Provider phone number"
 msgstr "提供者的電話號碼"
 
-#: network/netconnect.pm:303
+#: network/netconnect.pm:301
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "提供者 DNS 1 (選擇性輸入)"
 
-#: network/netconnect.pm:304
+#: network/netconnect.pm:302
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "提供者 DNS 2 (選擇性輸入)"
 
-#: network/netconnect.pm:305 standalone/drakconnect:420
+#: network/netconnect.pm:303 standalone/drakconnect:422
 #, c-format
 msgid "Dialing mode"
 msgstr "撥接的模式"
 
-#: network/netconnect.pm:306 standalone/drakconnect:425
-#: standalone/drakconnect:493
+#: network/netconnect.pm:304 standalone/drakconnect:427
+#: standalone/drakconnect:495
 #, c-format
 msgid "Connection speed"
 msgstr "連線速度"
 
-#: network/netconnect.pm:307 standalone/drakconnect:430
+#: network/netconnect.pm:305 standalone/drakconnect:432
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "連線逾時 (以秒為單位)"
 
-#: network/netconnect.pm:310 network/netconnect.pm:846
-#: standalone/drakconnect:467
+#: network/netconnect.pm:308 network/netconnect.pm:329
+#: network/netconnect.pm:886 standalone/drakconnect:469
 #, c-format
 msgid "Account Login (user name)"
 msgstr "帳號登入 (使用者名稱)"
 
-#: network/netconnect.pm:311 network/netconnect.pm:847
-#: standalone/drakconnect:468
+#: network/netconnect.pm:309 network/netconnect.pm:330
+#: network/netconnect.pm:887 standalone/drakconnect:470
 #, c-format
 msgid "Account Password"
 msgstr "帳號的密碼"
 
-#: network/netconnect.pm:328 network/netconnect.pm:677
-#: network/netconnect.pm:880
+#: network/netconnect.pm:325
+#, fuzzy, c-format
+msgid "Cable: account options"
+msgstr "撥號: 帳號選項"
+
+#: network/netconnect.pm:328
+#, c-format
+msgid "Use BPALogin (needed for Telstra)"
+msgstr ""
+
+#: network/netconnect.pm:362 network/netconnect.pm:715
+#: network/netconnect.pm:920
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "選取要設定的網路介面:"
 
-#: network/netconnect.pm:330 network/netconnect.pm:378
-#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
-#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
+#: network/netconnect.pm:364 network/netconnect.pm:412
+#: network/netconnect.pm:716 network/netconnect.pm:922
+#: network/netconnect.pm:1091 network/shorewall.pm:98
+#: standalone/drakconnect:684 standalone/drakgw:224 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "網路裝置"
 
-#: network/netconnect.pm:331 network/netconnect.pm:339
+#: network/netconnect.pm:365 network/netconnect.pm:373
 #, c-format
 msgid "External ISDN modem"
 msgstr "外接式 ISDN 數據機"
 
-#: network/netconnect.pm:377 standalone/harddrake2:192
+#: network/netconnect.pm:411 standalone/harddrake2:210
 #, c-format
 msgid "Select a device!"
 msgstr "選取一個裝置!"
 
-#: network/netconnect.pm:386 network/netconnect.pm:396
-#: network/netconnect.pm:406 network/netconnect.pm:439
-#: network/netconnect.pm:453
+#: network/netconnect.pm:420 network/netconnect.pm:430
+#: network/netconnect.pm:440 network/netconnect.pm:473
+#: network/netconnect.pm:487
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 設定"
 
-#: network/netconnect.pm:387
+#: network/netconnect.pm:421
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "您有那種的卡?"
 
-#: network/netconnect.pm:397
+#: network/netconnect.pm:431
 #, c-format
 msgid ""
 "\n"
@@ -9500,22 +9707,22 @@ msgstr ""
 "\n"
 "如果你有一個 PCMCIA 卡, 那您必須要知道你的卡的\"irq\" 與 \"io\"值.\n"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Continue"
 msgstr "繼續"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Abort"
 msgstr "放棄"
 
-#: network/netconnect.pm:407
+#: network/netconnect.pm:441
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "下列何者是您的 ISDN 卡?"
 
-#: network/netconnect.pm:425
+#: network/netconnect.pm:459
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -9523,157 +9730,159 @@ msgid ""
 "want to use?"
 msgstr ""
 
-#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
-#: standalone/harddrake2:117
+#: network/netconnect.pm:461 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:131
 #, c-format
 msgid "Driver"
 msgstr "驅動程式"
 
-#: network/netconnect.pm:439
+#: network/netconnect.pm:473
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "您要使用那個通訊協定?"
 
-#: network/netconnect.pm:441 standalone/drakconnect:116
-#: standalone/drakconnect:309 standalone/drakconnect:538
+#: network/netconnect.pm:475 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:540
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: network/netconnect.pm:453
+#: network/netconnect.pm:487
 #, c-format
 msgid ""
 "Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+"If it is not listed, choose Unlisted."
 msgstr ""
 "選擇您的提供者.\n"
 "如果並沒有包含在清單內, 請選則未列在清單內(Unlisted)."
 
-#: network/netconnect.pm:455 network/netconnect.pm:563
-#: network/netconnect.pm:719
+#: network/netconnect.pm:489 network/netconnect.pm:601
+#: network/netconnect.pm:757
 #, c-format
 msgid "Provider:"
 msgstr "提供者:"
 
-#: network/netconnect.pm:470
+#: network/netconnect.pm:504
 #, c-format
 msgid ""
-"Your modem isn't supported by the system.\n"
+"Your modem is not supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
+"系統不支援您的數據機。\n"
+"請到 http://www.linmodems.org 查詢。"
 
-#: network/netconnect.pm:482
+#: network/netconnect.pm:516
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "選取要設定的數據機:"
 
-#: network/netconnect.pm:530
+#: network/netconnect.pm:568
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "請選取您數據機連接的序列埠."
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:599
 #, c-format
 msgid "Select your provider:"
 msgstr "選擇您的提供者:"
 
-#: network/netconnect.pm:589
+#: network/netconnect.pm:627
 #, c-format
 msgid "Dialup: account options"
 msgstr "撥號: 帳號選項"
 
-#: network/netconnect.pm:592
+#: network/netconnect.pm:630
 #, c-format
 msgid "Connection name"
 msgstr "連線名稱"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:631
 #, c-format
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: network/netconnect.pm:594
+#: network/netconnect.pm:632
 #, c-format
 msgid "Login ID"
 msgstr "登入的 ID"
 
-#: network/netconnect.pm:609 network/netconnect.pm:642
+#: network/netconnect.pm:647 network/netconnect.pm:680
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "撥號: IP 參數"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:650
 #, c-format
 msgid "IP parameters"
 msgstr "IP 參數"
 
-#: network/netconnect.pm:613 network/netconnect.pm:976
+#: network/netconnect.pm:651 network/netconnect.pm:1018
 #: printer/printerdrake.pm:454 standalone/drakconnect:116
-#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakconnect:325 standalone/drakconnect:879
 #: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "IP 位址"
 
-#: network/netconnect.pm:614
+#: network/netconnect.pm:652
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "網路遮罩"
 
-#: network/netconnect.pm:626
+#: network/netconnect.pm:664
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "撥號: DNS 參數"
 
-#: network/netconnect.pm:629
+#: network/netconnect.pm:667
 #, c-format
 msgid "DNS"
-msgstr ""
+msgstr "DNS"
 
-#: network/netconnect.pm:630
+#: network/netconnect.pm:668
 #, c-format
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: network/netconnect.pm:631 network/netconnect.pm:844
-#: standalone/drakconnect:998
+#: network/netconnect.pm:669 network/netconnect.pm:884
+#: standalone/drakconnect:997
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "第一台 DNS 伺服器 (選擇性輸入)"
 
-#: network/netconnect.pm:632 network/netconnect.pm:845
-#: standalone/drakconnect:999
+#: network/netconnect.pm:670 network/netconnect.pm:885
+#: standalone/drakconnect:998
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "第二台 DNS 伺服器 (選擇性輸入)"
 
-#: network/netconnect.pm:633
+#: network/netconnect.pm:671
 #, c-format
 msgid "Set hostname from IP"
 msgstr "由 IP 設定主機名稱"
 
-#: network/netconnect.pm:645 standalone/drakconnect:334
+#: network/netconnect.pm:683 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "閘道"
 
-#: network/netconnect.pm:646
+#: network/netconnect.pm:684
 #, c-format
 msgid "Gateway IP address"
 msgstr "閘道 IP 位址"
 
-#: network/netconnect.pm:677
+#: network/netconnect.pm:715
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL 設定"
 
-#: network/netconnect.pm:717
+#: network/netconnect.pm:755
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "請選擇您的 ADSL 提供者"
 
-#: network/netconnect.pm:735
+#: network/netconnect.pm:773
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9681,32 +9890,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:739 network/netconnect.pm:744
+#: network/netconnect.pm:777 network/netconnect.pm:782
 #, c-format
 msgid "Use a floppy"
 msgstr "使用一個軟片"
 
-#: network/netconnect.pm:739 network/netconnect.pm:748
+#: network/netconnect.pm:777 network/netconnect.pm:786
 #, c-format
 msgid "Use my Windows partition"
 msgstr "使用我的 Windows 分割"
 
-#: network/netconnect.pm:739 network/netconnect.pm:751
+#: network/netconnect.pm:777 network/netconnect.pm:789
 #, c-format
 msgid "Do it later"
-msgstr ""
+msgstr "稍後再執行"
 
-#: network/netconnect.pm:758
+#: network/netconnect.pm:796
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:765
+#: network/netconnect.pm:803
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:780
+#: network/netconnect.pm:818
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9715,22 +9924,22 @@ msgid ""
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:889
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:850
+#: network/netconnect.pm:890
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:853
+#: network/netconnect.pm:893
 #, c-format
 msgid "Encapsulation:"
 msgstr "封裝:"
 
-#: network/netconnect.pm:870
+#: network/netconnect.pm:910
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9739,12 +9948,17 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:882
+#: network/netconnect.pm:922
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "手動載入驅動程式"
 
-#: network/netconnect.pm:898
+#: network/netconnect.pm:922
+#, c-format
+msgid "Use a Windows driver (with ndiswrapper)"
+msgstr "使用 Windows 驅動程式 (藉由 ndiswrapper)"
+
+#: network/netconnect.pm:940
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -9756,7 +9970,7 @@ msgstr ""
 "修改下面欄位將會凌越這個設定.\n"
 "您真的想重新設定這個裝置?"
 
-#: network/netconnect.pm:912 network/netconnect.pm:1340
+#: network/netconnect.pm:954 network/netconnect.pm:1436
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -9765,24 +9979,24 @@ msgstr ""
 "恭喜 ! 網路與網際網路設定組態已經設定完成了.\n"
 "\n"
 
-#: network/netconnect.pm:929
+#: network/netconnect.pm:971
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf 主機名稱解析"
 
-#: network/netconnect.pm:930 network/netconnect.pm:963
+#: network/netconnect.pm:972 network/netconnect.pm:1005
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "正在設定網路裝置 %s (驅動程式 %s)"
 
-#: network/netconnect.pm:931
+#: network/netconnect.pm:973
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:964
+#: network/netconnect.pm:1006
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -9793,114 +10007,139 @@ msgstr ""
 "每個項目都應該用小數點間隔的 IP 位址來輸入\n"
 "(例如 1.2.3.4)."
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:1013
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "由 DHCP 位址指派主機名稱"
 
-#: network/netconnect.pm:972
+#: network/netconnect.pm:1014
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主機名稱"
 
-#: network/netconnect.pm:977 standalone/drakconnect:328
-#: standalone/drakconnect:881 standalone/drakgw:323
+#: network/netconnect.pm:1019 standalone/drakconnect:330
+#: standalone/drakconnect:880 standalone/drakgw:320
 #, c-format
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: network/netconnect.pm:979 standalone/drakconnect:413
+#: network/netconnect.pm:1021 standalone/drakconnect:415
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "紀錄網路卡的 id (對於筆記型電腦相當有用)"
 
-#: network/netconnect.pm:980 standalone/drakconnect:414
+#: network/netconnect.pm:1022 standalone/drakconnect:416
 #, c-format
 msgid "Network Hotplugging"
 msgstr "網路熱插拔"
 
-#: network/netconnect.pm:982 standalone/drakconnect:408
+#: network/netconnect.pm:1024 standalone/drakconnect:410
 #, c-format
 msgid "Start at boot"
 msgstr "於開機時啟動"
 
-#: network/netconnect.pm:985 standalone/drakconnect:884
+#: network/netconnect.pm:1027 standalone/drakconnect:883
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 用戶端"
 
-#: network/netconnect.pm:995 printer/printerdrake.pm:1498
-#: standalone/drakconnect:648
+#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
+#: standalone/drakconnect:649
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 位址必須要用類似 1.2.3.4 的格式來輸入"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1041
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
-msgstr ""
+msgstr "警告：IP 位址 %s 通常是保留下來的！"
 
-#: network/netconnect.pm:1004 standalone/drakTermServ:1690
-#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#: network/netconnect.pm:1046 standalone/drakTermServ:1742
+#: standalone/drakTermServ:1743 standalone/drakTermServ:1744
 #, c-format
 msgid "%s already in use\n"
-msgstr ""
+msgstr "%s 已經在使用中了\n"
 
-#: network/netconnect.pm:1030 network/netconnect.pm:1059
+#: network/netconnect.pm:1067
+#, c-format
+msgid "Choose an ndiswrapper driver"
+msgstr "選擇一個 ndiswrapper 驅動程式"
+
+#: network/netconnect.pm:1068 network/netconnect.pm:1075
+#, c-format
+msgid "Install a new driver"
+msgstr "安裝一個新的驅動程式"
+
+#: network/netconnect.pm:1068
+#, c-format
+msgid "Use already installed driver (%s)"
+msgstr "使用已經安裝的驅動程式 (%s)"
+
+#: network/netconnect.pm:1072 printer/printerdrake.pm:3644
+#, fuzzy, c-format
+msgid "Could not install the %s package!"
+msgstr "正在安裝 %s 套件"
+
+#: network/netconnect.pm:1076
+#, c-format
+msgid "Please select the Windows driver (.inf file)"
+msgstr "請選取 Windows 驅動程式 (.inf 檔)"
+
+#: network/netconnect.pm:1126 network/netconnect.pm:1155
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
-msgstr "請輸入這張卡的無線網路參數:"
+msgstr "請輸入這張卡的無線網路參數："
 
-#: network/netconnect.pm:1033 standalone/drakconnect:380
+#: network/netconnect.pm:1129 standalone/drakconnect:382
 #, c-format
 msgid "Operating Mode"
 msgstr "運作模式"
 
-#: network/netconnect.pm:1035 standalone/drakconnect:381
+#: network/netconnect.pm:1131 standalone/drakconnect:383
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "網路名稱 (ESSID)"
 
-#: network/netconnect.pm:1036 standalone/drakconnect:382
+#: network/netconnect.pm:1132 standalone/drakconnect:384
 #, c-format
 msgid "Network ID"
 msgstr "網路 ID"
 
-#: network/netconnect.pm:1037 standalone/drakconnect:383
+#: network/netconnect.pm:1133 standalone/drakconnect:385
 #, c-format
 msgid "Operating frequency"
-msgstr ""
+msgstr "工作頻率"
 
-#: network/netconnect.pm:1038 standalone/drakconnect:384
+#: network/netconnect.pm:1134 standalone/drakconnect:386
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:1039 standalone/drakconnect:385
+#: network/netconnect.pm:1135 standalone/drakconnect:387
 #, c-format
 msgid "Bitrate (in b/s)"
-msgstr ""
+msgstr "連線速率 (b/s)"
 
-#: network/netconnect.pm:1045
+#: network/netconnect.pm:1141
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:1049
+#: network/netconnect.pm:1145
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:1062 standalone/drakconnect:396
+#: network/netconnect.pm:1158 standalone/drakconnect:398
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:1063
+#: network/netconnect.pm:1159
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9914,17 +10153,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1070 standalone/drakconnect:397
+#: network/netconnect.pm:1166 standalone/drakconnect:399
 #, c-format
 msgid "Fragmentation"
 msgstr "破碎片段"
 
-#: network/netconnect.pm:1071 standalone/drakconnect:398
+#: network/netconnect.pm:1167 standalone/drakconnect:400
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1072
+#: network/netconnect.pm:1168
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -9935,12 +10174,12 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1079 standalone/drakconnect:399
+#: network/netconnect.pm:1175 standalone/drakconnect:401
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1080
+#: network/netconnect.pm:1176
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -9952,12 +10191,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1088 standalone/drakconnect:400
+#: network/netconnect.pm:1184 standalone/drakconnect:402
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1185
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9975,7 +10214,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1163
+#: network/netconnect.pm:1259
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9988,67 +10227,67 @@ msgstr ""
 "類似 ``mybox.mylab.myco.com'' 的格式.\n"
 "使用閘道器的話, 也請在這邊輸入閘道器的 IP 位址."
 
-#: network/netconnect.pm:1167
+#: network/netconnect.pm:1263
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1169 standalone/drakconnect:997
+#: network/netconnect.pm:1265 standalone/drakconnect:996
 #, c-format
 msgid "Host name (optional)"
 msgstr "主機名稱 (選擇性輸入)"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1265
 #, c-format
 msgid "Host name"
 msgstr "主機名稱"
 
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1267
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS 伺服器 1"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1268
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS 伺服器 2"
 
-#: network/netconnect.pm:1173
+#: network/netconnect.pm:1269
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS 伺服器 3"
 
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1270
 #, c-format
 msgid "Search domain"
 msgstr "搜尋網域"
 
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1271
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:1176
+#: network/netconnect.pm:1272
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "閘道器 (比方 %s)"
 
-#: network/netconnect.pm:1178
+#: network/netconnect.pm:1274
 #, c-format
 msgid "Gateway device"
 msgstr "閘道器裝置"
 
-#: network/netconnect.pm:1187
+#: network/netconnect.pm:1283
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 伺服器位址必須要用 1.2.3.4 的格式來輸入"
 
-#: network/netconnect.pm:1192 standalone/drakconnect:651
+#: network/netconnect.pm:1288 standalone/drakconnect:652
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Gateway 位址必須要用類似 1.2.3.4 的格式來輸入"
 
-#: network/netconnect.pm:1203
+#: network/netconnect.pm:1299
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -10057,17 +10296,17 @@ msgid ""
 "It is not necessary on most networks."
 msgstr ""
 
-#: network/netconnect.pm:1207
+#: network/netconnect.pm:1303
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf 主機名稱"
 
-#: network/netconnect.pm:1210
+#: network/netconnect.pm:1306
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1316
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10078,52 +10317,52 @@ msgstr ""
 "請您選擇其中一個要使用的項目.\n"
 "\n"
 
-#: network/netconnect.pm:1222
+#: network/netconnect.pm:1318
 #, c-format
 msgid "Internet connection"
 msgstr "Internet 連線"
 
-#: network/netconnect.pm:1230
+#: network/netconnect.pm:1326
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "設定完成, 您想要套用設定值?"
 
-#: network/netconnect.pm:1240
+#: network/netconnect.pm:1336
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "您要在開機時自動啟動該連線嗎?"
 
-#: network/netconnect.pm:1258
+#: network/netconnect.pm:1354
 #, c-format
 msgid "Automatically at boot"
 msgstr "自動於開機時"
 
-#: network/netconnect.pm:1260
+#: network/netconnect.pm:1356
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr ""
 
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1358
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr ""
 
-#: network/netconnect.pm:1271
+#: network/netconnect.pm:1367
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "您想要如何撥接這個連線?"
 
-#: network/netconnect.pm:1284
+#: network/netconnect.pm:1380
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "網路需要被重新啟動. 您想要重新啟動它嗎?"
 
-#: network/netconnect.pm:1291 network/netconnect.pm:1356
+#: network/netconnect.pm:1387 network/netconnect.pm:1452
 #, c-format
 msgid "Network Configuration"
 msgstr "網路設定"
 
-#: network/netconnect.pm:1292
+#: network/netconnect.pm:1388
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -10134,36 +10373,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1300
+#: network/netconnect.pm:1396
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "現在您想要試著連線到 Internet 上面嗎?"
 
-#: network/netconnect.pm:1308 standalone/drakconnect:1029
+#: network/netconnect.pm:1404 standalone/drakconnect:1028
 #, c-format
 msgid "Testing your connection..."
 msgstr "正在測試您的連線..."
 
-#: network/netconnect.pm:1324
+#: network/netconnect.pm:1420
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "系統現在連上 Internet 了."
 
-#: network/netconnect.pm:1325
+#: network/netconnect.pm:1421
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "因為安全因素考量, 它現在將會被切斷連線."
 
-#: network/netconnect.pm:1326
+#: network/netconnect.pm:1422
 #, c-format
 msgid ""
-"The system doesn't seem to be connected to the Internet.\n"
+"The system does not seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 "系統目前看起來似乎並沒有連上 Internet.\n"
 "請嘗試重新設定您的連線."
 
-#: network/netconnect.pm:1343
+#: network/netconnect.pm:1439
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10172,18 +10411,18 @@ msgstr ""
 "在完成這個項目後, 我們建議您重新啟動您的 X 環境\n"
 "以避免因為您調整了主機名稱造成 X 的問題."
 
-#: network/netconnect.pm:1344
+#: network/netconnect.pm:1440
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection doesn't "
+"Test your connection via net_monitor or mcc. If your connection does not "
 "work, you might want to relaunch the configuration."
 msgstr ""
 "設定時發生問題.\n"
 "以 net_monitor 或 mcc 測試您的連線狀態. 若是您發現您的網路連線並不作用, 您或"
 "許需要重新再進行設定."
 
-#: network/netconnect.pm:1357
+#: network/netconnect.pm:1453
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10195,44 +10434,46 @@ msgstr ""
 "您可以點選確定 Ok 保留您的設定組態, 或者是選取取消 cancel\n"
 "來重新設定網路 & 網際網路連線.\n"
 
-#: network/netconnect.pm:1393
+#: network/netconnect.pm:1491
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
+"發生了一個沒有預料到的錯誤：\n"
+"%s"
 
-#: network/network.pm:316
+#: network/network.pm:319
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理伺服器設定"
 
-#: network/network.pm:317
+#: network/network.pm:320
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理伺服器"
 
-#: network/network.pm:318
+#: network/network.pm:321
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理伺服器"
 
-#: network/network.pm:321
+#: network/network.pm:324
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理伺服器的設定格式必須為 http://..."
 
-#: network/network.pm:322
+#: network/network.pm:325
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 應該是以 'ftp:' 或 'http:' 開頭"
 
-#: network/shorewall.pm:28
+#: network/shorewall.pm:25
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "防火牆設定已經偵測到了!"
 
-#: network/shorewall.pm:29
+#: network/shorewall.pm:26
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10241,7 +10482,7 @@ msgstr ""
 "警告! 偵測到現有已經存在的防火牆組態設定.\n"
 "您應該在安裝之後手動修正某些設定."
 
-#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
+#: network/shorewall.pm:91 standalone/drakgw:217 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -10252,59 +10493,59 @@ msgid ""
 "\t\tippp+ for a isdn connection.\n"
 msgstr ""
 
-#: network/tools.pm:197
+#: network/tools.pm:181
 #, c-format
 msgid "Insert floppy"
 msgstr "插入軟片"