sync with code

1 files changed, 108 insertions, 104 deletions

diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po
index 17e0f064a..c71773a47 100644
--- a/perl-install/install/share/po/zh_TW.po
+++ b/perl-install/install/share/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakx_install\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-21 02:03+0100\n"
+"POT-Creation-Date: 2012-04-17 22:54+0200\n"
 "PO-Revision-Date: 2011-04-28 01:18+0000\n"
 "Last-Translator: Franklin Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -174,7 +174,7 @@ msgid "Removing packages prior to upgrade..."
 msgstr "移除套件以更新..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:613
+#: any.pm:614
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -187,72 +187,72 @@ msgstr ""
 "\n"
 "您確定要移除這些套件嗎？\n"
 
-#: any.pm:832
+#: any.pm:833
 #, c-format
 msgid "Error reading file %s"
 msgstr "讀取檔案 %s 時發生錯誤"
 
-#: any.pm:1039
+#: any.pm:1041
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列磁碟已經改名："
 
-#: any.pm:1041
+#: any.pm:1043
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (原本為 %s)"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1117 steps_interactive.pm:946
+#: any.pm:1119 steps_interactive.pm:950
 #, c-format
 msgid "Network"
 msgstr "網路"
 
-#: any.pm:1121
+#: any.pm:1123
 #, c-format
 msgid "Please choose a media"
 msgstr "請選擇一個媒介"
 
-#: any.pm:1137
+#: any.pm:1139
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "檔案已經存在了。要覆蓋它嗎？"
 
-#: any.pm:1141
+#: any.pm:1143
 #, c-format
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: any.pm:1189
+#: any.pm:1191
 #, c-format
 msgid "Bad NFS name"
 msgstr "錯誤的 NFS 名稱"
 
-#: any.pm:1210
+#: any.pm:1212
 #, c-format
 msgid "Bad media %s"
 msgstr "損壞的媒介 %s"
 
-#: any.pm:1253
+#: any.pm:1256
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "在尚未進行分割前無法提供畫面捕捉功能"
 
-#: any.pm:1261
+#: any.pm:1264
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "在安裝後您可以於 %s 取得螢幕截圖"
@@ -267,7 +267,7 @@ msgstr "安裝"
 msgid "Configuration"
 msgstr "組態設定"
 
-#: install2.pm:168
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "您也必須要格式化 %s"
@@ -296,47 +296,47 @@ msgstr "關閉網路"
 msgid "Please wait, retrieving file"
 msgstr "請稍後，正在取回檔案"
 
-#: media.pm:724
+#: media.pm:725
 #, c-format
 msgid "unable to add medium"
 msgstr "無法新增媒體"
 
-#: media.pm:764
+#: media.pm:765
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在複製一些程式套件到磁碟以供稍後使用"
 
-#: media.pm:817
+#: media.pm:818
 #, c-format
 msgid "Copying in progress"
 msgstr "複製進行中"
 
-#: pkgs.pm:33
+#: pkgs.pm:59
 #, c-format
 msgid "must have"
 msgstr "必備的"
 
-#: pkgs.pm:34
+#: pkgs.pm:60
 #, c-format
 msgid "important"
 msgstr "重要的"
 
-#: pkgs.pm:35
+#: pkgs.pm:61
 #, c-format
 msgid "very nice"
 msgstr "極好的"
 
-#: pkgs.pm:36
+#: pkgs.pm:62
 #, c-format
 msgid "nice"
 msgstr "好的"
 
-#: pkgs.pm:37
+#: pkgs.pm:63
 #, c-format
 msgid "maybe"
 msgstr "或許"
 
-#: pkgs.pm:246
+#: pkgs.pm:272
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -345,22 +345,22 @@ msgstr ""
 "無法安裝 %s 要求的某些套件：\n"
 "%s"
 
-#: pkgs.pm:334
+#: pkgs.pm:360
 #, c-format
 msgid "An error occurred:"
 msgstr "發生一個錯誤："
 
-#: pkgs.pm:807
+#: pkgs.pm:833
 #, c-format
 msgid "Do not ask again"
 msgstr ""
 
-#: pkgs.pm:823
+#: pkgs.pm:849
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 個安裝執行失敗"
 
-#: pkgs.pm:824
+#: pkgs.pm:850
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安裝套件失敗："
@@ -692,7 +692,7 @@ msgstr ""
 "發生了一個錯誤，但我不知道該如何妥善處置它。\n"
 "要繼續安裝工作的話請小心。"
 
-#: steps.pm:451
+#: steps.pm:457
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -769,31 +769,26 @@ msgstr "自訂桌面"
 msgid "Here's a preview of the '%s' desktop."
 msgstr "這是 '%s' 桌面的預覽。"
 
-#: steps_gtk.pm:305
+#: steps_gtk.pm:304
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "在影像上點選以觀看較大的預覽畫面"
 
-#: steps_gtk.pm:323 steps_interactive.pm:617 steps_list.pm:30
+#: steps_gtk.pm:322 steps_interactive.pm:619 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "套件群組選擇"
 
-#: steps_gtk.pm:344 steps_interactive.pm:634
+#: steps_gtk.pm:343 steps_interactive.pm:636
 #, c-format
 msgid "Individual package selection"
 msgstr "單一套件選取"
 
-#: steps_gtk.pm:368 steps_interactive.pm:554
+#: steps_gtk.pm:367 steps_interactive.pm:555
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "總共大小： %d / %d MB"
 
-#: steps_gtk.pm:410
-#, c-format
-msgid "Bad package"
-msgstr "壞掉的套件"
-
 #: steps_gtk.pm:412
 #, c-format
 msgid "Version: "
@@ -814,6 +809,11 @@ msgstr "%d KB\n"
 msgid "Importance: "
 msgstr "重要性："
 
+#: steps_gtk.pm:415
+#, c-format
+msgid "No description"
+msgstr ""
+
 #: steps_gtk.pm:448
 #, c-format
 msgid "You cannot select/unselect this package"
@@ -876,83 +876,83 @@ msgstr "您不能不選這個套件，它一定要更新才行。"
 msgid "Show automatically selected packages"
 msgstr "顯示自動被選取的套件"
 
-#: steps_gtk.pm:503
+#: steps_gtk.pm:504
 #, c-format
 msgid "Install"
 msgstr "安裝"
 
-#: steps_gtk.pm:506
+#: steps_gtk.pm:507
 #, c-format
 msgid "Load/Save selection"
 msgstr "載入/儲存選取"
 
-#: steps_gtk.pm:507
+#: steps_gtk.pm:508
 #, c-format
 msgid "Updating package selection"
 msgstr "正在更新套件的選擇"
 
-#: steps_gtk.pm:512
+#: steps_gtk.pm:513
 #, c-format
 msgid "Minimal install"
 msgstr "最小安裝"
 
-#: steps_gtk.pm:525
+#: steps_gtk.pm:526
 #, c-format
 msgid "Software Management"
 msgstr "軟體套件管理"
 
-#: steps_gtk.pm:525 steps_interactive.pm:439
+#: steps_gtk.pm:526 steps_interactive.pm:439
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "選擇您想要安裝的套件"
 
-#: steps_gtk.pm:542 steps_interactive.pm:648 steps_list.pm:32
+#: steps_gtk.pm:543 steps_interactive.pm:650 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "正在安裝"
 
-#: steps_gtk.pm:572
+#: steps_gtk.pm:573
 #, c-format
 msgid "No details"
 msgstr "不看詳細資訊"
 
-#: steps_gtk.pm:591
+#: steps_gtk.pm:592
 #, c-format
 msgid "Time remaining:"
 msgstr "剩餘時間："
 
-#: steps_gtk.pm:592
+#: steps_gtk.pm:593
 #, c-format
 msgid "(estimating...)"
 msgstr "(正在估計...)"
 
-#: steps_gtk.pm:622
+#: steps_gtk.pm:623
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 個套件"
 
-#: steps_gtk.pm:677 steps_interactive.pm:812 steps_list.pm:43
+#: steps_gtk.pm:678 steps_interactive.pm:814 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "總結"
 
-#: steps_gtk.pm:696
+#: steps_gtk.pm:697
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: steps_gtk.pm:713 steps_interactive.pm:808 steps_interactive.pm:958
+#: steps_gtk.pm:714 steps_interactive.pm:810 steps_interactive.pm:962
 #, c-format
 msgid "not configured"
 msgstr "未被設定"
 
-#: steps_gtk.pm:747
+#: steps_gtk.pm:748
 #, c-format
 msgid "Media Selection"
 msgstr "選擇安裝媒介"
 
-#: steps_gtk.pm:756 steps_interactive.pm:340
+#: steps_gtk.pm:757 steps_interactive.pm:340
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -961,7 +961,7 @@ msgstr ""
 "已經找到下列的安裝媒介。\n"
 "如果您想略過它們，您現在可以將它們取消選取。"
 
-#: steps_gtk.pm:772 steps_interactive.pm:346
+#: steps_gtk.pm:773 steps_interactive.pm:346
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -973,7 +973,7 @@ msgstr ""
 "件\n"
 "在安裝完畢之後仍然可以繼續使用。"
 
-#: steps_gtk.pm:774 steps_interactive.pm:348
+#: steps_gtk.pm:775 steps_interactive.pm:348
 #, c-format
 msgid "Copy whole CDs"
 msgstr "複製整張光碟"
@@ -1149,17 +1149,17 @@ msgstr "桌面環境選擇"
 msgid "You can choose your workstation desktop profile."
 msgstr "您可以選擇您工作站的桌面環境："
 
-#: steps_interactive.pm:568
+#: steps_interactive.pm:569
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "所選取的大小超過可用的空間"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:585
 #, c-format
 msgid "Type of install"
 msgstr "安裝類型"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:586
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1168,87 +1168,87 @@ msgstr ""
 "您並未選取任何套件群組。\n"
 "請選擇您想要的最小安裝："
 
-#: steps_interactive.pm:590
+#: steps_interactive.pm:591
 #, c-format
 msgid "With X"
 msgstr "包含 X 環境"
 
-#: steps_interactive.pm:591
+#: steps_interactive.pm:592
 #, c-format
 msgid "Install suggested packages"
 msgstr "安裝建議套件"
 
-#: steps_interactive.pm:592
+#: steps_interactive.pm:593
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "包含基本的說明文件 (建議的！)"
 
-#: steps_interactive.pm:593
+#: steps_interactive.pm:594
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最小安裝 (尤其無 urpmi)"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Preparing installation"
 msgstr "正在準備安裝"
 
-#: steps_interactive.pm:657
+#: steps_interactive.pm:659
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安裝套件 %s"
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列套件時發生錯誤："
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "Go on anyway?"
 msgstr "無論如何都要繼續嗎？"
 
-#: steps_interactive.pm:685
+#: steps_interactive.pm:687
 #, c-format
 msgid "Retry"
 msgstr "重試"
 
-#: steps_interactive.pm:686
+#: steps_interactive.pm:688
 #, c-format
 msgid "Skip this package"
 msgstr "略過這個套件"
 
-#: steps_interactive.pm:687
+#: steps_interactive.pm:689
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "略過所有 %s 媒體的套件"
 
-#: steps_interactive.pm:688
+#: steps_interactive.pm:690
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "回到媒體與套件選擇"
 
-#: steps_interactive.pm:691
+#: steps_interactive.pm:693
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "安裝 %s 套件時發生錯誤。"
 
-#: steps_interactive.pm:710
+#: steps_interactive.pm:712
 #, c-format
 msgid "Post-install configuration"
 msgstr "安裝後的設定"
 
-#: steps_interactive.pm:717
+#: steps_interactive.pm:719
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "請確定更新模組媒介位於磁碟機 %s 中"
 
-#: steps_interactive.pm:745 steps_list.pm:47
+#: steps_interactive.pm:747 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "更新"
 
-#: steps_interactive.pm:746
+#: steps_interactive.pm:748
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1267,100 +1267,101 @@ msgstr ""
 "\n"
 "您想要安裝更新嗎？"
 
-#: steps_interactive.pm:854
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:858
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
 
-#: steps_interactive.pm:886 steps_interactive.pm:893 steps_interactive.pm:906
-#: steps_interactive.pm:923 steps_interactive.pm:938
+#: steps_interactive.pm:890 steps_interactive.pm:897 steps_interactive.pm:910
+#: steps_interactive.pm:927 steps_interactive.pm:942
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: steps_interactive.pm:907 steps_interactive.pm:924
+#: steps_interactive.pm:911 steps_interactive.pm:928
 #, c-format
 msgid "Sound card"
 msgstr "音效卡"
 
-#: steps_interactive.pm:927
+#: steps_interactive.pm:931
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 音效卡嗎？"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:933
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "請在安裝完畢後，執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:935
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "沒偵測到任何音效卡。請在安裝後嘗試 \"harddrake\" 進行設定"
 
-#: steps_interactive.pm:939
+#: steps_interactive.pm:943
 #, c-format
 msgid "Graphical interface"
 msgstr "圖形介面"
 
-#: steps_interactive.pm:945 steps_interactive.pm:956
+#: steps_interactive.pm:949 steps_interactive.pm:960
 #, c-format
 msgid "Network & Internet"
 msgstr "網路與網際網路"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:961
 #, c-format
 msgid "Proxies"
 msgstr "代理伺服器"
 
-#: steps_interactive.pm:958
+#: steps_interactive.pm:962
 #, c-format
 msgid "configured"
 msgstr "已設定"
 
-#: steps_interactive.pm:968
+#: steps_interactive.pm:972
 #, c-format
 msgid "Security Level"
 msgstr "安全層級"
 
-#: steps_interactive.pm:987
+#: steps_interactive.pm:992
 #, c-format
 msgid "Firewall"
 msgstr "防火牆"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "activated"
 msgstr "已啟用"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "disabled"
 msgstr "已停用"
 
-#: steps_interactive.pm:1005
+#: steps_interactive.pm:1010
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您尚未設定 X。您確定您真的要這樣做？"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1039
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "正在準備開機載入程式..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1039
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "正在準備安裝"
 
-#: steps_interactive.pm:1035
+#: steps_interactive.pm:1040
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "請耐心等候，這要花一些時間..."
 
-#: steps_interactive.pm:1046
+#: steps_interactive.pm:1051
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1373,24 +1374,24 @@ msgstr ""
 "安裝還是會繼續下去，不過您將需要使用 bootX 或某些其他方法來啟動您的機器。"
 "root fs 的核心參數是：root=%s"
 
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1064
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "在這個安全層級中，只有管理者能夠存取位於 Windows 分割區的檔案。"
 
-#: steps_interactive.pm:1091
+#: steps_interactive.pm:1096
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "請在 %s 中插入一片空白磁片"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1098
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在製作自動安裝磁片..."
 
-#: steps_interactive.pm:1104
+#: steps_interactive.pm:1109
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1401,12 +1402,12 @@ msgstr ""
 "\n"
 "您確定要結束安裝程式？"
 
-#: steps_interactive.pm:1114
+#: steps_interactive.pm:1119
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: steps_interactive.pm:1117
+#: steps_interactive.pm:1122
 #, c-format
 msgid "Reboot"
 msgstr "重新開機"
@@ -1543,6 +1544,9 @@ msgid ""
 "Exit"
 msgstr "離開"
 
+#~ msgid "Bad package"
+#~ msgstr "壞掉的套件"
+
 #, fuzzy
 #~ msgid "Preparing boot images..."
 #~ msgstr "正在準備開機載入程式..."