remove the mode-line from apt.ent to save them from being "translated"

9 files changed, 387 insertions, 432 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 902175d93..f69ffda05 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\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"
@@ -126,12 +126,7 @@ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -151,7 +146,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -163,7 +158,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -174,7 +169,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -190,7 +185,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -204,7 +199,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -219,7 +214,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -232,7 +227,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -252,7 +247,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -272,7 +267,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -289,7 +284,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -301,7 +296,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -313,7 +308,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -325,7 +320,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, no-wrap
 msgid ""
 "     "
@@ -339,7 +334,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -355,7 +350,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     "
@@ -368,7 +363,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -380,7 +375,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     "
@@ -393,7 +388,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -407,7 +402,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, no-wrap
 msgid ""
 "     "
@@ -421,7 +416,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -434,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     "
@@ -449,7 +444,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -463,7 +458,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - "
@@ -474,7 +469,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has "
@@ -493,7 +488,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of "
@@ -513,7 +508,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string "
 "e.g. -o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
@@ -521,14 +516,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release "
 "e.g. -t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -536,49 +531,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> "
 "<!ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
 "-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory "
 "e.g. apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -586,21 +581,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -608,7 +603,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -616,14 +611,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/de.po b/doc/po/de.po
index 1a45da327..801e85c3b 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.8.15-9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2011-11-13 11:21+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -135,12 +135,7 @@ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr "APT wurde vom APT-Team E<lt>apt@packages.debian.orgE<gt> geschrieben."
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -172,7 +167,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -190,7 +185,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -206,7 +201,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -232,7 +227,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -252,7 +247,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -276,7 +271,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -296,7 +291,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -325,7 +320,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -353,7 +348,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -379,7 +374,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -395,7 +390,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -411,7 +406,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -427,7 +422,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -449,7 +444,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -472,7 +467,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -488,7 +483,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -504,7 +499,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -520,7 +515,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -538,7 +533,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -560,7 +555,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -577,7 +572,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -596,7 +591,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -616,7 +611,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -625,7 +620,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"ÜBERSETZUNG\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -645,7 +640,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -666,21 +661,21 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr "<!ENTITY synopsis-config-string \"Konfigurationszeichenkette\">"
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr "<!ENTITY synopsis-config-file \"Konfigurationsdatei\">"
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -688,49 +683,49 @@ msgid ""
 msgstr "<!ENTITY synopsis-target-release \"Ziel-Release\">"
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr "<!ENTITY synopsis-architecture \"Architektur\">"
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr "<!ENTITY synopsis-pkg \"Paket\">"
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr "<!ENTITY synopsis-pkg-ver-number \"Paketversionsnummer\">"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr "<!ENTITY synopsis-prefix \"Präfix\">"
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr "<!ENTITY synopsis-regex \"regulärer_Ausdruck\">"
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr "<!ENTITY synopsis-cdrom-mount \"CD-ROM-Einhängepunkt\">"
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -738,21 +733,21 @@ msgid ""
 msgstr "<!ENTITY synopsis-tmp-directory \"temporäres_Verzeichnis\">"
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr "<!ENTITY synopsis-filename \"Dateiname\">"
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr "<!ENTITY synopsis-path \"Pfad\">"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 #, fuzzy
 #| msgid ""
 #| "<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-"
@@ -765,7 +760,7 @@ msgid ""
 msgstr "<!ENTITY synopsis-override \"außer_Kraft_setzen\">"
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -773,14 +768,14 @@ msgid ""
 msgstr "<!ENTITY synopsis-pathprefix \"Pfadpräfix\">"
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr "<!ENTITY synopsis-section \"Abschnitt\">"
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/es.po b/doc/po/es.po
index b775ccbf6..44ed65721 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -167,12 +167,7 @@ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt."
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -204,7 +199,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -222,7 +217,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -238,7 +233,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -264,7 +259,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -284,7 +279,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -308,7 +303,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -328,7 +323,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -359,7 +354,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -387,7 +382,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -414,7 +409,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -430,7 +425,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -446,7 +441,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -462,7 +457,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -484,7 +479,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -507,7 +502,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -523,7 +518,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -539,7 +534,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -555,7 +550,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -573,7 +568,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -595,7 +590,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -612,7 +607,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -631,7 +626,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -651,7 +646,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -663,7 +658,7 @@ msgstr ""
 "<!ENTITY translation-title \"TRADUCCIÓN\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -687,7 +682,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -713,21 +708,21 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -735,49 +730,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -785,21 +780,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -807,7 +802,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -815,14 +810,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 1ba450529..c48bcad31 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2011-02-17 07:50+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -143,12 +143,7 @@ msgstr ""
 "orgE<gt>."
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -180,7 +175,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -198,7 +193,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -214,7 +209,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -240,7 +235,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -260,7 +255,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -284,7 +279,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -304,7 +299,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -331,7 +326,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -359,7 +354,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -385,7 +380,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -401,7 +396,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -417,7 +412,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -433,7 +428,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -455,7 +450,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -476,7 +471,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -492,7 +487,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -508,7 +503,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -524,7 +519,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -541,7 +536,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -563,7 +558,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -579,7 +574,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -597,7 +592,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -616,7 +611,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -625,7 +620,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -643,7 +638,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -664,21 +659,21 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -686,49 +681,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -736,21 +731,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -758,7 +753,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -766,14 +761,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/it.po b/doc/po/it.po
index be5c59527..6cddf93c9 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -128,12 +128,7 @@ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -152,7 +147,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -164,7 +159,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -175,7 +170,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -191,7 +186,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -204,7 +199,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -219,7 +214,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -232,7 +227,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -249,7 +244,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -266,7 +261,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -282,7 +277,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -293,7 +288,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -304,7 +299,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -315,7 +310,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -326,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -341,7 +336,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -352,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -363,7 +358,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -374,7 +369,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -386,7 +381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -397,7 +392,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -408,7 +403,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -420,7 +415,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -433,7 +428,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -442,7 +437,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -456,7 +451,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -472,21 +467,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -494,49 +489,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -544,21 +539,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -566,7 +561,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -574,14 +569,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index d5c900866..6782ea600 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -152,12 +152,7 @@ msgstr ""
 "apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -189,7 +184,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -207,7 +202,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -223,7 +218,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -249,7 +244,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -269,7 +264,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -293,7 +288,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -313,7 +308,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -340,7 +335,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -368,7 +363,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -395,7 +390,7 @@ msgstr ""
 "\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -411,7 +406,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -427,7 +422,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -444,7 +439,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -467,7 +462,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -490,7 +485,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -506,7 +501,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -522,7 +517,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -539,7 +534,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -557,7 +552,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -580,7 +575,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -597,7 +592,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -614,7 +609,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -634,7 +629,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -646,7 +641,7 @@ msgstr ""
 "<!ENTITY translation-title \"翻訳\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -667,7 +662,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -693,21 +688,21 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -715,49 +710,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -765,21 +760,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -787,7 +782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -795,14 +790,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 52735655d..58c16006c 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2010-03-18 22:00+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -148,12 +148,7 @@ msgstr ""
 "apt zostało napisane przez zespół APT E<lt>apt@packages.debian.orgE<gt>."
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -185,7 +180,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -203,7 +198,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -220,7 +215,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -246,7 +241,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -266,7 +261,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -290,7 +285,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -311,7 +306,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry>\n"
@@ -347,7 +342,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -376,7 +371,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -402,7 +397,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -418,7 +413,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -434,7 +429,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -450,7 +445,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -473,7 +468,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -497,7 +492,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -513,7 +508,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -529,7 +524,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -545,7 +540,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -563,7 +558,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -585,7 +580,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -601,7 +596,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -619,7 +614,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY file-sourceslist \"\n"
@@ -643,7 +638,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -652,7 +647,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TŁUMACZENIE\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -670,7 +665,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -691,21 +686,21 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -713,49 +708,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -763,21 +758,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -785,7 +780,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -793,14 +788,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 99d793576..880036cdd 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -137,12 +137,7 @@ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr "apt foi escrito pelo APT team E<lt>apt@packages.debian.orgE<gt>."
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -174,7 +169,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -192,7 +187,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -208,7 +203,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -234,7 +229,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -254,7 +249,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -278,7 +273,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -298,7 +293,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -328,7 +323,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -356,7 +351,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -382,7 +377,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -398,7 +393,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -414,7 +409,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -430,7 +425,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -452,7 +447,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -476,7 +471,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -492,7 +487,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -508,7 +503,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -524,7 +519,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -542,7 +537,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -564,7 +559,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -580,7 +575,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -598,7 +593,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -618,7 +613,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -627,7 +622,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -645,7 +640,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -666,21 +661,21 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -688,49 +683,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -738,21 +733,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -760,7 +755,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -768,14 +763,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 481c23969..365d72935 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"POT-Creation-Date: 2012-05-21 04:50+0300\n"
+"POT-Creation-Date: 2012-05-21 04:58+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -144,12 +144,7 @@ msgstr ""
 " </RefSect1>\n"
 
 #. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:16
+#: apt.ent:14
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -175,7 +170,7 @@ msgstr ""
 " </docinfo>\n"
 
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:21
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -187,7 +182,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:27
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -198,7 +193,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:38
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -221,7 +216,7 @@ msgstr ""
 " </RefSect1>\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:46
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -239,7 +234,7 @@ msgstr ""
 " </RefSect1>\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:56
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -254,7 +249,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:64
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -267,7 +262,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:76
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -284,7 +279,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:88
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -301,7 +296,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:99
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -325,7 +320,7 @@ msgstr ""
 "   </para>\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:105
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -336,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:111
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -347,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:117
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -358,7 +353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:123
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -369,7 +364,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:133
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -384,7 +379,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:139
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -395,7 +390,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:145
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -406,7 +401,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:151
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -417,7 +412,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:158
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -429,7 +424,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:164
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -440,7 +435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:170
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -451,7 +446,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:177
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -463,7 +458,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:185
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -476,7 +471,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:189
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -485,7 +480,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:198
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -503,7 +498,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:209
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -519,21 +514,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:212
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:215
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:218
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -541,49 +536,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:221
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:224
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:227
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:230
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:233
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:236
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:239
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -591,21 +586,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:242
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:247
+#: apt.ent:245
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:248
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -613,7 +608,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
+#: apt.ent:251
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -621,14 +616,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:256
+#: apt.ent:254
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:259
+#: apt.ent:257
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"