Release 1.2

[apt.git] / doc / po / nl.po

diff --git a/doc/po/nl.po b/doc/po/nl.po
index 61ac20af7fbb24f905fc91ac7de652fa619a9d5a..243c27431aa272425297e8d4a82c585c64616635 100644 (file)
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.10.1-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.10.1-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2015-11-18 19:45+0100\n"
+"POT-Creation-Date: 2016-01-15 19:53+0100\n"

 "PO-Revision-Date: 2015-10-17 13:21+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "PO-Revision-Date: 2015-10-17 13:21+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"


@@ -706,7 +706,7 @@ msgid ""
 "Much like <command>apt</command> itself, its manpage is intended as an end "
 "user interface and as such only mentions the most used commands and options "
 "partly to not duplicate information in multiple places and partly to avoid "
 "Much like <command>apt</command> itself, its manpage is intended as an end "
 "user interface and as such only mentions the most used commands and options "
 "partly to not duplicate information in multiple places and partly to avoid "

-"overwelming readers with a cornucopia of options and details."
+"overwhelming readers with a cornucopia of options and details."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>


@@ -773,7 +773,7 @@ msgstr ""
 #: apt.8.xml
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 #: 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 ""
 "packages by append a plus (+) to the package name to install this package or "
 "a minus (-) to remove it."
 msgstr ""


@@ -792,10 +792,10 @@ msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals (=) and the version of the package "
 "to select. Alternatively the version from a specific release can be selected "
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals (=) and the version of the package "
 "to select. Alternatively the version from a specific release can be selected "

-"by following the package name with a forward slash (/) and codename (&stable-"
-"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
-"unstable). This will also select versions from this release for dependencies "
-"of this package if needed to satisfy the request."
+"by following the package name with a forward slash (/) and codename (&debian-"
+"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, "
+"testing, unstable). This will also select versions from this release for "
+"dependencies of this package if needed to satisfy the request."

 msgstr ""
 "Een specifieke versie van een pakket kiezen voor installatie kan door de "
 "pakketnaam te laten volgen door een gelijkheidsteken en de te selecteren "
 msgstr ""
 "Een specifieke versie van een pakket kiezen voor installatie kan door de "
 "pakketnaam te laten volgen door een gelijkheidsteken en de te selecteren "


@@ -810,11 +810,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 "
 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 accidently 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -837,11 +837,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 #. 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</"
 "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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>


@@ -855,7 +855,7 @@ msgstr "&apt-cache; &apt-conf;"
 #: apt.8.xml
 msgid ""
 "<option>search</option> can be used to search for the given &regex; term(s) "
 #: 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 ""
 "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 ""


@@ -865,7 +865,7 @@ msgstr ""
 msgid ""
 "Show information about the given package(s) including its dependencies, "
 "installation and download size, sources the package is available from, the "
 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 ""
 "look at this information before allowing &apt; to remove a package or while "
 "searching for new packages to install."
 msgstr ""


@@ -911,7 +911,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
 
 #. 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -924,9 +924,9 @@ msgstr ""
 #| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
 #| "using these commands in your scripts."
 msgid ""
 #| "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 ""
 "Het commandoregelprogramma &apt; werd ontworpen als een instrument voor de "
 "interactive use."
 msgstr ""
 "Het commandoregelprogramma &apt; werd ontworpen als een instrument voor de "


@@ -941,9 +941,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 "
 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>


@@ -996,8 +997,8 @@ msgstr ""
 "<command>apt-get</command> is het gereedschap voor de commandoregel voor het "
 "behandelen van pakketten. Het kan door de gebruiker beschouwd worden als "
 "zijn \"backend\" (het basisinstrument) voor andere gereedschappen die "
 "<command>apt-get</command> is het gereedschap voor de commandoregel voor het "
 "behandelen van pakketten. Het kan door de gebruiker beschouwd worden als "
 "zijn \"backend\" (het basisinstrument) voor andere gereedschappen die "

-"gebruik maken van de bibliotheek van APT. Er bestaan verschillende \"frontend"
-"\" interfaces, zoals &aptitude;, &synaptic; en &wajig;."
+"gebruik maken van de bibliotheek van APT. Er bestaan verschillende \"front-"
+"end\" interfaces, zoals &aptitude;, &synaptic; en &wajig;."

 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml


@@ -1099,7 +1100,7 @@ msgid ""
 "new packages)."
 msgstr ""
 "<literal>dselect-upgrade</literal> wordt gebruikt in combinatie met "
 "new packages)."
 msgstr ""
 "<literal>dselect-upgrade</literal> wordt gebruikt in combinatie met "

-"&dselect;, het traditionele frontend van Debian voor pakketbeheer. "
+"&dselect;, het traditionele front-end van Debian voor pakketbeheer. "

 "<literal>dselect-upgrade</literal> volgt de veranderingen op die &dselect; "
 "aanbrengt in het <literal>Status</literal>-veld van de beschikbare pakketten "
 "en voert de acties uit die nodig zijn om die status waar te maken "
 "<literal>dselect-upgrade</literal> volgt de veranderingen op die &dselect; "
 "aanbrengt in het <literal>Status</literal>-veld van de beschikbare pakketten "
 "en voert de acties uit die nodig zijn om die status waar te maken "


@@ -2912,16 +2913,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""

-"<command>apt-mark</command> can be used as a unified frontend 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
 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -2937,8 +2939,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 "
 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 explicitely 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."
 "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."


@@ -3015,7 +3017,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml
 
 #. 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -3054,15 +3056,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml
 
 #. 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 ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""

-"Some frontends 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</"
+"Some front-ends like <command>apt-get dselect-upgrade</command> can be used "
+"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 "
 "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 "


@@ -3107,11 +3109,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
 #. 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 frontends 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -3128,21 +3130,21 @@ msgstr ""
 #: apt-secure.8.xml
 #, fuzzy
 #| msgid ""
 #: apt-secure.8.xml
 #, fuzzy
 #| msgid ""

-#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "The package front-ends &apt-get;, &aptitude; and &synaptic; support this "

 #| "new authentication feature."
 msgid ""
 #| "new authentication feature."
 msgid ""

-"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"Note: All APT-based package management front-ends like &apt-get;, &aptitude; "

 "and &synaptic; support this authentication feature, so this manpage uses "
 "<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "and &synaptic; support this authentication feature, so this manpage uses "
 "<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""

-"De pakket-frontends &apt-get;, &aptitude; en &synaptic; ondersteunen deze "
+"De pakket-front-ends &apt-get;, &aptitude; en &synaptic; ondersteunen deze "

 "nieuwe authenticatiefunctionaliteit."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
 #, fuzzy
 #| msgid "Trusted archives"
 "nieuwe authenticatiefunctionaliteit."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
 #, fuzzy
 #| msgid "Trusted archives"

-msgid "Trusted repositories"
+msgid "Trusted Repositories"

 msgstr "Betrouwbare archieven"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "Betrouwbare archieven"
 
 #. type: Content of: <refentry><refsect1><para>


@@ -3195,10 +3197,10 @@ msgstr ""
 #| "Maintainers' keys are signed by other maintainers following pre-"
 #| "established procedures to ensure the identity of the key holder."
 msgid ""
 #| "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 "
 "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."
 "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."


@@ -3307,7 +3309,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml

-msgid "User configuration"
+#, fuzzy
+#| msgid "User configuration"
+msgid "User Configuration"

 msgstr "Configuratie op gebruikersniveau"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "Configuratie op gebruikersniveau"
 
 #. type: Content of: <refentry><refsect1><para>


@@ -3333,7 +3337,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""

-"Note that a default installation already contains all keys to securily "
+"Note that a default installation already contains all keys to securely "

 "acquire packages from the default repositories, so fiddling with "
 "<command>apt-key</command> is only needed if third-party repositories are "
 "added."
 "acquire packages from the default repositories, so fiddling with "
 "<command>apt-key</command> is only needed if third-party repositories are "
 "added."


@@ -3359,7 +3363,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml

-msgid "Archive configuration"
+#, fuzzy
+#| msgid "Archive configuration"
+msgid "Archive Configuration"

 msgstr "Configuratie op archiefniveau"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "Configuratie op archiefniveau"
 
 #. type: Content of: <refentry><refsect1><para>


@@ -3401,7 +3407,7 @@ msgstr ""
 #| "will know what key they need to import in order to authenticate the files "
 #| "in the archive."
 msgid ""
 #| "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 "
 "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 "


@@ -3415,11 +3421,11 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Provide instructions on how to add your archive and key</"
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Provide instructions on how to add your archive and key</"

-"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"emphasis>.  If your users can't acquire your key securely the chain of trust "

 "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 "
 "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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -3455,8 +3461,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 "
 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 ""
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""


@@ -4134,13 +4140,14 @@ msgstr ""
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "

-"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
-"'4.0', '5.0*'. See also &apt-preferences;."
+"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-"
+"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;."

 msgstr ""
 "De release waarvandaan pakketten standaard geïnstalleerd moeten worden als "
 "er meer dan een versie van beschikbaar is. Bevat releasenaam, codenaam of "
 msgstr ""
 "De release waarvandaan pakketten standaard geïnstalleerd moeten worden als "
 "er meer dan een versie van beschikbaar is. Bevat releasenaam, codenaam of "

-"releaseversie. Voorbeelden: 'stable', 'testing', 'unstable', '&stable-"
-"codename;', '&testing-codename;', '4.0', '5.0*'. Zie ook &apt-preferences;."
+"releaseversie. Voorbeelden: 'stable', 'testing', 'unstable', '&debian-stable-"
+"codename;', '&debian-testing-codename;', '4.0', '5.0*'. Zie ook &apt-"
+"preferences;."

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml


@@ -5131,11 +5138,11 @@ msgid ""
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "

-"normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
-"if the package is from a component (e.g. <literal>main</literal>)  this is "
-"the first part otherwise it is omitted, 2. the first letter of source "
-"package name, expect if the source package name starts with '<literal>lib</"
+"normal URI to a text file, except that package specific data is replaced "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
+"1. if the package is from a component (e.g. <literal>main</literal>)  this "
+"is the first part otherwise it is omitted, 2. the first letter of source "
+"package name, except if the source package name starts with '<literal>lib</"

 "literal>' in which case it will be the first four letters. 3. The complete "
 "source package name. 4. the complete name again and 5. the source version.  "
 "The first (if present), second, third and fourth part are separated by a "
 "literal>' in which case it will be the first four letters. 3. The complete "
 "source package name. 4. the complete name again and 5. the source version.  "
 "The first (if present), second, third and fourth part are separated by a "


@@ -5476,14 +5483,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""

-"Package action lines consist of five fields in Version 2: old version, "
-"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
-"no change), new version, action. The version fields are \"-\" for no version "
-"at all (for example when installing a package for the first time; no version "
-"is treated as earlier than any real version, so that is an upgrade, "
-"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
-"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
-"is being removed, or the filename of a .deb file if it is being unpacked."
+"Package action lines consist of five fields in Version 2: package name "
+"(without architecture qualification even if foreign), old version, direction "
+"of version change (&lt; for upgrades, &gt; for downgrades, = for no change), "
+"new version, action. The version fields are \"-\" for no version at all (for "
+"example when installing a package for the first time; no version is treated "
+"as earlier than any real version, so that is an upgrade, indicated as "
+"<literal>- &lt; 1.23.4</literal>). The action field is \"**CONFIGURE**\" if "
+"the package is being configured, \"**REMOVE**\" if it is being removed, or "
+"the filename of a .deb file if it is being unpacked."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -5491,9 +5499,9 @@ msgstr ""
 msgid ""
 "In Version 3 after each version field follows the architecture of this "
 "version, which is \"-\" if there is no version, and a field showing the "
 msgid ""
 "In Version 3 after each version field follows the architecture of this "
 "version, which is \"-\" if there is no version, and a field showing the "

-"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
-"\" is an incorrect typename which is just kept to remain compatible, it "
-"should be read as \"no\" and users are encouraged to support both."
+"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that "
+"\"none\" is an incorrect typename which is just kept to remain compatible, "
+"it should be read as \"no\" and users are encouraged to support both."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -5581,7 +5589,7 @@ msgstr ""
 "<emphasis>Deze opties worden daarom momenteel als experimenteel beschouwd en "
 "worden best niet in productieomgevingen gebruikt.</emphasis> Ook de "
 "voortgangsindicatie wordt erdoor ontregeld, met als gevolg dat die bij alle "
 "<emphasis>Deze opties worden daarom momenteel als experimenteel beschouwd en "
 "worden best niet in productieomgevingen gebruikt.</emphasis> Ook de "
 "voortgangsindicatie wordt erdoor ontregeld, met als gevolg dat die bij alle "

-"frontends momenteel ongeveer de helft van de tijd (of langer) op 100% "
+"front-ends momenteel ongeveer de helft van de tijd (of langer) op 100% "

 "voltooid blijft staan, terwijl ondertussen de configuratie van alle "
 "pakketten aan de gang is."
 
 "voltooid blijft staan, terwijl ondertussen de configuratie van alle "
 "pakketten aan de gang is."
 


@@ -6646,23 +6654,23 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "
 #: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "

-"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
-"</literal>\"."
+"belonging to any distribution whose Codename is \"<literal>&debian-testing-"
+"codename;</literal>\"."

 msgstr ""
 "De volgende structuur kent een hoge prioriteit toe aan alle pakketversies "
 "die behoren tot om het even welke distributie met de codenaam "
 msgstr ""
 "De volgende structuur kent een hoge prioriteit toe aan alle pakketversies "
 "die behoren tot om het even welke distributie met de codenaam "

-"\"<literal>&testing-codename;</literal>\"."
+"\"<literal>&debian-testing-codename;</literal>\"."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>


@@ -6670,23 +6678,24 @@ msgstr ""
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "

-"and whose release Version number is \"<literal>&stable-version;</literal>\"."
+"and whose release Version number is \"<literal>&debian-stable-version;</"
+"literal>\"."

 msgstr ""
 "De volgende structuur kent een hoge prioriteit toe aan alle pakketversies "
 "die behoren tot om het even welke uitgave die \"<literal>stable</literal>\" "
 msgstr ""
 "De volgende structuur kent een hoge prioriteit toe aan alle pakketversies "
 "die behoren tot om het even welke uitgave die \"<literal>stable</literal>\" "

-"als archiefnaam heeft en die \"<literal>&stable-version;</literal>\" als "
-"releaseversienummer heeft."
+"als archiefnaam heeft en die \"<literal>&debian-stable-version;</literal>\" "
+"als releaseversienummer heeft."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -6720,10 +6729,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml

-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: gnome* /kde/\n"
+#| "Pin: release n=experimental\n"
+#| "Pin-Priority: 500\n"

 msgid ""
 "Package: gnome* /kde/\n"
 msgid ""
 "Package: gnome* /kde/\n"

-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"

 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"


@@ -7046,17 +7059,17 @@ msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"

-"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent.  Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities:"
+"dists/&debian-stable-codename;/Release</filename>.  It consists of a single "
+"multi-line record which applies to <emphasis>all</emphasis> of the packages "
+"in the directory tree below its parent.  Unlike the <filename>Packages</"
+"filename> file, nearly all of the lines in a <filename>Release</filename> "
+"file are relevant for setting APT priorities:"

 msgstr ""
 "Het bestand <filename>Release</filename> bevindt zich normaal in de map "
 "<filename>.../dists/<replaceable>distributienaam</replaceable></filename>, "
 "bijvoorbeeld  <filename>.../dists/stable/Release</filename>, of "
 msgstr ""
 "Het bestand <filename>Release</filename> bevindt zich normaal in de map "
 "<filename>.../dists/<replaceable>distributienaam</replaceable></filename>, "
 "bijvoorbeeld  <filename>.../dists/stable/Release</filename>, of "

-"<filename>.../dists/&stable-codename;/Release</filename>. Het bevat een "
-"enkele structuur bestaande uit meerdere regels, die van toepassing is op "
+"<filename>.../dists/&debian-stable-codename;/Release</filename>. Het bevat "
+"een enkele structuur bestaande uit meerdere regels, die van toepassing is op "

 "<emphasis>alle</emphasis> pakketten uit de volledige mappenboom die zich "
 "onder diens bovenliggende map bevindt. In tegenstelling tot wat het geval is "
 "voor het bestand <filename>Packages</filename>, zijn praktisch alle regels "
 "<emphasis>alle</emphasis> pakketten uit de volledige mappenboom die zich "
 "onder diens bovenliggende map bevindt. In tegenstelling tot wat het geval is "
 "voor het bestand <filename>Packages</filename>, zijn praktisch alle regels "


@@ -7101,53 +7114,53 @@ msgstr "de regel <literal>Codename:</literal>"
 #: apt_preferences.5.xml
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 #: apt_preferences.5.xml
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "

-"For example, the line \"Codename: &testing-codename;\" specifies that all of "
-"the packages in the directory tree below the parent of the "
-"<filename>Release</filename> file belong to a version named "
-"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
-"preferences file would require the line:"
+"For example, the line \"Codename: &debian-testing-codename;\" specifies that "
+"all of the packages in the directory tree below the parent of the "
+"<filename>Release</filename> file belong to a version named <literal>&debian-"
+"testing-codename;</literal>.  Specifying this value in the APT preferences "
+"file would require the line:"

 msgstr ""
 "benoemt de codenaam waartoe alle pakketten in de mappenboom behoren. De "
 msgstr ""
 "benoemt de codenaam waartoe alle pakketten in de mappenboom behoren. De "

-"regel \"Codename: &testing-codename;\" geeft bijvoorbeeld aan dat alle "
-"pakketten uit de mappenboom die zich onder de bovenliggende map van het "
+"regel \"Codename: &debian-testing-codename;\" geeft bijvoorbeeld aan dat "
+"alle pakketten uit de mappenboom die zich onder de bovenliggende map van het "

 "<filename>Release</filename>-bestand bevindt, tot een versie behoren die de "
 "<filename>Release</filename>-bestand bevindt, tot een versie behoren die de "

-"naam <literal>&testing-codename;</literal> draagt. Om deze waarde op te "
-"geven in het APT-bestand preferences is de volgende regel nodig:"
+"naam <literal>&debian-testing-codename;</literal> draagt. Om deze waarde op "
+"te geven in het APT-bestand preferences is de volgende regel nodig:"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap

-msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release n=&testing-codename;\n"
+msgid "Pin: release n=&debian-testing-codename;\n"
+msgstr "Pin: release n=&debian-testing-codename;\n"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml
 msgid ""
 "names the release version.  For example, the packages in the tree might "

-"belong to Debian release version &stable-version;.  Note that there is "
-"normally no version number for the <literal>testing</literal> and "
+"belong to Debian release version &debian-stable-version;.  Note that there "
+"is normally no version number for the <literal>testing</literal> and "

 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "benoemt de releaseversie. De pakketten uit de boomstructuur zouden "
 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "benoemt de releaseversie. De pakketten uit de boomstructuur zouden "

-"bijvoorbeeld kunnen komen uit de Debian releaseversie &stable-version;. Merk "
-"op dat er normaal geen versienummer bestaat voor de distributies "
-"<literal>testing</literal> en <literal>unstable</literal> omdat ze nog niet "
-"uitgegeven werden.  Om dit op te geven in het APT-bestand preferences is een "
-"van de volgende regels nodig."
+"bijvoorbeeld kunnen komen uit de Debian releaseversie &debian-stable-"
+"version;. Merk op dat er normaal geen versienummer bestaat voor de "
+"distributies <literal>testing</literal> en <literal>unstable</literal> omdat "
+"ze nog niet uitgegeven werden.  Om dit op te geven in het APT-bestand "
+"preferences is een van de volgende regels nodig."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

 msgstr ""
 msgstr ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml


@@ -7456,9 +7469,9 @@ msgstr "De evolutie van een uitgave volgen aan de hand van zijn codenaam"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"

-"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"


@@ -7471,10 +7484,10 @@ msgid ""
 "Pin-Priority: -10\n"
 msgstr ""
 "Explanation: Installeer geen van Debian afkomstige pakketversies behalve \n"
 "Pin-Priority: -10\n"
 msgstr ""
 "Explanation: Installeer geen van Debian afkomstige pakketversies behalve \n"

-"Explanation: die uit de distributie met codenaam &testing-codename; of sid\n"
+"Explanation: die uit de distributie met codenaam &debian-testing-codename; of sid\n"

 "Explanation: of verwijder ze in het andere geval\n"
 "Package: *\n"
 "Explanation: of verwijder ze in het andere geval\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable heeft steeds de codenaam sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable heeft steeds de codenaam sid\n"


@@ -7517,14 +7530,14 @@ msgstr ""
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "

-"the release codenamed with <literal>&testing-codename;</literal>.  "
+"the release codenamed with <literal>&debian-testing-codename;</literal>.  "

 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Met een passend bestand &sources-list; en het bovenstaande preferences-"
 "bestand, zal elk van de volgende commando's APT ertoe aanzetten om op te "
 "waarderen naar de nieuwste versie(s) uit de release met de codenaam "
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Met een passend bestand &sources-list; en het bovenstaande preferences-"
 "bestand, zal elk van de volgende commando's APT ertoe aanzetten om op te "
 "waarderen naar de nieuwste versie(s) uit de release met de codenaam "

-"<literal>&testing-codename;</literal>.  <placeholder type=\"programlisting\" "
-"id=\"0\"/>"
+"<literal>&debian-testing-codename;</literal>.  <placeholder type="
+"\"programlisting\" id=\"0\"/>"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml


@@ -7538,19 +7551,19 @@ msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "

-"recent <literal>&testing-codename;</literal> version if that is more recent "
-"than the installed version, otherwise, to the most recent <literal>sid</"
-"literal> version if that is more recent than the installed version.  "
-"<placeholder type=\"programlisting\" id=\"0\"/>"
+"recent <literal>&debian-testing-codename;</literal> version if that is more "
+"recent than the installed version, otherwise, to the most recent "
+"<literal>sid</literal> version if that is more recent than the installed "
+"version.  <placeholder type=\"programlisting\" id=\"0\"/>"

 msgstr ""
 "Het volgende commando zal APT ertoe bewegen om het opgegeven pakket op te "
 "waarderen naar de nieuwste versie uit de distributie <literal>sid</literal>. "
 "Nadien zal de opdracht <command>apt-get upgrade</command> het pakket "
 msgstr ""
 "Het volgende commando zal APT ertoe bewegen om het opgegeven pakket op te "
 "waarderen naar de nieuwste versie uit de distributie <literal>sid</literal>. "
 "Nadien zal de opdracht <command>apt-get upgrade</command> het pakket "

-"opwaarderen naar de meest recente versie uit <literal>&testing-codename;</"
+"opwaarderen naar de meest recente versie uit <literal>&debian-testing-"
+"codename;</literal> indien dat een meer recente versie is dan die welke "
+"geïnstalleerd is of anders naar de meest recente versie uit <literal>sid</"

 "literal> indien dat een meer recente versie is dan die welke geïnstalleerd "
 "literal> indien dat een meer recente versie is dan die welke geïnstalleerd "

-"is of anders naar de meest recente versie uit <literal>sid</literal> indien "
-"dat een meer recente versie is dan die welke geïnstalleerd is. <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"is. <placeholder type=\"programlisting\" id=\"0\"/>"

 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml


@@ -7573,10 +7586,10 @@ msgstr "Lijst met geconfigureerde gegevensbronnen van APT"
 #| "by <command>apt-get update</command> (or by an equivalent command from "
 #| "another APT front-end)."
 msgid ""
 #| "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 "
 "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 "
 "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 "


@@ -7589,7 +7602,7 @@ msgstr ""
 "aparte regel vermeld, waarbij de meest wenselijke pakketbron eerst komt. De "
 "op deze geconfigureerde pakketbronnen beschikbare informatie wordt "
 "opgevraagd met <command>apt-get update</command> (of met een equivalent "
 "aparte regel vermeld, waarbij de meest wenselijke pakketbron eerst komt. De "
 "op deze geconfigureerde pakketbronnen beschikbare informatie wordt "
 "opgevraagd met <command>apt-get update</command> (of met een equivalent "

-"commando van een ander frontend voor APT)."
+"commando van een ander front-end voor APT)."

 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml


@@ -7634,7 +7647,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 
 #. 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -7651,10 +7664,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 "
 "(<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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -7662,14 +7675,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 "
 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
 "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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -7677,18 +7690,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 "
 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 "
 "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 ""
 "also have <literal>Architectures-Add</literal> and <literal>Architectures-"
 "Remove</literal> to modify the default value rather than replacing it."
 msgstr ""


@@ -7698,13 +7711,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 "
 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 "
 "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 ""
 
 "supporting the format yet."
 msgstr ""
 


@@ -7712,7 +7725,7 @@ msgstr ""
 #: sources.list.5.xml
 #, fuzzy
 #| msgid "The deb and deb-src types"
 #: 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 "De types deb en deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "De types deb en deb-src"
 
 #. type: Content of: <refentry><refsect1><para>


@@ -7723,9 +7736,9 @@ msgstr "De types deb en deb-src"
 #| "archive, <filename>distribution/component</filename>. The "
 #| "<literal>distribution</literal> is generally an archive name like "
 #| "<literal>stable</literal> or <literal>testing</literal> or a codename "
 #| "archive, <filename>distribution/component</filename>. The "
 #| "<literal>distribution</literal> is generally an archive name like "
 #| "<literal>stable</literal> or <literal>testing</literal> or a codename "

-#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-#| "literal> while component is one of <literal>main</literal>, "
-#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "like <literal>&debian-stable-codename;</literal> or <literal>&debian-"
+#| "testing-codename;</literal> while component is one of <literal>main</"
+#| "literal>, <literal>contrib</literal> or <literal>non-free</literal>. The "

 #| "<literal>deb-src</literal> type references a Debian distribution's source "
 #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 #| "src</literal> line is required to fetch source indexes."
 #| "<literal>deb-src</literal> type references a Debian distribution's source "
 #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 #| "src</literal> line is required to fetch source indexes."


@@ -7734,8 +7747,8 @@ msgid ""
 "archive, <filename>distribution/component</filename>. The "
 "<literal>distribution</literal> is generally a suite name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "archive, <filename>distribution/component</filename>. The "
 "<literal>distribution</literal> is generally a suite name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "

-"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal>, "
+"<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
+"codename;</literal> while component is one of <literal>main</literal>, "

 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "


@@ -7745,13 +7758,13 @@ msgstr ""
 "twee niveaus, <filename>distributie/component</filename>. De "
 "<literal>distributie</literal> is over het algemeen de naam van een archief "
 "zoals <literal>stable</literal> of <literal>testing</literal> of een "
 "twee niveaus, <filename>distributie/component</filename>. De "
 "<literal>distributie</literal> is over het algemeen de naam van een archief "
 "zoals <literal>stable</literal> of <literal>testing</literal> of een "

-"codenaam zoals <literal>&stable-codename;</literal> of <literal>&testing-"
-"codename;</literal>, terwijl component een van de volgende kan zijn: "
-"<literal>main</literal>, <literal>contrib</literal> of <literal>non-free</"
-"literal>. Het type <literal>deb-src</literal> verwijst onder dezelfde vorm "
-"als het type <literal>deb</literal> naar de broncode van een Debian "
-"distributie. Om bronnenindexen te kunnen ophalen is een <literal>deb-src</"
-"literal> regel noodzakelijk."
+"codenaam zoals <literal>&debian-stable-codename;</literal> of "
+"<literal>&debian-testing-codename;</literal>, terwijl component een van de "
+"volgende kan zijn: <literal>main</literal>, <literal>contrib</literal> of "
+"<literal>non-free</literal>. Het type <literal>deb-src</literal> verwijst "
+"onder dezelfde vorm als het type <literal>deb</literal> naar de broncode van "
+"een Debian distributie. Om bronnenindexen te kunnen ophalen is een "
+"<literal>deb-src</literal> regel noodzakelijk."

 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml


@@ -7760,7 +7773,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 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 ""
 "Het formaat van een item voor <filename>sources.list</filename>, waarbij de "
 "and <literal>deb-src</literal> types is:"
 msgstr ""
 "Het formaat van een item voor <filename>sources.list</filename>, waarbij de "


@@ -7835,12 +7848,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 
 #. 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. "
 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 ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""


@@ -7870,7 +7892,7 @@ msgstr ""
 #| "also parallelizes connections to different hosts to more effectively deal "
 #| "with sites with low bandwidth."
 msgid ""
 #| "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 "
 "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 "


@@ -7924,8 +7946,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
 #. 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 ""
 
 "this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 


@@ -7939,12 +7961,12 @@ msgstr "De types deb en deb-src"
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
 #. 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."
 "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."


@@ -7974,13 +7996,26 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 
 #. 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 "
 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 ""
 "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>architectuur1</replaceable>,"
+"<replaceable>architectuur2</replaceable>,…</literal> kan gebruikt worden om "
+"op te geven voor welke architecturen er informatie opgehaald moet worden. "
+"Indien deze optie niet gebruikt wordt, dan zal voor het ophalen rekening "
+"gehouden worden met alle architecturen die in de optie <literal>APT::"
+"Architectures</literal> opgegeven werden."

 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml


@@ -7988,7 +8023,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::"
 "<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 ""
 "can be enabled or disabled by using the identifier as field name instead of "
 "using this multivalue option."
 msgstr ""


@@ -8001,7 +8036,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 "
 "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 ""
 "the value of configuration option <option>Acquire::PDiffs</option> which "
 "defaults to <literal>yes</literal>."
 msgstr ""


@@ -8009,23 +8044,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
 #. 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 "
 "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 ""
 "<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."
 "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."


@@ -8037,14 +8073,14 @@ msgid ""
 "<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
 "which defaults to APT deciding if a source is considered trusted or if "
 "warnings should be raised before e.g.  packages are installed from this "
 "<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
 "which defaults to APT deciding if a source is considered trusted or if "
 "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 "
-"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."
+"source. This option can be used to override that decision. The value "
+"<literal>yes</literal> tells APT always to consider this source as trusted, "
+"even if it doesn't pass authentication checks. It disables parts of &apt-"
+"secure;, and should therefore only be used in a local and trusted context "
+"(if at all) as otherwise security is breached. The value <literal>no</"
+"literal> does the opposite, causing 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -8053,10 +8089,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 "
 "<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 "
 "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."
 "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."


@@ -8067,16 +8103,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 "
 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -8097,7 +8133,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml

-msgid "URI specification"
+#, fuzzy
+#| msgid "URI specification"
+msgid "URI Specification"

 msgstr "URI-specificatie"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "URI-specificatie"
 
 #. type: Content of: <refentry><refsect1><para>


@@ -8275,7 +8313,9 @@ msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 
 #. 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 "Regel voor de bronbestanden van het voorgaande"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgstr "Regel voor de bronbestanden van het voorgaande"
 
 #. type: Content of: <refentry><refsect1><literallayout>


@@ -8311,35 +8351,35 @@ msgstr ""
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""

-#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
-#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 msgid ""
 msgid ""

-"deb http://httpredir.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"

 msgstr ""
 msgstr ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""

-#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
-#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 msgid ""
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"
 msgid ""
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: main\n"
 "\n"
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""
 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml


@@ -8371,27 +8411,28 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 #: sources.list.5.xml
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 #: sources.list.5.xml
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "

-"directory, and uses only the &stable-codename;/contrib area."
+"directory, and uses only the &debian-stable-codename;/contrib area."

 msgstr ""
 "Gebruikt FTP om toegang te krijgen tot het archief op ftp.debian.org onder "
 msgstr ""
 "Gebruikt FTP om toegang te krijgen tot het archief op ftp.debian.org onder "

-"de map debian en gebruikt er enkel het gebied &stable-codename;/contrib."
+"de map debian en gebruikt er enkel het gebied &debian-stable-codename;/"
+"contrib."

 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap

-msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap

-#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"
 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: contrib"
 "Components: contrib"

-msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml


@@ -9198,13 +9239,13 @@ msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "

-"setting such as <filename>dists/&stable-codename;</filename>."
+"setting such as <filename>dists/&debian-stable-codename;</filename>."

 msgstr ""
 "De sectie <literal>Tree</literal> werkt met een bereiklabel dat de variabele "
 "<literal>$(DIST)</literal> instelt en de basis van de boomstructuur "
 "definieert (vooraan aan het pad wordt <literal>ArchiveDir</literal> "
 msgstr ""
 "De sectie <literal>Tree</literal> werkt met een bereiklabel dat de variabele "
 "<literal>$(DIST)</literal> instelt en de basis van de boomstructuur "
 "definieert (vooraan aan het pad wordt <literal>ArchiveDir</literal> "

-"toegevoegd). Doorgaans is dat een instelling zoals <filename>dists/&stable-"
-"codename;</filename>."
+"toegevoegd). Doorgaans is dat een instelling zoals <filename>dists/&debian-"
+"stable-codename;</filename>."

 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml


@@ -11119,7 +11160,7 @@ msgid ""
 msgstr ""
 "Het commando dist-upgrade kan door om het even welk ander standaard commando "
 "van APT vervangen worden, in het bijzonder dselect-upgrade. U kunt zelfs een "
 msgstr ""
 "Het commando dist-upgrade kan door om het even welk ander standaard commando "
 "van APT vervangen worden, in het bijzonder dselect-upgrade. U kunt zelfs een "

-"frontend voor APT gebruiken, zoals <emphasis>dselect</emphasis>. Dit stelt "
+"front-end voor APT gebruiken, zoals <emphasis>dselect</emphasis>. Dit stelt "

 "wel een probleem bij het opnieuw communiceren van de selecties naar "
 "'computer-in-kwestie'."
 
 "wel een probleem bij het opnieuw communiceren van de selecties naar "
 "'computer-in-kwestie'."
 


@@ -11575,12 +11616,16 @@ msgstr ""
 #~ msgstr "Enkele voorbeelden:"
 
 #~ msgid ""
 #~ msgstr "Enkele voorbeelden:"
 
 #~ msgid ""

-#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
+#~ "non-free\n"
+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"

 #~ "   "
 #~ msgstr ""
 #~ "   "
 #~ msgstr ""

-#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
+#~ "non-free\n"
+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"

 #~ "   "
 
 #~ msgid ""
 #~ "   "
 
 #~ msgid ""