From 6e85c84745b89c96ebbe49994d413757a11e4f95 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 3 Aug 2007 14:17:11 +0000
Subject: better phrasing

---
 po/zh_TW.po | 157 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 80 insertions(+), 77 deletions(-)

(limited to 'po/zh_TW.po')

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4b914f21..7129909e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-02 22:39+0200\n"
+"POT-Creation-Date: 2007-08-03 16:14+0200\n"
 "PO-Revision-Date: 2006-09-18 22:52+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -245,7 +245,7 @@ msgstr "媒體類別："
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
 #: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:612
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
 #: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
 #, c-format
 msgid "Cancel"
@@ -257,7 +257,7 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
 #: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:815
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
 #: ../rpmdrake.pm:304 ../rpmdrake.pm:616
 #, c-format
@@ -601,7 +601,7 @@ msgstr "同步管理..."
 msgid "Global options..."
 msgstr "全域選項"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:145
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -858,7 +858,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
@@ -1536,51 +1536,51 @@ msgstr "網路伺服器"
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:39
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "用法：%s [選項]..."
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:40
 #, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯示檔案列表"
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:41
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     限制於給定的媒體"
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     計畫合併所有找到的 .rpmnew/.rpmsave 檔案"
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:43
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            設定模式 (install (預設值)、remove、update)"
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問題"
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:45
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      啟動時不更新媒體"
 
-#: ../Rpmdrake/init.pm:53
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不驗證套件簽章"
 
-#: ../Rpmdrake/init.pm:54
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1589,37 +1589,37 @@ msgstr ""
 "  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host"
 "\" 主機名稱來顯示相依性"
 
-#: ../Rpmdrake/init.pm:55
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    僅顯示這些套件"
 
-#: ../Rpmdrake/init.pm:56
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      預先選取這些套件"
 
-#: ../Rpmdrake/init.pm:57
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 強制使用 root 來執行"
 
-#: ../Rpmdrake/init.pm:58
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           搜尋 \"pkg\" "
 
-#: ../Rpmdrake/init.pm:59
+#: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid "Running in user mode"
 msgstr "以一般使用者模式執行"
 
-#: ../Rpmdrake/init.pm:137
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1630,12 +1630,12 @@ msgstr ""
 "您無法對系統進行修改，\n"
 "但是您仍然可以瀏覽現存的資料庫。"
 
-#: ../Rpmdrake/init.pm:144 ../Rpmdrake/init.pm:169
+#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
 #, c-format
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../Rpmdrake/init.pm:149
+#: ../Rpmdrake/init.pm:142
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1647,7 +1647,7 @@ msgstr ""
 "\n"
 "此工具將協助您選取要從系統移除的軟體。"
 
-#: ../Rpmdrake/init.pm:154
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1659,12 +1659,12 @@ msgstr ""
 "\n"
 "此工具將協助您選取要安裝於系統上的更新。"
 
-#: ../Rpmdrake/init.pm:159
+#: ../Rpmdrake/init.pm:152
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "歡迎使用軟體安裝工具！"
 
-#: ../Rpmdrake/init.pm:160
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1679,17 +1679,17 @@ msgstr ""
 "套件都位於 CD 或 DVD 光碟內。此工具將會協助您選取您想\n"
 "要安裝於系統的軟體。"
 
-#: ../Rpmdrake/init.pm:171
+#: ../Rpmdrake/init.pm:164
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr ""
 
-#: ../Rpmdrake/init.pm:172
+#: ../Rpmdrake/init.pm:165
 #, fuzzy, c-format
 msgid "Do you want to add media sources now?"
 msgstr "您確定要移除套件來源 \"%s\" 嗎？"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
@@ -1746,18 +1746,18 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #: ../rpmdrake.pm:329
 #, c-format
 msgid "Please wait"
 msgstr "請稍候"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #, c-format
 msgid "Initializing..."
 msgstr "初始化中..."
@@ -1787,17 +1787,17 @@ msgstr "請稍候，正在尋找可用的套件..."
 msgid "Could not create temporary directory '%s'"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:792
+#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:772
+#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:480 ../Rpmdrake/pkg.pm:774
+#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1808,22 +1808,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:761
+#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:507
 #, c-format
 msgid "Unable to get source packages."
 msgstr "無法取得來源套件。"
 
-#: ../Rpmdrake/pkg.pm:509
+#: ../Rpmdrake/pkg.pm:508
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
 #, c-format
 msgid ""
 "\n"
@@ -1836,19 +1836,19 @@ msgstr ""
 "錯誤報告：\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:523
 #, fuzzy, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "為了滿足相依性，將一併安裝下列套件"
 
-#: ../Rpmdrake/pkg.pm:529
+#: ../Rpmdrake/pkg.pm:528
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "移除一把鑰匙"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:530
 #, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr ""
@@ -1858,14 +1858,14 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, fuzzy, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, fuzzy, c-format
 msgid "Is it ok to continue?"
 msgstr ""
@@ -1873,62 +1873,62 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../Rpmdrake/pkg.pm:562
+#: ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Change medium"
 msgstr "變更媒體"
 
-#: ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/pkg.pm:562
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請置入名為 \"%s\" 的媒體於裝置 [%s] 中"
 
-#: ../Rpmdrake/pkg.pm:586
+#: ../Rpmdrake/pkg.pm:585
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:586
-#, c-format
-msgid "Preparing..."
-msgstr "準備中..."
+#: ../Rpmdrake/pkg.pm:585
+#, fuzzy, c-format
+msgid "Preparing package installation transaction..."
+msgstr "正在準備套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:588
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:590
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Total: %s/%s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:611 ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:617
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:619
+#: ../Rpmdrake/pkg.pm:618
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:640
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "核對套件簽章..."
 
-#: ../Rpmdrake/pkg.pm:653 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../Rpmdrake/pkg.pm:654
+#: ../Rpmdrake/pkg.pm:653
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1943,43 +1943,43 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:666
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/pkg.pm:668
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../Rpmdrake/pkg.pm:673
+#: ../Rpmdrake/pkg.pm:672
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../Rpmdrake/pkg.pm:708 ../Rpmdrake/pkg.pm:726 ../Rpmdrake/pkg.pm:819
+#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
 #: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
 #, c-format
 msgid "Error"
 msgstr "錯誤"
 
-#: ../Rpmdrake/pkg.pm:709 ../Rpmdrake/pkg.pm:727 ../Rpmdrake/pkg.pm:740
+#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../Rpmdrake/pkg.pm:728
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
-#: ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:752
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1992,12 +1992,12 @@ msgstr ""
 "\n"
 "您或許需要更新您的媒體資料庫。"
 
-#: ../Rpmdrake/pkg.pm:773
+#: ../Rpmdrake/pkg.pm:763
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "安裝失敗"
 
-#: ../Rpmdrake/pkg.pm:787
+#: ../Rpmdrake/pkg.pm:777
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2010,42 +2010,42 @@ msgstr ""
 "有些設定檔被建立時以 `.rpmnew' 或 `.rpmsave' 命名，您\n"
 "現在可以檢查一下以確保它正常運作："
 
-#: ../Rpmdrake/pkg.pm:795
+#: ../Rpmdrake/pkg.pm:787
 #, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "一般資訊"
 
-#: ../Rpmdrake/pkg.pm:797
+#: ../Rpmdrake/pkg.pm:789
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "這些套件包含了升級資訊"
 
-#: ../Rpmdrake/pkg.pm:805
+#: ../Rpmdrake/pkg.pm:797
 #, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "更多該套件的資訊..."
 
-#: ../Rpmdrake/pkg.pm:808
+#: ../Rpmdrake/pkg.pm:800
 #, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "更多 %s 套件的資訊..."
 
-#: ../Rpmdrake/pkg.pm:820
+#: ../Rpmdrake/pkg.pm:812
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的套件。"
 
-#: ../Rpmdrake/pkg.pm:836 ../Rpmdrake/pkg.pm:853
+#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在移除套件，請稍候..."
 
-#: ../Rpmdrake/pkg.pm:864
+#: ../Rpmdrake/pkg.pm:856
 #, c-format
 msgid "Problem during removal"
 msgstr "移除時發生問題"
 
-#: ../Rpmdrake/pkg.pm:865
+#: ../Rpmdrake/pkg.pm:857
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -3128,6 +3128,9 @@ msgstr "移除軟體"
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
+#~ msgid "Preparing..."
+#~ msgstr "準備中..."
+
 #~ msgid "Message Passing"
 #~ msgstr "傳遞訊息中"
 
-- 
cgit v1.2.1