sync with code & sync translations with urpmi

1 files changed, 59 insertions, 49 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8e195bb0..a0221d3c 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-03-07 15:00+0100\n"
+"POT-Creation-Date: 2007-03-07 15:42+0100\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"
@@ -235,7 +235,7 @@ msgstr "媒體類別："
 #: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
 #: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
 #: ../Rpmdrake/edit_urpm_sources.pm:857 ../Rpmdrake/gui.pm:502
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:571
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:568
 #: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
@@ -247,7 +247,7 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
 #: ../Rpmdrake/edit_urpm_sources.pm:903 ../Rpmdrake/edit_urpm_sources.pm:1063
 #: ../Rpmdrake/gui.pm:502 ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:523
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:760
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
 #: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
@@ -843,7 +843,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
@@ -1703,23 +1703,23 @@ msgstr "您確定要移除套件來源 \"%s\" 嗎？"
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "請稍候"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #, c-format
 msgid "Initializing..."
 msgstr "初始化中..."
 
-#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
@@ -1796,17 +1796,17 @@ msgstr "排序套件中，請稍候..."
 msgid "Please wait, finding installed packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:731
+#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:737
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:716
 #, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:712 ../Rpmdrake/pkg.pm:770
+#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:718 ../Rpmdrake/pkg.pm:776
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1817,17 +1817,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:473
+#: ../Rpmdrake/pkg.pm:472
 #, c-format
 msgid "Unable to get source packages."
 msgstr "無法取得來源套件。"
 
-#: ../Rpmdrake/pkg.pm:474
+#: ../Rpmdrake/pkg.pm:473
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../Rpmdrake/pkg.pm:475 ../Rpmdrake/pkg.pm:700
+#: ../Rpmdrake/pkg.pm:474 ../Rpmdrake/pkg.pm:706
 #, c-format
 msgid ""
 "\n"
@@ -1840,7 +1840,7 @@ msgstr ""
 "錯誤報告：\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:492
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -1848,13 +1848,13 @@ msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be installed:"
 msgstr[0] "為了滿足相依性，將一併安裝下列套件"
 
-#: ../Rpmdrake/pkg.pm:497
+#: ../Rpmdrake/pkg.pm:496
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "移除一把鑰匙"
 
-#: ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:498
 #, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr ""
@@ -1864,14 +1864,14 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, fuzzy, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, fuzzy, c-format
 msgid "Is it ok to continue?"
 msgstr ""
@@ -1879,47 +1879,57 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:521
 #, c-format
 msgid "Change medium"
 msgstr "變更媒體"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:522
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請置入名為 \"%s\" 的媒體於裝置 [%s] 中"
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../Rpmdrake/pkg.pm:548
+#: ../Rpmdrake/pkg.pm:546
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:569
+#: ../Rpmdrake/pkg.pm:567 ../Rpmdrake/pkg.pm:572
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "正在下載套件 `%s' (%s/%s)..."
+msgid "Downloading package `%s'..."
+msgstr "正在下載套件 `%s'..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:574
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:575
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:595
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "核對套件簽章..."
 
-#: ../Rpmdrake/pkg.pm:602 ../rpmdrake.pm:750 ../rpmdrake.pm:859
+#: ../Rpmdrake/pkg.pm:608 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../Rpmdrake/pkg.pm:603
+#: ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1934,48 +1944,48 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:622
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:624
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../Rpmdrake/pkg.pm:622
+#: ../Rpmdrake/pkg.pm:628
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../Rpmdrake/pkg.pm:648 ../Rpmdrake/pkg.pm:666 ../Rpmdrake/pkg.pm:759
+#: ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:672 ../Rpmdrake/pkg.pm:765
 #: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
 #, c-format
 msgid "Error"
 msgstr "錯誤"
 
-#: ../Rpmdrake/pkg.pm:649 ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:655 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../Rpmdrake/pkg.pm:650
+#: ../Rpmdrake/pkg.pm:656
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../Rpmdrake/pkg.pm:668
+#: ../Rpmdrake/pkg.pm:674
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
-#: ../Rpmdrake/pkg.pm:680 ../Rpmdrake/pkg.pm:697 ../Rpmdrake/pkg.pm:769
+#: ../Rpmdrake/pkg.pm:686 ../Rpmdrake/pkg.pm:703 ../Rpmdrake/pkg.pm:775
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../Rpmdrake/pkg.pm:698
+#: ../Rpmdrake/pkg.pm:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1988,12 +1998,12 @@ msgstr ""
 "\n"
 "您或許需要更新您的媒體資料庫。"
 
-#: ../Rpmdrake/pkg.pm:711
+#: ../Rpmdrake/pkg.pm:717
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "安裝失敗"
 
-#: ../Rpmdrake/pkg.pm:726
+#: ../Rpmdrake/pkg.pm:732
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2006,42 +2016,42 @@ msgstr ""
 "有些設定檔被建立時以 `.rpmnew' 或 `.rpmsave' 命名，您\n"
 "現在可以檢查一下以確保它正常運作："
 
-#: ../Rpmdrake/pkg.pm:734
+#: ../Rpmdrake/pkg.pm:740
 #, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "一般資訊"
 
-#: ../Rpmdrake/pkg.pm:736
+#: ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "這些套件包含了升級資訊"
 
-#: ../Rpmdrake/pkg.pm:744
+#: ../Rpmdrake/pkg.pm:750
 #, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "更多該套件的資訊..."
 
-#: ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:753
 #, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "更多 %s 套件的資訊..."
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:766
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的套件。"
 
-#: ../Rpmdrake/pkg.pm:784 ../Rpmdrake/pkg.pm:789
+#: ../Rpmdrake/pkg.pm:790 ../Rpmdrake/pkg.pm:795
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在移除套件，請稍候..."
 
-#: ../Rpmdrake/pkg.pm:800
+#: ../Rpmdrake/pkg.pm:806
 #, c-format
 msgid "Problem during removal"
 msgstr "移除時發生問題"
 
-#: ../Rpmdrake/pkg.pm:801
+#: ../Rpmdrake/pkg.pm:807
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"