sync with code

1 files changed, 29 insertions, 19 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b8c58f02..e281603e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 14:22+0100\n"
+"POT-Creation-Date: 2007-01-18 15:22+0100\n"
 "PO-Revision-Date: 2006-09-01 21:32+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -194,16 +194,6 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:210
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
-msgstr ""
-"為了滿足相依性的需求，下面的 %d 個套件也必須一併安裝：\n"
-"%s\n"
-
 #: ../gurpmi2:217
 #, c-format
 msgid "Package installation..."
@@ -2113,12 +2103,11 @@ msgstr[1] ""
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:578 ../urpmi:589
+#: ../urpmi:578
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed"
+msgid "To satisfy dependencies, the following package is going to be installed"
 msgid_plural ""
-"To satisfy dependencies, the following package is going to be installed"
+"To satisfy dependencies, the following packages are going to be installed"
 msgstr[0] "為了滿足相依性，將一併安裝下列套件"
 msgstr[1] "為了滿足相依性，將一併安裝下列套件"
 
@@ -2136,6 +2125,15 @@ msgstr ""
 "您必須具有管理者權限以安裝下列的相依性項目：\n"
 "%s\n"
 
+#: ../urpmi:589 ../gurpmi2:209
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgid_plural ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr[0] "為了滿足相依性，將一併安裝下列套件"
+msgstr[1] "為了滿足相依性，將一併安裝下列套件"
+
 #: ../urpmi:592
 #, c-format
 msgid "(test only, installation will not be actually done)"
@@ -2850,6 +2848,22 @@ msgstr "沒有找到檔案列表\n"
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "為了滿足相依性的需求，下面的 %d 個套件也必須一併安裝：\n"
+#~ "%s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr[0] "為了滿足相依性，將一併安裝下列套件"
+#~ msgstr[1] "為了滿足相依性，將一併安裝下列套件"
+
 #~ msgid "skipping media %s: no hdlist"
 #~ msgstr "略過媒體 %s：沒有 hdlist 檔"
 
@@ -2907,10 +2921,6 @@ msgstr "沒有找到更新紀錄\n"
 #~ msgid "Preparing install on %s..."
 #~ msgstr "正在準備安裝到 %s 上..."
 
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr "為了滿足相依性，將一併安裝下列套件"
-
 #~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 #~ msgstr "  --probe-synthesis - 嘗試尋找並使用 synthesis 檔案。\n"