summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/deb/dpkgpm.cc39
-rw-r--r--apt-pkg/deb/dpkgpm.h2
-rw-r--r--debian/changelog3
-rw-r--r--doc/apt.conf.5.xml46
-rw-r--r--doc/examples/configure-index15
-rw-r--r--doc/po/apt-doc.pot229
-rw-r--r--doc/po/fr.po230
-rw-r--r--doc/po/ja.po243
-rw-r--r--po/apt-all.pot26
9 files changed, 589 insertions, 244 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b4a2abcb5..04e257b1b 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -134,8 +134,11 @@ bool pkgDPkgPM::Configure(PkgIterator Pkg)
{
if (Pkg.end() == true)
return false;
-
- List.push_back(Item(Item::Configure,Pkg));
+
+ bool static const NoConfigure = _config->FindB("DPkg::NoConfigure",false);
+ if (NoConfigure == false)
+ List.push_back(Item(Item::Configure,Pkg));
+
return true;
}
/*}}}*/
@@ -190,6 +193,9 @@ bool pkgDPkgPM::SendV2Pkgs(FILE *F)
// Write out the package actions in order.
for (vector<Item>::iterator I = List.begin(); I != List.end(); I++)
{
+ if(I->Pkg.end() == true)
+ continue;
+
pkgDepCache::StateCache &S = Cache[I->Pkg];
fprintf(F,"%s ",I->Pkg.Name());
@@ -629,6 +635,11 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false)
return false;
+ // support subpressing of triggers processing for special
+ // cases like d-i that runs the triggers handling manually
+ if(_config->FindB("DPkg::ConfigurePending",_config->FindB("DPkg::NoConfigure",false)) == true)
+ List.push_back(Item(Item::ConfigurePending,PkgIterator()));
+
// map the dpkg states to the operations that are performed
// (this is sorted in the same way as Item::Ops)
static const struct DpkgState DpkgStatesOpMap[][7] = {
@@ -666,6 +677,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// and the PackageOpsTranslations (human readable strings)
for (vector<Item>::const_iterator I = List.begin(); I != List.end();I++)
{
+ if((*I).Pkg.end() == true)
+ continue;
+
string const name = (*I).Pkg.Name();
PackageOpsDone[name] = 0;
for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++)
@@ -752,11 +766,16 @@ bool pkgDPkgPM::Go(int OutStatusFd)
case Item::Configure:
Args[n++] = "--configure";
- if (NoTriggers == true)
- Args[n++] = "--no-triggers";
Size += strlen(Args[n-1]);
break;
-
+
+ case Item::ConfigurePending:
+ Args[n++] = "--configure";
+ Size += strlen(Args[n-1]);
+ Args[n++] = "--pending";
+ Size += strlen(Args[n-1]);
+ break;
+
case Item::Install:
Args[n++] = "--unpack";
Size += strlen(Args[n-1]);
@@ -764,7 +783,13 @@ bool pkgDPkgPM::Go(int OutStatusFd)
Size += strlen(Args[n-1]);
break;
}
-
+
+ if (NoTriggers == true && I->Op != Item::ConfigurePending)
+ {
+ Args[n++] = "--no-triggers";
+ Size += strlen(Args[n-1]);
+ }
+
// Write in the file or package names
if (I->Op == Item::Install)
{
@@ -780,6 +805,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
{
for (;I != J && Size < MaxArgBytes; I++)
{
+ if((*I).Pkg.end() == true)
+ continue;
Args[n++] = I->Pkg.Name();
Size += strlen(Args[n-1]);
}
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ebc7e32bf..0c266605a 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -53,7 +53,7 @@ class pkgDPkgPM : public pkgPackageManager
struct Item
{
- enum Ops {Install, Configure, Remove, Purge} Op;
+ enum Ops {Install, Configure, Remove, Purge, ConfigurePending} Op;
string File;
PkgIterator Pkg;
Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
diff --git a/debian/changelog b/debian/changelog
index 41620d3cb..44d39b6aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ apt (0.7.24) UNRELEASED; urgency=low
- remove file as nobody will upgrade from 0.4.10 anymore
* debian/control:
- remove gnome-apt suggestion as it was removed from debian
+ * apt-pkg/deb/dpkgpm.cc:
+ - add and document experimental options to make aggressive
+ use of dpkg's trigger and configuration handling (Closes: #473461)
[ Christian Perrier ]
* doc/fr/*, doc/po/fr.po:
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 81be753f9..89de8ea4e 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -464,6 +464,52 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
the default is to disable signing and produce all binaries.</para></listitem>
</varlistentry>
</variablelist>
+
+ <refsect2><title>dpkg trigger usage</title>
+ <para>APT can call dpkg in a way so it can make aggressive use of triggers over
+ multiply calls of dpkg. Without further options dpkg will use triggers only in between his
+ own run. Activating these options can therefore descrease the time needed to perform the
+ install / upgrade. Note that it is intended to activate these options per default in the
+ future, but as it changes the way apt calling dpkg drastical it needs a lot more testing.
+ <emphasis>These options are therefore currently experimental and should not be used in
+ productive environments.</emphasis> Also it breaks the progress reporting so all frontends will
+ currently stay around half (or more) of the time in the 100% state while it actually configures
+ all packages.</para>
+ <para>If you have understand the current risks and problems with these options, but want
+ to help testing them create a new configuration file with the following three options activated.
+ Please report any bugs and problems you encounter and make sure to note that you have used
+ these options in the reports. Asking dpkg for help could also be useful for debugging proposes,
+ see e.g. <command>dpkg --audit</command>.
+<literallayout>DPkg::NoTriggers "true";
+DPkg::NoConfigure "true";
+DPkg::ConfigurePending "true";</literallayout>
+ </para>
+
+ <variablelist>
+ <varlistentry><term>NoTriggers</term>
+ <listitem><para>Add the no triggers flag to all dpkg calls (expect the ConfigurePending call).
+ See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the
+ triggers then this flag is present unless it is explicit 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 add these flag also to the unpack and remove calls.</para></listitem>
+ </varlistentry>
+ <varlistentry><term>NoConfigure</term>
+ <listitem><para>Set this option to true will prevent apt to call explicit the configuration
+ for all packages. The packages will only be called to unpack (or remove), so dpkg can handle the
+ configuration process. Activating this option will implicit activate also the next option per
+ default as otherwise the system could end in an unconfigured status which could be unbootable!
+ </para></listitem>
+ </varlistentry>
+ <varlistentry><term>ConfigurePending</term>
+ <listitem><para>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 automatic
+ per default if <literal>NoConfigure</literal> is set, but deactivating could be useful
+ if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you should
+ deactivate this option in all but the last run.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
</refsect1>
<refsect1>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 8025fa4b4..27118fb7e 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -319,18 +319,25 @@ DSelect
CheckDir "no";
}
-DPkg
+DPkg
{
+ // let apt aggressivly use dpkg triggers
+ NoTriggers "true";
+ NoConfigure "true";
+ ConfigurePending "true";
+
// Probably don't want to use force-downgrade..
Options {"--force-overwrite";"--force-downgrade";}
-
+
// Auto re-mounting of a readonly /usr
Pre-Invoke {"mount -o remount,rw /usr";};
Post-Invoke {"mount -o remount,ro /usr";};
-
+
+ Chroot-Directory "/";
+
// Prevents daemons from getting cwd as something mountable (default)
Run-Directory "/";
-
+
// Build options for apt-get source --compile
Build-Options "-b -uc";
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 338ff4d53..526488a1c 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-09-09 14:58+0300\n"
+"POT-Creation-Date: 2009-09-12 12:51+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1408,7 +1408,7 @@ msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:859 apt_preferences.5.xml:615
+#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:905 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
@@ -1418,7 +1418,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622 sources.list.5.xml:221
+#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 sources.list.5.xml:221
msgid "See Also"
msgstr ""
@@ -2673,7 +2673,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462 sources.list.5.xml:181
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 sources.list.5.xml:181
msgid "Examples"
msgstr ""
@@ -4988,13 +4988,102 @@ msgid ""
"default is to disable signing and produce all binaries."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt.conf.5.xml:468
+msgid "dpkg trigger usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:469
+msgid ""
+"APT can call dpkg in a way so it can make aggressive use of triggers over "
+"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"in between his own run. Activating these options can therefore descrease the "
+"time needed to perform the install / upgrade. Note that it is intended to "
+"activate these options per default in the future, but as it changes the way "
+"apt calling dpkg drastical it needs a lot more testing. <emphasis>These "
+"options are therefore currently experimental and should not be used in "
+"productive environments.</emphasis> Also it breaks the progress reporting so "
+"all frontends 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:483
+#, no-wrap
+msgid ""
+"DPkg::NoTriggers \"true\";\n"
+"DPkg::NoConfigure \"true\";\n"
+"DPkg::ConfigurePending \"true\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:478
+msgid ""
+"If you have understand the current risks and problems with these options, "
+"but want to help testing them create a new configuration file with the "
+"following three options activated. Please report any bugs and problems you "
+"encounter and make sure to note that you have used these options in the "
+"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"see e.g. <command>dpkg --audit</command>. <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:489
+msgid "NoTriggers"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:490
+msgid ""
+"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"call). See &dpkg; if you are interested in what this actually means. In "
+"short: dpkg will not run the triggers then this flag is present unless it is "
+"explicit 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 add these flag also to the unpack and remove calls."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:497
+msgid "NoConfigure"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+msgid ""
+"Set this option to true will prevent apt to call explicit the configuration "
+"for all packages. The packages will only be called to unpack (or remove), so "
+"dpkg can handle the configuration process. Activating this option will "
+"implicit activate also the next option per default as otherwise the system "
+"could end in an unconfigured status which could be unbootable!"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:504
+msgid "ConfigurePending"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:505
+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 automatic per default if "
+"<literal>NoConfigure</literal> is set, but deactivating could be useful if "
+"you want to run APT multiple times in a row - e.g. in an installer. In this "
+"sceneries you should deactivate this option in all but the last run."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:516
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:517
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5003,12 +5092,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:525
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:527
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5019,7 +5108,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:538
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5027,7 +5116,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:500
+#: apt.conf.5.xml:546
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5035,7 +5124,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:555
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5045,110 +5134,110 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:563
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:527
+#: apt.conf.5.xml:573
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:578
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:582
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:589
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:593
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:600
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:604
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:611
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:615
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:622
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:580
+#: apt.conf.5.xml:626
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:633
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:637
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:644
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:647
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:654
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:611
+#: apt.conf.5.xml:657
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:664
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:667
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5156,92 +5245,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:675
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:678
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:686
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:690
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:697
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:700
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:707
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:664
+#: apt.conf.5.xml:710
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:718
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:722
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:729
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:733
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:740
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:744
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:751
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:754
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5251,12 +5340,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:765
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:768
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5274,90 +5363,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:787
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:790
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:797
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:754
+#: apt.conf.5.xml:800
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:762
+#: apt.conf.5.xml:808
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:811
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:772
+#: apt.conf.5.xml:818
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:822
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:784
+#: apt.conf.5.xml:830
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:834
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:841
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:845
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:851
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:855
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:863
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:866
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5365,32 +5454,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:874
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:878
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:900
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:861
+#: apt.conf.5.xml:907
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:912
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 71327d583..ce0596a46 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-09-09 14:58+0300\n"
+"POT-Creation-Date: 2009-09-12 12:51+0300\n"
"PO-Revision-Date: 2009-09-04 20:23+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1882,7 +1882,7 @@ msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:859 apt_preferences.5.xml:615
+#: apt.conf.5.xml:905 apt_preferences.5.xml:615
msgid "Files"
msgstr "Fichiers"
@@ -1895,7 +1895,7 @@ msgstr ""
#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622
#: sources.list.5.xml:221
msgid "See Also"
msgstr "Voir aussi"
@@ -3481,7 +3481,7 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462
#: sources.list.5.xml:181
msgid "Examples"
msgstr "Exemples"
@@ -6793,14 +6793,104 @@ 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:468
+msgid "dpkg trigger usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:469
+msgid ""
+"APT can call dpkg in a way so it can make aggressive use of triggers over "
+"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"in between his own run. Activating these options can therefore descrease the "
+"time needed to perform the install / upgrade. Note that it is intended to "
+"activate these options per default in the future, but as it changes the way "
+"apt calling dpkg drastical it needs a lot more testing. <emphasis>These "
+"options are therefore currently experimental and should not be used in "
+"productive environments.</emphasis> Also it breaks the progress reporting so "
+"all frontends 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:483
+#, no-wrap
+msgid ""
+"DPkg::NoTriggers \"true\";\n"
+"DPkg::NoConfigure \"true\";\n"
+"DPkg::ConfigurePending \"true\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:478
+msgid ""
+"If you have understand the current risks and problems with these options, "
+"but want to help testing them create a new configuration file with the "
+"following three options activated. Please report any bugs and problems you "
+"encounter and make sure to note that you have used these options in the "
+"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout"
+"\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:489
+msgid "NoTriggers"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:490
+msgid ""
+"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"call). See &dpkg; if you are interested in what this actually means. In "
+"short: dpkg will not run the triggers then this flag is present unless it is "
+"explicit 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 add these flag also to the unpack and remove calls."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:497
+#, fuzzy
+msgid "NoConfigure"
+msgstr "Immediate-Configure"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+msgid ""
+"Set this option to true will prevent apt to call explicit the configuration "
+"for all packages. The packages will only be called to unpack (or remove), so "
+"dpkg can handle the configuration process. Activating this option will "
+"implicit activate also the next option per default as otherwise the system "
+"could end in an unconfigured status which could be unbootable!"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:504
+msgid "ConfigurePending"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:505
+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 automatic per default if <literal>NoConfigure</literal> "
+"is set, but deactivating could be useful if you want to run APT multiple "
+"times in a row - e.g. in an installer. In this sceneries you should "
+"deactivate this option in all but the last run."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:516
#, fuzzy
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:517
#, fuzzy
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
@@ -6813,13 +6903,13 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:525
#, fuzzy
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:527
#, fuzzy
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
@@ -6838,7 +6928,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:538
#, fuzzy
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
@@ -6850,7 +6940,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:500
+#: apt.conf.5.xml:546
#, fuzzy
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
@@ -6862,7 +6952,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) sans être « root »."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:555
#, fuzzy
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
@@ -6875,7 +6965,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:563
#, fuzzy
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -6885,71 +6975,71 @@ msgstr ""
"type statfs dans les ID de cédérom."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:527
+#: apt.conf.5.xml:573
#, fuzzy
msgid "A full list of debugging options to apt follows."
msgstr "Voici une liste complète des options de débogage de APT."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:578
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "Debug::Acquire::cdrom"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:582
#, fuzzy
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr "Affiche les informations concernant les sources de type cdrom://"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:589
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "Debug::Acquire::ftp"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:593
#, fuzzy
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:600
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "Debug::Acquire::http"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:604
#, fuzzy
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:611
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "Debug::Acquire::https"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:615
#, fuzzy
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:622
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "Debug::Acquire::gpgv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:580
+#: apt.conf.5.xml:626
#, fuzzy
msgid ""
"Print information related to verifying cryptographic signatures using "
@@ -6959,13 +7049,13 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:633
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "Debug::aptcdrom"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:637
#, fuzzy
msgid ""
"Output information about the process of accessing collections of packages "
@@ -6975,13 +7065,13 @@ msgstr ""
"stockées sur cédérom."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:644
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "Debug::BuildDeps"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:647
#, fuzzy
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
@@ -6989,13 +7079,13 @@ msgstr ""
"paquets source ( « build-dependencies » ) par &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:654
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "Debug::Hashes"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:611
+#: apt.conf.5.xml:657
#, fuzzy
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
@@ -7005,13 +7095,13 @@ msgstr ""
"librairies APT."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:664
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "Debug::IdentCdrom"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:667
#, fuzzy
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
@@ -7023,13 +7113,13 @@ msgstr ""
"sur le système de fichier du cédérom."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:675
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "Debug::NoLocking"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:678
#, fuzzy
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
@@ -7039,13 +7129,13 @@ msgstr ""
"deux instances de « apt-get update » en même temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:686
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "Debug::pkgAcquire"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:690
#, fuzzy
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
@@ -7053,13 +7143,13 @@ msgstr ""
"téléchargement."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:697
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "Debug::pkgAcquire::Auth"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:700
#, fuzzy
msgid ""
"Output status messages and errors related to verifying checksums and "
@@ -7070,13 +7160,13 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:707
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "Debug::pkgAcquire::Diffs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:664
+#: apt.conf.5.xml:710
#, fuzzy
msgid ""
"Output information about downloading and applying package index list diffs, "
@@ -7087,13 +7177,13 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:718
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "Debug::pkgAcquire::RRed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:722
#, fuzzy
msgid ""
"Output information related to patching apt package lists when downloading "
@@ -7104,13 +7194,13 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:729
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "Debug::pkgAcquire::Worker"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:733
#, fuzzy
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
@@ -7119,13 +7209,13 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:740
#, fuzzy
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "Debug::pkgAcquire::pkgAutoRemove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:744
#, fuzzy
msgid ""
"Log events related to the automatically-installed status of packages and to "
@@ -7135,13 +7225,13 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:751
#, fuzzy
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "Debug::pkgDepCache::AutoInstall"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:754
#, fuzzy
msgid ""
"Generate debug messages describing which packages are being automatically "
@@ -7157,13 +7247,13 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:765
#, fuzzy
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "Debug::pkgDepCache::AutoInstall"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:768
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7180,13 +7270,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:787
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "Debug::pkgInitConfig"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:790
#, fuzzy
msgid "Dump the default configuration to standard error on startup."
msgstr ""
@@ -7194,13 +7284,13 @@ msgstr ""
"standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:797
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "Debug::pkgDPkgPM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:754
+#: apt.conf.5.xml:800
#, fuzzy
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
@@ -7210,13 +7300,13 @@ msgstr ""
"arguments sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:762
+#: apt.conf.5.xml:808
#, fuzzy
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "Debug::pkgDPkgProgressReporting"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:811
#, fuzzy
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
@@ -7227,13 +7317,13 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:772
+#: apt.conf.5.xml:818
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "Debug::pkgOrderList"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:822
#, fuzzy
msgid ""
"Generate a trace of the algorithm that decides the order in which "
@@ -7243,38 +7333,38 @@ msgstr ""
"APT passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:784
+#: apt.conf.5.xml:830
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "Debug::pkgPackageManager"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:834
#, fuzzy
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:841
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "Debug::pkgPolicy"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:845
#, fuzzy
msgid "Output the priority of each package list on startup."
msgstr "Au lancement, affiche la priorité de chaque liste de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:851
#, fuzzy
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "Debug::pkgProblemResolver"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:855
#, fuzzy
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
@@ -7284,13 +7374,13 @@ msgstr ""
"concerne que les cas où un problème de dépendances complexe se présente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:863
#, fuzzy
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "Debug::pkgProblemResolver"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:866
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -7298,13 +7388,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:874
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "Debug::sourceList"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:878
#, fuzzy
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
@@ -7314,7 +7404,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:900
#, fuzzy
msgid ""
"&configureindex; is a configuration file showing example values for all "
@@ -7324,7 +7414,7 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:861
+#: apt.conf.5.xml:907
#, fuzzy
#| msgid "&apt-conf;"
msgid "&file-aptconf;"
@@ -7332,7 +7422,7 @@ msgstr "&apt-conf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:912
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 5458d85ff..1e09006f9 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-09-09 14:58+0300\n"
+"POT-Creation-Date: 2009-09-12 12:51+0300\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1928,7 +1928,7 @@ msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:859 apt_preferences.5.xml:615
+#: apt.conf.5.xml:905 apt_preferences.5.xml:615
msgid "Files"
msgstr "ファイル"
@@ -1942,7 +1942,7 @@ msgstr ""
#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622
#: sources.list.5.xml:221
msgid "See Also"
msgstr "関連項目"
@@ -3630,7 +3630,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462
#: sources.list.5.xml:181
msgid "Examples"
msgstr "サンプル"
@@ -6851,13 +6851,106 @@ msgstr ""
"これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され"
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt.conf.5.xml:468
+msgid "dpkg trigger usage"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:469
+msgid ""
+"APT can call dpkg in a way so it can make aggressive use of triggers over "
+"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"in between his own run. Activating these options can therefore descrease the "
+"time needed to perform the install / upgrade. Note that it is intended to "
+"activate these options per default in the future, but as it changes the way "
+"apt calling dpkg drastical it needs a lot more testing. <emphasis>These "
+"options are therefore currently experimental and should not be used in "
+"productive environments.</emphasis> Also it breaks the progress reporting so "
+"all frontends 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:483
+#, no-wrap
+msgid ""
+"DPkg::NoTriggers \"true\";\n"
+"DPkg::NoConfigure \"true\";\n"
+"DPkg::ConfigurePending \"true\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:478
+msgid ""
+"If you have understand the current risks and problems with these options, "
+"but want to help testing them create a new configuration file with the "
+"following three options activated. Please report any bugs and problems you "
+"encounter and make sure to note that you have used these options in the "
+"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout"
+"\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:489
+msgid "NoTriggers"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:490
+msgid ""
+"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"call). See &dpkg; if you are interested in what this actually means. In "
+"short: dpkg will not run the triggers then this flag is present unless it is "
+"explicit 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 add these flag also to the unpack and remove calls."
+msgstr ""
+
+# type: Content of: <refentry><refnamediv><refname>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:497
+#, fuzzy
+msgid "NoConfigure"
+msgstr "config-files"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+msgid ""
+"Set this option to true will prevent apt to call explicit the configuration "
+"for all packages. The packages will only be called to unpack (or remove), so "
+"dpkg can handle the configuration process. Activating this option will "
+"implicit activate also the next option per default as otherwise the system "
+"could end in an unconfigured status which could be unbootable!"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:504
+#, fuzzy
+msgid "ConfigurePending"
+msgstr "ユーザの設定"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:505
+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 automatic per default if <literal>NoConfigure</literal> "
+"is set, but deactivating could be useful if you want to run APT multiple "
+"times in a row - e.g. in an installer. In this sceneries you should "
+"deactivate this option in all but the last run."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:516
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:517
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6871,12 +6964,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:525
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:527
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6887,7 +6980,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:538
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6898,7 +6991,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:500
+#: apt.conf.5.xml:546
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6909,7 +7002,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:555
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6919,66 +7012,66 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:563
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:527
+#: apt.conf.5.xml:573
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:578
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:582
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:589
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:593
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:600
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:604
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:611
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:615
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:622
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:580
+#: apt.conf.5.xml:626
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -6986,46 +7079,46 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:633
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:637
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:644
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:647
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:654
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:611
+#: apt.conf.5.xml:657
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:664
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:667
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7033,93 +7126,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:675
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:678
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:686
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:690
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:697
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:700
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:707
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:664
+#: apt.conf.5.xml:710
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:718
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:722
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:729
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:733
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:740
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:744
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:751
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:754
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7129,12 +7222,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:765
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:768
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7151,91 +7244,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:787
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:790
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:797
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:754
+#: apt.conf.5.xml:800
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:762
+#: apt.conf.5.xml:808
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:811
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:772
+#: apt.conf.5.xml:818
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:822
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:784
+#: apt.conf.5.xml:830
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:834
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:841
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:845
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:851
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:855
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:863
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:866
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -7243,12 +7336,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:874
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:878
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7256,7 +7349,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:900
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7266,7 +7359,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:861
+#: apt.conf.5.xml:907
#, fuzzy
#| msgid "&apt-conf;"
msgid "&file-aptconf;"
@@ -7275,7 +7368,7 @@ msgstr "&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:912
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -9863,11 +9956,6 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "Operation failed"
#~ msgstr "オプション"
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "Config-Item"
-#~ msgstr "config-files"
-
# type: <tag></tag>
#, fuzzy
#~ msgid "Single-Instance"
@@ -9893,11 +9981,6 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "Version string for the method"
#~ msgstr "ユーザの設定"
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "601 Configuration"
-#~ msgstr "ユーザの設定"
-
#, fuzzy
#~ msgid "Notes"
#~ msgstr "contents"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index a037df160..d4b0d2542 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -2666,12 +2666,12 @@ msgstr ""
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Removing %s"
msgstr ""
@@ -2681,56 +2681,56 @@ msgstr ""
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:546
+#: apt-pkg/deb/dpkgpm.cc:554
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:635
+#: apt-pkg/deb/dpkgpm.cc:648
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:636
+#: apt-pkg/deb/dpkgpm.cc:649
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/deb/dpkgpm.cc:656
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:648
+#: apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/deb/dpkgpm.cc:663
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:656
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:849
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:877
msgid "Running dpkg"
msgstr ""
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 06:18:36 +0000