* doc/apt-ftparchive.8.xml:

  - fix typo, grammar and style issues

11 files changed, 225 insertions, 209 deletions

diff --git a/debian/changelog b/debian/changelog
index d09239de5..f0b754b5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * doc/apt-get.8.xml:
     - move dselect-upgrade below dist-upgrade
     - review and fix spelling issues
+  * doc/apt-ftparchive.8.xml:
+    - fix typo, grammar and style issues
 
   [ Robert Luberda ]
   * Polish manpage translation update (Closes: #675603)
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 84b5f4135..1a827b6ad 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -93,12 +93,12 @@
      <listitem><para>
      The <literal>release</literal> command generates a Release file from a
      directory tree. It recursively searches the given directory for uncompressed
-     <filename>Packages</filename> and <filename>Sources</filename> files and the ones
+     <filename>Packages</filename> and <filename>Sources</filename> files and ones
      compressed with <command>gzip</command>, <command>bzip2</command> or <command>lzma</command>
      as well as <filename>Release</filename> and <filename>md5sum.txt</filename> files by default
      (<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Additional filename patterns
      can be added by listing them in <literal>APT::FTPArchive::Release::Patterns</literal>.
-     It then writes to stdout a Release file containing a MD5, SHA1 and SHA256 digest
+     It then writes to stdout a <filename>Release</filename> file containing an MD5, SHA1 and SHA256 digest
      for each file.</para>
      <para>
      Values for the additional metadata fields in the Release file are
@@ -139,7 +139,7 @@
    tree manner. This only effects how the scope tag is handled.</para>
 
    <para>
-   The generate configuration has 4 separate sections, each described below.</para>
+   The generate configuration has four separate sections, each described below.</para>
 
      <refsect2><title><literal>Dir</literal> Section</title>
      <para>
@@ -162,7 +162,7 @@
       
       <varlistentry><term><option>CacheDir</option></term>
       <listitem><para>
-      Specifies the location of the cache files</para></listitem>
+      Specifies the location of the cache files.</para></listitem>
       </varlistentry>
       
       <varlistentry><term><option>FileListDir</option></term>
@@ -233,8 +233,8 @@
 
       <varlistentry><term><option>LongDescription</option></term>
       <listitem><para>
-      Sets if long descriptions should be included in the Packages file or split
-      out into a master Translation-en file.</para></listitem>
+      Specifies whether long descriptions should be included in the <filename>Packages</filename> file or split
+      out into a master <filename>Translation-en</filename> file.</para></listitem>
       </varlistentry>
      </variablelist>
    </refsect2>
@@ -290,7 +290,7 @@
 
       <varlistentry><term><option>Translation</option></term>
       <listitem><para>
-      Set the output Translation-en master file with the long descriptions if they
+      Sets the output Translation-en master file with the long descriptions if they
       should be not included in the Packages file. Defaults to
       <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename></para></listitem>
       </varlistentry>
@@ -306,7 +306,7 @@
       <listitem><para>
       Sets the output Contents file. Defaults to
       <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple 
-      Packages files to map onto a single Contents file (such as the default) 
+      Packages files to map onto a single Contents file (as is the default) 
       then <command>apt-ftparchive</command> will integrate those package files 
       together automatically.</para></listitem>
       </varlistentry>
@@ -352,7 +352,7 @@
      Typically this is a setting such as <filename>dists/&stable-codename;</filename>.</para>
      <para>
      All of the settings defined in the <literal>TreeDefault</literal> section can be
-     use in a <literal>Tree</literal> section as well as three new variables.</para>
+     used in a <literal>Tree</literal> section as well as three new variables.</para>
      <para>
      When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> 
      performs an operation similar to:
@@ -366,7 +366,7 @@ for i in Sections do
       <varlistentry><term><option>Sections</option></term>
       <listitem><para>
       This is a space separated list of sections which appear 
-      under the distribution, typically this is something like 
+      under the distribution; typically this is something like 
       <literal>main contrib non-free</literal></para></listitem>
       </varlistentry>
       
@@ -379,8 +379,8 @@ for i in Sections do
 
       <varlistentry><term><option>LongDescription</option></term>
       <listitem><para>
-      Sets if long descriptions should be included in the Packages file or split
-      out into a master Translation-en file.</para></listitem>
+      Specifies whether long descriptions should be included in the <filename>Packages</filename> file or split
+      out into a master <filename>Translation-en</filename> file.</para></listitem>
       </varlistentry>
 
       <varlistentry><term><option>BinOverride</option></term>
@@ -428,7 +428,7 @@ for i in Sections do
       
       <varlistentry><term><option>Contents</option></term>
       <listitem><para>
-      Sets the Contents file output. (optional)</para></listitem>
+      Sets the Contents file output (optional).</para></listitem>
       </varlistentry>
       
       <varlistentry><term><option>BinOverride</option></term>
@@ -472,8 +472,8 @@ for i in Sections do
 
  <refsect1><title>The Binary Override File</title>
    <para>The binary override file is fully compatible with &dpkg-scanpackages;. It
-   contains 4 fields separated by spaces. The first field is the package name,
-   the second is the priority to force that package to, the third is the
+   contains four fields separated by spaces. The first field is the package name,
+   the second is the priority to force that package to, the third is
    the section to force that package to and the final field is the maintainer 
    permutation field.</para>
    <para>The general form of the maintainer field is:
@@ -490,14 +490,14 @@ for i in Sections do
  <refsect1><title>The Source Override File</title>
    <para>
    The source override file is fully compatible with &dpkg-scansources;. It
-   contains 2 fields separated by spaces. The first fields is the source 
+   contains two fields separated by spaces. The first field is the source 
    package name, the second is the section to assign it.</para>
  </refsect1>   
 
  <refsect1><title>The Extra Override File</title>
    <para>
    The extra override file allows any arbitrary tag to be added or replaced
-   in the output. It has 3 columns, the first is the package, the second is
+   in the output. It has three columns, the first is the package, the second is
    the tag and the remainder of the line is the new value.</para>
  </refsect1>   
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 13bca71e5..d773cdd04 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 23:41+0300\n"
+"POT-Creation-Date: 2012-06-04 13:47+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"
@@ -1403,15 +1403,15 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default "
 "(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Additional "
 "filename patterns can be added by listing them in "
 "<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
-"stdout a Release file containing a MD5, SHA1 and SHA256 digest for each "
-"file."
+"stdout a <filename>Release</filename> file containing an MD5, SHA1 and "
+"SHA256 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1463,7 +1463,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
-msgid "The generate configuration has 4 separate sections, each described below."
+msgid "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -1495,7 +1495,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1580,8 +1580,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -1647,8 +1648,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to "
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
@@ -1665,7 +1666,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
-"multiple Packages files to map onto a single Contents file (such as the "
+"multiple Packages files to map onto a single Contents file (as is the "
 "default)  then <command>apt-ftparchive</command> will integrate those "
 "package files together automatically."
 msgstr ""
@@ -1727,7 +1728,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 
@@ -1753,7 +1754,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib "
+"distribution; typically this is something like <literal>main contrib "
 "non-free</literal>"
 msgstr ""
 
@@ -1818,7 +1819,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1855,8 +1856,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -1893,7 +1894,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 
@@ -1906,8 +1907,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index 8b2021eb2..5bc89c14e 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1898,13 +1898,13 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
+"literal>.  It then writes to stdout a <filename>Release</filename> file containing an MD5, SHA1 "
 "and SHA256 digest for each file."
 msgstr ""
 "Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
@@ -1916,7 +1916,7 @@ msgstr ""
 "filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</"
 "literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, "
 "indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> "
-"aufgeführt werden. Dann schreibt er eine Release-Datei auf die "
+"aufgeführt werden. Dann schreibt er eine <filename>Release</filename>-Datei auf die "
 "Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme "
 "enthält."
 
@@ -1993,7 +1993,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 "Die generate-Konfiguration hat vier getrennte Abschnitte, jeder ist "
 "unterhalb beschrieben"
@@ -2035,7 +2035,7 @@ msgstr "gibt den Ort der Override-Dateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr "gibt den Ort der Zwischenspeicherdateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2145,11 +2145,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the <filename>Packages</filename> file or split "
+"out into a master <filename>Translation-en</filename> file."
 msgstr ""
-"gesetzt, falls lange Beschreibungen in die Package-Datei eingeschlossen "
-"werden oder in eine Translation-en-Hauptdatei unterteilt werden sollen"
+"gesetzt, falls lange Beschreibungen in die <filename>Package</filename>-Datei eingeschlossen "
+"werden oder in eine <filename>Translation-en</filename>-Hauptdatei unterteilt werden sollen"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
@@ -2235,7 +2235,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
+"Sets the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 "setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/Contents-"
@@ -2344,7 +2344,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 "Alle im <literal>TreeDefault</literal>-Abschnitt definierten Einstellungen "
@@ -2380,7 +2380,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 "Dies ist eine durch Leerzeichen getrennte Liste der Abschnitte, die unter "
@@ -2462,7 +2462,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr "setzt die Contents-Dateiausgabe (optional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2499,8 +2499,8 @@ msgstr "Die Programm-Override-Datei"
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package name, "
+"the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -2548,7 +2548,7 @@ msgstr "Die Quell-Override-Datei"
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 "Die Quell-Override-Datei ist vollständig kompatibel zu &dpkg-scansources;. "
@@ -2564,7 +2564,7 @@ msgstr "Die zusätzlich Override-Datei"
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
+"the output. It has three columns, the first is the package, the second is the "
 "tag and the remainder of the line is the new value."
 msgstr ""
 "Die zusätzlich Override-Datei erlaubt jeder beliebigen Markierung zur "
diff --git a/doc/po/es.po b/doc/po/es.po
index e76665e4d..6c93b3ee0 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -1946,13 +1946,13 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
+"literal>.  It then writes to stdout a <filename>Release</filename> file containing an MD5, SHA1 "
 "and SHA256 digest for each file."
 msgstr ""
 
@@ -2029,7 +2029,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 "La configuración de «generate» tiene cuatro secciones diferentes, que se "
 "describen a continuación."
@@ -2070,7 +2070,7 @@ msgstr "Define la ubicación de los ficheros alternativos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr "Define la ubicación de los ficheros de la caché."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2181,12 +2181,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the <filename>Packages</filename> file or split "
+"out into a master <filename>Translation-en</filename> file."
 msgstr ""
 "Define si se deben incluir las descripciones largas en el fichero "
-"«Packages», o si se deben separar, guardándolo en el fichero «Translation-"
-"en»."
+"«<filename>Packages</filename>», o si se deben separar, guardándolo en el fichero «<filename>Translation-"
+"en</filename>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
@@ -2273,7 +2273,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
+"Sets the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
@@ -2298,7 +2298,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 "Define el fichero «Contents» de salida. El valor predeterminado es <filename>"
@@ -2385,7 +2385,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 "Todos los valores definidos en la sección <literal>TreeDefault</literal> se "
@@ -2421,7 +2421,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 "Es una lista de secciones separadas por espacios que aparecen bajo la "
@@ -2503,7 +2503,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr "Define el fichero «Contents» de salida. (Opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2540,8 +2540,8 @@ msgstr "El fichero binario alternativo"
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package name, "
+"the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -2589,7 +2589,7 @@ msgstr "El fichero de fuentes alternativo"
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 "El fichero de fuentes alternativo es totalmente compatible con &dpkg-"
@@ -2605,7 +2605,7 @@ msgstr "El fichero alternativo adicional"
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
+"the output. It has three columns, the first is the package, the second is the "
 "tag and the remainder of the line is the new value."
 msgstr ""
 "El fichero alternativo adicional permite añadir o reemplazar en la salida "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index a8c8cba80..b32698c76 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 19:24+0300\n"
+"POT-Creation-Date: 2012-06-02 23:41+0300\n"
 "PO-Revision-Date: 2012-06-02 18:37+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1878,14 +1878,14 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
-"and SHA256 digest for each file."
+"literal>.  It then writes to stdout a <filename>Release</filename> file "
+"containing an MD5, SHA1 and SHA256 digest for each file."
 msgstr ""
 "La commande <literal>release</literal> crée un fichier Release à partir "
 "d'une arborescence. Elle recherche récursivement dans le répertoire indiqué "
@@ -1896,8 +1896,8 @@ msgstr ""
 "(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Des motifs "
 "supplémentaires pour les noms de fichiers peuvent être ajoutés en les "
 "mentionnant dans  <literal>APT::FTPArchive::Release::Patterns</literal>.  Le "
-"fichier Release est ensuite affiché et comporte des sommes de contrôle MD5, "
-"SHA1 et SHA256 pour chaque fichier."
+"fichier <filename>Release</filename> est ensuite affiché et comporte des "
+"sommes de contrôle MD5, SHA1 et SHA256 pour chaque fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:104
@@ -1969,7 +1969,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
 
@@ -2009,7 +2009,7 @@ msgstr "Indique l'emplacement des fichiers d'« override »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr "Indique l'emplacement des fichiers de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2119,11 +2119,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
 msgstr ""
 "Définit si les descriptions longues doivent être incluses dans le fichier "
-"Packages ou déplacées dans un fichier maître Translation-en."
+"<filename>Packages</filename> ou déplacées dans un fichier maître "
+"<filename>Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
@@ -2210,9 +2212,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename>"
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 "Définit le fichier maître Translation-en qui comporte les descriptions "
 "longues si elles ne sont pas incluses dans le fichier Packages. Valeur par "
@@ -2234,7 +2236,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 "Indique le fichier « Contents » créé. Par défaut, c'est <filename>$(DIST)/"
@@ -2314,9 +2316,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:354
+#, fuzzy
+#| msgid ""
+#| "All of the settings defined in the <literal>TreeDefault</literal> section "
+#| "can be use in a <literal>Tree</literal> section as well as three new "
+#| "variables."
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 "Tous les paramètres définis dans la section <literal>TreeDefault</literal> "
@@ -2352,7 +2359,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 "C'est une liste de sections séparées par des espaces qui appartiennent à une "
@@ -2434,7 +2441,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr "Définit le fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2471,8 +2478,8 @@ msgstr "Le fichier d'« Override » pour les binaires."
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -2520,7 +2527,7 @@ msgstr "Le fichier d'« Override » pour les sources"
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 "Le fichier d'« Override » est pleinement compatible avec &dpkg-scansources;. "
@@ -2536,8 +2543,8 @@ msgstr "Le fichier supplémentaire d'« Override »"
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
 msgstr ""
 "Le fichier supplémentaire d'« Override » permet d'ajouter ou de remplacer "
 "des étiquettes sur la sortie. Il possède trois colonnes : la première "
diff --git a/doc/po/it.po b/doc/po/it.po
index c7a5c0a72..438bfc0a2 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 19:24+0300\n"
+"POT-Creation-Date: 2012-06-02 23:41+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"
@@ -1382,14 +1382,14 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
-"and SHA256 digest for each file."
+"literal>.  It then writes to stdout a <filename>Release</filename> file "
+"containing an MD5, SHA1 and SHA256 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1441,7 +1441,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -1473,7 +1473,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1558,8 +1558,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -1625,9 +1626,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename>"
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1643,7 +1644,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 
@@ -1704,7 +1705,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 
@@ -1730,7 +1731,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 
@@ -1795,7 +1796,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1832,8 +1833,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -1870,7 +1871,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 
@@ -1883,8 +1884,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 2154f897e..cb2c02cd2 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 18:01+0300\n"
+"POT-Creation-Date: 2012-06-02 23:41+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"
@@ -1982,14 +1982,14 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
-"and SHA256 digest for each file."
+"literal>.  It then writes to stdout a <filename>Release</filename> file "
+"containing an MD5, SHA1 and SHA256 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2065,7 +2065,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 "generate 設定には 4 個の独立したセクションがあります。以下それぞれ説明しま"
 "す。"
@@ -2110,7 +2110,7 @@ msgstr "オーバーライドファイルの場所を指定します。"
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr "キャッシュファイルの場所を指定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2229,8 +2229,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -2323,9 +2324,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename>"
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2345,7 +2346,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 "Contents ファイルの出力先を設定します。デフォルトは、<filename>$(DIST)/"
@@ -2434,7 +2435,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 "<literal>TreeDefault</literal> セクションで定義される設定はすべて、3 個の新し"
@@ -2472,7 +2473,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、"
@@ -2564,7 +2565,7 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr "Contents ファイルの出力先を設定します。(オプション)"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2608,8 +2609,8 @@ msgstr "バイナリオーバーライドファイル"
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -2660,7 +2661,7 @@ msgstr "ソースオーバーライドファイル"
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 "ソースオーバーライドファイルは、&dpkg-scansources; と完全に互換性があります。"
@@ -2678,8 +2679,8 @@ msgstr "特別オーバーライドファイル"
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
 msgstr ""
 "特別オーバーライドファイルは、出力中に任意のタグを追加・置換できるようにしま"
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 42d43cad2..1e74f9d72 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 18:01+0300\n"
+"POT-Creation-Date: 2012-06-02 23:41+0300\n"
 "PO-Revision-Date: 2012-06-02 11:31+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1842,9 +1842,9 @@ msgid ""
 "template files and config scripts.  Configuration Item: <literal>APT::"
 "ExtractTemplates::TempDir</literal>"
 msgstr ""
-"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony <command>debconf</command> i "
-"pliki konfiguracyjne. Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"ExtractTemplates::TempDir</literal>."
+"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony "
+"<command>debconf</command> i pliki konfiguracyjne. Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::ExtractTemplates::TempDir</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><para>
@@ -1942,14 +1942,14 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
-"and SHA256 digest for each file."
+"literal>.  It then writes to stdout a <filename>Release</filename> file "
+"containing an MD5, SHA1 and SHA256 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2002,7 +2002,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -2036,7 +2036,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2123,8 +2123,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -2192,9 +2193,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename>"
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2210,7 +2211,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 
@@ -2273,7 +2274,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 
@@ -2303,7 +2304,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 
@@ -2370,7 +2371,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2408,8 +2409,8 @@ msgstr "Wprowadzenie"
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -2447,7 +2448,7 @@ msgstr "Wprowadzenie"
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 
@@ -2460,8 +2461,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2760,16 +2761,16 @@ msgstr ""
 "Po <literal>install</literal> musi występować nazwa jednego lub więcej "
 "pakietów przeznaczonych do zainstalowania. Każdy argument jest nazwą "
 "pakietu, a nie pełną nazwą pliku, w którym się znajduje (na przykład w "
-"systemie Debian, tym argumentem byłoby <package>apt-utils</package>, a nie <literal>apt-utils_&apt-product-version;_amd64."
-"deb</literal>). Wszystkie pakiety, które są potrzebne do zainstalowania "
-"żądanego pakietu (lub żądanych pakietów), będą także ściągnięte i "
-"zainstalowane. Plik <filename>/etc/apt/sources.list</filename> zawiera listę "
-"adresów, z których będą pobierane żądane pakiety. Jeżeli po nazwie pakietu "
-"pojawi się minus (bez spacji pomiędzy minusem a nazwą pakietu), to ten "
-"pakiet zostanie usunięty, o ile oczywiście jest zainstalowany. Podobnie znak "
-"plusa może być użyty w celu zainstalowania pakietu. Ta ostatnia właściwość "
-"może być użyta do nadpisania decyzji podjętych przez system rozwiązywania "
-"konfliktów programu apt-get."
+"systemie Debian, tym argumentem byłoby <package>apt-utils</package>, a nie "
+"<literal>apt-utils_&apt-product-version;_amd64.deb</literal>). Wszystkie "
+"pakiety, które są potrzebne do zainstalowania żądanego pakietu (lub żądanych "
+"pakietów), będą także ściągnięte i zainstalowane. Plik <filename>/etc/apt/"
+"sources.list</filename> zawiera listę adresów, z których będą pobierane "
+"żądane pakiety. Jeżeli po nazwie pakietu pojawi się minus (bez spacji "
+"pomiędzy minusem a nazwą pakietu), to ten pakiet zostanie usunięty, o ile "
+"oczywiście jest zainstalowany. Podobnie znak plusa może być użyty w celu "
+"zainstalowania pakietu. Ta ostatnia właściwość może być użyta do nadpisania "
+"decyzji podjętych przez system rozwiązywania konfliktów programu apt-get."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index a28095e54..454e796c6 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 18:01+0300\n"
+"POT-Creation-Date: 2012-06-02 23:41+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"
@@ -1902,14 +1902,14 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
-"and SHA256 digest for each file."
+"literal>.  It then writes to stdout a <filename>Release</filename> file "
+"containing an MD5, SHA1 and SHA256 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1984,7 +1984,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 "A configuração do generate tem 4 secções separadas, cada uma descrita mais "
 "abaixo."
@@ -2026,7 +2026,7 @@ msgstr "Especifica a localização dos ficheiros de sobrepor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr "Especifica a localização dos ficheiros de cache"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2138,11 +2138,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
 msgstr ""
-"Define se as descrições longas devem ser incluídas no ficheiro Packages ou "
-"divididas em um ficheiro Translation-en mestre."
+"Define se as descrições longas devem ser incluídas no ficheiro "
+"<filename>Packages</filename> ou divididas em um ficheiro "
+"<filename>Translation-en</filename> mestre."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
@@ -2230,9 +2232,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename>"
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 "Define se o ficheiro mestre Translation-en de saída com as descrições longas "
 "não deve ser incluído no ficheiro Packages. A predefinição é <filename>"
@@ -2254,7 +2256,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 "Define a saída do ficheiro Contents. A predefinição é <filename>$(DIST)/"
@@ -2341,7 +2343,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 "Todas as definições definidas na secção <literal>TreeDefault</literal> podem "
@@ -2377,7 +2379,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 "Isto é uma lista de secções separada por espaços que aparece sob a "
@@ -2461,7 +2463,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr "Define a saída do ficheiro Contents (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -2498,8 +2500,8 @@ msgstr "O Ficheiro Binary Override"
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -2547,7 +2549,7 @@ msgstr "O Ficheiro Source Override"
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 "O ficheiro de sobreposição de fonte é totalmente compatível com &dpkg-"
@@ -2563,8 +2565,8 @@ msgstr "O Ficheiro Extra Override"
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
 msgstr ""
 "O ficheiro de sobreposição extra permite que qualquer etiqueta arbitrária "
 "seja adicionada ou substituída na saída. Tem 3 colunas, a primeira é o "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 28af3e4f7..816b1ea1c 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 19:24+0300\n"
+"POT-Creation-Date: 2012-06-02 23:41+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"
@@ -1435,14 +1435,14 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
 "ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 "<command>lzma</command> as well as <filename>Release</filename> and "
 "<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
-"and SHA256 digest for each file."
+"literal>.  It then writes to stdout a <filename>Release</filename> file "
+"containing an MD5, SHA1 and SHA256 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1494,7 +1494,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
 msgid ""
-"The generate configuration has 4 separate sections, each described below."
+"The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -1527,7 +1527,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
+msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1613,8 +1613,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -1681,9 +1682,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename>"
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1699,7 +1700,7 @@ msgstr ""
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
 "command> will integrate those package files together automatically."
 msgstr ""
 
@@ -1761,7 +1762,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
+"can be used in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 
@@ -1787,7 +1788,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
+"distribution; typically this is something like <literal>main contrib non-"
 "free</literal>"
 msgstr ""
 
@@ -1853,7 +1854,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
+msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -1890,8 +1891,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
 "section to force that package to and the final field is the maintainer "
 "permutation field."
 msgstr ""
@@ -1928,7 +1929,7 @@ msgstr ""
 #: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
+"contains two fields separated by spaces. The first field is the source "
 "package name, the second is the section to assign it."
 msgstr ""
 
@@ -1941,8 +1942,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>