Regenerate .pot files and merge .po files with them

1 files changed, 384 insertions, 325 deletions

diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 8c56c71a8..5dd3aa511 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2012-07-07 17:58+0800\n"
 "Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
 "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n"
@@ -18,27 +18,27 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "想搜尋什麼？"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "錯誤："
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "幫助："
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "按 ? 可以彈出幫助選單，用 <space> 能進入下個主題並離開幫助畫面。"
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "您可獲得有關下列主題的幫助訊息："
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
@@ -46,239 +46,239 @@ msgstr ""
 "請按上面列表中的按鍵，<space> 或“q”可退出幫助界面，\n"
 "或者用“.”(full stop)來依次閱讀幫助頁面。"
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "在幫助界面讀取鍵盤輸入時出錯"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) 失敗"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "在 SIGWINCH 處理程式中 doupdate 失敗了"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "恢復原先的 SIGWINCH sigact 失敗"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "恢復原先的 signal mask 失敗"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "擷取原先的 signal mask 失敗"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "擷取原先的 SIGWINCH sigact 出錯"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "無法阻塞 SIGWINCH 信號"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "設定新的 SIGWINCH sigact 失敗"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "分配顏色對失敗"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "建立標題視窗失敗"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "建立 whatinfo 視窗失敗"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "無法建立名稱列表的小視窗"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "無法建立標題小視窗"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "無法建立 thisstate 小視窗"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "無法建立相關訊息小視窗"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "建立查詢視窗失敗"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "快速鍵"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%，請按 "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s 繼續往下讀"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s 可以跳回原來的位置"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[未設定按鍵連結]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[未知：%d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "在幫助文檔或相關訊息中滾動滑鼠"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "在幫助或相關訊息中捲動頁面"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "上移"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "下移"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "跳到列表頂端"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "跳到列表底端"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "請求幫助(循環切換幫助界面)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "循環切換訊息顯示"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "重畫螢幕"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "在列表中向前滾動一行"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "在列表中向後滾動一行"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "在幫助或相關訊息中向前滾動一行"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "在幫助或相關訊息中向後滾動一行"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "在列表中向前滾動"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "在列表中向前滾動"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "把套件標記為“將要安裝”"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "把套件標記為“將要移除”"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "把套件標記為移除”"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "讓高亮顯示更易識別"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "讓高亮顯示較不易識別"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "搜尋名稱含有特定字串的套件"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "重復上次的搜尋"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "調整排序的依據 - 優先等級/類別"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "退出，並確認操作而且對相依問題進行復查"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "退出，並確認操作而且不再檢查"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "退出，並拒絕有關衝突和相依問題的建議"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "中止操作 - 不作任何更改並退出"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "把所有套件的狀態恢復到修改前"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "把所有套件的狀態恢復到建議值"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "把所有套件的狀態恢復到所要求的值"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "把所有套件的狀態恢復到目前安裝的值"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "選擇目前高亮顯示的存取方式"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "退出程序，而且不修改所選的存取方式"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "按鍵操作"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -368,11 +368,11 @@ msgstr ""
 "索)\n"
 "   D     把所有套件的狀態改成到所要求的值   \\        重復上次的搜尋\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "套件選擇界面簡介"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -426,11 +426,11 @@ msgstr ""
 "\n"
 "現在您可以按 <enter> 鍵離開幫助界面，進入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "唯讀的套件列表瀏覽界面簡介"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -465,11 +465,11 @@ msgstr ""
 "\n"
 "現在您可以通過按 <enter> 鍵離開幫助界面，進入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "用於解決衝突/相依問題的子列表的簡介"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -529,11 +529,11 @@ msgstr ""
 "請按<enter>離開幫助界面，進入子列表。\n"
 "需要幫助時，按“?”鍵。\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "顯示部位 1：套件列表及狀態簡寫"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -590,11 +590,11 @@ msgstr ""
 "的版本號和當前可用的版本號（使用 shift-v 可以開啟或關閉其\n"
 "顯示)，以及簡要的介紹。\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "顯示部位 2：列表高亮顯示部分﹔相關訊息的顯示"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -638,11 +638,11 @@ msgstr ""
 "  您可以用“i”鍵在這些顯示內容中來回切換，用“I”來關閉相關訊息\n"
 "  的顯示，或者擴大它在螢幕中所占的篇幅直到幾乎完全佔據螢幕。\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "安裝方式選擇界面的簡介"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -679,11 +679,11 @@ msgstr ""
 "現在按“k”鍵就能見到按鍵操作的完整列表，也可以在幫助選單中按“k”鍵。\n"
 "按“?”就能呼出幫助選單。\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "選擇安裝方式的按鍵操作"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -730,104 +730,104 @@ msgstr ""
 "  /                進行搜尋(按enter取消搜尋)\n"
 "  \\               重復上次的搜尋\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "輸入 dselect --help 就可以閱讀幫助訊息。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "來源[A]"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "選擇所使用的安裝來源。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的話，更新可用的套件列表。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "選擇[S]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "對系統中安裝的套件作取捨。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "安裝[I]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "安裝並升級之前指定的套件。"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "設定[C]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "對所有尚未設定的套件進行設定"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "刪除[R]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "刪除不需要的套件"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "選單"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 套件操作前端程式版本%s。\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -835,29 +835,47 @@ msgstr ""
 "這是自由軟體﹔請參閱 GNU Public License \n"
 "第二或更新的版本。該軟體【不】提供任何擔保。\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<標準輸出>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "用法：%s [<選項> ...][<選項> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "選項：\n"
 "  --admindir <目錄名>     以 <目錄名> 取代 %s。\n"
@@ -867,72 +885,79 @@ msgstr ""
 "                             設定螢幕顏色。\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     顯示求助訊息。\n"
 "  --version                  顯示版本號。\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "動作：\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "顯示部分：\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "顏色：\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "屬性：\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "無法打開偵錯檔案“%.255s”\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "無效的 %s “%s”"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "顯示哪一部分"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "未指定顏色"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "顏色"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "顏色屬性"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "終端機不支持游標的定位。\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "終端機不支持高亮顯示。\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -941,11 +966,11 @@ msgstr ""
 "請正確設定您的 TERM 變量，用一個更合適的終端機類型，\n"
 "或者改用針對單一套件的套裝管理工具 %s。\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "由於終端機缺乏必要的特色，只得中止操作"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -959,7 +984,7 @@ msgstr ""
 "按 <enter> 來確認。  用 ^L 來重繪螢幕。\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -967,7 +992,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -977,57 +1002,57 @@ msgstr ""
 "\n"
 "唯讀存取：僅僅可以預覽被選中的項目！"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "在主選單中 getch 失敗"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能識別的操作字串“%.50s”"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "縮寫"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "簡介"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - 存取方式的列表"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "存取方式“%s”。"
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate 失敗"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "無法解除阻塞 SIGWINCH 信號"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信號失敗"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch 失敗"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "說明"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "沒有發現相關說明。"
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1038,7 +1063,7 @@ msgstr ""
 "\n"
 "%s：%s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1046,191 +1071,201 @@ msgstr ""
 "\n"
 "按 <enter> 繼續。"
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " 看上去應該不可用\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "選擇所使用的安裝來源。"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - 存取方式的列表"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "請按 <enter> 繼續。\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<寫標準輸出時出錯>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "讀取程序的錯誤提示時出錯"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "更新套件列表的script"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "安裝script套件"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "查詢/設定 script "
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "安裝方式的選項檔案“%.250s”中有語法錯誤 -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "讀取安裝方式的選項檔案“%.250s”時出錯"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "無法讀取“%.250s”目錄中關於安裝方式的訊息"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "安裝方式“%.250s”的名字過長(%d > %d 個字元)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "無法取得 method script“%.250s”"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "無法讀取 method script“%.250s”"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "在本該有數字的地方沒有發現數字"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "在索引字串中發現了 EOF"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "索引字串過長"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "在選項名稱開始前就發現了換行符號"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "在選項名開始前就發現了 EOF"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "在選項名稱開始前就發現了換行符號"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "在本該是選項名開頭的地方不是字母"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "在選項名中發現了既不是字母也不是數字的字元"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "在選項名中發現了 EOF"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "在概述前發現了換行符號"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "在概述前發現了 EOF"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "在概述前發現了換行符號"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "在概述中發現了 EOF - 本該是換行符號的"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "無法打開選項說明檔案“%.250s”"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "無法 stat 選項說明檔案“%.250s”"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "讀取選項說明檔“%.250s”失敗"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "讀取選項說明檔“%.250s”時出錯"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "讀取安裝方式的選項檔案“%.250s”時出錯"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "無法打開目前的選項檔案“%.250s”"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "無法寫入新的選項檔案“%.250s”"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "新套件"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "安裝"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "保持"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "刪除"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "清除"
 
@@ -1238,331 +1273,325 @@ msgstr "清除"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "【重新安裝】"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "沒有安裝"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "刪除(殘存設定檔案)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "已部分安裝"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "已解壓縮(尚未設定)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "half configured (config failed)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "等待觸發中"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "觸發"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "已安裝完畢"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "需要"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "重要"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "標準"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "可選擇"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "額外"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!臭蟲!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "未歸類"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "建議"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "推薦"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "相依於"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "預相依於"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "取消"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "與之衝突"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "提供"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "替換"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "有助於"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "需"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "要"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "標"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "選"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "餘"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "瑕"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "有故障"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "新的"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "有更新"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "淘汰/本地"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "已更新"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "已安裝"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "已刪除"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "有問題的已安裝套件"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "新的可用套件"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "套件有更新版本(有更新的版本可用了)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "新的可用套件"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "系統中安裝這些的套件是已淘汰的和本地的"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "安裝了的套件版本是最新的"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "已經安裝的套件"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "可用的套件(目前沒有被安裝)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "安裝了的套件版本是最新的"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "被刪除而且不再可用的套件"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "已經安裝的套件"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "被刪除的套件 (其設定檔案仍然存在於系統中)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "被完全清除的套件以及那些從未被安裝過的套件"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "已安裝"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "已徹底移除"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "錯誤"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "已安裝？"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "原有標記"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "現標記為"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "所屬類別"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "優先級"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "套件名"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "可用版本"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "安裝版本"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "可用版本"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "安裝版本"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - 遞迴地列出套件"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - 檢視套件的狀態"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - 套件主列表"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (依類別區分)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (依是否可用和所屬類別)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (依狀態和所屬類別)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (依優先級)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (依是否可用和優先級)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (依狀態和優先級)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (依字母表順序)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (依是否可用)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (依狀態區分)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 標記:+/=/- 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 標記:+/=/- 詳盡:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " 詳盡:v 幫助:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
 "install, remove, hold, etc. it you will affect all the packages which match "
@@ -1581,80 +1610,110 @@ msgstr ""
 "您可以按 `o' 或者 `O' 來以不同的規則排序，這樣您就能在不同類型的套件作\n"
 "標記了。"
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "相互關系"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "無相關介紹。"
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "已安裝的控制檔案訊息"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "可用的控制檔案訊息"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "沒有多餘的套件"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "指定了無效的搜尋選項"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "正規表示法有誤"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " 看上去應該不可用\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " 或者 "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "所有"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "所有套件"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "不指定類別 %s 套件"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "在 %2$s 類別中 %1$s 套件"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s 套件"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "不指定類別 %s %s 套件"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "在 %3$s 類別中 %1$s %2$s 套件"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (曾為：%s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "動作：\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "顏色：\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "屬性：\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "在選項名開始前就發現了 EOF"
+
+#~ msgid "EOF before summary"
+#~ msgstr "在概述前發現了 EOF"
+
+#~ msgid "!Bug!"
+#~ msgstr "!臭蟲!"
+
+#~ msgid "Updated"
+#~ msgstr "有更新"
+
+#~ msgid "Up-to-date"
+#~ msgstr "已更新"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "套件有更新版本(有更新的版本可用了)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "可用的套件(目前沒有被安裝)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr "外部平台啟動但是多平台不支援"