merge the latest debian-sid branch

1 files changed, 15 insertions, 15 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 296e58a24..ce7ebc21d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2009-01-04 12:41+0800\n"
+"PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
@@ -1458,7 +1458,7 @@ msgstr "找不到雜湊元件！"
 
 #: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "在配置轉移資訊時失敗"
+msgstr "在配置抽換資訊時失敗"
 
 #: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
@@ -1467,12 +1467,12 @@ msgstr "在 AddDiversion 發生了內部錯誤"
 #: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "試圖改寫轉移資訊，%s -> %s 和 %s/%s"
+msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s"
 
 #: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "重複加入轉移資訊 %s -> %s"
+msgstr "重複加入抽換資訊 %s -> %s"
 
 #: apt-inst/filelist.cc:549
 #, c-format
@@ -1502,16 +1502,16 @@ msgstr "解開 %s 超過一次"
 #: apt-inst/extract.cc:134
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "路徑 %s 已被轉移"
+msgstr "路徑 %s 已被抽換"
 
 #: apt-inst/extract.cc:144
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "此套件試圖寫至轉移後的目標 %s/%s"
+msgstr "此套件試圖寫至抽換後的目標 %s/%s"
 
 #: apt-inst/extract.cc:154 apt-inst/extract.cc:297
 msgid "The diversion path is too long"
-msgstr "要進行轉移的路徑過長"
+msgstr "要進行抽換的路徑過長"
 
 #: apt-inst/extract.cc:240
 #, c-format
@@ -1610,21 +1610,21 @@ msgstr "內部錯誤，無法取得節點"
 #: apt-inst/deb/dpkgdb.cc:305
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr "讀取轉移檔 %sdiversions 失敗"
+msgstr "讀取抽換檔 %sdiversions 失敗"
 
 #: apt-inst/deb/dpkgdb.cc:320
 msgid "The diversion file is corrupted"
-msgstr "轉移檔已損壞"
+msgstr "抽換檔已損壞"
 
 #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
 #: apt-inst/deb/dpkgdb.cc:337
 #, c-format
 msgid "Invalid line in the diversion file: %s"
-msgstr "在轉移檔中的這一行有誤：%s"
+msgstr "在抽換檔中的這一行有誤：%s"
 
 #: apt-inst/deb/dpkgdb.cc:358
 msgid "Internal error adding a diversion"
-msgstr "內部錯誤：在新增轉移資料時發生錯誤"
+msgstr "內部錯誤：在新增抽換資料時發生錯誤"
 
 #: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
@@ -2218,7 +2218,7 @@ msgstr "子程序 %s 傳回錯誤碼 (%u)"
 #: apt-pkg/contrib/fileutl.cc:459
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "子程序 %s 不預期的結束"
+msgstr "子程序 %s 不預期得結束"
 
 #: apt-pkg/contrib/fileutl.cc:503
 #, c-format
@@ -2443,7 +2443,7 @@ msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
-msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用舊的索引檔。"
+msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。"
 
 #: apt-pkg/acquire.cc:59
 #, c-format
@@ -2716,7 +2716,7 @@ msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯�
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "發現標籤 '%s'\n"
+msgstr "找到標籤 '%s'\n"
 
 #: apt-pkg/cdrom.cc:744
 msgid "That is not a valid name, try again.\n"
@@ -2806,7 +2806,7 @@ msgstr "正在準備設定 %s"
 #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
 #, c-format
 msgid "Processing triggers for %s"
-msgstr "正在後續設定 %s"
+msgstr "正在進行 %s 的觸發程式"
 
 #: apt-pkg/deb/dpkgpm.cc:617
 #, c-format