Release 1.3~rc11.3_rc1

This commit looks heavy. Most of that comes from the fact that the
ordering of files in the translations changed with the switch to
CMake. I could have gone the extra mile to figure out the original
ordering and replicate it, but I have chosen to re-order everything
by file and line number, as that's easier.

12 files changed, 1313 insertions, 1678 deletions

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 5a34fbc34..c1bf31bda 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -239,7 +239,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.3~pre3+cmake2">
+<!ENTITY apt-product-version "1.3~rc1">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index cfc840ae9..6eebcc59a 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-06T00:00:00Z</date>
+   <date>2016-07-28T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index ae7866a3b..201227aaf 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.3~pre3+cmake2\n"
+"Project-Id-Version: apt-doc 1.3~rc1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1892,12 +1892,12 @@ msgstr ""
 msgid ""
 "Note that if usage of <command>apt-key</command> is desired the additional "
 "installation of the GNU Privacy Guard suite (packaged in "
-"<package>gnupg</package>) is required. For this reason alone the programmatic "
-"usage (especially in package maintainerscripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
+"<package>gnupg</package>) is required. For this reason alone the "
+"programmatic usage (especially in package maintainerscripts!) is strongly "
+"discouraged.  Further more the output format of all commands is undefined "
+"and can and does change whenever the underlying commands "
+"change. <command>apt-key</command> will try to detect such usage and "
+"generates warnings on stderr in these cases."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -3875,128 +3875,15 @@ msgid ""
 "default is to disable signing and produce all binaries."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:1
-msgid "dpkg trigger usage (and related options)"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:1
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:1
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:1
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is "
-"\"<literal>all</literal>\", which causes APT to configure all packages. The "
-"\"<literal>smart</literal>\" way is to configure only packages which need to "
-"be configured before another package can be unpacked (Pre-Depends), and let "
-"the rest be configured by &dpkg; with a call generated by the "
-"ConfigurePending option (see below). On the other hand, "
-"\"<literal>no</literal>\" will not configure anything, and totally relies on "
-"&dpkg; for configuration (which at the moment will fail if a Pre-Depends is "
-"encountered). Setting this option to any value other than "
-"<literal>all</literal> will implicitly also activate the next option by "
-"default, as otherwise the system could end in an unconfigured and "
-"potentially unbootable state."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""
 "If this option is set APT will call <command>dpkg --configure "
 "--pending</command> to let &dpkg; handle all required configurations and "
-"triggers. This option is activated automatically per default if the previous "
-"option is not set to <literal>all</literal>, but deactivating it could be "
+"triggers. This option is activated by default, but deactivating it could be "
 "useful if you want to run APT multiple times in a row - e.g. in an "
-"installer. In these sceneries you could deactivate this option in all but "
-"the last run."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this "
-"package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:1
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which may not be needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is rated "
-"higher).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with their "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"installer.  In this scenario you could deactivate this option in all but the "
+"last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
diff --git a/doc/po/de.po b/doc/po/de.po
index 461d3e13d..f4cacb321 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -5594,139 +5594,22 @@ msgstr ""
 "übermittelt. Standardmäßig wird das Signieren augeschaltet und alle "
 "Programme werden erstellt."
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"APT kann &dpkg; auf eine Art aufrufen, in der aggressiv Gebrauch von "
-"Triggern über mehrere &dpkg;-Aufrufe hinweg gemacht wird. Ohne weitere "
-"Optionen wird &dpkg; Trigger nur einmal bei jeder Ausführung benutzen. Diese "
-"Optionen zu aktivieren, kann daher die zum Installieren oder Upgrade "
-"benötigte Zeit verkürzen. Beachten Sie, dass geplant ist, diese Optionen in "
-"Zukunft standardmäßig zu aktivieren, aber da es die Art, wie APT &dpkg; "
-"aufruft, drastisch ändert, benötigt es noch viele weitere Tests. "
-"<emphasis>Diese Optionen sind daher aktuell noch experimentell und sollten "
-"nicht in produktiven Umgebungen benutzt werden.</emphasis> Außerdem "
-"unterbricht es die Fortschrittsanzeige, so dass alle Oberflächen derzeit die "
-"halbe (oder mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle "
-"Pakete konfiguriert werden."
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Beachten Sie, dass es nicht gewährleistet ist, dass APT diese Optionen "
-"unterstützen wird oder dass diese Optionen in der Zukunft keinen (großen) "
-"Ärger machen. Wenn Sie die allgemeinen Risiken und Probleme mit diesen "
-"Optionen verstanden haben, aber tapfer genug sind, sie testen zu helfen, "
-"erstellen Sie eine neue Konfigurationsdatei und testen Sie eine Kombination "
-"von Optionen. Bitte berichten Sie auf Englisch jegliche Fehler, Probleme und "
-"Verbesserungen, denen Sie begegnen und stellen Sie sicher, dass Sie alle von "
-"Ihnen benutzten Optionen in Ihren Berichten vermerken. Zum Zweck der "
-"Fehlersuche könnte es außerdem nützlich sein, &dpkg; um Hilfe zu fragen. "
-"Lesen Sie z.B. <command>dpkg --audit</command>. Eine defensive "
-"Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"fügt die keine-Trigger-Markierung zu allen &dpkg; Aufrufen hinzu "
-"(ausgenommen den ConfigurePending-Aufruf). Siehe &dpkg;, wenn Sie "
-"interessiert sind, was dies tatsächlich bedeutet. In Kürze: &dpkg; wird die "
-"Trigger nicht ausführen, dann ist diese Markierung vorhanden, außer sie wird "
-"explizit aufgerufen, um dies in einem gesonderten Aufruf zu tun. Beachten "
-"Sie, dass diese Option außerdem in älteren APT-Versionen mit einer "
-"geringfügig anderen Bedeutung existiert (nicht dokumentiert): Vorher hing "
-"diese Option nur --no-triggers an die Konfigurationsaufrufe für &dpkg; an – "
-"nun wird APT diese Markierung außerdem an die »unpack«- und »remove«-Aufrufe "
-"anhängen."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"Gültige Werte sind »<literal>all</literal>«, »<literal>smart</literal>« und "
-"»<literal>no</literal>«. Der Standardwert ist »<literal>all</literal>«, was  "
-"APT veranlasst, alle Pakete zu konfigurieren. Die Art von »<literal>smart</"
-"literal>« ist es, nur die Pakete zu konfigurieren, die konfiguriert werden "
-"müssen, bevor ein anderes Paket entpackt werden kann (Pre-Depends), und den "
-"Rest von &dpkg; mit einem Aufruf, der durch die Option ConfigurePending "
-"(siehe unten) generiert wurde, konfigurieren zu lassen. Im Gegensatz dazu "
-"wird »<literal>no</literal>« nichts konfigurieren und sich völlig auf die "
-"Konfiguration durch &dpkg; verlassen (was im Moment fehlschlägt, falls ein "
-"Pre-Depends vorkommt). Diese Option auf etwas anderes als <literal>all</"
-"literal> zu setzen, wird außerdem implizit standardmäßig die nächste Option "
-"aktivieren, da das System anderenfalls in einem nicht konfigurierten Status "
-"enden könnte und möglicherweise nicht mehr startbar ist."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 "Wenn diese Option gesetzt ist, wird APT <command>dpkg --configure --pending</"
 "command> aufrufen, um &dpkg; alle benötigten Konfigurationen und Trigger "
@@ -5737,64 +5620,6 @@ msgstr ""
 "könnten Sie diese Option außer in allen außer der letzten Ausführung "
 "deaktivieren."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"nützlich für <literal>smart</literal>-Konfiguration, da ein Paket mit "
-"ausstehenden Triggern nicht als <literal>installed</literal> angesehen wird "
-"und Dpkg es als aktuell entpackt betrachtet, was ein Hemmschuh für Pre-"
-"Dependencies ist (siehe Debian-Fehler #526774). Beachten Sie, dass dies alle "
-"Trigger ausführt, nicht nur die Trigger, die zum Konfigurieren dieses Pakets "
-"benötigt werden."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Essentielle Pakete (und ihre Abhängigkeiten) sollten sofort nach dem "
-"Entpacken konfiguriert werden. Es ist eine gute Idee, dies ziemlich früh im "
-"Upgrade-Prozess zu tun, da diese Konfigurationsaufrufe aktuell außerdem "
-"<literal>DPkg::TriggersPending</literal> benötigen, das eine Reihe von "
-"Triggern ausführt (die möglicherweise nicht gebraucht werden). Essentielle "
-"Pakete haben als Vorgabe eine hohe Bewertung, aber die Unmittelbarmarkierung "
-"ist relativ niedrig (ein Paket, das Pre-Depends hat, wird höher bewertet). "
-"Diese Option und die anderen in der gleichen Gruppe können benutzt werden, "
-"um die Bewertung zu ändern. Das folgende Beispiel zeigt die Einstellungen "
-"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Periodic and Archives options"
@@ -11334,6 +11159,175 @@ msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
+#~ msgid "dpkg trigger usage (and related options)"
+#~ msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "APT kann &dpkg; auf eine Art aufrufen, in der aggressiv Gebrauch von "
+#~ "Triggern über mehrere &dpkg;-Aufrufe hinweg gemacht wird. Ohne weitere "
+#~ "Optionen wird &dpkg; Trigger nur einmal bei jeder Ausführung benutzen. "
+#~ "Diese Optionen zu aktivieren, kann daher die zum Installieren oder "
+#~ "Upgrade benötigte Zeit verkürzen. Beachten Sie, dass geplant ist, diese "
+#~ "Optionen in Zukunft standardmäßig zu aktivieren, aber da es die Art, wie "
+#~ "APT &dpkg; aufruft, drastisch ändert, benötigt es noch viele weitere "
+#~ "Tests. <emphasis>Diese Optionen sind daher aktuell noch experimentell und "
+#~ "sollten nicht in produktiven Umgebungen benutzt werden.</emphasis> "
+#~ "Außerdem unterbricht es die Fortschrittsanzeige, so dass alle Oberflächen "
+#~ "derzeit die halbe (oder mehr) Zeit auf dem Status 100% stehen, während "
+#~ "tatsächlich alle Pakete konfiguriert werden."
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "Note that it is not guaranteed that APT will support these options or "
+#~ "that these options will not cause (big) trouble in the future. If you "
+#~ "have understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "Beachten Sie, dass es nicht gewährleistet ist, dass APT diese Optionen "
+#~ "unterstützen wird oder dass diese Optionen in der Zukunft keinen (großen) "
+#~ "Ärger machen. Wenn Sie die allgemeinen Risiken und Probleme mit diesen "
+#~ "Optionen verstanden haben, aber tapfer genug sind, sie testen zu helfen, "
+#~ "erstellen Sie eine neue Konfigurationsdatei und testen Sie eine "
+#~ "Kombination von Optionen. Bitte berichten Sie auf Englisch jegliche "
+#~ "Fehler, Probleme und Verbesserungen, denen Sie begegnen und stellen Sie "
+#~ "sicher, dass Sie alle von Ihnen benutzten Optionen in Ihren Berichten "
+#~ "vermerken. Zum Zweck der Fehlersuche könnte es außerdem nützlich sein, "
+#~ "&dpkg; um Hilfe zu fragen. Lesen Sie z.B. <command>dpkg --audit</"
+#~ "command>. Eine defensive Optionenkombination wäre <placeholder type="
+#~ "\"literallayout\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
+#~ "call).  See &dpkg; if you are interested in what this actually means. In "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "fügt die keine-Trigger-Markierung zu allen &dpkg; Aufrufen hinzu "
+#~ "(ausgenommen den ConfigurePending-Aufruf). Siehe &dpkg;, wenn Sie "
+#~ "interessiert sind, was dies tatsächlich bedeutet. In Kürze: &dpkg; wird "
+#~ "die Trigger nicht ausführen, dann ist diese Markierung vorhanden, außer "
+#~ "sie wird explizit aufgerufen, um dies in einem gesonderten Aufruf zu tun. "
+#~ "Beachten Sie, dass diese Option außerdem in älteren APT-Versionen mit "
+#~ "einer geringfügig anderen Bedeutung existiert (nicht dokumentiert): "
+#~ "Vorher hing diese Option nur --no-triggers an die Konfigurationsaufrufe "
+#~ "für &dpkg; an – nun wird APT diese Markierung außerdem an die »unpack«- "
+#~ "und »remove«-Aufrufe anhängen."
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "Gültige Werte sind »<literal>all</literal>«, »<literal>smart</literal>« "
+#~ "und »<literal>no</literal>«. Der Standardwert ist »<literal>all</"
+#~ "literal>«, was  APT veranlasst, alle Pakete zu konfigurieren. Die Art von "
+#~ "»<literal>smart</literal>« ist es, nur die Pakete zu konfigurieren, die "
+#~ "konfiguriert werden müssen, bevor ein anderes Paket entpackt werden kann "
+#~ "(Pre-Depends), und den Rest von &dpkg; mit einem Aufruf, der durch die "
+#~ "Option ConfigurePending (siehe unten) generiert wurde, konfigurieren zu "
+#~ "lassen. Im Gegensatz dazu wird »<literal>no</literal>« nichts "
+#~ "konfigurieren und sich völlig auf die Konfiguration durch &dpkg; "
+#~ "verlassen (was im Moment fehlschlägt, falls ein Pre-Depends vorkommt). "
+#~ "Diese Option auf etwas anderes als <literal>all</literal> zu setzen, wird "
+#~ "außerdem implizit standardmäßig die nächste Option aktivieren, da das "
+#~ "System anderenfalls in einem nicht konfigurierten Status enden könnte und "
+#~ "möglicherweise nicht mehr startbar ist."
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "nützlich für <literal>smart</literal>-Konfiguration, da ein Paket mit "
+#~ "ausstehenden Triggern nicht als <literal>installed</literal> angesehen "
+#~ "wird und Dpkg es als aktuell entpackt betrachtet, was ein Hemmschuh für "
+#~ "Pre-Dependencies ist (siehe Debian-Fehler #526774). Beachten Sie, dass "
+#~ "dies alle Trigger ausführt, nicht nur die Trigger, die zum Konfigurieren "
+#~ "dieses Pakets benötigt werden."
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "Essentielle Pakete (und ihre Abhängigkeiten) sollten sofort nach dem "
+#~ "Entpacken konfiguriert werden. Es ist eine gute Idee, dies ziemlich früh "
+#~ "im Upgrade-Prozess zu tun, da diese Konfigurationsaufrufe aktuell "
+#~ "außerdem <literal>DPkg::TriggersPending</literal> benötigen, das eine "
+#~ "Reihe von Triggern ausführt (die möglicherweise nicht gebraucht werden). "
+#~ "Essentielle Pakete haben als Vorgabe eine hohe Bewertung, aber die "
+#~ "Unmittelbarmarkierung ist relativ niedrig (ein Paket, das Pre-Depends "
+#~ "hat, wird höher bewertet). Diese Option und die anderen in der gleichen "
+#~ "Gruppe können benutzt werden, um die Bewertung zu ändern. Das folgende "
+#~ "Beispiel zeigt die Einstellungen mit ihren Vorgabewerten. <placeholder "
+#~ "type=\"literallayout\" id=\"0\"/>"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
 
diff --git a/doc/po/es.po b/doc/po/es.po
index 39c60fd63..325a8e50d 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -5626,138 +5626,22 @@ msgstr ""
 "el comportamiento predeterminado se limita a deshabilitar el firmado de "
 "paquetes y a producir todos los binarios."
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"APT puede invocar &dpkg; de forma que pueda hacer un uso agresivo de los "
-"disparadores («triggers») mediante varias invocaciones a &dpkg;. Sin no se "
-"definen más opciones, &dpkg; utilizará los disparadores una durante su "
-"ejecución. Si se activan estas opciones, se puede reducir el tiempo "
-"necesario para realizar la instalación o la actualización. Tenga en cuenta "
-"que está diseñado para que estas opciones se activen de forma predeterminada "
-"en un futuro, pero debido a los cambios drásticos en la manera en que APT "
-"invoca a &dpkg;, necesita más pruebas. <emphasis>Actualmente, estas opciones "
-"son experimentales, y no se deberían usar en entornos de producción.</"
-"emphasis> También provoca un fallo en el informe de progreso, con lo que "
-"todas las interfaces muestran un progreso del 100% durante la mitad del "
-"tiempo (o más) durante la configuración de todos los paquetes."
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Tenga en cuenta que no se garantiza que APT permitirá usar estas opciones o "
-"que estas opciones no causen un (gran) problema en el futuro. Si ha "
-"entendido los riesgos y los problemas actuales con estas opciones pero es lo "
-"suficientemente valiente para ayudar a probarlas, cree un nuevo fichero de "
-"configuración y pruebe una combinación de las opciones. Por favor, informe "
-"de cualquier error, problema o mejora que encuentre y asegúrese de apuntar "
-"en sus informes qué opciones ha usado. Pedir ayuda a &dpkg; también puede "
-"ser útil por motivos de depuración, véase por ejemplo: <command>dpkg --"
-"audit</command>. Una combinación de opciones defensivas sería <placeholder "
-"type=\"literallayout\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"Añade a todas las invocaciones a &dpkg; la opción sin disparadores («no "
-"triggers»), excepto a la invocación a «ConfigurePending». Consulte &dpkg; si "
-"está interesado en saber qué significa esto. De forma breve: &dpkg; no "
-"ejecuta los disparadores cuando está opción está presente a menos que se "
-"ejecute explícitamente con una invocación adicional. Tenga en cuenta que "
-"esta opción también existe en versiones antiguas de APT (aunque sin "
-"documentar) con un significado diferente. Anteriormente sólo se añadía la "
-"opción «--no-triggers» a las invocaciones de la configuración para &dpkg;, "
-"ahora APT también añade esta opción a las invocaciones de desempaquetado y "
-"eliminación."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"Los valores válidos son «<literal>all</literal>»,  «<literal>smart</"
-"literal>» y «<literal>no</literal>».  El valor predeterminado es "
-"«<literal>all</literal>», que hace que APT configure todos los paquetes. El "
-"valor «<literal>smart</literal>» sólo configura los paquetes que requieren "
-"ser configurados antes de que se desempaquete otro paquete (predependencia) "
-"y permite que &dpkg; configure los restantes con una invocación generada por "
-"la opción «ConfigurePending» (más abajo). El valor «<literal>no</literal>» "
-"no configura nada y depende por completo de &dpkg; para la configuración "
-"(que fallará si se encuentra una pre-dependencia). Si se define esta opción "
-"con un valor distinto a «<literal>all</literal>» activa implícitamente la "
-"siguiente opción de forma predeterminada, ya que de otro modo el sistema "
-"podría terminar en un estado mal configurado qué podría derivar en la "
-"imposibilidad de arrancar el sistema. "
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 "Si define esta opción, APT ejecutará <command>dpkg --configure --pending</"
 "command> para permitir a dpkg manejar todas las configuraciones necesarias y "
@@ -5767,65 +5651,6 @@ msgstr ""
 "veces seguidas, por ejemplo: en un instalador. En estas situaciones podría "
 "desactivar esta opción en todas las ejecuciones menos la última."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"Útil para una configuración <literal>smart</literal> en la que un paquete "
-"que tiene disparadores pendientes no se considera como <literal>instalado</"
-"literal> y que dpkg lo trata como <literal>desempaquetado</literal>, lo cual "
-"entra en conflicto con el sistema de pre-dependencias (véase debbugs "
-"#526774). Tenga en cuenta que esto procesará todos los disparadores, no sólo "
-"los disparadores necesarios para configurar este paquete."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Los paquetes esenciales (y sus dependencias) se deberían configurar "
-"inmediatamente después de desempaquetarlos. Se recomienda realizarlo lo más "
-"pronto posible en el proceso de actualización ya que actualmente estas "
-"invocaciones de configuración también necesitan <literal>DPkg::"
-"TriggersPending</literal>, que ejecuta varios disparadores (que puede que no "
-"sean necesarios). Los esenciales tienen, de forma predeterminada, una "
-"puntuación alta pero la opción inmediata es relativamente baja (un paquete "
-"que tenga pre-dependencias tiene una puntuación más alta). Puede cambiar la "
-"puntuación mediante esta opción y las otras del mismo grupo. El siguiente "
-"ejemplo muestra la configuración con los valores predeterminados. "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Periodic and Archives options"
@@ -11294,6 +11119,175 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
+#~ msgid "dpkg trigger usage (and related options)"
+#~ msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "APT puede invocar &dpkg; de forma que pueda hacer un uso agresivo de los "
+#~ "disparadores («triggers») mediante varias invocaciones a &dpkg;. Sin no "
+#~ "se definen más opciones, &dpkg; utilizará los disparadores una durante su "
+#~ "ejecución. Si se activan estas opciones, se puede reducir el tiempo "
+#~ "necesario para realizar la instalación o la actualización. Tenga en "
+#~ "cuenta que está diseñado para que estas opciones se activen de forma "
+#~ "predeterminada en un futuro, pero debido a los cambios drásticos en la "
+#~ "manera en que APT invoca a &dpkg;, necesita más pruebas. "
+#~ "<emphasis>Actualmente, estas opciones son experimentales, y no se "
+#~ "deberían usar en entornos de producción.</emphasis> También provoca un "
+#~ "fallo en el informe de progreso, con lo que todas las interfaces muestran "
+#~ "un progreso del 100% durante la mitad del tiempo (o más) durante la "
+#~ "configuración de todos los paquetes."
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "Note that it is not guaranteed that APT will support these options or "
+#~ "that these options will not cause (big) trouble in the future. If you "
+#~ "have understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "Tenga en cuenta que no se garantiza que APT permitirá usar estas opciones "
+#~ "o que estas opciones no causen un (gran) problema en el futuro. Si ha "
+#~ "entendido los riesgos y los problemas actuales con estas opciones pero es "
+#~ "lo suficientemente valiente para ayudar a probarlas, cree un nuevo "
+#~ "fichero de configuración y pruebe una combinación de las opciones. Por "
+#~ "favor, informe de cualquier error, problema o mejora que encuentre y "
+#~ "asegúrese de apuntar en sus informes qué opciones ha usado. Pedir ayuda a "
+#~ "&dpkg; también puede ser útil por motivos de depuración, véase por "
+#~ "ejemplo: <command>dpkg --audit</command>. Una combinación de opciones "
+#~ "defensivas sería <placeholder type=\"literallayout\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
+#~ "call).  See &dpkg; if you are interested in what this actually means. In "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "Añade a todas las invocaciones a &dpkg; la opción sin disparadores («no "
+#~ "triggers»), excepto a la invocación a «ConfigurePending». Consulte &dpkg; "
+#~ "si está interesado en saber qué significa esto. De forma breve: &dpkg; no "
+#~ "ejecuta los disparadores cuando está opción está presente a menos que se "
+#~ "ejecute explícitamente con una invocación adicional. Tenga en cuenta que "
+#~ "esta opción también existe en versiones antiguas de APT (aunque sin "
+#~ "documentar) con un significado diferente. Anteriormente sólo se añadía la "
+#~ "opción «--no-triggers» a las invocaciones de la configuración para "
+#~ "&dpkg;, ahora APT también añade esta opción a las invocaciones de "
+#~ "desempaquetado y eliminación."
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "Los valores válidos son «<literal>all</literal>»,  «<literal>smart</"
+#~ "literal>» y «<literal>no</literal>».  El valor predeterminado es "
+#~ "«<literal>all</literal>», que hace que APT configure todos los paquetes. "
+#~ "El valor «<literal>smart</literal>» sólo configura los paquetes que "
+#~ "requieren ser configurados antes de que se desempaquete otro paquete "
+#~ "(predependencia) y permite que &dpkg; configure los restantes con una "
+#~ "invocación generada por la opción «ConfigurePending» (más abajo). El "
+#~ "valor «<literal>no</literal>» no configura nada y depende por completo de "
+#~ "&dpkg; para la configuración (que fallará si se encuentra una pre-"
+#~ "dependencia). Si se define esta opción con un valor distinto a "
+#~ "«<literal>all</literal>» activa implícitamente la siguiente opción de "
+#~ "forma predeterminada, ya que de otro modo el sistema podría terminar en "
+#~ "un estado mal configurado qué podría derivar en la imposibilidad de "
+#~ "arrancar el sistema. "
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "Útil para una configuración <literal>smart</literal> en la que un paquete "
+#~ "que tiene disparadores pendientes no se considera como "
+#~ "<literal>instalado</literal> y que dpkg lo trata como "
+#~ "<literal>desempaquetado</literal>, lo cual entra en conflicto con el "
+#~ "sistema de pre-dependencias (véase debbugs #526774). Tenga en cuenta que "
+#~ "esto procesará todos los disparadores, no sólo los disparadores "
+#~ "necesarios para configurar este paquete."
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "Los paquetes esenciales (y sus dependencias) se deberían configurar "
+#~ "inmediatamente después de desempaquetarlos. Se recomienda realizarlo lo "
+#~ "más pronto posible en el proceso de actualización ya que actualmente "
+#~ "estas invocaciones de configuración también necesitan <literal>DPkg::"
+#~ "TriggersPending</literal>, que ejecuta varios disparadores (que puede que "
+#~ "no sean necesarios). Los esenciales tienen, de forma predeterminada, una "
+#~ "puntuación alta pero la opción inmediata es relativamente baja (un "
+#~ "paquete que tenga pre-dependencias tiene una puntuación más alta). Puede "
+#~ "cambiar la puntuación mediante esta opción y las otras del mismo grupo. "
+#~ "El siguiente ejemplo muestra la configuración con los valores "
+#~ "predeterminados. <placeholder type=\"literallayout\" id=\"0\"/>"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Lista las huellas digitales de las claves de confianza."
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index db1610a17..5beac6101 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -5586,140 +5586,22 @@ msgstr ""
 "paquets ; par défaut la signature est désactivée et tous les binaires sont "
 "créés."
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr ""
-"utilisation des actions différées (« triggers ») de dpkg (et options "
-"associées)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"APT peut lancer &dpkg; pour utiliser les actions différées de manière "
-"agressive entre les appels successifs à &dpkg;. Sans options "
-"supplémentaires, &dpkg; utilisera les actions différées une fois à chacune "
-"de ses exécutions. Si ces options sont utilisées, le temps d'exécution peut "
-"diminuer fortement dans les actions d'installation ou de mise à jour. Il est "
-"prévu de les activer par défaut dans le futur mais étant donné qu'elles "
-"changent notablement la méthode qu'utilise APT pour lancer &dpkg;, elles ont "
-"besoin d'importantes validations. <emphasis>Ces options sont donc "
-"expérimentales et ne devraient pas être utilisées avec des environnements de "
-"production.</emphasis>. Elles modifient également le suivi de progression et "
-"toutes les interfaces passeront la moitié du temps à un état terminé à 100% "
-"pendant la configuration des paquets."
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Veuillez noter que rien ne garantit qu'APT gérera encore ces options dans le "
-"futur ou qu'elles ne provoqueront pas de nombreux dégâts. Si vous avez bien "
-"compris les implications de ce choix et êtes suffisamment motivé(e) pour "
-"essayer ces options, il vous est donc possible de créer un nouveau fichier "
-"de configuration et essayer une combinaison de ces options. Veuillez "
-"signaler tout bogue, problèmes ou suggestions d'amélioration en prenant soin "
-"de mentionner les options utilisées. Utiliser l'aide apportée par &dpkg; "
-"peut également être utile pour le débogage, par exemple <command>dpkg --"
-"audit</command>. Une combinaison intéressante d'options pourrait être "
-"<placeholder type=\"literallayout\" id=\"0\"/>."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"Ajoute l'option « no-triggers » à tous les appels à &dpkg; (hormis l'appel "
-"« ConfigurePending »). Voir &dpkg; pour plus d'informations sur la "
-"signification de cette option. En résumé, &dpkg; n'effectuera pas les "
-"actions différées (« triggers ») si cette option est utilisée sauf si cela "
-"est demandé explicitement dans une invocation supplémentaire. Cette option "
-"existe en fait déjà (mais n'est pas documentée) dans de plus anciennes "
-"version d'APT avec une signification légèrement différente : elle n'ajoutait "
-"l'option « --no-triggers » qu'aux appels de &dpkg; avec « configure » alors "
-"que cela sera désormais utilisé également avec les appels à &dpkg; avec les "
-"options « unpack » et « remove »."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"Les valeurs possibles sont « <literal>all</literal> », « <literal>smart</"
-"literal> » et « <literal>no</literal> ». La valeur par défaut est "
-"« <literal>all</literal> » où APT configure tous les paquets. La valeur "
-"« <literal>smart</literal> » permet de ne configurer que les paquets qui ont "
-"besoin de l'être avant la décompaction d'un autre paquet (à cause d'une pré-"
-"dépendance) ; les autres configurations sont laissées pour un appel "
-"ultérieur à &dpkg; via un appel créé par l'option ConfigurePending (voir "
-"plus loin). L'option « <literal>no</literal> » ne provoquera aucune "
-"configuration et s'en remettra totalement à &dpkg; pour ces opérations (ce "
-"qui échouera en cas de pré-dépendances). Si cette option est définie sur une "
-"valeur différente de « <literal>all</literal> », l'option suivante sera "
-"activée par défaut pour éviter de placer le système dans un état non "
-"configuré et donc éventuellement non amorçable."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 "Si cette option est choisie, APT lancera <command>dpkg --configure --"
 "pending</command> pour laisser &dpkg; gérer les configurations de paquets et "
@@ -5730,68 +5612,6 @@ msgstr ""
 "d'installation. Dans ce cas, seul le dernier de tous les appels successifs "
 "peut conserver l'option active."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"Cette option est utile pour la configuration en mode « <literal>smart</"
-"literal> ». En effet, un paquet qui a des actions différées (« triggers ») "
-"en attente n'est pas considéré comme installé (état « <literal>installed</"
-"literal> ») et &dpkg; le considère actuellement comme simplement décompacté "
-"(état « <literal>unpacked</literal> ») ce qui empêche une gestion correcte "
-"des pré-dépendances (voir le bogue Debian #526774). Veuillez noter que cette "
-"option provoquera la gestion de toutes les actions différées, pas seulement "
-"celles concernant le paquet en cours de traitement."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Les paquets essentiels (et leurs dépendances) devraient être configurés "
-"après avoir été décompressés. Il est conseillé que cette opération ait lieu "
-"le plus tôt possible dans le processus de mise à jour car ces opérations de "
-"configuration nécessitent également <literal>DPkg::TriggersPending</"
-"literal>, ce qui peut conduire à l'exécution de certains actions différées "
-"qui ne sont pas nécessairement utiles. Les paquets essentiels obtiennent par "
-"défaut un score élevé mais le marqueur « immédiat » implique un score assez "
-"bas (par exemple un paquet qui comporte des prédépendances obtient un score "
-"plus élevé). Cette option et les options du même groupe permettent de "
-"modifier la façon d'attribuer un score. L'exemple ci-dessous indique ces "
-"réglages avec leurs valeurs par défaut. <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Periodic and Archives options"
@@ -11294,6 +11114,178 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid "dpkg trigger usage (and related options)"
+#~ msgstr ""
+#~ "utilisation des actions différées (« triggers ») de dpkg (et options "
+#~ "associées)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "APT peut lancer &dpkg; pour utiliser les actions différées de manière "
+#~ "agressive entre les appels successifs à &dpkg;. Sans options "
+#~ "supplémentaires, &dpkg; utilisera les actions différées une fois à "
+#~ "chacune de ses exécutions. Si ces options sont utilisées, le temps "
+#~ "d'exécution peut diminuer fortement dans les actions d'installation ou de "
+#~ "mise à jour. Il est prévu de les activer par défaut dans le futur mais "
+#~ "étant donné qu'elles changent notablement la méthode qu'utilise APT pour "
+#~ "lancer &dpkg;, elles ont besoin d'importantes validations. <emphasis>Ces "
+#~ "options sont donc expérimentales et ne devraient pas être utilisées avec "
+#~ "des environnements de production.</emphasis>. Elles modifient également "
+#~ "le suivi de progression et toutes les interfaces passeront la moitié du "
+#~ "temps à un état terminé à 100% pendant la configuration des paquets."
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "Note that it is not guaranteed that APT will support these options or "
+#~ "that these options will not cause (big) trouble in the future. If you "
+#~ "have understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "Veuillez noter que rien ne garantit qu'APT gérera encore ces options dans "
+#~ "le futur ou qu'elles ne provoqueront pas de nombreux dégâts. Si vous avez "
+#~ "bien compris les implications de ce choix et êtes suffisamment motivé(e) "
+#~ "pour essayer ces options, il vous est donc possible de créer un nouveau "
+#~ "fichier de configuration et essayer une combinaison de ces options. "
+#~ "Veuillez signaler tout bogue, problèmes ou suggestions d'amélioration en "
+#~ "prenant soin de mentionner les options utilisées. Utiliser l'aide "
+#~ "apportée par &dpkg; peut également être utile pour le débogage, par "
+#~ "exemple <command>dpkg --audit</command>. Une combinaison intéressante "
+#~ "d'options pourrait être <placeholder type=\"literallayout\" id=\"0\"/>."
+
+#~ msgid ""
+#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
+#~ "call).  See &dpkg; if you are interested in what this actually means. In "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "Ajoute l'option « no-triggers » à tous les appels à &dpkg; (hormis "
+#~ "l'appel « ConfigurePending »). Voir &dpkg; pour plus d'informations sur "
+#~ "la signification de cette option. En résumé, &dpkg; n'effectuera pas les "
+#~ "actions différées (« triggers ») si cette option est utilisée sauf si "
+#~ "cela est demandé explicitement dans une invocation supplémentaire. Cette "
+#~ "option existe en fait déjà (mais n'est pas documentée) dans de plus "
+#~ "anciennes version d'APT avec une signification légèrement différente : "
+#~ "elle n'ajoutait l'option « --no-triggers » qu'aux appels de &dpkg; avec "
+#~ "« configure » alors que cela sera désormais utilisé également avec les "
+#~ "appels à &dpkg; avec les options « unpack » et « remove »."
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "Les valeurs possibles sont « <literal>all</literal> », « <literal>smart</"
+#~ "literal> » et « <literal>no</literal> ». La valeur par défaut est "
+#~ "« <literal>all</literal> » où APT configure tous les paquets. La valeur "
+#~ "« <literal>smart</literal> » permet de ne configurer que les paquets qui "
+#~ "ont besoin de l'être avant la décompaction d'un autre paquet (à cause "
+#~ "d'une pré-dépendance) ; les autres configurations sont laissées pour un "
+#~ "appel ultérieur à &dpkg; via un appel créé par l'option ConfigurePending "
+#~ "(voir plus loin). L'option « <literal>no</literal> » ne provoquera aucune "
+#~ "configuration et s'en remettra totalement à &dpkg; pour ces opérations "
+#~ "(ce qui échouera en cas de pré-dépendances). Si cette option est définie "
+#~ "sur une valeur différente de « <literal>all</literal> », l'option "
+#~ "suivante sera activée par défaut pour éviter de placer le système dans un "
+#~ "état non configuré et donc éventuellement non amorçable."
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "Cette option est utile pour la configuration en mode « <literal>smart</"
+#~ "literal> ». En effet, un paquet qui a des actions différées "
+#~ "(« triggers ») en attente n'est pas considéré comme installé (état "
+#~ "« <literal>installed</literal> ») et &dpkg; le considère actuellement "
+#~ "comme simplement décompacté (état « <literal>unpacked</literal> ») ce qui "
+#~ "empêche une gestion correcte des pré-dépendances (voir le bogue Debian "
+#~ "#526774). Veuillez noter que cette option provoquera la gestion de toutes "
+#~ "les actions différées, pas seulement celles concernant le paquet en cours "
+#~ "de traitement."
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "Les paquets essentiels (et leurs dépendances) devraient être configurés "
+#~ "après avoir été décompressés. Il est conseillé que cette opération ait "
+#~ "lieu le plus tôt possible dans le processus de mise à jour car ces "
+#~ "opérations de configuration nécessitent également <literal>DPkg::"
+#~ "TriggersPending</literal>, ce qui peut conduire à l'exécution de certains "
+#~ "actions différées qui ne sont pas nécessairement utiles. Les paquets "
+#~ "essentiels obtiennent par défaut un score élevé mais le marqueur "
+#~ "« immédiat » implique un score assez bas (par exemple un paquet qui "
+#~ "comporte des prédépendances obtient un score plus élevé). Cette option et "
+#~ "les options du même groupe permettent de modifier la façon d'attribuer un "
+#~ "score. L'exemple ci-dessous indique ces réglages avec leurs valeurs par "
+#~ "défaut. <placeholder type=\"literallayout\" id=\"0\"/>"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Afficher les empreintes des clés fiables."
 
diff --git a/doc/po/it.po b/doc/po/it.po
index c4b1185e5..64828c1f3 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2015-12-27 21:26+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -5648,138 +5648,22 @@ msgstr ""
 "pacchetti; il valore predefinito disabilita la firma e produce tutti i "
 "binari."
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr "Uso dei trigger di dpkg (e relative opzioni)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"APT può invocare &dpkg; in modo tale da permettergli di fare un uso più "
-"aggressivo dei trigger su chiamate multiple di &dpkg;. Senza opzioni "
-"ulteriori &dpkg; usa i trigger una volta sola per ogni volta che viene "
-"eseguito. Attivando queste opzioni si può quindi diminuire il tempo "
-"necessario per effettuare l'installazione o l'aggiornamento. Notare che "
-"questo è pensato per attivare queste opzioni in modo predefinito nel futuro "
-"ma, dato che cambia drasticamente il modo in cui APT chiama &dpkg;, "
-"necessita di essere testato ancora molto. <emphasis>Queste opzioni sono "
-"perciò al momento sperimentali e non dovrebbero essere usate in ambienti di "
-"produzione.</emphasis> Inoltre rende difettosi i rapporti sull'avanzamento, "
-"tanto che che tutte le interfacce attualmente rimangono per metà (o più) del "
-"tempo nello stato 100% mentre in realtà stanno venendo configurati i "
-"pacchetti."
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Notare che non è garantito che APT supporterà queste opzioni o che queste "
-"opzioni non causeranno (grossi) problemi in futuro. Se i rischi e i problemi "
-"attuali legati a queste opzioni sono chiari, ma si è abbastanza coraggiosi "
-"da volere aiutare a testarle, creare un nuovo file di configurazione e "
-"provare una combinazione di opzioni. Segnalare ogni bug, problema o "
-"miglioramento che si presenta e assicurarsi di indicare nella segnalazione "
-"quali opzioni sono state usate. Potrebbe anche essere utile chiedere aiuto a "
-"&dpkg; per il debug; vedere ad esempio <command>dpkg --audit</command>. Una "
-"combinazione di opzioni sulla difensiva sarebbe <placeholder type="
-"\"literallayout\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"Aggiunge l'opzione --no-triggers a tutte le invocazioni di &dpkg; (tranne la "
-"chiamata ConfigurePending). Se si è interessati a capire cosa ciò significhi "
-"veramente, vedere &dpkg;. In breve: quando questa opzione è presente &dpkg; "
-"non esegue i trigger, a meno che non sia esplicitamente chiamato per farlo "
-"con una chiamata aggiuntiva. Notare che questa opzione esiste (non "
-"documentata) anche in versioni più vecchie di APT, con un significato "
-"leggermente diverso: prima queste opzioni aggiungevano solamente --no-"
-"triggers alle chiamate di &dpkg; per la configurazione, ora APT aggiunge "
-"questa opzione anche alle chiamate per lo spacchettamento e la rimozione."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"Valori permessi sono «<literal>all</literal>», «<literal>smart</literal>» e "
-"«<literal>no</literal>». Il valore predefinito è «<literal>all</literal>», "
-"il che fa sì che APT configuri tutti i pacchetti. Il modo «<literal>smart</"
-"literal>» (intelligente) è quello di configurare solo i pacchetti che devono "
-"essere configurati prima che possa essere spacchettato un altro pacchetto "
-"(Pre-Depends), e lasciare che il resto venga configurato da &dpkg; con una "
-"chiamata generata dall'opzione ConfigurePending (vedere più sotto). D'altro "
-"canto, «<literal>no</literal>» non configura nulla e si affida completamente "
-"a &dpkg; per la configurazione (che al momento fallisce se viene incontrata "
-"una relazione Pre-Depends). Impostare questo parametro ad un qualsiasi "
-"valore diverso da <literal>all</literal> attiva implicitamente in modo "
-"predefinito anche l'opzione successiva, dato che altrimenti il sistema "
-"potrebbe finire in uno stato non configurato e potenzialmente non avviabile."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 "Se questa opzione è impostata, APT invoca <command>dpkg --configure --"
 "pending</command> per lasciare che &dpkg; gestisca tutte le configurazioni e "
@@ -5789,65 +5673,6 @@ msgstr ""
 "più volte di seguito, ad esempio in un installatore. In uno scenario simile "
 "si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"Utile per la configurazione <literal>smart</literal> dato che un pacchetto "
-"che ha trigger in sospeso non è considerato come <literal>installato</"
-"literal> e &dpkg; attualmente lo tratta come <literal>spacchettato</literal> "
-"che è un ostacolo per le relazioni Pre-Depends (vedere il bug Debian "
-"#526774). Notare che questo elaborerà tutti i trigger, non solo quelli "
-"necessari per configurare il pacchetto in questione."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"I pacchetti essenziali (e le loro dipendenze) dovrebbero essere configurati "
-"immediatamente dopo essere stati spacchettati. È una buona idea farlo "
-"abbastanza presto nel processo di aggiornamento, dato che queste chiamate di "
-"configurazione al momento richiedono anche <literal>DPkg::TriggersPending</"
-"literal> che esegue un certo numero di trigger (che potrebbero non essere "
-"necessari). I pacchetti essenziali ottengono in modo predefinito un "
-"punteggio alto, ma il contrassegno di immediatezza è relativamente basso (un "
-"pacchetto che ha una relazione Pre-Depends è valutato con un punteggio "
-"maggiore). Queste opzioni e le altre nello stesso gruppo possono essere "
-"usate per cambiare il punteggio. L'esempio seguente mostra le impostazioni "
-"con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Periodic and Archives options"
@@ -11418,6 +11243,176 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
+#~ msgid "dpkg trigger usage (and related options)"
+#~ msgstr "Uso dei trigger di dpkg (e relative opzioni)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "APT può invocare &dpkg; in modo tale da permettergli di fare un uso più "
+#~ "aggressivo dei trigger su chiamate multiple di &dpkg;. Senza opzioni "
+#~ "ulteriori &dpkg; usa i trigger una volta sola per ogni volta che viene "
+#~ "eseguito. Attivando queste opzioni si può quindi diminuire il tempo "
+#~ "necessario per effettuare l'installazione o l'aggiornamento. Notare che "
+#~ "questo è pensato per attivare queste opzioni in modo predefinito nel "
+#~ "futuro ma, dato che cambia drasticamente il modo in cui APT chiama "
+#~ "&dpkg;, necessita di essere testato ancora molto. <emphasis>Queste "
+#~ "opzioni sono perciò al momento sperimentali e non dovrebbero essere usate "
+#~ "in ambienti di produzione.</emphasis> Inoltre rende difettosi i rapporti "
+#~ "sull'avanzamento, tanto che che tutte le interfacce attualmente rimangono "
+#~ "per metà (o più) del tempo nello stato 100% mentre in realtà stanno "
+#~ "venendo configurati i pacchetti."
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "Note that it is not guaranteed that APT will support these options or "
+#~ "that these options will not cause (big) trouble in the future. If you "
+#~ "have understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "Notare che non è garantito che APT supporterà queste opzioni o che queste "
+#~ "opzioni non causeranno (grossi) problemi in futuro. Se i rischi e i "
+#~ "problemi attuali legati a queste opzioni sono chiari, ma si è abbastanza "
+#~ "coraggiosi da volere aiutare a testarle, creare un nuovo file di "
+#~ "configurazione e provare una combinazione di opzioni. Segnalare ogni bug, "
+#~ "problema o miglioramento che si presenta e assicurarsi di indicare nella "
+#~ "segnalazione quali opzioni sono state usate. Potrebbe anche essere utile "
+#~ "chiedere aiuto a &dpkg; per il debug; vedere ad esempio <command>dpkg --"
+#~ "audit</command>. Una combinazione di opzioni sulla difensiva sarebbe "
+#~ "<placeholder type=\"literallayout\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
+#~ "call).  See &dpkg; if you are interested in what this actually means. In "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "Aggiunge l'opzione --no-triggers a tutte le invocazioni di &dpkg; (tranne "
+#~ "la chiamata ConfigurePending). Se si è interessati a capire cosa ciò "
+#~ "significhi veramente, vedere &dpkg;. In breve: quando questa opzione è "
+#~ "presente &dpkg; non esegue i trigger, a meno che non sia esplicitamente "
+#~ "chiamato per farlo con una chiamata aggiuntiva. Notare che questa opzione "
+#~ "esiste (non documentata) anche in versioni più vecchie di APT, con un "
+#~ "significato leggermente diverso: prima queste opzioni aggiungevano "
+#~ "solamente --no-triggers alle chiamate di &dpkg; per la configurazione, "
+#~ "ora APT aggiunge questa opzione anche alle chiamate per lo "
+#~ "spacchettamento e la rimozione."
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "Valori permessi sono «<literal>all</literal>», «<literal>smart</literal>» "
+#~ "e «<literal>no</literal>». Il valore predefinito è «<literal>all</"
+#~ "literal>», il che fa sì che APT configuri tutti i pacchetti. Il modo "
+#~ "«<literal>smart</literal>» (intelligente) è quello di configurare solo i "
+#~ "pacchetti che devono essere configurati prima che possa essere "
+#~ "spacchettato un altro pacchetto (Pre-Depends), e lasciare che il resto "
+#~ "venga configurato da &dpkg; con una chiamata generata dall'opzione "
+#~ "ConfigurePending (vedere più sotto). D'altro canto, «<literal>no</"
+#~ "literal>» non configura nulla e si affida completamente a &dpkg; per la "
+#~ "configurazione (che al momento fallisce se viene incontrata una relazione "
+#~ "Pre-Depends). Impostare questo parametro ad un qualsiasi valore diverso "
+#~ "da <literal>all</literal> attiva implicitamente in modo predefinito anche "
+#~ "l'opzione successiva, dato che altrimenti il sistema potrebbe finire in "
+#~ "uno stato non configurato e potenzialmente non avviabile."
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "Utile per la configurazione <literal>smart</literal> dato che un "
+#~ "pacchetto che ha trigger in sospeso non è considerato come "
+#~ "<literal>installato</literal> e &dpkg; attualmente lo tratta come "
+#~ "<literal>spacchettato</literal> che è un ostacolo per le relazioni Pre-"
+#~ "Depends (vedere il bug Debian #526774). Notare che questo elaborerà tutti "
+#~ "i trigger, non solo quelli necessari per configurare il pacchetto in "
+#~ "questione."
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "I pacchetti essenziali (e le loro dipendenze) dovrebbero essere "
+#~ "configurati immediatamente dopo essere stati spacchettati. È una buona "
+#~ "idea farlo abbastanza presto nel processo di aggiornamento, dato che "
+#~ "queste chiamate di configurazione al momento richiedono anche "
+#~ "<literal>DPkg::TriggersPending</literal> che esegue un certo numero di "
+#~ "trigger (che potrebbero non essere necessari). I pacchetti essenziali "
+#~ "ottengono in modo predefinito un punteggio alto, ma il contrassegno di "
+#~ "immediatezza è relativamente basso (un pacchetto che ha una relazione Pre-"
+#~ "Depends è valutato con un punteggio maggiore). Queste opzioni e le altre "
+#~ "nello stesso gruppo possono essere usate per cambiare il punteggio. "
+#~ "L'esempio seguente mostra le impostazioni con i loro valori predefiniti. "
+#~ "<placeholder type=\"literallayout\" id=\"0\"/>"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Elenca le impronte digitali delle chiavi fidate."
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 03ea3f815..22791c824 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2016-03-23 09:39+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -5400,128 +5400,22 @@ msgstr ""
 "これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され"
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr "dpkg トリガの使い方 (および関連オプション)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"APT は、複数の &dpkg; 呼び出しトリガを、積極的に行わせる方法で &dpkg; を呼び"
-"出せます。オプションがなければ、実行のたびに &dpkg; は一度トリガを引くだけで"
-"す。そのため、このオプションを有効にすると、インストールやアップグレードにか"
-"かる時間を、短くできます。将来、このオプションを、デフォルトで有効にする方向"
-"であることに注意してください。しかし、APT が &dpkg; を呼ぶ方法といった大幅な"
-"変更を行うには、もっとたくさんのテストが必要です。<emphasis>したがって、この"
-"オプションは現在実験中で、本番環境では使用するべきではありません。</emphasis>"
-"さらに、すべてのフロントエンドが、実際には全パッケージを設定中なのに、半分 "
-"(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"APT がこのオプションをサポートすることや、将来このオプションが (大きな) トラ"
-"ブルの原因にならないことは、保証されないことに注意してください。このオプショ"
-"ンの現在のリスクと問題を理解し、テストを手伝う十分な勇気があるなら、新しい設"
-"定ファイルを作成し、オプションの組み合わせのテストをお願いしたいです。遭遇し"
-"たどんなバグ、問題、改善点を、どのようなオプションを使用したかと添えて報告し"
-"てください。デバッグに役立つ可能性のある情報を &dpkg; に問い合わせることを提"
-"案します (例: <command>dpkg --audit</command> を参照)。防御的なオプションの組"
-"み合わせは、以下のようになります。<placeholder type=\"literallayout\" id="
-"\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"&dpkg; を呼び出すすべてのフラグ (ConfigurePending 呼び出し以外) を付与しませ"
-"ん。実際にこれが何を意味するのか興味があるなら、&dpkg; を参照してください。要"
-"するに、追加呼び出しで明示的に呼び出されない限り、このフラグがあると、&dpkg; "
-"はトリガを実行しません。また、古いバージョンの APT に、意味がわずかに異なる、"
-"このオプションが存在することに注意してください (ドキュメントなし)。以前のこの"
-"オプションは、&dpkg; の呼び出し設定に、--no-triggers を追加するだけでした。現"
-"在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"有効な値は \"<literal>all</literal>\", \"<literal>smart</literal>\", "
-"\"<literal>no</literal>\" です。デフォルト値は \"<literal>all</literal>\" "
-"で、APT にすべてのパッケージを設定させます。\"<literal>smart</literal>\" で"
-"は、他のパッケージを展開する前に、設定が終わっていなければならないパッケージ "
-"(事前依存) のみを設定し、残りを ConfigurePending オプション (後述) で生成し"
-"た &dpkg; 呼び出しで設定します。他方では、\"<literal>no</literal>\" は何も設"
-"定しません。設定については &dpkg; にすべて依存します (事前依存があると失敗し"
-"ます)。このオプションを <literal>all</literal> 以外の値に設定すると、次のオプ"
-"ションを暗黙的に有効にします。そうしないと、設定が完了せず、起動しなくなる可"
-"能性があるからです。"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 "このオプションがセットされると、&dpkg; にすべての必要な設定とトリガを扱わせる"
 "ように、APT は <command>dpkg --configure --pending</command> を呼び出します。"
@@ -5530,62 +5424,6 @@ msgstr ""
 "合 (インストーラなど) には、無効にしたほうが便利かもしれません。このシナリオ"
 "では、最後以外のすべての実行で、無効にできます。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"<literal>installed</literal> として認識されない保留トリガがあるパッケージを、"
-"<literal>smart</literal> 設定するのに便利です。&dpkg; は現在、先行依存関係に"
-"は無力な <literal>unpacked</literal> として扱います (debbugs #526774 参照)。"
-"このパッケージを設定するのに必要なトリガのみでなく、すべてのトリガを処理する"
-"ことに注意してください。"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"不可欠パッケージ (と、その依存しているパッケージ) は展開を終えると、すぐに設"
-"定するべきです。アップグレードプロセスの初期に、設定してしまうのが良いのです"
-"が、現在 <literal>DPkg::TriggersPending</literal> を要求しているパッケージも"
-"同時に行うため、かなり多くのトリガ (すべてが必要とは限らない) を処理すること"
-"になります。不可欠パッケージは、デフォルトではスコアを高く設定されています"
-"が、即時フラグは相対的に低くなっています (先行依存パッケージのほうが高い)。こ"
-"のオプションと、これと同じグループに属するものは、このスコア付けを変更するの"
-"に使用します。以下の例では、デフォルト値を変更しています。<placeholder type="
-"\"literallayout\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Periodic and Archives options"
@@ -10952,6 +10790,161 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
+#~ msgid "dpkg trigger usage (and related options)"
+#~ msgstr "dpkg トリガの使い方 (および関連オプション)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "APT は、複数の &dpkg; 呼び出しトリガを、積極的に行わせる方法で &dpkg; を呼"
+#~ "び出せます。オプションがなければ、実行のたびに &dpkg; は一度トリガを引くだ"
+#~ "けです。そのため、このオプションを有効にすると、インストールやアップグレー"
+#~ "ドにかかる時間を、短くできます。将来、このオプションを、デフォルトで有効に"
+#~ "する方向であることに注意してください。しかし、APT が &dpkg; を呼ぶ方法と"
+#~ "いった大幅な変更を行うには、もっとたくさんのテストが必要です。<emphasis>し"
+#~ "たがって、このオプションは現在実験中で、本番環境では使用するべきではありま"
+#~ "せん。</emphasis>さらに、すべてのフロントエンドが、実際には全パッケージを"
+#~ "設定中なのに、半分 (もしくはそれ以上) の時間 100% のままとなり、進捗レポー"
+#~ "トを壊してしまいます。"
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "Note that it is not guaranteed that APT will support these options or "
+#~ "that these options will not cause (big) trouble in the future. If you "
+#~ "have understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "APT がこのオプションをサポートすることや、将来このオプションが (大きな) ト"
+#~ "ラブルの原因にならないことは、保証されないことに注意してください。このオプ"
+#~ "ションの現在のリスクと問題を理解し、テストを手伝う十分な勇気があるなら、新"
+#~ "しい設定ファイルを作成し、オプションの組み合わせのテストをお願いしたいで"
+#~ "す。遭遇したどんなバグ、問題、改善点を、どのようなオプションを使用したかと"
+#~ "添えて報告してください。デバッグに役立つ可能性のある情報を &dpkg; に問い合"
+#~ "わせることを提案します (例: <command>dpkg --audit</command> を参照)。防御"
+#~ "的なオプションの組み合わせは、以下のようになります。<placeholder type="
+#~ "\"literallayout\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
+#~ "call).  See &dpkg; if you are interested in what this actually means. In "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "&dpkg; を呼び出すすべてのフラグ (ConfigurePending 呼び出し以外) を付与しま"
+#~ "せん。実際にこれが何を意味するのか興味があるなら、&dpkg; を参照してくださ"
+#~ "い。要するに、追加呼び出しで明示的に呼び出されない限り、このフラグがある"
+#~ "と、&dpkg; はトリガを実行しません。また、古いバージョンの APT に、意味がわ"
+#~ "ずかに異なる、このオプションが存在することに注意してください (ドキュメント"
+#~ "なし)。以前のこのオプションは、&dpkg; の呼び出し設定に、--no-triggers を追"
+#~ "加するだけでした。現在 APT は、このフラグを、展開呼び出しや削除呼び出しに"
+#~ "も追加します。"
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "有効な値は \"<literal>all</literal>\", \"<literal>smart</literal>\", "
+#~ "\"<literal>no</literal>\" です。デフォルト値は \"<literal>all</literal>\" "
+#~ "で、APT にすべてのパッケージを設定させます。\"<literal>smart</literal>\" "
+#~ "では、他のパッケージを展開する前に、設定が終わっていなければならないパッ"
+#~ "ケージ (事前依存) のみを設定し、残りを ConfigurePending オプション (後述) "
+#~ "で生成した &dpkg; 呼び出しで設定します。他方では、\"<literal>no</literal>"
+#~ "\" は何も設定しません。設定については &dpkg; にすべて依存します (事前依存"
+#~ "があると失敗します)。このオプションを <literal>all</literal> 以外の値に設"
+#~ "定すると、次のオプションを暗黙的に有効にします。そうしないと、設定が完了せ"
+#~ "ず、起動しなくなる可能性があるからです。"
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "<literal>installed</literal> として認識されない保留トリガがあるパッケージ"
+#~ "を、<literal>smart</literal> 設定するのに便利です。&dpkg; は現在、先行依存"
+#~ "関係には無力な <literal>unpacked</literal> として扱います (debbugs "
+#~ "#526774 参照)。このパッケージを設定するのに必要なトリガのみでなく、すべて"
+#~ "のトリガを処理することに注意してください。"
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "不可欠パッケージ (と、その依存しているパッケージ) は展開を終えると、すぐに"
+#~ "設定するべきです。アップグレードプロセスの初期に、設定してしまうのが良いの"
+#~ "ですが、現在 <literal>DPkg::TriggersPending</literal> を要求しているパッ"
+#~ "ケージも同時に行うため、かなり多くのトリガ (すべてが必要とは限らない) を処"
+#~ "理することになります。不可欠パッケージは、デフォルトではスコアを高く設定さ"
+#~ "れていますが、即時フラグは相対的に低くなっています (先行依存パッケージのほ"
+#~ "うが高い)。このオプションと、これと同じグループに属するものは、このスコア"
+#~ "付けを変更するのに使用します。以下の例では、デフォルト値を変更しています。"
+#~ "<placeholder type=\"literallayout\" id=\"0\"/>"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "信頼キーのフィンガープリントを一覧表示します。"
 
diff --git a/doc/po/nl.po b/doc/po/nl.po
index c67918949..ca4851114 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.1.10-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2016-02-01 16:17+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -5749,141 +5749,22 @@ msgstr ""
 "van pakketten. Het standaardgedrag is om ondertekening uit te zetten en alle "
 "binaire bestanden te produceren."
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr "het gebruik van triggers door dpkg (en gerelateerde opties)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"APT kan &dpkg; zodanig aanroepen dat het op een agressieve manier gebruik "
-"maakt van triggers in de loop van de verschillende stappen waarin &dpkg; "
-"aangeroepen wordt. Zonder extra opties zal &dpkg; een keer gebruik maken van "
-"triggers tijdens iedere uitvoering. Het activeren van deze opties kan daarom "
-"de tijd beperken die nodig is voor het uitvoeren van een installatie of een "
-"opwaardering. Merk op dat het de bedoeling is om deze opties in de toekomst "
-"standaard te activeren, maar aangezien het op een drastische manier ingrijpt "
-"op de manier waarop APT &dpkg; aanroept, is grondiger testen noodzakelijk. "
-"<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 "
-"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."
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Merk op dat er geen garantie bestaat dat APT deze opties zal blijven "
-"ondersteunen of dat ze in de toekomst geen (grote) problemen zullen "
-"veroorzaken. Indien u een goed begrip heeft van de actuele risico's en "
-"problemen met deze opties, maar moedig genoeg bent om ze te helpen testen, "
-"maakt u best een nieuw configuratiebestand aan om een combinatie van opties "
-"te testen. Gelieve bugs, problemen en verbeteringen die u bent tegengekomen "
-"te rapporteren en vergeet in uw rapport zeker niet te vermelden welke opties "
-"u gebruikte. Ook &dpkg; om hulp vragen kan nuttig zijn met het oog op het "
-"opsporen van problemen, zie bijvoorbeeld <command>dpkg --audit</command>. "
-"Een defensieve combinatie van opties zou <placeholder type=\"literallayout\" "
-"id=\"0\"/> zijn."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"De vlag \"geen triggers\" toevoegen aan alle aanroepen van &dpkg; (behalve "
-"voor de aanroep ConfigurePending). Raadpleeg &dpkg; indien u geïnteresseerd "
-"bent in wat dit daadwerkelijk betekent. In het kort: als deze vlag aanwezig "
-"is, zal &dpkg; de triggers niet uitvoeren tenzij het in een extra aanroep "
-"expliciet opgedragen wordt dat wel te doen. Merk op dat deze optie in een "
-"lichtjes andere betekenis (ongedocumenteerd) ook in oudere versies van APT "
-"aanwezig is: vroeger voegde deze optie enkel --no-triggers toe aan de "
-"configure-aanroep van &dpkg; - nu voegt APT deze vlag ook toe aan de "
-"aanroepen unpack en remove."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"Geldige waarden zijn \"<literal>all</literal>\", \"<literal>smart</literal>"
-"\" en \"<literal>no</literal>\". De standaardwaarde is \"<literal>all</"
-"literal>\", die APT ertoe aanzet om alle pakketten te configureren. De "
-"\"<literal>smart</literal>\"-manier bestaat erin om enkel die pakketten te "
-"configureren die geconfigureerd moeten zijn vooraleer een ander pakket "
-"uitgepakt kan worden (Pre-Depends (voorvereisten)) en de configuratie van de "
-"andere pakketten over te laten aan &dpkg; tijdens een door de optie "
-"ConfigurePending geïnitieerde aanroep (zie later). Anderzijds zal "
-"\"<literal>no</literal>\" helemaal niets configureren en volledig op &dpkg; "
-"vertrouwen voor de configuratie (hetgeen momenteel zal mislukken als er een "
-"Pre-Depends opduikt). Deze optie instellen op iets anders dan <literal>all</"
-"literal> zal standaard impliciet ook de volgende optie activeren. Anders "
-"bestaat het gevaar dat het systeem in een niet-geconfigureerde en niet op te "
-"starten toestand achterblijft."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 "Indien deze optie ingesteld staat zal APT <command>dpkg --configure --"
 "pending</command> aanroepen om &dpkg; alle nodige configuraties en triggers "
@@ -5894,66 +5775,6 @@ msgstr ""
 "dergelijk scenario kunt u deze optie uitschakelen voor alle keren dat APT "
 "uitgevoerd wordt, behalve voor de laatste keer."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"Nuttig voor de configuratie-instelling <literal>smart</literal>, vermits een "
-"pakket met wachtende triggers niet als <literal>installed</literal> "
-"(geïnstalleerd) beschouwd wordt en &dpkg; een dergelijk pakket momenteel als "
-"<literal>unpacked</literal> (niet uitgepakt) behandelt, hetgeen een "
-"hinderpaal is bij voorvereisten (zie Debian bug #526774). Merk op dat dit "
-"alle triggers verwerkt, niet enkel de triggers die nodig zijn om dit pakket "
-"te configureren."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Essentiële pakketten (en de pakketten waarvan zij afhankelijk zijn) zouden "
-"onmiddellijk geconfigureerd moeten worden nadat ze uitgepakt zijn. Het wordt "
-"aanbevolen om dit vrij vroeg in het opwaarderingsproces te doen aangezien "
-"deze configure-aanroepen momenteel ook <literal>DPkg::TriggersPending</"
-"literal> uitlokken, waardoor behoorlijk wat triggers afgehandeld kunnen "
-"worden (wat misschien niet nodig is). Essentiële pakketten krijgen per "
-"definitie een hoge score maar de vlag immediate heeft een relatief lage "
-"score (een pakket met een voorvereiste krijgt een hogere score). Deze optie "
-"en de andere uit dezelfde groep kunnen gebruikt worden om de score aan te "
-"passen. Het volgende voorbeeld toont de instellingen met hun "
-"standaardwaarden. <placeholder type=\"literallayout\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Periodic and Archives options"
@@ -11652,6 +11473,178 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 
+#~ msgid "dpkg trigger usage (and related options)"
+#~ msgstr "het gebruik van triggers door dpkg (en gerelateerde opties)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "APT kan &dpkg; zodanig aanroepen dat het op een agressieve manier gebruik "
+#~ "maakt van triggers in de loop van de verschillende stappen waarin &dpkg; "
+#~ "aangeroepen wordt. Zonder extra opties zal &dpkg; een keer gebruik maken "
+#~ "van triggers tijdens iedere uitvoering. Het activeren van deze opties kan "
+#~ "daarom de tijd beperken die nodig is voor het uitvoeren van een "
+#~ "installatie of een opwaardering. Merk op dat het de bedoeling is om deze "
+#~ "opties in de toekomst standaard te activeren, maar aangezien het op een "
+#~ "drastische manier ingrijpt op de manier waarop APT &dpkg; aanroept, is "
+#~ "grondiger testen noodzakelijk. <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 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."
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "Note that it is not guaranteed that APT will support these options or "
+#~ "that these options will not cause (big) trouble in the future. If you "
+#~ "have understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "Merk op dat er geen garantie bestaat dat APT deze opties zal blijven "
+#~ "ondersteunen of dat ze in de toekomst geen (grote) problemen zullen "
+#~ "veroorzaken. Indien u een goed begrip heeft van de actuele risico's en "
+#~ "problemen met deze opties, maar moedig genoeg bent om ze te helpen "
+#~ "testen, maakt u best een nieuw configuratiebestand aan om een combinatie "
+#~ "van opties te testen. Gelieve bugs, problemen en verbeteringen die u bent "
+#~ "tegengekomen te rapporteren en vergeet in uw rapport zeker niet te "
+#~ "vermelden welke opties u gebruikte. Ook &dpkg; om hulp vragen kan nuttig "
+#~ "zijn met het oog op het opsporen van problemen, zie bijvoorbeeld "
+#~ "<command>dpkg --audit</command>. Een defensieve combinatie van opties zou "
+#~ "<placeholder type=\"literallayout\" id=\"0\"/> zijn."
+
+#~ msgid ""
+#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
+#~ "call).  See &dpkg; if you are interested in what this actually means. In "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "De vlag \"geen triggers\" toevoegen aan alle aanroepen van &dpkg; "
+#~ "(behalve voor de aanroep ConfigurePending). Raadpleeg &dpkg; indien u "
+#~ "geïnteresseerd bent in wat dit daadwerkelijk betekent. In het kort: als "
+#~ "deze vlag aanwezig is, zal &dpkg; de triggers niet uitvoeren tenzij het "
+#~ "in een extra aanroep expliciet opgedragen wordt dat wel te doen. Merk op "
+#~ "dat deze optie in een lichtjes andere betekenis (ongedocumenteerd) ook in "
+#~ "oudere versies van APT aanwezig is: vroeger voegde deze optie enkel --no-"
+#~ "triggers toe aan de configure-aanroep van &dpkg; - nu voegt APT deze vlag "
+#~ "ook toe aan de aanroepen unpack en remove."
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "Geldige waarden zijn \"<literal>all</literal>\", \"<literal>smart</"
+#~ "literal>\" en \"<literal>no</literal>\". De standaardwaarde is "
+#~ "\"<literal>all</literal>\", die APT ertoe aanzet om alle pakketten te "
+#~ "configureren. De \"<literal>smart</literal>\"-manier bestaat erin om "
+#~ "enkel die pakketten te configureren die geconfigureerd moeten zijn "
+#~ "vooraleer een ander pakket uitgepakt kan worden (Pre-Depends "
+#~ "(voorvereisten)) en de configuratie van de andere pakketten over te laten "
+#~ "aan &dpkg; tijdens een door de optie ConfigurePending geïnitieerde "
+#~ "aanroep (zie later). Anderzijds zal \"<literal>no</literal>\" helemaal "
+#~ "niets configureren en volledig op &dpkg; vertrouwen voor de configuratie "
+#~ "(hetgeen momenteel zal mislukken als er een Pre-Depends opduikt). Deze "
+#~ "optie instellen op iets anders dan <literal>all</literal> zal standaard "
+#~ "impliciet ook de volgende optie activeren. Anders bestaat het gevaar dat "
+#~ "het systeem in een niet-geconfigureerde en niet op te starten toestand "
+#~ "achterblijft."
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "Nuttig voor de configuratie-instelling <literal>smart</literal>, vermits "
+#~ "een pakket met wachtende triggers niet als <literal>installed</literal> "
+#~ "(geïnstalleerd) beschouwd wordt en &dpkg; een dergelijk pakket momenteel "
+#~ "als <literal>unpacked</literal> (niet uitgepakt) behandelt, hetgeen een "
+#~ "hinderpaal is bij voorvereisten (zie Debian bug #526774). Merk op dat dit "
+#~ "alle triggers verwerkt, niet enkel de triggers die nodig zijn om dit "
+#~ "pakket te configureren."
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "Essentiële pakketten (en de pakketten waarvan zij afhankelijk zijn) "
+#~ "zouden onmiddellijk geconfigureerd moeten worden nadat ze uitgepakt zijn. "
+#~ "Het wordt aanbevolen om dit vrij vroeg in het opwaarderingsproces te doen "
+#~ "aangezien deze configure-aanroepen momenteel ook <literal>DPkg::"
+#~ "TriggersPending</literal> uitlokken, waardoor behoorlijk wat triggers "
+#~ "afgehandeld kunnen worden (wat misschien niet nodig is). Essentiële "
+#~ "pakketten krijgen per definitie een hoge score maar de vlag immediate "
+#~ "heeft een relatief lage score (een pakket met een voorvereiste krijgt een "
+#~ "hogere score). Deze optie en de andere uit dezelfde groep kunnen gebruikt "
+#~ "worden om de score aan te passen. Het volgende voorbeeld toont de "
+#~ "instellingen met hun standaardwaarden. <placeholder type=\"literallayout"
+#~ "\" id=\"0\"/>"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "De vingerafdrukken van de betrouwbare sleutels weergeven."
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index c545bbea6..7b1703c98 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -5098,135 +5098,14 @@ msgid ""
 "default is to disable signing and produce all binaries."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -10369,6 +10248,32 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Wyświetla listę odcisków zaufanych kluczy."
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 9965050a7..9f3098b15 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: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\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"
@@ -5559,136 +5559,22 @@ msgstr ""
 "Estas opções são passadas ao &dpkg-buildpackage; quando compila pacotes, a "
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr "Utilização trigger do dpkg (e opções relacionadas)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"O APT pode chamar o &dpkg; num tal modo que o deixa fazer uso agressivo dos "
-"triggers sobre múltiplas chamadas do &dpkg;. Sem mais opções o &dpkg; irá "
-"usar triggers uma vez por cada vez que corre. Activando estas opções pode "
-"portanto diminuir o tempo necessário para executar a instalação ou "
-"actualização. Note que é intenção futura activar estas opções por "
-"predefinição, mas como muda drasticamente a maneira como o APT chama o "
-"&dpkg;, precisa de muitos mais testes. <emphasis>Estas opções são portanto "
-"presentemente experimentais e não deve ser usadas em ambientes produtivos.</"
-"emphasis> Também interrompe o relatório de progresso de modo que todos os "
-"front-ends irão permanecer a cerca de metade (ou mais) do tempo no estado de "
-"100% enquanto na realidade está a configurar todos os pacotes."
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Note que não é garantido que o APT irá suportar estas opções ou que estas "
-"opções não irão causar (grandes) problemas no futuro. Se você compreendeu os "
-"riscos e problemas actuais com estas opções, mas tem coragem suficiente para "
-"ajudar a testá-la, crie um novo ficheiro de configuração e teste uma "
-"combinação de opções. Por favor reporte quaisquer bugs, problemas e "
-"melhoramentos que encontre e certifique-se de anotar nos seus relatórios "
-"quais as opções que usou. Pedir ajuda ao &dpkg; também pode ser útil para "
-"propósitos de depuração, veja ex. <command>dpkg --audit</command>. Uma "
-"combinação de opções defensiva seria <placeholder type=\"literallayout\" id="
-"\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"Adiciona a bandeira 'no triggers' a todas as chamadas do &dpkg; (excepto a "
-"chamada ConfigurePending). Veja &dpkg; se está interessado no que isto "
-"realmente representa. Em resumo: o  &dpkg; não irá correr os triggers quando "
-"esta bandeira está presente a menos que seja explicitamente chamado a fazê-"
-"lo numa chamada extra. Note que esta opção existe (não documentada) também "
-"em versões mais antigas do APT com um significado ligeiramente diferente: "
-"Anteriormente esta opção apenas acrescentava --no-triggers às chamadas "
-"configure para o &dpkg; - agora o APT irá adicionar esta bandeira também às "
-"chamadas unpack e remove."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"Valores válidos são \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"e \"<literal>no</literal>\".  O valor predefinido é \"<literal>all</literal>"
-"\" que faz com que o APT configure todos os pacotes. O modo "
-"\"<literal>smart</literal>\" serve para configurar apenas pacotes que "
-"precisam de ser configurados antes que outro pacote possa ser desempacotado "
-"(pré-dependências) e o resto configurado pelo &dpkg; com uma chamada gerada "
-"pela opção ConfigurePending (veja em baixo). Por outro lado, \"<literal>no</"
-"literal>\" não irá configurar nada e confiar no &dpkg; para configurações (o "
-"que de momento irá falhar se encontrar uma pré-dependência). Definir esta "
-"opção para qualquer valor que diferente de <literal>all</literal> irá também "
-"implicitamente activar a próxima opção predefinida caso contrário o sistema "
-"poderia acabar num estado não configurado onde potencialmente poderia não "
-"arrancar."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 "Se esta opção for definida, o APT irá chamar <command>dpkg --configure --"
 "pending</command> para permitir ao &dpkg; lidar como todas as configurações "
@@ -5698,64 +5584,6 @@ msgstr ""
 "vezes numa fila - ex. numa instalação. Nestes cenários você pode desactivar "
 "esta opção em todas excepto na última execução."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"Útil para configuração <literal>smart</literal>, pois um pacote que tenha "
-"triggers pendentes não é considerado como <literal>installed</literal> e o "
-"&dpkg; trata-o como actualmente <literal>unpacked</literal> o que é um modo "
-"de lidar com pré-dependências (veja debbugs #526774). Note que isto irá "
-"processar todos os triggers, e não apenas os triggers necessários para "
-"configurar este pacote."
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"Os pacotes essenciais ( e as suas dependências) deve ser configurados "
-"imediatamente após a descompactação. Será uma boa ideia fazer isto bem cedo "
-"no processo de actualização pois estas chamadas de configuração também "
-"requerem actualmente <literal>DPkg::TriggersPending</literal> o que irá "
-"correr alguns triggers (que talvez não sejam necessários). Os essenciais "
-"obtêm por predefinição uma pontuação alta mas a bandeira 'imediato' é "
-"relativamente baixa (um pacote que tenha uma pré-dependência tem pontuação "
-"mais alta). Esta opção e as outras no mesmo grupo podem ser usadas para "
-"alterar a pontuação. O exemplo seguinte mostra as definições que são valores "
-"predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Periodic and Archives options"
@@ -11205,6 +11033,171 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 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 "dpkg trigger usage (and related options)"
+#~ msgstr "Utilização trigger do dpkg (e opções relacionadas)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "O APT pode chamar o &dpkg; num tal modo que o deixa fazer uso agressivo "
+#~ "dos triggers sobre múltiplas chamadas do &dpkg;. Sem mais opções o &dpkg; "
+#~ "irá usar triggers uma vez por cada vez que corre. Activando estas opções "
+#~ "pode portanto diminuir o tempo necessário para executar a instalação ou "
+#~ "actualização. Note que é intenção futura activar estas opções por "
+#~ "predefinição, mas como muda drasticamente a maneira como o APT chama o "
+#~ "&dpkg;, precisa de muitos mais testes. <emphasis>Estas opções são "
+#~ "portanto presentemente experimentais e não deve ser usadas em ambientes "
+#~ "produtivos.</emphasis> Também interrompe o relatório de progresso de modo "
+#~ "que todos os front-ends irão permanecer a cerca de metade (ou mais) do "
+#~ "tempo no estado de 100% enquanto na realidade está a configurar todos os "
+#~ "pacotes."
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ msgid ""
+#~ "Note that it is not guaranteed that APT will support these options or "
+#~ "that these options will not cause (big) trouble in the future. If you "
+#~ "have understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "Note que não é garantido que o APT irá suportar estas opções ou que estas "
+#~ "opções não irão causar (grandes) problemas no futuro. Se você compreendeu "
+#~ "os riscos e problemas actuais com estas opções, mas tem coragem "
+#~ "suficiente para ajudar a testá-la, crie um novo ficheiro de configuração "
+#~ "e teste uma combinação de opções. Por favor reporte quaisquer bugs, "
+#~ "problemas e melhoramentos que encontre e certifique-se de anotar nos seus "
+#~ "relatórios quais as opções que usou. Pedir ajuda ao &dpkg; também pode "
+#~ "ser útil para propósitos de depuração, veja ex. <command>dpkg --audit</"
+#~ "command>. Uma combinação de opções defensiva seria <placeholder type="
+#~ "\"literallayout\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
+#~ "call).  See &dpkg; if you are interested in what this actually means. In "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "Adiciona a bandeira 'no triggers' a todas as chamadas do &dpkg; (excepto "
+#~ "a chamada ConfigurePending). Veja &dpkg; se está interessado no que isto "
+#~ "realmente representa. Em resumo: o  &dpkg; não irá correr os triggers "
+#~ "quando esta bandeira está presente a menos que seja explicitamente "
+#~ "chamado a fazê-lo numa chamada extra. Note que esta opção existe (não "
+#~ "documentada) também em versões mais antigas do APT com um significado "
+#~ "ligeiramente diferente: Anteriormente esta opção apenas acrescentava --no-"
+#~ "triggers às chamadas configure para o &dpkg; - agora o APT irá adicionar "
+#~ "esta bandeira também às chamadas unpack e remove."
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "Valores válidos são \"<literal>all</literal>\", \"<literal>smart</literal>"
+#~ "\" e \"<literal>no</literal>\".  O valor predefinido é \"<literal>all</"
+#~ "literal>\" que faz com que o APT configure todos os pacotes. O modo "
+#~ "\"<literal>smart</literal>\" serve para configurar apenas pacotes que "
+#~ "precisam de ser configurados antes que outro pacote possa ser "
+#~ "desempacotado (pré-dependências) e o resto configurado pelo &dpkg; com "
+#~ "uma chamada gerada pela opção ConfigurePending (veja em baixo). Por outro "
+#~ "lado, \"<literal>no</literal>\" não irá configurar nada e confiar no "
+#~ "&dpkg; para configurações (o que de momento irá falhar se encontrar uma "
+#~ "pré-dependência). Definir esta opção para qualquer valor que diferente de "
+#~ "<literal>all</literal> irá também implicitamente activar a próxima opção "
+#~ "predefinida caso contrário o sistema poderia acabar num estado não "
+#~ "configurado onde potencialmente poderia não arrancar."
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "Útil para configuração <literal>smart</literal>, pois um pacote que tenha "
+#~ "triggers pendentes não é considerado como <literal>installed</literal> e "
+#~ "o &dpkg; trata-o como actualmente <literal>unpacked</literal> o que é um "
+#~ "modo de lidar com pré-dependências (veja debbugs #526774). Note que isto "
+#~ "irá processar todos os triggers, e não apenas os triggers necessários "
+#~ "para configurar este pacote."
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "Os pacotes essenciais ( e as suas dependências) deve ser configurados "
+#~ "imediatamente após a descompactação. Será uma boa ideia fazer isto bem "
+#~ "cedo no processo de actualização pois estas chamadas de configuração "
+#~ "também requerem actualmente <literal>DPkg::TriggersPending</literal> o "
+#~ "que irá correr alguns triggers (que talvez não sejam necessários). Os "
+#~ "essenciais obtêm por predefinição uma pontuação alta mas a bandeira "
+#~ "'imediato' é relativamente baixa (um pacote que tenha uma pré-dependência "
+#~ "tem pontuação mais alta). Esta opção e as outras no mesmo grupo podem ser "
+#~ "usadas para alterar a pontuação. O exemplo seguinte mostra as definições "
+#~ "que são valores predefinidos. <placeholder type=\"literallayout\" id="
+#~ "\"0\"/>"
+
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Lista as fingerprints das chaves de confiança."
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index c3c30b1ec..15721f6e8 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-06 23:20+0200\n"
+"POT-Creation-Date: 2016-08-11 14:09+0200\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -3835,125 +3835,14 @@ msgid ""
 "default is to disable signing and produce all binaries."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>