sync with code

1 files changed, 114 insertions, 46 deletions

diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po
index 8ebd7b33d..e87982007 100644
--- a/perl-install/install/share/po/zh_TW.po
+++ b/perl-install/install/share/po/zh_TW.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # You-Cheng Hsieh <yochenhsieh@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 20:52+0100\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2015-03-02 03:10+0000\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/"
+"language/zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../../advertising/01_IM_mageia.pl:1
@@ -73,8 +74,7 @@ msgstr ""
 msgid "Do you have further supplementary media?"
 msgstr "您還有其他的補充媒介嗎?"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la
-#. LaTeX
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: any.pm:154
 #, c-format
 msgid ""
@@ -82,7 +82,11 @@ msgid ""
 "\n"
 "\n"
 "Do you have a supplementary installation medium to configure?"
-msgstr "已經找到下列媒介，它們將會在安裝過程中使用到：%s。\n\n\n您有其他的安裝媒介需要設定嗎？"
+msgstr ""
+"已經找到下列媒介，它們將會在安裝過程中使用到：%s。\n"
+"\n"
+"\n"
+"您有其他的安裝媒介需要設定嗎？"
 
 #: any.pm:162
 #, c-format
@@ -189,8 +193,8 @@ msgstr ""
 #: any.pm:436
 #, c-format
 msgid ""
-"Some hardware on your machine needs some non free firmwares in order for the"
-" free software drivers to work."
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
 msgstr "您的機器上的某些硬體需要非自由的軔體才能夠讓自由的驅動程式運作。"
 
 #: any.pm:437
@@ -213,13 +217,15 @@ msgstr "\"%s\" 包含非自由的軟體套件。\n"
 msgid ""
 "It also contains firmwares needed for certain devices to operate (eg: some "
 "ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
-msgstr "它也包含某些裝置運作時所需要的軔體(如：某些 ATI/AMD 顯示卡、網路卡、RAID介面卡...)"
+msgstr ""
+"它也包含某些裝置運作時所需要的軔體(如：某些 ATI/AMD 顯示卡、網路卡、RAID介面"
+"卡...)"
 
 #: any.pm:478
 #, c-format
 msgid ""
-"\"%s\" contains software that can not be distributed in every country due to"
-" software patents."
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
 msgstr "\"%s\" 包含因為軟體專利而無法在所有國家散佈的軟體套件。"
 
 #: any.pm:479
@@ -253,8 +259,7 @@ msgstr "正在搜尋要升級的套件..."
 msgid "Removing packages prior to upgrade..."
 msgstr "移除套件以更新..."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la
-#. LaTeX
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: any.pm:881
 #, c-format
 msgid ""
@@ -262,7 +267,11 @@ msgid ""
 "\n"
 "\n"
 "Do you really want to remove these packages?\n"
-msgstr "下列套件將被移除以升級您的系統：%s\n\n\n您確定要移除這些套件嗎？\n"
+msgstr ""
+"下列套件將被移除以升級您的系統：%s\n"
+"\n"
+"\n"
+"您確定要移除這些套件嗎？\n"
 
 #: any.pm:1096
 #, c-format
@@ -354,7 +363,9 @@ msgstr "您也必須要格式化 %s"
 msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
-msgstr "某些在您電腦上的硬體需要 \"專有版權\" 的驅動程式以便於能夠工作。\n您可以在這裡找到一些相關的資訊： %s"
+msgstr ""
+"某些在您電腦上的硬體需要 \"專有版權\" 的驅動程式以便於能夠工作。\n"
+"您可以在這裡找到一些相關的資訊： %s"
 
 #: interactive.pm:22
 #, c-format
@@ -431,7 +442,9 @@ msgstr "沒有描述"
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
-msgstr "無法安裝 %s 要求的某些套件：\n%s"
+msgstr ""
+"無法安裝 %s 要求的某些套件：\n"
+"%s"
 
 #: pkgs.pm:382 pkgs.pm:409
 #, c-format
@@ -473,7 +486,9 @@ msgstr "辦公軟體平台"
 msgid ""
 "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
 "(LibreOffice Calc, Kspread), PDF viewers, etc"
-msgstr "辦公軟體：文書處理軟體 (LibreOffice Writer、Kword)、試算表 (OpenOffice.org Calc、Kspread)、PDF 檢視器等等"
+msgstr ""
+"辦公軟體：文書處理軟體 (LibreOffice Writer、Kword)、試算表 (OpenOffice.org "
+"Calc、Kspread)、PDF 檢視器等等"
 
 #: share/meta-task/compssUsers.pl:26
 #, c-format
@@ -696,8 +711,8 @@ msgstr "KDE 工作站"
 #: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection"
-" of accompanying tools"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr "K 桌面環境，包含許多好用的圖型介面工具程式"
 
 #: share/meta-task/compssUsers.pl:158
@@ -836,15 +851,21 @@ msgstr "用來設定伺服器的精靈"
 msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
-msgstr "發生了一個錯誤，但我不知道該如何妥善處置它。\n要繼續安裝工作的話請小心。"
+msgstr ""
+"發生了一個錯誤，但我不知道該如何妥善處置它。\n"
+"要繼續安裝工作的話請小心。"
 
 #: steps.pm:458
 #, c-format
 msgid ""
 "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"
-msgstr "有某些重要的套件沒有被適當地安裝。\n可能是您的光碟機或者是光碟片有缺陷。\n請將光碟放在一個已經安裝好的電腦上使用 \"rpm -qpl media/main/*.rpm\" 來檢查\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
+"\"\n"
+msgstr ""
+"有某些重要的套件沒有被適當地安裝。\n"
+"可能是您的光碟機或者是光碟片有缺陷。\n"
+"請將光碟放在一個已經安裝好的電腦上使用 \"rpm -qpl media/main/*.rpm\" 來檢查\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -872,7 +893,9 @@ msgid ""
 "Your system is low on resources. You may have some problem installing\n"
 "%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
-msgstr "您的系統資源不足，可能在安裝 %s 時會發生問題。如果真的發生問題，您可以試著改用文字介面安裝。只要在用光碟開機後的選單中按下 F1，並輸入 text 即可。"
+msgstr ""
+"您的系統資源不足，可能在安裝 %s 時會發生問題。如果真的發生問題，您可以試著改"
+"用文字介面安裝。只要在用光碟開機後的選單中按下 F1，並輸入 text 即可。"
 
 #: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
@@ -1097,14 +1120,21 @@ msgstr "未被設定"
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
-msgstr "已經找到下列的安裝媒介。\n如果您想略過它們，您現在可以將它們取消選取。"
+msgstr ""
+"已經找到下列的安裝媒介。\n"
+"如果您想略過它們，您現在可以將它們取消選取。"
 
 #: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard disk drive before installation.\n"
-"It will then continue from the hard disk drive and the packages will remain available once the system is fully installed."
-msgstr "您可以選擇在安裝前將光碟的內容複製到硬碟。稍候將會由硬碟繼續安裝，並且這些套件\n在安裝完畢之後仍然可以繼續使用。"
+"You have the option to copy the contents of the CDs onto the hard disk drive "
+"before installation.\n"
+"It will then continue from the hard disk drive and the packages will remain "
+"available once the system is fully installed."
+msgstr ""
+"您可以選擇在安裝前將光碟的內容複製到硬碟。稍候將會由硬碟繼續安裝，並且這些套"
+"件\n"
+"在安裝完畢之後仍然可以繼續使用。"
 
 #: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
@@ -1178,7 +1208,12 @@ msgid ""
 "\n"
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
-msgstr "安裝器偵測到您所安裝的 Mageia Linux 系統無法安全地更新到 %s。\n\n建議您重新安裝，而不要用升級的。\n\n警告：在您選擇「新安裝」之前，您應該備份您所有的個人資料。"
+msgstr ""
+"安裝器偵測到您所安裝的 Mageia Linux 系統無法安全地更新到 %s。\n"
+"\n"
+"建議您重新安裝，而不要用升級的。\n"
+"\n"
+"警告：在您選擇「新安裝」之前，您應該備份您所有的個人資料。"
 
 #: steps_interactive.pm:264
 #, c-format
@@ -1194,9 +1229,13 @@ msgstr "正在設定 IDE"
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
-msgstr "更換光碟片！\n請插入標示為 \"%s\" 的光碟於您的光碟機中，完成後請按下確定。\n若是您沒有這片光碟，請點選取消以略過這一片光碟的安裝。"
+msgstr ""
+"更換光碟片！\n"
+"請插入標示為 \"%s\" 的光碟於您的光碟機中，完成後請按下確定。\n"
+"若是您沒有這片光碟，請點選取消以略過這一片光碟的安裝。"
 
 #: steps_interactive.pm:372
 #, c-format
@@ -1215,7 +1254,9 @@ msgstr "您的系統剩餘的空間不足以安裝或升級 (%dMB > %dMB)"
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
-msgstr "請選擇要載入或者儲存套件選擇到磁片上。\n它使用與自動安裝所產生的磁片相同的格式。"
+msgstr ""
+"請選擇要載入或者儲存套件選擇到磁片上。\n"
+"它使用與自動安裝所產生的磁片相同的格式。"
 
 #: steps_interactive.pm:430
 #, c-format
@@ -1267,7 +1308,9 @@ msgstr "安裝類型"
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
-msgstr "您並未選取任何套件群組。\n請選擇您想要的最小安裝："
+msgstr ""
+"您並未選取任何套件群組。\n"
+"請選擇您想要的最小安裝："
 
 #: steps_interactive.pm:578
 #, c-format
@@ -1356,6 +1399,25 @@ msgstr "更新"
 
 #: steps_interactive.pm:740
 #, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
+#, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
 "have been updated after the distribution was released. They may\n"
@@ -1365,7 +1427,13 @@ msgid ""
 "connection.\n"
 "\n"
 "Do you want to install the updates?"
-msgstr "您現在有機會下載更新套件。這些套件在發行版釋放之後已經被更新過了。\n他們或許有安全性或臭蟲修正。\n\n要下載這些套件，您需要有正常運作的網際網路連線。\n\n您想要安裝更新嗎？"
+msgstr ""
+"您現在有機會下載更新套件。這些套件在發行版釋放之後已經被更新過了。\n"
+"他們或許有安全性或臭蟲修正。\n"
+"\n"
+"要下載這些套件，您需要有正常運作的網際網路連線。\n"
+"\n"
+"您想要安裝更新嗎？"
 
 #. -PO: example: lilo-graphic on /dev/hda1
 #: steps_interactive.pm:853
@@ -1392,8 +1460,8 @@ msgstr "您有 ISA 音效卡嗎？"
 #: steps_interactive.pm:931
 #, c-format
 msgid ""
-"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound"
-" card"
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
 msgstr "請在安裝完畢後，執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡"
 
 #: steps_interactive.pm:933
@@ -1446,13 +1514,8 @@ msgstr "已停用"
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您尚未設定 X。您確定您真的要這樣做？"
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "正在準備開機載入程式..."
-
-#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1040
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
 msgid "Preparing initial startup program..."
 msgstr "正在準備初始化啟動程式..."
@@ -1485,7 +1548,10 @@ msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
-msgstr "還有些步驟沒有完成。\n\n您確定要結束安裝程式？"
+msgstr ""
+"還有些步驟沒有完成。\n"
+"\n"
+"您確定要結束安裝程式？"
 
 #: steps_interactive.pm:1112
 #, c-format
@@ -1497,8 +1563,7 @@ msgstr "恭喜"
 msgid "Reboot"
 msgstr "重新開機"
 
-#. -PO: please keep the following messages very short: they must fit in the
-#. left list of the installer!!!
+#. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
 msgid ""
@@ -1629,3 +1694,6 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "離開"
+
+#~ msgid "Preparing bootloader..."
+#~ msgstr "正在準備開機載入程式..."