Regenerate .pot files and merge .po files with them

1 files changed, 67 insertions, 71 deletions

diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 2e6d27b34..ab043b545 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2009-05-21 06:34+0200\n"
+"POT-Creation-Date: 2009-05-26 01:10+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -1270,238 +1270,222 @@ msgid "Standard"
 msgstr "標準"
 
 #: dselect/pkgdisplay.cc:65
-msgid "Recommended"
-msgstr "建議"
-
-#: dselect/pkgdisplay.cc:66
 msgid "Optional"
 msgstr "可選擇"
 
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc:66
 msgid "Extra"
 msgstr "額外"
 
-#: dselect/pkgdisplay.cc:68
-msgid "Contrib"
-msgstr "貢獻"
-
-#: dselect/pkgdisplay.cc:69
+#: dselect/pkgdisplay.cc:67
 msgid "!Bug!"
 msgstr "!臭蟲!"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc:68
 msgid "Unclassified"
 msgstr "未歸類"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc:71
 msgid "suggests"
 msgstr "建議"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc:72
 msgid "recommends"
 msgstr "推薦"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc:73
 msgid "depends on"
 msgstr "相依於"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:74
 msgid "pre-depends on"
 msgstr "預相依於"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:75
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "與之衝突"
 
-#: dselect/pkgdisplay.cc:79
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "提供"
 
-#: dselect/pkgdisplay.cc:80
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "替換"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "有助於"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "需"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "要"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "標"
 
-#: dselect/pkgdisplay.cc:87
-msgid "Rec"
-msgstr "薦"
-
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:85
 msgid "Opt"
 msgstr "選"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:86
 msgid "Xtr"
 msgstr "餘"
 
-#: dselect/pkgdisplay.cc:90
-msgid "Ctb"
-msgstr "獻"
-
-#: dselect/pkgdisplay.cc:91
+#: dselect/pkgdisplay.cc:87
 msgid "bUG"
 msgstr "瑕"
 
-#: dselect/pkgdisplay.cc:92
+#: dselect/pkgdisplay.cc:88
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:100 dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:96 dselect/pkgdisplay.cc:116
 msgid "Broken"
 msgstr "有故障"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:97
 msgid "New"
 msgstr "新的"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:98
 msgid "Updated"
 msgstr "有更新"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc:99
 msgid "Obsolete/local"
 msgstr "淘汰/本地"
 
-#: dselect/pkgdisplay.cc:104
+#: dselect/pkgdisplay.cc:100
 msgid "Up-to-date"
 msgstr "已更新"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:101
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:106 dselect/pkgdisplay.cc:122
+#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:118
 msgid "Removed"
 msgstr "已刪除"
 
-#: dselect/pkgdisplay.cc:107 dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:112
 msgid "Brokenly installed packages"
 msgstr "有問題的已安裝套件"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:104
 msgid "Newly available packages"
 msgstr "新的可用套件"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:105
 msgid "Updated packages (newer version is available)"
 msgstr "套件有更新版本(有更新的版本可用了)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:106
 msgid "Obsolete and local packages present on system"
 msgstr "系統中安裝這些的套件是已淘汰的和本地的"
 
-#: dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc:107
 msgid "Up to date installed packages"
 msgstr "安裝了的套件版本是最新的"
 
-#: dselect/pkgdisplay.cc:112
+#: dselect/pkgdisplay.cc:108
 msgid "Available packages (not currently installed)"
 msgstr "可用的套件(目前沒有被安裝)"
 
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:109
 msgid "Removed and no longer available packages"
 msgstr "被刪除而且不再可用的套件"
 
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:113
 msgid "Installed packages"
 msgstr "已經安裝的套件"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:114
 msgid "Removed packages (configuration still present)"
 msgstr "被刪除的套件 (其設定檔案仍然存在於系統中)"
 
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:115
 msgid "Purged packages and those never installed"
 msgstr "被完全清除的套件以及那些從未被安裝過的套件"
 
-#: dselect/pkgdisplay.cc:121
+#: dselect/pkgdisplay.cc:117
 msgid "Installed"
 msgstr "已安裝"
 
-#: dselect/pkgdisplay.cc:123
+#: dselect/pkgdisplay.cc:119
 msgid "Purged"
 msgstr "已徹底移除"
 
-#: dselect/pkgdisplay.cc:203
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - recursive package listing"
 msgstr "dselect - 遞迴地列出套件"
 
-#: dselect/pkgdisplay.cc:204
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - inspection of package states"
 msgstr "dselect - 檢視套件的狀態"
 
-#: dselect/pkgdisplay.cc:205
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - main package listing"
 msgstr "dselect - 套件主列表"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:209
 msgid " (by section)"
 msgstr " (依類別區分)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:212
 msgid " (avail., section)"
 msgstr " (依是否可用和所屬類別)"
 
-#: dselect/pkgdisplay.cc:219
+#: dselect/pkgdisplay.cc:215
 msgid " (status, section)"
 msgstr " (依狀態和所屬類別)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:224
 msgid " (by priority)"
 msgstr " (依優先級)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:227
 msgid " (avail., priority)"
 msgstr " (依是否可用和優先級)"
 
-#: dselect/pkgdisplay.cc:234
+#: dselect/pkgdisplay.cc:230
 msgid " (status, priority)"
 msgstr " (依狀態和優先級)"
 
-#: dselect/pkgdisplay.cc:243 dselect/pkgdisplay.cc:255
+#: dselect/pkgdisplay.cc:239 dselect/pkgdisplay.cc:251
 msgid " (alphabetically)"
 msgstr " (依字母表順序)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:242
 msgid " (by availability)"
 msgstr " (依是否可用)"
 
-#: dselect/pkgdisplay.cc:249
+#: dselect/pkgdisplay.cc:245
 msgid " (by status)"
 msgstr " (依狀態區分)"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 標記:+/=/- 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:264
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 標記:+/=/- 詳盡:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:265
+#: dselect/pkgdisplay.cc:261
 msgid " terse:v help:?"
 msgstr " 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:266
+#: dselect/pkgdisplay.cc:262
 msgid " verbose:v help:?"
 msgstr " 詳盡:v 幫助:?"
 
@@ -1642,6 +1626,18 @@ msgstr "安裝版本"
 msgid "Avail.ver"
 msgstr "可用版本"
 
+#~ msgid "Recommended"
+#~ msgstr "建議"
+
+#~ msgid "Contrib"
+#~ msgstr "貢獻"
+
+#~ msgid "Rec"
+#~ msgstr "薦"
+
+#~ msgid "Ctb"
+#~ msgstr "獻"
+
 #~ msgid ""
 #~ "baselist::startdisplay() done ...\n"
 #~ "\n"