Update PO and POT

[apt.git] / po / zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c9f4657cab0d15bd32b8315330c6c182e07c8994..3b1329fabce8f5f7eacd7a33d686655cb88454a3 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-19 22:24+0800\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
+"PO-Revision-Date: 2006-10-21 16:58+0800\n"

 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"


@@ -147,14 +147,14 @@ msgstr "  版本表格:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 

-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70

 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550

-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
 
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
 

-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"


@@ -228,6 +228,18 @@ msgstr ""
 "  -o=? 設定任意指定的設定選項,例如 -o dir::cache=/tmp\n"
 "若要深入了解,您還可以查閱 apt-cache(8) 和 apt.conf(5) 參考手冊。\n"
 
 "  -o=? 設定任意指定的設定選項,例如 -o dir::cache=/tmp\n"
 "若要深入了解,您還可以查閱 apt-cache(8) 和 apt.conf(5) 參考手冊。\n"
 

+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "請給這張光碟取個名字，比如說“Debian 2.1r1 Disk 1”"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "請放入光碟至光碟機，然後按 [Enter] 鍵。"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "請對您的光碟套件中的其它光碟重復相同的操作。"
+

 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "參數並非一對"
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "參數並非一對"


@@ -323,7 +335,6 @@ msgid "Error processing contents %s"
 msgstr "處理目錄 %s 時出錯"
 
 #: ftparchive/apt-ftparchive.cc:556
 msgstr "處理目錄 %s 時出錯"
 
 #: ftparchive/apt-ftparchive.cc:556

-#, fuzzy

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -412,115 +423,126 @@ msgstr "找不到符合的選項"
 msgid "Some files are missing in the package file group `%s'"
 msgstr "套件檔案組  `%s' 缺少部份檔案"
 
 msgid "Some files are missing in the package file group `%s'"
 msgstr "套件檔案組  `%s' 缺少部份檔案"
 

-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47

 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB 已損毀,檔案被更名成 %s.old"
 
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB 已損毀,檔案被更名成 %s.old"
 

-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65

 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB 過舊,嘗試更新 %s"
 
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB 過舊,嘗試更新 %s"
 

-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。"
+
+#: ftparchive/cachedb.cc:81

 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "無法開啟 DB 檔案 %s:%s"
 
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "無法開啟 DB 檔案 %s:%s"
 

-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272

 #, c-format
 #, c-format

-msgid "File date has changed %s"
-msgstr "檔案資料已更改 %s"
+msgid "Failed to stat %s"
+msgstr "無法取得 %s 的狀態"

 
 

-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242

 msgid "Archive has no control record"
 msgstr "檔案沒有 control 記錄"
 
 msgid "Archive has no control record"
 msgstr "檔案沒有 control 記錄"
 

-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448

 msgid "Unable to get a cursor"
 msgstr "無法取得游標"
 
 msgid "Unable to get a cursor"
 msgstr "無法取得游標"
 

-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79

 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W:無法讀取目錄 %s\n"
 
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W:無法讀取目錄 %s\n"
 

-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84

 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W:無法取得 %s 狀態\n"
 
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W:無法取得 %s 狀態\n"
 

-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135

 msgid "E: "
 msgstr "錯誤："
 
 msgid "E: "
 msgstr "錯誤："
 

-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137

 msgid "W: "
 msgstr "警告："
 
 msgid "W: "
 msgstr "警告："
 

-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144

 msgid "E: Errors apply to file "
 msgstr "E:套用到檔案時出錯"
 
 msgid "E: Errors apply to file "
 msgstr "E:套用到檔案時出錯"
 

-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191

 #, c-format
 msgid "Failed to resolve %s"
 msgstr "無法解析路徑 %s"
 
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "無法解析路徑 %s"
 

-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173

 msgid "Tree walking failed"
 msgstr "無法走訪目錄樹"
 
 msgid "Tree walking failed"
 msgstr "無法走訪目錄樹"
 

-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198

 #, c-format
 msgid "Failed to open %s"
 msgstr "無法開啟 %s"
 
 #, c-format
 msgid "Failed to open %s"
 msgstr "無法開啟 %s"
 

-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257

 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " 移除連結 %s [%s]\n"
 
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " 移除連結 %s [%s]\n"
 

-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265

 #, c-format
 msgid "Failed to readlink %s"
 msgstr "無法讀取符號鏈接 %s"
 
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "無法讀取符號鏈接 %s"
 

-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269

 #, c-format
 msgid "Failed to unlink %s"
 msgstr "無法 unlink %s"
 
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "無法 unlink %s"
 

-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276

 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 無法將 %s 鏈接到 %s"
 
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 無法將 %s 鏈接到 %s"
 

-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 達到了 DeLink 的上限 %sB。\n"
 
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 達到了 DeLink 的上限 %sB。\n"
 

-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "無法取得 %s 的狀態"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390

 msgid "Archive had no package field"
 msgstr "檔案無套件字符"
 
 msgid "Archive had no package field"
 msgstr "檔案無套件字符"
 

-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613

 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 無 override 項目\n"
 
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 無 override 項目\n"
 

-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701

 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 套件維護者是 %s 非 %s\n"
 
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 套件維護者是 %s 非 %s\n"
 

+#: ftparchive/writer.cc:623
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 無原始碼 override 項目\n"
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 無二元碼 override 項目\n"
+

 #: ftparchive/contents.cc:317
 #, c-format
 msgid "Internal error, could not locate member %s"
 #: ftparchive/contents.cc:317
 #, c-format
 msgid "Internal error, could not locate member %s"


@@ -616,226 +638,224 @@ msgstr "在 unlink %s 時出錯"
 msgid "Failed to rename %s to %s"
 msgstr "無法將 %s 更名為 %s"
 
 msgid "Failed to rename %s to %s"
 msgstr "無法將 %s 更名為 %s"
 

-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120

 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示法出錯 - %s"
 
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示法出錯 - %s"
 

-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237

 msgid "The following packages have unmet dependencies:"
 msgstr "下列的套件有無法滿足的依存關係："
 
 msgid "The following packages have unmet dependencies:"
 msgstr "下列的套件有無法滿足的依存關係："
 

-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327

 #, c-format
 msgid "but %s is installed"
 msgstr "但是『%s』卻已經安裝好了。"
 
 #, c-format
 msgid "but %s is installed"
 msgstr "但是『%s』卻已經安裝好了。"
 

-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329

 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是『%s』卻將被安裝。"
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是『%s』卻將被安裝。"
 

-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336

 msgid "but it is not installable"
 msgstr "但是它卻無法安裝。"
 
 msgid "but it is not installable"
 msgstr "但是它卻無法安裝。"
 

-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338

 msgid "but it is a virtual package"
 msgstr "但是它只是虛擬的套件"
 
 msgid "but it is a virtual package"
 msgstr "但是它只是虛擬的套件"
 

-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341

 msgid "but it is not installed"
 msgid "but it is not installed"

-msgstr "但是『%s』卻還沒有安裝。"
+msgstr "但是『』卻還沒有安裝。"

 
 

-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341

 msgid "but it is not going to be installed"
 msgstr "但是它卻不會被安裝。"
 
 msgid "but it is not going to be installed"
 msgstr "但是它卻不會被安裝。"
 

-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346

 msgid " or"
 msgstr "或"
 
 msgid " or"
 msgstr "或"
 

-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375

 msgid "The following NEW packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 
 msgid "The following NEW packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 

-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401

 msgid "The following packages will be REMOVED:"
 msgstr "下列的套件都將被【刪除】："
 
 msgid "The following packages will be REMOVED:"
 msgstr "下列的套件都將被【刪除】："
 

-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423

 msgid "The following packages have been kept back:"
 msgstr "下列的套件都將維持舊版本:"
 
 msgid "The following packages have been kept back:"
 msgstr "下列的套件都將維持舊版本:"
 

-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444

 msgid "The following packages will be upgraded:"
 msgstr "下列的套件都將更新:"
 
 msgid "The following packages will be upgraded:"
 msgstr "下列的套件都將更新:"
 

-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465

 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列的套件都將被「降級」:"
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列的套件都將被「降級」:"
 

-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485

 msgid "The following held packages will be changed:"
 msgstr "下列押後的套件都將被更改："
 
 msgid "The following held packages will be changed:"
 msgstr "下列押後的套件都將被更改："
 

-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538

 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 

-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:546

 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""

-"警告：下列的重要套件都將被刪除\n"
+"警告：下列的基本套件都將被移除。\n"

 "除非您很清楚在做什麼，請勿輕易嘗試。"
 
 "除非您很清楚在做什麼，請勿輕易嘗試。"
 

-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "更新 %lu 個套件，新安裝 %lu 個套件，"
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "更新 %lu 個套件，新安裝 %lu 個套件，"
 

-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581

 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安裝 %lu 個套件，"
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安裝 %lu 個套件，"
 

-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583

 #, c-format
 msgid "%lu downgraded, "
 msgstr "降 %lu 個套件的版，"
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降 %lu 個套件的版，"
 

-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n"
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n"
 

-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n"
 
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n"
 

-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649

 msgid "Correcting dependencies..."
 msgstr "更正依存關係中..."
 
 msgid "Correcting dependencies..."
 msgstr "更正依存關係中..."
 

-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652

 msgid " failed."
 msgstr "失敗"
 
 msgid " failed."
 msgstr "失敗"
 

-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655

 msgid "Unable to correct dependencies"
 msgstr "無法更正依存關係。"
 
 msgid "Unable to correct dependencies"
 msgstr "無法更正依存關係。"
 

-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658

 msgid "Unable to minimize the upgrade set"
 msgstr "無法最小化升級的套件集合"
 
 msgid "Unable to minimize the upgrade set"
 msgstr "無法最小化升級的套件集合"
 

-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660

 msgid " Done"
 msgstr " 完成"
 
 msgid " Done"
 msgstr " 完成"
 

-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664

 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 

-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667

 msgid "Unmet dependencies. Try using -f."
 msgstr "無法滿足相依關係。試試看 -f 選項。"
 
 msgid "Unmet dependencies. Try using -f."
 msgstr "無法滿足相依關係。試試看 -f 選項。"
 

-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689

 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告：下列的套件驗證失敗！"
 
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告：下列的套件驗證失敗！"
 

-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693

 msgid "Authentication warning overridden.\n"
 msgid "Authentication warning overridden.\n"

-msgstr ""
+msgstr "忽略了認證警告。\n"

 
 

-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700

 msgid "Install these packages without verification [y/N]? "
 msgstr "不驗證這些套件就直接安裝？[y/N]"
 
 msgid "Install these packages without verification [y/N]? "
 msgstr "不驗證這些套件就直接安裝？[y/N]"
 

-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702

 msgid "Some packages could not be authenticated"
 msgstr "部份套件無法驗證"
 
 msgid "Some packages could not be authenticated"
 msgstr "部份套件無法驗證"
 

-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858

 msgid "There are problems and -y was used without --force-yes"
 msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
 
 msgid "There are problems and -y was used without --force-yes"
 msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
 

-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755

 msgid "Internal error, InstallPackages was called with broken packages!"
 msgid "Internal error, InstallPackages was called with broken packages!"

-msgstr ""
+msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！"

 
 

-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764

 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需要被移除,但移除動作被禁止。"
 
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需要被移除,但移除動作被禁止。"
 

-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:775

 msgid "Internal error, Ordering didn't finish"
 msgid "Internal error, Ordering didn't finish"

-msgstr "å\85§é\83¨é\8c¯èª¤ï¼\9aæ\96°å¢\9eè½\89移(diversion)失æ\95\97"
+msgstr "å\85§é\83¨é\8c¯èª¤ï¼\8cOrdering didn't finish"

 
 

-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851

 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載的目錄"
 
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載的目錄"
 

-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135

 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源單。"
 
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源單。"
 

-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816

 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"

-msgstr ""
+msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧"

 
 

-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821

 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n"
 

-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824

 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下載 %sB 的檔案。\n"
 
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下載 %sB 的檔案。\n"
 

-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829

 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "解壓縮後將消耗 %sB 的空間。\n"
 
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "解壓縮後將消耗 %sB 的空間。\n"
 

-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832

 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解壓縮後將空出 %sB 的空間。\n"
 
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解壓縮後將空出 %sB 的空間。\n"
 

-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
+#, c-format

 msgid "Couldn't determine free space in %s"
 msgid "Couldn't determine free space in %s"

-msgstr "『%s』內沒有足夠的空間。"
+msgstr "%s 無法足夠的空間。"

 
 

-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849

 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "『%s』內沒有足夠的空間。"
 
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "『%s』內沒有足夠的空間。"
 

-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884

 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。"
 
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。"
 

-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866

 msgid "Yes, do as I say!"
 msgstr "是的,請執行我所指定的"
 
 msgid "Yes, do as I say!"
 msgstr "是的,請執行我所指定的"
 

-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:868
+#, c-format

 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"


@@ -845,28 +865,28 @@ msgstr ""
 "若要繼續的話,就輸入下面的句子“%s”\n"
 " ?] "
 
 "若要繼續的話,就輸入下面的句子“%s”\n"
 " ?] "
 

-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893

 msgid "Abort."
 msgstr "放棄執行。"
 
 msgid "Abort."
 msgstr "放棄執行。"
 

-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889

 msgid "Do you want to continue [Y/n]? "
 msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
 

-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法下載『%s』檔案。%s\n"
 
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法下載『%s』檔案。%s\n"
 

-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979

 msgid "Some files failed to download"
 msgstr "部份檔案無法下載"
 
 msgid "Some files failed to download"
 msgstr "部份檔案無法下載"
 

-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041

 msgid "Download complete and in download only mode"
 msgstr "下載完畢,目前是“僅下載”模式"
 
 msgid "Download complete and in download only mode"
 msgstr "下載完畢,目前是“僅下載”模式"
 

-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986

 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"


@@ -874,47 +894,47 @@ msgstr ""
 "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n"
 "選項?"
 
 "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n"
 "選項?"
 

-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990

 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)"
 
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)"
 

-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995

 msgid "Unable to correct missing packages."
 msgstr "無法更正遺失的套件。"
 
 msgid "Unable to correct missing packages."
 msgstr "無法更正遺失的套件。"
 

-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996

 msgid "Aborting install."
 msgstr "放棄安裝。"
 
 msgid "Aborting install."
 msgstr "放棄安裝。"
 

-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030

 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意,選擇了 %s 而非 %s\n"
 
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意,選擇了 %s 而非 %s\n"
 

-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040

 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n"
 
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n"
 

-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058

 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "套件『%s』沒有安裝，所以無法刪除。\n"
 
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "套件『%s』沒有安裝，所以無法刪除。\n"
 

-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069

 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "虛擬套件『%s』的提供者是：\n"
 
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "虛擬套件『%s』的提供者是：\n"
 

-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081

 msgid " [Installed]"
 msgstr "【已安裝】"
 
 msgid " [Installed]"
 msgstr "【已安裝】"
 

-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086

 msgid "You should explicitly select one to install."
 msgstr "請您明確地選擇一個來進行安裝。"
 
 msgid "You should explicitly select one to install."
 msgstr "請您明確地選擇一個來進行安裝。"
 

-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091

 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"


@@ -925,73 +945,73 @@ msgstr ""
 "這可能意味著這個套件已經消失或捨棄,\n"
 "或者只能在其他原碼中找到\n"
 
 "這可能意味著這個套件已經消失或捨棄,\n"
 "或者只能在其他原碼中找到\n"
 

-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110

 msgid "However the following packages replace it:"
 msgstr "但是下列的套件將取代它："
 
 msgid "However the following packages replace it:"
 msgstr "但是下列的套件將取代它："
 

-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113

 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "套件 %s 還沒有可供安裝的候選版本"
 
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "套件 %s 還沒有可供安裝的候選版本"
 

-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133

 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安裝 %s,因為無法下載它。\n"
 
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安裝 %s,因為無法下載它。\n"
 

-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141

 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "『%s』已經是最新版本了。\n"
 
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "『%s』已經是最新版本了。\n"
 

-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”發布版本"
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”發布版本"
 

-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 

-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176

 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "選定的版本為 %s (%s) 的 %s\n"
 
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "選定的版本為 %s (%s) 的 %s\n"
 

-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313

 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 

-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326

 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 
 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 

-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384

 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
 
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
 

-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 

-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到 %s 套件。"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到 %s 套件。"
 

-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1516

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
 

-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1546

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 

-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1549

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -999,7 +1019,7 @@ msgstr ""
 "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
 "定一個解決辦法)。"
 
 "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
 "定一個解決辦法)。"
 

-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1561

 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"


@@ -1010,7 +1030,7 @@ msgstr ""
 "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
 "或從 Incoming 目錄移除。"
 
 "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
 "或從 Incoming 目錄移除。"
 

-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1569

 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"


@@ -1020,122 +1040,126 @@ msgstr ""
 "該套件無法安裝,您最好提交一個針對這個套件\n"
 "的臭蟲報告。"
 
 "該套件無法安裝,您最好提交一個針對這個套件\n"
 "的臭蟲報告。"
 

-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1574

 msgid "The following information may help to resolve the situation:"
 msgstr "底下的資訊有助於解決現在的情況:"
 
 msgid "The following information may help to resolve the situation:"
 msgstr "底下的資訊有助於解決現在的情況:"
 

-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1577

 msgid "Broken packages"
 msgstr "損毀的套件"
 
 msgid "Broken packages"
 msgstr "損毀的套件"
 

-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1603

 msgid "The following extra packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 
 msgid "The following extra packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 

-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1692

 msgid "Suggested packages:"
 msgstr "建議(Suggested)的套件:"
 
 msgid "Suggested packages:"
 msgstr "建議(Suggested)的套件:"
 

-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1693

 msgid "Recommended packages:"
 msgstr "推薦(Recommended)的套件:"
 
 msgid "Recommended packages:"
 msgstr "推薦(Recommended)的套件:"
 

-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1713

 msgid "Calculating upgrade... "
 msgstr "籌畫升級套件中..."
 
 msgid "Calculating upgrade... "
 msgstr "籌畫升級套件中..."
 

-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101

 msgid "Failed"
 msgstr "失敗"
 
 msgid "Failed"
 msgstr "失敗"
 

-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1721

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 

-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794

 msgid "Internal error, problem resolver broke stuff"
 msgid "Internal error, problem resolver broke stuff"

-msgstr "內部錯誤,AllUpgrade 造成錯誤"
+msgstr "內部錯誤，problem resolver 處理失敗"

 
 

-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1894

 msgid "Must specify at least one package to fetch source for"
 msgstr "必須指定至少一個對應的套件才能下載源碼"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "必須指定至少一個對應的套件才能下載源碼"
 

-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 套件的源碼"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 套件的源碼"
 

-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1968
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "略過已被下載的檔案“%s”\n"
+
+#: cmdline/apt-get.cc:1992

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "『%s』內沒有足夠的空間。"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "『%s』內沒有足夠的空間。"
 

-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1997

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
 

-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2000

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始檔案。\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始檔案。\n"
 

-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2006

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下載源碼 %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下載源碼 %s\n"
 

-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2037

 msgid "Failed to fetch some archives."
 msgstr "無法下載某些檔案。"
 
 msgid "Failed to fetch some archives."
 msgstr "無法下載某些檔案。"
 

-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2065

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
 

-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2077

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "執行解開套件指令 '%s' 時失敗。\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "執行解開套件指令 '%s' 時失敗。\n"
 

-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2078

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"

-msgstr ""
+msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"

 
 

-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2095

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "執行建立套件指令 '%s' 時失敗。\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "執行建立套件指令 '%s' 時失敗。\n"
 

-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2114

 msgid "Child process failed"
 msgstr "子程序失敗"
 
 msgid "Child process failed"
 msgstr "子程序失敗"
 

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2130

 msgid "Must specify at least one package to check builddeps for"
 msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
 

-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2158

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的建構相依關係。"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的建構相依關係。"
 

-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2178

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 無建立相依關係訊息。\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 無建立相依關係訊息。\n"
 

-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2230

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
 

-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2282

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1144,30 +1168,30 @@ msgstr ""
 "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
 "相依關係"
 
 "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
 "相依關係"
 

-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2317

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
 

-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2342

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
 

-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2356

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 所要求的建構相依關係。"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 所要求的建構相依關係。"
 

-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2360

 msgid "Failed to process build dependencies"
 msgstr "無法處理建構相依關係"
 
 msgid "Failed to process build dependencies"
 msgstr "無法處理建構相依關係"
 

-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2392

 msgid "Supported modules:"
 msgstr "支援模組:"
 
 msgid "Supported modules:"
 msgstr "支援模組:"
 

-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2433

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1346,19 +1370,19 @@ msgstr "結合現有資料中"
 msgid "Failed to create pipes"
 msgstr "無法建立管線"
 
 msgid "Failed to create pipes"
 msgstr "無法建立管線"
 

-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144

 msgid "Failed to exec gzip "
 msgstr "無法執行 gzip"
 
 msgid "Failed to exec gzip "
 msgstr "無法執行 gzip"
 

-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207

 msgid "Corrupted archive"
 msgstr "損毀的檔案"
 
 msgid "Corrupted archive"
 msgstr "損毀的檔案"
 

-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196

 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar checksum 失敗,檔案已損毀"
 
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar checksum 失敗,檔案已損毀"
 

-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299

 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s"
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s"


@@ -1415,11 +1439,11 @@ msgid "Duplicate conf file %s/%s"
 msgstr "重複的設定檔 %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 msgstr "重複的設定檔 %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to write file %s"
 msgstr "寫入檔案 %s 失敗"
 
 msgid "Failed to write file %s"
 msgstr "寫入檔案 %s 失敗"
 

-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104

 #, c-format
 msgid "Failed to close file %s"
 msgstr "關閉檔案 %s 失敗"
 #, c-format
 msgid "Failed to close file %s"
 msgstr "關閉檔案 %s 失敗"


@@ -1472,7 +1496,8 @@ msgid "File %s/%s overwrites the one in the package %s"
 msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案"
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
 msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案"
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750

-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38

 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀取『%s』。"
 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀取『%s』。"


@@ -1518,7 +1543,7 @@ msgstr "無法變換 admin 目錄至 %sinfo"
 msgid "Internal error getting a package name"
 msgstr "內部錯誤，無法取得套件名稱"
 
 msgid "Internal error getting a package name"
 msgstr "內部錯誤，無法取得套件名稱"
 

-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386

 msgid "Reading file listing"
 msgstr "讀取軟件表中"
 
 msgid "Reading file listing"
 msgstr "讀取軟件表中"
 


@@ -1564,10 +1589,6 @@ msgstr "內部錯誤：新增轉移(diversion)失敗"
 msgid "The pkg cache must be initialized first"
 msgstr "套件快取必須先初始化"
 
 msgid "The pkg cache must be initialized first"
 msgstr "套件快取必須先初始化"
 

-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "讀取軟件表中"
-

 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"


@@ -1627,26 +1648,25 @@ msgstr ""
 msgid "Wrong CD-ROM"
 msgstr "碟片不正確。"
 
 msgid "Wrong CD-ROM"
 msgstr "碟片不正確。"
 

-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166

 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
 
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
 

-#: methods/cdrom.cc:169
-#, fuzzy
+#: methods/cdrom.cc:171

 msgid "Disk not found."
 msgid "Disk not found."

-msgstr "找不到檔案"
+msgstr "找不到磁碟"

 
 

-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264

 msgid "File not found"
 msgstr "找不到檔案"
 
 msgid "File not found"
 msgstr "找不到檔案"
 

-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150

 msgid "Failed to stat"
 msgstr "無法讀取資料"
 
 msgid "Failed to stat"
 msgstr "無法讀取資料"
 

-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147

 msgid "Failed to set modification time"
 msgstr "日期更新失敗"
 
 msgid "Failed to set modification time"
 msgstr "日期更新失敗"
 


@@ -1772,7 +1792,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法允許連線"
 
 msgid "Unable to accept connection"
 msgstr "無法允許連線"
 

-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "問題雜湊表"
 
 msgid "Problem hashing file"
 msgstr "問題雜湊表"
 


@@ -1795,7 +1815,7 @@ msgstr "資料傳輸失敗，伺服器回應 %s"
 msgid "Query"
 msgstr "查詢"
 
 msgid "Query"
 msgstr "查詢"
 

-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109

 msgid "Unable to invoke "
 msgstr "無法讀取 "
 
 msgid "Unable to invoke "
 msgstr "無法讀取 "
 


@@ -1824,156 +1844,155 @@ msgstr "無法聯絡到主機『%s:%s (%s)』。"
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 

-#: methods/connect.cc:106
+#: methods/connect.cc:108

 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425

 #, c-format
 msgid "Connecting to %s"
 msgstr "聯絡主機『%s』中"
 
 #, c-format
 msgid "Connecting to %s"
 msgstr "聯絡主機『%s』中"
 

-#: methods/connect.cc:165
+#: methods/connect.cc:167

 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "無法解析位置 %s"
 
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "無法解析位置 %s"
 

-#: methods/connect.cc:171
+#: methods/connect.cc:173

 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "解析『%s』暫時失敗"
 
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "解析『%s』暫時失敗"
 

-#: methods/connect.cc:174
+#: methods/connect.cc:176

 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "無法解析『%s:%s (%i)』。"
 
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "無法解析『%s:%s (%i)』。"
 

-#: methods/connect.cc:221
+#: methods/connect.cc:223

 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "無法聯絡到主機『%s %s』："
 
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "無法聯絡到主機『%s %s』："
 

-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "無法存取keyring：%s"
+
+#: methods/gpgv.cc:100

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."

-msgstr ""
+msgstr "錯誤：Acquire::gpgv::Options 的參數列表超長。結束執行。"

 
 

-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"

-msgstr ""
+msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！"

 
 

-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209

 msgid "At least one invalid signature was encountered."
 msgid "At least one invalid signature was encountered."

-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "無法取得『%s』鎖。"
+msgstr "至少發現一個無效的簽名。"

 
 

-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "無法執行“%s”來驗證簽名(您安裝了 gnupg 嗎？)"

 
 

-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218

 msgid "Unknown error executing gpgv"
 msgid "Unknown error executing gpgv"

-msgstr ""
+msgstr "執行 gpgv 時發生未知錯誤"

 
 

-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249

 msgid "The following signatures were invalid:\n"
 msgid "The following signatures were invalid:\n"

-msgstr "下列的【新】套件都將被安裝："
+msgstr "下列的簽名皆不合法：\n"

 
 

-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"

-msgstr ""
+msgstr "由於沒有公鑰，下列簽名無法進行驗證：\n"

 
 

-#: methods/gzip.cc:57
+#: methods/gzip.cc:64

 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "無法開啟管線給 %s 使用"
 
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "無法開啟管線給 %s 使用"
 

-#: methods/gzip.cc:102
+#: methods/gzip.cc:109

 #, c-format
 msgid "Read error from %s process"
 msgstr "從 %s 進程讀取錯誤"
 
 #, c-format
 msgid "Read error from %s process"
 msgstr "從 %s 進程讀取錯誤"
 

-#: methods/http.cc:344
+#: methods/http.cc:377

 msgid "Waiting for headers"
 msgstr "等待標頭"
 
 msgid "Waiting for headers"
 msgstr "等待標頭"
 

-#: methods/http.cc:490
+#: methods/http.cc:523

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 

-#: methods/http.cc:498
+#: methods/http.cc:531

 msgid "Bad header line"
 msgstr "壞的標頭"
 
 msgid "Bad header line"
 msgstr "壞的標頭"
 

-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:550 methods/http.cc:557

 msgid "The HTTP server sent an invalid reply header"
 msgstr "http 伺服器傳送一個無效的回覆標頭"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http 伺服器傳送一個無效的回覆標頭"
 

-#: methods/http.cc:553
+#: methods/http.cc:586

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
 

-#: methods/http.cc:568
+#: methods/http.cc:601

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
 

-#: methods/http.cc:570
+#: methods/http.cc:603

 msgid "This HTTP server has broken range support"
 msgstr "http 伺服器有損毀的範圍支援"
 
 msgid "This HTTP server has broken range support"
 msgstr "http 伺服器有損毀的範圍支援"
 

-#: methods/http.cc:594
+#: methods/http.cc:627

 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 

-#: methods/http.cc:741
+#: methods/http.cc:774

 msgid "Select failed"
 msgstr "Select 失敗"
 
 msgid "Select failed"
 msgstr "Select 失敗"
 

-#: methods/http.cc:746
+#: methods/http.cc:779

 msgid "Connection timed out"
 msgstr "連線逾時"
 
 msgid "Connection timed out"
 msgstr "連線逾時"
 

-#: methods/http.cc:769
+#: methods/http.cc:802

 msgid "Error writing to output file"
 msgstr "寫入輸出檔時發生錯誤"
 
 msgid "Error writing to output file"
 msgstr "寫入輸出檔時發生錯誤"
 

-#: methods/http.cc:797
+#: methods/http.cc:833

 msgid "Error writing to file"
 msgstr "寫入檔案時發生錯誤"
 
 msgid "Error writing to file"
 msgstr "寫入檔案時發生錯誤"
 

-#: methods/http.cc:822
+#: methods/http.cc:861

 msgid "Error writing to the file"
 msgstr "寫入檔案時發生錯誤"
 
 msgid "Error writing to the file"
 msgstr "寫入檔案時發生錯誤"
 

-#: methods/http.cc:836
+#: methods/http.cc:875

 msgid "Error reading from server. Remote end closed connection"
 msgstr "從遠端主機讀取錯誤，關閉連線"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "從遠端主機讀取錯誤，關閉連線"
 

-#: methods/http.cc:838
+#: methods/http.cc:877

 msgid "Error reading from server"
 msgstr "從伺服器讀取發生錯誤"
 
 msgid "Error reading from server"
 msgstr "從伺服器讀取發生錯誤"
 

-#: methods/http.cc:1069
+#: methods/http.cc:1108

 msgid "Bad header data"
 msgstr "壞的標頭資料"
 
 msgid "Bad header data"
 msgstr "壞的標頭資料"
 

-#: methods/http.cc:1086
+#: methods/http.cc:1125

 msgid "Connection failed"
 msgstr "連線失敗"
 
 msgid "Connection failed"
 msgstr "連線失敗"
 

-#: methods/http.cc:1177
+#: methods/http.cc:1216

 msgid "Internal error"
 msgstr "內部錯誤"
 
 msgid "Internal error"
 msgstr "內部錯誤"
 


@@ -1986,7 +2005,7 @@ msgstr "不能將空白檔案讀入記憶體"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "無法讀入檔案 %lu 位元組至記憶體"
 
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "無法讀入檔案 %lu 位元組至記憶體"
 

-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938

 #, c-format
 msgid "Selection %s not found"
 msgstr "選項『%s』找不到。"
 #, c-format
 msgid "Selection %s not found"
 msgstr "選項『%s』找不到。"


@@ -2046,12 +2065,12 @@ msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'"
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
 
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
 

-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155

 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 錯誤！"
 
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 錯誤！"
 

-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157

 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"


@@ -2107,7 +2126,7 @@ msgstr "無效的操作：%s"
 msgid "Unable to stat the mount point %s"
 msgstr "無法讀取掛載點 %s"
 
 msgid "Unable to stat the mount point %s"
 msgstr "無法讀取掛載點 %s"
 

-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44

 #, c-format
 msgid "Unable to change to %s"
 msgstr "無法進入『%s』目錄。"
 #, c-format
 msgid "Unable to change to %s"
 msgstr "無法進入『%s』目錄。"


@@ -2252,74 +2271,74 @@ msgstr "次要"
 msgid "extra"
 msgstr "添加"
 
 msgid "extra"
 msgstr "添加"
 

-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90

 msgid "Building dependency tree"
 msgstr "了解套件依存關係中"
 
 msgid "Building dependency tree"
 msgstr "了解套件依存關係中"
 

-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62

 msgid "Candidate versions"
 msgstr "候選版本"
 
 msgid "Candidate versions"
 msgstr "候選版本"
 

-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91

 msgid "Dependency generation"
 msgstr "產生套件依存關係"
 
 msgid "Dependency generation"
 msgstr "產生套件依存關係"
 

-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:106

 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "無法辨識套件『%s』(1)。"
 
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "無法辨識套件『%s』(1)。"
 

-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:193

 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件『%s』(1)。"
 
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件『%s』(1)。"
 

-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。"
 

-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。"
 

-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。"
 

-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。"
 

-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。"
 

-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203

 #, c-format
 msgid "Opening %s"
 msgstr "開啟『%s』中"
 
 #, c-format
 msgid "Opening %s"
 msgstr "開啟『%s』中"
 

-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "來源檔『%2$s』第 %1$u 行太長。"
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "來源檔『%2$s』第 %1$u 行太長。"
 

-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。"
 

-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
 
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
 

-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255

 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。"
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。"


@@ -2345,13 +2364,13 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
 
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
 

-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr "無法解決依存關係。可能原因是某些套件被押後。"
 
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr "無法解決依存關係。可能原因是某些套件被押後。"
 

-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068

 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法解決問題，因為某些損毀的套件被押後。"
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法解決問題，因為某些損毀的套件被押後。"
 


@@ -2365,10 +2384,17 @@ msgstr "找不到『%spartial』清單目錄。"
 msgid "Archive directory %spartial is missing."
 msgstr "找不到『%spartial』檔案目錄。"
 
 msgid "Archive directory %spartial is missing."
 msgstr "找不到『%spartial』檔案目錄。"
 

-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:830

 #, c-format
 #, c-format

-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)"
+
+#: apt-pkg/acquire.cc:832
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在下載第%li個檔案(共有%li)"

 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format


@@ -2381,19 +2407,16 @@ msgid "Method %s did not start correctly"
 msgstr "安裝方式『%s』沒有正確啟動。"
 
 #: apt-pkg/acquire-worker.cc:377
 msgstr "安裝方式『%s』沒有正確啟動。"
 
 #: apt-pkg/acquire-worker.cc:377

-#, fuzzy, c-format
+#, c-format

 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."

-msgstr ""
-"更換媒體:請把名為\n"
-" '%s' 的光碟\n"
-"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
+msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。"

 
 

-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120

 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "本軟體不支持『%s』包裝法。"
 
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "本軟體不支持『%s』包裝法。"
 

-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136

 msgid "Unable to determine a suitable packaging system type"
 msgstr "無法明白系統類別。"
 
 msgid "Unable to determine a suitable packaging system type"
 msgstr "無法明白系統類別。"
 


@@ -2414,16 +2437,16 @@ msgstr "無法讀取套件清單或狀況檔。"
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 

-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270

 msgid "Invalid record in the preferences file, no Package header"
 msgstr "喜好檔有錯誤—缺少套件前置檔。"
 
 msgid "Invalid record in the preferences file, no Package header"
 msgstr "喜好檔有錯誤—缺少套件前置檔。"
 

-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "本軟體不支持『%s』型的版本釘子。"
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "本軟體不支持『%s』型的版本釘子。"
 

-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300

 msgid "No priority (or zero) specified for pin"
 msgstr "對於釘住的檔案無優先順序"
 
 msgid "No priority (or zero) specified for pin"
 msgstr "對於釘住的檔案無優先順序"
 


@@ -2511,31 +2534,35 @@ msgstr "無法寫入來源暫存檔。"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 

-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952

 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 
 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 

-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:647
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "以下 key ID 沒有可用的公鑰：\n"
+
+#: apt-pkg/acquire-item.cc:760

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 

-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:819

 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 

-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:855

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 

-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:942

 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 
 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 


@@ -2589,11 +2616,16 @@ msgstr "掃描碟片中的索引檔案..\n"
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
 
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
 

-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "保存標誌：%s \n"
+
+#: apt-pkg/cdrom.cc:712

 msgid "That is not a valid name, try again.\n"
 msgstr "這不是合法名稱，重試一下。\n"
 
 msgid "That is not a valid name, try again.\n"
 msgstr "這不是合法名稱，重試一下。\n"
 

-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728

 #, c-format
 msgid ""
 "This disc is called: \n"
 #, c-format
 msgid ""
 "This disc is called: \n"


@@ -2602,20 +2634,21 @@ msgstr ""
 "這個碟片名為：\n"
 "'%s'\n"
 
 "這個碟片名為：\n"
 "'%s'\n"
 

-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732

 msgid "Copying package lists..."
 msgstr "複製套件清單中"
 
 msgid "Copying package lists..."
 msgstr "複製套件清單中"
 

-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756

 msgid "Writing new source list\n"
 msgstr "寫入新的來源列表中\n"
 
 msgid "Writing new source list\n"
 msgstr "寫入新的來源列表中\n"
 

-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765

 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 

-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"

 msgstr "卸載光碟機中..."
 
 #: apt-pkg/indexcopy.cc:261
 msgstr "卸載光碟機中..."
 
 #: apt-pkg/indexcopy.cc:261


@@ -2639,55 +2672,67 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
 msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358

-#, fuzzy, c-format
+#, c-format

 msgid "Preparing %s"
 msgid "Preparing %s"

-msgstr "開啟『%s』中"
+msgstr "準備配置%s中"

 
 #: apt-pkg/deb/dpkgpm.cc:359
 
 #: apt-pkg/deb/dpkgpm.cc:359

-#, fuzzy, c-format
+#, c-format

 msgid "Unpacking %s"
 msgid "Unpacking %s"

-msgstr "開啟『%s』中"
+msgstr "解開%s中"

 
 #: apt-pkg/deb/dpkgpm.cc:364
 
 #: apt-pkg/deb/dpkgpm.cc:364

-#, fuzzy, c-format
+#, c-format

 msgid "Preparing to configure %s"
 msgid "Preparing to configure %s"

-msgstr "開啟組態檔 %s"
+msgstr "準備設定%s檔"

 
 #: apt-pkg/deb/dpkgpm.cc:365
 
 #: apt-pkg/deb/dpkgpm.cc:365

-#, fuzzy, c-format
+#, c-format

 msgid "Configuring %s"
 msgid "Configuring %s"

-msgstr "è\81¯çµ¡ä¸»æ©\9fã\80\8e%sã\80\8f中"
+msgstr "設å®\9a%s中"

 
 #: apt-pkg/deb/dpkgpm.cc:366
 
 #: apt-pkg/deb/dpkgpm.cc:366

-#, fuzzy, c-format
+#, c-format

 msgid "Installed %s"
 msgid "Installed %s"

-msgstr "已安裝:"
+msgstr "已安裝%s"

 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"

-msgstr ""
+msgstr "正在準備 %s 的刪除操作"

 
 #: apt-pkg/deb/dpkgpm.cc:372
 
 #: apt-pkg/deb/dpkgpm.cc:372

-#, fuzzy, c-format
+#, c-format

 msgid "Removing %s"
 msgid "Removing %s"

-msgstr "開啟『%s』中"
+msgstr "移除%s中"

 
 #: apt-pkg/deb/dpkgpm.cc:373
 
 #: apt-pkg/deb/dpkgpm.cc:373

-#, fuzzy, c-format
+#, c-format

 msgid "Removed %s"
 msgid "Removed %s"

-msgstr "推薦"
+msgstr "已移除%s"

 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format

-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "準備完整移除 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format

-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "已完整移除%s"

 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"

+
+#~ msgid "File date has changed %s"
+#~ msgstr "檔案資料已更改 %s"
+
+#~ msgid "Could not patch file"
+#~ msgstr "無法開啟『%s』檔案。"
+
+#~ msgid "Reading file list"
+#~ msgstr "讀取軟件表中"
+
+#~ msgid "Could not execute "
+#~ msgstr "無法取得『%s』鎖。"