sync with code

1 files changed, 123 insertions, 118 deletions

diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po
index 421e323af..b8b5441ca 100644
--- a/perl-install/install/share/po/zh_TW.po
+++ b/perl-install/install/share/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"POT-Creation-Date: 2016-01-02 14:54+0100\n"
 "PO-Revision-Date: 2015-05-28 13:40+0000\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/"
@@ -90,129 +90,124 @@ msgstr ""
 
 #: any.pm:162
 #, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: any.pm:163
-#, c-format
 msgid "Network (HTTP)"
 msgstr "網路 (HTTP)"
 
-#: any.pm:164
+#: any.pm:163
 #, c-format
 msgid "Network (FTP)"
 msgstr "網路 (FTP)"
 
-#: any.pm:165
+#: any.pm:164
 #, c-format
 msgid "Network (NFS)"
 msgstr "網路 (NFS)"
 
-#: any.pm:224
+#: any.pm:223
 #, c-format
 msgid "URL of the mirror?"
 msgstr "映像站的 URL？"
 
-#: any.pm:230
+#: any.pm:229
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL 開頭必須是 ftp:// 或 http://"
 
-#: any.pm:248
+#: any.pm:247
 #, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "請到 %s 網站取得映射站台清單..."
 
-#: any.pm:253
+#: any.pm:252
 #, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "到 %s 網站取得映射站台清單失敗"
 
-#: any.pm:263
+#: any.pm:262
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "選取要用來抓取程式套件檔的 FTP 映射站台"
 
-#: any.pm:293
+#: any.pm:290
 #, c-format
 msgid "NFS setup"
 msgstr "設定 NFS"
 
-#: any.pm:294
+#: any.pm:291
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "請輸入您的 NFS 媒介的主機和目錄名稱"
 
-#: any.pm:298
+#: any.pm:295
 #, c-format
 msgid "Hostname missing"
 msgstr "沒有主機名稱"
 
-#: any.pm:299
+#: any.pm:296
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "目錄必須以「/」開始"
 
-#: any.pm:303
+#: any.pm:300
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS 掛載點的主機名稱？"
 
-#: any.pm:304
+#: any.pm:301
 #, c-format
 msgid "Directory"
 msgstr "目錄"
 
-#: any.pm:334
+#: any.pm:331
 #, c-format
 msgid "Supplementary"
 msgstr "補充"
 
-#: any.pm:369
+#: any.pm:366
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "無法在這個映像站上找到套件列表檔。請確定位址是正確的。"
 
-#: any.pm:394
+#: any.pm:391
 #, c-format
 msgid "Core Release"
 msgstr ""
 
-#: any.pm:396
+#: any.pm:393
 #, c-format
 msgid "Tainted Release"
 msgstr ""
 
-#: any.pm:398
+#: any.pm:395
 #, c-format
 msgid "Nonfree Release"
 msgstr ""
 
-#: any.pm:436
+#: any.pm:433
 #, c-format
 msgid ""
 "Some hardware on your machine needs some non free firmwares in order for the "
 "free software drivers to work."
 msgstr "您的機器上的某些硬體需要非自由的軔體才能夠讓自由的驅動程式運作。"
 
-#: any.pm:437
+#: any.pm:434
 #, c-format
 msgid "You should enable \"%s\""
 msgstr "您應該啟用 \"%s\""
 
-#: any.pm:475
+#: any.pm:472
 #, c-format
 msgid "\"%s\" contains the various pieces of the systems and its applications"
 msgstr "\"%s\" 包含各種系統元件和應用程式"
 
-#: any.pm:476
+#: any.pm:473
 #, c-format
 msgid "\"%s\" contains non free software.\n"
 msgstr "\"%s\" 包含非自由的軟體套件。\n"
 
-#: any.pm:477
+#: any.pm:474
 #, c-format
 msgid ""
 "It also contains firmwares needed for certain devices to operate (eg: some "
@@ -221,40 +216,40 @@ msgstr ""
 "它也包含某些裝置運作時所需要的軔體(如：某些 ATI/AMD 顯示卡、網路卡、RAID介面"
 "卡...)"
 
-#: any.pm:478
+#: any.pm:475
 #, c-format
 msgid ""
 "\"%s\" contains software that can not be distributed in every country due to "
 "software patents."
 msgstr "\"%s\" 包含因為軟體專利而無法在所有國家散佈的軟體套件。"
 
-#: any.pm:479
+#: any.pm:476
 #, c-format
 msgid ""
 "It also contains software from \"%s\" rebuild with additional capabilities."
 msgstr "它也包含了 \"%s\" 中以不同方式編譯的軟體套件。"
 
-#: any.pm:485
+#: any.pm:482
 #, c-format
 msgid "Here you can enable more media if you want."
 msgstr "您可以在這裡啟用更多媒體。"
 
-#: any.pm:502
+#: any.pm:499
 #, c-format
 msgid "This medium provides package updates for medium \"%s\""
 msgstr "這個媒體包含 \"%s\" 媒體的套件更新"
 
-#: any.pm:600
+#: any.pm:597
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查看已經安裝過的套件..."
 
-#: any.pm:634
+#: any.pm:631
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在搜尋要升級的套件..."
 
-#: any.pm:653
+#: any.pm:650
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "移除套件以更新..."
@@ -303,7 +298,7 @@ msgstr "FTP"
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1382 steps_interactive.pm:948
+#: any.pm:1382 steps_interactive.pm:973
 #, c-format
 msgid "Network"
 msgstr "網路"
@@ -353,7 +348,7 @@ msgstr "安裝"
 msgid "Configuration"
 msgstr "組態設定"
 
-#: install2.pm:210
+#: install2.pm:211
 #, c-format
 msgid "You must also format %s"
 msgstr "您也必須要格式化 %s"
@@ -377,22 +372,22 @@ msgstr "啟動網路"
 msgid "Bringing down the network"
 msgstr "關閉網路"
 
-#: media.pm:404
+#: media.pm:407
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "請稍後，正在取回檔案"
 
-#: media.pm:712
+#: media.pm:714
 #, c-format
 msgid "unable to add medium"
 msgstr "無法新增媒體"
 
-#: media.pm:752
+#: media.pm:754
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在複製一些程式套件到磁碟以供稍後使用"
 
-#: media.pm:805
+#: media.pm:807
 #, c-format
 msgid "Copying in progress"
 msgstr "複製進行中"
@@ -437,7 +432,7 @@ msgstr "\"%s\" 媒體沒有 XML 資訊，所以 %s 套件只會有部份內容�
 msgid "No description"
 msgstr "沒有描述"
 
-#: pkgs.pm:286
+#: pkgs.pm:288
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -446,27 +441,27 @@ msgstr ""
 "無法安裝 %s 要求的某些套件：\n"
 "%s"
 
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:384 pkgs.pm:411
 #, c-format
 msgid "An error occurred:"
 msgstr "發生一個錯誤："
 
-#: pkgs.pm:401
+#: pkgs.pm:403
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "發生了一個致命的錯誤：%s。"
 
-#: pkgs.pm:895 pkgs.pm:937
+#: pkgs.pm:897 pkgs.pm:939
 #, c-format
 msgid "Do not ask again"
 msgstr "不要再詢問"
 
-#: pkgs.pm:911
+#: pkgs.pm:913
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 個安裝執行失敗"
 
-#: pkgs.pm:912
+#: pkgs.pm:914
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安裝套件失敗："
@@ -547,33 +542,33 @@ msgstr "Console 工具"
 msgid "Editors, shells, file tools, terminals"
 msgstr "編輯器、shell、檔案工具、終端機"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
-#: share/meta-task/compssUsers.pl:208
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:203
 #, c-format
 msgid "Development"
 msgstr "程式開發"
 
-#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:204
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C/C++ 發展環境，包含編譯器、程式庫與及一些引入檔"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Documentation"
 msgstr "文件檔案"
 
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux 系統與自由軟體的書籍、HOWTO 文件"
 
-#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:212
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "LSB 的支援，包含第三類協力廠商軟體支援"
@@ -704,9 +699,9 @@ msgid "Graphical Environment"
 msgstr "圖形環境"
 
 #: share/meta-task/compssUsers.pl:152
-#, c-format
-msgid "KDE Workstation"
-msgstr "KDE 工作站"
+#, fuzzy, c-format
+msgid "Plasma Workstation"
+msgstr "工作站"
 
 #: share/meta-task/compssUsers.pl:153
 #, c-format
@@ -786,62 +781,50 @@ msgstr "一個輕量且快速的圖形環境"
 
 #: share/meta-task/compssUsers.pl:194
 #, c-format
-msgid "Plasma Desktop"
-msgstr "Plasma 桌面"
-
-#: share/meta-task/compssUsers.pl:195
-#, c-format
-msgid ""
-"The Plasma Desktop, the basic graphical environment with a collection of "
-"accompanying tools"
-msgstr ""
-
-#: share/meta-task/compssUsers.pl:199
-#, c-format
 msgid "Other Graphical Desktops"
 msgstr "其他圖型桌面軟體"
 
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Fvwm, 等"
 
-#: share/meta-task/compssUsers.pl:223
+#: share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Utilities"
 msgstr "工具軟體"
 
-#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
+#: share/meta-task/compssUsers.pl:220 share/meta-task/compssUsers.pl:221
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 伺服主機"
 
-#: share/meta-task/compssUsers.pl:230
+#: share/meta-task/compssUsers.pl:225
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:231
+#: share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin 遠端設定伺服器"
 
-#: share/meta-task/compssUsers.pl:235
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "網路工具/監控"
 
-#: share/meta-task/compssUsers.pl:236
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "監控工具、程序管理、tcpdump、nmap..."
 
-#: share/meta-task/compssUsers.pl:240
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia 精靈"
 
-#: share/meta-task/compssUsers.pl:241
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Wizards to configure server"
 msgstr "用來設定伺服器的精靈"
@@ -855,7 +838,7 @@ msgstr ""
 "發生了一個錯誤，但我不知道該如何妥善處置它。\n"
 "要繼續安裝工作的話請小心。"
 
-#: steps.pm:458
+#: steps.pm:460
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -897,7 +880,7 @@ msgstr ""
 "您的系統資源不足，可能在安裝 %s 時會發生問題。如果真的發生問題，您可以試著改"
 "用文字介面安裝。只要在用光碟開機後的選單中按下 F1，並輸入 text 即可。"
 
-#: steps_gtk.pm:242 steps_gtk.pm:757
+#: steps_gtk.pm:242 steps_gtk.pm:754
 #, c-format
 msgid "Media Selection"
 msgstr "選擇安裝媒介"
@@ -1094,28 +1077,28 @@ msgstr "剩餘時間："
 msgid "(estimating...)"
 msgstr "(正在估計...)"
 
-#: steps_gtk.pm:631
+#: steps_gtk.pm:627
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 個套件"
 
-#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
+#: steps_gtk.pm:684 steps_interactive.pm:834 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "總結"
 
-#: steps_gtk.pm:706
+#: steps_gtk.pm:703
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#: steps_gtk.pm:720 steps_interactive.pm:830 steps_interactive.pm:986
 #, c-format
 msgid "not configured"
 msgstr "未被設定"
 
-#: steps_gtk.pm:766 steps_interactive.pm:315
+#: steps_gtk.pm:763 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1124,7 +1107,7 @@ msgstr ""
 "已經找到下列的安裝媒介。\n"
 "如果您想略過它們，您現在可以將它們取消選取。"
 
-#: steps_gtk.pm:782 steps_interactive.pm:321
+#: steps_gtk.pm:779 steps_interactive.pm:321
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1136,7 +1119,7 @@ msgstr ""
 "件\n"
 "在安裝完畢之後仍然可以繼續使用。"
 
-#: steps_gtk.pm:784 steps_interactive.pm:323
+#: steps_gtk.pm:781 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "複製整張光碟"
@@ -1217,12 +1200,12 @@ msgstr ""
 
 #: steps_interactive.pm:264
 #, c-format
-msgid "IDE"
-msgstr "IDE"
+msgid "CD/DVD"
+msgstr ""
 
 #: steps_interactive.pm:264
-#, c-format
-msgid "Configuring IDE"
+#, fuzzy, c-format
+msgid "Configuring CD/DVD"
 msgstr "正在設定 IDE"
 
 #: steps_interactive.pm:354
@@ -1392,7 +1375,7 @@ msgstr "安裝後的設定"
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "請確定更新模組媒介位於磁碟機 %s 中"
 
-#: steps_interactive.pm:739 steps_list.pm:47
+#: steps_interactive.pm:739 steps_interactive.pm:769 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "更新"
@@ -1418,7 +1401,17 @@ msgstr ""
 "要設定這些來源，您需要有可運作的網路連線。\n"
 "您想要設定更新來源嗎?"
 
-#: steps_interactive.pm:764
+#: steps_interactive.pm:762
+#, fuzzy, c-format
+msgid "Failure when adding medium"
+msgstr "無法新增媒體"
+
+#: steps_interactive.pm:762
+#, fuzzy, c-format
+msgid "Retry?"
+msgstr "重試"
+
+#: steps_interactive.pm:770
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1438,113 +1431,113 @@ msgstr ""
 "您想要安裝更新嗎？"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:853
+#: steps_interactive.pm:878
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
 
-#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
-#: steps_interactive.pm:925 steps_interactive.pm:940
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: steps_interactive.pm:909 steps_interactive.pm:926
+#: steps_interactive.pm:934 steps_interactive.pm:951
 #, c-format
 msgid "Sound card"
 msgstr "音效卡"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:954
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 音效卡嗎？"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:956
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "請在安裝完畢後，執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡"
 
-#: steps_interactive.pm:933
+#: steps_interactive.pm:958
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "沒偵測到任何音效卡。請在安裝後嘗試 \"harddrake\" 進行設定"
 
-#: steps_interactive.pm:941
+#: steps_interactive.pm:966
 #, c-format
 msgid "Graphical interface"
 msgstr "圖形介面"
 
-#: steps_interactive.pm:947 steps_interactive.pm:959
+#: steps_interactive.pm:972 steps_interactive.pm:984
 #, c-format
 msgid "Network & Internet"
 msgstr "網路與網際網路"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:985
 #, c-format
 msgid "Proxies"
 msgstr "代理伺服器"
 
-#: steps_interactive.pm:961
+#: steps_interactive.pm:986
 #, c-format
 msgid "configured"
 msgstr "已設定"
 
-#: steps_interactive.pm:971
+#: steps_interactive.pm:996
 #, c-format
 msgid "Security Level"
 msgstr "安全層級"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:1016
 #, c-format
 msgid "Firewall"
 msgstr "防火牆"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "activated"
 msgstr "已啟用"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "disabled"
 msgstr "已停用"
 
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1034
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您尚未設定 X。您確定您真的要這樣做？"
 
 #. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1065
 #, c-format
 msgid "Preparing initial startup program..."
 msgstr "正在準備初始化啟動程式..."
 
-#: steps_interactive.pm:1041
+#: steps_interactive.pm:1066
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "請耐心等候，這要花一些時間..."
 
-#: steps_interactive.pm:1057
+#: steps_interactive.pm:1082
 #, 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:1089
+#: steps_interactive.pm:1114
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "請在 %s 中插入一片空白磁片"
 
-#: steps_interactive.pm:1091
+#: steps_interactive.pm:1116
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在製作自動安裝磁片..."
 
-#: steps_interactive.pm:1102
+#: steps_interactive.pm:1127
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1555,12 +1548,12 @@ msgstr ""
 "\n"
 "您確定要結束安裝程式？"
 
-#: steps_interactive.pm:1112
+#: steps_interactive.pm:1137
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: steps_interactive.pm:1115
+#: steps_interactive.pm:1140
 #, c-format
 msgid "Reboot"
 msgstr "重新開機"
@@ -1696,3 +1689,15 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "離開"
+
+#~ msgid "CD-ROM"
+#~ msgstr "CD-ROM"
+
+#~ msgid "KDE Workstation"
+#~ msgstr "KDE 工作站"
+
+#~ msgid "Plasma Desktop"
+#~ msgstr "Plasma 桌面"
+
+#~ msgid "IDE"
+#~ msgstr "IDE"