X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/d04e44ac8177fc5b70ae0189bb5e437c2502f910..3465138575e1fd0d5892d9b6be1ae232eb873460:/po/zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7b23c6ad8..c3ed7eae7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,13 +2,15 @@
 # Translators: 黃思文 <steven.huang@upcursor.org>
 #              Asho Yeh <asho@debian.org.tw>
 #              Kanru Chen <kanru.96@stu.csie.ncnu.edu.tw>
+#              Tetralet <tetralet@gmail.com>
+#              Zhou Mo <cdluminate@gmail.com> 2016 # Simplified Chinese Translator, only make trivial fixes.
 #
 # $Id: zh_TW.po,v 1.11 2004/04/30 04:50:38 mdz Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.5.4\n"
+"Project-Id-Version: apt 1.2.X\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-27 10:30+0100\n"
+"POT-Creation-Date: 2016-06-23 09:02+0200\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."
@@ -55,7 +57,7 @@ msgid " [Working]"
 msgstr " [工作中]"
 
 #: apt-private/acqprogress.cc
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
@@ -118,14 +120,12 @@ msgid "Package %s is a virtual package provided by:\n"
 msgstr "套件 %s 是虛擬套件，提供者為：\n"
 
 #: apt-private/private-cacheset.cc
-#, fuzzy
 msgid " [Installed]"
 msgstr "【已安裝】"
 
 #: apt-private/private-cacheset.cc
-#, fuzzy
 msgid " [Not candidate version]"
-msgstr "候選版本"
+msgstr "【非候選版本】"
 
 #: apt-private/private-cacheset.cc
 msgid "You should explicitly select one to install."
@@ -146,7 +146,7 @@ msgid "However the following packages replace it:"
 msgstr "然而，下列的套件取代了它："
 
 #: apt-private/private-cacheset.cc
-#, fuzzy, c-format
+#, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "套件 %s 沒有可安裝的候選版本"
 
@@ -182,7 +182,7 @@ msgstr ""
 
 #: apt-private/private-cmndline.cc
 msgid ""
-"Configuration options and syntax are detailed in apt.conf(5).\n"
+"Configuration options and syntax is detailed in apt.conf(5).\n"
 "Information about how to configure sources can be found in sources.list(5).\n"
 "Package and version choices can be expressed via apt_preferences(5).\n"
 "Security details are available in apt-secure(8).\n"
@@ -219,7 +219,7 @@ msgstr "是否不經驗證就安裝這些套件？"
 
 #: apt-private/private-download.cc apt-private/private-install.cc
 msgid ""
-"--force-yes is deprecated; use one of the options starting with --allow "
+"--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
 msgstr ""
 
@@ -230,10 +230,10 @@ msgid ""
 "unauthenticated"
 msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "無法取得 %s，%s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "無法取得 %s，%s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -249,6 +249,34 @@ msgstr "在 %s 裡沒有足夠的的未使用空間。"
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載目錄"
 
+#: apt-private/private-install.cc
+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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
+"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("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"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "以下的資訊或許有助於解決當前的情況："
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "損毀的套件"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
@@ -337,7 +365,6 @@ msgid "Abort."
 msgstr "放棄執行。"
 
 #: apt-private/private-install.cc
-#, fuzzy
 msgid "Do you want to continue?"
 msgstr "是否繼續進行 [Y/n]？"
 
@@ -395,20 +422,6 @@ msgstr ""
 "嗯，看起來 AutoRemover 弄壞了什麼東西，而這是不該發生的。\n"
 "請針對 apt 發佈錯誤回報。"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("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"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr "以下的資訊或許有助於解決當前的情況："
-
 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處理失敗"
@@ -451,21 +464,6 @@ msgstr ""
 "決方案）。"
 
 #: apt-private/private-install.cc
-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"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
-"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "損毀的套件"
-
-#: apt-private/private-install.cc
-#, fuzzy
 msgid "The following additional packages will be installed:"
 msgstr "下列的額外套件將被安裝："
 
@@ -525,12 +523,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANSLATORS: placeholder is a binary name like apt or apt-get
 #: apt-private/private-main.cc
+#, c-format
 msgid ""
 "NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
+"      %s needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+"      so don't depend on the relevance to the real current situation!\n"
 msgstr ""
 
 #: apt-private/private-output.cc apt-private/private-show.cc
@@ -741,10 +741,6 @@ msgstr "快取資料未同步，無法 x-ref 套件檔"
 msgid "Pinned packages:"
 msgstr "鎖定的套件："
 
-#: apt-private/private-show.cc
-msgid "(not found)"
-msgstr "(未找到)"
-
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
@@ -763,10 +759,6 @@ msgstr "  候選："
 msgid "(none)"
 msgstr "(無)"
 
-#: apt-private/private-show.cc
-msgid "  Package pin: "
-msgstr "  套件鎖定："
-
 #. Show the priority tables
 #: apt-private/private-show.cc
 msgid "  Version table:"
@@ -869,27 +861,6 @@ msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 
-#: apt-private/private-source.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "無法處理編譯相依關係"
-
 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
@@ -901,48 +872,25 @@ msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 
 #: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
+msgid "Must specify at least one package to check builddeps for"
+msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 
 #: apt-private/private-source.cc
 #, c-format
 msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
 
 #: apt-private/private-source.cc
 #, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr ""
-"無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
 #: apt-private/private-source.cc
 #, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "無法滿足套件 %s 的編譯相依關係。"
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "無法處理編譯相依關係"
 
 #: apt-private/private-source.cc
 msgid "Failed to process build dependencies"
@@ -958,6 +906,11 @@ msgstr "無法將 %s 更名為 %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
+#: apt-private/private-unmet.cc
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
+
 #: apt-private/private-update.cc
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
@@ -974,11 +927,6 @@ msgstr[1] ""
 msgid "All packages are up to date."
 msgstr ""
 
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
-
 #: cmdline/apt-cache.cc
 #, fuzzy
 msgid "apt-cache stats does not take any arguments"
@@ -1059,10 +1007,10 @@ msgid ""
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
 "apt-cache queries and displays available information about installed\n"
-"as well as installable packages. It works exclusively on the data\n"
-"acquired via the 'update' command of e.g. apt-get to the local cache.\n"
-"The displayed information can therefore be outdated if the last update\n"
-"is too long ago, but in exchange apt-cache works independently of the\n"
+"and installable packages. It works exclusively on the data acquired\n"
+"into the local cache via the 'update' command of e.g. apt-get. The\n"
+"displayed information may therefore be outdated if the last update was\n"
+"too long ago, but in exchange apt-cache works independently of the\n"
 "availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
@@ -1094,66 +1042,6 @@ msgstr "列出系統中所有套件"
 msgid "Show policy settings"
 msgstr "顯示套件的可安裝版本資訊"
 
-#: cmdline/apt.cc
-msgid ""
-"Usage: apt [options] command\n"
-"\n"
-"apt is a commandline package manager and provides commands for\n"
-"searching and managing as well as querying information about packages.\n"
-"It provides the same functionality as the specialized APT tools,\n"
-"like apt-get and apt-cache, but enables options more suitable for\n"
-"interactive use by default.\n"
-msgstr ""
-
-#. query
-#: cmdline/apt.cc
-msgid "list packages based on package names"
-msgstr ""
-
-#: cmdline/apt.cc
-#, fuzzy
-msgid "search in package descriptions"
-msgstr "正在讀取套件清單"
-
-#: cmdline/apt.cc
-msgid "show package details"
-msgstr ""
-
-#. package stuff
-#: cmdline/apt.cc
-#, fuzzy
-msgid "install packages"
-msgstr "鎖定的套件："
-
-#: cmdline/apt.cc
-#, fuzzy
-msgid "remove packages"
-msgstr "損毀的套件"
-
-#: cmdline/apt.cc cmdline/apt-get.cc
-msgid "Remove automatically all unused packages"
-msgstr "自動移除所有不再使用的套件"
-
-#. system wide stuff
-#: cmdline/apt.cc
-#, fuzzy
-msgid "update list of available packages"
-msgstr "%s 被設定為手動安裝。\n"
-
-#: cmdline/apt.cc
-msgid "upgrade the system by installing/upgrading packages"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid "upgrade the system by removing/installing/upgrading packages"
-msgstr ""
-
-#. misc
-#: cmdline/apt.cc
-#, fuzzy
-msgid "edit the source information file"
-msgstr "正在讀取狀態資料"
-
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1185,7 +1073,7 @@ msgstr "請對您的光碟組中的其它光碟重複相同的操作。"
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is used to add CD-ROMs, USB flashdrives and other removable\n"
+"apt-cdrom is used to add CDROM's, USB flashdrives and other removable\n"
 "media types as package sources to APT. The mount point and device\n"
 "information is taken from apt.conf(5), udev(7) and fstab(5).\n"
 msgstr ""
@@ -1195,12 +1083,16 @@ msgid "Arguments not in pairs"
 msgstr "參數並未成對"
 
 #: cmdline/apt-config.cc
+#, fuzzy
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 "apt-config is an interface to the configuration settings used by\n"
-"all APT tools to be used mainly in debugging and shell scripting.\n"
+"all APT tools, mainly intended for debugging and shell scripting.\n"
 msgstr ""
+"用法：apt-config [選項] 指令\n"
+"\n"
+"apt-config 是一個用於讀取 APT 設定檔的簡單工具\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1273,6 +1165,10 @@ msgstr "移除套件"
 msgid "Remove packages and config files"
 msgstr "移除並清除套件"
 
+#: cmdline/apt-get.cc cmdline/apt.cc
+msgid "Remove automatically all unused packages"
+msgstr "自動移除所有不再使用的套件"
+
 #: cmdline/apt-get.cc
 msgid "Distribution upgrade, see apt-get(8)"
 msgstr "發行版本升級，請參閱 apt-get(8)"
@@ -1330,6 +1226,7 @@ msgstr ""
 #: cmdline/apt-helper.cc
 msgid ""
 "Usage: apt-helper [options] command\n"
+"       apt-helper [options] cat-file file ...\n"
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper bundles a variety of commands for shell scripts to use\n"
@@ -1344,6 +1241,10 @@ msgstr ""
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "detect proxy using apt.conf"
 msgstr ""
@@ -1407,9 +1308,9 @@ msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It is also possible to\n"
-"manipulate the dpkg(1) selection states of packages with it.\n"
-"It can also list all packages with or without a certain marking.\n"
+"as manually or automatically installed. It can also be used to\n"
+"manipulate the dpkg(1) selection states of packages, and to list\n"
+"all packages with or without a certain marking.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1444,6 +1345,62 @@ msgstr "%s 被設定為手動安裝。\n"
 msgid "Print the list of package on hold"
 msgstr ""
 
+#: cmdline/apt.cc
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"apt is a commandline package manager and provides commands for\n"
+"searching and managing as well as querying information about packages.\n"
+"It provides the same functionality as the specialized APT tools,\n"
+"like apt-get and apt-cache, but enables options more suitable for\n"
+"interactive use by default.\n"
+msgstr ""
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "正在讀取套件清單"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "鎖定的套件："
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "損毀的套件"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s 被設定為手動安裝。\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "正在讀取狀態資料"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -1539,11 +1496,11 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 msgid "Unable to connect to %s:%s:"
 msgstr "無法連線至 %s %s："
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/store.cc
 msgid "Failed to stat"
 msgstr "無法取得狀態"
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/rred.cc methods/store.cc
 msgid "Failed to set modification time"
 msgstr "無法設定修改時間"
 
@@ -1697,6 +1654,21 @@ msgstr "查詢"
 msgid "Unable to invoke "
 msgstr "無法 invoke "
 
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr ""
+
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
@@ -1711,18 +1683,16 @@ msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "無法執行 '%s' 來驗證簽章（gnupg 是否安裝了？）"
 
-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
-msgstr ""
-
 #: methods/gpgv.cc
 msgid "Unknown error executing apt-key"
 msgstr "在執行 apt-key 時發生未知的錯誤"
 
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr ""
+
 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
 msgstr "以下簽名無效：\n"
@@ -1733,10 +1703,6 @@ msgid ""
 "available:\n"
 msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 
-#: methods/gzip.cc
-msgid "Empty files can't be valid archives"
-msgstr ""
-
 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
@@ -1804,6 +1770,12 @@ msgstr "無法開啟檔案 %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "無法取得 %s 的狀態"
+
 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "無法和子程序建立 IPC 管線"
@@ -1859,6 +1831,10 @@ msgstr ""
 msgid "Internal error"
 msgstr "內部錯誤"
 
+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr ""
+
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "錯誤的預設設定！"
@@ -1896,6 +1872,20 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 msgid "Merging available information"
 msgstr "整合現有的資料"
 
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待 %s 但是它並不存在"
+
 #: cmdline/apt-extracttemplates.cc
 #, fuzzy
 msgid ""
@@ -1936,7 +1926,8 @@ msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
 "apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike.\n"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\n"
 msgstr ""
 "用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
 "\n"
@@ -1958,7 +1949,7 @@ msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 "apt-sortpkgs is a simple tool to sort package information files.\n"
-"It sorts by default by binary package information, but the -s option\n"
+"By default it sorts by binary package information, but the -s option\n"
 "can be used to switch to source package ordering instead.\n"
 msgstr ""
 
@@ -2090,14 +2081,9 @@ msgstr ""
 "資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
 
 #: ftparchive/cachedb.cc
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "無法開啟 DB 檔 %s: %s"
-
-#: ftparchive/cachedb.cc apt-inst/extract.cc
-#, c-format
-msgid "Failed to stat %s"
-msgstr "無法取得 %s 的狀態"
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "無法開啟 DB 檔 %s: %s"
 
 #: ftparchive/cachedb.cc
 #, fuzzy
@@ -2147,11 +2133,6 @@ msgstr "和子程序/檔案 IO 失敗"
 msgid "Failed to read while computing MD5"
 msgstr "在計算 MD5 時無法讀取到資料"
 
-#: ftparchive/multicompress.cc
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在取消 %s 的連結時發生問題"
-
 #: ftparchive/multicompress.cc apt-inst/extract.cc
 #, c-format
 msgid "Failed to rename %s to %s"
@@ -2230,16 +2211,11 @@ msgstr "無法開啟 %s"
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "無法讀取連結 %s"
 
-#: ftparchive/writer.cc
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "無法移除連結 %s"
-
 #: ftparchive/writer.cc
 #, c-format
 msgid "*** Failed to link %s to %s"
@@ -2424,61 +2400,61 @@ msgstr "重複加入抽換資訊 %s -> %s"
 msgid "Duplicate conf file %s/%s"
 msgstr "重複的設定檔 %s/%s"
 
-#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "找不到清單目錄 %spartial。"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Updating from such a repository can't be done securely, and is therefore "
+"disabled by default."
+msgstr ""
 
-#: apt-pkg/acquire.cc
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can't be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "找不到套件檔目錄 %spartial。"
+msgid "The repository '%s' is no longer signed."
+msgstr "路徑 %s 已被抽換"
 
-#: apt-pkg/acquire.cc
+#: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "無法鎖定列表目錄"
+msgid "The repository '%s' does no longer have a Release file."
+msgstr "路徑 %s 已被抽換"
 
-#: apt-pkg/acquire.cc
-#, c-format
+#: apt-pkg/acquire-item.cc
 msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
 
-#: apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "不被支援的索引檔類型 '%s'"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在取得檔案 %li/%li（還有 %s）"
+msgid "The repository '%s' is not signed."
+msgstr "路徑 %s 已被抽換"
 
-#: apt-pkg/acquire.cc
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "正在取得檔案 %li/%li"
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "路徑 %s 已被抽換"
 
 #: apt-pkg/acquire-item.cc
-msgid ""
-"Updating such a repository securely is impossible and therefore disabled by "
-"default."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' provides only weak security information."
+msgstr "路徑 %s 已被抽換"
 
 #: apt-pkg/acquire-item.cc
-msgid ""
-"Data from such a repository can't be authenticated and is therefore "
-"potentially dangerous to use."
-msgstr ""
+msgid "Hash Sum mismatch"
+msgstr "Hash Sum 不符"
 
 #: apt-pkg/acquire-item.cc
-msgid ""
-"See apt-secure(8) manpage for repository creation and user configuration "
-"details."
+msgid "Insufficient information available to perform this download securely"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2486,10 +2462,6 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr "無法重新命名，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc
-msgid "Hash Sum mismatch"
-msgstr "Hash Sum 不符"
-
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "大小不符"
@@ -2517,6 +2489,13 @@ msgstr ""
 msgid "GPG error: %s: %s"
 msgstr ""
 
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' doesn't support "
+"architecture '%s'"
+msgstr ""
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -2525,8 +2504,11 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"
+msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
@@ -2543,33 +2525,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
 
-#. No Release file was present, or verification failed, so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is not signed."
-msgstr "路徑 %s 已被抽換"
-
-#. No Release file was present so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' does not have a Release file."
-msgstr "路徑 %s 已被抽換"
-
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "路徑 %s 已被抽換"
-
-#: apt-pkg/acquire-item.cc
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -2617,6 +2572,50 @@ msgid ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
 msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 
+#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "找不到清單目錄 %spartial。"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "找不到套件檔目錄 %spartial。"
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "無法鎖定列表目錄"
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "No sandbox user '%s' on the system, can not drop privileges"
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc apt-pkg/clean.cc
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "不被支援的索引檔類型 '%s'"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在取得檔案 %li/%li（還有 %s）"
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在取得檔案 %li/%li"
+
 #: apt-pkg/algorithms.cc
 #, c-format
 msgid ""
@@ -2895,6 +2894,11 @@ msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾"
 
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "在刪除檔案時發生問題"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2936,11 +2940,6 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待 %s 但是它並不存在"
-
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -2967,14 +2966,8 @@ msgid "Problem closing the gzip file %s"
 msgstr "在關閉檔案時發生問題"
 
 #: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file %s"
-msgstr "無法開啟檔案 %s"
-
-#: apt-pkg/contrib/fileutl.cc
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "無法開啟管線給 %s 使用"
+msgid "Unexpected end of file"
+msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"
@@ -2984,6 +2977,16 @@ msgstr "無法建立子程序 IPC"
 msgid "Failed to exec compressor "
 msgstr "無法執行壓縮程式"
 
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file %s"
+msgstr "無法開啟檔案 %s"
+
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "無法開啟管線給 %s 使用"
+
 #: apt-pkg/contrib/fileutl.cc
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
@@ -3004,11 +3007,6 @@ msgstr "在關閉檔案時發生問題"
 msgid "Problem renaming the file %s to %s"
 msgstr "在同步檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "在刪除檔案時發生問題"
-
 #: apt-pkg/contrib/fileutl.cc
 msgid "Problem syncing the file"
 msgstr "在同步檔案時發生問題"
@@ -3019,13 +3017,13 @@ msgstr "不能 mmap 空白檔案"
 
 #: apt-pkg/contrib/mmap.cc
 #, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "無法開啟管線給 %s 使用"
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "無法 mmap 到 %lu 位元組"
 
 #: apt-pkg/contrib/mmap.cc
 #, fuzzy, c-format
-msgid "Couldn't make mmap of %llu bytes"
-msgstr "無法 mmap 到 %lu 位元組"
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "無法開啟管線給 %s 使用"
 
 #: apt-pkg/contrib/mmap.cc
 #, fuzzy
@@ -3148,13 +3146,15 @@ msgid "No Hash entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
 #: apt-pkg/deb/debmetaindex.cc
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+#, c-format
+msgid ""
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"
+msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "Invalid '%s' entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
@@ -3168,6 +3168,11 @@ msgstr ""
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr ""
 
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
 msgid "Unable to parse package file %s (%d)"
@@ -3233,7 +3238,7 @@ msgstr "正在執行安裝後套件後續處理程式 %s"
 msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "無法開啟檔案 %s"
@@ -3457,11 +3462,6 @@ msgstr "套件快取檔損壞"
 msgid "The package cache file is an incompatible version"
 msgstr "套件快取檔版本不符"
 
-#: apt-pkg/pkgcache.cc
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "套件快取檔損壞"
-
 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
@@ -3472,6 +3472,11 @@ msgstr "本 APT 不支援 '%s' 版本系統"
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "這個套件快取是用於另一種平台的"
 
+#: apt-pkg/pkgcache.cc
+#, fuzzy
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr "套件快取檔損壞"
+
 #: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr "相依關係"
@@ -3508,14 +3513,14 @@ msgstr "毀損"
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc
-msgid "important"
-msgstr "重要"
-
 #: apt-pkg/pkgcache.cc
 msgid "required"
 msgstr "必要"
 
+#: apt-pkg/pkgcache.cc
+msgid "important"
+msgstr "重要"
+
 #: apt-pkg/pkgcache.cc
 msgid "standard"
 msgstr "標準"
@@ -3636,14 +3641,9 @@ msgstr "在 sources.list 中必須包含一些 'source' URI"
 
 #: apt-pkg/tagfile.cc
 #, c-format
-msgid "Cannot convert %s to integer"
+msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "無法取得 %s，%s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3655,6 +3655,59 @@ msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而
 msgid "Calculating upgrade"
 msgstr "籌備升級中"
 
+#~ msgid "(not found)"
+#~ msgstr "(未找到)"
+
+#~ msgid "  Package pin: "
+#~ msgstr "  套件鎖定："
+
+#~ msgid "There is no public key available for the following key IDs:\n"
+#~ msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
+
+#, fuzzy
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "路徑 %s 已被抽換"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+#~ "packages"
+#~ msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
+
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because candidate version of "
+#~ "package %s can't satisfy version requirements"
+#~ msgstr ""
+#~ "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
+
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
+
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "無法滿足套件 %s 的編譯相依關係。"
+
+#~ msgid "Problem unlinking %s"
+#~ msgstr "在取消 %s 的連結時發生問題"
+
+#~ msgid "Failed to unlink %s"
+#~ msgstr "無法移除連結 %s"
+
 #~ msgid ""
 #~ "Usage: apt-cache [options] command\n"
 #~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
@@ -3689,15 +3742,6 @@ msgstr "籌備升級中"
 #~ "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 #~ "請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
 
-#~ msgid ""
-#~ "Usage: apt-config [options] command\n"
-#~ "\n"
-#~ "apt-config is a simple tool to read the APT config file\n"
-#~ msgstr ""
-#~ "用法：apt-config [選項] 指令\n"
-#~ "\n"
-#~ "apt-config 是一個用於讀取 APT 設定檔的簡單工具\n"
-
 #~ msgid ""
 #~ "Options:\n"
 #~ "  -h   This help text.\n"