Regenerate .pot files and merge .po files with them

31 files changed, 166 insertions, 153 deletions

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 69ae3f314..137b27ee0 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-02-17 08:55+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index c31664c46..35f29abf3 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 17:30+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index 9c25f024e..b9cd22221 100644
--- a/dselect/po/cs.po
+++ b/dselect/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2009-09-11 20:35+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 247fa823f..20e49881a 100644
--- a/dselect/po/da.po
+++ b/dselect/po/da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_dselect_1.16.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
-"PO-Revision-Date: 2012-07-03 16:32+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
+"PO-Revision-Date: 2012-07-21 02:33+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
 "Language: da\n"
@@ -1608,4 +1608,3 @@ msgstr "Inst.ver"
 #: dselect/pkgtop.cc:290
 msgid "Avail.ver"
 msgstr "Tilg.ver"
-
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 38a2ee961..171f0a00c 100644
--- a/dselect/po/de.po
+++ b/dselect/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.16.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 09:35+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 166413a8f..de3fa1e00 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.6-1-g3aa48\n"
+"Project-Id-Version: dpkg 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/dselect/po/el.po b/dselect/po/el.po
index a10b7a7a3..648e63ae6 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-02-17 08:56+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index 4fa29b734..e3526fc06 100644
--- a/dselect/po/es.po
+++ b/dselect/po/es.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.16\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-08 01:48+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1020,7 +1020,9 @@ msgstr "el terminal carece de propiedades necesarias: abandonando"
 
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
-msgstr "se han activado arquitecturas foráneas pero no se soportan múltiples arquitecturas («multi-arch»)"
+msgstr ""
+"se han activado arquitecturas foráneas pero no se soportan múltiples "
+"arquitecturas («multi-arch»)"
 
 #: dselect/main.cc:422
 msgid ""
diff --git a/dselect/po/et.po b/dselect/po/et.po
index 8c0f0a998..759aad312 100644
--- a/dselect/po/et.po
+++ b/dselect/po/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2007-07-13 08:22+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index 0992c46b6..c6f396e13 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2009-01-05 16:29+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 6724bb984..ada816b3c 100644
--- a/dselect/po/fr.po
+++ b/dselect/po/fr.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 08:30+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -273,7 +273,6 @@ msgid "Search for a package whose name contains a string"
 msgstr "Rechercher un paquet dont le nom contient une chaîne particulière"
 
 #: dselect/bindings.cc:162
-#| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Répéter la dernière recherche"
 
@@ -919,16 +918,6 @@ msgstr ""
 
 #: dselect/main.cc:185
 #, 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"
@@ -962,7 +951,6 @@ msgstr ""
 
 #: dselect/main.cc:198
 #, c-format
-#| msgid "Section"
 msgid "Actions:\n"
 msgstr "Actions :\n"
 
@@ -988,7 +976,6 @@ msgstr "impossible d'ouvrir le fichier de débogage « %.255s »\n"
 
 #: dselect/main.cc:251
 #, c-format
-#| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Non valable %s « %s »"
 
@@ -997,7 +984,6 @@ msgid "screen part"
 msgstr "Partie de l'écran"
 
 #: dselect/main.cc:274
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Spécification de couleur nulle"
 
@@ -1619,7 +1605,6 @@ msgid "Available control file information"
 msgstr "Informations disponibles du fichier de contrôle"
 
 #: dselect/pkglist.cc:421
-#| msgid "There are no packages."
 msgid "there are no packages"
 msgstr "Il n'existe pas de paquets"
 
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index bcbac206c..a65f918ce 100644
--- a/dselect/po/gl.po
+++ b/dselect/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect_gl\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2008-12-27 15:56+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index 44410dbf0..578f4026b 100644
--- a/dselect/po/hu.po
+++ b/dselect/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-10-06 03:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index 7356c5c0e..f63267753 100644
--- a/dselect/po/id.po
+++ b/dselect/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-10-06 20:20+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
diff --git a/dselect/po/it.po b/dselect/po/it.po
index 604055978..cfedb5f12 100644
--- a/dselect/po/it.po
+++ b/dselect/po/it.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-10-06 22:01+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index ed585d8b9..9accba673 100644
--- a/dselect/po/ja.po
+++ b/dselect/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 23:43+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -330,14 +330,17 @@ msgstr ""
 "  ^b                    ^f                      1 文字だけ水平移動\n"
 "\n"
 "後で処理するためにパッケージにマークを付ける:\n"
-" +, Insert  インストールまたはアップグレード   =, H  現在の状態を維持 (hold)\n"
-" -, Delete  削除                             :, G  維持 (hold) 解除: アップグレードまたはインストールしない\n"
+" +, Insert  インストールまたはアップグレード   =, H  現在の状態を維持 "
+"(hold)\n"
+" -, Delete  削除                             :, G  維持 (hold) 解除: アップグ"
+"レードまたはインストールしない\n"
 " _          (設定ファイルも含め) 完全削除\n"
 "                                             その他:\n"
 "終了、中止、上書き (大文字に注意!):      ?, F1 ヘルプ (または Help)\n"
 " Return  確認後、終了 (依存関係を照合)   i, I  情報画面の切り替え\n"
 "   Q     確認後、終了 (依存関係を無視)   o, O  ソートオプションの切り替え\n"
-" X, Esc  中止 (eXit)。変更は破棄する     v, V  ステータス画面オプションの変更\n"
+" X, Esc  中止 (eXit)。変更は破棄する     v, V  ステータス画面オプションの変"
+"更\n"
 "   R     前のリスト状態に戻す            ^l    画面の再描画\n"
 "   U     提案された状態にすべて従う      /     検索 (リターンでキャンセル)\n"
 "   D     直接要求された状態にすべて従う  n, \\  検索次候補\n"
@@ -547,8 +550,10 @@ msgstr ""
 "1文字でステータスが表されており、左から次のような意味を持ちます\n"
 "(詳細表示は `v' でトグルできます):\n"
 "\n"
-" エラーフラグ: 空欄 - エラーなし (しかし、パッケージが壊れた状態の場合あり - 下記参照)\n"
-"              `R'   - インストール中に重大なエラー発生、再インストールが必要\n"
+" エラーフラグ: 空欄 - エラーなし (しかし、パッケージが壊れた状態の場合あり - "
+"下記参照)\n"
+"              `R'   - インストール中に重大なエラー発生、再インストールが必"
+"要\n"
 " インストール状態:  空欄  - 未インストール\n"
 "                     `*'  - インストール済み\n"
 "                     `-'  - 未インストール (設定ファイルが残存)\n"
@@ -818,7 +823,8 @@ msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
-"これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書バージョン\n"
+"これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書バージョ"
+"ン\n"
 "2 もしくはそれ以降を参照してください。このソフトウェアは無保証です。\n"
 
 #: dselect/main.cc:170 dselect/main.cc:218
@@ -846,7 +852,8 @@ msgstr ""
 "オプション:\n"
 "  --admindir <ディレクトリ>  %s の代わりに <ディレクトリ> を使う\n"
 "  --expert                   上級者モードに切り替える\n"
-"  --debug <ファイル> | -D<ファイル>  デバッグモードに切り替え、出力を<ファイル>に送る\n"
+"  --debug <ファイル> | -D<ファイル>  デバッグモードに切り替え、出力を<ファイ"
+"ル>に送る\n"
 "  --colour | --color 画面:[前景],[背景][:属性[+属性+...]]\n"
 "                             画面の色を設定する\n"
 "\n"
@@ -931,7 +938,8 @@ msgstr "必要とする機能がこの端末にはありません。終了しま
 
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
-msgstr "他アーキテクチャが有効ですが、マルチアーキテクチャはサポートされていません"
+msgstr ""
+"他アーキテクチャが有効ですが、マルチアーキテクチャはサポートされていません"
 
 #: dselect/main.cc:422
 msgid ""
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 7ba36f176..92d3f7ebc 100644
--- a/dselect/po/ko.po
+++ b/dselect/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2007-09-16 22:55-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index 54d628e7a..73f1b857c 100644
--- a/dselect/po/nb.po
+++ b/dselect/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2010-09-02 23:01+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index e12762efa..5f8db83bc 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg/deselect 1.16.1.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2011-12-12 11:55+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index d7fe6b3d1..71d5ffc07 100644
--- a/dselect/po/nn.po
+++ b/dselect/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-02-17 08:57+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index 5a9960c01..2ae655a42 100644
--- a/dselect/po/pl.po
+++ b/dselect/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2009-09-27 02:41+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index ef0d94a32..96a829a5c 100644
--- a/dselect/po/pt.po
+++ b/dselect/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2008-12-27 16:05+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index 11ac74c06..d418f5bd4 100644
--- a/dselect/po/pt_BR.po
+++ b/dselect/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2008-06-09 02:53-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index 155235df4..c1fa4c08d 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2008-06-28 19:11+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index f1581ae19..99fc00b51 100644
--- a/dselect/po/ru.po
+++ b/dselect/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.7.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-07 08:36+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -233,7 +233,6 @@ msgid "Search for a package whose name contains a string"
 msgstr "Найти пакет, имя которого содержит строку"
 
 #: dselect/bindings.cc:162
-#| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Повторить последний поиск"
 
@@ -629,7 +628,8 @@ msgstr ""
 "  состояния выделенного пакета или описание выделенной группы. Если вы\n"
 "  не понимаете значение символов, отображающих состояние, перейдите\n"
 "  к соответствующему пакету и посмотрите на разделительную линию, или\n"
-"  с помощью клавиши «v» переключите программу в режим подробного отображения\n"
+"  с помощью клавиши «v» переключите программу в режим подробного "
+"отображения\n"
 "  (следующее нажатие клавиши «v» вернёт экран в краткий режим).\n"
 "\n"
 "* Нижняя часть экрана показывает более подробную информацию о выделенном\n"
@@ -640,7 +640,8 @@ msgstr ""
 "  информация о конфликтах и зависимостях, затрагивающих данный пакет\n"
 "  (в дополнительных списках разрешения конфликтов и зависимостей).\n"
 "\n"
-"  Клавиша «i» циклически переключает режимы отображения в этой части экрана,\n"
+"  Клавиша «i» циклически переключает режимы отображения в этой части "
+"экрана,\n"
 "  а клавиша «I» скрывает её или расширяет почти до размеров экрана.\n"
 
 #: dselect/helpmsgs.cc:176
@@ -866,16 +867,6 @@ msgstr ""
 
 #: dselect/main.cc:185
 #, 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"
@@ -888,8 +879,8 @@ msgstr ""
 "Параметры:\n"
 "  --admindir <каталог>       Использовать <каталог> вместо %s.\n"
 "  --expert                   Включить экспертный режим.\n"
-"  --debug <файл> | -D<файл>  Включить отладку, посылать все сообщения в <файл>"
-".\n"
+"  --debug <файл> | -D<файл>  Включить отладку, посылать все сообщения в "
+"<файл>.\n"
 "  --colour | --color screenpart:[foreground],[background][:attr[+attr+…]]\n"
 "                             Настроить цвета экрана.\n"
 "\n"
@@ -907,7 +898,6 @@ msgstr ""
 
 #: dselect/main.cc:198
 #, c-format
-#| msgid "Section"
 msgid "Actions:\n"
 msgstr "Действия:\n"
 
@@ -933,7 +923,6 @@ msgstr "не удалось открыть отладочный файл «%.255
 
 #: dselect/main.cc:251
 #, c-format
-#| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "некорректный %s «%s»"
 
@@ -942,7 +931,6 @@ msgid "screen part"
 msgstr "сектор экрана"
 
 #: dselect/main.cc:274
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "задающие цвет значения пусты"
 
@@ -1553,7 +1541,6 @@ msgid "Available control file information"
 msgstr "Доступна информация из файла control"
 
 #: dselect/pkglist.cc:421
-#| msgid "There are no packages."
 msgid "there are no packages"
 msgstr "нет пакетов"
 
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index f27d33666..b624a8de0 100644
--- a/dselect/po/sk.po
+++ b/dselect/po/sk.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-03 01:09+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 #: dselect/basecmds.cc:125
 msgid "Search for ? "
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index 581f9a031..5cf1f0460 100644
--- a/dselect/po/sv.po
+++ b/dselect/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 09:02+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index 7ed31e836..afe56a720 100644
--- a/dselect/po/tl.po
+++ b/dselect/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index 6b4d592ac..4c0bdc1f9 100644
--- a/dselect/po/vi.po
+++ b/dselect/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-10-09 20:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 640d0b83c..527c2d029 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-05-06 20:11+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 2f2846d2f..8f9f157e5 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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-07 17:58+0800\n"
 "Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -227,7 +227,6 @@ msgid "Search for a package whose name contains a string"
 msgstr "搜尋名稱含有特定字串的套件"
 
 #: dselect/bindings.cc:162
-#| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "重復上次的搜尋"
 
@@ -293,15 +292,21 @@ msgid ""
 "\n"
 "Mark packages for later processing:\n"
 " +, Insert  install or upgrade      =, H  hold in present state\n"
-" -, Delete  remove                  :, G  unhold: upgrade or leave uninstalled\n"
+" -, Delete  remove                  :, G  unhold: upgrade or leave "
+"uninstalled\n"
 " _          remove & purge config\n"
 "                                             Miscellaneous:\n"
-"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n"
-" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info displays\n"
-"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display opts\n"
+"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+"Help)\n"
+" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+"displays\n"
+"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+"options\n"
+" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+"opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
-"   U     set all to sUggested state             /   search (Return to cancel)\n"
+"   U     set all to sUggested state             /   search (Return to "
+"cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "移動按鍵：下一個/前一個，頂端/底端，上移/下移，後移/前移：\n"
@@ -311,8 +316,10 @@ msgstr ""
 "  t，Home               e，End                  跳到列表的頂端/底端\n"
 "  u                     d                       讓相關訊息滾動一頁\n"
 "  ^u                    ^d                      讓相關訊息滾動一行\n"
-"  B，左箭頭             F，右箭頭               讓顯示內容左右平移 1/3 螢幕寬度\n"
-"  ^b                    ^f                      讓顯示內容左右平移一個字元寬度\n"
+"  B，左箭頭             F，右箭頭               讓顯示內容左右平移 1/3 螢幕寬"
+"度\n"
+"  ^b                    ^f                      讓顯示內容左右平移一個字元寬"
+"度\n"
 "\n"
 "為套件作上標記，待之後再作處理：\n"
 " +，Insert   安裝或者升級           =，H  令其保持當前狀態\n"
@@ -320,11 +327,13 @@ msgstr ""
 " _           刪除並清除設定\n"
 "                                             其它：\n"
 "退出，覆寫狀態(注意，都是大寫！)：            ?, F1     請求幫助(Help)\n"
-" Enter    確認並退出(檢查相依性)            i, I      切換或滾動相關訊息的顯示\n"
+" Enter    確認並退出(檢查相依性)            i, I      切換或滾動相關訊息的顯"
+"示\n"
 "   Q     確認並退出(忽略相依問題)             o, O      滾動排序的各個選項\n"
 " X, Esc  退出程序，把之前的改動作廢           v, V      修改狀態顯示的選項\n"
 "   R     把所有套件的狀態恢復到修改前       ^l        重畫螢幕\n"
-"   U     把所有套件的狀態改成建議值         /         搜尋 (按Enter取消搜索)\n"
+"   U     把所有套件的狀態改成建議值         /         搜尋 (按Enter取消搜"
+"索)\n"
 "   D     把所有套件的狀態改成到所要求的值   \\        重復上次的搜尋\n"
 
 #: dselect/helpmsgs.cc:55
@@ -335,21 +344,27 @@ msgstr "套件選擇界面簡介"
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  You can navigate around the list using the cursor keys,\n"
 "mark packages for installation (using `+') or deinstallation (using `-').\n"
-"Packages can be marked either singly or in groups; initially you will see that\n"
-"the line `All packages' is selected.  `+', `-' and so on will affect all the\n"
+"Packages can be marked either singly or in groups; initially you will see "
+"that\n"
+"the line `All packages' is selected.  `+', `-' and so on will affect all "
+"the\n"
 "packages described by the highlighted line.\n"
 "\n"
-"Some of your choices will cause conflicts or dependency problems; you will be\n"
-"given a sub-list of the relevant packages, so that you can solve the problems.\n"
+"Some of your choices will cause conflicts or dependency problems; you will "
+"be\n"
+"given a sub-list of the relevant packages, so that you can solve the "
+"problems.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
 "Much on-line help is available, please make use of it - press `?' at\n"
 "any time for help.\n"
 "\n"
-"When you have finished selecting packages, press <enter> to confirm changes,\n"
+"When you have finished selecting packages, press <enter> to confirm "
+"changes,\n"
 "or `X' to quit without saving changes. A final check on conflicts and\n"
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
@@ -387,10 +402,12 @@ msgstr "唯讀的套件列表瀏覽界面簡介"
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  Since you do not have the privilege necessary to update\n"
 "package states, you are in a read-only mode.  You can navigate around the\n"
-"list using the cursor keys (please see the `Keystrokes' help screen), observe\n"
+"list using the cursor keys (please see the `Keystrokes' help screen), "
+"observe\n"
 "the status of the packages and read information about them.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
@@ -425,25 +442,34 @@ msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
 "One or more of your choices have raised a conflict or dependency problem -\n"
-"some packages should only be installed in conjunction with certain others, and\n"
+"some packages should only be installed in conjunction with certain others, "
+"and\n"
 "some combinations of packages may not be installed together.\n"
 "\n"
-"You will see a sub-list containing the packages involved.  The bottom half of\n"
-"the display shows relevant conflicts and dependencies; use `i' to cycle between\n"
+"You will see a sub-list containing the packages involved.  The bottom half "
+"of\n"
+"the display shows relevant conflicts and dependencies; use `i' to cycle "
+"between\n"
 "that, the package descriptions and the internal control information.\n"
 "\n"
-"A set of `suggested' packages has been calculated, and the initial markings in\n"
+"A set of `suggested' packages has been calculated, and the initial markings "
+"in\n"
 "this sub-list have been set to match those, so you can just hit Return to\n"
-"accept the suggestions if you wish.  You may abort the change(s) which caused\n"
+"accept the suggestions if you wish.  You may abort the change(s) which "
+"caused\n"
 "the problem(s), and go back to the main list, by pressing capital `X'.\n"
 "\n"
-"You can also move around the list and change the markings so that they are more\n"
-"like what you want, and you can `reject' my suggestions by using the capital\n"
-"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' to\n"
+"You can also move around the list and change the markings so that they are "
+"more\n"
+"like what you want, and you can `reject' my suggestions by using the "
+"capital\n"
+"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' "
+"to\n"
 "force me to accept the situation currently displayed, in case you want to\n"
 "override a recommendation or think that the program is mistaken.\n"
 "\n"
-"Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n"
+"Press <space> to leave help and enter the sub-list; remember: press `?' for "
+"help.\n"
 msgstr ""
 "用於解決衝突/相依問題的子列表的簡介。\n"
 "\n"
@@ -457,7 +483,8 @@ msgstr ""
 "的簡介和內部控制訊息。\n"
 "\n"
 "有一組被“建議”的套件已被統計出來了，\n"
-"而且這個子列表中的對應套件的狀態也被標記成了“建議”的狀態。這樣，如果您願意的話，\n"
+"而且這個子列表中的對應套件的狀態也被標記成了“建議”的狀態。這樣，如果您願意的"
+"話，\n"
 "只需按一下enter來接受軟體的建議。\n"
 "您還可以按大寫的“X”來取消導致問題的更動，並回到主列表界面。\n"
 "\n"
@@ -476,12 +503,17 @@ msgstr "顯示部位 1：套件列表及狀態簡寫"
 
 #: dselect/helpmsgs.cc:125
 msgid ""
-"The top half of the screen shows a list of packages.  For each package you see\n"
-"four columns for its current status on the system and mark.  In terse mode (use\n"
-"`v' to toggle verbose display) these are single characters, from left to right:\n"
-"\n"
-" Error flag: Space - no error (but package may be in broken state - see below)\n"
-"              `R'  - serious error during installation, needs reinstallation;\n"
+"The top half of the screen shows a list of packages.  For each package you "
+"see\n"
+"four columns for its current status on the system and mark.  In terse mode "
+"(use\n"
+"`v' to toggle verbose display) these are single characters, from left to "
+"right:\n"
+"\n"
+" Error flag: Space - no error (but package may be in broken state - see "
+"below)\n"
+"              `R'  - serious error during installation, needs "
+"reinstallation;\n"
 " Installed state:     Space    - not installed;\n"
 "                       `*'     - installed;\n"
 "                       `-'     - not installed but config files remain;\n"
@@ -498,7 +530,8 @@ msgid ""
 "  `n': package is new and has yet to be marked for install/remove/&c.\n"
 "\n"
 "Also displayed are each package's Priority, Section, name, installed and\n"
-"available version numbers (shift-V to display/hide) and summary description.\n"
+"available version numbers (shift-V to display/hide) and summary "
+"description.\n"
 msgstr ""
 "螢幕的上半部分顯示的是套件的列表。對每個套件來說，\n"
 "都有四列代號表示該套件在系統中的狀態以及現在的標記。在簡略模式裡(可用\n"
@@ -531,11 +564,14 @@ msgstr "顯示部位 2：列表高亮顯示部分﹔相關訊息的顯示"
 
 #: dselect/helpmsgs.cc:152
 msgid ""
-"* Highlight: One line in the package list will be highlighted.  It indicates\n"
+"* Highlight: One line in the package list will be highlighted.  It "
+"indicates\n"
 "  which package(s) will be affected by presses of `+', `-' and `_'.\n"
 "\n"
-"* The dividing line in the middle of the screen shows a brief explanation of\n"
-"  the status of the currently-highlighted package, or a description of which\n"
+"* The dividing line in the middle of the screen shows a brief explanation "
+"of\n"
+"  the status of the currently-highlighted package, or a description of "
+"which\n"
 "  group is highlighted if a group line is.  If you don't understand the\n"
 "  meaning of some of the status characters displayed, go to the relevant\n"
 "  package and look at this divider line, or use the `v' key for a verbose\n"
@@ -576,21 +612,25 @@ msgstr "安裝方式選擇界面的簡介"
 
 #: dselect/helpmsgs.cc:176
 msgid ""
-"dselect and dpkg can do automatic installation, loading the package files to be\n"
+"dselect and dpkg can do automatic installation, loading the package files to "
+"be\n"
 "installed from one of a number of different possible places.\n"
 "\n"
 "This list allows you to select one of these installation methods.\n"
 "\n"
-"Move the highlight to the method you wish to use, and hit Enter.  You will then\n"
+"Move the highlight to the method you wish to use, and hit Enter.  You will "
+"then\n"
 "be prompted for the information required to do the installation.\n"
 "\n"
 "As you move the highlight a description of each method, where available, is\n"
 "displayed in the bottom half of the screen.\n"
 "\n"
-"If you wish to quit without changing anything use the `x' key while in the list\n"
+"If you wish to quit without changing anything use the `x' key while in the "
+"list\n"
 "of installation methods.\n"
 "\n"
-"A full list of keystrokes is available by pressing `k' now, or from the help\n"
+"A full list of keystrokes is available by pressing `k' now, or from the "
+"help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
 "dselect 和 dpkg 能夠實現自動化的安裝，它們可以從多個不同的位置取回\n"
@@ -626,7 +666,8 @@ msgid ""
 "\n"
 "Quit:\n"
 " Return, Enter    select this method and go to its configuration dialogue\n"
-" x, X             exit without changing or setting up the installation method\n"
+" x, X             exit without changing or setting up the installation "
+"method\n"
 "\n"
 "Miscellaneous:\n"
 "  ?, Help, F1      request help\n"
@@ -641,8 +682,10 @@ msgstr ""
 "  t，Home               e，End                  跳到列表的頂端/底端\n"
 "  u                     d                       讓相關訊息滾動一頁\n"
 "  ^u                    ^d                      讓相關訊息滾動一行\n"
-"  B，左箭頭             F，右箭頭               讓顯示內容左右平移 1/3 的螢幕寬度\n"
-"  ^b                    ^f                      讓顯示內容左右平移一個字元寬度\n"
+"  B，左箭頭             F，右箭頭               讓顯示內容左右平移 1/3 的螢幕"
+"寬度\n"
+"  ^b                    ^f                      讓顯示內容左右平移一個字元寬"
+"度\n"
 "(在套件列表界面也使用同樣的按鍵設定。)\n"
 "\n"
 "退出：\n"
@@ -760,8 +803,7 @@ msgstr ""
 "這是自由軟體﹔請參閱 GNU Public License \n"
 "第二或更新的版本。該軟體【不】提供任何擔保。\n"
 
-#: dselect/main.cc:170
-#: dselect/main.cc:218
+#: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
 msgstr "<標準輸出>"
 
@@ -806,7 +848,6 @@ msgstr ""
 
 #: dselect/main.cc:198
 #, c-format
-#| msgid "Section"
 msgid "Actions:\n"
 msgstr "動作：\n"
 
@@ -832,7 +873,6 @@ msgstr "無法打開偵錯檔案“%.255s”\n"
 
 #: dselect/main.cc:251
 #, c-format
-#| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "無效的 %s “%s”"
 
@@ -841,12 +881,10 @@ msgid "screen part"
 msgstr "顯示哪一部分"
 
 #: dselect/main.cc:274
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "未指定顏色"
 
-#: dselect/main.cc:282
-#: dselect/main.cc:287
+#: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
 msgstr "顏色"
 
@@ -933,29 +971,23 @@ msgstr "存取方式“%s”。"
 msgid "Abbrev."
 msgstr "縮寫"
 
-#: dselect/methlist.cc:116
-#: dselect/pkginfo.cc:105
-#: dselect/pkgtop.cc:292
+#: dselect/methlist.cc:116 dselect/pkginfo.cc:105 dselect/pkgtop.cc:292
 msgid "Description"
 msgstr "簡介"
 
-#: dselect/methlist.cc:159
-#: dselect/pkglist.cc:577
+#: dselect/methlist.cc:159 dselect/pkglist.cc:577
 msgid "doupdate failed"
 msgstr "doupdate 失敗"
 
-#: dselect/methlist.cc:161
-#: dselect/pkglist.cc:580
+#: dselect/methlist.cc:161 dselect/pkglist.cc:580
 msgid "failed to unblock SIGWINCH"
 msgstr "無法解除阻塞 SIGWINCH 信號"
 
-#: dselect/methlist.cc:165
-#: dselect/pkglist.cc:585
+#: dselect/methlist.cc:165 dselect/pkglist.cc:585
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信號失敗"
 
-#: dselect/methlist.cc:166
-#: dselect/pkglist.cc:587
+#: dselect/methlist.cc:166 dselect/pkglist.cc:587
 msgid "getch failed"
 msgstr "getch 失敗"
 
@@ -1276,8 +1308,7 @@ msgstr "瑕"
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
 msgid "Broken"
 msgstr "有故障"
 
@@ -1301,13 +1332,11 @@ msgstr "已更新"
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:101
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
 msgid "Removed"
 msgstr "已刪除"
 
-#: dselect/pkgdisplay.cc:102
-#: dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
 msgid "Brokenly installed packages"
 msgstr "有問題的已安裝套件"
 
@@ -1421,10 +1450,14 @@ msgstr " 詳盡:v 幫助:?"
 
 #: dselect/pkginfo.cc:80
 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 the criterion shown.\n"
-"\n"
-"If you move the highlight to a line for a particular package you will see information about that package displayed here.\n"
-"You can use `o' and `O' to change the sort order and give yourself the opportunity to mark packages in different kinds of groups."
+"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 "
+"the criterion shown.\n"
+"\n"
+"If you move the highlight to a line for a particular package you will see "
+"information about that package displayed here.\n"
+"You can use `o' and `O' to change the sort order and give yourself the "
+"opportunity to mark packages in different kinds of groups."
 msgstr ""
 "您現在高亮顯示的代表著多個套件。如果您要求安裝、刪除、保持等等，您將會\n"
 "影響到符合所示標準的所有套件。\n"
@@ -1451,7 +1484,6 @@ msgid "Available control file information"
 msgstr "可用的控制檔案訊息"
 
 #: dselect/pkglist.cc:421
-#| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "沒有多餘的套件"