enforce a slightly more sensible default header

In 12f7536 I chose to opt for a slightly better text which avoids
assigning copyright to the FSF (not because it would be wrong to do it,
but is usually not what the contributor intended, but just the default.

xgettext has a --foreign flag for avoiding the copyright, but po4a
hasn't and an empty copyright-holder doesn't work either, so this little
rework of files with sed and cat.

Git-Dch: Ignore

1 files changed, 154 insertions, 113 deletions

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 6de20ab9c..1a88e4622 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-27 10:30+0100\n"
+"POT-Creation-Date: 2015-11-22 18:04+0100\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -766,7 +766,7 @@ msgstr ""
 #: apt.8.xml
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
-"&glob; or exact match. The requested action can be overidden for specific "
+"&glob; or exact match. The requested action can be overridden for specific "
 "packages by append a plus (+) to the package name to install this package or "
 "a minus (-) to remove it."
 msgstr ""
@@ -802,11 +802,11 @@ msgstr ""
 msgid ""
 "Removing a package removes all packaged data, but leaves usually small "
 "(modified) user configuration files behind, in case the remove was an "
-"accident. Just issuing an installtion request for the accidentally removed "
-"package will restore it funcation as before in that case. On the other hand "
-"you can get right of these leftovers via calling <command>purge</command> "
-"even on already removed packages.  Note that this does not effect any data "
-"or configuration stored in your home directory."
+"accident. Just issuing an installation request for the accidentally removed "
+"package will restore its function as before in that case. On the other hand "
+"you can get rid of these leftovers by calling <command>purge</command> even "
+"on already removed packages. Note that this does not affect any data or "
+"configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -829,11 +829,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"Try to ensure that the list does not include applications you have grown to "
-"like even through they there once installed just as a dependency of another "
+"You should check that the list does not include applications you have grown "
+"to like even though they were once installed just as a dependency of another "
 "package. You can mark such a package as manually installed by using &apt-"
 "mark;. Packages which you have installed explicitly via <command>install</"
-"command> are never proposed for automatic removal as well."
+"command> are also never proposed for automatic removal."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -847,7 +847,7 @@ msgstr "&apt-conf;"
 #: apt.8.xml
 msgid ""
 "<option>search</option> can be used to search for the given &regex; term(s) "
-"in the list of the available packages and display matches.  This can e.g. be "
+"in the list of available packages and display matches.  This can e.g. be "
 "useful if you are looking for packages having a specific feature.  If you "
 "are looking for a package including a specific file try &apt-file;."
 msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
 msgid ""
 "Show information about the given package(s) including its dependencies, "
 "installation and download size, sources the package is available from, the "
-"description of the packages content and many more. It can e.g. be helpful to "
+"description of the packages content and much more. It can e.g. be helpful to "
 "look at this information before allowing &apt; to remove a package or while "
 "searching for new packages to install."
 msgstr ""
@@ -904,7 +904,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage and Differences to other APT tools"
+msgid "Script Usage and Differences from Other APT Tools"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -917,9 +917,9 @@ msgstr ""
 #| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
 #| "using these commands in your scripts."
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change "
-"behaviour between versions. While it tries to not break backward "
-"compatibility there is no guarantee for it either if it seems benefitial for "
+"The &apt; commandline is designed as an end-user tool and it may change "
+"behavior between versions. While it tries not to break backward "
+"compatibility this is not guaranteed either if a change seems beneficial for "
 "interactive use."
 msgstr ""
 "A linha de comandos do &apt; foi desenhada como ferramenta de utilizador "
@@ -934,9 +934,10 @@ msgstr ""
 msgid ""
 "All features of &apt; are available in dedicated APT tools like &apt-get; "
 "and &apt-cache; as well.  &apt; just changes the default value of some "
-"options (see &apt-conf; and specifically the Binary scope). So prefer using "
-"these commands (potentially with some additional options enabled) in your "
-"scripts as they keep backward compatibility as much as possible."
+"options (see &apt-conf; and specifically the Binary scope). So you should "
+"prefer using these commands (potentially with some additional options "
+"enabled) in your scripts as they keep backward compatibility as much as "
+"possible."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2854,16 +2855,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> can be used as a unified front-end to set various "
-"settings for a package like marking a package as being automatically/"
-"manually installed or changing <command>dpkg</command> selections such as "
-"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
-"get dselect-upgrade</command> or <command>aptitude</command>."
+"<command>apt-mark</command> can be used as a unified front-end to set "
+"various settings for a package, such as marking a package as being "
+"automatically/manually installed or changing <command>dpkg</command> "
+"selections such as hold, install, deinstall and purge which are respected e."
+"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml
-msgid "Automatically and manually installed packages"
+msgid "Automatically and Manually Installed Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2879,8 +2881,8 @@ msgstr ""
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed, while package you installed explicitly is "
-"marked as manually installed.  Once a automatically installed package is no "
+"being automatically installed, while the package you installed explicitly is "
+"marked as manually installed.  Once an automatically installed package is no "
 "longer depended on by any manually installed package it is considered no "
 "longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
 "command> will at least suggest removing them."
@@ -2954,7 +2956,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml
-msgid "Prevent changes for a package"
+msgid "Prevent Changes for a Package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2992,15 +2994,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml
-msgid "Shedule packages for install, remove and purge"
+msgid "Schedule Packages for Install, Remove and Purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
 "Some front-ends like <command>apt-get dselect-upgrade</command> can be used "
-"to apply previously sheduled changes to the install state of packages. Such "
-"changes can be sheduled with the <option>install</option>, <option>remove</"
+"to apply previously scheduled changes to the install state of packages. Such "
+"changes can be scheduled with the <option>install</option>, <option>remove</"
 "option> (also known as <option>deinstall</option>) and <option>purge</"
 "option> commands.  Packages with a specific selection can be displayed with "
 "<option>showinstall</option>, <option>showremove</option> and "
@@ -3044,11 +3046,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If an archive doesn't have a signed Release file or no Release file at all "
-"current APT versions will raise a warning in <command>update</command> "
-"operations and front-ends like <command>apt-get</command> will require "
-"explicit confirmation if an installation request includes a package from "
-"such an unauthenticated archive."
+"If an archive has an unsigned Release file or no Release file at all current "
+"APT versions will raise a warning in <command>update</command> operations "
+"and front-ends like <command>apt-get</command> will require explicit "
+"confirmation if an installation request includes a package from such an "
+"unauthenticated archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3079,7 +3081,7 @@ msgstr ""
 #: apt-secure.8.xml
 #, fuzzy
 #| msgid "Trusted archives"
-msgid "Trusted repositories"
+msgid "Trusted Repositories"
 msgstr "Arquivos de confiança"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3131,10 +3133,10 @@ msgstr ""
 #| "Maintainers' keys are signed by other maintainers following pre-"
 #| "established procedures to ensure the identity of the key holder."
 msgid ""
-"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"The chain of trust in Debian starts (e.g.) when a maintainer uploads a new "
 "package or a new version of a package to the Debian archive. In order to "
 "become effective, this upload needs to be signed by a key contained in one "
-"of the Debian package maintainers keyrings (available in the debian-keyring "
+"of the Debian package maintainer keyrings (available in the debian-keyring "
 "package). Maintainers' keys are signed by other maintainers following pre-"
 "established procedures to ensure the identity of the key holder. Similar "
 "procedures exist in all Debian-based distributions."
@@ -3239,7 +3241,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "User configuration"
+#, fuzzy
+#| msgid "User configuration"
+msgid "User Configuration"
 msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3290,7 +3294,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Archive configuration"
+#, fuzzy
+#| msgid "Archive configuration"
+msgid "Archive Configuration"
 msgstr "Configuração de arquivos"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3332,7 +3338,7 @@ msgstr ""
 #| "will know what key they need to import in order to authenticate the files "
 #| "in the archive."
 msgid ""
-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, so that your users will "
 "know what key they need to import in order to authenticate the files in the "
 "archive. It is best to ship your key in its own keyring package like "
 "&keyring-distro; does with &keyring-package; to be able to distribute "
@@ -3350,7 +3356,7 @@ msgid ""
 "described above is broken.  How you can help users add your key depends on "
 "your archive and target audience ranging from having your keyring package "
 "included in another archive users already have configured (like the default "
-"repositories of their distribution) to leverage the web of trust."
+"repositories of their distribution) to leveraging the web of trust."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3386,8 +3392,8 @@ msgstr ""
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
-"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
-"(available also in the harden-doc package) and the <ulink url=\"http://www."
+"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
+"available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
@@ -7404,10 +7410,10 @@ msgstr "Lista das fontes de dados APT configuradas"
 #| "by <command>apt-get update</command> (or by an equivalent command from "
 #| "another APT front-end)."
 msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"The source list <filename>/etc/apt/sources.list</filename> and the files "
 "contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
 "support any number of active sources and a variety of source media. The "
-"files list one source per line (one line style) or contain multiline stanzas "
+"files list one source per line (one-line style) or contain multiline stanzas "
 "defining one or more sources per stanza (deb822 style), with the most "
 "preferred source listed first (in case a single version is available from "
 "more than one source). The information available from the configured sources "
@@ -7463,7 +7469,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
-msgid "one line style format"
+msgid "One-Line-Style Format"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7480,10 +7486,10 @@ msgid ""
 "(<literal>[]</literal>)  included in the line after the type separated from "
 "it with a space.  If an option allows multiple values these are separated "
 "from each other with a comma (<literal>,</literal>). An option name is "
-"separated from its value(s) by a equal sign (<literal>=</literal>). "
-"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
-"as separator which instead of replacing the default with the given value(s) "
-"modify the default value(s) to remove or include the given values."
+"separated from its value(s) by an equals sign (<literal>=</literal>). "
+"Multivalue options also have <literal>-=</literal> and <literal>+=</literal> "
+"as separators, which instead of replacing the default with the given "
+"value(s) modify the default value(s) to remove or include the given values."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7491,14 +7497,14 @@ msgstr ""
 msgid ""
 "This is the traditional format and supported by all apt versions.  Note that "
 "not all options as described below are supported by all apt versions.  Note "
-"also that some older applications parsing this format on its own might not "
+"also that some older applications parsing this format on their own might not "
 "expect to encounter options as they were uncommon before the introduction of "
 "multi-architecture support."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
-msgid "deb822 style format"
+msgid "deb822-Style Format"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7506,18 +7512,18 @@ msgstr ""
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
-"derivatives, like the metadata itself apt will download from the configured "
-"sources or the <filename>debian/control</filename> file in a Debian source "
-"package.  Individual entries are separated by an empty line, additional "
-"empty lines are ignored, and a <literal>#</literal> character at the start "
-"of the line marks the entire line as a comment. An entry can hence be "
-"disabled by commenting out each line belonging to the stanza, but it is "
+"derivatives, such as the metadata files that apt will download from the "
+"configured sources or the <filename>debian/control</filename> file in a "
+"Debian source package.  Individual entries are separated by an empty line; "
+"additional empty lines are ignored, and a <literal>#</literal> character at "
+"the start of the line marks the entire line as a comment. An entry can hence "
+"be disabled by commenting out each line belonging to the stanza, but it is "
 "usually easier to add the field \"Enabled: no\" to the stanza to disable the "
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
 "especially that multiple values are separated by spaces, not by commas as in "
-"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"the one-line format. Multivalue fields like <literal>Architectures</literal> "
 "also have <literal>Architectures-Add</literal> and <literal>Architectures-"
 "Remove</literal> to modify the default value rather than replacing it."
 msgstr ""
@@ -7527,13 +7533,13 @@ msgstr ""
 msgid ""
 "This is a new format supported by apt itself since version 1.1. Previous "
 "versions ignore such files with a notice message as described earlier.  It "
-"is intended to make this format gradually the default format and deprecating "
-"the previously described one line style format as it is easier to create, "
-"extend and modify by humans and machines alike especially if a lot of "
+"is intended to make this format gradually the default format, deprecating "
+"the previously described one-line-style format, as it is easier to create, "
+"extend and modify for humans and machines alike especially if a lot of "
 "sources and/or options are involved.  Developers who are working with and/or "
 "parsing apt sources are highly encouraged to add support for this format and "
 "to contact the APT team to coordinate and share this work. Users can freely "
-"adopt this format already, but could encounter problems with software not "
+"adopt this format already, but may encounter problems with software not "
 "supporting the format yet."
 msgstr ""
 
@@ -7541,7 +7547,7 @@ msgstr ""
 #: sources.list.5.xml
 #, fuzzy
 #| msgid "The deb and deb-src types"
-msgid "The deb and deb-src types: General Format"
+msgid "The deb and deb-src Types: General Format"
 msgstr "Os tipos deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7588,7 +7594,7 @@ msgstr ""
 #| "The format for a <filename>sources.list</filename> entry using the "
 #| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
 msgid ""
-"The format for two one line style entries using the <literal>deb</literal> "
+"The format for two one-line-style entries using the <literal>deb</literal> "
 "and <literal>deb-src</literal> types is:"
 msgstr ""
 "O formato para uma entrada na <filename>sources.list</filename> usando os "
@@ -7661,12 +7667,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+#| "literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
 "literal> or <literal>armel</literal>) used on the system. This permits "
 "architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
+"In general this is only of interest when specifying an exact path; "
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
@@ -7695,7 +7710,7 @@ msgstr ""
 #| "also parallelizes connections to different hosts to more effectively deal "
 #| "with sites with low bandwidth."
 msgid ""
-"Especially in the one line style format since only one distribution can be "
+"Especially in the one-line-style format since only one distribution can be "
 "specified per line it may be necessary to have multiple lines for the same "
 "URI, if a subset of all available distributions or components at that "
 "location is desired.  APT will sort the URI list after it has generated a "
@@ -7748,8 +7763,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"As an example, the sources for your distribution could look like this in one "
-"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"As an example, the sources for your distribution could look like this in one-"
+"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
 "this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 
@@ -7763,12 +7778,12 @@ msgstr "Os tipos deb e deb-src"
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Each source entry can have options specified modifying which and how the "
-"source is accessed and data acquired from it. Format, syntax and names of "
-"the options varies between the two formats one line and deb822 style as "
-"described, but they have both the same options available. For simplicity we "
-"list the deb822 fieldname and provide the one line name in brackets.  "
-"Remember that beside setting multivalue options explicitly, there is also "
+"Each source entry can have options specified to modify which source is "
+"accessed and how data is acquired from it. Format, syntax and names of the "
+"options vary between the one-line-style and deb822-style formats as "
+"described, but they both have the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one-line name in brackets.  "
+"Remember that besides setting multivalue options explicitly, there is also "
 "the option to modify them based on the default, but we aren't listing those "
 "names explicitly here. Unsupported options are silently ignored by all APT "
 "versions."
@@ -7797,13 +7812,25 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
 msgid ""
 "<option>Languages</option> (<option>lang</option>) is a multivalue option "
-"defining for which languages information like translated package "
+"defining for which languages information such as translated package "
 "descriptions should be downloaded.  If this option isn't set the default is "
 "all languages as defined by the <option>Acquire::Languages</option> config "
 "option."
 msgstr ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> pode ser usado para especificar para quais "
+"arquitecturas deve ser descarregada a informação. Se esta opção não estiver "
+"definida, serão descarregadas todas as arquitecturas definidas pela opção "
+"<literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -7811,7 +7838,7 @@ msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
 "not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope.  Aditionally, specific targets "
+"IndexTargets</option> configuration scope.  Additionally, specific targets "
 "can be enabled or disabled by using the identifier as field name instead of "
 "using this multivalue option."
 msgstr ""
@@ -7824,7 +7851,7 @@ msgid ""
 "downloading the new indexes entirely. The value of this option is ignored if "
 "the repository doesn't announce the availability of PDiffs.  Defaults to the "
 "value of the option with the same name for a specific index file defined in "
-"the <option>Acquire::IndexTargets</option> scope, which itself default to "
+"the <option>Acquire::IndexTargets</option> scope, which itself defaults to "
 "the value of configuration option <option>Acquire::PDiffs</option> which "
 "defaults to <literal>yes</literal>."
 msgstr ""
@@ -7832,23 +7859,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"<option>By-Hash</option> (<option>by-hash</option>)  can have the value \"yes"
-"\", \"no\" or \"force\" and controls if APT should try to acquire indexes "
-"via an URI constructed from a hashsum of the expected file instead of using "
-"the well-known stable filename of the index. Using this can avoid hashsum "
-"mismatches, but requires a supporting mirror. The value \"yes\"/\"no\" "
+"<option>By-Hash</option> (<option>by-hash</option>)  can have the value "
+"<literal>yes</literal>, <literal>no</literal> or <literal>force</literal> "
+"and controls if APT should try to acquire indexes via a URI constructed from "
+"a hashsum of the expected file instead of using the well-known stable "
+"filename of the index. Using this can avoid hashsum mismatches, but requires "
+"a supporting mirror. A <literal>yes</literal> or <literal>no</literal> value "
 "activates/disables the use of this feature if this source indicates support "
-"for it, while \"force\" will enable the feature regardless of what the "
-"source indicates.  Defaults to the value of the option of the same name for "
-"a specific index file defined in the <option>Acquire::IndexTargets</option> "
-"scope, which itself defaults to the value of configuration option "
+"for it, while <literal>force</literal> will enable the feature regardless of "
+"what the source indicates. Defaults to the value of the option of the same "
+"name for a specific index file defined in the <option>Acquire::IndexTargets</"
+"option> scope, which itself defaults to the value of configuration option "
 "<option>Acquire::By-Hash</option> which defaults to <literal>yes</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"Furthermore, there are options which if set affect <emphasis>all</emphasis> "
 "sources with the same URI and Suite, so they have to be set on all such "
 "entries and can not be varied between different components. APT will try to "
 "detect and error out on such anomalies."
@@ -7862,12 +7890,12 @@ msgid ""
 "warnings should be raised before e.g.  packages are installed from this "
 "source. This option can be used to override this decision either with the "
 "value <literal>yes</literal>, which lets APT consider this source always as "
-"a trusted source even if it has no or fails authentication checks by "
-"disabling parts of &apt-secure; and should therefore only be used in a local "
+"a trusted source, even if it lacks or fails authentication checks, by "
+"disabling parts of &apt-secure;. It should therefore only be used in a local "
 "and trusted context (if at all) as otherwise security is breached. The "
-"opposite can be achieved with the value no, which causes the source to be "
-"handled as untrusted even if the authentication checks passed successfully.  "
-"The default value can't be set explicitly."
+"opposite can be achieved with the value <literal>no</literal>, which causes "
+"the source to be handled as untrusted even if the authentication checks "
+"passed successfully.  The default value can't be set explicitly."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -7876,10 +7904,10 @@ msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
-"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"file) or a fingerprint of a key either in the <filename>trusted.gpg</"
 "filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
 "filename> directory (see <command>apt-key fingerprint</command>). If the "
-"option is set only the key(s) in this keyring or only the key with this "
+"option is set, only the key(s) in this keyring or only the key with this "
 "fingerprint is used for the &apt-secure; verification of this repository. "
 "Otherwise all keys in the trusted keyrings are considered valid signers for "
 "this repository."
@@ -7890,16 +7918,16 @@ msgstr ""
 msgid ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  is "
 "a yes/no value which controls if APT should try to detect replay attacks. A "
-"repository creator can declare until then the data provided in the "
-"repository should be considered valid and if this time is reached, but no "
-"new data is provided the data is considered expired and an error is raised.  "
-"Beside increasing security as a malicious attacker can't sent old data "
-"forever denying a user to be able to upgrade to a new version, this also "
-"helps users identify mirrors which are no longer updated. Some repositories "
-"like historic archives aren't updated anymore by design through, so this "
-"check can be disabled by setting this option to <literal>no</literal>.  "
-"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
-"Until</option> which itself defaults to <literal>yes</literal>."
+"repository creator can declare a time until which the data provided in the "
+"repository should be considered valid, and if this time is reached, but no "
+"new data is provided, the data is considered expired and an error is "
+"raised.  Besides increasing security, as a malicious attacker can't send old "
+"data forever to prevent a user from upgrading to a new version, this also "
+"helps users identify mirrors which are no longer updated. However, some "
+"repositories such as historic archives are not updated any more by design, "
+"so this check can be disabled by setting this option to <literal>no</"
+"literal>.  Defaults to the value of configuration option <option>Acquire::"
+"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -7920,7 +7948,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
-msgid "URI specification"
+#, fuzzy
+#| msgid "URI specification"
+msgid "URI Specification"
 msgstr "Especificação da URI"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -8095,7 +8125,9 @@ msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
-msgid "Source line for the above"
+#, fuzzy
+#| msgid "Source line for the above"
+msgid "Sources specification for the above."
 msgstr "Linha de fonte para o referido acima"
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -9057,11 +9089,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
-"this tree has a source archive."
+"this tree has a source archive.  The architecture 'all' signals that "
+"architecture specific files like <filename>Packages</filename> should not "
+"include information about architecture <literal>all</literal> packages in "
+"all files as they will be available in a dedicated file."
 msgstr ""
-"Isto é uma lista separada por espaços de todas as arquitecturas que aparecem "
-"sob a secção de buscas. A arquitectura especial 'source' é usada para "
-"indicar que esta árvore tem um arquivo fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -11017,6 +11049,15 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 #~ msgid ""
+#~ "This is a space separated list of all the architectures that appear under "
+#~ "search section. The special architecture 'source' is used to indicate "
+#~ "that this tree has a source archive."
+#~ msgstr ""
+#~ "Isto é uma lista separada por espaços de todas as arquitecturas que "
+#~ "aparecem sob a secção de buscas. A arquitectura especial 'source' é usada "
+#~ "para indicar que esta árvore tem um arquivo fonte."
+
+#~ msgid ""
 #~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
 #~ "for handling packages. It provides a commandline interface for the "
 #~ "package management of the system.  See also &apt-get; and &apt-cache; for "